This is an automated email from the ASF dual-hosted git repository. udo pushed a commit to branch feature/GEODE-3604 in repository https://gitbox.apache.org/repos/asf/geode.git
commit fd03804267a79de0ecde3c01fdcc4098126afa8f Author: kohlmu-pivotal <[email protected]> AuthorDate: Fri Sep 8 17:01:51 2017 -0700 Make Authentication and Authorization generic for the GenericProtocolServerConnection.java moved Authentication into internal packages. --- .../sockets/GenericProtocolServerConnection.java | 13 ++-- .../tier/sockets/MessageExecutionContext.java | 2 +- .../cache/tier/sockets/MessageHandlerFactory.java | 34 ---------- .../ProtocolMessageHandlerLookupService.java | 30 +++++++++ .../tier/sockets/ServerConnectionFactory.java | 73 ++++------------------ .../cache/tier/sockets/TcpServerFactory.java | 13 +++- .../security/server/Authenticator.java | 4 +- .../server/AuthenticatorLookupService.java | 47 ++++++++++++++ .../{ => internal}/security/server/Authorizer.java | 8 +-- .../security/server/NoOpAuthenticator.java | 2 +- .../internal}/security/server/NoOpAuthorizer.java | 2 +- .../{ => internal}/security/server/package.html | 0 ...he.geode.internal.security.server.Authenticator | 1 + .../org.apache.geode.security.server.Authenticator | 1 - .../protocol/protobuf/ProtobufOpsProcessor.java | 4 +- .../protobuf/ProtobufSimpleAuthenticator.java | 4 +- .../protobuf/ProtobufSimpleAuthorizer.java | 2 +- ...he.geode.internal.security.server.Authenticator | 1 + .../org.apache.geode.security.server.Authenticator | 2 - .../GenericProtocolServerConnectionTest.java | 4 +- .../protobuf/ProtobufStreamProcessorTest.java | 2 +- .../GetAllRequestOperationHandlerJUnitTest.java | 2 +- ...egionNamesRequestOperationHandlerJUnitTest.java | 2 +- .../GetRegionRequestOperationHandlerJUnitTest.java | 2 +- .../GetRequestOperationHandlerJUnitTest.java | 2 +- .../PutAllRequestOperationHandlerJUnitTest.java | 2 +- .../PutRequestOperationHandlerJUnitTest.java | 2 +- .../RemoveRequestOperationHandlerJUnitTest.java | 2 +- 28 files changed, 135 insertions(+), 128 deletions(-) diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/GenericProtocolServerConnection.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/GenericProtocolServerConnection.java index cf94af9..78861e3 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/GenericProtocolServerConnection.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/GenericProtocolServerConnection.java @@ -15,13 +15,13 @@ package org.apache.geode.internal.cache.tier.sockets; -import org.apache.geode.cache.Cache; import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.internal.cache.tier.Acceptor; import org.apache.geode.internal.cache.tier.CachedRegionHelper; import org.apache.geode.internal.security.SecurityService; +import org.apache.geode.internal.security.server.Authenticator; +import org.apache.geode.internal.security.server.AuthenticatorLookupService; import org.apache.geode.security.SecurityManager; -import org.apache.geode.security.server.Authenticator; import java.io.EOFException; import java.io.IOException; @@ -47,14 +47,15 @@ public class GenericProtocolServerConnection extends ServerConnection { CacheServerStats cacheServerStats, int hsTimeout, int socketBufferSize, String communicationModeStr, byte communicationMode, Acceptor acceptor, - ClientProtocolMessageHandler newClientProtocol, - SecurityService securityService, Authenticator authenticator) { + SecurityService securityService, + ClientProtocolMessageHandler clientProtocolMessageHandler, + AuthenticatorLookupService authenticatorLookupService) { super(socket, cache, cachedRegionHelper, cacheServerStats, hsTimeout, socketBufferSize, communicationModeStr, communicationMode, acceptor, securityService); securityManager = securityService.getSecurityManager(); - this.messageHandler = newClientProtocol; - this.authenticator = authenticator; + this.messageHandler = clientProtocolMessageHandler; + this.authenticator = authenticatorLookupService.getAuthenticator(); } @Override diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/MessageExecutionContext.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/MessageExecutionContext.java index d68a165..f45d518 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/MessageExecutionContext.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/MessageExecutionContext.java @@ -19,7 +19,7 @@ import org.apache.geode.annotations.Experimental; import org.apache.geode.cache.Cache; import org.apache.geode.distributed.Locator; import org.apache.geode.internal.exception.InvalidExecutionContextException; -import org.apache.geode.security.server.Authorizer; +import org.apache.geode.internal.security.server.Authorizer; @Experimental public class MessageExecutionContext { diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/MessageHandlerFactory.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/MessageHandlerFactory.java deleted file mode 100644 index 2aca8c2..0000000 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/MessageHandlerFactory.java +++ /dev/null @@ -1,34 +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.geode.internal.cache.tier.sockets; - -import java.util.Iterator; -import java.util.ServiceLoader; - -public class MessageHandlerFactory { - public ClientProtocolMessageHandler makeMessageHandler() { - ServiceLoader<ClientProtocolMessageHandler> loader = - ServiceLoader.load(ClientProtocolMessageHandler.class); - Iterator<ClientProtocolMessageHandler> iterator = loader.iterator(); - - if (!iterator.hasNext()) { - throw new ServiceLoadingFailureException( - "There is no ClientProtocolMessageHandler implementation found in JVM"); - } - - return iterator.next(); - } -} diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ProtocolMessageHandlerLookupService.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ProtocolMessageHandlerLookupService.java new file mode 100644 index 0000000..36f2624 --- /dev/null +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ProtocolMessageHandlerLookupService.java @@ -0,0 +1,30 @@ +package org.apache.geode.internal.cache.tier.sockets; + +import java.util.Iterator; +import java.util.ServiceLoader; + +public class ProtocolMessageHandlerLookupService { + private ClientProtocolMessageHandler protocolHandler; + + public ProtocolMessageHandlerLookupService() { + protocolHandler = findFirstProtocolMessageHandler(); + } + + private ClientProtocolMessageHandler findFirstProtocolMessageHandler() { + ServiceLoader<ClientProtocolMessageHandler> loader = + ServiceLoader.load(ClientProtocolMessageHandler.class); + Iterator<ClientProtocolMessageHandler> iterator = loader.iterator(); + + if (!iterator.hasNext()) { + throw new ServiceLoadingFailureException( + "There is no ClientProtocolMessageHandler implementation found in JVM"); + } + + return iterator.next(); + } + + public ClientProtocolMessageHandler lookupProtocolHandler(String protocolType) { + //TODO Do we need to make provision for different protocols here right now? + return protocolHandler; + } +} diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionFactory.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionFactory.java index 722cd34..bfde7c0 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionFactory.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionFactory.java @@ -17,86 +17,37 @@ package org.apache.geode.internal.cache.tier.sockets; import static org.apache.geode.internal.cache.tier.CommunicationMode.ProtobufClientServerProtocol; +import java.io.IOException; +import java.net.Socket; + import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.internal.cache.tier.Acceptor; import org.apache.geode.internal.cache.tier.CachedRegionHelper; import org.apache.geode.internal.security.SecurityService; -import org.apache.geode.security.server.Authenticator; - -import java.io.IOException; -import java.net.Socket; -import java.util.HashMap; -import java.util.Map; -import java.util.ServiceLoader; +import org.apache.geode.internal.security.server.AuthenticatorLookupService; /** * Creates instances of ServerConnection based on the connection mode provided. */ public class ServerConnectionFactory { - private ClientProtocolMessageHandler protocolHandler; - private Map<String, Class<? extends Authenticator>> authenticators = null; + private final ProtocolMessageHandlerLookupService protocolMessageHandlerLookupService; + private final AuthenticatorLookupService authenticatorLookupService; - private synchronized void initializeAuthenticatorsMap() { - if (authenticators != null) { - return; - } - authenticators = new HashMap<>(); - ServiceLoader<Authenticator> loader = ServiceLoader.load(Authenticator.class); - for (Authenticator streamAuthenticator : loader) { - authenticators.put(streamAuthenticator.implementationID(), streamAuthenticator.getClass()); - } - } - - private synchronized ClientProtocolMessageHandler initializeMessageHandler() { - if (protocolHandler != null) { - return protocolHandler; - } - - protocolHandler = new MessageHandlerFactory().makeMessageHandler(); - - return protocolHandler; - } - - private Authenticator findStreamAuthenticator(String implementationID) { - if (authenticators == null) { - initializeAuthenticatorsMap(); - } - Class<? extends Authenticator> streamAuthenticatorClass = authenticators.get(implementationID); - if (streamAuthenticatorClass == null) { - throw new ServiceLoadingFailureException( - "Could not find implementation for Authenticator with implementation ID " - + implementationID); - } else { - try { - return streamAuthenticatorClass.newInstance(); - } catch (InstantiationException | IllegalAccessException e) { - throw new ServiceLoadingFailureException( - "Unable to instantiate authenticator for ID " + implementationID, e); - } - } - } - - private ClientProtocolMessageHandler getClientProtocolMessageHandler() { - if (protocolHandler == null) { - initializeMessageHandler(); - } - return protocolHandler; + public ServerConnectionFactory() { + protocolMessageHandlerLookupService = new ProtocolMessageHandlerLookupService(); + authenticatorLookupService = new AuthenticatorLookupService(); } public ServerConnection makeServerConnection(Socket socket, InternalCache cache, CachedRegionHelper cachedRegionHelper, - CacheServerStats cacheServerStats, int hsTimeout, int socketBufferSize, String communicationModeStr, - byte communicationMode, Acceptor acceptor, SecurityService securityService) + CacheServerStats cacheServerStats, int hsTimeout, int socketBufferSize, String communicationModeStr, + byte communicationMode, Acceptor acceptor, SecurityService securityService) throws IOException { if (ProtobufClientServerProtocol.getModeNumber() == communicationMode) { if (!Boolean.getBoolean("geode.feature-protobuf-protocol")) { throw new IOException("Server received unknown communication mode: " + communicationMode); } else { - String authenticationMode = - System.getProperty("geode.protocol-authentication-mode", "NOOP"); - return new GenericProtocolServerConnection(socket, cache, cachedRegionHelper, cacheServerStats, hsTimeout, socketBufferSize, - communicationModeStr, communicationMode, acceptor, getClientProtocolMessageHandler(), - securityService, findStreamAuthenticator(authenticationMode)); + communicationModeStr, communicationMode, acceptor, securityService, protocolMessageHandlerLookupService.lookupProtocolHandler("protobuf"),authenticatorLookupService); } } else { return new LegacyServerConnection(socket, cache, cachedRegionHelper, cacheServerStats, hsTimeout, socketBufferSize, diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/TcpServerFactory.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/TcpServerFactory.java index 959e6e2..cd1e76a 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/TcpServerFactory.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/TcpServerFactory.java @@ -16,7 +16,9 @@ package org.apache.geode.internal.cache.tier.sockets; import java.net.InetAddress; +import java.util.Iterator; import java.util.Properties; +import java.util.ServiceLoader; import org.apache.logging.log4j.Logger; @@ -33,7 +35,16 @@ public class TcpServerFactory { public TcpServerFactory() { try { - protocolHandler = new MessageHandlerFactory().makeMessageHandler(); + ServiceLoader<ClientProtocolMessageHandler> loader = + ServiceLoader.load(ClientProtocolMessageHandler.class); + Iterator<ClientProtocolMessageHandler> iterator = loader.iterator(); + + if (!iterator.hasNext()) { + throw new ServiceLoadingFailureException( + "There is no ClientProtocolMessageHandler implementation found in JVM"); + } + + protocolHandler = iterator.next(); } catch (ServiceLoadingFailureException ex) { logger.warn(ex.getMessage()); } diff --git a/geode-core/src/main/java/org/apache/geode/security/server/Authenticator.java b/geode-core/src/main/java/org/apache/geode/internal/security/server/Authenticator.java similarity index 95% rename from geode-core/src/main/java/org/apache/geode/security/server/Authenticator.java rename to geode-core/src/main/java/org/apache/geode/internal/security/server/Authenticator.java index 7893b4b..eddf190 100644 --- a/geode-core/src/main/java/org/apache/geode/security/server/Authenticator.java +++ b/geode-core/src/main/java/org/apache/geode/internal/security/server/Authenticator.java @@ -12,12 +12,13 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ -package org.apache.geode.security.server; +package org.apache.geode.internal.security.server; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import org.apache.geode.annotations.Experimental; import org.apache.geode.security.AuthenticationRequiredException; import org.apache.geode.security.SecurityManager; @@ -28,6 +29,7 @@ import org.apache.geode.security.SecurityManager; * If authentication fails, an implementor may continue to wait for another valid authentication * exchange. */ +@Experimental public interface Authenticator { /** * diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/server/AuthenticatorLookupService.java b/geode-core/src/main/java/org/apache/geode/internal/security/server/AuthenticatorLookupService.java new file mode 100644 index 0000000..b7af501 --- /dev/null +++ b/geode-core/src/main/java/org/apache/geode/internal/security/server/AuthenticatorLookupService.java @@ -0,0 +1,47 @@ +package org.apache.geode.internal.security.server; + +import java.util.HashMap; +import java.util.Map; +import java.util.ServiceLoader; + +import org.apache.geode.GemFireConfigException; +import org.apache.geode.internal.cache.tier.sockets.ServiceLoadingFailureException; + +public class AuthenticatorLookupService { + private Map<String, Class<? extends Authenticator>> authenticators = null; + + public AuthenticatorLookupService() { + if (authenticators == null) { + initializeAuthenticatorsMap(); + } + } + + private synchronized void initializeAuthenticatorsMap() { + if (authenticators != null) { + return; + } + authenticators = new HashMap<>(); + ServiceLoader<Authenticator> loader = ServiceLoader.load(Authenticator.class); + for (Authenticator streamAuthenticator : loader) { + authenticators.put(streamAuthenticator.implementationID(), streamAuthenticator.getClass()); + } + } + + public Authenticator getAuthenticator() { + String authenticationMode = System.getProperty("geode.protocol-authentication-mode", "NOOP"); + + Class<? extends Authenticator> streamAuthenticatorClass = authenticators.get(authenticationMode); + if (streamAuthenticatorClass == null) { + throw new GemFireConfigException( + "Could not find implementation for Authenticator with implementation ID " + + authenticationMode); + } else { + try { + return streamAuthenticatorClass.newInstance(); + } catch (InstantiationException | IllegalAccessException e) { + throw new ServiceLoadingFailureException( + "Unable to instantiate authenticator for ID " + authenticationMode, e); + } + } + } +} diff --git a/geode-core/src/main/java/org/apache/geode/security/server/Authorizer.java b/geode-core/src/main/java/org/apache/geode/internal/security/server/Authorizer.java similarity index 83% rename from geode-core/src/main/java/org/apache/geode/security/server/Authorizer.java rename to geode-core/src/main/java/org/apache/geode/internal/security/server/Authorizer.java index e3f5738..861d2c0 100644 --- a/geode-core/src/main/java/org/apache/geode/security/server/Authorizer.java +++ b/geode-core/src/main/java/org/apache/geode/internal/security/server/Authorizer.java @@ -12,12 +12,12 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ -package org.apache.geode.security.server; +package org.apache.geode.internal.security.server; +import org.apache.geode.annotations.Experimental; import org.apache.geode.security.ResourcePermission; +@Experimental public interface Authorizer { - default boolean authorize(ResourcePermission permissionRequested) { - return true; - } + boolean authorize(ResourcePermission permissionRequested); } diff --git a/geode-protobuf/src/main/java/org/apache/geode/security/server/NoOpAuthenticator.java b/geode-core/src/main/java/org/apache/geode/internal/security/server/NoOpAuthenticator.java similarity index 96% rename from geode-protobuf/src/main/java/org/apache/geode/security/server/NoOpAuthenticator.java rename to geode-core/src/main/java/org/apache/geode/internal/security/server/NoOpAuthenticator.java index bf435d2..24d3a18 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/security/server/NoOpAuthenticator.java +++ b/geode-core/src/main/java/org/apache/geode/internal/security/server/NoOpAuthenticator.java @@ -12,7 +12,7 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ -package org.apache.geode.security.server; +package org.apache.geode.internal.security.server; import java.io.IOException; import java.io.InputStream; diff --git a/geode-protobuf/src/main/java/org/apache/geode/security/server/NoOpAuthorizer.java b/geode-core/src/main/java/org/apache/geode/internal/security/server/NoOpAuthorizer.java similarity index 95% rename from geode-protobuf/src/main/java/org/apache/geode/security/server/NoOpAuthorizer.java rename to geode-core/src/main/java/org/apache/geode/internal/security/server/NoOpAuthorizer.java index 1491f04..d7f50b1 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/security/server/NoOpAuthorizer.java +++ b/geode-core/src/main/java/org/apache/geode/internal/security/server/NoOpAuthorizer.java @@ -12,7 +12,7 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ -package org.apache.geode.security.server; +package org.apache.geode.internal.security.server; import org.apache.geode.security.ResourcePermission; diff --git a/geode-core/src/main/java/org/apache/geode/security/server/package.html b/geode-core/src/main/java/org/apache/geode/internal/security/server/package.html similarity index 100% rename from geode-core/src/main/java/org/apache/geode/security/server/package.html rename to geode-core/src/main/java/org/apache/geode/internal/security/server/package.html diff --git a/geode-core/src/main/resources/META-INF/services/org.apache.geode.internal.security.server.Authenticator b/geode-core/src/main/resources/META-INF/services/org.apache.geode.internal.security.server.Authenticator new file mode 100644 index 0000000..f459a51 --- /dev/null +++ b/geode-core/src/main/resources/META-INF/services/org.apache.geode.internal.security.server.Authenticator @@ -0,0 +1 @@ +org.apache.geode.internal.security.server.NoOpAuthenticator \ No newline at end of file diff --git a/geode-core/src/main/resources/META-INF/services/org.apache.geode.security.server.Authenticator b/geode-core/src/main/resources/META-INF/services/org.apache.geode.security.server.Authenticator deleted file mode 100644 index 8b13789..0000000 --- a/geode-core/src/main/resources/META-INF/services/org.apache.geode.security.server.Authenticator +++ /dev/null @@ -1 +0,0 @@ - diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufOpsProcessor.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufOpsProcessor.java index d3ac9d7..a114c3f 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufOpsProcessor.java +++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufOpsProcessor.java @@ -20,8 +20,8 @@ import org.apache.geode.internal.exception.InvalidExecutionContextException; import org.apache.geode.internal.protocol.protobuf.ClientProtocol; import org.apache.geode.protocol.protobuf.registry.OperationContextRegistry; import org.apache.geode.protocol.protobuf.utilities.ProtobufResponseUtilities; -import org.apache.geode.security.server.Authorizer; -import org.apache.geode.security.server.NoOpAuthorizer; +import org.apache.geode.internal.security.server.Authorizer; +import org.apache.geode.internal.security.server.NoOpAuthorizer; import org.apache.geode.serialization.SerializationService; /** diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufSimpleAuthenticator.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufSimpleAuthenticator.java index 47b7fac..1e4ae5b 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufSimpleAuthenticator.java +++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufSimpleAuthenticator.java @@ -17,10 +17,10 @@ package org.apache.geode.protocol.protobuf; import org.apache.geode.management.internal.security.ResourceConstants; import org.apache.geode.internal.protocol.protobuf.AuthenticationAPI; import org.apache.geode.security.AuthenticationRequiredException; -import org.apache.geode.security.server.Authenticator; +import org.apache.geode.internal.security.server.Authenticator; import org.apache.geode.security.AuthenticationFailedException; import org.apache.geode.security.SecurityManager; -import org.apache.geode.security.server.Authorizer; +import org.apache.geode.internal.security.server.Authorizer; import java.io.EOFException; import java.io.IOException; diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufSimpleAuthorizer.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufSimpleAuthorizer.java index e29abfa..756d779 100644 --- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufSimpleAuthorizer.java +++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufSimpleAuthorizer.java @@ -16,7 +16,7 @@ package org.apache.geode.protocol.protobuf; import org.apache.geode.security.ResourcePermission; import org.apache.geode.security.SecurityManager; -import org.apache.geode.security.server.Authorizer; +import org.apache.geode.internal.security.server.Authorizer; public class ProtobufSimpleAuthorizer implements Authorizer { private final Object authenticatedPrincipal; diff --git a/geode-protobuf/src/main/resources/META-INF/services/org.apache.geode.internal.security.server.Authenticator b/geode-protobuf/src/main/resources/META-INF/services/org.apache.geode.internal.security.server.Authenticator new file mode 100644 index 0000000..45e4eea --- /dev/null +++ b/geode-protobuf/src/main/resources/META-INF/services/org.apache.geode.internal.security.server.Authenticator @@ -0,0 +1 @@ +org.apache.geode.protocol.protobuf.ProtobufSimpleAuthenticator \ No newline at end of file diff --git a/geode-protobuf/src/main/resources/META-INF/services/org.apache.geode.security.server.Authenticator b/geode-protobuf/src/main/resources/META-INF/services/org.apache.geode.security.server.Authenticator deleted file mode 100644 index e13c994..0000000 --- a/geode-protobuf/src/main/resources/META-INF/services/org.apache.geode.security.server.Authenticator +++ /dev/null @@ -1,2 +0,0 @@ -org.apache.geode.protocol.protobuf.ProtobufSimpleAuthenticator -org.apache.geode.security.server.NoOpAuthenticator \ No newline at end of file diff --git a/geode-protobuf/src/test/java/org/apache/geode/internal/cache/tier/sockets/GenericProtocolServerConnectionTest.java b/geode-protobuf/src/test/java/org/apache/geode/internal/cache/tier/sockets/GenericProtocolServerConnectionTest.java index be9c4a2..50ef5b1 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/internal/cache/tier/sockets/GenericProtocolServerConnectionTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/internal/cache/tier/sockets/GenericProtocolServerConnectionTest.java @@ -24,7 +24,7 @@ import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.internal.cache.tier.CachedRegionHelper; import org.apache.geode.internal.cache.tier.CommunicationMode; import org.apache.geode.internal.security.SecurityService; -import org.apache.geode.security.server.NoOpAuthenticator; +import org.apache.geode.internal.security.server.AuthenticatorLookupService; import org.apache.geode.test.junit.categories.UnitTest; import org.junit.Test; @@ -79,6 +79,6 @@ public class GenericProtocolServerConnectionTest { return new GenericProtocolServerConnection(socketMock, mock(InternalCache.class), mock(CachedRegionHelper.class), mock(CacheServerStats.class), 0, 0, "", CommunicationMode.ProtobufClientServerProtocol.getModeNumber(), mock(AcceptorImpl.class), - clientProtocolMock, mock(SecurityService.class), new NoOpAuthenticator()); + mock(SecurityService.class), clientProtocolMock, new AuthenticatorLookupService()); } } diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/ProtobufStreamProcessorTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/ProtobufStreamProcessorTest.java index 50d7b40..6e93129 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/ProtobufStreamProcessorTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/ProtobufStreamProcessorTest.java @@ -27,7 +27,7 @@ import org.junit.experimental.categories.Category; import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext; -import org.apache.geode.security.server.NoOpAuthorizer; +import org.apache.geode.internal.security.server.NoOpAuthorizer; import org.apache.geode.test.junit.categories.UnitTest; @Category(UnitTest.class) diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandlerJUnitTest.java index 0850f25..45977b2 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandlerJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandlerJUnitTest.java @@ -41,7 +41,7 @@ import org.apache.geode.protocol.protobuf.Result; import org.apache.geode.protocol.protobuf.Success; import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities; import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities; -import org.apache.geode.security.server.NoOpAuthorizer; +import org.apache.geode.internal.security.server.NoOpAuthorizer; import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException; import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredForTypeException; import org.apache.geode.serialization.registry.exception.CodecNotRegisteredForTypeException; diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRegionNamesRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRegionNamesRequestOperationHandlerJUnitTest.java index 0d09148..df089a7 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRegionNamesRequestOperationHandlerJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRegionNamesRequestOperationHandlerJUnitTest.java @@ -33,7 +33,7 @@ import org.apache.geode.internal.protocol.protobuf.RegionAPI; import org.apache.geode.protocol.protobuf.Result; import org.apache.geode.protocol.protobuf.Success; import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities; -import org.apache.geode.security.server.NoOpAuthorizer; +import org.apache.geode.internal.security.server.NoOpAuthorizer; import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException; import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredForTypeException; import org.apache.geode.serialization.registry.exception.CodecNotRegisteredForTypeException; diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRegionRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRegionRequestOperationHandlerJUnitTest.java index 3458e21..c344973 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRegionRequestOperationHandlerJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRegionRequestOperationHandlerJUnitTest.java @@ -28,7 +28,7 @@ import org.apache.geode.protocol.protobuf.Failure; import org.apache.geode.protocol.protobuf.ProtocolErrorCode; import org.apache.geode.internal.protocol.protobuf.RegionAPI; import org.apache.geode.protocol.protobuf.Result; -import org.apache.geode.security.server.NoOpAuthorizer; +import org.apache.geode.internal.security.server.NoOpAuthorizer; import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException; import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredForTypeException; import org.apache.geode.serialization.registry.exception.CodecNotRegisteredForTypeException; diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRequestOperationHandlerJUnitTest.java index 5bdd5d7..17c2cb3 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRequestOperationHandlerJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRequestOperationHandlerJUnitTest.java @@ -26,7 +26,7 @@ import org.apache.geode.protocol.protobuf.Result; import org.apache.geode.protocol.protobuf.Success; import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities; import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities; -import org.apache.geode.security.server.NoOpAuthorizer; +import org.apache.geode.internal.security.server.NoOpAuthorizer; import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException; import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredForTypeException; import org.apache.geode.serialization.registry.exception.CodecNotRegisteredForTypeException; diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/PutAllRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/PutAllRequestOperationHandlerJUnitTest.java index 36a5cf4..3ddeae7 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/PutAllRequestOperationHandlerJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/PutAllRequestOperationHandlerJUnitTest.java @@ -23,7 +23,7 @@ import org.apache.geode.protocol.protobuf.Result; import org.apache.geode.protocol.protobuf.Success; import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities; import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities; -import org.apache.geode.security.server.NoOpAuthorizer; +import org.apache.geode.internal.security.server.NoOpAuthorizer; import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException; import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredForTypeException; import org.apache.geode.serialization.registry.exception.CodecNotRegisteredForTypeException; diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/PutRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/PutRequestOperationHandlerJUnitTest.java index 5235a90..37309ff 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/PutRequestOperationHandlerJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/PutRequestOperationHandlerJUnitTest.java @@ -26,7 +26,7 @@ import org.apache.geode.protocol.protobuf.Result; import org.apache.geode.protocol.protobuf.Success; import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities; import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities; -import org.apache.geode.security.server.NoOpAuthorizer; +import org.apache.geode.internal.security.server.NoOpAuthorizer; import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException; import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredForTypeException; import org.apache.geode.serialization.registry.exception.CodecNotRegisteredForTypeException; diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/RemoveRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/RemoveRequestOperationHandlerJUnitTest.java index a5bde46..81ce080 100644 --- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/RemoveRequestOperationHandlerJUnitTest.java +++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/RemoveRequestOperationHandlerJUnitTest.java @@ -27,7 +27,7 @@ import org.apache.geode.protocol.protobuf.Result; import org.apache.geode.protocol.protobuf.Success; import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities; import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities; -import org.apache.geode.security.server.NoOpAuthorizer; +import org.apache.geode.internal.security.server.NoOpAuthorizer; import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException; import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredForTypeException; import org.apache.geode.serialization.registry.exception.CodecNotRegisteredForTypeException; -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
