#gg-9809: authenticateNode return SecurityContext.

apache · Feb 18, 2015 · 0c8c2eb · 0c8c2eb
1 parent 4756e14
commit 0c8c2eb
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/...ore/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/...ore/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -238,7 +238,7 @@ public void setNodeAttributes(Map<String, Object> attrs, IgniteProductVersion ve
         getSpi().setMetricsProvider(createMetricsProvider());
 
         getSpi().setAuthenticator(new DiscoverySpiNodeAuthenticator() {
-            @Override public GridSecurityContext authenticateNode(ClusterNode node, GridSecurityCredentials cred) {
+            @Override public SecurityContext authenticateNode(ClusterNode node, GridSecurityCredentials cred) {
                 try {
                     return ctx.security().authenticateNode(node, cred);
                 }

diff --git a/...les/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiNodeAuthenticator.java b/...les/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiNodeAuthenticator.java
@@ -35,7 +35,7 @@ public interface DiscoverySpiNodeAuthenticator {
      * @throws IgniteException If authentication process failed
      *      (invalid credentials should not lead to this exception).
      */
-    public GridSecurityContext authenticateNode(ClusterNode node, GridSecurityCredentials cred) throws IgniteException;
+    public SecurityContext authenticateNode(ClusterNode node, GridSecurityCredentials cred) throws IgniteException;
 
     /**
      * Gets global node authentication flag.

diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -1271,7 +1271,7 @@ private void joinTopology() throws IgniteSpiException {
 
                 // Authenticate local node.
                 try {
-                    GridSecurityContext subj = nodeAuth.authenticateNode(locNode, locCred);
+                    SecurityContext subj = nodeAuth.authenticateNode(locNode, locCred);
 
                     if (subj == null)
                         throw new IgniteSpiException("Authentication failed for local node: " + locNode.id());
@@ -3066,7 +3066,7 @@ private void processJoinRequestMessage(TcpDiscoveryJoinRequestMessage msg) {
                 try {
                     GridSecurityCredentials cred = unmarshalCredentials(node);
 
-                    GridSecurityContext subj = nodeAuth.authenticateNode(node, cred);
+                    SecurityContext subj = nodeAuth.authenticateNode(node, cred);
 
                     if (subj == null) {
                         // Node has not pass authentication.
@@ -3510,7 +3510,7 @@ private void processNodeAddedMessage(TcpDiscoveryNodeAddedMessage msg) {
                             authFailed = false;
                         }
                         else {
-                            GridSecurityContext subj = nodeAuth.authenticateNode(node, cred);
+                            SecurityContext subj = nodeAuth.authenticateNode(node, cred);
 
                             GridSecurityContext coordSubj = ignite.configuration().getMarshaller().unmarshal(
                                 node.<byte[]>attribute(IgniteNodeAttributes.ATTR_SECURITY_SUBJECT), U.gridClassLoader());

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
@@ -390,7 +390,7 @@ protected long getMaxMetricsWaitTime() {
                 });
 
                 spi.setAuthenticator(new DiscoverySpiNodeAuthenticator() {
-                    @Override public GridSecurityContext authenticateNode(ClusterNode n, GridSecurityCredentials cred) {
+                    @Override public SecurityContext authenticateNode(ClusterNode n, GridSecurityCredentials cred) {
                         GridSecuritySubject subj = getGridSecuritySubject(GridSecuritySubjectType.REMOTE_NODE, n.id());
 
                         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
@@ -65,7 +65,7 @@ public DiscoverySpiDataExchange getDataExchange() {
     @GridSpiTestConfig
     public DiscoverySpiNodeAuthenticator getAuthenticator() {
         return new DiscoverySpiNodeAuthenticator() {
-            @Override public GridSecurityContext authenticateNode(ClusterNode n, GridSecurityCredentials cred) {
+            @Override public SecurityContext authenticateNode(ClusterNode n, GridSecurityCredentials cred) {
                 GridSecuritySubject subj = getGridSecuritySubject(GridSecuritySubjectType.REMOTE_NODE, n.id());
 
                 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
@@ -333,7 +333,7 @@ private void configureDiscovery(GridSpiTest spiTest) throws Exception {
         getTestResources().inject(discoSpi);
 
         discoSpi.setAuthenticator(new DiscoverySpiNodeAuthenticator() {
-            @Override public GridSecurityContext authenticateNode(ClusterNode n, GridSecurityCredentials cred) {
+            @Override public SecurityContext authenticateNode(ClusterNode n, GridSecurityCredentials cred) {
                 GridSecuritySubject subj = getGridSecuritySubject(GridSecuritySubjectType.REMOTE_NODE, n.id());
 
                 return new GridSecurityContext(subj);