geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jinmeil...@apache.org
Subject [08/50] [abbrv] incubator-geode git commit: Created GetAll test
Date Fri, 08 Jul 2016 15:51:28 GMT
Created GetAll test


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/088e4069
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/088e4069
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/088e4069

Branch: refs/heads/develop
Commit: 088e406900335b83e925889d299f93da611d8bf7
Parents: 98244ec
Author: gmeilen <gracemeilen@gmail.com>
Authored: Mon Jun 27 11:37:37 2016 -0700
Committer: gmeilen <gracemeilen@gmail.com>
Committed: Mon Jun 27 11:37:37 2016 -0700

----------------------------------------------------------------------
 .../cache/tier/sockets/command/GetAll.java      |  1 +
 .../cache/tier/sockets/command/GetAll651.java   |  1 +
 .../cache/tier/sockets/command/GetAll70.java    |  1 +
 ...tegratedClientGetAllAuthDistributedTest.java | 62 ++++++++++++++++++++
 4 files changed, 65 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/088e4069/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetAll.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetAll.java
b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetAll.java
index 5a49241..c88ccb3 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetAll.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetAll.java
@@ -116,6 +116,7 @@ public class GetAll extends BaseCommand {
       servConn.setAsTrue(RESPONDED);
       return;
     }
+    GeodeSecurityUtil.authorizeRegionRead(region.getName());
     // Send header
     ChunkedMessage chunkedResponseMsg = servConn.getChunkedResponseMessage();
     chunkedResponseMsg.setMessageType(MessageType.RESPONSE);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/088e4069/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetAll651.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetAll651.java
b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetAll651.java
index 56100f2..600ee46 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetAll651.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetAll651.java
@@ -114,6 +114,7 @@ public class GetAll651 extends BaseCommand {
       servConn.setAsTrue(RESPONDED);
       return;
     }
+    GeodeSecurityUtil.authorizeRegionRead(region.getName());
     // Send header
     ChunkedMessage chunkedResponseMsg = servConn.getChunkedResponseMessage();
     chunkedResponseMsg.setMessageType(MessageType.RESPONSE);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/088e4069/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetAll70.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetAll70.java
b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetAll70.java
index d162b19..1953051 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetAll70.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetAll70.java
@@ -127,6 +127,7 @@ public class GetAll70 extends BaseCommand {
       servConn.setAsTrue(RESPONDED);
       return;
     }
+    GeodeSecurityUtil.authorizeRegionRead(region.getName());
     // Send header
     ChunkedMessage chunkedResponseMsg = servConn.getChunkedResponseMessage();
     chunkedResponseMsg.setMessageType(MessageType.RESPONSE);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/088e4069/geode-core/src/test/java/com/gemstone/gemfire/security/IntegratedClientGetAllAuthDistributedTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/IntegratedClientGetAllAuthDistributedTest.java
b/geode-core/src/test/java/com/gemstone/gemfire/security/IntegratedClientGetAllAuthDistributedTest.java
new file mode 100644
index 0000000..a690163
--- /dev/null
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/IntegratedClientGetAllAuthDistributedTest.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gemstone.gemfire.security;
+
+import static com.googlecode.catchexception.CatchException.*;
+import static org.assertj.core.api.Assertions.*;
+
+import java.util.Arrays;
+
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.client.ClientCache;
+import com.gemstone.gemfire.cache.client.ClientCacheFactory;
+import com.gemstone.gemfire.cache.client.ClientRegionFactory;
+import com.gemstone.gemfire.cache.client.ClientRegionShortcut;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(DistributedTest.class)
+public class IntegratedClientGetAllAuthDistributedTest extends AbstractIntegratedClientAuthDistributedTest
{
+
+  @Test
+  public void testGetAll() {
+    client1.invoke("logging in super-user with correct password", () -> {
+      ClientCache cache = new ClientCacheFactory(createClientProperties("stranger", "1234567"))
+        .setPoolSubscriptionEnabled(true)
+        .addPoolServer("localhost", serverPort)
+        .create();
+
+      Region region = cache.createClientRegionFactory(ClientRegionShortcut.PROXY).create(REGION_NAME);
+      assertNotAuthorized(() -> region.getAll(Arrays.asList("key1", "key2", "key3", "key4")),
"DATA:READ:AuthRegion");
+    });
+
+    client2.invoke("logging in super-user with correct password", () -> {
+      ClientCache cache = new ClientCacheFactory(createClientProperties("authRegionReader",
"1234567"))
+        .setPoolSubscriptionEnabled(true)
+        .addPoolServer("localhost", serverPort)
+        .create();
+
+      Region region = cache.createClientRegionFactory(ClientRegionShortcut.PROXY).create(REGION_NAME);
+      region.getAll(Arrays.asList("key1", "key2", "key3", "key4"));
+    });
+  }
+}
+
+


Mime
View raw message