Merge pull request #19 from ArcanePlugins/ver/1.1.x

Ver/1.1.x
ArcanePlugins · Jan 18, 2025 · 61efc24 · 61efc24
2 parents 4fc8fbb + 74b66dc
commit 61efc24
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 7 deletions.
diff --git a/blackwidowlib/pom.xml b/blackwidowlib/pom.xml
@@ -24,11 +24,11 @@
     <parent>
         <groupId>io.github.arcaneplugins.blackwidow</groupId>
         <artifactId>blackwidow</artifactId>
-        <version>1.1.4</version>
+        <version>1.1.5</version>
     </parent>
 
     <artifactId>blackwidowlib</artifactId>
-    <version>1.1.4</version>
+    <version>1.1.5</version>
     <build>
         <plugins>
             <plugin>

diff --git a/...b/src/test/java/io/github/arcaneplugins/blackwidow/lib/cmdblocking/TestCmdEvaluation.java b/...b/src/test/java/io/github/arcaneplugins/blackwidow/lib/cmdblocking/TestCmdEvaluation.java
@@ -25,6 +25,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.EnumSet;
+import java.util.function.BiFunction;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Supplier;
@@ -150,6 +151,77 @@ public void testChainsMustStartWithSlash() {
         }
     }
 
+    /**
+     * Ensures wildcard base command rules detect all base commands.
+     *
+     * @author lokka30
+     * @since 1.1.5
+     */
+    @Test
+    public void testWildcardBaseCmd() {
+        final BiFunction<String, Policy, Boolean> test = (cmd, policy) -> {
+            final Evaluation eval = Evaluator.evaluate(
+                    "/hello",
+                    Collections.singletonList(new Chain(
+                            "wildcard-base-cmd",
+                            true,
+                            Policy.DENY,
+                            Collections.singletonList("/*"),
+                            false,
+                            EvalCause.setValues()
+                    )),
+                    Policy.ALLOW,
+                    false,
+                    EvalCause.CMD_EXECUTION,
+                    debugLogger,
+                    warningLogger
+            );
+
+            return eval.policy() == policy && !eval.dueToException();
+        };
+
+        Assertions.assertTrue(test.apply("/hello", Policy.DENY), "failed wildcard base cmd match");
+        Assertions.assertTrue(test.apply("/something abc", Policy.DENY), "failed wildcard base cmd match with an argument");
+    }
+
+    /**
+     * Ensures wildcard argument command rules detect all command arguments.
+     *
+     * @author lokka30
+     * @since 1.1.5
+     */
+    @Test
+    public void testWildcardArgs() {
+        final BiFunction<String, Policy, Boolean> test = (cmd, policy) -> {
+            final Evaluation eval = Evaluator.evaluate(
+                    cmd,
+                    Collections.singletonList(new Chain(
+                            "wildcard-arg-cmd",
+                            true,
+                            policy,
+                            Collections.singletonList("/hello * world *"),
+                            false,
+                            EvalCause.setValues()
+                    )),
+                    Policy.ALLOW,
+                    false,
+                    EvalCause.CMD_EXECUTION,
+                    debugLogger,
+                    warningLogger
+            );
+
+            return eval.policy() == policy && !eval.dueToException();
+        };
+
+        Assertions.assertTrue(test.apply("/hello something world anything123", Policy.DENY));
+        Assertions.assertTrue(test.apply("/hello another world thing withmorestuff at the end", Policy.DENY));
+        Assertions.assertTrue(test.apply("/hello * world *", Policy.DENY));
+        Assertions.assertTrue(test.apply("/hello * world * hasmorestuff", Policy.DENY));
+
+        Assertions.assertTrue(test.apply("/nothello a world a", Policy.ALLOW));
+        Assertions.assertTrue(test.apply("/hello something notworld anotherthinghere", Policy.ALLOW));
+    }
+
     /**
      * Example to ensure all commands expected to be denied are.. denied.
      *

diff --git a/blackwidowpluginbukkit/pom.xml b/blackwidowpluginbukkit/pom.xml
@@ -24,11 +24,11 @@
     <parent>
         <groupId>io.github.arcaneplugins.blackwidow</groupId>
         <artifactId>blackwidow</artifactId>
-        <version>1.1.4</version>
+        <version>1.1.5</version>
     </parent>
 
     <artifactId>blackwidowpluginbukkit</artifactId>
-    <version>1.1.4</version>
+    <version>1.1.5</version>
 
     <properties>
         <maven.compiler.source>21</maven.compiler.source>
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>io.github.arcaneplugins.blackwidow</groupId>
             <artifactId>blackwidowlib</artifactId>
-            <version>1.1.4</version>
+            <version>1.1.5</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/...eplugins/blackwidow/plugin/bukkit/logic/inbuilt/requirement/HasPermissionRequirement.java b/...eplugins/blackwidow/plugin/bukkit/logic/inbuilt/requirement/HasPermissionRequirement.java
@@ -27,7 +27,7 @@
 
 public final class HasPermissionRequirement extends Requirement {
 
-    public static final String ID = "has-perission";
+    public static final String ID = "has-permission";
 
     private final String permission;
 

diff --git a/pom.xml b/pom.xml
@@ -24,7 +24,7 @@
 
     <groupId>io.github.arcaneplugins.blackwidow</groupId>
     <artifactId>blackwidow</artifactId>
-    <version>1.1.4</version>
+    <version>1.1.5</version>
     <packaging>pom</packaging>
     <modules>
         <module>blackwidowlib</module>