You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2017/06/02 20:58:55 UTC
[3/3] geode git commit: Add TODO comments
Add TODO comments
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/b8d211f4
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/b8d211f4
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/b8d211f4
Branch: refs/heads/feature/GEODE-2632-19
Commit: b8d211f44c92a14a840591e050c5f632ac2141a0
Parents: 21b1e19
Author: Kirk Lund <kl...@apache.org>
Authored: Fri Jun 2 13:58:40 2017 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Fri Jun 2 13:58:40 2017 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/geode/cache/CacheFactory.java | 1 +
.../geode/internal/security/SecurityServiceFactory.java | 8 ++++++++
.../test/java/org/apache/geode/tools/pulse/tests/Server.java | 1 +
3 files changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/b8d211f4/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java b/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java
index b4a1cc5..36560fd 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java
@@ -206,6 +206,7 @@ public class CacheFactory {
if (this.dsProps.isEmpty()) {
// any ds will do
ds = InternalDistributedSystem.getConnectedInstance();
+ // TODO:KIRK: if already connected AND we specify security then throw Error
}
if (ds == null) {
ds = DistributedSystem.connect(this.dsProps);
http://git-wip-us.apache.org/repos/asf/geode/blob/b8d211f4/geode-core/src/main/java/org/apache/geode/internal/security/SecurityServiceFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/SecurityServiceFactory.java b/geode-core/src/main/java/org/apache/geode/internal/security/SecurityServiceFactory.java
index 6013286..3cdc828 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/security/SecurityServiceFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/security/SecurityServiceFactory.java
@@ -34,6 +34,10 @@ public class SecurityServiceFactory {
// do not instantiate
}
+ /**
+ * Creates and initializes SecurityService. Initialization will invoke init on both
+ * SecurityManager and PostProcessor if they are specified.
+ */
public static SecurityService create(CacheConfig cacheConfig,
DistributionConfig distributionConfig) {
Properties securityConfig = getSecurityConfig(distributionConfig);
@@ -47,6 +51,10 @@ public class SecurityServiceFactory {
return securityService;
}
+ /**
+ * Creates but does NOT initialize SecurityService. Init is NOTE invoked on either
+ * SecurityManager and PostProcessor if they are specified.
+ */
public static SecurityService create(Properties securityConfig, SecurityManager securityManager,
PostProcessor postProcessor) {
SecurityServiceType type = determineType(securityConfig, securityManager);
http://git-wip-us.apache.org/repos/asf/geode/blob/b8d211f4/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/Server.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/Server.java b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/Server.java
index 9a16182..015a480 100644
--- a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/Server.java
+++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/Server.java
@@ -88,6 +88,7 @@ public class Server {
SecurityService securityService =
SecurityServiceFactory.create(securityProperties, new TestSecurityManager(), null);
+ securityService.initSecurity(securityProperties); // TODO:KIRK: clean this up
// wire in the authenticator and authorizaton
JMXShiroAuthenticator interceptor = new JMXShiroAuthenticator(securityService);