Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions examples/string_vs_integer_model.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[request_definition]
r = sub, obj, act, exp

[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 && r.exp == "1"
7 changes: 7 additions & 0 deletions examples/string_vs_integer_policy.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
p, reader, data, read
p, writer, data, write
p, admin, data, delete
g, alice, reader
g, alice, writer
g, bob, reader
g, cathy, admin
36 changes: 34 additions & 2 deletions src/main/java/org/casbin/CommandExecutor.java
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,14 @@ public String outputResult() throws InvocationTargetException, IllegalAccessExce
convertedParams[i] = Integer.valueOf(inputVal[i]);
} else if(genericParameterTypes[i] == String.class) {
convertedParams[i] = inputVal[i];
} else if(genericParameterTypes[i] == Object[].class || genericParameterTypes[i] == String[].class) {
} else if(genericParameterTypes[i] == Object[].class) {
String[] remainingArgs = Arrays.copyOfRange(inputVal, i, inputVal.length);
Object[] convertedArray = new Object[remainingArgs.length];
for (int j = 0; j < remainingArgs.length; j++) {
convertedArray[j] = smartConvertValue(remainingArgs[j]);
}
convertedParams[i] = convertedArray;
} else if(genericParameterTypes[i] == String[].class) {
convertedParams[i] = Arrays.copyOfRange(inputVal, i, inputVal.length);
} else if (genericParameterTypes[i] == String[][].class) {
String[] arr = Arrays.copyOfRange(inputVal, i, inputVal.length);
Expand Down Expand Up @@ -148,4 +155,29 @@ public String outputResult() throws InvocationTargetException, IllegalAccessExce
ObjectMapper mapper = new ObjectMapper();
return mapper.writeValueAsString(responseBody);
}
}

private Object smartConvertValue(String value) {
value = value.trim();

if (value.startsWith("\"") && value.endsWith("\"")) {
return value.substring(1, value.length() - 1); // 去掉引号
}

if (value.matches("-?\\d+")) {
return Integer.valueOf(value); // Integer
}

if (value.matches("-?\\d*\\.\\d+")) {
return Double.valueOf(value);
}

if ("true".equalsIgnoreCase(value)) {
return Boolean.TRUE;
} else if ("false".equalsIgnoreCase(value)) {
return Boolean.FALSE;
}

return value;
}

}
6 changes: 6 additions & 0 deletions src/test/java/org/casbin/ClientTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -332,4 +332,10 @@ public void testKeyMatch5() {
assertEquals(Client.run(new String[]{"enforceEx", "-m", "examples/keymatch5_model.conf", "-p", "examples/keymatch5_policy.csv", "alice", "/alice_data/hello/123", "GET"}), "{\"allow\":true,\"explain\":[\"alice\",\"/alice_data/{resource}/.*\",\"GET\"]}");
assertEquals(Client.run(new String[]{"enforceEx", "-m", "examples/keymatch5_model.conf", "-p", "examples/keymatch5_policy.csv", "alice", "/alice_data/hello/123", "POST"}), "{\"allow\":false,\"explain\":[]}");
}

@Test
public void testStringVsIntegerParameter() {
assertEquals(Client.run(new String[]{"enforceEx", "-m", "examples/string_vs_integer_model.conf", "-p", "examples/string_vs_integer_policy.csv", "alice", "data", "read", "\"1\""}), "{\"allow\":true,\"explain\":[\"reader\",\"data\",\"read\"]}");
assertEquals(Client.run(new String[]{"enforceEx", "-m", "examples/string_vs_integer_model.conf", "-p", "examples/string_vs_integer_policy.csv", "alice", "data", "read", "1"}), "{\"allow\":false,\"explain\":[]}");
}
}