feat: modify the request part to one string

Author: sukidayou

README.md

@@ -18,47 +18,48 @@ mvn clean install
 ```
 
 ## Options
-| options               | description                                  | must | remark                                                    |
-|-----------------------|----------------------------------------------|------|-----------------------------------------------------------|
-| `-m, --model`         | The path of the model file or model text     | y    | Please wrap it with `""` and separate each line with `\|` |
-| `-p, --policy`        | The path of the policy file or policy text   | y    | Please wrap it with `""` and separate each line with `\|` |          
-| `-e, --enforce`       | Check permissions                            | n    | Please wrap it with `""`                                  |
-| `-ex, --enforceEx`    | Check permissions and get which policy it is | n    | Please wrap it with `""`                                  |
-| `-AF, --addFuntion`   | Add custom funtion                           | n    | Please wrap it with `""` and separate each line with `\|` |
-| `-ap, --addPolicy`    | Add a policy rule to the policy file         | n    | Please wrap it with `""`                                  |
-| `-rp, --removePolicy` | Remove a policy rule from the policy file    | n    | Please wrap it with `""`                                  |
+| options               | description                                  | must | remark                                                                                                             |
+|-----------------------|----------------------------------------------|------|--------------------------------------------------------------------------------------------------------------------|
+| `-m, --model`         | The path of the model file or model text     | y    | Please wrap it with `""` and separate each line with `\|`                                                          |
+| `-p, --policy`        | The path of the policy file or policy text   | y    | Please wrap it with `""` and separate each line with `\|`                                                          |          
+| `-r, --request`       | The parameters of corresponding request      | y    | Please wrap it with `""` and separate each parameter with `\n`,which corresponds to the line break of the terminal |
+| `-e, --enforce`       | Check permissions                            | n    | Please wrap it with `""`                                                                                           |
+| `-ex, --enforceEx`    | Check permissions and get which policy it is | n    | Please wrap it with `""`                                                                                           |
+| `-AF, --addFuntion`   | Add custom funtion                           | n    | Please wrap it with `""` and separate each line with `\|`                                                          |
+| `-ap, --addPolicy`    | Add a policy rule to the policy file         | n    | Please wrap it with `""`                                                                                           |
+| `-rp, --removePolicy` | Remove a policy rule from the policy file    | n    | Please wrap it with `""`                                                                                           |
 
 ## Get started
 
 - Check whether Alice has read permission on data1
 
     ```shell
-    ./casbin enforce -m "examples/rbac_model.conf" -p "examples/rbac_policy.csv" "alice" "data1" "read"
+    ./casbin enforce -m "examples/rbac_model.conf" -p "examples/rbac_policy.csv" -r "alice, data1, read"
     ```
     > {"allow":true,"explain":null}
     ```shell
-    ./casbin enforce -m "[request_definition]|r = sub, obj, act|[policy_definition]|p = sub, obj, act|[role_definition]|g = _, _|[policy_effect]|e = some(where (p.eft == allow))|[matchers]|m = g(r.sub, p.sub) && r.obj == p.obj && r.act == p.act" -p "p, alice, data1, read|p, bob, data2, write|p, data2_admin, data2, read|p, data2_admin, data2, write|g, alice, data2_admin" "alice" "data1" "read"
+    ./casbin enforce -m "[request_definition]|r = sub, obj, act|[policy_definition]|p = sub, obj, act|[role_definition]|g = _, _|[policy_effect]|e = some(where (p.eft == allow))|[matchers]|m = g(r.sub, p.sub) && r.obj == p.obj && r.act == p.act" -p "p, alice, data1, read|p, bob, data2, write|p, data2_admin, data2, read|p, data2_admin, data2, write|g, alice, data2_admin" -r "alice, data1, read"
     ```
     > {"allow":true,"explain":null}
 
 - Check whether Alice has write permission for data2. If so, display the effective policy.
 
     ```shell
-    ./casbin enforceEx -m "examples/rbac_model.conf" -p "examples/rbac_policy.csv" "alice" "data2" "write"
+    ./casbin enforceEx -m "examples/rbac_model.conf" -p "examples/rbac_policy.csv" -r "alice, data2, write"
     ```
     > {"allow":true,"explain":["data2_admin","data2","write"]}
 
 - Add a policy to the policy file
 
     ```shell
-    ./casbin addPolicy -m "examples/rbac_model.conf" -p "examples/rbac_policy.csv" "alice" "data2" "write"
+    ./casbin addPolicy -m "examples/rbac_model.conf" -p "examples/rbac_policy.csv" -r "alice, data2, write"
     ```
     > {"allow":true,"explain":null}
 
 - Delete a policy from the policy file
 
     ```shell
-    ./casbin removePolicy -m "examples/rbac_model.conf" -p "examples/rbac_policy.csv" "alice" "data2" "write"
+    ./casbin removePolicy -m "examples/rbac_model.conf" -p "examples/rbac_policy.csv" -r "alice, data2, write"
     ```
     > {"allow":true,"explain":null}
 

src/main/java/org/casbin/Client.java

@@ -37,7 +37,21 @@ public static String run(String... args) {
                 CustomFunction customFunction = DynamicClassGenerator.generateClass(methodName, codes);
                 enforcer.addFunction(methodName, customFunction);
             }
-            CommandExecutor commandExecutor = new CommandExecutor(enforcer, commandName, cmd.getArgs());
+
+            String[] requestParts = new String[0];
+            if (cmd.hasOption("r")) {
+                String requestStr = cmd.getOptionValue("r");
+                if (requestStr.contains("\n")) {
+                    requestParts = requestStr.split("\n");
+                } else {
+                    requestParts = requestStr.split(",");
+                }
+                for (int i = 0; i < requestParts.length; i++) {
+                    requestParts[i] = requestParts[i].trim();
+                }
+            }
+
+            CommandExecutor commandExecutor = new CommandExecutor(enforcer, commandName, requestParts);
             Object o = commandExecutor.outputResult();
             System.out.println(o);
             return o.toString();
@@ -79,6 +93,10 @@ private static CommandLine getCmd(String[] args) throws ParseException {
         option.hasArg();
         options.addOption(option);
 
+        option = new Option("r", "request", true, "the request");
+        option.hasArg();
+        options.addOption(option);
+
         CommandLineParser parser = new DefaultParser();
         return parser.parse(options, args);
     }