Repository: incubator-geode Updated Branches: refs/heads/develop d24a5fb13 -> 1aa39174d
GEODE-1450: Move ExampleJSONAuthorization out of 'test' and into 'main' Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/1aa39174 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/1aa39174 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/1aa39174 Branch: refs/heads/develop Commit: 1aa39174daa8ab2b2017013a62ff297fda7362e4 Parents: d24a5fb Author: Jens Deppe <[email protected]> Authored: Thu Jun 2 10:46:59 2016 -0700 Committer: Jens Deppe <[email protected]> Committed: Thu Jun 2 10:46:59 2016 -0700 ---------------------------------------------------------------------- .../gemfire/security/templates/SampleJsonAuthorization.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1aa39174/geode-core/src/main/java/com/gemstone/gemfire/security/templates/SampleJsonAuthorization.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/security/templates/SampleJsonAuthorization.java b/geode-core/src/main/java/com/gemstone/gemfire/security/templates/SampleJsonAuthorization.java index 5723ea5..dca64e7 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/security/templates/SampleJsonAuthorization.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/security/templates/SampleJsonAuthorization.java @@ -178,11 +178,10 @@ public class SampleJsonAuthorization implements AccessControl, Authenticator { for (JsonNode op : r.get("operationsAllowed")) { String[] parts = op.asText().split(":"); - if (regionNames == null) { - role.permissions.add(new ResourceOperationContext(parts[0], parts[1], "*", false)); - } else { - role.permissions.add(new ResourceOperationContext(parts[0], parts[1], regionNames, false)); - } + String resourcePart = (parts.length > 0) ? parts[0] : null; + String operationPart = (parts.length > 1) ? parts[1] : null; + String regionPart = (regionNames != null) ? regionNames : "*"; + role.permissions.add(new ResourceOperationContext(resourcePart, operationPart, regionPart, false)); } roleMap.put(role.name, role);
