You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vk...@apache.org on 2017/05/02 11:05:50 UTC
[1/2] ignite git commit: IGNITE-5080 - Fixes in
SecurityBasicPermissionSet
Repository: ignite
Updated Branches:
refs/heads/master eb6a1697f -> 56ec99519
IGNITE-5080 - Fixes in SecurityBasicPermissionSet
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2f7172cb
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2f7172cb
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2f7172cb
Branch: refs/heads/master
Commit: 2f7172cb5c7af8e61cba00d6ec5e4d6f76b635e4
Parents: eb6a169
Author: Valentin Kulichenko <va...@gmail.com>
Authored: Fri Apr 28 14:53:33 2017 +0200
Committer: Valentin Kulichenko <va...@ing.be>
Committed: Tue May 2 12:55:37 2017 +0200
----------------------------------------------------------------------
.../security/SecurityBasicPermissionSet.java | 89 ++++++++++++++------
1 file changed, 65 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2f7172cb/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityBasicPermissionSet.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityBasicPermissionSet.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityBasicPermissionSet.java
index 7521dff..44166d9 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityBasicPermissionSet.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityBasicPermissionSet.java
@@ -17,10 +17,12 @@
package org.apache.ignite.plugin.security;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.A;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.jetbrains.annotations.Nullable;
@@ -33,16 +35,20 @@ public class SecurityBasicPermissionSet implements SecurityPermissionSet {
private static final long serialVersionUID = 0L;
/** Cache permissions. */
- private Map<String, Collection<SecurityPermission>> cachePerms = new HashMap<>();
+ @GridToStringInclude
+ private Map<String, Collection<SecurityPermission>> cachePermissions = new HashMap<>();
/** Task permissions. */
- private Map<String, Collection<SecurityPermission>> taskPerms = new HashMap<>();
+ @GridToStringInclude
+ private Map<String, Collection<SecurityPermission>> taskPermissions = new HashMap<>();
/** Service permissions. */
- private Map<String, Collection<SecurityPermission>> srvcPerms = new HashMap<>();
+ @GridToStringInclude
+ private Map<String, Collection<SecurityPermission>> servicePermissions = new HashMap<>();
/** System permissions. */
- private Collection<SecurityPermission> sysPerms = new ArrayList<>();
+ @GridToStringInclude
+ private Collection<SecurityPermission> systemPermissions;
/** Default allow all. */
private boolean dfltAllowAll;
@@ -50,37 +56,43 @@ public class SecurityBasicPermissionSet implements SecurityPermissionSet {
/**
* Setter for set cache permission map.
*
- * @param cachePerms Cache permissions.
+ * @param cachePermissions Cache permissions.
*/
- public void setCachePermissions(Map<String, Collection<SecurityPermission>> cachePerms) {
- this.cachePerms = cachePerms;
+ public void setCachePermissions(Map<String, Collection<SecurityPermission>> cachePermissions) {
+ A.notNull(cachePermissions, "cachePermissions");
+
+ this.cachePermissions = cachePermissions;
}
/**
* Setter for set task permission map.
*
- * @param taskPerms Task permissions.
+ * @param taskPermissions Task permissions.
*/
- public void setTaskPermissions(Map<String, Collection<SecurityPermission>> taskPerms) {
- this.taskPerms = taskPerms;
+ public void setTaskPermissions(Map<String, Collection<SecurityPermission>> taskPermissions) {
+ A.notNull(taskPermissions, "taskPermissions");
+
+ this.taskPermissions = taskPermissions;
}
/**
* Setter for set service permission map.
*
- * @param srvcPerms Service permissions.
+ * @param servicePermissions Service permissions.
*/
- public void setServicePermissions(Map<String, Collection<SecurityPermission>> srvcPerms) {
- this.srvcPerms = srvcPerms;
+ public void setServicePermissions(Map<String, Collection<SecurityPermission>> servicePermissions) {
+ A.notNull(taskPermissions, "servicePermissions");
+
+ this.servicePermissions = servicePermissions;
}
/**
- * Setter for set collection system permission.
+ * Setter for set collection system permission.
*
- * @param sysPerms System permissions.
+ * @param systemPermissions System permissions.
*/
- public void setSystemPermissions(Collection<SecurityPermission> sysPerms) {
- this.sysPerms = sysPerms;
+ public void setSystemPermissions(Collection<SecurityPermission> systemPermissions) {
+ this.systemPermissions = systemPermissions;
}
/**
@@ -94,22 +106,22 @@ public class SecurityBasicPermissionSet implements SecurityPermissionSet {
/** {@inheritDoc} */
@Override public Map<String, Collection<SecurityPermission>> cachePermissions() {
- return cachePerms;
+ return cachePermissions;
}
/** {@inheritDoc} */
@Override public Map<String, Collection<SecurityPermission>> taskPermissions() {
- return taskPerms;
+ return taskPermissions;
}
/** {@inheritDoc} */
@Override public Map<String, Collection<SecurityPermission>> servicePermissions() {
- return srvcPerms;
+ return servicePermissions;
}
/** {@inheritDoc} */
@Nullable @Override public Collection<SecurityPermission> systemPermissions() {
- return sysPerms;
+ return systemPermissions;
}
/** {@inheritDoc} */
@@ -118,6 +130,35 @@ public class SecurityBasicPermissionSet implements SecurityPermissionSet {
}
/** {@inheritDoc} */
+ @Override public boolean equals(Object o) {
+ if (this == o)
+ return true;
+
+ if (!(o instanceof SecurityBasicPermissionSet))
+ return false;
+
+ SecurityBasicPermissionSet other = (SecurityBasicPermissionSet)o;
+
+ return dfltAllowAll == other.dfltAllowAll &&
+ F.eq(cachePermissions, other.cachePermissions) &&
+ F.eq(taskPermissions, other.taskPermissions) &&
+ F.eq(servicePermissions, other.servicePermissions) &&
+ F.eq(systemPermissions, other.systemPermissions);
+ }
+
+ /** {@inheritDoc} */
+ @Override public int hashCode() {
+ int res = (dfltAllowAll ? 1 : 0);
+
+ res = 31 * res + (cachePermissions != null ? cachePermissions.hashCode() : 0);
+ res = 31 * res + (taskPermissions != null ? taskPermissions.hashCode() : 0);
+ res = 31 * res + (servicePermissions != null ? servicePermissions.hashCode() : 0);
+ res = 31 * res + (systemPermissions != null ? systemPermissions.hashCode() : 0);
+
+ return res;
+ }
+
+ /** {@inheritDoc} */
@Override public String toString() {
return S.toString(SecurityBasicPermissionSet.class, this);
}
[2/2] ignite git commit: IGNITE-5081 - Removed redundant duplication
of permissions in SecurityPermissionSetBuilder
Posted by vk...@apache.org.
IGNITE-5081 - Removed redundant duplication of permissions in SecurityPermissionSetBuilder
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/56ec9951
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/56ec9951
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/56ec9951
Branch: refs/heads/master
Commit: 56ec995199d12c3b257e77cb49296dc747bc7a93
Parents: 2f7172c
Author: Valentin Kulichenko <va...@gmail.com>
Authored: Fri Apr 28 14:48:57 2017 +0200
Committer: Valentin Kulichenko <va...@ing.be>
Committed: Tue May 2 12:59:53 2017 +0200
----------------------------------------------------------------------
.../security/SecurityPermissionSetBuilder.java | 17 +++---
.../SecurityPermissionSetBuilderTest.java | 63 ++++++++++++--------
2 files changed, 46 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/56ec9951/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityPermissionSetBuilder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityPermissionSetBuilder.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityPermissionSetBuilder.java
index cf38c0f..abac541 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityPermissionSetBuilder.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityPermissionSetBuilder.java
@@ -17,16 +17,17 @@
package org.apache.ignite.plugin.security;
-import java.util.Map;
-import java.util.List;
-import java.util.HashMap;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
import org.apache.ignite.IgniteException;
+import org.apache.ignite.internal.util.typedef.internal.U;
-import static java.util.Collections.unmodifiableList;
import static java.util.Collections.unmodifiableMap;
+import static java.util.Collections.unmodifiableSet;
/**
* Provides a convenient way to create a permission set.
@@ -61,7 +62,7 @@ public class SecurityPermissionSetBuilder {
private Map<String, Collection<SecurityPermission>> srvcPerms = new HashMap<>();
/** System permissions.*/
- private List<SecurityPermission> sysPerms = new ArrayList<>();
+ private Set<SecurityPermission> sysPerms = new HashSet<>();
/** Default allow all.*/
private boolean dfltAllowAll;
@@ -193,7 +194,7 @@ public class SecurityPermissionSetBuilder {
private final <T> Collection<T> toCollection(T... perms) {
assert perms != null;
- Collection<T> col = new ArrayList<>(perms.length);
+ Collection<T> col = U.newHashSet(perms.length);
Collections.addAll(col, perms);
@@ -234,7 +235,7 @@ public class SecurityPermissionSetBuilder {
permSet.setCachePermissions(unmodifiableMap(cachePerms));
permSet.setTaskPermissions(unmodifiableMap(taskPerms));
permSet.setServicePermissions(unmodifiableMap(srvcPerms));
- permSet.setSystemPermissions(unmodifiableList(sysPerms));
+ permSet.setSystemPermissions(unmodifiableSet(sysPerms));
return permSet;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/56ec9951/modules/core/src/test/java/org/apache/ignite/plugin/security/SecurityPermissionSetBuilderTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/plugin/security/SecurityPermissionSetBuilderTest.java b/modules/core/src/test/java/org/apache/ignite/plugin/security/SecurityPermissionSetBuilderTest.java
index 5443cfd..0ac7bc7 100644
--- a/modules/core/src/test/java/org/apache/ignite/plugin/security/SecurityPermissionSetBuilderTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/plugin/security/SecurityPermissionSetBuilderTest.java
@@ -17,23 +17,24 @@
package org.apache.ignite.plugin.security;
-import java.util.Map;
-import java.util.Arrays;
-import java.util.HashMap;
import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
import java.util.concurrent.Callable;
import org.apache.ignite.IgniteException;
+import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import static org.apache.ignite.plugin.security.SecurityPermission.ADMIN_VIEW;
import static org.apache.ignite.plugin.security.SecurityPermission.CACHE_PUT;
import static org.apache.ignite.plugin.security.SecurityPermission.CACHE_READ;
import static org.apache.ignite.plugin.security.SecurityPermission.CACHE_REMOVE;
import static org.apache.ignite.plugin.security.SecurityPermission.SERVICE_DEPLOY;
import static org.apache.ignite.plugin.security.SecurityPermission.SERVICE_INVOKE;
+import static org.apache.ignite.plugin.security.SecurityPermission.EVENTS_ENABLE;
import static org.apache.ignite.plugin.security.SecurityPermission.TASK_CANCEL;
import static org.apache.ignite.plugin.security.SecurityPermission.TASK_EXECUTE;
-import static org.apache.ignite.plugin.security.SecurityPermission.EVENTS_ENABLE;
-import static org.apache.ignite.plugin.security.SecurityPermission.ADMIN_VIEW;
import static org.apache.ignite.testframework.GridTestUtils.assertThrows;
/**
@@ -41,31 +42,30 @@ import static org.apache.ignite.testframework.GridTestUtils.assertThrows;
*/
public class SecurityPermissionSetBuilderTest extends GridCommonAbstractTest {
/**
- *
*/
@SuppressWarnings({"ThrowableNotThrown", "ArraysAsListWithZeroOrOneArgument"})
public void testPermissionBuilder() {
SecurityBasicPermissionSet exp = new SecurityBasicPermissionSet();
Map<String, Collection<SecurityPermission>> permCache = new HashMap<>();
- permCache.put("cache1", Arrays.asList(CACHE_PUT, CACHE_REMOVE));
- permCache.put("cache2", Arrays.asList(CACHE_READ));
+ permCache.put("cache1", permissions(CACHE_PUT, CACHE_REMOVE));
+ permCache.put("cache2", permissions(CACHE_READ));
exp.setCachePermissions(permCache);
Map<String, Collection<SecurityPermission>> permTask = new HashMap<>();
- permTask.put("task1", Arrays.asList(TASK_CANCEL));
- permTask.put("task2", Arrays.asList(TASK_EXECUTE));
+ permTask.put("task1", permissions(TASK_CANCEL));
+ permTask.put("task2", permissions(TASK_EXECUTE));
exp.setTaskPermissions(permTask);
Map<String, Collection<SecurityPermission>> permSrvc = new HashMap<>();
- permSrvc.put("service1", Arrays.asList(SERVICE_DEPLOY));
- permSrvc.put("service2", Arrays.asList(SERVICE_INVOKE));
+ permSrvc.put("service1", permissions(SERVICE_DEPLOY));
+ permSrvc.put("service2", permissions(SERVICE_INVOKE));
exp.setServicePermissions(permSrvc);
- exp.setSystemPermissions(Arrays.asList(ADMIN_VIEW, EVENTS_ENABLE));
+ exp.setSystemPermissions(permissions(ADMIN_VIEW, EVENTS_ENABLE));
final SecurityPermissionSetBuilder permsBuilder = new SecurityPermissionSetBuilder();
@@ -105,19 +105,18 @@ public class SecurityPermissionSetBuilderTest extends GridCommonAbstractTest {
"you can assign permission only start with [EVENTS_, ADMIN_], but you try SERVICE_INVOKE"
);
- permsBuilder.appendCachePermissions(
- "cache1", CACHE_PUT, CACHE_REMOVE
- ).appendCachePermissions(
- "cache2", CACHE_READ
- ).appendTaskPermissions(
- "task1", TASK_CANCEL
- ).appendTaskPermissions(
- "task2", TASK_EXECUTE
- ).appendServicePermissions(
- "service1", SERVICE_DEPLOY
- ).appendServicePermissions(
- "service2", SERVICE_INVOKE
- ).appendSystemPermissions(ADMIN_VIEW, EVENTS_ENABLE);
+ permsBuilder
+ .appendCachePermissions("cache1", CACHE_PUT)
+ .appendCachePermissions("cache1", CACHE_PUT, CACHE_REMOVE)
+ .appendCachePermissions("cache2", CACHE_READ)
+ .appendTaskPermissions("task1", TASK_CANCEL)
+ .appendTaskPermissions("task2", TASK_EXECUTE)
+ .appendTaskPermissions("task2", TASK_EXECUTE)
+ .appendServicePermissions("service1", SERVICE_DEPLOY)
+ .appendServicePermissions("service2", SERVICE_INVOKE)
+ .appendServicePermissions("service2", SERVICE_INVOKE)
+ .appendSystemPermissions(ADMIN_VIEW)
+ .appendSystemPermissions(ADMIN_VIEW, EVENTS_ENABLE);
SecurityPermissionSet actual = permsBuilder.build();
@@ -127,4 +126,16 @@ public class SecurityPermissionSetBuilderTest extends GridCommonAbstractTest {
assertEquals(exp.systemPermissions(), actual.systemPermissions());
assertEquals(exp.defaultAllowAll(), actual.defaultAllowAll());
}
+
+ /**
+ * @param perms Permissions.
+ * @return Collection.
+ */
+ private static Collection<SecurityPermission> permissions(SecurityPermission... perms) {
+ Collection<SecurityPermission> col = U.newHashSet(perms.length);
+
+ Collections.addAll(col, perms);
+
+ return col;
+ }
}