#gg-9809: all methods return SecurityContext instead of GridSecurityContext.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c5076762 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c5076762 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c5076762 Branch: refs/heads/sprint-2 Commit: c5076762b5a04c3c8451494e35c1de16747aafcc Parents: 0c8c2eb Author: ivasilinets <ivasilin...@gridgain.com> Authored: Wed Feb 18 14:34:12 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Wed Feb 18 14:34:12 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/rest/GridRestProcessor.java | 8 ++++---- .../internal/processors/security/GridSecurityProcessor.java | 6 +++--- .../processors/security/os/GridOsSecurityProcessor.java | 6 +++--- .../org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c5076762/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java index 6d9ee37..3d834fb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java @@ -161,7 +161,7 @@ public class GridRestProcessor extends GridProcessorAdapter { if (log.isDebugEnabled()) log.debug("Received request from client: " + req); - GridSecurityContext subjCtx = null; + SecurityContext subjCtx = null; try { subjCtx = authenticate(req); @@ -436,7 +436,7 @@ public class GridRestProcessor extends GridProcessorAdapter { * @return Authentication subject context. * @throws IgniteCheckedException If authentication failed. */ - private GridSecurityContext authenticate(GridRestRequest req) throws IgniteCheckedException { + private SecurityContext authenticate(GridRestRequest req) throws IgniteCheckedException { // Authenticate client if invalid session. AuthenticationContext authCtx = new AuthenticationContext(); @@ -466,7 +466,7 @@ public class GridRestProcessor extends GridProcessorAdapter { authCtx.credentials(cred); - GridSecurityContext subjCtx = ctx.security().authenticate(authCtx); + SecurityContext subjCtx = ctx.security().authenticate(authCtx); if (subjCtx == null) { if (req.credentials() == null) @@ -483,7 +483,7 @@ public class GridRestProcessor extends GridProcessorAdapter { * @param sCtx Security context. * @throws GridSecurityException If authorization failed. */ - private void authorize(GridRestRequest req, GridSecurityContext sCtx) throws GridSecurityException { + private void authorize(GridRestRequest req, SecurityContext sCtx) throws GridSecurityException { GridSecurityPermission perm = null; String name = null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c5076762/modules/core/src/main/java/org/apache/ignite/internal/processors/security/GridSecurityProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/security/GridSecurityProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/security/GridSecurityProcessor.java index e8879c8..66c692f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/security/GridSecurityProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/security/GridSecurityProcessor.java @@ -37,7 +37,7 @@ public interface GridSecurityProcessor extends GridProcessor { * @return {@code True} if succeeded, {@code false} otherwise. * @throws IgniteCheckedException If error occurred. */ - public GridSecurityContext authenticateNode(ClusterNode node, GridSecurityCredentials cred) throws IgniteCheckedException; + public SecurityContext authenticateNode(ClusterNode node, GridSecurityCredentials cred) throws IgniteCheckedException; /** * Gets flag indicating whether all nodes or coordinator only should run the authentication for joining node. @@ -53,7 +53,7 @@ public interface GridSecurityProcessor extends GridProcessor { * @return {@code True} if succeeded, {@code false} otherwise. * @throws IgniteCheckedException If error occurred. */ - public GridSecurityContext authenticate(AuthenticationContext ctx) throws IgniteCheckedException; + public SecurityContext authenticate(AuthenticationContext ctx) throws IgniteCheckedException; /** * Gets collection of authenticated nodes. @@ -80,7 +80,7 @@ public interface GridSecurityProcessor extends GridProcessor { * @param securityCtx Optional security context. * @throws GridSecurityException If security check failed. */ - public void authorize(String name, GridSecurityPermission perm, @Nullable GridSecurityContext securityCtx) + public void authorize(String name, GridSecurityPermission perm, @Nullable SecurityContext securityCtx) throws GridSecurityException; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c5076762/modules/core/src/main/java/org/apache/ignite/internal/processors/security/os/GridOsSecurityProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/security/os/GridOsSecurityProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/security/os/GridOsSecurityProcessor.java index 9360cb2..54bf946 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/security/os/GridOsSecurityProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/security/os/GridOsSecurityProcessor.java @@ -69,7 +69,7 @@ public class GridOsSecurityProcessor extends GridProcessorAdapter implements Gri }; /** {@inheritDoc} */ - @Override public GridSecurityContext authenticateNode(ClusterNode node, GridSecurityCredentials cred) + @Override public SecurityContext authenticateNode(ClusterNode node, GridSecurityCredentials cred) throws IgniteCheckedException { GridSecuritySubjectAdapter s = new GridSecuritySubjectAdapter(GridSecuritySubjectType.REMOTE_NODE, node.id()); @@ -86,7 +86,7 @@ public class GridOsSecurityProcessor extends GridProcessorAdapter implements Gri } /** {@inheritDoc} */ - @Override public GridSecurityContext authenticate(AuthenticationContext authCtx) throws IgniteCheckedException { + @Override public SecurityContext authenticate(AuthenticationContext authCtx) throws IgniteCheckedException { GridSecuritySubjectAdapter s = new GridSecuritySubjectAdapter(authCtx.subjectType(), authCtx.subjectId()); s.permissions(ALLOW_ALL); @@ -109,7 +109,7 @@ public class GridOsSecurityProcessor extends GridProcessorAdapter implements Gri } /** {@inheritDoc} */ - @Override public void authorize(String name, GridSecurityPermission perm, @Nullable GridSecurityContext securityCtx) + @Override public void authorize(String name, GridSecurityPermission perm, @Nullable SecurityContext securityCtx) throws GridSecurityException { // No-op. } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c5076762/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 f51a74c..8e9d372 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 @@ -3512,7 +3512,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov else { SecurityContext subj = nodeAuth.authenticateNode(node, cred); - GridSecurityContext coordSubj = ignite.configuration().getMarshaller().unmarshal( + SecurityContext coordSubj = ignite.configuration().getMarshaller().unmarshal( node.<byte[]>attribute(IgniteNodeAttributes.ATTR_SECURITY_SUBJECT), U.gridClassLoader()); if (!permissionsEqual(coordSubj.subject().permissions(), subj.subject().permissions())) {
