You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ji...@apache.org on 2016/06/21 03:14:29 UTC
[8/9] incubator-geode git commit: client server
client server
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/ea9a5854
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/ea9a5854
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/ea9a5854
Branch: refs/heads/feature/GEODE-1571
Commit: ea9a5854412464d0d228b8272a26b317bd58fc5f
Parents: c6e7a3b
Author: Jinmei Liao <ji...@pivotal.io>
Authored: Mon Jun 20 13:49:05 2016 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Mon Jun 20 13:49:05 2016 -0700
----------------------------------------------------------------------
.../cache/tier/sockets/ServerConnection.java | 4 +--
.../tier/sockets/ServerHandShakeProcessor.java | 1 +
.../security/IntegratedClientAuthDUnitTest.java | 26 ++++++++++----------
3 files changed, 16 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ea9a5854/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerConnection.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerConnection.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerConnection.java
index 3a6cadb..39c4cc7 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerConnection.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerConnection.java
@@ -787,11 +787,10 @@ public class ServerConnection implements Runnable {
// if a subject exists for this uniqueId, binds the subject to this thread so that we can do authorization later
if(AcceptorImpl.isIntegratedSecurity() && !isInternalMessage()) {
long uniqueId = getUniqueId();
- logger.info(command + " received with uniqueId "+uniqueId);
Subject subject = this.clientUserAuths.getSubject(uniqueId);
if(subject!=null) {
threadState = GeodeSecurityUtil.bindSubject(subject);
- logger.info("binding " + subject.getPrincipal() + " to the current thread");
+ logger.info( command + " with " + uniqueId + ", binding " + subject.getPrincipal() + " to the current thread executing ");
}
}
@@ -1058,6 +1057,7 @@ public class ServerConnection implements Runnable {
Subject subject = (Subject)principal;
uniqueId = this.clientUserAuths.putSubject(subject);
logger.info("Put subject in Map: "+uniqueId+" for "+ subject.getPrincipal());
+ logger.info(this.clientUserAuths);
}
else {
//this sets principal in map as well....
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ea9a5854/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerHandShakeProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerHandShakeProcessor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerHandShakeProcessor.java
index b24b00c..eef147a 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerHandShakeProcessor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerHandShakeProcessor.java
@@ -314,6 +314,7 @@ public class ServerHandShakeProcessor {
long uniqueId;
if(principal instanceof Subject){
uniqueId = connection.getClientUserAuths().putSubject((Subject)principal);
+ logger.info("Put subject in Map: "+uniqueId+" for "+ ((Subject)principal).getPrincipal());
}
else {
//this sets principal in map as well....
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ea9a5854/geode-core/src/test/java/com/gemstone/gemfire/security/IntegratedClientAuthDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/IntegratedClientAuthDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/security/IntegratedClientAuthDUnitTest.java
index 58f7d8f..dbd88a9 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/IntegratedClientAuthDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/IntegratedClientAuthDUnitTest.java
@@ -85,24 +85,24 @@ public class IntegratedClientAuthDUnitTest extends JUnit4DistributedTestCase {
keys.add("key1");
keys.add("key2");
- // have one client log in as authorized user to put some data in the regions first.
- client2.invoke(()->{
- Cache cache = SecurityTestUtils.createCacheClient("authRegionUser", "1234567", port, SecurityTestUtils.NO_EXCEPTION);
- final Region region = cache.getRegion(SecurityTestUtils.REGION_NAME);
- region.putAll(allValues);
- cache.close();
- });
+// // have one client log in as authorized user to put some data in the regions first.
+// client2.invoke(()->{
+// Cache cache = SecurityTestUtils.createCacheClient("authRegionUser", "1234567", port, SecurityTestUtils.NO_EXCEPTION);
+// final Region region = cache.getRegion(SecurityTestUtils.REGION_NAME);
+// region.putAll(allValues);
+// cache.close();
+// });
// client1 connects to server as a user not authorized to do any operations
AsyncInvocation ai1 = client1.invokeAsync(()->{
Cache cache = SecurityTestUtils.createCacheClient("stranger", "1234567", port, SecurityTestUtils.NO_EXCEPTION);
final Region region = cache.getRegion(SecurityTestUtils.REGION_NAME);
- assertNotAuthorized(()->region.put("key3", "value3"), "[DATA:WRITE:AuthRegion:key3]");
- assertNotAuthorized(()->region.get("key3"), "[DATA:READ:AuthRegion:key3]");
+ assertNotAuthorized(()->region.put("key3", "value3"), "DATA:WRITE:AuthRegion:key3");
+ assertNotAuthorized(()->region.get("key3"), "DATA:READ:AuthRegion:key3");
//putall
- assertNotAuthorized(()->region.putAll(allValues), "[DATA:WRITE:AuthRegion]");
+ assertNotAuthorized(()->region.putAll(allValues), "DATA:WRITE:AuthRegion");
// not authorized for either keys, get no record back
Map keyValues = region.getAll(keys);
@@ -145,10 +145,10 @@ public class IntegratedClientAuthDUnitTest extends JUnit4DistributedTestCase {
Cache cache = SecurityTestUtils.createCacheClient("key1User", "1234567", port, SecurityTestUtils.NO_EXCEPTION);
final Region region = cache.getRegion(SecurityTestUtils.REGION_NAME);
- assertNotAuthorized(()->region.put("key2", "value1"), "[DATA:WRITE:AuthRegion:key2]");
- assertNotAuthorized(()->region.get("key2"), "[DATA:READ:AuthRegion:key2]");
+ assertNotAuthorized(()->region.put("key2", "value1"), "DATA:WRITE:AuthRegion:key2");
+ assertNotAuthorized(()->region.get("key2"), "DATA:READ:AuthRegion:key2");
- assertNotAuthorized(()->region.putAll(allValues), "[DATA:WRITE:AuthRegion]");
+ assertNotAuthorized(()->region.putAll(allValues), "DATA:WRITE:AuthRegion");
// only authorized for one recrod
Map keyValues = region.getAll(keys);