You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by yz...@apache.org on 2015/04/10 13:21:37 UTC
[1/4] incubator-ignite git commit: sp-3 renaming
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-sprint-3 566bef007 -> 674635f4b
sp-3 renaming
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/219a2ee9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/219a2ee9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/219a2ee9
Branch: refs/heads/ignite-sprint-3
Commit: 219a2ee9075e94aa56f9de7aea6606feaa3d5468
Parents: dbe0ac2
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Fri Apr 10 13:56:24 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Fri Apr 10 13:56:24 2015 +0300
----------------------------------------------------------------------
.../client/GridClientConfiguration.java | 8 +-
.../GridClientConnectionManagerAdapter.java | 2 +-
.../discovery/GridDiscoveryManager.java | 2 +-
.../processors/rest/GridRestProcessor.java | 12 +-
.../security/GridSecurityProcessor.java | 2 +-
.../security/os/GridOsSecurityProcessor.java | 2 +-
.../plugin/security/AuthenticationContext.java | 6 +-
.../security/GridSecurityCredentials.java | 184 ------------------
.../GridSecurityCredentialsBasicProvider.java | 44 -----
.../GridSecurityCredentialsProvider.java | 6 +-
.../plugin/security/SecurityCredentials.java | 191 +++++++++++++++++++
.../SecurityCredentialsBasicProvider.java | 44 +++++
.../DiscoverySpiNodeAuthenticator.java | 2 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 8 +-
.../http/jetty/GridJettyRestHandler.java | 2 +-
15 files changed, 261 insertions(+), 254 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/219a2ee9/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java
index cfd780c..1b2389a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java
@@ -674,12 +674,12 @@ public class GridClientConfiguration {
int idx = cred.indexOf(':');
if (idx >= 0 && idx < cred.length() - 1) {
- setSecurityCredentialsProvider(new GridSecurityCredentialsBasicProvider(
- new GridSecurityCredentials(cred.substring(0, idx), cred.substring(idx + 1))));
+ setSecurityCredentialsProvider(new SecurityCredentialsBasicProvider(
+ new SecurityCredentials(cred.substring(0, idx), cred.substring(idx + 1))));
}
else {
- setSecurityCredentialsProvider(new GridSecurityCredentialsBasicProvider(
- new GridSecurityCredentials(null, null, cred)));
+ setSecurityCredentialsProvider(new SecurityCredentialsBasicProvider(
+ new SecurityCredentials(null, null, cred)));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/219a2ee9/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java
index 2a04ae8..166eed5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java
@@ -420,7 +420,7 @@ public abstract class GridClientConnectionManagerAdapter implements GridClientCo
}
}
- GridSecurityCredentials cred = null;
+ SecurityCredentials cred = null;
try {
if (cfg.getSecurityCredentialsProvider() != null)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/219a2ee9/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 775e5f8..adbfa76 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
@@ -331,7 +331,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
if (ctx.security().enabled()) {
spi.setAuthenticator(new DiscoverySpiNodeAuthenticator() {
- @Override public SecurityContext authenticateNode(ClusterNode node, GridSecurityCredentials cred) {
+ @Override public SecurityContext authenticateNode(ClusterNode node, SecurityCredentials cred) {
try {
return ctx.security().authenticateNode(node, cred);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/219a2ee9/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 89c34a3..ab5ef78 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
@@ -464,21 +464,21 @@ public class GridRestProcessor extends GridProcessorAdapter {
authCtx.subjectType(REMOTE_CLIENT);
authCtx.subjectId(req.clientId());
- GridSecurityCredentials cred;
+ SecurityCredentials cred;
- if (req.credentials() instanceof GridSecurityCredentials)
- cred = (GridSecurityCredentials)req.credentials();
+ if (req.credentials() instanceof SecurityCredentials)
+ cred = (SecurityCredentials)req.credentials();
else if (req.credentials() instanceof String) {
String credStr = (String)req.credentials();
int idx = credStr.indexOf(':');
cred = idx >= 0 && idx < credStr.length() ?
- new GridSecurityCredentials(credStr.substring(0, idx), credStr.substring(idx + 1)) :
- new GridSecurityCredentials(credStr, null);
+ new SecurityCredentials(credStr.substring(0, idx), credStr.substring(idx + 1)) :
+ new SecurityCredentials(credStr, null);
}
else {
- cred = new GridSecurityCredentials();
+ cred = new SecurityCredentials();
cred.setUserObject(req.credentials());
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/219a2ee9/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 1ff16bb..bd36828 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 SecurityContext authenticateNode(ClusterNode node, GridSecurityCredentials cred) throws IgniteCheckedException;
+ public SecurityContext authenticateNode(ClusterNode node, SecurityCredentials cred) throws IgniteCheckedException;
/**
* Gets flag indicating whether all nodes or coordinator only should run the authentication for joining node.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/219a2ee9/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 3e4a937..783c981 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
@@ -39,7 +39,7 @@ public class GridOsSecurityProcessor extends GridProcessorAdapter implements Gri
}
/** {@inheritDoc} */
- @Override public SecurityContext authenticateNode(ClusterNode node, GridSecurityCredentials cred)
+ @Override public SecurityContext authenticateNode(ClusterNode node, SecurityCredentials cred)
throws IgniteCheckedException {
return null;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/219a2ee9/modules/core/src/main/java/org/apache/ignite/plugin/security/AuthenticationContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/AuthenticationContext.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/AuthenticationContext.java
index 9239e9f..4885134 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/security/AuthenticationContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/security/AuthenticationContext.java
@@ -31,7 +31,7 @@ public class AuthenticationContext {
private UUID subjId;
/** Credentials. */
- private GridSecurityCredentials credentials;
+ private SecurityCredentials credentials;
/** Subject address. */
private InetSocketAddress addr;
@@ -77,7 +77,7 @@ public class AuthenticationContext {
*
* @return Security credentials.
*/
- public GridSecurityCredentials credentials() {
+ public SecurityCredentials credentials() {
return credentials;
}
@@ -86,7 +86,7 @@ public class AuthenticationContext {
*
* @param credentials Security credentials.
*/
- public void credentials(GridSecurityCredentials credentials) {
+ public void credentials(SecurityCredentials credentials) {
this.credentials = credentials;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/219a2ee9/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentials.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentials.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentials.java
deleted file mode 100644
index b7fb045..0000000
--- a/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentials.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.plugin.security;
-
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-
-/**
- * Security credentials used for client or node authentication. Security credentials
- * are provided by {@link GridSecurityCredentialsProvider} which is specified on
- * client or node startup in configuration.
- * <p>
- * Getting credentials through {@link GridSecurityCredentialsProvider} abstraction allows
- * users to provide custom implementations for storing user names and passwords in their
- * environment, possibly in encrypted format. Ignite comes with
- * {@link GridSecurityCredentialsBasicProvider} which simply provides
- * the passed in {@code login} and {@code password} when encryption or custom logic is not required.
- * <p>
- * In addition to {@code login} and {@code password}, security credentials allow for
- * specifying {@link #setUserObject(Object) userObject} as well, which can be used
- * to pass in any additional information required for authentication.
- */
-public class GridSecurityCredentials implements Externalizable {
- /** */
- private static final long serialVersionUID = -2655741071578326256L;
-
- /** Login. */
- private Object login;
-
- /** Password. */
- @GridToStringExclude
- private Object password;
-
- /** Additional user object. */
- @GridToStringExclude
- private Object userObj;
-
- /**
- * Empty constructor required by {@link Externalizable}.
- */
- public GridSecurityCredentials() {
- // No-op.
- }
-
- /**
- * Constructs security credentials based on {@code login} and {@code password}.
- *
- * @param login Login.
- * @param password Password.
- */
- public GridSecurityCredentials(String login, String password) {
- this.login = login;
- this.password = password;
- }
-
- /**
- * Constructs security credentials based on {@code login}, {@code password},
- * and custom user object.
- *
- * @param login Login.
- * @param password Password.
- * @param userObj User object.
- */
- public GridSecurityCredentials(String login, String password, @Nullable Object userObj) {
- this.login = login;
- this.password = password;
- this.userObj = userObj;
- }
-
- /**
- * Gets login.
- *
- * @return Login.
- */
- public Object getLogin() {
- return login;
- }
-
- /**
- * Sets login.
- *
- * @param login Login.
- */
- public void setLogin(Object login) {
- this.login = login;
- }
-
- /**
- * Gets password.
- *
- * @return Password.
- */
- public Object getPassword() {
- return password;
- }
-
- /**
- * Sets password.
- *
- * @param password Password.
- */
- public void setPassword(Object password) {
- this.password = password;
- }
-
- /**
- * Gets user-specific object.
- *
- * @return User object.
- */
- @Nullable public Object getUserObject() {
- return userObj;
- }
-
- /**
- * Sets user-specific object.
- *
- * @param userObj User object.
- */
- public void setUserObject(@Nullable Object userObj) {
- this.userObj = userObj;
- }
-
- /** {@inheritDoc} */
- @Override public void writeExternal(ObjectOutput out) throws IOException {
- out.writeObject(login);
- out.writeObject(password);
- out.writeObject(userObj);
- }
-
- /** {@inheritDoc} */
- @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- login = in.readObject();
- password = in.readObject();
- userObj = in.readObject();
- }
-
- /** {@inheritDoc} */
- @Override public boolean equals(Object o) {
- if (this == o)
- return true;
-
- if (!(o instanceof GridSecurityCredentials))
- return false;
-
- GridSecurityCredentials that = (GridSecurityCredentials)o;
-
- return F.eq(login, that.login) && F.eq(password, that.password) && F.eq(userObj, that.userObj);
- }
-
- /** {@inheritDoc} */
- @Override public int hashCode() {
- int res = login != null ? login.hashCode() : 0;
-
- res = 31 * res + (password != null ? password.hashCode() : 0);
- res = 31 * res + (userObj != null ? userObj.hashCode() : 0);
-
- return res;
- }
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return S.toString(GridSecurityCredentials.class, this);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/219a2ee9/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentialsBasicProvider.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentialsBasicProvider.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentialsBasicProvider.java
deleted file mode 100644
index a5f422b..0000000
--- a/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentialsBasicProvider.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.plugin.security;
-
-import org.apache.ignite.*;
-
-/**
- * Basic implementation for {@link GridSecurityCredentialsProvider}. Use it
- * when custom logic for storing security credentials is not required and it
- * is OK to specify credentials directly in configuration.
- */
-public class GridSecurityCredentialsBasicProvider implements GridSecurityCredentialsProvider {
- /** */
- private GridSecurityCredentials cred;
-
- /**
- * Constructs security credentials provider based on security credentials passed in.
- *
- * @param cred Security credentials.
- */
- public GridSecurityCredentialsBasicProvider(GridSecurityCredentials cred) {
- this.cred = cred;
- }
-
- /** {@inheritDoc} */
- @Override public GridSecurityCredentials credentials() throws IgniteCheckedException {
- return cred;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/219a2ee9/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentialsProvider.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentialsProvider.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentialsProvider.java
index b83fe12..499fab6 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentialsProvider.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentialsProvider.java
@@ -26,11 +26,11 @@ import org.apache.ignite.*;
* Getting credentials through {@link GridSecurityCredentialsProvider} abstraction allows
* users to provide custom implementations for storing user names and passwords in their
* environment, possibly in encrypted format. Ignite comes with
- * {@link GridSecurityCredentialsBasicProvider} which simply provides
+ * {@link SecurityCredentialsBasicProvider} which simply provides
* the passed in {@code login} and {@code password} when encryption or custom logic is not required.
* <p>
* In addition to {@code login} and {@code password}, security credentials allow for
- * specifying {@link GridSecurityCredentials#setUserObject(Object) userObject} as well, which can be used
+ * specifying {@link SecurityCredentials#setUserObject(Object) userObject} as well, which can be used
* to pass in any additional information required for authentication.
*/
public interface GridSecurityCredentialsProvider {
@@ -40,5 +40,5 @@ public interface GridSecurityCredentialsProvider {
* @return Security credentials.
* @throws IgniteCheckedException If failed.
*/
- public GridSecurityCredentials credentials() throws IgniteCheckedException;
+ public SecurityCredentials credentials() throws IgniteCheckedException;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/219a2ee9/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentials.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentials.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentials.java
new file mode 100644
index 0000000..58a09ad
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentials.java
@@ -0,0 +1,191 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.plugin.security;
+
+import org.apache.ignite.internal.util.tostring.*;
+import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+import org.jetbrains.annotations.*;
+
+import java.io.*;
+
+/**
+ * Security credentials used for node authentication. Security credentials
+ * are provided by {@link GridSecurityCredentialsProvider} which is specified on
+ * client or node startup in configuration.
+ * <p>
+ * Getting credentials through {@link GridSecurityCredentialsProvider} abstraction allows
+ * users to provide custom implementations for storing user names and passwords in their
+ * environment, possibly in encrypted format. Ignite comes with
+ * {@link SecurityCredentialsBasicProvider} which simply provides
+ * the passed in {@code login} and {@code password} when encryption or custom logic is not required.
+ * <p>
+ * In addition to {@code login} and {@code password}, security credentials allow for
+ * specifying {@link #setUserObject(Object) userObject} as well, which can be used
+ * to pass in any additional information required for authentication.
+ */
+public class SecurityCredentials implements Externalizable {
+ /** */
+ private static final long serialVersionUID = 0L;
+
+ /** Login. */
+ private Object login;
+
+ /** Password. */
+ @GridToStringExclude
+ private Object password;
+
+ /** Additional user object. */
+ @GridToStringExclude
+ private Object userObj;
+
+ /**
+ * Empty constructor required by {@link Externalizable}.
+ */
+ public SecurityCredentials() {
+ // No-op.
+ }
+
+ /**
+ * Constructs security credentials based on {@code login} and {@code password}.
+ *
+ * @param login Login.
+ * @param password Password.
+ */
+ public SecurityCredentials(
+ String login,
+ String password
+ ) {
+ this.login = login;
+ this.password = password;
+ }
+
+ /**
+ * Constructs security credentials based on {@code login}, {@code password},
+ * and custom user object.
+ *
+ * @param login Login.
+ * @param password Password.
+ * @param userObj User object.
+ */
+ public SecurityCredentials(
+ String login,
+ String password,
+ @Nullable Object userObj
+ ) {
+ this.login = login;
+ this.password = password;
+ this.userObj = userObj;
+ }
+
+ /**
+ * Gets login.
+ *
+ * @return Login.
+ */
+ public Object getLogin() {
+ return login;
+ }
+
+ /**
+ * Sets login.
+ *
+ * @param login Login.
+ */
+ public void setLogin(Object login) {
+ this.login = login;
+ }
+
+ /**
+ * Gets password.
+ *
+ * @return Password.
+ */
+ public Object getPassword() {
+ return password;
+ }
+
+ /**
+ * Sets password.
+ *
+ * @param password Password.
+ */
+ public void setPassword(Object password) {
+ this.password = password;
+ }
+
+ /**
+ * Gets user-specific object.
+ *
+ * @return User object.
+ */
+ @Nullable public Object getUserObject() {
+ return userObj;
+ }
+
+ /**
+ * Sets user-specific object.
+ *
+ * @param userObj User object.
+ */
+ public void setUserObject(@Nullable Object userObj) {
+ this.userObj = userObj;
+ }
+
+ /** {@inheritDoc} */
+ @Override public void writeExternal(ObjectOutput out) throws IOException {
+ out.writeObject(login);
+ out.writeObject(password);
+ out.writeObject(userObj);
+ }
+
+ /** {@inheritDoc} */
+ @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+ login = in.readObject();
+ password = in.readObject();
+ userObj = in.readObject();
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean equals(Object o) {
+ if (this == o)
+ return true;
+
+ if (!(o instanceof SecurityCredentials))
+ return false;
+
+ SecurityCredentials that = (SecurityCredentials)o;
+
+ return F.eq(login, that.login) && F.eq(password, that.password) && F.eq(userObj, that.userObj);
+ }
+
+ /** {@inheritDoc} */
+ @Override public int hashCode() {
+ int res = login != null ? login.hashCode() : 0;
+
+ res = 31 * res + (password != null ? password.hashCode() : 0);
+ res = 31 * res + (userObj != null ? userObj.hashCode() : 0);
+
+ return res;
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(SecurityCredentials.class, this);
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/219a2ee9/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentialsBasicProvider.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentialsBasicProvider.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentialsBasicProvider.java
new file mode 100644
index 0000000..5491a5e
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentialsBasicProvider.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.plugin.security;
+
+import org.apache.ignite.*;
+
+/**
+ * Basic implementation for {@link GridSecurityCredentialsProvider}. Use it
+ * when custom logic for storing security credentials is not required and it
+ * is OK to specify credentials directly in configuration.
+ */
+public class SecurityCredentialsBasicProvider implements GridSecurityCredentialsProvider {
+ /** */
+ private SecurityCredentials cred;
+
+ /**
+ * Constructs security credentials provider based on security credentials passed in.
+ *
+ * @param cred Security credentials.
+ */
+ public SecurityCredentialsBasicProvider(SecurityCredentials cred) {
+ this.cred = cred;
+ }
+
+ /** {@inheritDoc} */
+ @Override public SecurityCredentials credentials() throws IgniteCheckedException {
+ return cred;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/219a2ee9/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 421307c..70dc572 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 SecurityContext authenticateNode(ClusterNode node, GridSecurityCredentials cred) throws IgniteException;
+ public SecurityContext authenticateNode(ClusterNode node, SecurityCredentials cred) throws IgniteException;
/**
* Gets global node authentication flag.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/219a2ee9/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 1707666..9b38cad 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
@@ -1262,7 +1262,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
spiState = CONNECTING;
}
- GridSecurityCredentials locCred = (GridSecurityCredentials)locNode.getAttributes()
+ SecurityCredentials locCred = (SecurityCredentials)locNode.getAttributes()
.get(IgniteNodeAttributes.ATTR_SECURITY_CREDENTIALS);
// Marshal credentials for backward compatibility and security.
@@ -1696,7 +1696,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
* @return Security credentials.
* @throws IgniteSpiException If unmarshal fails.
*/
- private GridSecurityCredentials unmarshalCredentials(TcpDiscoveryNode node) throws IgniteSpiException {
+ private SecurityCredentials unmarshalCredentials(TcpDiscoveryNode node) throws IgniteSpiException {
try {
byte[] credBytes = (byte[])node.getAttributes().get(IgniteNodeAttributes.ATTR_SECURITY_CREDENTIALS);
@@ -3125,7 +3125,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
if (nodeAuth != null) {
// Authenticate node first.
try {
- GridSecurityCredentials cred = unmarshalCredentials(node);
+ SecurityCredentials cred = unmarshalCredentials(node);
SecurityContext subj = nodeAuth.authenticateNode(node, cred);
@@ -3472,7 +3472,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
boolean authFailed = true;
try {
- GridSecurityCredentials cred = unmarshalCredentials(node);
+ SecurityCredentials cred = unmarshalCredentials(node);
if (cred == null) {
if (log.isDebugEnabled())
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/219a2ee9/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
----------------------------------------------------------------------
diff --git a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
index 579cf35..9c60c61 100644
--- a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
+++ b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
@@ -453,7 +453,7 @@ public class GridJettyRestHandler extends AbstractHandler {
restReq.command(cmd);
if (params.containsKey("ignite.login") || params.containsKey("ignite.password")) {
- GridSecurityCredentials cred = new GridSecurityCredentials(
+ SecurityCredentials cred = new SecurityCredentials(
(String)params.get("ignite.login"), (String)params.get("ignite.password"));
restReq.credentials(cred);
[3/4] incubator-ignite git commit: sp-3 renaming
Posted by yz...@apache.org.
sp-3 renaming
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/26b5c285
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/26b5c285
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/26b5c285
Branch: refs/heads/ignite-sprint-3
Commit: 26b5c2856cd0d7db950589b13ba3a0928ba340de
Parents: ace5ef6
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Fri Apr 10 14:15:54 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Fri Apr 10 14:15:54 2015 +0300
----------------------------------------------------------------------
.../internal/ComputeTaskInternalFuture.java | 2 +-
.../client/GridClientConfiguration.java | 6 +-
.../router/GridTcpRouterConfiguration.java | 6 +-
.../eventstorage/GridEventStorageManager.java | 4 +-
.../processors/cache/GridCacheAdapter.java | 12 ++--
.../processors/cache/GridCacheContext.java | 6 +-
.../dht/atomic/GridDhtAtomicCache.java | 6 +-
.../dht/colocated/GridDhtColocatedCache.java | 3 +-
.../distributed/near/GridNearAtomicCache.java | 2 +-
.../near/GridNearTransactionalCache.java | 2 +-
.../local/atomic/GridLocalAtomicCache.java | 6 +-
.../cache/query/GridCacheQueryAdapter.java | 2 +-
.../continuous/CacheContinuousQueryManager.java | 2 +-
.../transactions/IgniteTxLocalAdapter.java | 6 +-
.../processors/rest/GridRestProcessor.java | 19 +++---
.../security/GridSecurityProcessor.java | 7 +-
.../processors/security/SecurityContext.java | 6 +-
.../security/os/GridOsSecurityProcessor.java | 5 +-
.../processors/task/GridTaskProcessor.java | 3 +-
.../GridSecurityCredentialsProvider.java | 44 -------------
.../plugin/security/GridSecurityException.java | 58 ----------------
.../plugin/security/GridSecurityPermission.java | 69 --------------------
.../plugin/security/SecurityCredentials.java | 6 +-
.../SecurityCredentialsBasicProvider.java | 4 +-
.../security/SecurityCredentialsProvider.java | 44 +++++++++++++
.../plugin/security/SecurityException.java | 61 +++++++++++++++++
.../plugin/security/SecurityPermission.java | 69 ++++++++++++++++++++
.../plugin/security/SecurityPermissionSet.java | 6 +-
.../ignite/plugin/security/SecuritySubject.java | 4 +-
.../junits/spi/GridSpiAbstractTest.java | 7 +-
30 files changed, 240 insertions(+), 237 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26b5c285/modules/core/src/main/java/org/apache/ignite/internal/ComputeTaskInternalFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/ComputeTaskInternalFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/ComputeTaskInternalFuture.java
index 219cf1b..a76c17b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/ComputeTaskInternalFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/ComputeTaskInternalFuture.java
@@ -218,7 +218,7 @@ public class ComputeTaskInternalFuture<R> extends GridFutureAdapter<R> {
/** {@inheritDoc} */
@Override public boolean cancel() throws IgniteCheckedException {
- ctx.security().authorize(ses.getTaskName(), GridSecurityPermission.TASK_CANCEL, null);
+ ctx.security().authorize(ses.getTaskName(), SecurityPermission.TASK_CANCEL, null);
if (onCancelled()) {
ctx.task().onCancelled(ses.getId());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26b5c285/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java
index 1b2389a..3d01afa 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java
@@ -104,7 +104,7 @@ public class GridClientConfiguration {
private Map<String, GridClientDataConfiguration> dataCfgs = Collections.emptyMap();
/** Credentials. */
- private GridSecurityCredentialsProvider credProvider;
+ private SecurityCredentialsProvider credProvider;
/** Executor. */
private ExecutorService executor;
@@ -347,7 +347,7 @@ public class GridClientConfiguration {
*
* @return Credentials provider.
*/
- public GridSecurityCredentialsProvider getSecurityCredentialsProvider() {
+ public SecurityCredentialsProvider getSecurityCredentialsProvider() {
return credProvider;
}
@@ -356,7 +356,7 @@ public class GridClientConfiguration {
*
* @param credProvider Client credentials provider.
*/
- public void setSecurityCredentialsProvider(GridSecurityCredentialsProvider credProvider) {
+ public void setSecurityCredentialsProvider(SecurityCredentialsProvider credProvider) {
this.credProvider = credProvider;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26b5c285/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouterConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouterConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouterConfiguration.java
index 9e3c22a..711333c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouterConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouterConfiguration.java
@@ -83,7 +83,7 @@ public class GridTcpRouterConfiguration {
private IgniteLogger log;
/** Credentials. */
- private GridSecurityCredentialsProvider credsProvider;
+ private SecurityCredentialsProvider credsProvider;
/**
* Gets TCP host or IP address for router to bind to.
@@ -197,7 +197,7 @@ public class GridTcpRouterConfiguration {
*
* @return Credentials.
*/
- @Nullable public GridSecurityCredentialsProvider getSecurityCredentialsProvider() {
+ @Nullable public SecurityCredentialsProvider getSecurityCredentialsProvider() {
return credsProvider;
}
@@ -295,7 +295,7 @@ public class GridTcpRouterConfiguration {
*
* @param credsProvider Credentials provider.
*/
- public void setSecurityCredentialsProvider(GridSecurityCredentialsProvider credsProvider) {
+ public void setSecurityCredentialsProvider(SecurityCredentialsProvider credsProvider) {
this.credsProvider = credsProvider;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26b5c285/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
index e8c9396..3e41a6a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
@@ -303,7 +303,7 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi>
public synchronized void enableEvents(int[] types) {
assert types != null;
- ctx.security().authorize(null, GridSecurityPermission.EVENTS_ENABLE, null);
+ ctx.security().authorize(null, SecurityPermission.EVENTS_ENABLE, null);
boolean[] userRecordableEvts0 = userRecordableEvts;
boolean[] recordableEvts0 = recordableEvts;
@@ -346,7 +346,7 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi>
public synchronized void disableEvents(int[] types) {
assert types != null;
- ctx.security().authorize(null, GridSecurityPermission.EVENTS_DISABLE, null);
+ ctx.security().authorize(null, SecurityPermission.EVENTS_DISABLE, null);
boolean[] userRecordableEvts0 = userRecordableEvts;
boolean[] recordableEvts0 = recordableEvts;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26b5c285/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 45c449b..30e3bc7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -624,7 +624,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
@Override public Iterable<Cache.Entry<K, V>> localEntries(CachePeekMode[] peekModes) throws IgniteCheckedException {
assert peekModes != null;
- ctx.checkSecurity(GridSecurityPermission.CACHE_READ);
+ ctx.checkSecurity(SecurityPermission.CACHE_READ);
PeekModes modes = parsePeekModes(peekModes, false);
@@ -685,7 +685,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
if (keyCheck)
validateCacheKey(key);
- ctx.checkSecurity(GridSecurityPermission.CACHE_READ);
+ ctx.checkSecurity(SecurityPermission.CACHE_READ);
PeekModes modes = parsePeekModes(peekModes, false);
@@ -1073,7 +1073,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
/** {@inheritDoc} */
@Override public void clearLocally() {
- ctx.checkSecurity(GridSecurityPermission.CACHE_REMOVE);
+ ctx.checkSecurity(SecurityPermission.CACHE_REMOVE);
List<GridCacheClearAllRunnable<K, V>> jobs = splitClearLocally();
@@ -1741,7 +1741,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
@Nullable IgniteCacheExpiryPolicy expiry,
final boolean skipVals
) {
- ctx.checkSecurity(GridSecurityPermission.CACHE_READ);
+ ctx.checkSecurity(SecurityPermission.CACHE_READ);
if (keyCheck)
validateCacheKeys(keys);
@@ -4466,7 +4466,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
*/
public void clearLocally0(Collection<? extends K> keys,
@Nullable CacheEntryPredicate... filter) {
- ctx.checkSecurity(GridSecurityPermission.CACHE_REMOVE);
+ ctx.checkSecurity(SecurityPermission.CACHE_REMOVE);
if (F.isEmpty(keys))
return;
@@ -4491,7 +4491,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
if (keyCheck)
validateCacheKey(key);
- ctx.checkSecurity(GridSecurityPermission.CACHE_REMOVE);
+ ctx.checkSecurity(SecurityPermission.CACHE_REMOVE);
return clearLocally(ctx.versions().next(), key, filter);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26b5c285/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
index 9076fc2..952ece2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
@@ -55,6 +55,7 @@ import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.marshaller.*;
import org.apache.ignite.plugin.security.*;
+import org.apache.ignite.plugin.security.SecurityException;
import org.jetbrains.annotations.*;
import javax.cache.*;
@@ -68,7 +69,6 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*;
import static org.apache.ignite.cache.CacheMemoryMode.*;
import static org.apache.ignite.cache.CacheRebalanceMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
-import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
/**
* Cache context.
@@ -670,9 +670,9 @@ public class GridCacheContext<K, V> implements Externalizable {
/**
* @param op Operation to check.
- * @throws GridSecurityException If security check failed.
+ * @throws SecurityException If security check failed.
*/
- public void checkSecurity(GridSecurityPermission op) throws GridSecurityException {
+ public void checkSecurity(SecurityPermission op) throws SecurityException {
if (CU.isSystemCache(name()))
return;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26b5c285/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index be9a963..026d2c5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -270,7 +270,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
final boolean deserializePortable,
final boolean skipVals
) {
- ctx.checkSecurity(GridSecurityPermission.CACHE_READ);
+ ctx.checkSecurity(SecurityPermission.CACHE_READ);
if (F.isEmpty(keys))
return new GridFinishedFuture<>(Collections.<K, V>emptyMap());
@@ -781,7 +781,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
if (map != null && keyCheck)
validateCacheKeys(map.keySet());
- ctx.checkSecurity(GridSecurityPermission.CACHE_PUT);
+ ctx.checkSecurity(SecurityPermission.CACHE_PUT);
GridCacheProjectionImpl<K, V> prj = ctx.projectionPerCall();
@@ -842,7 +842,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
if (keyCheck)
validateCacheKeys(keys);
- ctx.checkSecurity(GridSecurityPermission.CACHE_REMOVE);
+ ctx.checkSecurity(SecurityPermission.CACHE_REMOVE);
GridCacheProjectionImpl<K, V> prj = ctx.projectionPerCall();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26b5c285/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
index a9026b0..b246442 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
@@ -18,7 +18,6 @@
package org.apache.ignite.internal.processors.cache.distributed.dht.colocated;
import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.cluster.*;
@@ -156,7 +155,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
final boolean deserializePortable,
final boolean skipVals
) {
- ctx.checkSecurity(GridSecurityPermission.CACHE_READ);
+ ctx.checkSecurity(SecurityPermission.CACHE_READ);
if (F.isEmpty(keys))
return new GridFinishedFuture<>(Collections.<K, V>emptyMap());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26b5c285/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
index 6069849..429dee3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
@@ -364,7 +364,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> {
boolean deserializePortable,
boolean skipVals
) {
- ctx.checkSecurity(GridSecurityPermission.CACHE_READ);
+ ctx.checkSecurity(SecurityPermission.CACHE_READ);
if (F.isEmpty(keys))
return new GridFinishedFuture<>(Collections.<K, V>emptyMap());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26b5c285/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java
index 44ff756..bfd0177 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java
@@ -103,7 +103,7 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K, V>
final boolean deserializePortable,
final boolean skipVals
) {
- ctx.checkSecurity(GridSecurityPermission.CACHE_READ);
+ ctx.checkSecurity(SecurityPermission.CACHE_READ);
if (F.isEmpty(keys))
return new GridFinishedFuture<>(Collections.<K, V>emptyMap());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26b5c285/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
index 204baf0..1911300 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
@@ -519,7 +519,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
boolean deserializePortable,
boolean skipVals
) throws IgniteCheckedException {
- ctx.checkSecurity(GridSecurityPermission.CACHE_READ);
+ ctx.checkSecurity(SecurityPermission.CACHE_READ);
if (F.isEmpty(keys))
return Collections.emptyMap();
@@ -853,9 +853,9 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
validateCacheKeys(keys);
if (op == DELETE)
- ctx.checkSecurity(GridSecurityPermission.CACHE_REMOVE);
+ ctx.checkSecurity(SecurityPermission.CACHE_REMOVE);
else
- ctx.checkSecurity(GridSecurityPermission.CACHE_PUT);
+ ctx.checkSecurity(SecurityPermission.CACHE_PUT);
String taskName = ctx.kernalContext().job().currentTaskName();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26b5c285/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
index d4af0b4..4b1fc87 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
@@ -395,7 +395,7 @@ public class GridCacheQueryAdapter<T> implements CacheQuery<T> {
@Nullable IgniteClosure<T, R> rmtTransform, @Nullable Object... args) {
Collection<ClusterNode> nodes = nodes();
- cctx.checkSecurity(GridSecurityPermission.CACHE_READ);
+ cctx.checkSecurity(SecurityPermission.CACHE_READ);
if (nodes.isEmpty())
return new GridCacheQueryErrorFuture<>(cctx.kernalContext(), new ClusterGroupEmptyCheckedException());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26b5c285/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
index 13d29bf..759a949 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
@@ -360,7 +360,7 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter {
private UUID executeQuery0(CacheEntryUpdatedListener locLsnr, final CacheEntryEventSerializableFilter rmtFilter,
int bufSize, long timeInterval, boolean autoUnsubscribe, boolean internal, boolean notifyExisting,
boolean oldValRequired, boolean sync, boolean ignoreExpired, ClusterGroup grp) throws IgniteCheckedException {
- cctx.checkSecurity(GridSecurityPermission.CACHE_READ);
+ cctx.checkSecurity(SecurityPermission.CACHE_READ);
if (grp == null)
grp = cctx.kernalContext().grid().cluster();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26b5c285/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
index 3aa2f4b..29eabf3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
@@ -1136,7 +1136,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter
assert keysCnt == keys.size();
assert cached == null || F.first(keys).equals(cached.key());
- cacheCtx.checkSecurity(GridSecurityPermission.CACHE_READ);
+ cacheCtx.checkSecurity(SecurityPermission.CACHE_READ);
groupLockSanityCheck(cacheCtx, keys);
@@ -2524,7 +2524,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter
) {
assert filter == null || invokeMap == null;
- cacheCtx.checkSecurity(GridSecurityPermission.CACHE_PUT);
+ cacheCtx.checkSecurity(SecurityPermission.CACHE_PUT);
if (retval)
needReturnValue(true);
@@ -2744,7 +2744,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter
@Nullable GridCacheEntryEx cached,
final boolean retval,
@Nullable final CacheEntryPredicate[] filter) {
- cacheCtx.checkSecurity(GridSecurityPermission.CACHE_REMOVE);
+ cacheCtx.checkSecurity(SecurityPermission.CACHE_REMOVE);
if (retval)
needReturnValue(true);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26b5c285/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 8562b8e..917a8e3 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
@@ -38,6 +38,7 @@ import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.internal.util.worker.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.plugin.security.*;
+import org.apache.ignite.plugin.security.SecurityException;
import org.jsr166.*;
import java.lang.reflect.*;
@@ -175,7 +176,7 @@ public class GridRestProcessor extends GridProcessorAdapter {
authorize(req, subjCtx);
}
- catch (GridSecurityException e) {
+ catch (SecurityException e) {
assert subjCtx != null;
GridRestResponse res = new GridRestResponse(STATUS_SECURITY_CHECK_FAILED, e.getMessage());
@@ -514,16 +515,16 @@ public class GridRestProcessor extends GridProcessorAdapter {
/**
* @param req REST request.
* @param sCtx Security context.
- * @throws GridSecurityException If authorization failed.
+ * @throws SecurityException If authorization failed.
*/
- private void authorize(GridRestRequest req, SecurityContext sCtx) throws GridSecurityException {
- GridSecurityPermission perm = null;
+ private void authorize(GridRestRequest req, SecurityContext sCtx) throws SecurityException {
+ SecurityPermission perm = null;
String name = null;
switch (req.command()) {
case CACHE_GET:
case CACHE_GET_ALL:
- perm = GridSecurityPermission.CACHE_READ;
+ perm = SecurityPermission.CACHE_READ;
name = ((GridRestCacheRequest)req).cacheName();
break;
@@ -531,7 +532,7 @@ public class GridRestProcessor extends GridProcessorAdapter {
case CACHE_QUERY_EXECUTE:
case CACHE_QUERY_FETCH:
case CACHE_QUERY_REBUILD_INDEXES:
- perm = GridSecurityPermission.CACHE_READ;
+ perm = SecurityPermission.CACHE_READ;
name = ((GridRestCacheQueryRequest)req).cacheName();
break;
@@ -543,21 +544,21 @@ public class GridRestProcessor extends GridProcessorAdapter {
case CACHE_CAS:
case CACHE_APPEND:
case CACHE_PREPEND:
- perm = GridSecurityPermission.CACHE_PUT;
+ perm = SecurityPermission.CACHE_PUT;
name = ((GridRestCacheRequest)req).cacheName();
break;
case CACHE_REMOVE:
case CACHE_REMOVE_ALL:
- perm = GridSecurityPermission.CACHE_REMOVE;
+ perm = SecurityPermission.CACHE_REMOVE;
name = ((GridRestCacheRequest)req).cacheName();
break;
case EXE:
case RESULT:
- perm = GridSecurityPermission.TASK_EXECUTE;
+ perm = SecurityPermission.TASK_EXECUTE;
name = ((GridRestTaskRequest)req).taskName();
break;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26b5c285/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 1a94562..1a32f56 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
@@ -21,6 +21,7 @@ import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.internal.processors.*;
import org.apache.ignite.plugin.security.*;
+import org.apache.ignite.plugin.security.SecurityException;
import org.jetbrains.annotations.*;
import java.util.*;
@@ -78,10 +79,10 @@ public interface GridSecurityProcessor extends GridProcessor {
* @param name Cache name or task class name.
* @param perm Permission to authorize.
* @param securityCtx Optional security context.
- * @throws GridSecurityException If security check failed.
+ * @throws SecurityException If security check failed.
*/
- public void authorize(String name, GridSecurityPermission perm, @Nullable SecurityContext securityCtx)
- throws GridSecurityException;
+ public void authorize(String name, SecurityPermission perm, @Nullable SecurityContext securityCtx)
+ throws SecurityException;
/**
* Callback invoked when subject session got expired.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26b5c285/modules/core/src/main/java/org/apache/ignite/internal/processors/security/SecurityContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/security/SecurityContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/security/SecurityContext.java
index 6ad4874..3151f68 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/security/SecurityContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/security/SecurityContext.java
@@ -35,7 +35,7 @@ public interface SecurityContext {
* @param perm Permission to check.
* @return {@code True} if task operation is allowed.
*/
- public boolean taskOperationAllowed(String taskClsName, GridSecurityPermission perm);
+ public boolean taskOperationAllowed(String taskClsName, SecurityPermission perm);
/**
* Checks whether cache operation is allowed.
@@ -44,7 +44,7 @@ public interface SecurityContext {
* @param perm Permission to check.
* @return {@code True} if cache operation is allowed.
*/
- public boolean cacheOperationAllowed(String cacheName, GridSecurityPermission perm);
+ public boolean cacheOperationAllowed(String cacheName, SecurityPermission perm);
/**
* Checks whether system-wide permission is allowed (excluding Visor task operations).
@@ -52,5 +52,5 @@ public interface SecurityContext {
* @param perm Permission to check.
* @return {@code True} if system operation is allowed.
*/
- public boolean systemOperationAllowed(GridSecurityPermission perm);
+ public boolean systemOperationAllowed(SecurityPermission perm);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26b5c285/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 15cffa0..4b81041 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
@@ -23,6 +23,7 @@ import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.*;
import org.apache.ignite.internal.processors.security.*;
import org.apache.ignite.plugin.security.*;
+import org.apache.ignite.plugin.security.SecurityException;
import org.jetbrains.annotations.*;
import java.util.*;
@@ -65,8 +66,8 @@ public class GridOsSecurityProcessor extends GridProcessorAdapter implements Gri
}
/** {@inheritDoc} */
- @Override public void authorize(String name, GridSecurityPermission perm, @Nullable SecurityContext securityCtx)
- throws GridSecurityException {
+ @Override public void authorize(String name, SecurityPermission perm, @Nullable SecurityContext securityCtx)
+ throws SecurityException {
// No-op.
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26b5c285/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
index 0dce4ad..8b531a4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
@@ -18,7 +18,6 @@
package org.apache.ignite.internal.processors.task;
import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.compute.*;
import org.apache.ignite.events.*;
@@ -419,7 +418,7 @@ public class GridTaskProcessor extends GridProcessorAdapter {
else
taskClsName = taskCls != null ? taskCls.getName() : taskName;
- ctx.security().authorize(taskClsName, GridSecurityPermission.TASK_EXECUTE, null);
+ ctx.security().authorize(taskClsName, SecurityPermission.TASK_EXECUTE, null);
// Get values from thread-local context.
Map<GridTaskThreadContextKey, Object> map = thCtx.get();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26b5c285/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentialsProvider.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentialsProvider.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentialsProvider.java
deleted file mode 100644
index 499fab6..0000000
--- a/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentialsProvider.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.plugin.security;
-
-import org.apache.ignite.*;
-
-/**
- * Security credentials provider for specifying security credentials.
- * Security credentials used for client or node authentication.
- * <p>
- * Getting credentials through {@link GridSecurityCredentialsProvider} abstraction allows
- * users to provide custom implementations for storing user names and passwords in their
- * environment, possibly in encrypted format. Ignite comes with
- * {@link SecurityCredentialsBasicProvider} which simply provides
- * the passed in {@code login} and {@code password} when encryption or custom logic is not required.
- * <p>
- * In addition to {@code login} and {@code password}, security credentials allow for
- * specifying {@link SecurityCredentials#setUserObject(Object) userObject} as well, which can be used
- * to pass in any additional information required for authentication.
- */
-public interface GridSecurityCredentialsProvider {
- /**
- * Gets security credentials.
- *
- * @return Security credentials.
- * @throws IgniteCheckedException If failed.
- */
- public SecurityCredentials credentials() throws IgniteCheckedException;
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26b5c285/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityException.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityException.java
deleted file mode 100644
index ffd9c85..0000000
--- a/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityException.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.plugin.security;
-
-import org.apache.ignite.*;
-import org.jetbrains.annotations.*;
-
-/**
- * Common security exception for the grid.
- */
-public class GridSecurityException extends IgniteException {
- /** */
- private static final long serialVersionUID = 0L;
-
- /**
- * Constructs security grid exception with given message and cause.
- *
- * @param msg Exception message.
- * @param cause Exception cause.
- */
- public GridSecurityException(String msg, @Nullable Throwable cause) {
- super(msg, cause);
- }
-
- /**
- * Creates new security grid exception given throwable as a cause and
- * source of error message.
- *
- * @param cause Non-null throwable cause.
- */
- public GridSecurityException(Throwable cause) {
- this(cause.getMessage(), cause);
- }
-
- /**
- * Constructs security grid exception with given message.
- *
- * @param msg Exception message.
- */
- public GridSecurityException(String msg) {
- super(msg);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26b5c285/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityPermission.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityPermission.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityPermission.java
deleted file mode 100644
index 6662093..0000000
--- a/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityPermission.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.plugin.security;
-
-import org.jetbrains.annotations.*;
-
-/**
- * Supported security permissions within grid. Permissions
- * are specified on per-cache or per-task level.
- */
-public enum GridSecurityPermission {
- /** Cache {@code read} permission. */
- CACHE_READ,
-
- /** Cache {@code put} permission. */
- CACHE_PUT,
-
- /** Cache {@code remove} permission. */
- CACHE_REMOVE,
-
- /** Task {@code execute} permission. */
- TASK_EXECUTE,
-
- /** Task {@code cancel} permission. */
- TASK_CANCEL,
-
- /** Events {@code enable} permission. */
- EVENTS_ENABLE,
-
- /** Events {@code disable} permission. */
- EVENTS_DISABLE,
-
- /** Common visor tasks permission. */
- ADMIN_VIEW,
-
- /** Visor cache read (query) permission. */
- ADMIN_QUERY,
-
- /** Visor cache load permission. */
- ADMIN_CACHE;
-
- /** Enumerated values. */
- private static final GridSecurityPermission[] VALS = values();
-
- /**
- * Efficiently gets enumerated value from its ordinal.
- *
- * @param ord Ordinal value.
- * @return Enumerated value or {@code null} if ordinal out of range.
- */
- @Nullable public static GridSecurityPermission fromOrdinal(int ord) {
- return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26b5c285/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentials.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentials.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentials.java
index 58a09ad..f3b0e24 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentials.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentials.java
@@ -26,10 +26,10 @@ import java.io.*;
/**
* Security credentials used for node authentication. Security credentials
- * are provided by {@link GridSecurityCredentialsProvider} which is specified on
- * client or node startup in configuration.
+ * are provided by {@link SecurityCredentialsProvider} which is specified on
+ * node startup in configuration.
* <p>
- * Getting credentials through {@link GridSecurityCredentialsProvider} abstraction allows
+ * Getting credentials through {@link SecurityCredentialsProvider} abstraction allows
* users to provide custom implementations for storing user names and passwords in their
* environment, possibly in encrypted format. Ignite comes with
* {@link SecurityCredentialsBasicProvider} which simply provides
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26b5c285/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentialsBasicProvider.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentialsBasicProvider.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentialsBasicProvider.java
index 5491a5e..90b3352 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentialsBasicProvider.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentialsBasicProvider.java
@@ -20,11 +20,11 @@ package org.apache.ignite.plugin.security;
import org.apache.ignite.*;
/**
- * Basic implementation for {@link GridSecurityCredentialsProvider}. Use it
+ * Basic implementation for {@link SecurityCredentialsProvider}. Use it
* when custom logic for storing security credentials is not required and it
* is OK to specify credentials directly in configuration.
*/
-public class SecurityCredentialsBasicProvider implements GridSecurityCredentialsProvider {
+public class SecurityCredentialsBasicProvider implements SecurityCredentialsProvider {
/** */
private SecurityCredentials cred;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26b5c285/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentialsProvider.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentialsProvider.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentialsProvider.java
new file mode 100644
index 0000000..4f65437
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityCredentialsProvider.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.plugin.security;
+
+import org.apache.ignite.*;
+
+/**
+ * Security credentials provider for specifying security credentials.
+ * Security credentials used for node authentication.
+ * <p>
+ * Getting credentials through {@link SecurityCredentialsProvider} abstraction allows
+ * users to provide custom implementations for storing user names and passwords in their
+ * environment, possibly in encrypted format. Ignite comes with
+ * {@link SecurityCredentialsBasicProvider} which simply provides
+ * the passed in {@code login} and {@code password} when encryption or custom logic is not required.
+ * <p>
+ * In addition to {@code login} and {@code password}, security credentials allow for
+ * specifying {@link SecurityCredentials#setUserObject(Object) userObject} as well, which can be used
+ * to pass in any additional information required for authentication.
+ */
+public interface SecurityCredentialsProvider {
+ /**
+ * Gets security credentials.
+ *
+ * @return Security credentials.
+ * @throws IgniteCheckedException If failed.
+ */
+ public SecurityCredentials credentials() throws IgniteCheckedException;
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26b5c285/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityException.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityException.java
new file mode 100644
index 0000000..84fa5a4
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityException.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.plugin.security;
+
+import org.apache.ignite.*;
+import org.jetbrains.annotations.*;
+
+/**
+ * Common security exception for the grid.
+ */
+public class SecurityException extends IgniteException {
+ /** */
+ private static final long serialVersionUID = 0L;
+
+ /**
+ * Constructs security grid exception with given message and cause.
+ *
+ * @param msg Exception message.
+ * @param cause Exception cause.
+ */
+ public SecurityException(
+ String msg,
+ @Nullable Throwable cause
+ ) {
+ super(msg, cause);
+ }
+
+ /**
+ * Creates new security grid exception given throwable as a cause and
+ * source of error message.
+ *
+ * @param cause Non-null throwable cause.
+ */
+ public SecurityException(Throwable cause) {
+ this(cause.getMessage(), cause);
+ }
+
+ /**
+ * Constructs security grid exception with given message.
+ *
+ * @param msg Exception message.
+ */
+ public SecurityException(String msg) {
+ super(msg);
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26b5c285/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityPermission.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityPermission.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityPermission.java
new file mode 100644
index 0000000..3cab511
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityPermission.java
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.plugin.security;
+
+import org.jetbrains.annotations.*;
+
+/**
+ * Supported security permissions within grid. Permissions
+ * are specified on per-cache or per-task level.
+ */
+public enum SecurityPermission {
+ /** Cache {@code read} permission. */
+ CACHE_READ,
+
+ /** Cache {@code put} permission. */
+ CACHE_PUT,
+
+ /** Cache {@code remove} permission. */
+ CACHE_REMOVE,
+
+ /** Task {@code execute} permission. */
+ TASK_EXECUTE,
+
+ /** Task {@code cancel} permission. */
+ TASK_CANCEL,
+
+ /** Events {@code enable} permission. */
+ EVENTS_ENABLE,
+
+ /** Events {@code disable} permission. */
+ EVENTS_DISABLE,
+
+ /** Common visor tasks permission. */
+ ADMIN_VIEW,
+
+ /** Visor cache read (query) permission. */
+ ADMIN_QUERY,
+
+ /** Visor cache load permission. */
+ ADMIN_CACHE;
+
+ /** Enumerated values. */
+ private static final SecurityPermission[] VALS = values();
+
+ /**
+ * Efficiently gets enumerated value from its ordinal.
+ *
+ * @param ord Ordinal value.
+ * @return Enumerated value or {@code null} if ordinal out of range.
+ */
+ @Nullable public static SecurityPermission fromOrdinal(int ord) {
+ return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26b5c285/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityPermissionSet.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityPermissionSet.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityPermissionSet.java
index 2a84778..aa5a139 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityPermissionSet.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityPermissionSet.java
@@ -47,7 +47,7 @@ public interface SecurityPermissionSet extends Serializable {
*
* @return Map of task names to task permissions.
*/
- public Map<String, Collection<GridSecurityPermission>> taskPermissions();
+ public Map<String, Collection<SecurityPermission>> taskPermissions();
/**
* Map of cache names to cache permissions. Wildcards are allowed at the
@@ -55,12 +55,12 @@ public interface SecurityPermissionSet extends Serializable {
*
* @return Map of cache names to cache permissions.
*/
- public Map<String, Collection<GridSecurityPermission>> cachePermissions();
+ public Map<String, Collection<SecurityPermission>> cachePermissions();
/**
* Collection of system-wide permissions (events enable/disable, Visor task execution).
*
* @return Collection of system-wide permissions.
*/
- @Nullable public Collection<GridSecurityPermission> systemPermissions();
+ @Nullable public Collection<SecurityPermission> systemPermissions();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26b5c285/modules/core/src/main/java/org/apache/ignite/plugin/security/SecuritySubject.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecuritySubject.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecuritySubject.java
index f8c2cdb..d14666f 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecuritySubject.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecuritySubject.java
@@ -22,7 +22,7 @@ import java.net.*;
import java.util.*;
/**
- * Security subject representing authenticated node or client with a set of permissions.
+ * Security subject representing authenticated node with a set of permissions.
*/
public interface SecuritySubject extends Serializable {
/**
@@ -33,7 +33,7 @@ public interface SecuritySubject extends Serializable {
public UUID id();
/**
- * Gets subject type, either node or client.
+ * Gets subject type for node.
*
* @return Subject type.
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26b5c285/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 eafd62a..bc6b4cb 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
@@ -39,7 +39,6 @@ import org.jetbrains.annotations.*;
import java.io.*;
import java.lang.reflect.*;
-import java.net.*;
import java.util.*;
import java.util.concurrent.*;
@@ -699,17 +698,17 @@ public abstract class GridSpiAbstractTest<T extends IgniteSpi> extends GridAbstr
}
/** {@inheritDoc} */
- @Override public Map<String, Collection<GridSecurityPermission>> taskPermissions() {
+ @Override public Map<String, Collection<SecurityPermission>> taskPermissions() {
return Collections.emptyMap();
}
/** {@inheritDoc} */
- @Override public Map<String, Collection<GridSecurityPermission>> cachePermissions() {
+ @Override public Map<String, Collection<SecurityPermission>> cachePermissions() {
return Collections.emptyMap();
}
/** {@inheritDoc} */
- @Nullable @Override public Collection<GridSecurityPermission> systemPermissions() {
+ @Nullable @Override public Collection<SecurityPermission> systemPermissions() {
return null;
}
}
[4/4] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-sprint-3' into ignite-sprint-3
Posted by yz...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/674635f4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/674635f4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/674635f4
Branch: refs/heads/ignite-sprint-3
Commit: 674635f4ba051294315eaf024ebbcc48c6ae0d2b
Parents: 26b5c28 566bef0
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Fri Apr 10 14:21:22 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Fri Apr 10 14:21:22 2015 +0300
----------------------------------------------------------------------
bin/ignitevisorcmd.bat | 39 ++--
modules/core/pom.xml | 2 +-
.../configuration/CacheConfiguration.java | 68 +++---
.../ignite/internal/GridJobExecuteRequest.java | 10 +-
.../ignite/internal/GridJobExecuteResponse.java | 4 +-
.../apache/ignite/internal/GridTaskMessage.java | 30 ---
.../ignite/internal/GridTaskSessionRequest.java | 6 +-
.../internal/cluster/ClusterGroupAdapter.java | 150 +++++++++++--
.../internal/processors/igfs/IgfsAsyncImpl.java | 4 +-
.../ignite/internal/processors/igfs/IgfsEx.java | 4 +-
.../processors/igfs/IgfsFileWorker.java | 180 ---------------
.../processors/igfs/IgfsFileWorkerBatch.java | 225 ++++++++-----------
.../processors/igfs/IgfsFileWorkerTask.java | 32 ---
.../internal/processors/igfs/IgfsImpl.java | 150 ++++++++-----
.../internal/processors/igfs/IgfsProcessor.java | 2 +-
.../processors/task/GridTaskProcessor.java | 6 -
.../visor/cache/VisorCacheClearTask.java | 3 +
.../internal/visor/log/VisorLogSearchTask.java | 12 +-
.../node/VisorNodeEventsCollectorTask.java | 3 +
.../internal/visor/util/VisorTaskUtils.java | 3 +
.../startup/cmdline/CommandLineStartup.java | 7 +-
.../ignite/internal/GridProjectionSelfTest.java | 82 +++++++
.../processors/igfs/IgfsAbstractSelfTest.java | 16 +-
.../HadoopDefaultMapReducePlannerSelfTest.java | 2 +-
.../ignite/tools/classgen/ClassesGenerator.java | 2 +-
.../ignite/visor/commands/VisorConsole.scala | 19 ++
26 files changed, 527 insertions(+), 534 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/674635f4/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
----------------------------------------------------------------------
[2/4] incubator-ignite git commit: sp-3 renaming
Posted by yz...@apache.org.
sp-3 renaming
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ace5ef68
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ace5ef68
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ace5ef68
Branch: refs/heads/ignite-sprint-3
Commit: ace5ef688a94d5fb9b38c85a84b2d1970af4e641
Parents: 219a2ee
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Fri Apr 10 14:05:04 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Fri Apr 10 14:05:04 2015 +0300
----------------------------------------------------------------------
.../internal/managers/GridManagerAdapter.java | 4 +-
.../processors/rest/GridRestProcessor.java | 2 +-
.../security/GridSecurityProcessor.java | 4 +-
.../processors/security/SecurityContext.java | 2 +-
.../security/os/GridOsSecurityProcessor.java | 4 +-
.../plugin/security/AuthenticationContext.java | 6 +-
.../security/GridSecurityPermissionSet.java | 66 --------------------
.../plugin/security/GridSecuritySubject.java | 62 ------------------
.../security/GridSecuritySubjectType.java | 48 --------------
.../plugin/security/SecurityPermissionSet.java | 66 ++++++++++++++++++++
.../ignite/plugin/security/SecuritySubject.java | 62 ++++++++++++++++++
.../plugin/security/SecuritySubjectType.java | 48 ++++++++++++++
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 4 +-
.../org/apache/ignite/spi/IgniteSpiContext.java | 4 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 4 +-
.../testframework/GridSpiTestContext.java | 4 +-
.../junits/spi/GridSpiAbstractTest.java | 59 +----------------
17 files changed, 198 insertions(+), 251 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ace5ef68/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
index c478d28..a0521c8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
@@ -490,7 +490,7 @@ public abstract class GridManagerAdapter<T extends IgniteSpi> implements GridMan
return null;
}
- @Override public Collection<GridSecuritySubject> authenticatedSubjects() {
+ @Override public Collection<SecuritySubject> authenticatedSubjects() {
try {
return ctx.security().authenticatedSubjects();
}
@@ -499,7 +499,7 @@ public abstract class GridManagerAdapter<T extends IgniteSpi> implements GridMan
}
}
- @Override public GridSecuritySubject authenticatedSubject(UUID subjId) {
+ @Override public SecuritySubject authenticatedSubject(UUID subjId) {
try {
return ctx.security().authenticatedSubject(subjId);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ace5ef68/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 ab5ef78..8562b8e 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
@@ -45,7 +45,7 @@ import java.util.*;
import java.util.concurrent.*;
import static org.apache.ignite.internal.processors.rest.GridRestResponse.*;
-import static org.apache.ignite.plugin.security.GridSecuritySubjectType.*;
+import static org.apache.ignite.plugin.security.SecuritySubjectType.*;
/**
* Rest processor implementation.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ace5ef68/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 bd36828..1a94562 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
@@ -61,7 +61,7 @@ public interface GridSecurityProcessor extends GridProcessor {
* @return Collection of authenticated nodes.
* @throws IgniteCheckedException If error occurred.
*/
- public Collection<GridSecuritySubject> authenticatedSubjects() throws IgniteCheckedException;
+ public Collection<SecuritySubject> authenticatedSubjects() throws IgniteCheckedException;
/**
* Gets authenticated node subject.
@@ -70,7 +70,7 @@ public interface GridSecurityProcessor extends GridProcessor {
* @return Security subject.
* @throws IgniteCheckedException If error occurred.
*/
- public GridSecuritySubject authenticatedSubject(UUID subjId) throws IgniteCheckedException;
+ public SecuritySubject authenticatedSubject(UUID subjId) throws IgniteCheckedException;
/**
* Authorizes grid operation.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ace5ef68/modules/core/src/main/java/org/apache/ignite/internal/processors/security/SecurityContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/security/SecurityContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/security/SecurityContext.java
index 7bb5c70..6ad4874 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/security/SecurityContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/security/SecurityContext.java
@@ -26,7 +26,7 @@ public interface SecurityContext {
/**
* @return Security subject.
*/
- public GridSecuritySubject subject();
+ public SecuritySubject subject();
/**
* Checks whether task operation is allowed.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ace5ef68/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 783c981..15cffa0 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
@@ -55,12 +55,12 @@ public class GridOsSecurityProcessor extends GridProcessorAdapter implements Gri
}
/** {@inheritDoc} */
- @Override public Collection<GridSecuritySubject> authenticatedSubjects() {
+ @Override public Collection<SecuritySubject> authenticatedSubjects() {
return Collections.emptyList();
}
/** {@inheritDoc} */
- @Override public GridSecuritySubject authenticatedSubject(UUID nodeId) {
+ @Override public SecuritySubject authenticatedSubject(UUID nodeId) {
return null;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ace5ef68/modules/core/src/main/java/org/apache/ignite/plugin/security/AuthenticationContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/AuthenticationContext.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/AuthenticationContext.java
index 4885134..a10a96d 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/security/AuthenticationContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/security/AuthenticationContext.java
@@ -25,7 +25,7 @@ import java.util.*;
*/
public class AuthenticationContext {
/** Subject type. */
- private GridSecuritySubjectType subjType;
+ private SecuritySubjectType subjType;
/** Subject ID.w */
private UUID subjId;
@@ -41,7 +41,7 @@ public class AuthenticationContext {
*
* @return Subject type.
*/
- public GridSecuritySubjectType subjectType() {
+ public SecuritySubjectType subjectType() {
return subjType;
}
@@ -50,7 +50,7 @@ public class AuthenticationContext {
*
* @param subjType Subject type.
*/
- public void subjectType(GridSecuritySubjectType subjType) {
+ public void subjectType(SecuritySubjectType subjType) {
this.subjType = subjType;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ace5ef68/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityPermissionSet.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityPermissionSet.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityPermissionSet.java
deleted file mode 100644
index df7b48d..0000000
--- a/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityPermissionSet.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.plugin.security;
-
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-
-/**
- * Security permission set for authorized security subjects. Permission set
- * allows to specify task permissions for every task and cache permissions
- * for every cache. While cards are supported at the end of task or
- * cache name.
- * <p>
- * Property {@link #defaultAllowAll()} specifies whether to allow or deny
- * cache and task operations if they were not explicitly specified.
- */
-public interface GridSecurityPermissionSet extends Serializable {
- /**
- * Flag indicating whether to allow or deny cache and task operations
- * if they were not explicitly specified.
- *
- * @return {@code True} to allow all cache task operations if they were
- * not explicitly specified, {@code false} otherwise.
- */
- public boolean defaultAllowAll();
-
- /**
- * Map of task names to task permissions. Wildcards are allowed at the
- * end of task names.
- *
- * @return Map of task names to task permissions.
- */
- public Map<String, Collection<GridSecurityPermission>> taskPermissions();
-
- /**
- * Map of cache names to cache permissions. Wildcards are allowed at the
- * end of cache names.
- *
- * @return Map of cache names to cache permissions.
- */
- public Map<String, Collection<GridSecurityPermission>> cachePermissions();
-
- /**
- * Collection of system-wide permissions (events enable/disable, Visor task execution).
- *
- * @return Collection of system-wide permissions.
- */
- @Nullable public Collection<GridSecurityPermission> systemPermissions();
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ace5ef68/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecuritySubject.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecuritySubject.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecuritySubject.java
deleted file mode 100644
index b55e282..0000000
--- a/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecuritySubject.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.plugin.security;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
-/**
- * Security subject representing authenticated node or client with a set of permissions.
- */
-public interface GridSecuritySubject extends Serializable {
- /**
- * Gets subject ID.
- *
- * @return Subject ID.
- */
- public UUID id();
-
- /**
- * Gets subject type, either node or client.
- *
- * @return Subject type.
- */
- public GridSecuritySubjectType type();
-
- /**
- * Login provided via subject security credentials.
- *
- * @return Login object.
- */
- public Object login();
-
- /**
- * Gets subject connection address. Usually {@link InetSocketAddress} representing connection IP and port.
- *
- * @return Subject connection address.
- */
- public InetSocketAddress address();
-
- /**
- * Authorized permission set for the subject.
- *
- * @return Authorized permission set for the subject.
- */
- public GridSecurityPermissionSet permissions();
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ace5ef68/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecuritySubjectType.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecuritySubjectType.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecuritySubjectType.java
deleted file mode 100644
index fc8d320..0000000
--- a/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecuritySubjectType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.plugin.security;
-
-import org.jetbrains.annotations.*;
-
-/**
- * Supported security subject types. Subject type can be retrieved form {@link GridSecuritySubject#type()} method.
- */
-public enum GridSecuritySubjectType {
- /**
- * Subject type for a remote {@link org.apache.ignite.cluster.ClusterNode}.
- */
- REMOTE_NODE,
-
- /**
- * Subject type for remote client.
- */
- REMOTE_CLIENT;
-
- /** Enumerated values. */
- private static final GridSecuritySubjectType[] VALS = values();
-
- /**
- * Efficiently gets enumerated value from its ordinal.
- *
- * @param ord Ordinal value.
- * @return Enumerated value.
- */
- @Nullable public static GridSecuritySubjectType fromOrdinal(byte ord) {
- return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ace5ef68/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityPermissionSet.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityPermissionSet.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityPermissionSet.java
new file mode 100644
index 0000000..2a84778
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecurityPermissionSet.java
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.plugin.security;
+
+import org.jetbrains.annotations.*;
+
+import java.io.*;
+import java.util.*;
+
+/**
+ * Security permission set for authorized security subjects. Permission set
+ * allows to specify task permissions for every task and cache permissions
+ * for every cache. While cards are supported at the end of task or
+ * cache name.
+ * <p>
+ * Property {@link #defaultAllowAll()} specifies whether to allow or deny
+ * cache and task operations if they were not explicitly specified.
+ */
+public interface SecurityPermissionSet extends Serializable {
+ /**
+ * Flag indicating whether to allow or deny cache and task operations
+ * if they were not explicitly specified.
+ *
+ * @return {@code True} to allow all cache task operations if they were
+ * not explicitly specified, {@code false} otherwise.
+ */
+ public boolean defaultAllowAll();
+
+ /**
+ * Map of task names to task permissions. Wildcards are allowed at the
+ * end of task names.
+ *
+ * @return Map of task names to task permissions.
+ */
+ public Map<String, Collection<GridSecurityPermission>> taskPermissions();
+
+ /**
+ * Map of cache names to cache permissions. Wildcards are allowed at the
+ * end of cache names.
+ *
+ * @return Map of cache names to cache permissions.
+ */
+ public Map<String, Collection<GridSecurityPermission>> cachePermissions();
+
+ /**
+ * Collection of system-wide permissions (events enable/disable, Visor task execution).
+ *
+ * @return Collection of system-wide permissions.
+ */
+ @Nullable public Collection<GridSecurityPermission> systemPermissions();
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ace5ef68/modules/core/src/main/java/org/apache/ignite/plugin/security/SecuritySubject.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecuritySubject.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecuritySubject.java
new file mode 100644
index 0000000..f8c2cdb
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecuritySubject.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.plugin.security;
+
+import java.io.*;
+import java.net.*;
+import java.util.*;
+
+/**
+ * Security subject representing authenticated node or client with a set of permissions.
+ */
+public interface SecuritySubject extends Serializable {
+ /**
+ * Gets subject ID.
+ *
+ * @return Subject ID.
+ */
+ public UUID id();
+
+ /**
+ * Gets subject type, either node or client.
+ *
+ * @return Subject type.
+ */
+ public SecuritySubjectType type();
+
+ /**
+ * Login provided via subject security credentials.
+ *
+ * @return Login object.
+ */
+ public Object login();
+
+ /**
+ * Gets subject connection address. Usually {@link InetSocketAddress} representing connection IP and port.
+ *
+ * @return Subject connection address.
+ */
+ public InetSocketAddress address();
+
+ /**
+ * Authorized permission set for the subject.
+ *
+ * @return Authorized permission set for the subject.
+ */
+ public SecurityPermissionSet permissions();
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ace5ef68/modules/core/src/main/java/org/apache/ignite/plugin/security/SecuritySubjectType.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/SecuritySubjectType.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecuritySubjectType.java
new file mode 100644
index 0000000..2170807
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/security/SecuritySubjectType.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.plugin.security;
+
+import org.jetbrains.annotations.*;
+
+/**
+ * Supported security subject types. Subject type can be retrieved form {@link SecuritySubject#type()} method.
+ */
+public enum SecuritySubjectType {
+ /**
+ * Subject type for a remote {@link org.apache.ignite.cluster.ClusterNode}.
+ */
+ REMOTE_NODE,
+
+ /**
+ * Subject type for remote client.
+ */
+ REMOTE_CLIENT;
+
+ /** Enumerated values. */
+ private static final SecuritySubjectType[] VALS = values();
+
+ /**
+ * Efficiently gets enumerated value from its ordinal.
+ *
+ * @param ord Ordinal value.
+ * @return Enumerated value.
+ */
+ @Nullable public static SecuritySubjectType fromOrdinal(byte ord) {
+ return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ace5ef68/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
index f198210..28040ba 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
@@ -694,12 +694,12 @@ public abstract class IgniteSpiAdapter implements IgniteSpi, IgniteSpiManagement
}
/** {@inheritDoc} */
- @Override public Collection<GridSecuritySubject> authenticatedSubjects() {
+ @Override public Collection<SecuritySubject> authenticatedSubjects() {
return Collections.emptyList();
}
/** {@inheritDoc} */
- @Override public GridSecuritySubject authenticatedSubject(UUID subjId) {
+ @Override public SecuritySubject authenticatedSubject(UUID subjId) {
return null;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ace5ef68/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiContext.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiContext.java
index 5eef37a..aac8ae6 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiContext.java
@@ -310,7 +310,7 @@ public interface IgniteSpiContext {
* @return Collection of authenticated subjects.
* @throws IgniteException If any exception occurs.
*/
- public Collection<GridSecuritySubject> authenticatedSubjects() throws IgniteException;
+ public Collection<SecuritySubject> authenticatedSubjects() throws IgniteException;
/**
* Gets security subject based on subject ID.
@@ -319,7 +319,7 @@ public interface IgniteSpiContext {
* @return Authorized security subject.
* @throws IgniteException If any exception occurs.
*/
- public GridSecuritySubject authenticatedSubject(UUID subjId) throws IgniteException;
+ public SecuritySubject authenticatedSubject(UUID subjId) throws IgniteException;
/**
* Reads swapped cache value from off-heap and swap.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ace5ef68/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 9b38cad..4b43fec 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
@@ -2176,14 +2176,14 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
}
/**
- * Checks if two given {@link GridSecurityPermissionSet} objects contain the same permissions.
+ * Checks if two given {@link SecurityPermissionSet} objects contain the same permissions.
* Each permission belongs to one of three groups : cache, task or system.
*
* @param locPerms The first set of permissions.
* @param rmtPerms The second set of permissions.
* @return {@code True} if given parameters contain the same permissions, {@code False} otherwise.
*/
- private boolean permissionsEqual(GridSecurityPermissionSet locPerms, GridSecurityPermissionSet rmtPerms) {
+ private boolean permissionsEqual(SecurityPermissionSet locPerms, SecurityPermissionSet rmtPerms) {
boolean dfltAllowMatch = !(locPerms.defaultAllowAll() ^ rmtPerms.defaultAllowAll());
boolean bothHaveSamePerms = F.eqNotOrdered(rmtPerms.systemPermissions(), locPerms.systemPermissions()) &&
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ace5ef68/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java b/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java
index a4e011a..549c3fb 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java
@@ -474,12 +474,12 @@ public class GridSpiTestContext implements IgniteSpiContext {
}
/** {@inheritDoc} */
- @Override public Collection<GridSecuritySubject> authenticatedSubjects() {
+ @Override public Collection<SecuritySubject> authenticatedSubjects() {
return Collections.emptyList();
}
/** {@inheritDoc} */
- @Override public GridSecuritySubject authenticatedSubject(UUID subjId) {
+ @Override public SecuritySubject authenticatedSubject(UUID subjId) {
return null;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ace5ef68/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 e0acde9..eafd62a 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
@@ -100,15 +100,8 @@ public abstract class GridSpiAbstractTest<T extends IgniteSpi> extends GridAbstr
/**
* @return Allow all permission security set.
*/
- private static GridSecurityPermissionSet getAllPermissionSet() {
- return new GridSecurityPermissionSetImpl();
- }
-
- /**
- * @return Grid allow all security subject.
- */
- protected GridSecuritySubject getGridSecuritySubject(final GridSecuritySubjectType type, final UUID id) {
- return new GridSecuritySubjectImpl(id, type);
+ private static SecurityPermissionSet getAllPermissionSet() {
+ return new SecurityPermissionSetImpl();
}
/**
@@ -696,7 +689,7 @@ public abstract class GridSpiAbstractTest<T extends IgniteSpi> extends GridAbstr
}
}
- private static class GridSecurityPermissionSetImpl implements GridSecurityPermissionSet {
+ private static class SecurityPermissionSetImpl implements SecurityPermissionSet {
/** Serial version uid. */
private static final long serialVersionUID = 0L;
@@ -720,50 +713,4 @@ public abstract class GridSpiAbstractTest<T extends IgniteSpi> extends GridAbstr
return null;
}
}
-
- private static class GridSecuritySubjectImpl implements GridSecuritySubject {
- /** Node Id. */
- private UUID id;
-
- /** Grid security type. */
- private GridSecuritySubjectType type;
-
- private GridSecurityPermissionSet permission;
-
- public GridSecuritySubjectImpl() {
- }
-
- public GridSecuritySubjectImpl(UUID id, GridSecuritySubjectType type) {
- this.id = id;
-
- this.type = type;
-
- permission = getAllPermissionSet();
- }
-
- /** {@inheritDoc} */
- @Override public UUID id() {
- return id;
- }
-
- /** {@inheritDoc} */
- @Override public GridSecuritySubjectType type() {
- return type;
- }
-
- /** {@inheritDoc} */
- @Override public Object login() {
- return null;
- }
-
- /** {@inheritDoc} */
- @Override public InetSocketAddress address() {
- return null;
- }
-
- /** {@inheritDoc} */
- @Override public GridSecurityPermissionSet permissions() {
- return permission;
- }
- }
}