ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject [13/46] incubator-ignite git commit: #gg-9809: authenticateNode return SecurityContext.
Date Wed, 25 Feb 2015 00:36:36 GMT
#gg-9809: authenticateNode return SecurityContext.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0c8c2eb5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0c8c2eb5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0c8c2eb5

Branch: refs/heads/ignite-sql-tests
Commit: 0c8c2eb550d6bbdeedb4ed9aec8659753c381f6f
Parents: 4756e14
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Wed Feb 18 14:28:33 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Wed Feb 18 14:28:33 2015 +0300

----------------------------------------------------------------------
 .../internal/managers/discovery/GridDiscoveryManager.java      | 2 +-
 .../ignite/spi/discovery/DiscoverySpiNodeAuthenticator.java    | 2 +-
 .../org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java   | 6 +++---
 .../apache/ignite/spi/discovery/AbstractDiscoverySelfTest.java | 2 +-
 .../spi/discovery/tcp/TcpDiscoverySpiStartStopSelfTest.java    | 2 +-
 .../ignite/testframework/junits/spi/GridSpiAbstractTest.java   | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c8c2eb5/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index 06ba35b..1d39089 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -238,7 +238,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi>
{
         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);
                 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c8c2eb5/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiNodeAuthenticator.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiNodeAuthenticator.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiNodeAuthenticator.java
index f817699..421307c 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiNodeAuthenticator.java
+++ b/modules/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.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c8c2eb5/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
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
index 0df53f9..f51a74c 100644
--- 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 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements
TcpDiscov
 
                 // 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 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements
TcpDiscov
                 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 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements
TcpDiscov
                             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());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c8c2eb5/modules/core/src/test/java/org/apache/ignite/spi/discovery/AbstractDiscoverySelfTest.java
----------------------------------------------------------------------
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
index f3b1036..00423dd 100644
--- 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 @@ public abstract class AbstractDiscoverySelfTest<T extends IgniteSpi>
extends Gri
                 });
 
                 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);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c8c2eb5/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiStartStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiStartStopSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiStartStopSelfTest.java
index c7ef480..089da9d 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiStartStopSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiStartStopSelfTest.java
@@ -65,7 +65,7 @@ public class TcpDiscoverySpiStartStopSelfTest extends GridSpiStartStopAbstractTe
     @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);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c8c2eb5/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java
index f5a8c11..b7c197a 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java
@@ -333,7 +333,7 @@ public abstract class GridSpiAbstractTest<T extends IgniteSpi> extends
GridAbstr
         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);


Mime
View raw message