You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ud...@apache.org on 2017/09/14 19:10:20 UTC
[geode] branch feature/GEODE-3604 updated (0abafd2 -> 4d048a6)
This is an automated email from the ASF dual-hosted git repository.
udo pushed a change to branch feature/GEODE-3604
in repository https://gitbox.apache.org/repos/asf/geode.git.
discard 0abafd2 refactored some more code
discard 4ceda1d spotlessApply
discard 4ac9904 Moving Failure.java, Result.java and Success.java to its own package
discard 74e4856 Change stream processing to avoid intermediary collections and process in-line
discard 51fdbdd Moving ProtobufSimpleAuthenticator.java and ProtobufSimpleAuthorizer.java to different package in geode-protobuf
discard 065b215 Make Authentication and Authorization generic for the GenericProtocolServerConnection.java moved Authentication into internal packages.
discard 57b6732 Moved NoOpAuthenticator.java and NoOpAuthorizer.java out of core
add 52305a8 GEODE-3587 Fix the source distribution basename
add cba6c4f GEODE-3580: patch test to avoid the current failure. (#774)
add e5a2319 GEODE-3579 Update gfsh stop locator docs (#765)
add 2655ddb GEODE-3544: Fix JSON parsing error
add e61847c Update javadoc for JarBuilder
add 13dfbb4 GEODE-3539: Add test for missing coverage of status locator command
add a4320f7 GEODE-3562 CI Failure: JSONCodecJUnitTest.testSimpleJSONEncode fails on Windows
add 6bbaad0 GEODE-3079 Ensure emergencyClose() closes socket
add f1f9307 GEODE-3185: Fixes CI failures in windows in org.apache.geode.internal.cache.BackupJUnitTest
add 5c09e20 GEODE-3615: Added CleanupDUnitVMsRule to ConnectCommandWithSSLTest
new 4ed6666 Moved NoOpAuthenticator.java and NoOpAuthorizer.java out of core
new fd03804 Make Authentication and Authorization generic for the GenericProtocolServerConnection.java moved Authentication into internal packages.
new ef7226b Moving ProtobufSimpleAuthenticator.java and ProtobufSimpleAuthorizer.java to different package in geode-protobuf
new f75db76 Change stream processing to avoid intermediary collections and process in-line
new d794696 Moving Failure.java, Result.java and Success.java to its own package
new f165d34 spotlessApply
new a0a3d3e refactored some more code
new 4d048a6 More changes relating to Authorization
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (0abafd2)
\
N -- N -- N refs/heads/feature/GEODE-3604 (4d048a6)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 8 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
geode-assembly/build.gradle | 6 +-
.../cli/shell/GfshExitCodeStatusCommandsTest.java | 13 ++
.../internal/cache/persistence/RestoreScript.java | 1 +
.../sockets/GenericProtocolServerConnection.java | 27 +++--
.../tier/sockets/ServerConnectionFactory.java | 11 +-
.../protocol/ClientProtocolMessageHandler.java | 2 +
.../internal/protocol/MessageExecutionContext.java | 28 +++--
.../ProtocolMessageHandlerLookupService.java | 38 +++---
.../protocol/security/server/Authenticator.java | 12 +-
.../server/AuthenticatorLookupService.java | 2 +-
...ervice.java => AuthorizationLookupService.java} | 34 +++---
.../protocol/security/server/Authorizer.java | 6 +-
.../security/server/NoOpAuthenticator.java | 11 +-
.../protocol/security/server/NoOpAuthorizer.java | 9 +-
.../management/internal/cli/util/JsonUtil.java | 6 +-
...de.internal.protocol.security.server.Authorizer | 1 +
.../deadlock/GemFireDeadlockDetectorDUnitTest.java | 4 +
.../tier/sockets/ServerConnectionFactoryTest.java | 36 ++----
.../GfshStatusCommandsIntegrationTest.java | 3 -
...ctionJUnitTest.java => Geode3544JUnitTest.java} | 134 +++++++++++++--------
.../gfsh/command-pages/stop.html.md.erb | 31 ++++-
.../org/apache/geode/test/compiler/JarBuilder.java | 59 +++++----
.../protocol/operations/OperationHandler.java | 6 +-
...essor.java => ProtobufOperationsProcessor.java} | 32 ++---
...or.java => ProtobufProtocolMessageHandler.java} | 58 ++++++---
.../server/ProtobufSimpleAuthenticator.java | 53 ++++----
.../security/server/ProtobufSimpleAuthorizer.java | 16 ++-
....internal.protocol.ClientProtocolMessageHandler | 2 +-
...e.internal.protocol.security.server.Authorizer} | 2 +-
.../GenericProtocolServerConnectionTest.java | 32 ++++-
...ava => ProtobufProtocolMessageHandlerTest.java} | 10 +-
.../ProtobufSimpleAuthenticatorJUnitTest.java | 42 ++++---
.../GetAllRequestOperationHandlerJUnitTest.java | 24 ++--
...egionNamesRequestOperationHandlerJUnitTest.java | 20 +--
.../GetRegionRequestOperationHandlerJUnitTest.java | 48 +++-----
.../GetRequestOperationHandlerJUnitTest.java | 60 +++++----
.../PutAllRequestOperationHandlerJUnitTest.java | 51 ++++----
.../PutRequestOperationHandlerJUnitTest.java | 64 +++++-----
.../RemoveRequestOperationHandlerJUnitTest.java | 61 +++++-----
.../server/AuthenticationIntegrationTest.java | 43 +++----
.../server/AuthorizationIntegrationTest.java | 7 +-
.../serialization/codec/JSONCodecJUnitTest.java | 5 +-
.../cli/commands/ConnectCommandWithSSLTest.java | 4 +
43 files changed, 611 insertions(+), 503 deletions(-)
copy geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/{AuthenticatorLookupService.java => AuthorizationLookupService.java} (59%)
create mode 100644 geode-core/src/main/resources/META-INF/services/org.apache.geode.internal.protocol.security.server.Authorizer
copy geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/{DataCommandFunctionJUnitTest.java => Geode3544JUnitTest.java} (52%)
rename geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/{ProtobufOpsProcessor.java => ProtobufOperationsProcessor.java} (78%)
rename geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/{ProtobufStreamProcessor.java => ProtobufProtocolMessageHandler.java} (58%)
copy geode-protobuf/src/main/resources/META-INF/services/{org.apache.geode.internal.protocol.security.server.Authenticator => org.apache.geode.internal.protocol.security.server.Authorizer} (82%)
rename geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/{ProtobufStreamProcessorTest.java => ProtobufProtocolMessageHandlerTest.java} (82%)
--
To stop receiving notification emails like this one, please contact
['"commits@geode.apache.org" <co...@geode.apache.org>'].
[geode] 05/08: Moving Failure.java,
Result.java and Success.java to its own package
Posted by ud...@apache.org.
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 d794696b7152aa13aa68c1bbe71d56c8939f5381
Author: kohlmu-pivotal <uk...@pivotal.io>
AuthorDate: Mon Sep 11 10:51:15 2017 -0700
Moving Failure.java, Result.java and Success.java to its own package
---
.../org/apache/geode/protocol/operations/OperationHandler.java | 2 +-
.../apache/geode/protocol/protobuf/EncodingTypeTranslator.java | 2 +-
.../apache/geode/protocol/protobuf/ProtobufOpsProcessor.java | 2 ++
.../protobuf/operations/GetAllRequestOperationHandler.java | 10 +++-------
.../operations/GetAvailableServersOperationHandler.java | 4 ++--
.../operations/GetRegionNamesRequestOperationHandler.java | 4 ++--
.../protobuf/operations/GetRegionRequestOperationHandler.java | 6 +++---
.../protobuf/operations/GetRequestOperationHandler.java | 6 +++---
.../protobuf/operations/PutAllRequestOperationHandler.java | 7 +++----
.../protobuf/operations/PutRequestOperationHandler.java | 6 +++---
.../protobuf/operations/RemoveRequestOperationHandler.java | 6 +++---
.../apache/geode/protocol/{protobuf => responses}/Failure.java | 2 +-
.../apache/geode/protocol/{protobuf => responses}/Result.java | 2 +-
.../apache/geode/protocol/{protobuf => responses}/Success.java | 2 +-
.../operations/GetAllRequestOperationHandlerJUnitTest.java | 4 ++--
.../GetAvailableServersOperationHandlerJUnitTest.java | 4 ++--
.../GetRegionNamesRequestOperationHandlerJUnitTest.java | 4 ++--
.../operations/GetRegionRequestOperationHandlerJUnitTest.java | 4 ++--
.../operations/GetRequestOperationHandlerJUnitTest.java | 6 +++---
.../operations/PutAllRequestOperationHandlerJUnitTest.java | 4 ++--
.../operations/PutRequestOperationHandlerJUnitTest.java | 6 +++---
.../operations/RemoveRequestOperationHandlerJUnitTest.java | 6 +++---
22 files changed, 48 insertions(+), 51 deletions(-)
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/operations/OperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/operations/OperationHandler.java
index aca8ac2..e1a6f9f 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/operations/OperationHandler.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/operations/OperationHandler.java
@@ -18,7 +18,7 @@ import org.apache.geode.annotations.Experimental;
import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
import org.apache.geode.internal.exception.InvalidExecutionContextException;
import org.apache.geode.protocol.protobuf.ProtobufOpsProcessor;
-import org.apache.geode.protocol.protobuf.Result;
+import org.apache.geode.protocol.responses.Result;
import org.apache.geode.serialization.SerializationService;
/**
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/EncodingTypeTranslator.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/EncodingTypeTranslator.java
index ab2d118..9ae761d 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/EncodingTypeTranslator.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/EncodingTypeTranslator.java
@@ -28,7 +28,7 @@ import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException
*/
@Experimental
public abstract class EncodingTypeTranslator {
- static final HashMap<Class, BasicTypes.EncodingType> typeToEncodingMap = intializeTypeMap();
+ private static final HashMap<Class, BasicTypes.EncodingType> typeToEncodingMap = intializeTypeMap();
private static HashMap<Class, BasicTypes.EncodingType> intializeTypeMap() {
HashMap<Class, BasicTypes.EncodingType> result = new HashMap<>();
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 a114c3f..04db646 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
@@ -22,6 +22,8 @@ import org.apache.geode.protocol.protobuf.registry.OperationContextRegistry;
import org.apache.geode.protocol.protobuf.utilities.ProtobufResponseUtilities;
import org.apache.geode.internal.security.server.Authorizer;
import org.apache.geode.internal.security.server.NoOpAuthorizer;
+import org.apache.geode.protocol.responses.Failure;
+import org.apache.geode.protocol.responses.Result;
import org.apache.geode.serialization.SerializationService;
/**
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandler.java
index 41ad65f..2d50fe1 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandler.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandler.java
@@ -14,10 +14,6 @@
*/
package org.apache.geode.protocol.protobuf.operations;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
import org.apache.geode.annotations.Experimental;
import org.apache.geode.cache.CacheLoaderException;
import org.apache.geode.cache.PartitionedRegionStorageException;
@@ -28,10 +24,10 @@ import org.apache.geode.internal.exception.InvalidExecutionContextException;
import org.apache.geode.internal.protocol.protobuf.BasicTypes;
import org.apache.geode.internal.protocol.protobuf.RegionAPI;
import org.apache.geode.protocol.operations.OperationHandler;
-import org.apache.geode.protocol.protobuf.Failure;
+import org.apache.geode.protocol.responses.Failure;
import org.apache.geode.protocol.protobuf.ProtocolErrorCode;
-import org.apache.geode.protocol.protobuf.Result;
-import org.apache.geode.protocol.protobuf.Success;
+import org.apache.geode.protocol.responses.Result;
+import org.apache.geode.protocol.responses.Success;
import org.apache.geode.protocol.protobuf.utilities.ProtobufResponseUtilities;
import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities;
import org.apache.geode.serialization.SerializationService;
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAvailableServersOperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAvailableServersOperationHandler.java
index 6d63b95..2ad8c10 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAvailableServersOperationHandler.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAvailableServersOperationHandler.java
@@ -25,8 +25,8 @@ import org.apache.geode.internal.exception.InvalidExecutionContextException;
import org.apache.geode.internal.protocol.protobuf.BasicTypes;
import org.apache.geode.internal.protocol.protobuf.ServerAPI;
import org.apache.geode.protocol.operations.OperationHandler;
-import org.apache.geode.protocol.protobuf.Result;
-import org.apache.geode.protocol.protobuf.Success;
+import org.apache.geode.protocol.responses.Result;
+import org.apache.geode.protocol.responses.Success;
import org.apache.geode.serialization.SerializationService;
@Experimental
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRegionNamesRequestOperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRegionNamesRequestOperationHandler.java
index 8d1b466..98a24c0 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRegionNamesRequestOperationHandler.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRegionNamesRequestOperationHandler.java
@@ -22,8 +22,8 @@ import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
import org.apache.geode.internal.exception.InvalidExecutionContextException;
import org.apache.geode.protocol.operations.OperationHandler;
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.responses.Result;
+import org.apache.geode.protocol.responses.Success;
import org.apache.geode.protocol.protobuf.utilities.ProtobufResponseUtilities;
import org.apache.geode.serialization.SerializationService;
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRegionRequestOperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRegionRequestOperationHandler.java
index a41519a..fcf0cfa 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRegionRequestOperationHandler.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRegionRequestOperationHandler.java
@@ -20,11 +20,11 @@ import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
import org.apache.geode.internal.exception.InvalidExecutionContextException;
import org.apache.geode.internal.protocol.protobuf.BasicTypes;
import org.apache.geode.protocol.operations.OperationHandler;
-import org.apache.geode.protocol.protobuf.Failure;
+import org.apache.geode.protocol.responses.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.protocol.protobuf.Success;
+import org.apache.geode.protocol.responses.Result;
+import org.apache.geode.protocol.responses.Success;
import org.apache.geode.protocol.protobuf.utilities.ProtobufResponseUtilities;
import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities;
import org.apache.geode.serialization.SerializationService;
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRequestOperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRequestOperationHandler.java
index 79ad85a..eeea966 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRequestOperationHandler.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRequestOperationHandler.java
@@ -20,11 +20,11 @@ import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
import org.apache.geode.internal.exception.InvalidExecutionContextException;
import org.apache.geode.protocol.operations.OperationHandler;
import org.apache.geode.internal.protocol.protobuf.BasicTypes;
-import org.apache.geode.protocol.protobuf.Failure;
+import org.apache.geode.protocol.responses.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.protocol.protobuf.Success;
+import org.apache.geode.protocol.responses.Result;
+import org.apache.geode.protocol.responses.Success;
import org.apache.geode.protocol.protobuf.utilities.ProtobufResponseUtilities;
import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities;
import org.apache.geode.serialization.SerializationService;
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/PutAllRequestOperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/PutAllRequestOperationHandler.java
index b3ca344..1194b21 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/PutAllRequestOperationHandler.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/PutAllRequestOperationHandler.java
@@ -15,7 +15,6 @@
package org.apache.geode.protocol.protobuf.operations;
import java.util.Objects;
-import java.util.stream.Collectors;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -26,11 +25,11 @@ import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
import org.apache.geode.internal.exception.InvalidExecutionContextException;
import org.apache.geode.protocol.operations.OperationHandler;
import org.apache.geode.internal.protocol.protobuf.BasicTypes;
-import org.apache.geode.protocol.protobuf.Failure;
+import org.apache.geode.protocol.responses.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.protocol.protobuf.Success;
+import org.apache.geode.protocol.responses.Result;
+import org.apache.geode.protocol.responses.Success;
import org.apache.geode.protocol.protobuf.utilities.ProtobufResponseUtilities;
import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities;
import org.apache.geode.serialization.SerializationService;
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/PutRequestOperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/PutRequestOperationHandler.java
index 3be4a84..bcd0fdd 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/PutRequestOperationHandler.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/PutRequestOperationHandler.java
@@ -20,11 +20,11 @@ import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
import org.apache.geode.internal.exception.InvalidExecutionContextException;
import org.apache.geode.protocol.operations.OperationHandler;
import org.apache.geode.internal.protocol.protobuf.BasicTypes;
-import org.apache.geode.protocol.protobuf.Failure;
+import org.apache.geode.protocol.responses.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.protocol.protobuf.Success;
+import org.apache.geode.protocol.responses.Result;
+import org.apache.geode.protocol.responses.Success;
import org.apache.geode.protocol.protobuf.utilities.ProtobufResponseUtilities;
import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities;
import org.apache.geode.serialization.SerializationService;
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/RemoveRequestOperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/RemoveRequestOperationHandler.java
index 513dc25..51ff1e2 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/RemoveRequestOperationHandler.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/RemoveRequestOperationHandler.java
@@ -22,11 +22,11 @@ import org.apache.geode.cache.Region;
import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
import org.apache.geode.internal.exception.InvalidExecutionContextException;
import org.apache.geode.protocol.operations.OperationHandler;
-import org.apache.geode.protocol.protobuf.Failure;
+import org.apache.geode.protocol.responses.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.protocol.protobuf.Success;
+import org.apache.geode.protocol.responses.Result;
+import org.apache.geode.protocol.responses.Success;
import org.apache.geode.protocol.protobuf.utilities.ProtobufResponseUtilities;
import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities;
import org.apache.geode.serialization.SerializationService;
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/Failure.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/responses/Failure.java
similarity index 97%
rename from geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/Failure.java
rename to geode-protobuf/src/main/java/org/apache/geode/protocol/responses/Failure.java
index e1595dc..a5e0c97 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/Failure.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/responses/Failure.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.protocol.protobuf;
+package org.apache.geode.protocol.responses;
import java.util.function.Function;
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/Result.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/responses/Result.java
similarity index 96%
rename from geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/Result.java
rename to geode-protobuf/src/main/java/org/apache/geode/protocol/responses/Result.java
index f0c3b32..df5e32b 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/Result.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/responses/Result.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.protocol.protobuf;
+package org.apache.geode.protocol.responses;
import java.util.function.Function;
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/Success.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/responses/Success.java
similarity index 97%
rename from geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/Success.java
rename to geode-protobuf/src/main/java/org/apache/geode/protocol/responses/Success.java
index 0d3895b..4d1bba2 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/Success.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/responses/Success.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.protocol.protobuf;
+package org.apache.geode.protocol.responses;
import java.util.function.Function;
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 45977b2..9b1bc44 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
@@ -37,8 +37,8 @@ import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
import org.apache.geode.internal.exception.InvalidExecutionContextException;
import org.apache.geode.internal.protocol.protobuf.BasicTypes;
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.responses.Result;
+import org.apache.geode.protocol.responses.Success;
import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities;
import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities;
import org.apache.geode.internal.security.server.NoOpAuthorizer;
diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetAvailableServersOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetAvailableServersOperationHandlerJUnitTest.java
index 492f19f..32bf5db 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetAvailableServersOperationHandlerJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetAvailableServersOperationHandlerJUnitTest.java
@@ -21,10 +21,10 @@ import org.apache.geode.distributed.internal.ServerLocator;
import org.apache.geode.internal.exception.InvalidExecutionContextException;
import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
import org.apache.geode.internal.protocol.protobuf.BasicTypes;
-import org.apache.geode.protocol.protobuf.Result;
+import org.apache.geode.protocol.responses.Result;
import org.apache.geode.internal.protocol.protobuf.ServerAPI;
import org.apache.geode.internal.protocol.protobuf.ServerAPI.GetAvailableServersResponse;
-import org.apache.geode.protocol.protobuf.Success;
+import org.apache.geode.protocol.responses.Success;
import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities;
import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Before;
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 df089a7..7f79f25 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
@@ -30,8 +30,8 @@ import org.apache.geode.cache.Region;
import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
import org.apache.geode.internal.exception.InvalidExecutionContextException;
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.responses.Result;
+import org.apache.geode.protocol.responses.Success;
import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities;
import org.apache.geode.internal.security.server.NoOpAuthorizer;
import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException;
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 c344973..15c84c3 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
@@ -24,10 +24,10 @@ import org.apache.geode.internal.exception.InvalidExecutionContextException;
import org.apache.geode.protocol.MessageUtil;
import org.apache.geode.internal.protocol.protobuf.BasicTypes;
import org.apache.geode.internal.protocol.protobuf.ClientProtocol;
-import org.apache.geode.protocol.protobuf.Failure;
+import org.apache.geode.protocol.responses.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.protocol.responses.Result;
import org.apache.geode.internal.security.server.NoOpAuthorizer;
import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException;
import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredForTypeException;
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 17c2cb3..370ed41 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
@@ -19,11 +19,11 @@ import org.apache.geode.cache.Region;
import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
import org.apache.geode.internal.exception.InvalidExecutionContextException;
import org.apache.geode.internal.protocol.protobuf.BasicTypes;
-import org.apache.geode.protocol.protobuf.Failure;
+import org.apache.geode.protocol.responses.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.protocol.protobuf.Success;
+import org.apache.geode.protocol.responses.Result;
+import org.apache.geode.protocol.responses.Success;
import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities;
import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities;
import org.apache.geode.internal.security.server.NoOpAuthorizer;
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 3ddeae7..816ea5e 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
@@ -19,8 +19,8 @@ import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
import org.apache.geode.internal.exception.InvalidExecutionContextException;
import org.apache.geode.internal.protocol.protobuf.BasicTypes;
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.responses.Result;
+import org.apache.geode.protocol.responses.Success;
import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities;
import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities;
import org.apache.geode.internal.security.server.NoOpAuthorizer;
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 37309ff..c3c4e73 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
@@ -19,11 +19,11 @@ import org.apache.geode.cache.Region;
import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
import org.apache.geode.internal.exception.InvalidExecutionContextException;
import org.apache.geode.internal.protocol.protobuf.BasicTypes;
-import org.apache.geode.protocol.protobuf.Failure;
+import org.apache.geode.protocol.responses.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.protocol.protobuf.Success;
+import org.apache.geode.protocol.responses.Result;
+import org.apache.geode.protocol.responses.Success;
import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities;
import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities;
import org.apache.geode.internal.security.server.NoOpAuthorizer;
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 81ce080..b149fbe 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
@@ -20,11 +20,11 @@ import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
import org.apache.geode.internal.exception.InvalidExecutionContextException;
import org.apache.geode.internal.protocol.protobuf.BasicTypes;
import org.apache.geode.internal.protocol.protobuf.ClientProtocol;
-import org.apache.geode.protocol.protobuf.Failure;
+import org.apache.geode.protocol.responses.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.protocol.protobuf.Success;
+import org.apache.geode.protocol.responses.Result;
+import org.apache.geode.protocol.responses.Success;
import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities;
import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities;
import org.apache.geode.internal.security.server.NoOpAuthorizer;
--
To stop receiving notification emails like this one, please contact
"commits@geode.apache.org" <co...@geode.apache.org>.
[geode] 01/08: Moved NoOpAuthenticator.java and NoOpAuthorizer.java
out of core
Posted by ud...@apache.org.
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 4ed66660c2dc6a3e9f9d6f9451faf6e1a85f1b02
Author: kohlmu-pivotal <uk...@pivotal.io>
AuthorDate: Fri Sep 8 15:48:07 2017 -0700
Moved NoOpAuthenticator.java and NoOpAuthorizer.java out of core
---
.../distributed/internal/tcpserver/TcpServer.java | 45 ++++++++--------------
.../sockets/GenericProtocolServerConnection.java | 24 ++++++------
.../tier/sockets/MessageExecutionContext.java | 9 ++---
.../tier/sockets/ServerConnectionFactory.java | 12 +++---
.../apache/geode/security/server/Authorizer.java | 4 +-
.../org.apache.geode.security.server.Authenticator | 2 +-
.../protocol/protobuf/ProtobufOpsProcessor.java | 22 +++++++++--
.../protobuf/ProtobufSimpleAuthenticator.java | 44 +++++++++++----------
.../geode/security/server/NoOpAuthenticator.java | 0
.../geode/security/server/NoOpAuthorizer.java | 0
.../org.apache.geode.security.server.Authenticator | 3 +-
.../GenericProtocolServerConnectionTest.java | 0
.../RoundTripCacheConnectionJUnitTest.java | 7 +---
13 files changed, 86 insertions(+), 86 deletions(-)
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpServer.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpServer.java
index a721589..6ec265a 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpServer.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpServer.java
@@ -68,27 +68,20 @@ import org.apache.geode.internal.security.SecurableCommunicationChannel;
/**
* TCP server which listens on a port and delegates requests to a request handler. The server uses
- * expects messages containing a global version number, followed by a DataSerializable object
- * <p>
+ * expects messages containing a global version number, followed by a DataSerializable object <p>
* This code was factored out of GossipServer.java to allow multiple handlers to share the same
* gossip server port.
- *
* @since GemFire 5.7
*/
public class TcpServer {
/**
- * The version of the tcp server protocol
- * <p>
- * This should be incremented if the gossip message structures change
- * <p>
- * 0 - special indicator of a non-gossip message from a client<br>
- * 1000 - gemfire 5.5 - using java serialization<br>
- * 1001 - 5.7 - using DataSerializable and supporting server locator messages.<br>
- * 1002 - 7.1 - sending GemFire version along with GOSSIP_VERSION in each request.
- * <p>
- * with the addition of support for all old versions of clients you can no longer change this
- * version number
+ * The version of the tcp server protocol <p> This should be incremented if the gossip message
+ * structures change <p> 0 - special indicator of a non-gossip message from a client<br> 1000 -
+ * gemfire 5.5 - using java serialization<br> 1001 - 5.7 - using DataSerializable and supporting
+ * server locator messages.<br> 1002 - 7.1 - sending GemFire version along with GOSSIP_VERSION in
+ * each request. <p> with the addition of support for all old versions of clients you can no
+ * longer change this version number
*/
public final static int GOSSIPVERSION = 1002;
public final static int NON_GOSSIP_REQUEST_VERSION = 0;
@@ -97,12 +90,7 @@ public class TcpServer {
// GossipServer.
public final static int OLDGOSSIPVERSION = 1001;
- private static/* GemStoneAddition */ final Map GOSSIP_TO_GEMFIRE_VERSION_MAP = new HashMap();
-
- /**
- * For the new client-server protocol, which ignores the usual handshake mechanism.
- */
- public static final byte PROTOBUF_CLIENT_SERVER_PROTOCOL = (byte) 110;
+ private static final Map GOSSIP_TO_GEMFIRE_VERSION_MAP = new HashMap();
// For test purpose only
public static boolean isTesting = false;
@@ -117,7 +105,7 @@ public class TcpServer {
private static final Logger log = LogService.getLogger();
- protected/* GemStoneAddition */ final/* GemStoneAddition */ static int READ_TIMEOUT =
+ protected final static int READ_TIMEOUT =
Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "TcpServer.READ_TIMEOUT", 60 * 1000);
// This is for backwards compatibility. The p2p.backlog flag used to be the only way to configure
// the locator backlog.
@@ -156,9 +144,9 @@ public class TcpServer {
}
public TcpServer(int port, InetAddress bind_address, Properties sslConfig,
- DistributionConfigImpl cfg, TcpHandler handler, PoolStatHelper poolHelper,
- ThreadGroup threadGroup, String threadName, InternalLocator internalLocator,
- ClientProtocolMessageHandler messageHandler) {
+ DistributionConfigImpl cfg, TcpHandler handler, PoolStatHelper poolHelper,
+ ThreadGroup threadGroup, String threadName, InternalLocator internalLocator,
+ ClientProtocolMessageHandler messageHandler) {
this.port = port;
this.bind_address = bind_address;
this.handler = handler;
@@ -191,7 +179,7 @@ public class TcpServer {
}
private static PooledExecutorWithDMStats createExecutor(PoolStatHelper poolHelper,
- final ThreadGroup threadGroup) {
+ final ThreadGroup threadGroup) {
ThreadFactory factory = new ThreadFactory() {
private final AtomicInteger threadNum = new AtomicInteger();
@@ -208,7 +196,7 @@ public class TcpServer {
}
public void restarting(InternalDistributedSystem ds, InternalCache cache,
- ClusterConfigurationService sharedConfig) throws IOException {
+ ClusterConfigurationService sharedConfig) throws IOException {
this.shuttingDown = false;
this.handler.restarting(ds, cache, sharedConfig);
startServerThread();
@@ -278,7 +266,6 @@ public class TcpServer {
/**
* Returns the value of the bound port. If the server was initialized with a port of 0 indicating
* that any ephemeral port should be used, this method will return the actual bound port.
- *
* @return the locator's tcp/ip port. This will be zero if the locator hasn't been started.
*/
public int getPort() {
@@ -372,7 +359,8 @@ public class TcpServer {
short versionOrdinal;
if (gossipVersion == NON_GOSSIP_REQUEST_VERSION) {
- if (input.readUnsignedByte() == PROTOBUF_CLIENT_SERVER_PROTOCOL
+ if (input.readUnsignedByte() == CommunicationMode.ProtobufClientServerProtocol
+ .getModeNumber()
&& Boolean.getBoolean("geode.feature-protobuf-protocol")) {
messageHandler.receiveMessage(input, socket.getOutputStream(),
new MessageExecutionContext(internalLocator));
@@ -538,7 +526,6 @@ public class TcpServer {
/**
* Returns GossipVersion for older Gemfire versions.
- *
* @return gossip version
*/
public static int getGossipVersionForOrdinal(short ordinal) {
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 6c81028..cf94af9 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,6 +15,7 @@
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;
@@ -41,11 +42,15 @@ public class GenericProtocolServerConnection extends ServerConnection {
* Creates a new <code>GenericProtocolServerConnection</code> that processes messages received
* from an edge client over a given <code>Socket</code>.
*/
- public GenericProtocolServerConnection(Socket s, InternalCache c, CachedRegionHelper helper,
- CacheServerStats stats, int hsTimeout, int socketBufferSize, String communicationModeStr,
- byte communicationMode, Acceptor acceptor, ClientProtocolMessageHandler newClientProtocol,
- SecurityService securityService, Authenticator authenticator) {
- super(s, c, helper, stats, hsTimeout, socketBufferSize, communicationModeStr, communicationMode,
+ GenericProtocolServerConnection(Socket socket, InternalCache cache,
+ CachedRegionHelper cachedRegionHelper,
+ CacheServerStats cacheServerStats, int hsTimeout,
+ int socketBufferSize, String communicationModeStr,
+ byte communicationMode, Acceptor acceptor,
+ ClientProtocolMessageHandler newClientProtocol,
+ SecurityService securityService, Authenticator authenticator) {
+ super(socket, cache, cachedRegionHelper, cacheServerStats, hsTimeout, socketBufferSize,
+ communicationModeStr, communicationMode,
acceptor, securityService);
securityManager = securityService.getSecurityManager();
this.messageHandler = newClientProtocol;
@@ -59,12 +64,9 @@ public class GenericProtocolServerConnection extends ServerConnection {
InputStream inputStream = socket.getInputStream();
OutputStream outputStream = socket.getOutputStream();
- if (!authenticator.isAuthenticated()) {
- authenticator.authenticate(inputStream, outputStream, securityManager);
- } else {
- messageHandler.receiveMessage(inputStream, outputStream,
- new MessageExecutionContext(this.getCache(), authenticator.getAuthorizer()));
- }
+ authenticator.authenticate(inputStream, outputStream, securityManager);
+ messageHandler.receiveMessage(inputStream, outputStream,
+ new MessageExecutionContext(this.getCache(), authenticator.getAuthorizer()));
} catch (EOFException e) {
this.setFlagProcessMessagesAsFalse();
setClientDisconnectedException(e);
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 1130ce7..d68a165 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
@@ -18,9 +18,7 @@ package org.apache.geode.internal.cache.tier.sockets;
import org.apache.geode.annotations.Experimental;
import org.apache.geode.cache.Cache;
import org.apache.geode.distributed.Locator;
-import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.internal.exception.InvalidExecutionContextException;
-import org.apache.geode.security.server.NoOpAuthorizer;
import org.apache.geode.security.server.Authorizer;
@Experimental
@@ -34,14 +32,13 @@ public class MessageExecutionContext {
this.authorizer = streamAuthorizer;
}
- public MessageExecutionContext(InternalLocator locator) {
+
+ public MessageExecutionContext(Locator locator) {
this.locator = locator;
- // set a no-op authorizer until such time as locators implement authentication
- // and authorization checks
- this.authorizer = new NoOpAuthorizer();
}
/**
+
* Returns the cache associated with this execution
* <p>
*
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 f0348c3..722cd34 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
@@ -36,8 +36,6 @@ public class ServerConnectionFactory {
private ClientProtocolMessageHandler protocolHandler;
private Map<String, Class<? extends Authenticator>> authenticators = null;
- public ServerConnectionFactory() {}
-
private synchronized void initializeAuthenticatorsMap() {
if (authenticators != null) {
return;
@@ -85,23 +83,23 @@ public class ServerConnectionFactory {
return protocolHandler;
}
- public ServerConnection makeServerConnection(Socket s, InternalCache c, CachedRegionHelper helper,
- CacheServerStats stats, int hsTimeout, int socketBufferSize, String communicationModeStr,
+ public ServerConnection makeServerConnection(Socket socket, InternalCache cache, CachedRegionHelper cachedRegionHelper,
+ CacheServerStats cacheServerStats, int hsTimeout, int socketBufferSize, String communicationModeStr,
byte communicationMode, Acceptor acceptor, SecurityService securityService)
throws IOException {
- if (communicationMode == ProtobufClientServerProtocol.getModeNumber()) {
+ 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(s, c, helper, stats, hsTimeout, socketBufferSize,
+ return new GenericProtocolServerConnection(socket, cache, cachedRegionHelper, cacheServerStats, hsTimeout, socketBufferSize,
communicationModeStr, communicationMode, acceptor, getClientProtocolMessageHandler(),
securityService, findStreamAuthenticator(authenticationMode));
}
} else {
- return new LegacyServerConnection(s, c, helper, stats, hsTimeout, socketBufferSize,
+ return new LegacyServerConnection(socket, cache, cachedRegionHelper, cacheServerStats, hsTimeout, socketBufferSize,
communicationModeStr, communicationMode, acceptor, securityService);
}
}
diff --git a/geode-core/src/main/java/org/apache/geode/security/server/Authorizer.java b/geode-core/src/main/java/org/apache/geode/security/server/Authorizer.java
index fea2198..e3f5738 100644
--- a/geode-core/src/main/java/org/apache/geode/security/server/Authorizer.java
+++ b/geode-core/src/main/java/org/apache/geode/security/server/Authorizer.java
@@ -17,5 +17,7 @@ package org.apache.geode.security.server;
import org.apache.geode.security.ResourcePermission;
public interface Authorizer {
- boolean authorize(ResourcePermission permissionRequested);
+ default boolean authorize(ResourcePermission permissionRequested) {
+ return true;
+ }
}
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
index 4f34d2a..8b13789 100644
--- 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
@@ -1 +1 @@
-org.apache.geode.security.server.NoOpAuthenticator
+
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 7dee26b..d3ac9d7 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,6 +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.serialization.SerializationService;
/**
@@ -33,22 +35,23 @@ public class ProtobufOpsProcessor {
private final SerializationService serializationService;
public ProtobufOpsProcessor(SerializationService serializationService,
- OperationContextRegistry operationContextRegistry) {
+ OperationContextRegistry operationContextRegistry) {
this.serializationService = serializationService;
this.operationContextRegistry = operationContextRegistry;
}
public ClientProtocol.Response process(ClientProtocol.Request request,
- MessageExecutionContext context) {
+ MessageExecutionContext context) {
ClientProtocol.Request.RequestAPICase requestType = request.getRequestAPICase();
OperationContext operationContext = operationContextRegistry.getOperationContext(requestType);
ClientProtocol.Response.Builder builder;
Result result;
+ Authorizer authorizer = findAuthorizer(context);
try {
- if (context.getAuthorizer().authorize(operationContext.getAccessPermissionRequired())) {
+ if (authorizer.authorize(operationContext.getAccessPermissionRequired())) {
result = operationContext.getOperationHandler().process(serializationService,
operationContext.getFromRequest().apply(request), context);
- } else {
+ } else{
result = Failure.of(ProtobufResponseUtilities.makeErrorResponse(
ProtocolErrorCode.AUTHORIZATION_FAILED.codeValue,
"User isn't authorized for this operation."));
@@ -63,4 +66,15 @@ public class ProtobufOpsProcessor {
operationContext.getToErrorResponse());
return builder.build();
}
+
+ private Authorizer findAuthorizer(MessageExecutionContext context) {
+ Authorizer authorizer = context.getAuthorizer();
+ if(authorizer != null)
+ {
+ return authorizer;
+ }else{
+ //TODO Horrible HACK because we need to look this up correctly.
+ return new NoOpAuthorizer();
+ }
+ }
}
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 5fadadd..47b7fac 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
@@ -30,38 +30,42 @@ import java.util.Properties;
public class ProtobufSimpleAuthenticator implements Authenticator {
private ProtobufSimpleAuthorizer authorizer = null;
+ private boolean authenticationSuccessfull = false;
@Override
public void authenticate(InputStream inputStream, OutputStream outputStream,
- SecurityManager securityManager) throws IOException {
- AuthenticationAPI.SimpleAuthenticationRequest authenticationRequest =
- AuthenticationAPI.SimpleAuthenticationRequest.parseDelimitedFrom(inputStream);
- if (authenticationRequest == null) {
- throw new EOFException();
- }
+ SecurityManager securityManager) throws IOException {
+ if (!authenticationSuccessfull) {
+ AuthenticationAPI.SimpleAuthenticationRequest authenticationRequest =
+ AuthenticationAPI.SimpleAuthenticationRequest.parseDelimitedFrom(inputStream);
+ if (authenticationRequest == null) {
+ throw new EOFException();
+ }
- Properties properties = new Properties();
- properties.setProperty(ResourceConstants.USER_NAME, authenticationRequest.getUsername());
- properties.setProperty(ResourceConstants.PASSWORD, authenticationRequest.getPassword());
+ Properties properties = new Properties();
+ properties.setProperty(ResourceConstants.USER_NAME, authenticationRequest.getUsername());
+ properties.setProperty(ResourceConstants.PASSWORD, authenticationRequest.getPassword());
- authorizer = null; // authenticating a new user clears current authorizer
- try {
- Object principal = securityManager.authenticate(properties);
- if (principal != null) {
- authorizer = new ProtobufSimpleAuthorizer(principal, securityManager);
+ try {
+ Object principal = securityManager.authenticate(properties);
+ if (principal != null) {
+ authenticationSuccessfull = true;
+ authorizer = new ProtobufSimpleAuthorizer(principal, securityManager);
+ }
+ } catch (AuthenticationFailedException e) {
+ authorizer = null;
}
- } catch (AuthenticationFailedException e) {
- authorizer = null;
+
+ AuthenticationAPI.SimpleAuthenticationResponse.newBuilder()
+ .setAuthenticated(isAuthenticated())
+ .build().writeDelimitedTo(outputStream);
}
- AuthenticationAPI.SimpleAuthenticationResponse.newBuilder().setAuthenticated(isAuthenticated())
- .build().writeDelimitedTo(outputStream);
}
@Override
public boolean isAuthenticated() {
- // note: an authorizer is only created if the user has been authenticated
- return authorizer != null;
+ return authenticationSuccessfull;
}
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/security/server/NoOpAuthenticator.java b/geode-protobuf/src/main/java/org/apache/geode/security/server/NoOpAuthenticator.java
similarity index 100%
rename from geode-core/src/main/java/org/apache/geode/security/server/NoOpAuthenticator.java
rename to geode-protobuf/src/main/java/org/apache/geode/security/server/NoOpAuthenticator.java
diff --git a/geode-core/src/main/java/org/apache/geode/security/server/NoOpAuthorizer.java b/geode-protobuf/src/main/java/org/apache/geode/security/server/NoOpAuthorizer.java
similarity index 100%
rename from geode-core/src/main/java/org/apache/geode/security/server/NoOpAuthorizer.java
rename to geode-protobuf/src/main/java/org/apache/geode/security/server/NoOpAuthorizer.java
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
index 45e4eea..e13c994 100644
--- 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
@@ -1 +1,2 @@
-org.apache.geode.protocol.protobuf.ProtobufSimpleAuthenticator
\ No newline at end of file
+org.apache.geode.protocol.protobuf.ProtobufSimpleAuthenticator
+org.apache.geode.security.server.NoOpAuthenticator
\ No newline at end of file
diff --git a/geode-core/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
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/GenericProtocolServerConnectionTest.java
rename to geode-protobuf/src/test/java/org/apache/geode/internal/cache/tier/sockets/GenericProtocolServerConnectionTest.java
diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripCacheConnectionJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripCacheConnectionJUnitTest.java
index cc15e4f..b38771b 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripCacheConnectionJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripCacheConnectionJUnitTest.java
@@ -292,12 +292,7 @@ public class RoundTripCacheConnectionJUnitTest {
@Test
public void testNewProtocolRespectsMaxConnectionLimit() throws IOException, InterruptedException {
- cache.getDistributedSystem().disconnect();
-
- CacheFactory cacheFactory = new CacheFactory();
- cacheFactory.set(ConfigurationProperties.LOCATORS, "");
- cacheFactory.set(ConfigurationProperties.MCAST_PORT, "0");
- cache = cacheFactory.create();
+ cache.getCacheServers().get(0).stop();
CacheServer cacheServer = cache.addCacheServer();
final int cacheServerPort = AvailablePortHelper.getRandomAvailableTCPPort();
--
To stop receiving notification emails like this one, please contact
"commits@geode.apache.org" <co...@geode.apache.org>.
[geode] 02/08: Make Authentication and Authorization generic for
the GenericProtocolServerConnection.java moved Authentication into internal
packages.
Posted by ud...@apache.org.
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 <uk...@pivotal.io>
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
"commits@geode.apache.org" <co...@geode.apache.org>.
[geode] 07/08: refactored some more code
Posted by ud...@apache.org.
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 a0a3d3ea1dbec8d71bb27e05f5d280e3a5e80b05
Author: kohlmu-pivotal <uk...@pivotal.io>
AuthorDate: Mon Sep 11 16:33:09 2017 -0700
refactored some more code
---
.../distributed/internal/tcpserver/TcpServer.java | 4 ++--
.../geode/internal/cache/CacheServerImpl.java | 4 ++--
.../sockets/GenericProtocolServerConnection.java | 6 ++++--
.../cache/tier/sockets/ServerConnectionFactory.java | 3 ++-
.../cache/tier/sockets/TcpServerFactory.java | 1 +
.../ClientProtocolMessageHandler.java | 5 ++++-
.../MessageExecutionContext.java | 4 ++--
.../ProtocolMessageHandlerLookupService.java | 4 +++-
.../security/server/Authenticator.java | 2 +-
.../security/server/AuthenticatorLookupService.java | 16 +++++++++++++++-
.../{ => protocol}/security/server/Authorizer.java | 2 +-
.../security/server/NoOpAuthenticator.java | 2 +-
.../security/server/NoOpAuthorizer.java | 2 +-
.../{ => protocol}/security/server/package.html | 0
....internal.protocol.security.server.Authenticator | 1 +
...che.geode.internal.security.server.Authenticator | 1 -
.../geode/protocol/operations/OperationHandler.java | 2 +-
.../protocol/protobuf/ProtobufOpsProcessor.java | 6 +++---
.../protocol/protobuf/ProtobufStreamProcessor.java | 4 ++--
.../operations/GetAllRequestOperationHandler.java | 2 +-
.../GetAvailableServersOperationHandler.java | 2 +-
.../GetRegionNamesRequestOperationHandler.java | 2 +-
.../GetRegionRequestOperationHandler.java | 2 +-
.../operations/GetRequestOperationHandler.java | 2 +-
.../operations/PutAllRequestOperationHandler.java | 2 +-
.../operations/PutRequestOperationHandler.java | 2 +-
.../operations/RemoveRequestOperationHandler.java | 2 +-
.../server/ProtobufSimpleAuthenticator.java | 4 ++--
.../security/server/ProtobufSimpleAuthorizer.java | 2 +-
....internal.protocol.ClientProtocolMessageHandler} | 0
...internal.protocol.security.server.Authenticator} | 0
.../GenericProtocolServerConnectionTest.java | 3 ++-
.../protocol/RoundTripCacheConnectionJUnitTest.java | 21 ++++++++-------------
.../protobuf/ProtobufStreamProcessorTest.java | 4 ++--
.../GetAllRequestOperationHandlerJUnitTest.java | 4 ++--
...etAvailableServersOperationHandlerJUnitTest.java | 2 +-
...RegionNamesRequestOperationHandlerJUnitTest.java | 4 ++--
.../GetRegionRequestOperationHandlerJUnitTest.java | 4 ++--
.../GetRequestOperationHandlerJUnitTest.java | 4 ++--
.../PutAllRequestOperationHandlerJUnitTest.java | 4 ++--
.../PutRequestOperationHandlerJUnitTest.java | 4 ++--
.../RemoveRequestOperationHandlerJUnitTest.java | 4 ++--
.../server}/AuthenticationIntegrationTest.java | 2 +-
.../server}/AuthorizationIntegrationTest.java | 2 +-
44 files changed, 86 insertions(+), 67 deletions(-)
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpServer.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpServer.java
index cc8a8bb..bbf8be8 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpServer.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpServer.java
@@ -58,9 +58,9 @@ import org.apache.geode.internal.VersionedDataInputStream;
import org.apache.geode.internal.VersionedDataOutputStream;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.tier.CommunicationMode;
-import org.apache.geode.internal.cache.tier.sockets.ClientProtocolMessageHandler;
+import org.apache.geode.internal.protocol.ClientProtocolMessageHandler;
import org.apache.geode.internal.cache.tier.sockets.HandShake;
-import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
+import org.apache.geode.internal.protocol.MessageExecutionContext;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.net.SocketCreatorFactory;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerImpl.java
index bcd8b32..b5327a8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerImpl.java
@@ -27,6 +27,7 @@ import java.util.List;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.geode.internal.cache.tier.sockets.GenericProtocolServerConnection;
import org.apache.geode.internal.cache.tier.sockets.ServerConnectionFactory;
import org.apache.logging.log4j.Logger;
@@ -37,7 +38,6 @@ import org.apache.geode.InvalidValueException;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.ClientSession;
import org.apache.geode.cache.DataPolicy;
-import org.apache.geode.cache.DiskStore;
import org.apache.geode.cache.DiskStoreFactory;
import org.apache.geode.cache.DynamicRegionFactory;
import org.apache.geode.cache.EvictionAction;
@@ -95,7 +95,7 @@ public class CacheServerImpl extends AbstractCacheServer implements Distribution
/**
* The server connection factory, that provides either a
* {@link org.apache.geode.internal.cache.tier.sockets.LegacyServerConnection} or a new
- * {@link org.apache.geode.internal.cache.tier.sockets.GenericProtocolServerConnection}
+ * {@link GenericProtocolServerConnection}
*/
private final ServerConnectionFactory serverConnectionFactory = new ServerConnectionFactory();
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 01d5acc..1e69243 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
@@ -18,9 +18,11 @@ package org.apache.geode.internal.cache.tier.sockets;
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.protocol.ClientProtocolMessageHandler;
+import org.apache.geode.internal.protocol.MessageExecutionContext;
+import org.apache.geode.internal.protocol.security.server.Authenticator;
+import org.apache.geode.internal.protocol.security.server.AuthenticatorLookupService;
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 java.io.EOFException;
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 7b13fd0..c86ab83 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
@@ -23,8 +23,9 @@ 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.protocol.ProtocolMessageHandlerLookupService;
import org.apache.geode.internal.security.SecurityService;
-import org.apache.geode.internal.security.server.AuthenticatorLookupService;
+import org.apache.geode.internal.protocol.security.server.AuthenticatorLookupService;
/**
* Creates instances of ServerConnection based on the connection mode provided.
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 cd1e76a..15dff3b 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
@@ -28,6 +28,7 @@ import org.apache.geode.distributed.internal.PoolStatHelper;
import org.apache.geode.distributed.internal.tcpserver.TcpHandler;
import org.apache.geode.distributed.internal.tcpserver.TcpServer;
import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.protocol.ClientProtocolMessageHandler;
public class TcpServerFactory {
private ClientProtocolMessageHandler protocolHandler;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientProtocolMessageHandler.java b/geode-core/src/main/java/org/apache/geode/internal/protocol/ClientProtocolMessageHandler.java
similarity index 87%
rename from geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientProtocolMessageHandler.java
rename to geode-core/src/main/java/org/apache/geode/internal/protocol/ClientProtocolMessageHandler.java
index 0ced3aa..3c9be1c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientProtocolMessageHandler.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/protocol/ClientProtocolMessageHandler.java
@@ -13,12 +13,15 @@
* the License.
*/
-package org.apache.geode.internal.cache.tier.sockets;
+package org.apache.geode.internal.protocol;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import org.apache.geode.internal.cache.tier.sockets.GenericProtocolServerConnection;
+import org.apache.geode.internal.cache.tier.sockets.ServerConnectionFactory;
+
/**
* This is an interface that other modules can implement to hook into
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/protocol/MessageExecutionContext.java
similarity index 95%
rename from geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/MessageExecutionContext.java
rename to geode-core/src/main/java/org/apache/geode/internal/protocol/MessageExecutionContext.java
index 416cb28..f895688 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/protocol/MessageExecutionContext.java
@@ -13,13 +13,13 @@
* the License.
*/
-package org.apache.geode.internal.cache.tier.sockets;
+package org.apache.geode.internal.protocol;
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.internal.security.server.Authorizer;
+import org.apache.geode.internal.protocol.security.server.Authorizer;
@Experimental
public class MessageExecutionContext {
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/protocol/ProtocolMessageHandlerLookupService.java
similarity index 88%
rename from geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ProtocolMessageHandlerLookupService.java
rename to geode-core/src/main/java/org/apache/geode/internal/protocol/ProtocolMessageHandlerLookupService.java
index ca1cecd..418eecc 100644
--- 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/protocol/ProtocolMessageHandlerLookupService.java
@@ -1,8 +1,10 @@
-package org.apache.geode.internal.cache.tier.sockets;
+package org.apache.geode.internal.protocol;
import java.util.Iterator;
import java.util.ServiceLoader;
+import org.apache.geode.internal.cache.tier.sockets.ServiceLoadingFailureException;
+
public class ProtocolMessageHandlerLookupService {
private ClientProtocolMessageHandler protocolHandler;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/server/Authenticator.java b/geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/Authenticator.java
similarity index 97%
rename from geode-core/src/main/java/org/apache/geode/internal/security/server/Authenticator.java
rename to geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/Authenticator.java
index eddf190..f4d2b14 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/security/server/Authenticator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/Authenticator.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.internal.security.server;
+package org.apache.geode.internal.protocol.security.server;
import java.io.IOException;
import java.io.InputStream;
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/protocol/security/server/AuthenticatorLookupService.java
similarity index 65%
rename from geode-core/src/main/java/org/apache/geode/internal/security/server/AuthenticatorLookupService.java
rename to geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/AuthenticatorLookupService.java
index 3ce811a..06c92e3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/security/server/AuthenticatorLookupService.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/AuthenticatorLookupService.java
@@ -1,4 +1,18 @@
-package org.apache.geode.internal.security.server;
+/*
+ * 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.protocol.security.server;
import java.util.HashMap;
import java.util.Map;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/server/Authorizer.java b/geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/Authorizer.java
similarity index 94%
rename from geode-core/src/main/java/org/apache/geode/internal/security/server/Authorizer.java
rename to geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/Authorizer.java
index 861d2c0..b9c69fe 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/security/server/Authorizer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/Authorizer.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.internal.security.server;
+package org.apache.geode.internal.protocol.security.server;
import org.apache.geode.annotations.Experimental;
import org.apache.geode.security.ResourcePermission;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/server/NoOpAuthenticator.java b/geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/NoOpAuthenticator.java
similarity index 96%
rename from geode-core/src/main/java/org/apache/geode/internal/security/server/NoOpAuthenticator.java
rename to geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/NoOpAuthenticator.java
index 24d3a18..4b41c9f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/security/server/NoOpAuthenticator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/protocol/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.internal.security.server;
+package org.apache.geode.internal.protocol.security.server;
import java.io.IOException;
import java.io.InputStream;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/server/NoOpAuthorizer.java b/geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/NoOpAuthorizer.java
similarity index 94%
rename from geode-core/src/main/java/org/apache/geode/internal/security/server/NoOpAuthorizer.java
rename to geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/NoOpAuthorizer.java
index d7f50b1..3f0e01a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/security/server/NoOpAuthorizer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/protocol/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.internal.security.server;
+package org.apache.geode.internal.protocol.security.server;
import org.apache.geode.security.ResourcePermission;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/server/package.html b/geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/package.html
similarity index 100%
rename from geode-core/src/main/java/org/apache/geode/internal/security/server/package.html
rename to geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/package.html
diff --git a/geode-core/src/main/resources/META-INF/services/org.apache.geode.internal.protocol.security.server.Authenticator b/geode-core/src/main/resources/META-INF/services/org.apache.geode.internal.protocol.security.server.Authenticator
new file mode 100644
index 0000000..e115aae
--- /dev/null
+++ b/geode-core/src/main/resources/META-INF/services/org.apache.geode.internal.protocol.security.server.Authenticator
@@ -0,0 +1 @@
+org.apache.geode.internal.protocol.security.server.NoOpAuthenticator
\ No newline at end of file
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
deleted file mode 100644
index f459a51..0000000
--- a/geode-core/src/main/resources/META-INF/services/org.apache.geode.internal.security.server.Authenticator
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.geode.internal.security.server.NoOpAuthenticator
\ No newline at end of file
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/operations/OperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/operations/OperationHandler.java
index e1a6f9f..8e9e4c0 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/operations/OperationHandler.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/operations/OperationHandler.java
@@ -15,7 +15,7 @@
package org.apache.geode.protocol.operations;
import org.apache.geode.annotations.Experimental;
-import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
+import org.apache.geode.internal.protocol.MessageExecutionContext;
import org.apache.geode.internal.exception.InvalidExecutionContextException;
import org.apache.geode.protocol.protobuf.ProtobufOpsProcessor;
import org.apache.geode.protocol.responses.Result;
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 a06c655..555c189 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
@@ -15,13 +15,13 @@
package org.apache.geode.protocol.protobuf;
import org.apache.geode.annotations.Experimental;
-import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
+import org.apache.geode.internal.protocol.MessageExecutionContext;
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.internal.security.server.Authorizer;
-import org.apache.geode.internal.security.server.NoOpAuthorizer;
+import org.apache.geode.internal.protocol.security.server.Authorizer;
+import org.apache.geode.internal.protocol.security.server.NoOpAuthorizer;
import org.apache.geode.protocol.responses.Failure;
import org.apache.geode.protocol.responses.Result;
import org.apache.geode.serialization.SerializationService;
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufStreamProcessor.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufStreamProcessor.java
index f28c310..22534ab 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufStreamProcessor.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufStreamProcessor.java
@@ -20,8 +20,8 @@ import java.io.InputStream;
import java.io.OutputStream;
import org.apache.geode.annotations.Experimental;
-import org.apache.geode.internal.cache.tier.sockets.ClientProtocolMessageHandler;
-import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
+import org.apache.geode.internal.protocol.ClientProtocolMessageHandler;
+import org.apache.geode.internal.protocol.MessageExecutionContext;
import org.apache.geode.protocol.exception.InvalidProtocolMessageException;
import org.apache.geode.internal.protocol.protobuf.ClientProtocol;
import org.apache.geode.protocol.protobuf.registry.OperationContextRegistry;
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandler.java
index 85a3f81..9715ea8 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandler.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandler.java
@@ -19,7 +19,7 @@ import org.apache.geode.cache.CacheLoaderException;
import org.apache.geode.cache.PartitionedRegionStorageException;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.TimeoutException;
-import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
+import org.apache.geode.internal.protocol.MessageExecutionContext;
import org.apache.geode.internal.exception.InvalidExecutionContextException;
import org.apache.geode.internal.protocol.protobuf.BasicTypes;
import org.apache.geode.internal.protocol.protobuf.RegionAPI;
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAvailableServersOperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAvailableServersOperationHandler.java
index eefd9f0..1c9a6fa 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAvailableServersOperationHandler.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAvailableServersOperationHandler.java
@@ -20,7 +20,7 @@ import java.util.List;
import org.apache.geode.annotations.Experimental;
import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.distributed.internal.ServerLocation;
-import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
+import org.apache.geode.internal.protocol.MessageExecutionContext;
import org.apache.geode.internal.exception.InvalidExecutionContextException;
import org.apache.geode.internal.protocol.protobuf.BasicTypes;
import org.apache.geode.internal.protocol.protobuf.ServerAPI;
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRegionNamesRequestOperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRegionNamesRequestOperationHandler.java
index 98a24c0..e819b1f 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRegionNamesRequestOperationHandler.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRegionNamesRequestOperationHandler.java
@@ -18,7 +18,7 @@ import java.util.Set;
import org.apache.geode.annotations.Experimental;
import org.apache.geode.cache.Region;
-import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
+import org.apache.geode.internal.protocol.MessageExecutionContext;
import org.apache.geode.internal.exception.InvalidExecutionContextException;
import org.apache.geode.protocol.operations.OperationHandler;
import org.apache.geode.internal.protocol.protobuf.RegionAPI;
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRegionRequestOperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRegionRequestOperationHandler.java
index fcf0cfa..2e94cb8 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRegionRequestOperationHandler.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRegionRequestOperationHandler.java
@@ -16,7 +16,7 @@ package org.apache.geode.protocol.protobuf.operations;
import org.apache.geode.annotations.Experimental;
import org.apache.geode.cache.Region;
-import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
+import org.apache.geode.internal.protocol.MessageExecutionContext;
import org.apache.geode.internal.exception.InvalidExecutionContextException;
import org.apache.geode.internal.protocol.protobuf.BasicTypes;
import org.apache.geode.protocol.operations.OperationHandler;
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRequestOperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRequestOperationHandler.java
index eeea966..5f37a76 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRequestOperationHandler.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRequestOperationHandler.java
@@ -16,7 +16,7 @@ package org.apache.geode.protocol.protobuf.operations;
import org.apache.geode.annotations.Experimental;
import org.apache.geode.cache.Region;
-import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
+import org.apache.geode.internal.protocol.MessageExecutionContext;
import org.apache.geode.internal.exception.InvalidExecutionContextException;
import org.apache.geode.protocol.operations.OperationHandler;
import org.apache.geode.internal.protocol.protobuf.BasicTypes;
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/PutAllRequestOperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/PutAllRequestOperationHandler.java
index 845f6cf..03f7379 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/PutAllRequestOperationHandler.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/PutAllRequestOperationHandler.java
@@ -21,7 +21,7 @@ import org.apache.logging.log4j.Logger;
import org.apache.geode.annotations.Experimental;
import org.apache.geode.cache.Region;
-import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
+import org.apache.geode.internal.protocol.MessageExecutionContext;
import org.apache.geode.internal.exception.InvalidExecutionContextException;
import org.apache.geode.protocol.operations.OperationHandler;
import org.apache.geode.internal.protocol.protobuf.BasicTypes;
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/PutRequestOperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/PutRequestOperationHandler.java
index bcd0fdd..3a89fa2 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/PutRequestOperationHandler.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/PutRequestOperationHandler.java
@@ -16,7 +16,7 @@ package org.apache.geode.protocol.protobuf.operations;
import org.apache.geode.annotations.Experimental;
import org.apache.geode.cache.Region;
-import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
+import org.apache.geode.internal.protocol.MessageExecutionContext;
import org.apache.geode.internal.exception.InvalidExecutionContextException;
import org.apache.geode.protocol.operations.OperationHandler;
import org.apache.geode.internal.protocol.protobuf.BasicTypes;
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/RemoveRequestOperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/RemoveRequestOperationHandler.java
index 51ff1e2..6d9b7a8 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/RemoveRequestOperationHandler.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/RemoveRequestOperationHandler.java
@@ -19,7 +19,7 @@ import org.apache.logging.log4j.Logger;
import org.apache.geode.annotations.Experimental;
import org.apache.geode.cache.Region;
-import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
+import org.apache.geode.internal.protocol.MessageExecutionContext;
import org.apache.geode.internal.exception.InvalidExecutionContextException;
import org.apache.geode.protocol.operations.OperationHandler;
import org.apache.geode.protocol.responses.Failure;
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/security/server/ProtobufSimpleAuthenticator.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/security/server/ProtobufSimpleAuthenticator.java
index 3d6bf58..ed2b9ec 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/security/server/ProtobufSimpleAuthenticator.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/security/server/ProtobufSimpleAuthenticator.java
@@ -17,10 +17,10 @@ package org.apache.geode.protocol.protobuf.security.server;
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.internal.security.server.Authenticator;
+import org.apache.geode.internal.protocol.security.server.Authenticator;
import org.apache.geode.security.AuthenticationFailedException;
import org.apache.geode.security.SecurityManager;
-import org.apache.geode.internal.security.server.Authorizer;
+import org.apache.geode.internal.protocol.security.server.Authorizer;
import java.io.EOFException;
import java.io.IOException;
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/security/server/ProtobufSimpleAuthorizer.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/security/server/ProtobufSimpleAuthorizer.java
index e0d7474..a67f9c4 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/security/server/ProtobufSimpleAuthorizer.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/security/server/ProtobufSimpleAuthorizer.java
@@ -16,7 +16,7 @@ package org.apache.geode.protocol.protobuf.security.server;
import org.apache.geode.security.ResourcePermission;
import org.apache.geode.security.SecurityManager;
-import org.apache.geode.internal.security.server.Authorizer;
+import org.apache.geode.internal.protocol.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.cache.tier.sockets.ClientProtocolMessageHandler b/geode-protobuf/src/main/resources/META-INF/services/org.apache.geode.internal.protocol.ClientProtocolMessageHandler
similarity index 100%
rename from geode-protobuf/src/main/resources/META-INF/services/org.apache.geode.internal.cache.tier.sockets.ClientProtocolMessageHandler
rename to geode-protobuf/src/main/resources/META-INF/services/org.apache.geode.internal.protocol.ClientProtocolMessageHandler
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.protocol.security.server.Authenticator
similarity index 100%
rename from geode-protobuf/src/main/resources/META-INF/services/org.apache.geode.internal.security.server.Authenticator
rename to geode-protobuf/src/main/resources/META-INF/services/org.apache.geode.internal.protocol.security.server.Authenticator
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 50ef5b1..6020b58 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
@@ -23,8 +23,9 @@ import org.apache.geode.internal.Assert;
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.protocol.ClientProtocolMessageHandler;
import org.apache.geode.internal.security.SecurityService;
-import org.apache.geode.internal.security.server.AuthenticatorLookupService;
+import org.apache.geode.internal.protocol.security.server.AuthenticatorLookupService;
import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripCacheConnectionJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripCacheConnectionJUnitTest.java
index b38771b..cf67a10 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripCacheConnectionJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripCacheConnectionJUnitTest.java
@@ -71,7 +71,6 @@ import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities;
import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities;
import org.apache.geode.serialization.SerializationService;
import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException;
-import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredForTypeException;
import org.apache.geode.serialization.registry.exception.CodecNotRegisteredForTypeException;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.util.test.TestUtil;
@@ -276,18 +275,16 @@ public class RoundTripCacheConnectionJUnitTest {
@Test
public void testConnectionCountIsProperlyDecremented() throws Exception {
- CacheServer cacheServer = this.cache.getCacheServers().stream().findFirst().get();
+ CacheServer cacheServer = this.cache.getCacheServers().get(0);
AcceptorImpl acceptor = ((CacheServerImpl) cacheServer).getAcceptor();
- Awaitility.await().atMost(30, TimeUnit.SECONDS).until(() -> {
- return acceptor.getClientServerCnxCount() == 1;
- });
+ Awaitility.await().atMost(30, TimeUnit.SECONDS)
+ .until(() -> acceptor.getClientServerCnxCount() == 1);
// run another test that creates a connection to the server
testNewProtocolGetRegionNamesCallSucceeds();
assertFalse(socket.isClosed());
socket.close();
- Awaitility.await().atMost(30, TimeUnit.SECONDS).until(() -> {
- return acceptor.getClientServerCnxCount() == 0;
- });
+ Awaitility.await().atMost(30, TimeUnit.SECONDS)
+ .until(() -> acceptor.getClientServerCnxCount() == 0);
}
@Test
@@ -404,8 +401,7 @@ public class RoundTripCacheConnectionJUnitTest {
private void validateGetResponse(Socket socket,
ProtobufProtocolSerializer protobufProtocolSerializer, Object expectedValue)
- throws InvalidProtocolMessageException, IOException, UnsupportedEncodingTypeException,
- CodecNotRegisteredForTypeException, CodecAlreadyRegisteredForTypeException {
+ throws InvalidProtocolMessageException, IOException {
ClientProtocol.Response response =
deserializeResponse(socket, protobufProtocolSerializer, TEST_GET_CORRELATION_ID);
@@ -457,9 +453,8 @@ public class RoundTripCacheConnectionJUnitTest {
}
private void validateGetAllResponse(Socket socket,
- ProtobufProtocolSerializer protobufProtocolSerializer)
- throws InvalidProtocolMessageException, IOException, UnsupportedEncodingTypeException,
- CodecNotRegisteredForTypeException, CodecAlreadyRegisteredForTypeException {
+ ProtobufProtocolSerializer protobufProtocolSerializer) throws InvalidProtocolMessageException,
+ IOException, UnsupportedEncodingTypeException, CodecNotRegisteredForTypeException {
ClientProtocol.Response response =
deserializeResponse(socket, protobufProtocolSerializer, TEST_GET_CORRELATION_ID);
assertEquals(ClientProtocol.Response.ResponseAPICase.GETALLRESPONSE,
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 6e93129..44f5158 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
@@ -26,8 +26,8 @@ import org.junit.Test;
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.internal.security.server.NoOpAuthorizer;
+import org.apache.geode.internal.protocol.MessageExecutionContext;
+import org.apache.geode.internal.protocol.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 9b1bc44..9b75a7c 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
@@ -33,7 +33,7 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheLoaderException;
import org.apache.geode.cache.Region;
-import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
+import org.apache.geode.internal.protocol.MessageExecutionContext;
import org.apache.geode.internal.exception.InvalidExecutionContextException;
import org.apache.geode.internal.protocol.protobuf.BasicTypes;
import org.apache.geode.internal.protocol.protobuf.RegionAPI;
@@ -41,7 +41,7 @@ import org.apache.geode.protocol.responses.Result;
import org.apache.geode.protocol.responses.Success;
import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities;
import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities;
-import org.apache.geode.internal.security.server.NoOpAuthorizer;
+import org.apache.geode.internal.protocol.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/GetAvailableServersOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetAvailableServersOperationHandlerJUnitTest.java
index 32bf5db..a38767a 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetAvailableServersOperationHandlerJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetAvailableServersOperationHandlerJUnitTest.java
@@ -19,7 +19,7 @@ import org.apache.geode.distributed.internal.LocatorLoadSnapshot;
import org.apache.geode.distributed.internal.ServerLocation;
import org.apache.geode.distributed.internal.ServerLocator;
import org.apache.geode.internal.exception.InvalidExecutionContextException;
-import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
+import org.apache.geode.internal.protocol.MessageExecutionContext;
import org.apache.geode.internal.protocol.protobuf.BasicTypes;
import org.apache.geode.protocol.responses.Result;
import org.apache.geode.internal.protocol.protobuf.ServerAPI;
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 7f79f25..dfb5798 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
@@ -27,13 +27,13 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.Region;
-import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
+import org.apache.geode.internal.protocol.MessageExecutionContext;
import org.apache.geode.internal.exception.InvalidExecutionContextException;
import org.apache.geode.internal.protocol.protobuf.RegionAPI;
import org.apache.geode.protocol.responses.Result;
import org.apache.geode.protocol.responses.Success;
import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities;
-import org.apache.geode.internal.security.server.NoOpAuthorizer;
+import org.apache.geode.internal.protocol.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 15c84c3..ae6fdec 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
@@ -19,7 +19,7 @@ import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.Scope;
-import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
+import org.apache.geode.internal.protocol.MessageExecutionContext;
import org.apache.geode.internal.exception.InvalidExecutionContextException;
import org.apache.geode.protocol.MessageUtil;
import org.apache.geode.internal.protocol.protobuf.BasicTypes;
@@ -28,7 +28,7 @@ import org.apache.geode.protocol.responses.Failure;
import org.apache.geode.protocol.protobuf.ProtocolErrorCode;
import org.apache.geode.internal.protocol.protobuf.RegionAPI;
import org.apache.geode.protocol.responses.Result;
-import org.apache.geode.internal.security.server.NoOpAuthorizer;
+import org.apache.geode.internal.protocol.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 370ed41..e45c9b7 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
@@ -16,7 +16,7 @@ package org.apache.geode.protocol.protobuf.operations;
import com.google.protobuf.ByteString;
import org.apache.geode.cache.Region;
-import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
+import org.apache.geode.internal.protocol.MessageExecutionContext;
import org.apache.geode.internal.exception.InvalidExecutionContextException;
import org.apache.geode.internal.protocol.protobuf.BasicTypes;
import org.apache.geode.protocol.responses.Failure;
@@ -26,7 +26,7 @@ import org.apache.geode.protocol.responses.Result;
import org.apache.geode.protocol.responses.Success;
import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities;
import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities;
-import org.apache.geode.internal.security.server.NoOpAuthorizer;
+import org.apache.geode.internal.protocol.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 816ea5e..b0acb22 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
@@ -15,7 +15,7 @@
package org.apache.geode.protocol.protobuf.operations;
import org.apache.geode.cache.Region;
-import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
+import org.apache.geode.internal.protocol.MessageExecutionContext;
import org.apache.geode.internal.exception.InvalidExecutionContextException;
import org.apache.geode.internal.protocol.protobuf.BasicTypes;
import org.apache.geode.internal.protocol.protobuf.RegionAPI;
@@ -23,7 +23,7 @@ import org.apache.geode.protocol.responses.Result;
import org.apache.geode.protocol.responses.Success;
import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities;
import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities;
-import org.apache.geode.internal.security.server.NoOpAuthorizer;
+import org.apache.geode.internal.protocol.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 c3c4e73..d4d988c 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
@@ -16,7 +16,7 @@ package org.apache.geode.protocol.protobuf.operations;
import com.google.protobuf.ByteString;
import org.apache.geode.cache.Region;
-import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
+import org.apache.geode.internal.protocol.MessageExecutionContext;
import org.apache.geode.internal.exception.InvalidExecutionContextException;
import org.apache.geode.internal.protocol.protobuf.BasicTypes;
import org.apache.geode.protocol.responses.Failure;
@@ -26,7 +26,7 @@ import org.apache.geode.protocol.responses.Result;
import org.apache.geode.protocol.responses.Success;
import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities;
import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities;
-import org.apache.geode.internal.security.server.NoOpAuthorizer;
+import org.apache.geode.internal.protocol.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 b149fbe..9c89e74 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
@@ -16,7 +16,7 @@ package org.apache.geode.protocol.protobuf.operations;
import com.google.protobuf.ByteString;
import org.apache.geode.cache.Region;
-import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
+import org.apache.geode.internal.protocol.MessageExecutionContext;
import org.apache.geode.internal.exception.InvalidExecutionContextException;
import org.apache.geode.internal.protocol.protobuf.BasicTypes;
import org.apache.geode.internal.protocol.protobuf.ClientProtocol;
@@ -27,7 +27,7 @@ import org.apache.geode.protocol.responses.Result;
import org.apache.geode.protocol.responses.Success;
import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities;
import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities;
-import org.apache.geode.internal.security.server.NoOpAuthorizer;
+import org.apache.geode.internal.protocol.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/AuthenticationIntegrationTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/security/server/AuthenticationIntegrationTest.java
similarity index 99%
rename from geode-protobuf/src/test/java/org/apache/geode/protocol/AuthenticationIntegrationTest.java
rename to geode-protobuf/src/test/java/org/apache/geode/protocol/security/server/AuthenticationIntegrationTest.java
index 02a053f..9db8342 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/protocol/AuthenticationIntegrationTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/security/server/AuthenticationIntegrationTest.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.protocol;
+package org.apache.geode.protocol.security.server;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/AuthorizationIntegrationTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/security/server/AuthorizationIntegrationTest.java
similarity index 99%
rename from geode-protobuf/src/test/java/org/apache/geode/protocol/AuthorizationIntegrationTest.java
rename to geode-protobuf/src/test/java/org/apache/geode/protocol/security/server/AuthorizationIntegrationTest.java
index 47bdbf5..c518ca8 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/protocol/AuthorizationIntegrationTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/security/server/AuthorizationIntegrationTest.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.protocol;
+package org.apache.geode.protocol.security.server;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
--
To stop receiving notification emails like this one, please contact
"commits@geode.apache.org" <co...@geode.apache.org>.
[geode] 06/08: spotlessApply
Posted by ud...@apache.org.
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 f165d34013a0dccd8311ea26f5291647dacb7be6
Author: kohlmu-pivotal <uk...@pivotal.io>
AuthorDate: Mon Sep 11 10:53:05 2017 -0700
spotlessApply
---
.../distributed/internal/tcpserver/TcpServer.java | 36 +++++++++++++---------
.../sockets/GenericProtocolServerConnection.java | 14 +++------
.../tier/sockets/MessageExecutionContext.java | 2 +-
.../ProtocolMessageHandlerLookupService.java | 2 +-
.../tier/sockets/ServerConnectionFactory.java | 20 +++++++-----
.../server/AuthenticatorLookupService.java | 3 +-
.../protocol/protobuf/EncodingTypeTranslator.java | 3 +-
.../protocol/protobuf/ProtobufOpsProcessor.java | 13 ++++----
.../operations/GetAllRequestOperationHandler.java | 5 ++-
.../GetAvailableServersOperationHandler.java | 6 ++--
.../operations/PutAllRequestOperationHandler.java | 3 +-
.../server/ProtobufSimpleAuthenticator.java | 5 ++-
12 files changed, 60 insertions(+), 52 deletions(-)
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpServer.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpServer.java
index 6ec265a..cc8a8bb 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpServer.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpServer.java
@@ -68,20 +68,27 @@ import org.apache.geode.internal.security.SecurableCommunicationChannel;
/**
* TCP server which listens on a port and delegates requests to a request handler. The server uses
- * expects messages containing a global version number, followed by a DataSerializable object <p>
+ * expects messages containing a global version number, followed by a DataSerializable object
+ * <p>
* This code was factored out of GossipServer.java to allow multiple handlers to share the same
* gossip server port.
+ *
* @since GemFire 5.7
*/
public class TcpServer {
/**
- * The version of the tcp server protocol <p> This should be incremented if the gossip message
- * structures change <p> 0 - special indicator of a non-gossip message from a client<br> 1000 -
- * gemfire 5.5 - using java serialization<br> 1001 - 5.7 - using DataSerializable and supporting
- * server locator messages.<br> 1002 - 7.1 - sending GemFire version along with GOSSIP_VERSION in
- * each request. <p> with the addition of support for all old versions of clients you can no
- * longer change this version number
+ * The version of the tcp server protocol
+ * <p>
+ * This should be incremented if the gossip message structures change
+ * <p>
+ * 0 - special indicator of a non-gossip message from a client<br>
+ * 1000 - gemfire 5.5 - using java serialization<br>
+ * 1001 - 5.7 - using DataSerializable and supporting server locator messages.<br>
+ * 1002 - 7.1 - sending GemFire version along with GOSSIP_VERSION in each request.
+ * <p>
+ * with the addition of support for all old versions of clients you can no longer change this
+ * version number
*/
public final static int GOSSIPVERSION = 1002;
public final static int NON_GOSSIP_REQUEST_VERSION = 0;
@@ -144,9 +151,9 @@ public class TcpServer {
}
public TcpServer(int port, InetAddress bind_address, Properties sslConfig,
- DistributionConfigImpl cfg, TcpHandler handler, PoolStatHelper poolHelper,
- ThreadGroup threadGroup, String threadName, InternalLocator internalLocator,
- ClientProtocolMessageHandler messageHandler) {
+ DistributionConfigImpl cfg, TcpHandler handler, PoolStatHelper poolHelper,
+ ThreadGroup threadGroup, String threadName, InternalLocator internalLocator,
+ ClientProtocolMessageHandler messageHandler) {
this.port = port;
this.bind_address = bind_address;
this.handler = handler;
@@ -179,7 +186,7 @@ public class TcpServer {
}
private static PooledExecutorWithDMStats createExecutor(PoolStatHelper poolHelper,
- final ThreadGroup threadGroup) {
+ final ThreadGroup threadGroup) {
ThreadFactory factory = new ThreadFactory() {
private final AtomicInteger threadNum = new AtomicInteger();
@@ -196,7 +203,7 @@ public class TcpServer {
}
public void restarting(InternalDistributedSystem ds, InternalCache cache,
- ClusterConfigurationService sharedConfig) throws IOException {
+ ClusterConfigurationService sharedConfig) throws IOException {
this.shuttingDown = false;
this.handler.restarting(ds, cache, sharedConfig);
startServerThread();
@@ -266,6 +273,7 @@ public class TcpServer {
/**
* Returns the value of the bound port. If the server was initialized with a port of 0 indicating
* that any ephemeral port should be used, this method will return the actual bound port.
+ *
* @return the locator's tcp/ip port. This will be zero if the locator hasn't been started.
*/
public int getPort() {
@@ -360,8 +368,7 @@ public class TcpServer {
short versionOrdinal;
if (gossipVersion == NON_GOSSIP_REQUEST_VERSION) {
if (input.readUnsignedByte() == CommunicationMode.ProtobufClientServerProtocol
- .getModeNumber()
- && Boolean.getBoolean("geode.feature-protobuf-protocol")) {
+ .getModeNumber() && Boolean.getBoolean("geode.feature-protobuf-protocol")) {
messageHandler.receiveMessage(input, socket.getOutputStream(),
new MessageExecutionContext(internalLocator));
} else {
@@ -526,6 +533,7 @@ public class TcpServer {
/**
* Returns GossipVersion for older Gemfire versions.
+ *
* @return gossip version
*/
public static int getGossipVersionForOrdinal(short ordinal) {
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 78861e3..01d5acc 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
@@ -43,16 +43,12 @@ public class GenericProtocolServerConnection extends ServerConnection {
* from an edge client over a given <code>Socket</code>.
*/
GenericProtocolServerConnection(Socket socket, InternalCache cache,
- CachedRegionHelper cachedRegionHelper,
- CacheServerStats cacheServerStats, int hsTimeout,
- int socketBufferSize, String communicationModeStr,
- byte communicationMode, Acceptor acceptor,
- SecurityService securityService,
- ClientProtocolMessageHandler clientProtocolMessageHandler,
- AuthenticatorLookupService authenticatorLookupService) {
+ CachedRegionHelper cachedRegionHelper, CacheServerStats cacheServerStats, int hsTimeout,
+ int socketBufferSize, String communicationModeStr, byte communicationMode, Acceptor acceptor,
+ SecurityService securityService, ClientProtocolMessageHandler clientProtocolMessageHandler,
+ AuthenticatorLookupService authenticatorLookupService) {
super(socket, cache, cachedRegionHelper, cacheServerStats, hsTimeout, socketBufferSize,
- communicationModeStr, communicationMode,
- acceptor, securityService);
+ communicationModeStr, communicationMode, acceptor, securityService);
securityManager = securityService.getSecurityManager();
this.messageHandler = clientProtocolMessageHandler;
this.authenticator = authenticatorLookupService.getAuthenticator();
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 f45d518..416cb28 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
@@ -38,7 +38,7 @@ public class MessageExecutionContext {
}
/**
-
+ *
* Returns the cache associated with this execution
* <p>
*
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
index 36f2624..ca1cecd 100644
--- 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
@@ -24,7 +24,7 @@ public class ProtocolMessageHandlerLookupService {
}
public ClientProtocolMessageHandler lookupProtocolHandler(String protocolType) {
- //TODO Do we need to make provision for different protocols here right now?
+ // 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 bfde7c0..7b13fd0 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
@@ -38,20 +38,24 @@ public class ServerConnectionFactory {
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)
- throws IOException {
+ public ServerConnection makeServerConnection(Socket socket, InternalCache cache,
+ CachedRegionHelper cachedRegionHelper, 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 {
- return new GenericProtocolServerConnection(socket, cache, cachedRegionHelper, cacheServerStats, hsTimeout, socketBufferSize,
- communicationModeStr, communicationMode, acceptor, securityService, protocolMessageHandlerLookupService.lookupProtocolHandler("protobuf"),authenticatorLookupService);
+ return new GenericProtocolServerConnection(socket, cache, cachedRegionHelper,
+ cacheServerStats, hsTimeout, socketBufferSize, communicationModeStr, communicationMode,
+ acceptor, securityService,
+ protocolMessageHandlerLookupService.lookupProtocolHandler("protobuf"),
+ authenticatorLookupService);
}
} else {
- return new LegacyServerConnection(socket, cache, cachedRegionHelper, cacheServerStats, hsTimeout, socketBufferSize,
- communicationModeStr, communicationMode, acceptor, securityService);
+ return new LegacyServerConnection(socket, cache, cachedRegionHelper, cacheServerStats,
+ hsTimeout, socketBufferSize, communicationModeStr, communicationMode, acceptor,
+ securityService);
}
}
}
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
index b7af501..3ce811a 100644
--- 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
@@ -30,7 +30,8 @@ public class AuthenticatorLookupService {
public Authenticator getAuthenticator() {
String authenticationMode = System.getProperty("geode.protocol-authentication-mode", "NOOP");
- Class<? extends Authenticator> streamAuthenticatorClass = authenticators.get(authenticationMode);
+ Class<? extends Authenticator> streamAuthenticatorClass =
+ authenticators.get(authenticationMode);
if (streamAuthenticatorClass == null) {
throw new GemFireConfigException(
"Could not find implementation for Authenticator with implementation ID "
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/EncodingTypeTranslator.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/EncodingTypeTranslator.java
index 9ae761d..afbb066 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/EncodingTypeTranslator.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/EncodingTypeTranslator.java
@@ -28,7 +28,8 @@ import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException
*/
@Experimental
public abstract class EncodingTypeTranslator {
- private static final HashMap<Class, BasicTypes.EncodingType> typeToEncodingMap = intializeTypeMap();
+ private static final HashMap<Class, BasicTypes.EncodingType> typeToEncodingMap =
+ intializeTypeMap();
private static HashMap<Class, BasicTypes.EncodingType> intializeTypeMap() {
HashMap<Class, BasicTypes.EncodingType> result = new HashMap<>();
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 04db646..a06c655 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
@@ -37,13 +37,13 @@ public class ProtobufOpsProcessor {
private final SerializationService serializationService;
public ProtobufOpsProcessor(SerializationService serializationService,
- OperationContextRegistry operationContextRegistry) {
+ OperationContextRegistry operationContextRegistry) {
this.serializationService = serializationService;
this.operationContextRegistry = operationContextRegistry;
}
public ClientProtocol.Response process(ClientProtocol.Request request,
- MessageExecutionContext context) {
+ MessageExecutionContext context) {
ClientProtocol.Request.RequestAPICase requestType = request.getRequestAPICase();
OperationContext operationContext = operationContextRegistry.getOperationContext(requestType);
ClientProtocol.Response.Builder builder;
@@ -53,7 +53,7 @@ public class ProtobufOpsProcessor {
if (authorizer.authorize(operationContext.getAccessPermissionRequired())) {
result = operationContext.getOperationHandler().process(serializationService,
operationContext.getFromRequest().apply(request), context);
- } else{
+ } else {
result = Failure.of(ProtobufResponseUtilities.makeErrorResponse(
ProtocolErrorCode.AUTHORIZATION_FAILED.codeValue,
"User isn't authorized for this operation."));
@@ -71,11 +71,10 @@ public class ProtobufOpsProcessor {
private Authorizer findAuthorizer(MessageExecutionContext context) {
Authorizer authorizer = context.getAuthorizer();
- if(authorizer != null)
- {
+ if (authorizer != null) {
return authorizer;
- }else{
- //TODO Horrible HACK because we need to look this up correctly.
+ } else {
+ // TODO Horrible HACK because we need to look this up correctly.
return new NoOpAuthorizer();
}
}
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandler.java
index 2d50fe1..85a3f81 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandler.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandler.java
@@ -51,12 +51,11 @@ public class GetAllRequestOperationHandler
RegionAPI.GetAllResponse.Builder responseBuilder = RegionAPI.GetAllResponse.newBuilder();
- request.getKeyList().stream()
- .map((key) -> processOneMessage(serializationService, region, key))
+ request.getKeyList().stream().map((key) -> processOneMessage(serializationService, region, key))
.forEach(entry -> {
if (entry instanceof BasicTypes.Entry) {
responseBuilder.addEntries((BasicTypes.Entry) entry);
- }else if (entry instanceof BasicTypes.KeyedError) {
+ } else if (entry instanceof BasicTypes.KeyedError) {
responseBuilder.addFailures((BasicTypes.KeyedError) entry);
}
});
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAvailableServersOperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAvailableServersOperationHandler.java
index 2ad8c10..eefd9f0 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAvailableServersOperationHandler.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAvailableServersOperationHandler.java
@@ -48,9 +48,9 @@ public class GetAvailableServersOperationHandler implements
ServerAPI.GetAvailableServersResponse.Builder serverResponseBuilder =
ServerAPI.GetAvailableServersResponse.newBuilder();
- serversFromSnapshot
- .stream().map(serverLocation -> getServerProtobufMessage((ServerLocation) serverLocation))
- .forEach( serverMessage -> serverResponseBuilder.addServers((BasicTypes.Server) serverMessage));
+ serversFromSnapshot.stream()
+ .map(serverLocation -> getServerProtobufMessage((ServerLocation) serverLocation)).forEach(
+ serverMessage -> serverResponseBuilder.addServers((BasicTypes.Server) serverMessage));
return Success.of(serverResponseBuilder.build());
}
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/PutAllRequestOperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/PutAllRequestOperationHandler.java
index 1194b21..845f6cf 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/PutAllRequestOperationHandler.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/PutAllRequestOperationHandler.java
@@ -55,7 +55,8 @@ public class PutAllRequestOperationHandler
RegionAPI.PutAllResponse.Builder builder = RegionAPI.PutAllResponse.newBuilder();
putAllRequest.getEntryList().stream()
- .map((entry) -> singlePut(serializationService, region, entry)).filter(Objects::nonNull).forEach(failedKey -> builder.addFailedKeys(failedKey));
+ .map((entry) -> singlePut(serializationService, region, entry)).filter(Objects::nonNull)
+ .forEach(failedKey -> builder.addFailedKeys(failedKey));
return Success.of(builder.build());
}
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/security/server/ProtobufSimpleAuthenticator.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/security/server/ProtobufSimpleAuthenticator.java
index 9892bef..3d6bf58 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/security/server/ProtobufSimpleAuthenticator.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/security/server/ProtobufSimpleAuthenticator.java
@@ -34,7 +34,7 @@ public class ProtobufSimpleAuthenticator implements Authenticator {
@Override
public void authenticate(InputStream inputStream, OutputStream outputStream,
- SecurityManager securityManager) throws IOException {
+ SecurityManager securityManager) throws IOException {
if (!authenticationSuccessfull) {
AuthenticationAPI.SimpleAuthenticationRequest authenticationRequest =
AuthenticationAPI.SimpleAuthenticationRequest.parseDelimitedFrom(inputStream);
@@ -57,8 +57,7 @@ public class ProtobufSimpleAuthenticator implements Authenticator {
}
AuthenticationAPI.SimpleAuthenticationResponse.newBuilder()
- .setAuthenticated(isAuthenticated())
- .build().writeDelimitedTo(outputStream);
+ .setAuthenticated(isAuthenticated()).build().writeDelimitedTo(outputStream);
}
}
--
To stop receiving notification emails like this one, please contact
"commits@geode.apache.org" <co...@geode.apache.org>.
[geode] 08/08: More changes relating to Authorization
Posted by ud...@apache.org.
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 4d048a60afd5246b29b63d169f37fbe3eb2368a1
Author: kohlmu-pivotal <uk...@pivotal.io>
AuthorDate: Thu Sep 14 11:24:19 2017 -0700
More changes relating to Authorization
---
.../sockets/GenericProtocolServerConnection.java | 27 +++++----
.../tier/sockets/ServerConnectionFactory.java | 11 ++--
.../protocol/ClientProtocolMessageHandler.java | 2 +
.../internal/protocol/MessageExecutionContext.java | 28 +++++++---
.../ProtocolMessageHandlerLookupService.java | 38 +++++++------
.../protocol/security/server/Authenticator.java | 12 +---
.../server/AuthenticatorLookupService.java | 2 +-
...ervice.java => AuthorizationLookupService.java} | 34 ++++++------
.../protocol/security/server/Authorizer.java | 6 +-
.../security/server/NoOpAuthenticator.java | 11 +---
.../protocol/security/server/NoOpAuthorizer.java | 9 ++-
...de.internal.protocol.security.server.Authorizer | 1 +
.../tier/sockets/ServerConnectionFactoryTest.java | 36 +++++-------
.../protocol/operations/OperationHandler.java | 6 +-
...essor.java => ProtobufOperationsProcessor.java} | 32 +++++------
...or.java => ProtobufProtocolMessageHandler.java} | 58 ++++++++++++++------
.../server/ProtobufSimpleAuthenticator.java | 53 ++++++++----------
.../security/server/ProtobufSimpleAuthorizer.java | 16 +++---
....internal.protocol.ClientProtocolMessageHandler | 2 +-
...de.internal.protocol.security.server.Authorizer | 1 +
.../GenericProtocolServerConnectionTest.java | 12 +++-
...ava => ProtobufProtocolMessageHandlerTest.java} | 10 ++--
.../ProtobufSimpleAuthenticatorJUnitTest.java | 42 ++++++++------
.../GetAllRequestOperationHandlerJUnitTest.java | 24 ++++----
...egionNamesRequestOperationHandlerJUnitTest.java | 20 ++-----
.../GetRegionRequestOperationHandlerJUnitTest.java | 48 ++++++----------
.../GetRequestOperationHandlerJUnitTest.java | 60 ++++++++++----------
.../PutAllRequestOperationHandlerJUnitTest.java | 51 ++++++++---------
.../PutRequestOperationHandlerJUnitTest.java | 64 ++++++++++------------
.../RemoveRequestOperationHandlerJUnitTest.java | 61 ++++++++++-----------
.../server/AuthenticationIntegrationTest.java | 43 ++++++++-------
.../server/AuthorizationIntegrationTest.java | 7 ++-
32 files changed, 416 insertions(+), 411 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 1e69243..6d9d361 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,22 +15,22 @@
package org.apache.geode.internal.cache.tier.sockets;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+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.protocol.ClientProtocolMessageHandler;
import org.apache.geode.internal.protocol.MessageExecutionContext;
import org.apache.geode.internal.protocol.security.server.Authenticator;
-import org.apache.geode.internal.protocol.security.server.AuthenticatorLookupService;
import org.apache.geode.internal.security.SecurityService;
+import org.apache.geode.security.AuthenticationFailedException;
import org.apache.geode.security.SecurityManager;
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.Socket;
-
/**
* Holds the socket and protocol handler for the new client protocol.
*/
@@ -48,12 +48,12 @@ public class GenericProtocolServerConnection extends ServerConnection {
CachedRegionHelper cachedRegionHelper, CacheServerStats cacheServerStats, int hsTimeout,
int socketBufferSize, String communicationModeStr, byte communicationMode, Acceptor acceptor,
SecurityService securityService, ClientProtocolMessageHandler clientProtocolMessageHandler,
- AuthenticatorLookupService authenticatorLookupService) {
+ Authenticator authenticator) {
super(socket, cache, cachedRegionHelper, cacheServerStats, hsTimeout, socketBufferSize,
communicationModeStr, communicationMode, acceptor, securityService);
securityManager = securityService.getSecurityManager();
this.messageHandler = clientProtocolMessageHandler;
- this.authenticator = authenticatorLookupService.getAuthenticator();
+ this.authenticator = authenticator;
}
@Override
@@ -63,9 +63,14 @@ public class GenericProtocolServerConnection extends ServerConnection {
InputStream inputStream = socket.getInputStream();
OutputStream outputStream = socket.getOutputStream();
- authenticator.authenticate(inputStream, outputStream, securityManager);
+ Object authenticationToken =
+ authenticator.authenticate(inputStream, outputStream, securityManager);
messageHandler.receiveMessage(inputStream, outputStream,
- new MessageExecutionContext(this.getCache(), authenticator.getAuthorizer()));
+ new MessageExecutionContext(this.getCache(), authenticationToken, securityManager));
+ } catch (AuthenticationFailedException e) {
+ logger.warn(e);
+ this.setFlagProcessMessagesAsFalse();
+ setClientDisconnectedException(e);
} catch (EOFException e) {
this.setFlagProcessMessagesAsFalse();
setClientDisconnectedException(e);
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 c86ab83..3058c81 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
@@ -23,9 +23,10 @@ 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.protocol.ClientProtocolMessageHandler;
import org.apache.geode.internal.protocol.ProtocolMessageHandlerLookupService;
-import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.internal.protocol.security.server.AuthenticatorLookupService;
+import org.apache.geode.internal.security.SecurityService;
/**
* Creates instances of ServerConnection based on the connection mode provided.
@@ -37,6 +38,7 @@ public class ServerConnectionFactory {
public ServerConnectionFactory() {
protocolMessageHandlerLookupService = new ProtocolMessageHandlerLookupService();
authenticatorLookupService = new AuthenticatorLookupService();
+
}
public ServerConnection makeServerConnection(Socket socket, InternalCache cache,
@@ -47,11 +49,12 @@ public class ServerConnectionFactory {
if (!Boolean.getBoolean("geode.feature-protobuf-protocol")) {
throw new IOException("Server received unknown communication mode: " + communicationMode);
} else {
+ ClientProtocolMessageHandler clientProtocolMessageHandler =
+ protocolMessageHandlerLookupService.lookupProtocolHandler("PROTOBUF");
return new GenericProtocolServerConnection(socket, cache, cachedRegionHelper,
cacheServerStats, hsTimeout, socketBufferSize, communicationModeStr, communicationMode,
- acceptor, securityService,
- protocolMessageHandlerLookupService.lookupProtocolHandler("protobuf"),
- authenticatorLookupService);
+ acceptor, securityService, clientProtocolMessageHandler,
+ authenticatorLookupService.getAuthenticator());
}
} else {
return new LegacyServerConnection(socket, cache, cachedRegionHelper, cacheServerStats,
diff --git a/geode-core/src/main/java/org/apache/geode/internal/protocol/ClientProtocolMessageHandler.java b/geode-core/src/main/java/org/apache/geode/internal/protocol/ClientProtocolMessageHandler.java
index 3c9be1c..86bd563 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/protocol/ClientProtocolMessageHandler.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/protocol/ClientProtocolMessageHandler.java
@@ -34,4 +34,6 @@ import org.apache.geode.internal.cache.tier.sockets.ServerConnectionFactory;
public interface ClientProtocolMessageHandler {
void receiveMessage(InputStream inputStream, OutputStream outputStream,
MessageExecutionContext executionContext) throws IOException;
+
+ String getMessageHandlerProtocolName();
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/protocol/MessageExecutionContext.java b/geode-core/src/main/java/org/apache/geode/internal/protocol/MessageExecutionContext.java
index f895688..c52419b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/protocol/MessageExecutionContext.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/protocol/MessageExecutionContext.java
@@ -19,22 +19,27 @@ 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.internal.protocol.security.server.Authorizer;
+import org.apache.geode.security.SecurityManager;
@Experimental
public class MessageExecutionContext {
private Cache cache;
private Locator locator;
- private Authorizer authorizer;
+ private final Object authenticationToken;
+ private final SecurityManager securityManager;
- public MessageExecutionContext(Cache cache, Authorizer streamAuthorizer) {
+ public MessageExecutionContext(Cache cache, Object authenticationToken,
+ SecurityManager securityManager) {
this.cache = cache;
- this.authorizer = streamAuthorizer;
+ this.authenticationToken = authenticationToken;
+ this.securityManager = securityManager;
}
public MessageExecutionContext(Locator locator) {
this.locator = locator;
+ this.authenticationToken = null;
+ this.securityManager = null;
}
/**
@@ -67,10 +72,19 @@ public class MessageExecutionContext {
}
/**
- * Returns the Authorizer associated with this execution. This can be used to perform
+ * Returns the AuthenticatedTokenassociated with this execution. This can be used to perform
* authorization checks for the user associated with this thread.
*/
- public Authorizer getAuthorizer() {
- return authorizer;
+ public Object getAuthenticationToken() {
+ return authenticationToken;
+ }
+
+ /**
+ * Returns the security manager.
+ *
+ * @return
+ */
+ public SecurityManager getSecurityManager() {
+ return securityManager;
}
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/protocol/ProtocolMessageHandlerLookupService.java b/geode-core/src/main/java/org/apache/geode/internal/protocol/ProtocolMessageHandlerLookupService.java
index 418eecc..4196fd6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/protocol/ProtocolMessageHandlerLookupService.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/protocol/ProtocolMessageHandlerLookupService.java
@@ -1,32 +1,38 @@
+/*
+ * 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.protocol;
-import java.util.Iterator;
+import java.util.HashMap;
+import java.util.Map;
import java.util.ServiceLoader;
-import org.apache.geode.internal.cache.tier.sockets.ServiceLoadingFailureException;
-
public class ProtocolMessageHandlerLookupService {
- private ClientProtocolMessageHandler protocolHandler;
+ private Map<String, ClientProtocolMessageHandler> protocolMessageHandlers = new HashMap<>();
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");
+ for (ClientProtocolMessageHandler clientProtocolMessageHandler : loader) {
+ protocolMessageHandlers.put(clientProtocolMessageHandler.getMessageHandlerProtocolName(),
+ clientProtocolMessageHandler);
}
- return iterator.next();
}
public ClientProtocolMessageHandler lookupProtocolHandler(String protocolType) {
- // TODO Do we need to make provision for different protocols here right now?
- return protocolHandler;
+ return protocolMessageHandlers.get(protocolType);
}
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/Authenticator.java b/geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/Authenticator.java
index f4d2b14..7d68aa0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/Authenticator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/Authenticator.java
@@ -19,7 +19,6 @@ 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;
/**
@@ -36,9 +35,10 @@ public interface Authenticator {
* @param inputStream to read auth messages from.
* @param outputStream to send messages to.
* @param securityManager can be used for validating credentials against.
+ * @return a authentication token that proves that the remote entity was authenticated
* @throws IOException if EOF or if invalid input is received.
*/
- void authenticate(InputStream inputStream, OutputStream outputStream,
+ Object authenticate(InputStream inputStream, OutputStream outputStream,
SecurityManager securityManager) throws IOException;
/**
@@ -49,13 +49,7 @@ public interface Authenticator {
boolean isAuthenticated();
/**
- * Return an authorization object which can be used to determine which permissions this stream has
- * according to the provided securityManager.
- */
- Authorizer getAuthorizer() throws AuthenticationRequiredException;
-
- /**
* @return a unique identifier for this particular implementation (NOOP, PASSTHROUGH, etc.)
*/
- String implementationID();
+ String getImplementationID();
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/AuthenticatorLookupService.java b/geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/AuthenticatorLookupService.java
index 06c92e3..ccea628 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/AuthenticatorLookupService.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/AuthenticatorLookupService.java
@@ -37,7 +37,7 @@ public class AuthenticatorLookupService {
authenticators = new HashMap<>();
ServiceLoader<Authenticator> loader = ServiceLoader.load(Authenticator.class);
for (Authenticator streamAuthenticator : loader) {
- authenticators.put(streamAuthenticator.implementationID(), streamAuthenticator.getClass());
+ authenticators.put(streamAuthenticator.getImplementationID(), streamAuthenticator.getClass());
}
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/AuthenticatorLookupService.java b/geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/AuthorizationLookupService.java
similarity index 59%
copy from geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/AuthenticatorLookupService.java
copy to geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/AuthorizationLookupService.java
index 06c92e3..2002dc3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/AuthenticatorLookupService.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/AuthorizationLookupService.java
@@ -21,41 +21,39 @@ 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 class AuthorizationLookupService {
+ private Map<String, Class<? extends Authorizer>> authorizers = null;
- public AuthenticatorLookupService() {
- if (authenticators == null) {
+ public AuthorizationLookupService() {
+ if (authorizers == null) {
initializeAuthenticatorsMap();
}
}
private synchronized void initializeAuthenticatorsMap() {
- if (authenticators != null) {
+ if (authorizers != null) {
return;
}
- authenticators = new HashMap<>();
- ServiceLoader<Authenticator> loader = ServiceLoader.load(Authenticator.class);
- for (Authenticator streamAuthenticator : loader) {
- authenticators.put(streamAuthenticator.implementationID(), streamAuthenticator.getClass());
+ authorizers = new HashMap<>();
+ ServiceLoader<Authorizer> loader = ServiceLoader.load(Authorizer.class);
+ for (Authorizer authorizer : loader) {
+ authorizers.put(authorizer.getImplementationID(), authorizer.getClass());
}
}
- public Authenticator getAuthenticator() {
- String authenticationMode = System.getProperty("geode.protocol-authentication-mode", "NOOP");
+ public Authorizer getAuthorizer() {
+ String authorizationMode = System.getProperty("geode.protocol-authentication-mode", "NOOP");
- Class<? extends Authenticator> streamAuthenticatorClass =
- authenticators.get(authenticationMode);
- if (streamAuthenticatorClass == null) {
+ Class<? extends Authorizer> authorizationClass = authorizers.get(authorizationMode);
+ if (authorizationClass == null) {
throw new GemFireConfigException(
- "Could not find implementation for Authenticator with implementation ID "
- + authenticationMode);
+ "Could not find implementation for Authorizer with ID " + authorizationMode);
} else {
try {
- return streamAuthenticatorClass.newInstance();
+ return authorizationClass.newInstance();
} catch (InstantiationException | IllegalAccessException e) {
throw new ServiceLoadingFailureException(
- "Unable to instantiate authenticator for ID " + authenticationMode, e);
+ "Unable to instantiate authenticator for ID " + authorizationMode, e);
}
}
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/Authorizer.java b/geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/Authorizer.java
index b9c69fe..5d92208 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/Authorizer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/Authorizer.java
@@ -16,8 +16,12 @@ package org.apache.geode.internal.protocol.security.server;
import org.apache.geode.annotations.Experimental;
import org.apache.geode.security.ResourcePermission;
+import org.apache.geode.security.SecurityManager;
@Experimental
public interface Authorizer {
- boolean authorize(ResourcePermission permissionRequested);
+ boolean authorize(Object authenticatedToken, ResourcePermission permissionRequested,
+ SecurityManager securityManager);
+
+ String getImplementationID();
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/NoOpAuthenticator.java b/geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/NoOpAuthenticator.java
index 4b41c9f..d68415f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/NoOpAuthenticator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/NoOpAuthenticator.java
@@ -26,9 +26,9 @@ import org.apache.geode.security.SecurityManager;
*/
public class NoOpAuthenticator implements Authenticator {
@Override
- public void authenticate(InputStream inputStream, OutputStream outputStream,
+ public Object authenticate(InputStream inputStream, OutputStream outputStream,
SecurityManager securityManager) throws IOException {
- // this method needs to do nothing as it is a pass-through implementation
+ return null;
}
@Override
@@ -37,12 +37,7 @@ public class NoOpAuthenticator implements Authenticator {
}
@Override
- public Authorizer getAuthorizer() {
- return new NoOpAuthorizer();
- }
-
- @Override
- public String implementationID() {
+ public String getImplementationID() {
return "NOOP";
}
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/NoOpAuthorizer.java b/geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/NoOpAuthorizer.java
index 3f0e01a..d3cdab4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/NoOpAuthorizer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/protocol/security/server/NoOpAuthorizer.java
@@ -15,13 +15,20 @@
package org.apache.geode.internal.protocol.security.server;
import org.apache.geode.security.ResourcePermission;
+import org.apache.geode.security.SecurityManager;
/**
* An implementation of {@link Authorizer} that doesn't use its parameters and always returns true.
*/
public class NoOpAuthorizer implements Authorizer {
@Override
- public boolean authorize(ResourcePermission permissionRequested) {
+ public boolean authorize(Object authenticatedToken, ResourcePermission permissionRequested,
+ SecurityManager securityManager) {
return true;
}
+
+ @Override
+ public String getImplementationID() {
+ return "NOOP";
+ }
}
diff --git a/geode-core/src/main/resources/META-INF/services/org.apache.geode.internal.protocol.security.server.Authorizer b/geode-core/src/main/resources/META-INF/services/org.apache.geode.internal.protocol.security.server.Authorizer
new file mode 100644
index 0000000..85fcb4a
--- /dev/null
+++ b/geode-core/src/main/resources/META-INF/services/org.apache.geode.internal.protocol.security.server.Authorizer
@@ -0,0 +1 @@
+org.apache.geode.internal.protocol.security.server.NoOpAuthorizer
\ No newline at end of file
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionFactoryTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionFactoryTest.java
index 09c5949..568571d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionFactoryTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ServerConnectionFactoryTest.java
@@ -15,23 +15,24 @@
package org.apache.geode.internal.cache.tier.sockets;
-import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.internal.cache.tier.CommunicationMode;
-import org.apache.geode.internal.cache.tier.CachedRegionHelper;
-import org.apache.geode.internal.security.SecurityService;
-import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import java.io.IOException;
import java.net.InetAddress;
import java.net.Socket;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.contrib.java.lang.system.RestoreSystemProperties;
+import org.junit.experimental.categories.Category;
+
+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.test.junit.categories.UnitTest;
/**
* We don't test the path where the service providing protobufProtocolHandler is actually present,
@@ -58,17 +59,6 @@ public class ServerConnectionFactoryTest {
}
- /**
- * @throws ServiceLoadingFailureException because the service is implemented in a different
- * module, and when this unit test is run, that module won't be present.
- */
- @Test(expected = ServiceLoadingFailureException.class)
- public void newClientProtocolFailsWithSystemPropertySet() throws IOException {
- System.setProperty("geode.feature-protobuf-protocol", "true");
- ServerConnection serverConnection = serverConnectionMockedExceptForCommunicationMode(
- CommunicationMode.ProtobufClientServerProtocol.getModeNumber());
- }
-
@Test
public void makeServerConnection() throws Exception {
CommunicationMode[] communicationModes = new CommunicationMode[] {
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/operations/OperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/operations/OperationHandler.java
index 8e9e4c0..b954039 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/operations/OperationHandler.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/operations/OperationHandler.java
@@ -15,9 +15,9 @@
package org.apache.geode.protocol.operations;
import org.apache.geode.annotations.Experimental;
-import org.apache.geode.internal.protocol.MessageExecutionContext;
import org.apache.geode.internal.exception.InvalidExecutionContextException;
-import org.apache.geode.protocol.protobuf.ProtobufOpsProcessor;
+import org.apache.geode.internal.protocol.MessageExecutionContext;
+import org.apache.geode.protocol.protobuf.ProtobufOperationsProcessor;
import org.apache.geode.protocol.responses.Result;
import org.apache.geode.serialization.SerializationService;
@@ -25,7 +25,7 @@ import org.apache.geode.serialization.SerializationService;
* This interface is implemented by a object capable of handling request types 'Req' and returning
* an a response of type 'Resp'
*
- * See {@link ProtobufOpsProcessor}
+ * See {@link ProtobufOperationsProcessor}
*/
@Experimental
public interface OperationHandler<Req, Resp> {
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/ProtobufOperationsProcessor.java
similarity index 78%
rename from geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufOpsProcessor.java
rename to geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufOperationsProcessor.java
index 555c189..9cc072e 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/ProtobufOperationsProcessor.java
@@ -15,13 +15,12 @@
package org.apache.geode.protocol.protobuf;
import org.apache.geode.annotations.Experimental;
-import org.apache.geode.internal.protocol.MessageExecutionContext;
import org.apache.geode.internal.exception.InvalidExecutionContextException;
+import org.apache.geode.internal.protocol.MessageExecutionContext;
import org.apache.geode.internal.protocol.protobuf.ClientProtocol;
+import org.apache.geode.internal.protocol.security.server.Authorizer;
import org.apache.geode.protocol.protobuf.registry.OperationContextRegistry;
import org.apache.geode.protocol.protobuf.utilities.ProtobufResponseUtilities;
-import org.apache.geode.internal.protocol.security.server.Authorizer;
-import org.apache.geode.internal.protocol.security.server.NoOpAuthorizer;
import org.apache.geode.protocol.responses.Failure;
import org.apache.geode.protocol.responses.Result;
import org.apache.geode.serialization.SerializationService;
@@ -31,26 +30,30 @@ import org.apache.geode.serialization.SerializationService;
* it to the appropriate handler.
*/
@Experimental
-public class ProtobufOpsProcessor {
+public class ProtobufOperationsProcessor {
private final OperationContextRegistry operationContextRegistry;
private final SerializationService serializationService;
+ private final Authorizer authorizer;
- public ProtobufOpsProcessor(SerializationService serializationService,
- OperationContextRegistry operationContextRegistry) {
+ ProtobufOperationsProcessor(SerializationService serializationService,
+ OperationContextRegistry operationContextRegistry, Authorizer autherizer) {
this.serializationService = serializationService;
this.operationContextRegistry = operationContextRegistry;
+ this.authorizer = autherizer;
}
- public ClientProtocol.Response process(ClientProtocol.Request request,
- MessageExecutionContext context) {
+ public ClientProtocol.Response process(final ClientProtocol.Request request,
+ final MessageExecutionContext context) {
ClientProtocol.Request.RequestAPICase requestType = request.getRequestAPICase();
OperationContext operationContext = operationContextRegistry.getOperationContext(requestType);
ClientProtocol.Response.Builder builder;
Result result;
- Authorizer authorizer = findAuthorizer(context);
+
try {
- if (authorizer.authorize(operationContext.getAccessPermissionRequired())) {
+ boolean authorized = authorizer.authorize(context.getAuthenticationToken(),
+ operationContext.getAccessPermissionRequired(), context.getSecurityManager());
+ if (authorized) {
result = operationContext.getOperationHandler().process(serializationService,
operationContext.getFromRequest().apply(request), context);
} else {
@@ -69,13 +72,4 @@ public class ProtobufOpsProcessor {
return builder.build();
}
- private Authorizer findAuthorizer(MessageExecutionContext context) {
- Authorizer authorizer = context.getAuthorizer();
- if (authorizer != null) {
- return authorizer;
- } else {
- // TODO Horrible HACK because we need to look this up correctly.
- return new NoOpAuthorizer();
- }
- }
}
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufStreamProcessor.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufProtocolMessageHandler.java
similarity index 58%
rename from geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufStreamProcessor.java
rename to geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufProtocolMessageHandler.java
index 22534ab..8607392 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufStreamProcessor.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufProtocolMessageHandler.java
@@ -22,8 +22,10 @@ import java.io.OutputStream;
import org.apache.geode.annotations.Experimental;
import org.apache.geode.internal.protocol.ClientProtocolMessageHandler;
import org.apache.geode.internal.protocol.MessageExecutionContext;
-import org.apache.geode.protocol.exception.InvalidProtocolMessageException;
import org.apache.geode.internal.protocol.protobuf.ClientProtocol;
+import org.apache.geode.internal.protocol.security.server.AuthorizationLookupService;
+import org.apache.geode.internal.protocol.security.server.Authorizer;
+import org.apache.geode.protocol.exception.InvalidProtocolMessageException;
import org.apache.geode.protocol.protobuf.registry.OperationContextRegistry;
import org.apache.geode.protocol.protobuf.serializer.ProtobufProtocolSerializer;
import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities;
@@ -35,40 +37,60 @@ import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredF
* and then pushes it to the output stream.
*/
@Experimental
-public class ProtobufStreamProcessor implements ClientProtocolMessageHandler {
+public class ProtobufProtocolMessageHandler implements ClientProtocolMessageHandler {
private final ProtobufProtocolSerializer protobufProtocolSerializer;
- private final ProtobufOpsProcessor protobufOpsProcessor;
+ private final ProtobufOperationsProcessor protobufOperationProcessor;
+ private final OperationContextRegistry operationContextRegistry;
+ private final ProtobufSerializationService protobufSerializationService;
+ private final Authorizer authorizer;
- public ProtobufStreamProcessor() throws CodecAlreadyRegisteredForTypeException {
+ public ProtobufProtocolMessageHandler() throws CodecAlreadyRegisteredForTypeException {
protobufProtocolSerializer = new ProtobufProtocolSerializer();
- protobufOpsProcessor = new ProtobufOpsProcessor(new ProtobufSerializationService(),
- new OperationContextRegistry());
+ operationContextRegistry = new OperationContextRegistry();
+ protobufSerializationService = new ProtobufSerializationService();
+ authorizer = new AuthorizationLookupService().getAuthorizer();
+ protobufOperationProcessor = new ProtobufOperationsProcessor(protobufSerializationService,
+ operationContextRegistry, authorizer);
+
}
@Override
public void receiveMessage(InputStream inputStream, OutputStream outputStream,
MessageExecutionContext executionContext) throws IOException {
try {
- processOneMessage(inputStream, outputStream, executionContext);
+ ClientProtocol.Message incomingMessage = deserializeMessageFromInputStream(inputStream);
+ ClientProtocol.Message outgoingMessage = processMessage(incomingMessage, executionContext);
+ serializeMessageToOutputStream(outgoingMessage, outputStream);
} catch (InvalidProtocolMessageException e) {
throw new IOException(e);
}
}
- private void processOneMessage(InputStream inputStream, OutputStream outputStream,
- MessageExecutionContext executionContext)
- throws InvalidProtocolMessageException, IOException {
- ClientProtocol.Message message = protobufProtocolSerializer.deserialize(inputStream);
- if (message == null) {
- throw new EOFException("Tried to deserialize protobuf message at EOF");
- }
+ @Override
+ public String getMessageHandlerProtocolName() {
+ return "PROTOBUF";
+ }
- ClientProtocol.Request request = message.getRequest();
- ClientProtocol.Response response = protobufOpsProcessor.process(request, executionContext);
+ private ClientProtocol.Message processMessage(ClientProtocol.Message message,
+ MessageExecutionContext executionContext) {
+ ClientProtocol.Response response =
+ protobufOperationProcessor.process(message.getRequest(), executionContext);
ClientProtocol.MessageHeader responseHeader =
ProtobufUtilities.createMessageHeaderForRequest(message);
- ClientProtocol.Message responseMessage =
- ProtobufUtilities.createProtobufResponse(responseHeader, response);
+ return ProtobufUtilities.createProtobufResponse(responseHeader, response);
+ }
+
+ private void serializeMessageToOutputStream(ClientProtocol.Message responseMessage,
+ OutputStream outputStream) throws IOException {
protobufProtocolSerializer.serialize(responseMessage, outputStream);
}
+
+ private ClientProtocol.Message deserializeMessageFromInputStream(InputStream inputStream)
+ throws InvalidProtocolMessageException, EOFException {
+ ClientProtocol.Message message = protobufProtocolSerializer.deserialize(inputStream);
+ if (message == null) {
+ throw new EOFException("Tried to deserialize protobuf message at EOF");
+ }
+ return message;
+ }
}
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/security/server/ProtobufSimpleAuthenticator.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/security/server/ProtobufSimpleAuthenticator.java
index ed2b9ec..2cdbeae 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/security/server/ProtobufSimpleAuthenticator.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/security/server/ProtobufSimpleAuthenticator.java
@@ -14,31 +14,32 @@
*/
package org.apache.geode.protocol.protobuf.security.server;
-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.internal.protocol.security.server.Authenticator;
-import org.apache.geode.security.AuthenticationFailedException;
-import org.apache.geode.security.SecurityManager;
-import org.apache.geode.internal.protocol.security.server.Authorizer;
-
import java.io.EOFException;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.Properties;
+import org.apache.geode.internal.protocol.protobuf.AuthenticationAPI;
+import org.apache.geode.internal.protocol.security.server.Authenticator;
+import org.apache.geode.management.internal.security.ResourceConstants;
+import org.apache.geode.security.AuthenticationFailedException;
+import org.apache.geode.security.SecurityManager;
+
public class ProtobufSimpleAuthenticator implements Authenticator {
- private ProtobufSimpleAuthorizer authorizer = null;
private boolean authenticationSuccessfull = false;
+ private Object principal;
@Override
- public void authenticate(InputStream inputStream, OutputStream outputStream,
+ public Object authenticate(InputStream inputStream, OutputStream outputStream,
SecurityManager securityManager) throws IOException {
- if (!authenticationSuccessfull) {
+ if (authenticationSuccessfull) {
+ return principal;
+ } else {
AuthenticationAPI.SimpleAuthenticationRequest authenticationRequest =
AuthenticationAPI.SimpleAuthenticationRequest.parseDelimitedFrom(inputStream);
if (authenticationRequest == null) {
+ // TODO Why are we returning and EOF here?
throw new EOFException();
}
@@ -47,19 +48,19 @@ public class ProtobufSimpleAuthenticator implements Authenticator {
properties.setProperty(ResourceConstants.PASSWORD, authenticationRequest.getPassword());
try {
- Object principal = securityManager.authenticate(properties);
- if (principal != null) {
- authenticationSuccessfull = true;
- authorizer = new ProtobufSimpleAuthorizer(principal, securityManager);
- }
+ principal = securityManager.authenticate(properties);
+ authenticationSuccessfull = true;
+ AuthenticationAPI.SimpleAuthenticationResponse.newBuilder()
+ .setAuthenticated(isAuthenticated()).build().writeDelimitedTo(outputStream);
+ return principal;
} catch (AuthenticationFailedException e) {
- authorizer = null;
+ // We need to add some logging here;
+ // logger.error(e);
+ AuthenticationAPI.SimpleAuthenticationResponse.newBuilder().setAuthenticated(false).build()
+ .writeDelimitedTo(outputStream);
+ throw e;
}
-
- AuthenticationAPI.SimpleAuthenticationResponse.newBuilder()
- .setAuthenticated(isAuthenticated()).build().writeDelimitedTo(outputStream);
}
-
}
@Override
@@ -68,15 +69,7 @@ public class ProtobufSimpleAuthenticator implements Authenticator {
}
@Override
- public Authorizer getAuthorizer() throws AuthenticationRequiredException {
- if (authorizer == null) {
- throw new AuthenticationRequiredException("Not yet authenticated");
- }
- return authorizer;
- }
-
- @Override
- public String implementationID() {
+ public String getImplementationID() {
return "SIMPLE";
}
}
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/security/server/ProtobufSimpleAuthorizer.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/security/server/ProtobufSimpleAuthorizer.java
index a67f9c4..067bb6a 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/security/server/ProtobufSimpleAuthorizer.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/security/server/ProtobufSimpleAuthorizer.java
@@ -14,21 +14,19 @@
*/
package org.apache.geode.protocol.protobuf.security.server;
+import org.apache.geode.internal.protocol.security.server.Authorizer;
import org.apache.geode.security.ResourcePermission;
import org.apache.geode.security.SecurityManager;
-import org.apache.geode.internal.protocol.security.server.Authorizer;
public class ProtobufSimpleAuthorizer implements Authorizer {
- private final Object authenticatedPrincipal;
- private final SecurityManager securityManager;
-
- public ProtobufSimpleAuthorizer(Object authenticatedPrincipal, SecurityManager securityManager) {
- this.authenticatedPrincipal = authenticatedPrincipal;
- this.securityManager = securityManager;
+ @Override
+ public boolean authorize(Object authenticatedPrincipal, ResourcePermission permissionRequested,
+ SecurityManager securityManager) {
+ return securityManager.authorize(authenticatedPrincipal, permissionRequested);
}
@Override
- public boolean authorize(ResourcePermission permissionRequested) {
- return securityManager.authorize(authenticatedPrincipal, permissionRequested);
+ public String getImplementationID() {
+ return "SIMPLE";
}
}
diff --git a/geode-protobuf/src/main/resources/META-INF/services/org.apache.geode.internal.protocol.ClientProtocolMessageHandler b/geode-protobuf/src/main/resources/META-INF/services/org.apache.geode.internal.protocol.ClientProtocolMessageHandler
index 5a17eda..33fe588 100644
--- a/geode-protobuf/src/main/resources/META-INF/services/org.apache.geode.internal.protocol.ClientProtocolMessageHandler
+++ b/geode-protobuf/src/main/resources/META-INF/services/org.apache.geode.internal.protocol.ClientProtocolMessageHandler
@@ -1 +1 @@
-org.apache.geode.protocol.protobuf.ProtobufStreamProcessor
\ No newline at end of file
+org.apache.geode.protocol.protobuf.ProtobufProtocolMessageHandler
\ No newline at end of file
diff --git a/geode-protobuf/src/main/resources/META-INF/services/org.apache.geode.internal.protocol.security.server.Authorizer b/geode-protobuf/src/main/resources/META-INF/services/org.apache.geode.internal.protocol.security.server.Authorizer
new file mode 100644
index 0000000..a2bf30d
--- /dev/null
+++ b/geode-protobuf/src/main/resources/META-INF/services/org.apache.geode.internal.protocol.security.server.Authorizer
@@ -0,0 +1 @@
+org.apache.geode.protocol.protobuf.security.server.ProtobufSimpleAuthorizer
\ 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 6020b58..a6a0907 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
@@ -19,13 +19,20 @@ import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.Socket;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.internal.Assert;
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.protocol.ClientProtocolMessageHandler;
-import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.internal.protocol.security.server.AuthenticatorLookupService;
+import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
@@ -80,6 +87,7 @@ public class GenericProtocolServerConnectionTest {
return new GenericProtocolServerConnection(socketMock, mock(InternalCache.class),
mock(CachedRegionHelper.class), mock(CacheServerStats.class), 0, 0, "",
CommunicationMode.ProtobufClientServerProtocol.getModeNumber(), mock(AcceptorImpl.class),
- mock(SecurityService.class), clientProtocolMock, new AuthenticatorLookupService());
+ mock(SecurityService.class), clientProtocolMock,
+ new AuthenticatorLookupService().getAuthenticator());
}
}
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/ProtobufProtocolMessageHandlerTest.java
similarity index 82%
rename from geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/ProtobufStreamProcessorTest.java
rename to geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/ProtobufProtocolMessageHandlerTest.java
index 44f5158..6cd56af 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/ProtobufProtocolMessageHandlerTest.java
@@ -27,19 +27,19 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.protocol.MessageExecutionContext;
-import org.apache.geode.internal.protocol.security.server.NoOpAuthorizer;
import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
-public class ProtobufStreamProcessorTest {
+public class ProtobufProtocolMessageHandlerTest {
@Test(expected = EOFException.class)
public void receiveMessage() throws Exception {
InputStream inputStream = new ByteArrayInputStream(new byte[0]);
OutputStream outputStream = new ByteArrayOutputStream(2);
- ProtobufStreamProcessor protobufStreamProcessor = new ProtobufStreamProcessor();
+ ProtobufProtocolMessageHandler protobufProtocolMessageHandler =
+ new ProtobufProtocolMessageHandler();
InternalCache mockInternalCache = mock(InternalCache.class);
- protobufStreamProcessor.receiveMessage(inputStream, outputStream,
- new MessageExecutionContext(mockInternalCache, new NoOpAuthorizer()));
+ protobufProtocolMessageHandler.receiveMessage(inputStream, outputStream,
+ new MessageExecutionContext(mockInternalCache, null, null));
}
}
diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/ProtobufSimpleAuthenticatorJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/ProtobufSimpleAuthenticatorJUnitTest.java
index 2f09f8c..118ea03 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/ProtobufSimpleAuthenticatorJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/ProtobufSimpleAuthenticatorJUnitTest.java
@@ -15,22 +15,7 @@
package org.apache.geode.protocol.protobuf;
-import org.apache.geode.examples.security.ExampleSecurityManager;
-import org.apache.geode.management.internal.security.ResourceConstants;
-import org.apache.geode.internal.protocol.protobuf.AuthenticationAPI;
-import org.apache.geode.protocol.protobuf.security.server.ProtobufSimpleAuthenticator;
-import org.apache.geode.security.AuthenticationFailedException;
-import org.apache.geode.security.SecurityManager;
-import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.Properties;
-
+import static org.apache.geode.internal.Assert.fail;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.any;
@@ -38,6 +23,23 @@ import static org.mockito.ArgumentMatchers.same;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.Properties;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.examples.security.ExampleSecurityManager;
+import org.apache.geode.internal.protocol.protobuf.AuthenticationAPI;
+import org.apache.geode.management.internal.security.ResourceConstants;
+import org.apache.geode.protocol.protobuf.security.server.ProtobufSimpleAuthenticator;
+import org.apache.geode.security.AuthenticationFailedException;
+import org.apache.geode.security.SecurityManager;
+import org.apache.geode.test.junit.categories.UnitTest;
+
@Category(UnitTest.class)
public class ProtobufSimpleAuthenticatorJUnitTest {
private static final String TEST_USERNAME = "user1";
@@ -97,8 +99,12 @@ public class ProtobufSimpleAuthenticatorJUnitTest {
when(mockSecurityManager.authenticate(expectedAuthProperties))
.thenThrow(new AuthenticationFailedException("BOOM!"));
- protobufSimpleAuthenticator.authenticate(byteArrayInputStream, byteArrayOutputStream,
- mockSecurityManager);
+ try {
+ protobufSimpleAuthenticator.authenticate(byteArrayInputStream, byteArrayOutputStream,
+ mockSecurityManager);
+ fail("This should throw an AuthenticationFailedException.");
+ } catch (AuthenticationFailedException e) {
+ }
AuthenticationAPI.SimpleAuthenticationResponse simpleAuthenticationResponse =
getSimpleAuthenticationResponse(byteArrayOutputStream);
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 9b75a7c..09f9177 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
@@ -33,15 +33,14 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheLoaderException;
import org.apache.geode.cache.Region;
-import org.apache.geode.internal.protocol.MessageExecutionContext;
import org.apache.geode.internal.exception.InvalidExecutionContextException;
+import org.apache.geode.internal.protocol.MessageExecutionContext;
import org.apache.geode.internal.protocol.protobuf.BasicTypes;
import org.apache.geode.internal.protocol.protobuf.RegionAPI;
-import org.apache.geode.protocol.responses.Result;
-import org.apache.geode.protocol.responses.Success;
import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities;
import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities;
-import org.apache.geode.internal.protocol.security.server.NoOpAuthorizer;
+import org.apache.geode.protocol.responses.Result;
+import org.apache.geode.protocol.responses.Success;
import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException;
import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredForTypeException;
import org.apache.geode.serialization.registry.exception.CodecNotRegisteredForTypeException;
@@ -80,9 +79,8 @@ public class GetAllRequestOperationHandlerJUnitTest extends OperationHandlerJUni
public void processReturnsExpectedValuesForValidKeys()
throws CodecAlreadyRegisteredForTypeException, UnsupportedEncodingTypeException,
CodecNotRegisteredForTypeException, InvalidExecutionContextException {
- Result<RegionAPI.GetAllResponse> result =
- operationHandler.process(serializationServiceStub, generateTestRequest(true, false),
- new MessageExecutionContext(cacheStub, new NoOpAuthorizer()));
+ Result<RegionAPI.GetAllResponse> result = operationHandler.process(serializationServiceStub,
+ generateTestRequest(true, false), new MessageExecutionContext(cacheStub, null, null));
assertTrue(result instanceof Success);
@@ -101,9 +99,8 @@ public class GetAllRequestOperationHandlerJUnitTest extends OperationHandlerJUni
@Test
public void processReturnsNoEntriesForNoKeysRequested() throws UnsupportedEncodingTypeException,
CodecNotRegisteredForTypeException, InvalidExecutionContextException {
- Result<RegionAPI.GetAllResponse> result =
- operationHandler.process(serializationServiceStub, generateTestRequest(false, false),
- new MessageExecutionContext(cacheStub, new NoOpAuthorizer()));
+ Result<RegionAPI.GetAllResponse> result = operationHandler.process(serializationServiceStub,
+ generateTestRequest(false, false), new MessageExecutionContext(cacheStub, null, null));
assertTrue(result instanceof Success);
@@ -120,7 +117,7 @@ public class GetAllRequestOperationHandlerJUnitTest extends OperationHandlerJUni
RegionAPI.GetAllRequest getAllRequest =
ProtobufRequestUtilities.createGetAllRequest(TEST_REGION, testKeys);
Result<RegionAPI.GetAllResponse> result = operationHandler.process(serializationServiceStub,
- getAllRequest, new MessageExecutionContext(cacheStub, new NoOpAuthorizer()));
+ getAllRequest, new MessageExecutionContext(cacheStub, null, null));
assertTrue(result instanceof Success);
RegionAPI.GetAllResponse message = result.getMessage();
@@ -134,9 +131,8 @@ public class GetAllRequestOperationHandlerJUnitTest extends OperationHandlerJUni
@Test
public void multipleKeysWhereOneThrows() throws UnsupportedEncodingTypeException,
CodecNotRegisteredForTypeException, InvalidExecutionContextException {
- Result<RegionAPI.GetAllResponse> result =
- operationHandler.process(serializationServiceStub, generateTestRequest(true, true),
- new MessageExecutionContext(cacheStub, new NoOpAuthorizer()));
+ Result<RegionAPI.GetAllResponse> result = operationHandler.process(serializationServiceStub,
+ generateTestRequest(true, true), new MessageExecutionContext(cacheStub, null, null));
assertTrue(result instanceof Success);
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 dfb5798..97c7bf0 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
@@ -27,16 +27,12 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.Region;
-import org.apache.geode.internal.protocol.MessageExecutionContext;
import org.apache.geode.internal.exception.InvalidExecutionContextException;
+import org.apache.geode.internal.protocol.MessageExecutionContext;
import org.apache.geode.internal.protocol.protobuf.RegionAPI;
+import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities;
import org.apache.geode.protocol.responses.Result;
import org.apache.geode.protocol.responses.Success;
-import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities;
-import org.apache.geode.internal.protocol.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;
import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.junit.categories.UnitTest;
@@ -63,12 +59,10 @@ public class GetRegionNamesRequestOperationHandlerJUnitTest extends OperationHan
}
@Test
- public void processReturnsCacheRegions()
- throws CodecAlreadyRegisteredForTypeException, UnsupportedEncodingTypeException,
- CodecNotRegisteredForTypeException, InvalidExecutionContextException {
+ public void processReturnsCacheRegions() throws InvalidExecutionContextException {
Result<RegionAPI.GetRegionNamesResponse> result = operationHandler.process(
serializationServiceStub, ProtobufRequestUtilities.createGetRegionNamesRequest(),
- new MessageExecutionContext(cacheStub, new NoOpAuthorizer()));
+ new MessageExecutionContext(cacheStub, null, null));
Assert.assertTrue(result instanceof Success);
RegionAPI.GetRegionNamesResponse getRegionsResponse = result.getMessage();
@@ -86,15 +80,13 @@ public class GetRegionNamesRequestOperationHandlerJUnitTest extends OperationHan
}
@Test
- public void processReturnsNoCacheRegions()
- throws CodecAlreadyRegisteredForTypeException, UnsupportedEncodingTypeException,
- CodecNotRegisteredForTypeException, InvalidExecutionContextException {
+ public void processReturnsNoCacheRegions() throws InvalidExecutionContextException {
Cache emptyCache = mock(Cache.class);;
when(emptyCache.rootRegions())
.thenReturn(Collections.unmodifiableSet(new HashSet<Region<String, String>>()));
Result<RegionAPI.GetRegionNamesResponse> result = operationHandler.process(
serializationServiceStub, ProtobufRequestUtilities.createGetRegionNamesRequest(),
- new MessageExecutionContext(emptyCache, new NoOpAuthorizer()));
+ new MessageExecutionContext(emptyCache, null, null));
Assert.assertTrue(result instanceof Success);
RegionAPI.GetRegionNamesResponse getRegionsResponse = result.getMessage();
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 ae6fdec..67aa1b5 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
@@ -14,35 +14,31 @@
*/
package org.apache.geode.protocol.protobuf.operations;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.Collections;
+import java.util.HashSet;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.Scope;
-import org.apache.geode.internal.protocol.MessageExecutionContext;
import org.apache.geode.internal.exception.InvalidExecutionContextException;
-import org.apache.geode.protocol.MessageUtil;
+import org.apache.geode.internal.protocol.MessageExecutionContext;
import org.apache.geode.internal.protocol.protobuf.BasicTypes;
-import org.apache.geode.internal.protocol.protobuf.ClientProtocol;
-import org.apache.geode.protocol.responses.Failure;
-import org.apache.geode.protocol.protobuf.ProtocolErrorCode;
import org.apache.geode.internal.protocol.protobuf.RegionAPI;
+import org.apache.geode.protocol.MessageUtil;
+import org.apache.geode.protocol.protobuf.ProtocolErrorCode;
+import org.apache.geode.protocol.responses.Failure;
import org.apache.geode.protocol.responses.Result;
-import org.apache.geode.internal.protocol.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;
import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.Collections;
-import java.util.HashSet;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
@Category(UnitTest.class)
public class GetRegionRequestOperationHandlerJUnitTest extends OperationHandlerJUnitTest {
@@ -60,9 +56,7 @@ public class GetRegionRequestOperationHandlerJUnitTest extends OperationHandlerJ
}
@Test
- public void processReturnsCacheRegions()
- throws CodecAlreadyRegisteredForTypeException, UnsupportedEncodingTypeException,
- CodecNotRegisteredForTypeException, InvalidExecutionContextException {
+ public void processReturnsCacheRegions() throws InvalidExecutionContextException {
RegionAttributes regionAttributesStub = mock(RegionAttributes.class);
when(cacheStub.getRegion(TEST_REGION1)).thenReturn(region1Stub);
@@ -77,7 +71,7 @@ public class GetRegionRequestOperationHandlerJUnitTest extends OperationHandlerJ
Result<RegionAPI.GetRegionResponse> result = operationHandler.process(serializationServiceStub,
MessageUtil.makeGetRegionRequest(TEST_REGION1),
- new MessageExecutionContext(cacheStub, new NoOpAuthorizer()));
+ new MessageExecutionContext(cacheStub, null, null));
RegionAPI.GetRegionResponse response = result.getMessage();
BasicTypes.Region region = response.getRegion();
Assert.assertEquals(TEST_REGION1, region.getName());
@@ -89,21 +83,15 @@ public class GetRegionRequestOperationHandlerJUnitTest extends OperationHandlerJ
Assert.assertEquals(10, region.getSize());
}
- private ClientProtocol.Request createRequestMessage(RegionAPI.GetRegionRequest getRegionRequest) {
- return ClientProtocol.Request.newBuilder().setGetRegionRequest(getRegionRequest).build();
- }
-
@Test
- public void processReturnsNoCacheRegions()
- throws CodecAlreadyRegisteredForTypeException, UnsupportedEncodingTypeException,
- CodecNotRegisteredForTypeException, InvalidExecutionContextException {
+ public void processReturnsNoCacheRegions() throws InvalidExecutionContextException {
Cache emptyCache = mock(Cache.class);
when(emptyCache.rootRegions())
.thenReturn(Collections.unmodifiableSet(new HashSet<Region<String, String>>()));
String unknownRegionName = "UNKNOWN_REGION";
Result<RegionAPI.GetRegionResponse> result = operationHandler.process(serializationServiceStub,
MessageUtil.makeGetRegionRequest(unknownRegionName),
- new MessageExecutionContext(emptyCache, new NoOpAuthorizer()));
+ new MessageExecutionContext(emptyCache, null, null));
Assert.assertTrue(result instanceof Failure);
Assert.assertEquals(ProtocolErrorCode.REGION_NOT_FOUND.codeValue,
result.getErrorMessage().getError().getErrorCode());
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 e45c9b7..1769a14 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
@@ -14,33 +14,32 @@
*/
package org.apache.geode.protocol.protobuf.operations;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.io.UnsupportedEncodingException;
+
import com.google.protobuf.ByteString;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Region;
-import org.apache.geode.internal.protocol.MessageExecutionContext;
import org.apache.geode.internal.exception.InvalidExecutionContextException;
+import org.apache.geode.internal.protocol.MessageExecutionContext;
import org.apache.geode.internal.protocol.protobuf.BasicTypes;
-import org.apache.geode.protocol.responses.Failure;
-import org.apache.geode.protocol.protobuf.ProtocolErrorCode;
import org.apache.geode.internal.protocol.protobuf.RegionAPI;
-import org.apache.geode.protocol.responses.Result;
-import org.apache.geode.protocol.responses.Success;
+import org.apache.geode.protocol.protobuf.ProtocolErrorCode;
import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities;
import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities;
-import org.apache.geode.internal.protocol.security.server.NoOpAuthorizer;
+import org.apache.geode.protocol.responses.Failure;
+import org.apache.geode.protocol.responses.Result;
+import org.apache.geode.protocol.responses.Success;
import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException;
-import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredForTypeException;
import org.apache.geode.serialization.registry.exception.CodecNotRegisteredForTypeException;
import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.UnsupportedEncodingException;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
@Category(UnitTest.class)
public class GetRequestOperationHandlerJUnitTest extends OperationHandlerJUnitTest {
@@ -68,12 +67,11 @@ public class GetRequestOperationHandlerJUnitTest extends OperationHandlerJUnitTe
}
@Test
- public void processReturnsTheEncodedValueFromTheRegion()
- throws CodecAlreadyRegisteredForTypeException, UnsupportedEncodingTypeException,
+ public void processReturnsTheEncodedValueFromTheRegion() throws UnsupportedEncodingTypeException,
CodecNotRegisteredForTypeException, InvalidExecutionContextException {
RegionAPI.GetRequest getRequest = generateTestRequest(false, false, false);
Result<RegionAPI.GetResponse> result = operationHandler.process(serializationServiceStub,
- getRequest, new MessageExecutionContext(cacheStub, new NoOpAuthorizer()));
+ getRequest, new MessageExecutionContext(cacheStub, null, null));
Assert.assertTrue(result instanceof Success);
Assert.assertEquals(BasicTypes.EncodedValue.ValueCase.STRINGRESULT,
@@ -84,11 +82,11 @@ public class GetRequestOperationHandlerJUnitTest extends OperationHandlerJUnitTe
@Test
public void processReturnsUnsucessfulResponseForInvalidRegion()
- throws CodecAlreadyRegisteredForTypeException, UnsupportedEncodingTypeException,
- CodecNotRegisteredForTypeException, InvalidExecutionContextException {
+ throws UnsupportedEncodingTypeException, CodecNotRegisteredForTypeException,
+ InvalidExecutionContextException {
RegionAPI.GetRequest getRequest = generateTestRequest(true, false, false);
Result<RegionAPI.GetResponse> response = operationHandler.process(serializationServiceStub,
- getRequest, new MessageExecutionContext(cacheStub, new NoOpAuthorizer()));
+ getRequest, new MessageExecutionContext(cacheStub, null, null));
Assert.assertTrue(response instanceof Failure);
Assert.assertEquals(ProtocolErrorCode.REGION_NOT_FOUND.codeValue,
@@ -96,32 +94,30 @@ public class GetRequestOperationHandlerJUnitTest extends OperationHandlerJUnitTe
}
@Test
- public void processReturnsKeyNotFoundWhenKeyIsNotFound()
- throws CodecAlreadyRegisteredForTypeException, UnsupportedEncodingTypeException,
+ public void processReturnsKeyNotFoundWhenKeyIsNotFound() throws UnsupportedEncodingTypeException,
CodecNotRegisteredForTypeException, InvalidExecutionContextException {
RegionAPI.GetRequest getRequest = generateTestRequest(false, true, false);
Result<RegionAPI.GetResponse> response = operationHandler.process(serializationServiceStub,
- getRequest, new MessageExecutionContext(cacheStub, new NoOpAuthorizer()));
+ getRequest, new MessageExecutionContext(cacheStub, null, null));
Assert.assertTrue(response instanceof Success);
}
@Test
public void processReturnsLookupFailureWhenKeyFoundWithNoValue()
- throws CodecAlreadyRegisteredForTypeException, UnsupportedEncodingTypeException,
- CodecNotRegisteredForTypeException, InvalidExecutionContextException {
+ throws UnsupportedEncodingTypeException, CodecNotRegisteredForTypeException,
+ InvalidExecutionContextException {
RegionAPI.GetRequest getRequest = generateTestRequest(false, false, true);
Result<RegionAPI.GetResponse> response = operationHandler.process(serializationServiceStub,
- getRequest, new MessageExecutionContext(cacheStub, new NoOpAuthorizer()));
+ getRequest, new MessageExecutionContext(cacheStub, null, null));
Assert.assertTrue(response instanceof Success);
}
@Test
public void processReturnsErrorWhenUnableToDecodeRequest()
- throws CodecAlreadyRegisteredForTypeException, UnsupportedEncodingTypeException,
- CodecNotRegisteredForTypeException, UnsupportedEncodingException,
- InvalidExecutionContextException {
+ throws UnsupportedEncodingTypeException, CodecNotRegisteredForTypeException,
+ UnsupportedEncodingException, InvalidExecutionContextException {
CodecNotRegisteredForTypeException exception =
new CodecNotRegisteredForTypeException("error finding codec for type");
when(serializationServiceStub.decode(any(), any())).thenThrow(exception);
@@ -134,7 +130,7 @@ public class GetRequestOperationHandlerJUnitTest extends OperationHandlerJUnitTe
RegionAPI.GetRequest getRequest =
ProtobufRequestUtilities.createGetRequest(TEST_REGION, encodedKey).getGetRequest();
Result<RegionAPI.GetResponse> response = operationHandler.process(serializationServiceStub,
- getRequest, new MessageExecutionContext(cacheStub, new NoOpAuthorizer()));
+ getRequest, new MessageExecutionContext(cacheStub, null, null));
Assert.assertTrue(response instanceof Failure);
Assert.assertEquals(ProtocolErrorCode.VALUE_ENCODING_ERROR.codeValue,
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 b0acb22..18c2ec4 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
@@ -14,35 +14,35 @@
*/
package org.apache.geode.protocol.protobuf.operations;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Region;
-import org.apache.geode.internal.protocol.MessageExecutionContext;
import org.apache.geode.internal.exception.InvalidExecutionContextException;
+import org.apache.geode.internal.protocol.MessageExecutionContext;
import org.apache.geode.internal.protocol.protobuf.BasicTypes;
import org.apache.geode.internal.protocol.protobuf.RegionAPI;
-import org.apache.geode.protocol.responses.Result;
-import org.apache.geode.protocol.responses.Success;
import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities;
import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities;
-import org.apache.geode.internal.protocol.security.server.NoOpAuthorizer;
+import org.apache.geode.protocol.responses.Result;
+import org.apache.geode.protocol.responses.Success;
import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException;
import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredForTypeException;
import org.apache.geode.serialization.registry.exception.CodecNotRegisteredForTypeException;
import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
@Category(UnitTest.class)
public class PutAllRequestOperationHandlerJUnitTest extends OperationHandlerJUnitTest {
@@ -74,9 +74,8 @@ public class PutAllRequestOperationHandlerJUnitTest extends OperationHandlerJUni
CodecAlreadyRegisteredForTypeException, InvalidExecutionContextException {
PutAllRequestOperationHandler operationHandler = new PutAllRequestOperationHandler();
- Result<RegionAPI.PutAllResponse> result =
- operationHandler.process(serializationServiceStub, generateTestRequest(false, true),
- new MessageExecutionContext(cacheStub, new NoOpAuthorizer()));
+ Result<RegionAPI.PutAllResponse> result = operationHandler.process(serializationServiceStub,
+ generateTestRequest(false, true), new MessageExecutionContext(cacheStub, null, null));
Assert.assertTrue(result instanceof Success);
@@ -89,9 +88,8 @@ public class PutAllRequestOperationHandlerJUnitTest extends OperationHandlerJUni
public void processWithInvalidEntrySucceedsAndReturnsFailedKey() throws Exception {
PutAllRequestOperationHandler operationHandler = new PutAllRequestOperationHandler();
- Result<RegionAPI.PutAllResponse> result =
- operationHandler.process(serializationServiceStub, generateTestRequest(true, true),
- new MessageExecutionContext(cacheStub, new NoOpAuthorizer()));
+ Result<RegionAPI.PutAllResponse> result = operationHandler.process(serializationServiceStub,
+ generateTestRequest(true, true), new MessageExecutionContext(cacheStub, null, null));
assertTrue(result instanceof Success);
verify(regionMock).put(TEST_KEY1, TEST_VALUE1);
@@ -109,9 +107,8 @@ public class PutAllRequestOperationHandlerJUnitTest extends OperationHandlerJUni
public void processWithNoEntriesPasses() throws Exception {
PutAllRequestOperationHandler operationHandler = new PutAllRequestOperationHandler();
- Result<RegionAPI.PutAllResponse> result =
- operationHandler.process(serializationServiceStub, generateTestRequest(false, false),
- new MessageExecutionContext(cacheStub, new NoOpAuthorizer()));
+ Result<RegionAPI.PutAllResponse> result = operationHandler.process(serializationServiceStub,
+ generateTestRequest(false, false), new MessageExecutionContext(cacheStub, null, null));
assertTrue(result instanceof Success);
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 d4d988c..70b34c3 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
@@ -14,37 +14,36 @@
*/
package org.apache.geode.protocol.protobuf.operations;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.io.UnsupportedEncodingException;
+
import com.google.protobuf.ByteString;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Region;
-import org.apache.geode.internal.protocol.MessageExecutionContext;
import org.apache.geode.internal.exception.InvalidExecutionContextException;
+import org.apache.geode.internal.protocol.MessageExecutionContext;
import org.apache.geode.internal.protocol.protobuf.BasicTypes;
-import org.apache.geode.protocol.responses.Failure;
-import org.apache.geode.protocol.protobuf.ProtocolErrorCode;
import org.apache.geode.internal.protocol.protobuf.RegionAPI;
-import org.apache.geode.protocol.responses.Result;
-import org.apache.geode.protocol.responses.Success;
+import org.apache.geode.protocol.protobuf.ProtocolErrorCode;
import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities;
import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities;
-import org.apache.geode.internal.protocol.security.server.NoOpAuthorizer;
+import org.apache.geode.protocol.responses.Failure;
+import org.apache.geode.protocol.responses.Result;
+import org.apache.geode.protocol.responses.Success;
import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException;
-import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredForTypeException;
import org.apache.geode.serialization.registry.exception.CodecNotRegisteredForTypeException;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.UnsupportedEncodingException;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyString;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
@Category(UnitTest.class)
public class PutRequestOperationHandlerJUnitTest extends OperationHandlerJUnitTest {
@@ -64,12 +63,11 @@ public class PutRequestOperationHandlerJUnitTest extends OperationHandlerJUnitTe
}
@Test
- public void test_puttingTheEncodedEntryIntoRegion()
- throws UnsupportedEncodingTypeException, CodecNotRegisteredForTypeException,
- CodecAlreadyRegisteredForTypeException, InvalidExecutionContextException {
+ public void test_puttingTheEncodedEntryIntoRegion() throws UnsupportedEncodingTypeException,
+ CodecNotRegisteredForTypeException, InvalidExecutionContextException {
PutRequestOperationHandler operationHandler = new PutRequestOperationHandler();
Result<RegionAPI.PutResponse> result = operationHandler.process(serializationServiceStub,
- generateTestRequest(), new MessageExecutionContext(cacheStub, new NoOpAuthorizer()));
+ generateTestRequest(), new MessageExecutionContext(cacheStub, null, null));
assertTrue(result instanceof Success);
@@ -78,8 +76,8 @@ public class PutRequestOperationHandlerJUnitTest extends OperationHandlerJUnitTe
}
@Test
- public void test_invalidEncodingType() throws CodecAlreadyRegisteredForTypeException,
- UnsupportedEncodingTypeException, CodecNotRegisteredForTypeException,
+ public void test_invalidEncodingType()
+ throws UnsupportedEncodingTypeException, CodecNotRegisteredForTypeException,
UnsupportedEncodingException, InvalidExecutionContextException {
String exceptionText = "unsupported type!";
UnsupportedEncodingTypeException exception =
@@ -100,7 +98,7 @@ public class PutRequestOperationHandlerJUnitTest extends OperationHandlerJUnitTe
RegionAPI.PutRequest putRequest =
ProtobufRequestUtilities.createPutRequest(TEST_REGION, testEntry).getPutRequest();
Result<RegionAPI.PutResponse> result = operationHandler.process(serializationServiceStub,
- putRequest, new MessageExecutionContext(cacheStub, new NoOpAuthorizer()));
+ putRequest, new MessageExecutionContext(cacheStub, null, null));
assertTrue(result instanceof Failure);
assertEquals(ProtocolErrorCode.VALUE_ENCODING_ERROR.codeValue,
@@ -108,13 +106,12 @@ public class PutRequestOperationHandlerJUnitTest extends OperationHandlerJUnitTe
}
@Test
- public void test_RegionNotFound()
- throws CodecAlreadyRegisteredForTypeException, UnsupportedEncodingTypeException,
+ public void test_RegionNotFound() throws UnsupportedEncodingTypeException,
CodecNotRegisteredForTypeException, InvalidExecutionContextException {
when(cacheStub.getRegion(TEST_REGION)).thenReturn(null);
PutRequestOperationHandler operationHandler = new PutRequestOperationHandler();
Result<RegionAPI.PutResponse> result = operationHandler.process(serializationServiceStub,
- generateTestRequest(), new MessageExecutionContext(cacheStub, new NoOpAuthorizer()));
+ generateTestRequest(), new MessageExecutionContext(cacheStub, null, null));
assertTrue(result instanceof Failure);
assertEquals(ProtocolErrorCode.REGION_NOT_FOUND.codeValue,
@@ -122,14 +119,13 @@ public class PutRequestOperationHandlerJUnitTest extends OperationHandlerJUnitTe
}
@Test
- public void test_RegionThrowsClasscastException()
- throws CodecAlreadyRegisteredForTypeException, UnsupportedEncodingTypeException,
+ public void test_RegionThrowsClasscastException() throws UnsupportedEncodingTypeException,
CodecNotRegisteredForTypeException, InvalidExecutionContextException {
when(regionMock.put(any(), any())).thenThrow(ClassCastException.class);
PutRequestOperationHandler operationHandler = new PutRequestOperationHandler();
Result<RegionAPI.PutResponse> result = operationHandler.process(serializationServiceStub,
- generateTestRequest(), new MessageExecutionContext(cacheStub, new NoOpAuthorizer()));
+ generateTestRequest(), new MessageExecutionContext(cacheStub, null, null));
assertTrue(result instanceof Failure);
assertEquals(ProtocolErrorCode.CONSTRAINT_VIOLATION.codeValue,
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 9c89e74..db77184 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
@@ -14,36 +14,35 @@
*/
package org.apache.geode.protocol.protobuf.operations;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.io.UnsupportedEncodingException;
+
import com.google.protobuf.ByteString;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Region;
-import org.apache.geode.internal.protocol.MessageExecutionContext;
import org.apache.geode.internal.exception.InvalidExecutionContextException;
+import org.apache.geode.internal.protocol.MessageExecutionContext;
import org.apache.geode.internal.protocol.protobuf.BasicTypes;
import org.apache.geode.internal.protocol.protobuf.ClientProtocol;
-import org.apache.geode.protocol.responses.Failure;
-import org.apache.geode.protocol.protobuf.ProtocolErrorCode;
import org.apache.geode.internal.protocol.protobuf.RegionAPI;
-import org.apache.geode.protocol.responses.Result;
-import org.apache.geode.protocol.responses.Success;
+import org.apache.geode.protocol.protobuf.ProtocolErrorCode;
import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities;
import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities;
-import org.apache.geode.internal.protocol.security.server.NoOpAuthorizer;
+import org.apache.geode.protocol.responses.Failure;
+import org.apache.geode.protocol.responses.Result;
+import org.apache.geode.protocol.responses.Success;
import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException;
-import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredForTypeException;
import org.apache.geode.serialization.registry.exception.CodecNotRegisteredForTypeException;
import org.apache.geode.test.junit.categories.UnitTest;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.UnsupportedEncodingException;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
@Category(UnitTest.class)
public class RemoveRequestOperationHandlerJUnitTest extends OperationHandlerJUnitTest {
@@ -70,11 +69,11 @@ public class RemoveRequestOperationHandlerJUnitTest extends OperationHandlerJUni
@Test
public void processValidKeyRemovesTheEntryAndReturnSuccess()
- throws CodecAlreadyRegisteredForTypeException, UnsupportedEncodingTypeException,
- CodecNotRegisteredForTypeException, InvalidExecutionContextException {
+ throws UnsupportedEncodingTypeException, CodecNotRegisteredForTypeException,
+ InvalidExecutionContextException {
RegionAPI.RemoveRequest removeRequest = generateTestRequest(false, false).getRemoveRequest();
Result<RegionAPI.RemoveResponse> result = operationHandler.process(serializationServiceStub,
- removeRequest, new MessageExecutionContext(cacheStub, new NoOpAuthorizer()));
+ removeRequest, new MessageExecutionContext(cacheStub, null, null));
assertTrue(result instanceof Success);
verify(regionStub).remove(TEST_KEY);
@@ -82,11 +81,11 @@ public class RemoveRequestOperationHandlerJUnitTest extends OperationHandlerJUni
@Test
public void processReturnsUnsucessfulResponseForInvalidRegion()
- throws CodecAlreadyRegisteredForTypeException, UnsupportedEncodingTypeException,
- CodecNotRegisteredForTypeException, InvalidExecutionContextException {
+ throws UnsupportedEncodingTypeException, CodecNotRegisteredForTypeException,
+ InvalidExecutionContextException {
RegionAPI.RemoveRequest removeRequest = generateTestRequest(true, false).getRemoveRequest();
Result<RegionAPI.RemoveResponse> result = operationHandler.process(serializationServiceStub,
- removeRequest, new MessageExecutionContext(cacheStub, new NoOpAuthorizer()));
+ removeRequest, new MessageExecutionContext(cacheStub, null, null));
assertTrue(result instanceof Failure);
assertEquals(ProtocolErrorCode.REGION_NOT_FOUND.codeValue,
@@ -94,21 +93,19 @@ public class RemoveRequestOperationHandlerJUnitTest extends OperationHandlerJUni
}
@Test
- public void processReturnsSuccessWhenKeyIsNotFound()
- throws CodecAlreadyRegisteredForTypeException, UnsupportedEncodingTypeException,
+ public void processReturnsSuccessWhenKeyIsNotFound() throws UnsupportedEncodingTypeException,
CodecNotRegisteredForTypeException, InvalidExecutionContextException {
RegionAPI.RemoveRequest removeRequest = generateTestRequest(false, true).getRemoveRequest();
Result<RegionAPI.RemoveResponse> result = operationHandler.process(serializationServiceStub,
- removeRequest, new MessageExecutionContext(cacheStub, new NoOpAuthorizer()));
+ removeRequest, new MessageExecutionContext(cacheStub, null, null));
assertTrue(result instanceof Success);
}
@Test
public void processReturnsErrorWhenUnableToDecodeRequest()
- throws CodecAlreadyRegisteredForTypeException, UnsupportedEncodingTypeException,
- CodecNotRegisteredForTypeException, UnsupportedEncodingException,
- InvalidExecutionContextException {
+ throws UnsupportedEncodingTypeException, CodecNotRegisteredForTypeException,
+ UnsupportedEncodingException, InvalidExecutionContextException {
CodecNotRegisteredForTypeException exception =
new CodecNotRegisteredForTypeException("error finding codec for type");
when(serializationServiceStub.decode(any(), any())).thenThrow(exception);
@@ -122,7 +119,7 @@ public class RemoveRequestOperationHandlerJUnitTest extends OperationHandlerJUni
RegionAPI.RemoveRequest removeRequest =
ProtobufRequestUtilities.createRemoveRequest(TEST_REGION, encodedKey).getRemoveRequest();;
Result<RegionAPI.RemoveResponse> result = operationHandler.process(serializationServiceStub,
- removeRequest, new MessageExecutionContext(cacheStub, new NoOpAuthorizer()));
+ removeRequest, new MessageExecutionContext(cacheStub, null, null));
assertTrue(result instanceof Failure);
assertEquals(ProtocolErrorCode.VALUE_ENCODING_ERROR.codeValue,
diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/security/server/AuthenticationIntegrationTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/security/server/AuthenticationIntegrationTest.java
index 9db8342..6406431 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/protocol/security/server/AuthenticationIntegrationTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/security/server/AuthenticationIntegrationTest.java
@@ -14,39 +14,40 @@
*/
package org.apache.geode.protocol.security.server;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.same;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.Socket;
+import java.util.Properties;
+import java.util.concurrent.TimeUnit;
+
+import org.awaitility.Awaitility;
+import org.junit.After;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.contrib.java.lang.system.RestoreSystemProperties;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.distributed.ConfigurationProperties;
import org.apache.geode.internal.AvailablePortHelper;
-import org.apache.geode.management.internal.security.ResourceConstants;
import org.apache.geode.internal.protocol.protobuf.AuthenticationAPI;
import org.apache.geode.internal.protocol.protobuf.ClientProtocol;
import org.apache.geode.internal.protocol.protobuf.RegionAPI;
+import org.apache.geode.management.internal.security.ResourceConstants;
import org.apache.geode.protocol.protobuf.serializer.ProtobufProtocolSerializer;
import org.apache.geode.security.SecurityManager;
import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredForTypeException;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.awaitility.Awaitility;
-import org.junit.After;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.Socket;
-import java.util.Properties;
-import java.util.concurrent.TimeUnit;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.same;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
@Category(IntegrationTest.class)
public class AuthenticationIntegrationTest {
diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/security/server/AuthorizationIntegrationTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/security/server/AuthorizationIntegrationTest.java
index c518ca8..af93924 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/protocol/security/server/AuthorizationIntegrationTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/security/server/AuthorizationIntegrationTest.java
@@ -73,7 +73,6 @@ public class AuthorizationIntegrationTest {
private ProtobufProtocolSerializer protobufProtocolSerializer;
private Object securityPrincipal;
private SecurityManager mockSecurityManager;
- private String testRegion;
public static final ResourcePermission READ_PERMISSION =
new ResourcePermission(ResourcePermission.Resource.DATA, ResourcePermission.Operation.READ);
public static final ResourcePermission WRITE_PERMISSION =
@@ -81,6 +80,10 @@ public class AuthorizationIntegrationTest {
@Before
public void setUp() throws IOException, CodecAlreadyRegisteredForTypeException {
+
+ System.setProperty("geode.feature-protobuf-protocol", "true");
+ System.setProperty("geode.protocol-authentication-mode", "SIMPLE");
+
Properties expectedAuthProperties = new Properties();
expectedAuthProperties.setProperty(ResourceConstants.USER_NAME, TEST_USERNAME);
expectedAuthProperties.setProperty(ResourceConstants.PASSWORD, TEST_PASSWORD);
@@ -103,8 +106,6 @@ public class AuthorizationIntegrationTest {
cache.createRegionFactory().create(TEST_REGION);
- System.setProperty("geode.feature-protobuf-protocol", "true");
- System.setProperty("geode.protocol-authentication-mode", "SIMPLE");
socket = new Socket("localhost", cacheServerPort);
Awaitility.await().atMost(5, TimeUnit.SECONDS).until(socket::isConnected);
--
To stop receiving notification emails like this one, please contact
"commits@geode.apache.org" <co...@geode.apache.org>.
[geode] 04/08: Change stream processing to avoid intermediary
collections and process in-line
Posted by ud...@apache.org.
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 f75db762f187de0044da3b8ca326ec0fa3bbc8f4
Author: kohlmu-pivotal <uk...@pivotal.io>
AuthorDate: Mon Sep 11 10:00:20 2017 -0700
Change stream processing to avoid intermediary collections and process in-line
---
.../operations/GetAllRequestOperationHandler.java | 19 ++++++++---------
.../GetAvailableServersOperationHandler.java | 24 +++++++++++-----------
.../operations/PutAllRequestOperationHandler.java | 7 +++----
3 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandler.java
index 446dbcb..41ad65f 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandler.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandler.java
@@ -53,18 +53,17 @@ public class GetAllRequestOperationHandler
.makeErrorResponse(ProtocolErrorCode.REGION_NOT_FOUND.codeValue, "Region not found"));
}
- Map<Boolean, List<Object>> resultsCollection = request.getKeyList().stream()
- .map((key) -> processOneMessage(serializationService, region, key))
- .collect(Collectors.partitioningBy(x -> x instanceof BasicTypes.Entry));
RegionAPI.GetAllResponse.Builder responseBuilder = RegionAPI.GetAllResponse.newBuilder();
- for (Object entry : resultsCollection.get(true)) {
- responseBuilder.addEntries((BasicTypes.Entry) entry);
- }
-
- for (Object entry : resultsCollection.get(false)) {
- responseBuilder.addFailures((BasicTypes.KeyedError) entry);
- }
+ request.getKeyList().stream()
+ .map((key) -> processOneMessage(serializationService, region, key))
+ .forEach(entry -> {
+ if (entry instanceof BasicTypes.Entry) {
+ responseBuilder.addEntries((BasicTypes.Entry) entry);
+ }else if (entry instanceof BasicTypes.KeyedError) {
+ responseBuilder.addFailures((BasicTypes.KeyedError) entry);
+ }
+ });
return Success.of(responseBuilder.build());
}
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAvailableServersOperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAvailableServersOperationHandler.java
index a242492..6d63b95 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAvailableServersOperationHandler.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAvailableServersOperationHandler.java
@@ -14,19 +14,18 @@
*/
package org.apache.geode.protocol.protobuf.operations;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.stream.Collectors;
+import java.util.Collections;
+import java.util.List;
import org.apache.geode.annotations.Experimental;
import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.distributed.internal.ServerLocation;
import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
import org.apache.geode.internal.exception.InvalidExecutionContextException;
-import org.apache.geode.protocol.operations.OperationHandler;
import org.apache.geode.internal.protocol.protobuf.BasicTypes;
-import org.apache.geode.protocol.protobuf.Result;
import org.apache.geode.internal.protocol.protobuf.ServerAPI;
+import org.apache.geode.protocol.operations.OperationHandler;
+import org.apache.geode.protocol.protobuf.Result;
import org.apache.geode.protocol.protobuf.Success;
import org.apache.geode.serialization.SerializationService;
@@ -40,18 +39,19 @@ public class GetAvailableServersOperationHandler implements
MessageExecutionContext executionContext) throws InvalidExecutionContextException {
InternalLocator internalLocator = (InternalLocator) executionContext.getLocator();
- ArrayList serversFromSnapshot =
+ List serversFromSnapshot =
internalLocator.getServerLocatorAdvisee().getLoadSnapshot().getServers(null);
if (serversFromSnapshot == null) {
- serversFromSnapshot = new ArrayList();
+ serversFromSnapshot = Collections.EMPTY_LIST;
}
- Collection<BasicTypes.Server> servers = (Collection<BasicTypes.Server>) serversFromSnapshot
+ ServerAPI.GetAvailableServersResponse.Builder serverResponseBuilder =
+ ServerAPI.GetAvailableServersResponse.newBuilder();
+
+ serversFromSnapshot
.stream().map(serverLocation -> getServerProtobufMessage((ServerLocation) serverLocation))
- .collect(Collectors.toList());
- ServerAPI.GetAvailableServersResponse.Builder builder =
- ServerAPI.GetAvailableServersResponse.newBuilder().addAllServers(servers);
- return Success.of(builder.build());
+ .forEach( serverMessage -> serverResponseBuilder.addServers((BasicTypes.Server) serverMessage));
+ return Success.of(serverResponseBuilder.build());
}
private BasicTypes.Server getServerProtobufMessage(ServerLocation serverLocation) {
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/PutAllRequestOperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/PutAllRequestOperationHandler.java
index 8f2d9ef..b3ca344 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/PutAllRequestOperationHandler.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/PutAllRequestOperationHandler.java
@@ -54,10 +54,9 @@ public class PutAllRequestOperationHandler
"Region passed by client did not exist: " + putAllRequest.getRegionName(), logger, null));
}
- RegionAPI.PutAllResponse.Builder builder = RegionAPI.PutAllResponse.newBuilder()
- .addAllFailedKeys(putAllRequest.getEntryList().stream()
- .map((entry) -> singlePut(serializationService, region, entry)).filter(Objects::nonNull)
- .collect(Collectors.toList()));
+ RegionAPI.PutAllResponse.Builder builder = RegionAPI.PutAllResponse.newBuilder();
+ putAllRequest.getEntryList().stream()
+ .map((entry) -> singlePut(serializationService, region, entry)).filter(Objects::nonNull).forEach(failedKey -> builder.addFailedKeys(failedKey));
return Success.of(builder.build());
}
--
To stop receiving notification emails like this one, please contact
"commits@geode.apache.org" <co...@geode.apache.org>.
[geode] 03/08: Moving ProtobufSimpleAuthenticator.java and
ProtobufSimpleAuthorizer.java to different package in geode-protobuf
Posted by ud...@apache.org.
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 ef7226b165ef45e83873813ce5cb56cc591ab7e0
Author: kohlmu-pivotal <uk...@pivotal.io>
AuthorDate: Mon Sep 11 09:37:01 2017 -0700
Moving ProtobufSimpleAuthenticator.java and ProtobufSimpleAuthorizer.java
to different package in geode-protobuf
---
.../protobuf/{ => security/server}/ProtobufSimpleAuthenticator.java | 2 +-
.../protobuf/{ => security/server}/ProtobufSimpleAuthorizer.java | 2 +-
.../services/org.apache.geode.internal.security.server.Authenticator | 2 +-
.../geode/protocol/protobuf/ProtobufSimpleAuthenticatorJUnitTest.java | 1 +
4 files changed, 4 insertions(+), 3 deletions(-)
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/security/server/ProtobufSimpleAuthenticator.java
similarity index 98%
rename from geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufSimpleAuthenticator.java
rename to geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/security/server/ProtobufSimpleAuthenticator.java
index 1e4ae5b..9892bef 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/security/server/ProtobufSimpleAuthenticator.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.protocol.protobuf;
+package org.apache.geode.protocol.protobuf.security.server;
import org.apache.geode.management.internal.security.ResourceConstants;
import org.apache.geode.internal.protocol.protobuf.AuthenticationAPI;
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/security/server/ProtobufSimpleAuthorizer.java
similarity index 96%
rename from geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufSimpleAuthorizer.java
rename to geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/security/server/ProtobufSimpleAuthorizer.java
index 756d779..e0d7474 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/security/server/ProtobufSimpleAuthorizer.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.protocol.protobuf;
+package org.apache.geode.protocol.protobuf.security.server;
import org.apache.geode.security.ResourcePermission;
import org.apache.geode.security.SecurityManager;
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
index 45e4eea..0005e93 100644
--- 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
@@ -1 +1 @@
-org.apache.geode.protocol.protobuf.ProtobufSimpleAuthenticator
\ No newline at end of file
+org.apache.geode.protocol.protobuf.security.server.ProtobufSimpleAuthenticator
\ No newline at end of file
diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/ProtobufSimpleAuthenticatorJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/ProtobufSimpleAuthenticatorJUnitTest.java
index 33424a3..2f09f8c 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/ProtobufSimpleAuthenticatorJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/ProtobufSimpleAuthenticatorJUnitTest.java
@@ -18,6 +18,7 @@ package org.apache.geode.protocol.protobuf;
import org.apache.geode.examples.security.ExampleSecurityManager;
import org.apache.geode.management.internal.security.ResourceConstants;
import org.apache.geode.internal.protocol.protobuf.AuthenticationAPI;
+import org.apache.geode.protocol.protobuf.security.server.ProtobufSimpleAuthenticator;
import org.apache.geode.security.AuthenticationFailedException;
import org.apache.geode.security.SecurityManager;
import org.apache.geode.test.junit.categories.UnitTest;
--
To stop receiving notification emails like this one, please contact
"commits@geode.apache.org" <co...@geode.apache.org>.