#ignite-189: move GridAllowAllPermissionSet to org.gridgain.grid.kern…

…al.processors.security.
apache · Feb 13, 2015 · 85c5b69 · 85c5b69
1 parent f9f7134
commit 85c5b69
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 59 deletions.
diff --git a/...c/main/java/org/apache/ignite/internal/processors/security/GridAllowAllPermissionSet.java b/...c/main/java/org/apache/ignite/internal/processors/security/GridAllowAllPermissionSet.java
diff --git a/.../main/java/org/apache/ignite/internal/processors/security/os/GridOsSecurityProcessor.java b/.../main/java/org/apache/ignite/internal/processors/security/os/GridOsSecurityProcessor.java
@@ -41,7 +41,30 @@ public GridOsSecurityProcessor(GridKernalContext ctx) {
     }
 
     /** Allow all permissions. */
-    private static final GridSecurityPermissionSet ALLOW_ALL = new GridAllowAllPermissionSet();
+    private static final GridSecurityPermissionSet ALLOW_ALL = new GridSecurityPermissionSet() {
+        /** Serial version uid. */
+        private static final long serialVersionUID = 0L;
+
+        /** {@inheritDoc} */
+        @Override public boolean defaultAllowAll() {
+            return true;
+        }
+
+        /** {@inheritDoc} */
+        @Override public Map<String, Collection<GridSecurityPermission>> taskPermissions() {
+            return Collections.emptyMap();
+        }
+
+        /** {@inheritDoc} */
+        @Override public Map<String, Collection<GridSecurityPermission>> cachePermissions() {
+            return Collections.emptyMap();
+        }
+
+        /** {@inheritDoc} */
+        @Nullable @Override public Collection<GridSecurityPermission> systemPermissions() {
+            return null;
+        }
+    };
 
     /** {@inheritDoc} */
     @Override public GridSecurityContext authenticateNode(ClusterNode node, GridSecurityCredentials cred)

diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/AbstractDiscoverySelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/AbstractDiscoverySelfTest.java
@@ -394,7 +394,7 @@ protected long getMaxMetricsWaitTime() {
                         GridSecuritySubjectAdapter subj = new GridSecuritySubjectAdapter(
                             GridSecuritySubjectType.REMOTE_NODE, n.id());
 
-                        subj.permissions(new GridAllowAllPermissionSet());
+                        subj.permissions(getAllPermissionSet());
 
                         return new GridSecurityContext(subj);
                     }

diff --git a/...e/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiStartStopSelfTest.java b/...e/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiStartStopSelfTest.java
@@ -69,7 +69,7 @@ public DiscoverySpiNodeAuthenticator getAuthenticator() {
                 GridSecuritySubjectAdapter subj = new GridSecuritySubjectAdapter(
                     GridSecuritySubjectType.REMOTE_NODE, n.id());
 
-                subj.permissions(new GridAllowAllPermissionSet());
+                subj.permissions(getAllPermissionSet());
 
                 return new GridSecurityContext(subj);
             }

diff --git a/...es/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java b/...es/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java
@@ -95,6 +95,36 @@ protected TestData<T> getTestData() {
         return data;
     }
 
+    /**
+     * @return Allow all permission security set.
+     */
+    protected GridSecurityPermissionSet getAllPermissionSet() {
+        return new GridSecurityPermissionSet() {
+            /** Serial version uid. */
+            private static final long serialVersionUID = 0L;
+
+            /** {@inheritDoc} */
+            @Override public boolean defaultAllowAll() {
+                return true;
+            }
+
+            /** {@inheritDoc} */
+            @Override public Map<String, Collection<GridSecurityPermission>> taskPermissions() {
+                return Collections.emptyMap();
+            }
+
+            /** {@inheritDoc} */
+            @Override public Map<String, Collection<GridSecurityPermission>> cachePermissions() {
+                return Collections.emptyMap();
+            }
+
+            /** {@inheritDoc} */
+            @Nullable @Override public Collection<GridSecurityPermission> systemPermissions() {
+                return null;
+            }
+        };
+    }
+
     /**
      * @throws Exception If failed.
      */
@@ -322,7 +352,7 @@ private void configureDiscovery(GridSpiTest spiTest) throws Exception {
                 GridSecuritySubjectAdapter subj = new GridSecuritySubjectAdapter(
                     GridSecuritySubjectType.REMOTE_NODE, n.id());
 
-                subj.permissions(new GridAllowAllPermissionSet());
+                subj.permissions(getAllPermissionSet());
 
                 return new GridSecurityContext(subj);
             }