http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/310698c1/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestCase.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestCase.java new file mode 100644 index 0000000..be3de47 --- /dev/null +++ b/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestCase.java @@ -0,0 +1,1333 @@ +/* + * 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.gemstone.gemfire.internal.AvailablePort.*; +import static com.gemstone.gemfire.security.SecurityTestUtils.*; +import static com.gemstone.gemfire.test.dunit.Assert.*; +import static com.gemstone.gemfire.test.dunit.Host.*; +import static com.gemstone.gemfire.test.dunit.Wait.*; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Random; +import java.util.Set; + +import com.gemstone.gemfire.cache.DynamicRegionFactory; +import com.gemstone.gemfire.cache.InterestResultPolicy; +import com.gemstone.gemfire.cache.Operation; +import com.gemstone.gemfire.cache.Region; +import com.gemstone.gemfire.cache.Region.Entry; +import com.gemstone.gemfire.cache.RegionDestroyedException; +import com.gemstone.gemfire.cache.client.ServerConnectivityException; +import com.gemstone.gemfire.cache.operations.OperationContext.OperationCode; +import com.gemstone.gemfire.cache.query.CqAttributes; +import com.gemstone.gemfire.cache.query.CqAttributesFactory; +import com.gemstone.gemfire.cache.query.CqEvent; +import com.gemstone.gemfire.cache.query.CqException; +import com.gemstone.gemfire.cache.query.CqListener; +import com.gemstone.gemfire.cache.query.CqQuery; +import com.gemstone.gemfire.cache.query.QueryInvocationTargetException; +import com.gemstone.gemfire.cache.query.QueryService; +import com.gemstone.gemfire.cache.query.SelectResults; +import com.gemstone.gemfire.cache.query.Struct; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; +import com.gemstone.gemfire.internal.AvailablePort.Keeper; +import com.gemstone.gemfire.internal.cache.AbstractRegionEntry; +import com.gemstone.gemfire.internal.cache.LocalRegion; +import com.gemstone.gemfire.internal.util.Callable; +import com.gemstone.gemfire.security.generator.AuthzCredentialGenerator; +import com.gemstone.gemfire.security.generator.AuthzCredentialGenerator.ClassCode; +import com.gemstone.gemfire.security.generator.CredentialGenerator; +import com.gemstone.gemfire.security.generator.DummyCredentialGenerator; +import com.gemstone.gemfire.security.generator.XmlAuthzCredentialGenerator; +import com.gemstone.gemfire.test.dunit.VM; +import com.gemstone.gemfire.test.dunit.WaitCriterion; +import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase; + +/** + * Base class for tests for authorization from client to server. It contains + * utility functions for the authorization tests from client to server. + * + * @since 5.5 + */ +public class ClientAuthorizationTestCase extends JUnit4DistributedTestCase { + + private static final int PAUSE = 5 * 1000; + + protected static VM server1 = null; + protected static VM server2 = null; + protected static VM client1 = null; + protected static VM client2 = null; + + protected static final String regionName = REGION_NAME; + protected static final String subregionName = "AuthSubregion"; + + private static final String[] serverIgnoredExceptions = { + "Connection refused", + AuthenticationRequiredException.class.getName(), + AuthenticationFailedException.class.getName(), + NotAuthorizedException.class.getName(), + GemFireSecurityException.class.getName(), + RegionDestroyedException.class.getName(), + ClassNotFoundException.class.getName() + }; + + private static final String[] clientIgnoredExceptions = { + AuthenticationFailedException.class.getName(), + NotAuthorizedException.class.getName(), + RegionDestroyedException.class.getName() + }; + + @Override + public final void preSetUp() throws Exception { + } + + @Override + public final void postSetUp() throws Exception { + preSetUpClientAuthorizationTestBase(); + setUpClientAuthorizationTestBase(); + postSetUpClientAuthorizationTestBase(); + } + + private final void setUpClientAuthorizationTestBase() throws Exception { + server1 = getHost(0).getVM(0); + server2 = getHost(0).getVM(1); + client1 = getHost(0).getVM(2); + client2 = getHost(0).getVM(3); + setUpIgnoredExceptions(); + } + + private final void setUpIgnoredExceptions() { + Set<String> serverExceptions = new HashSet<>(); + serverExceptions.addAll(Arrays.asList(serverIgnoredExceptions())); + if (serverExceptions.isEmpty()) { + serverExceptions.addAll(Arrays.asList(serverIgnoredExceptions)); + } + + String[] serverExceptionsArray = serverExceptions.toArray(new String[serverExceptions.size()]); + server1.invoke(() -> registerExpectedExceptions(serverExceptionsArray)); + server2.invoke(() -> registerExpectedExceptions(serverExceptionsArray)); + + Set<String> clientExceptions = new HashSet<>(); + clientExceptions.addAll(Arrays.asList(clientIgnoredExceptions())); + if (clientExceptions.isEmpty()) { + clientExceptions.addAll(Arrays.asList(clientIgnoredExceptions)); + } + + String[] clientExceptionsArray = serverExceptions.toArray(new String[clientExceptions.size()]); + client2.invoke(() -> registerExpectedExceptions(clientExceptionsArray)); + registerExpectedExceptions(clientExceptionsArray); + } + + protected String[] serverIgnoredExceptions() { + return new String[]{}; + } + + protected String[] clientIgnoredExceptions() { + return new String[]{}; + } + + protected void preSetUpClientAuthorizationTestBase() throws Exception { + } + + protected void postSetUpClientAuthorizationTestBase() throws Exception { + } + + @Override + public final void preTearDown() throws Exception { + preTearDownClientAuthorizationTestBase(); + tearDownClientAuthorizationTestBase(); + postTearDownClientAuthorizationTestBase(); + } + + @Override + public final void postTearDown() throws Exception { + } + + private final void tearDownClientAuthorizationTestBase() throws Exception { + // close the clients first + client1.invoke(() -> closeCache()); + client2.invoke(() -> closeCache()); + // then close the servers + server1.invoke(() -> closeCache()); + server2.invoke(() -> closeCache()); + } + + protected void preTearDownClientAuthorizationTestBase() throws Exception { + } + + protected void postTearDownClientAuthorizationTestBase() throws Exception { + } + + protected static Properties buildProperties(String authenticator, String accessor, boolean isAccessorPP, Properties extraAuthProps, Properties extraAuthzProps) { + Properties authProps = new Properties(); + if (authenticator != null) { + authProps.setProperty(DistributionConfig.SECURITY_CLIENT_AUTHENTICATOR_NAME, authenticator); + } + if (accessor != null) { + if (isAccessorPP) { + authProps.setProperty(DistributionConfig.SECURITY_CLIENT_ACCESSOR_PP_NAME, accessor); + } else { + authProps.setProperty(DistributionConfig.SECURITY_CLIENT_ACCESSOR_NAME, accessor); + } + } + return concatProperties(new Properties[] { authProps, extraAuthProps, extraAuthzProps }); + } + + protected static Integer createCacheServer(int locatorPort, Properties authProps, Properties javaProps) { + if (locatorPort == 0) { + locatorPort = getRandomAvailablePort(SOCKET); + } + return SecurityTestUtils.createCacheServer(authProps, javaProps, locatorPort, null, 0, true, NO_EXCEPTION); + } + + protected static int createCacheServer(int locatorPort, int serverPort, Properties authProps, Properties javaProps) { + if (locatorPort == 0) { + locatorPort = getRandomAvailablePort(SOCKET); + } + return SecurityTestUtils.createCacheServer(authProps, javaProps, locatorPort, null, serverPort, true, NO_EXCEPTION); + } + + protected static Region getRegion() { + return getCache().getRegion(regionName); + } + + protected static Region getSubregion() { + return getCache().getRegion(regionName + '/' + subregionName); + } + + private static Region createSubregion(Region region) { + Region subregion = getSubregion(); + if (subregion == null) { + subregion = region.createSubregion(subregionName, region.getAttributes()); + } + return subregion; + } + + protected static String indicesToString(int[] indices) { + String str = ""; + if (indices != null && indices.length > 0) { + str += indices[0]; + for (int index = 1; index < indices.length; ++index) { + str += ","; + str += indices[index]; + } + } + return str; + } + + protected static void doOp(Byte opCode, int[] indices, Integer flagsI, Integer expectedResult) throws InterruptedException { + OperationCode op = OperationCode.fromOrdinal(opCode.byteValue()); + boolean operationOmitted = false; + final int flags = flagsI.intValue(); + Region region = getRegion(); + + if ((flags & OpFlags.USE_SUBREGION) > 0) { + assertNotNull(region); + Region subregion = null; + + if ((flags & OpFlags.NO_CREATE_SUBREGION) > 0) { + if ((flags & OpFlags.CHECK_NOREGION) > 0) { + // Wait for some time for DRF update to come + waitForCondition(new Callable() { + public Object call() throws Exception { + return Boolean.valueOf(getSubregion() == null); + } + }); + subregion = getSubregion(); + assertNull(subregion); + return; + + } else { + // Wait for some time for DRF update to come + waitForCondition(new Callable() { + public Object call() throws Exception { + return Boolean.valueOf(getSubregion() != null); + } + }); + subregion = getSubregion(); + assertNotNull(subregion); + } + + } else { + subregion = createSubregion(region); + } + + assertNotNull(subregion); + region = subregion; + + } else if ((flags & OpFlags.CHECK_NOREGION) > 0) { + // Wait for some time for region destroy update to come + waitForCondition(new Callable() { + public Object call() throws Exception { + return Boolean.valueOf(getRegion() == null); + } + }); + region = getRegion(); + assertNull(region); + return; + + } else { + assertNotNull(region); + } + + final String[] keys = KEYS; + final String[] vals; + if ((flags & OpFlags.USE_NEWVAL) > 0) { + vals = NVALUES; + } + else { + vals = VALUES; + } + + InterestResultPolicy policy = InterestResultPolicy.KEYS_VALUES; + if ((flags & OpFlags.REGISTER_POLICY_NONE) > 0) { + policy = InterestResultPolicy.NONE; + } + + final int numOps = indices.length; + System.out.println("Got doOp for op: " + op.toString() + ", numOps: " + numOps + ", indices: " + indicesToString(indices) + ", expect: " + expectedResult); + boolean exceptionOccured = false; + boolean breakLoop = false; + + if (op.isGet() || op.isContainsKey() || op.isKeySet() || op.isQuery() || op.isExecuteCQ()) { + Thread.sleep(PAUSE); + } + + for (int indexIndex = 0; indexIndex < numOps; ++indexIndex) { + if (breakLoop) { + break; + } + int index = indices[indexIndex]; + + try { + final Object key = keys[index]; + final Object expectedVal = vals[index]; + + if (op.isGet()) { + Object value = null; + // this is the case for testing GET_ALL + if ((flags & OpFlags.USE_ALL_KEYS) > 0) { + breakLoop = true; + List keyList = new ArrayList(numOps); + Object searchKey; + + for (int keyNumIndex = 0; keyNumIndex < numOps; ++keyNumIndex) { + int keyNum = indices[keyNumIndex]; + searchKey = keys[keyNum]; + keyList.add(searchKey); + + // local invalidate some KEYS to force fetch of those KEYS from server + if ((flags & OpFlags.CHECK_NOKEY) > 0) { + AbstractRegionEntry entry = (AbstractRegionEntry)((LocalRegion)region).getRegionEntry(searchKey); + System.out.println(""+keyNum+": key is " + searchKey + " and entry is " + entry); + assertFalse(region.containsKey(searchKey)); + } else { + if (keyNumIndex % 2 == 1) { + assertTrue(region.containsKey(searchKey)); + region.localInvalidate(searchKey); + } + } + } + + Map entries = region.getAll(keyList); + + for (int keyNumIndex = 0; keyNumIndex < numOps; ++keyNumIndex) { + int keyNum = indices[keyNumIndex]; + searchKey = keys[keyNum]; + if ((flags & OpFlags.CHECK_FAIL) > 0) { + assertFalse(entries.containsKey(searchKey)); + } else { + assertTrue(entries.containsKey(searchKey)); + value = entries.get(searchKey); + assertEquals(vals[keyNum], value); + } + } + + break; + } + + if ((flags & OpFlags.LOCAL_OP) > 0) { + Callable cond = new Callable() { + private Region region; + + @Override + public Object call() throws Exception { + Object value = getLocalValue(region, key); + return Boolean.valueOf((flags & OpFlags.CHECK_FAIL) > 0 ? !expectedVal.equals(value) : expectedVal.equals(value)); + } + + public Callable init(Region region) { + this.region = region; + return this; + } + }.init(region); + + waitForCondition(cond); + value = getLocalValue(region, key); + + } else if ((flags & OpFlags.USE_GET_ENTRY_IN_TX) > 0) { + getCache().getCacheTransactionManager().begin(); + Entry e = region.getEntry(key); + // Also, check getAll() + ArrayList a = new ArrayList(); + a.addAll(a); + region.getAll(a); + + getCache().getCacheTransactionManager().commit(); + value = e.getValue(); + + } else { + if ((flags & OpFlags.CHECK_NOKEY) > 0) { + assertFalse(region.containsKey(key)); + } else { + assertTrue(region.containsKey(key) || ((LocalRegion)region).getRegionEntry(key).isTombstone()); + region.localInvalidate(key); + } + value = region.get(key); + } + + if ((flags & OpFlags.CHECK_FAIL) > 0) { + assertFalse(expectedVal.equals(value)); + } else { + assertNotNull(value); + assertEquals(expectedVal, value); + } + + } else if (op.isPut()) { + region.put(key, expectedVal); + + } else if (op.isPutAll()) { + HashMap map = new HashMap(); + for (int i=0; i<indices.length; i++) { + map.put(keys[indices[i]], vals[indices[i]]); + } + region.putAll(map); + breakLoop = true; + + } else if (op.isDestroy()) { + // if (!region.containsKey(key)) { + // // Since DESTROY will fail unless the value is present + // // in the local cache, this is a workaround for two cases: + // // 1. When the operation is supposed to succeed then in + // // the current AuthzCredentialGenerators the clients having + // // DESTROY permission also has CREATE/UPDATE permission + // // so that calling region.put() will work for that case. + // // 2. When the operation is supposed to fail with + // // NotAuthorizedException then in the current + // // AuthzCredentialGenerators the clients not + // // having DESTROY permission are those with reader role that have + // // GET permission. + // // + // // If either of these assumptions fails, then this has to be + // // adjusted or reworked accordingly. + // if ((flags & OpFlags.CHECK_NOTAUTHZ) > 0) { + // Object value = region.get(key); + // assertNotNull(value); + // assertEquals(vals[index], value); + // } + // else { + // region.put(key, vals[index]); + // } + // } + if ((flags & OpFlags.LOCAL_OP) > 0) { + region.localDestroy(key); + } + else { + region.destroy(key); + } + + } else if (op.isInvalidate()) { + if (region.containsKey(key)) { + if ((flags & OpFlags.LOCAL_OP) > 0) { + region.localInvalidate(key); + } else { + region.invalidate(key); + } + } + + } else if (op.isContainsKey()) { + boolean result; + if ((flags & OpFlags.LOCAL_OP) > 0) { + result = region.containsKey(key); + } else { + result = region.containsKeyOnServer(key); + } + if ((flags & OpFlags.CHECK_FAIL) > 0) { + assertFalse(result); + } else { + assertTrue(result); + } + + } else if (op.isRegisterInterest()) { + if ((flags & OpFlags.USE_LIST) > 0) { + breakLoop = true; + // Register interest list in this case + List keyList = new ArrayList(numOps); + for (int keyNumIndex = 0; keyNumIndex < numOps; ++keyNumIndex) { + int keyNum = indices[keyNumIndex]; + keyList.add(keys[keyNum]); + } + region.registerInterest(keyList, policy); + + } else if ((flags & OpFlags.USE_REGEX) > 0) { + breakLoop = true; + region.registerInterestRegex("key[1-" + numOps + ']', policy); + + } else if ((flags & OpFlags.USE_ALL_KEYS) > 0) { + breakLoop = true; + region.registerInterest("ALL_KEYS", policy); + + } else { + region.registerInterest(key, policy); + } + + } else if (op.isUnregisterInterest()) { + if ((flags & OpFlags.USE_LIST) > 0) { + breakLoop = true; + // Register interest list in this case + List keyList = new ArrayList(numOps); + for (int keyNumIndex = 0; keyNumIndex < numOps; ++keyNumIndex) { + int keyNum = indices[keyNumIndex]; + keyList.add(keys[keyNum]); + } + region.unregisterInterest(keyList); + + } else if ((flags & OpFlags.USE_REGEX) > 0) { + breakLoop = true; + region.unregisterInterestRegex("key[1-" + numOps + ']'); + + } else if ((flags & OpFlags.USE_ALL_KEYS) > 0) { + breakLoop = true; + region.unregisterInterest("ALL_KEYS"); + + } else { + region.unregisterInterest(key); + } + + } else if (op.isKeySet()) { + breakLoop = true; + Set keySet; + if ((flags & OpFlags.LOCAL_OP) > 0) { + keySet = region.keySet(); + } else { + keySet = region.keySetOnServer(); + } + + assertNotNull(keySet); + if ((flags & OpFlags.CHECK_FAIL) == 0) { + assertEquals(numOps, keySet.size()); + } + for (int keyNumIndex = 0; keyNumIndex < numOps; ++keyNumIndex) { + int keyNum = indices[keyNumIndex]; + if ((flags & OpFlags.CHECK_FAIL) > 0) { + assertFalse(keySet.contains(keys[keyNum])); + } else { + assertTrue(keySet.contains(keys[keyNum])); + } + } + + } else if (op.isQuery()) { + breakLoop = true; + SelectResults queryResults = region.query("SELECT DISTINCT * FROM " + region.getFullPath()); + assertNotNull(queryResults); + Set queryResultSet = queryResults.asSet(); + if ((flags & OpFlags.CHECK_FAIL) == 0) { + assertEquals(numOps, queryResultSet.size()); + } + for (int keyNumIndex = 0; keyNumIndex < numOps; ++keyNumIndex) { + int keyNum = indices[keyNumIndex]; + if ((flags & OpFlags.CHECK_FAIL) > 0) { + assertFalse(queryResultSet.contains(vals[keyNum])); + } else { + assertTrue(queryResultSet.contains(vals[keyNum])); + } + } + + } else if (op.isExecuteCQ()) { + breakLoop = true; + QueryService queryService = getCache().getQueryService(); + CqQuery cqQuery; + if ((cqQuery = queryService.getCq("cq1")) == null) { + CqAttributesFactory cqFact = new CqAttributesFactory(); + cqFact.addCqListener(new AuthzCqListener()); + CqAttributes cqAttrs = cqFact.create(); + cqQuery = queryService.newCq("cq1", "SELECT * FROM " + region.getFullPath(), cqAttrs); + } + + if ((flags & OpFlags.LOCAL_OP) > 0) { + // Interpret this as testing results using CqListener + final AuthzCqListener listener = (AuthzCqListener)cqQuery.getCqAttributes().getCqListener(); + WaitCriterion ev = new WaitCriterion() { + @Override + public boolean done() { + if ((flags & OpFlags.CHECK_FAIL) > 0) { + return 0 == listener.getNumUpdates(); + } else { + return numOps == listener.getNumUpdates(); + } + } + @Override + public String description() { + return null; + } + }; + waitForCriterion(ev, 3 * 1000, 200, true); + + if ((flags & OpFlags.CHECK_FAIL) > 0) { + assertEquals(0, listener.getNumUpdates()); + } else { + assertEquals(numOps, listener.getNumUpdates()); + listener.checkPuts(vals, indices); + } + + assertEquals(0, listener.getNumCreates()); + assertEquals(0, listener.getNumDestroys()); + assertEquals(0, listener.getNumOtherOps()); + assertEquals(0, listener.getNumErrors()); + + } else { + SelectResults cqResults = cqQuery.executeWithInitialResults(); + assertNotNull(cqResults); + Set cqResultValues = new HashSet(); + for (Object o : cqResults.asList()) { + Struct s = (Struct)o; + cqResultValues.add(s.get("value")); + } + + Set cqResultSet = cqResults.asSet(); + if ((flags & OpFlags.CHECK_FAIL) == 0) { + assertEquals(numOps, cqResultSet.size()); + } + + for (int keyNumIndex = 0; keyNumIndex < numOps; ++keyNumIndex) { + int keyNum = indices[keyNumIndex]; + if ((flags & OpFlags.CHECK_FAIL) > 0) { + assertFalse(cqResultValues.contains(vals[keyNum])); + } else { + assertTrue(cqResultValues.contains(vals[keyNum])); + } + } + } + + } else if (op.isStopCQ()) { + breakLoop = true; + CqQuery cqQuery = getCache().getQueryService().getCq("cq1"); + ((AuthzCqListener)cqQuery.getCqAttributes().getCqListener()).reset(); + cqQuery.stop(); + + } else if (op.isCloseCQ()) { + breakLoop = true; + CqQuery cqQuery = getCache().getQueryService().getCq("cq1"); + ((AuthzCqListener)cqQuery.getCqAttributes().getCqListener()).reset(); + cqQuery.close(); + + } else if (op.isRegionClear()) { + breakLoop = true; + if ((flags & OpFlags.LOCAL_OP) > 0) { + region.localClear(); + } else { + region.clear(); + } + + } else if (op.isRegionCreate()) { + breakLoop = true; + // Region subregion = createSubregion(region); + // subregion.createRegionOnServer(); + // Create region on server using the DynamicRegionFactory + // Assume it has been already initialized + DynamicRegionFactory drf = DynamicRegionFactory.get(); + Region subregion = drf.createDynamicRegion(regionName, subregionName); + assertEquals('/' + regionName + '/' + subregionName, subregion.getFullPath()); + + } else if (op.isRegionDestroy()) { + breakLoop = true; + if ((flags & OpFlags.LOCAL_OP) > 0) { + region.localDestroyRegion(); + + } else { + if ((flags & OpFlags.USE_SUBREGION) > 0) { + try { + DynamicRegionFactory.get().destroyDynamicRegion(region.getFullPath()); + } catch (RegionDestroyedException ex) { + // harmless to ignore this + System.out.println("doOp: sub-region " + region.getFullPath() + " already destroyed"); + operationOmitted = true; + } + } else { + region.destroyRegion(); + } + } + + } else { + fail("doOp: Unhandled operation " + op); + } + + if (expectedResult.intValue() != NO_EXCEPTION) { + if (!operationOmitted && !op.isUnregisterInterest()) { + fail("Expected an exception while performing operation op =" + op + "flags = " + OpFlags.description(flags)); + } + } + + } catch (Exception ex) { + exceptionOccured = true; + if ((ex instanceof ServerConnectivityException || ex instanceof QueryInvocationTargetException || ex instanceof CqException) + && (expectedResult.intValue() == NOTAUTHZ_EXCEPTION) && (ex.getCause() instanceof NotAuthorizedException)) { + System.out.println("doOp: Got expected NotAuthorizedException when doing operation [" + op + "] with flags " + OpFlags.description(flags) + ": " + ex.getCause()); + continue; + } else if (expectedResult.intValue() == OTHER_EXCEPTION) { + System.out.println("doOp: Got expected exception when doing operation: " + ex.toString()); + continue; + } else { + fail("doOp: Got unexpected exception when doing operation. Policy = " + policy + " flags = " + OpFlags.description(flags), ex); + } + } + } + if (!exceptionOccured && !operationOmitted && expectedResult.intValue() != NO_EXCEPTION) { + fail("Expected an exception while performing operation: " + op + " flags = " + OpFlags.description(flags)); + } + } + + protected void executeOpBlock(List opBlock, Integer port1, Integer port2, String authInit, Properties extraAuthProps, Properties extraAuthzProps, TestCredentialGenerator gen, Random rnd) throws InterruptedException { + for (Iterator opIter = opBlock.iterator(); opIter.hasNext();) { + // Start client with valid credentials as specified in OperationWithAction + OperationWithAction currentOp = (OperationWithAction)opIter.next(); + OperationCode opCode = currentOp.getOperationCode(); + int opFlags = currentOp.getFlags(); + int clientNum = currentOp.getClientNum(); + VM clientVM = null; + boolean useThisVM = false; + + switch (clientNum) { + case 1: + clientVM = client1; + break; + case 2: + clientVM = client2; + break; + case 3: + useThisVM = true; + break; + default: + fail("executeOpBlock: Unknown client number " + clientNum); + break; + } + + System.out.println("executeOpBlock: performing operation number [" + currentOp.getOpNum() + "]: " + currentOp); + if ((opFlags & OpFlags.USE_OLDCONN) == 0) { + Properties opCredentials; + int newRnd = rnd.nextInt(100) + 1; + String currentRegionName = '/' + regionName; + if ((opFlags & OpFlags.USE_SUBREGION) > 0) { + currentRegionName += ('/' + subregionName); + } + + String credentialsTypeStr; + OperationCode authOpCode = currentOp.getAuthzOperationCode(); + int[] indices = currentOp.getIndices(); + CredentialGenerator cGen = gen.getCredentialGenerator(); + final Properties javaProps = cGen == null ? null : cGen.getJavaProperties(); + + if ((opFlags & OpFlags.CHECK_NOTAUTHZ) > 0 || (opFlags & OpFlags.USE_NOTAUTHZ) > 0) { + opCredentials = gen.getDisallowedCredentials(new OperationCode[] { authOpCode }, new String[] { currentRegionName }, indices, newRnd); + credentialsTypeStr = " unauthorized " + authOpCode; + } else { + opCredentials = gen.getAllowedCredentials(new OperationCode[] { opCode, authOpCode }, new String[] { currentRegionName }, indices, newRnd); + credentialsTypeStr = " authorized " + authOpCode; + } + + Properties clientProps = concatProperties(new Properties[] { opCredentials, extraAuthProps, extraAuthzProps }); + // Start the client with valid credentials but allowed or disallowed to perform an operation + System.out.println("executeOpBlock: For client" + clientNum + credentialsTypeStr + " credentials: " + opCredentials); + boolean setupDynamicRegionFactory = (opFlags & OpFlags.ENABLE_DRF) > 0; + + if (useThisVM) { + SecurityTestUtils.createCacheClientWithDynamicRegion(authInit, clientProps, javaProps, new int[] { port1, port2 }, 0, setupDynamicRegionFactory, NO_EXCEPTION); + } else { + clientVM.invoke(() -> SecurityTestUtils.createCacheClientWithDynamicRegion(authInit, clientProps, javaProps, new int[] { port1, port2 }, 0, setupDynamicRegionFactory, NO_EXCEPTION)); + } + } + + int expectedResult; + if ((opFlags & OpFlags.CHECK_NOTAUTHZ) > 0) { + expectedResult = NOTAUTHZ_EXCEPTION; + } else if ((opFlags & OpFlags.CHECK_EXCEPTION) > 0) { + expectedResult = OTHER_EXCEPTION; + } else { + expectedResult = NO_EXCEPTION; + } + + // Perform the operation from selected client + if (useThisVM) { + doOp(new Byte(opCode.toOrdinal()), currentOp.getIndices(), new Integer(opFlags), new Integer(expectedResult)); + } else { + byte ordinal = opCode.toOrdinal(); + int[] indices = currentOp.getIndices(); + clientVM.invoke(() -> ClientAuthorizationTestCase.doOp( new Byte(ordinal), indices, new Integer(opFlags), new Integer(expectedResult) )); + } + } + } + + protected AuthzCredentialGenerator getXmlAuthzGenerator(){ + AuthzCredentialGenerator authzGen = new XmlAuthzCredentialGenerator(); + CredentialGenerator cGen = new DummyCredentialGenerator(); + cGen.init(); + authzGen.init(cGen); + return authzGen; + } + + protected List getDummyGeneratorCombos() { + List generators = new ArrayList(); + Iterator authzCodeIter = AuthzCredentialGenerator.ClassCode.getAll().iterator(); + + while (authzCodeIter.hasNext()) { + ClassCode authzClassCode = (ClassCode) authzCodeIter.next(); + AuthzCredentialGenerator authzGen = AuthzCredentialGenerator.create(authzClassCode); + + if (authzGen != null) { + CredentialGenerator cGen = new DummyCredentialGenerator(); + cGen.init(); + if (authzGen.init(cGen)) { + generators.add(authzGen); + } + } + } + + assertTrue(generators.size() > 0); + return generators; + } + + protected void runOpsWithFailover(OperationWithAction[] opCodes, String testName) throws InterruptedException { + AuthzCredentialGenerator gen = getXmlAuthzGenerator(); + CredentialGenerator cGen = gen.getCredentialGenerator(); + Properties extraAuthProps = cGen.getSystemProperties(); + Properties javaProps = cGen.getJavaProperties(); + Properties extraAuthzProps = gen.getSystemProperties(); + String authenticator = cGen.getAuthenticator(); + String authInit = cGen.getAuthInit(); + String accessor = gen.getAuthorizationCallback(); + TestAuthzCredentialGenerator tgen = new TestAuthzCredentialGenerator(gen); + + System.out.println(testName + ": Using authinit: " + authInit); + System.out.println(testName + ": Using authenticator: " + authenticator); + System.out.println(testName + ": Using accessor: " + accessor); + + // Start servers with all required properties + Properties serverProps = buildProperties(authenticator, accessor, false, extraAuthProps, extraAuthzProps); + + // Get ports for the servers + Keeper locator1PortKeeper = getRandomAvailablePortKeeper(SOCKET); + Keeper locator2PortKeeper = getRandomAvailablePortKeeper(SOCKET); + Keeper port1Keeper = getRandomAvailablePortKeeper(SOCKET); + Keeper port2Keeper = getRandomAvailablePortKeeper(SOCKET); + int locator1Port = locator1PortKeeper.getPort(); + int locator2Port = locator2PortKeeper.getPort(); + int port1 = port1Keeper.getPort(); + int port2 = port2Keeper.getPort(); + + // Perform all the ops on the clients + List opBlock = new ArrayList(); + Random rnd = new Random(); + + for (int opNum = 0; opNum < opCodes.length; ++opNum) { + // Start client with valid credentials as specified in OperationWithAction + OperationWithAction currentOp = opCodes[opNum]; + + if (currentOp.equals(OperationWithAction.OPBLOCK_END) || currentOp.equals(OperationWithAction.OPBLOCK_NO_FAILOVER)) { + // End of current operation block; execute all the operations on the servers with/without failover + if (opBlock.size() > 0) { + locator1PortKeeper.release(); + port1Keeper.release(); + // Start the first server and execute the operation block + server1.invoke(() -> ClientAuthorizationTestCase.createCacheServer(locator1Port, port1, serverProps, javaProps )); + server2.invoke(() -> closeCache()); + executeOpBlock(opBlock, port1, port2, authInit, extraAuthProps, extraAuthzProps, tgen, rnd); + if (!currentOp.equals(OperationWithAction.OPBLOCK_NO_FAILOVER)) { + // Failover to the second server and run the block again + locator2PortKeeper.release(); + port2Keeper.release(); + server2.invoke(() -> ClientAuthorizationTestCase.createCacheServer(locator2Port, port2, serverProps, javaProps )); + server1.invoke(() -> closeCache()); + executeOpBlock(opBlock, port1, port2, authInit, extraAuthProps, extraAuthzProps, tgen, rnd); + } + opBlock.clear(); + } + + } else { + currentOp.setOpNum(opNum); + opBlock.add(currentOp); + } + } + } + + /** + * Implements the {@link CqListener} interface and counts the number of + * different operations and also queues up the received updates to precise + * checking of each update. + * + * @since 5.5 + */ + private static class AuthzCqListener implements CqListener { + + private List eventList; + private int numCreates; + private int numUpdates; + private int numDestroys; + private int numOtherOps; + private int numErrors; + + public AuthzCqListener() { + this.eventList = new ArrayList(); + reset(); + } + + public void reset() { + this.eventList.clear(); + this.numCreates = 0; + this.numUpdates = 0; + this.numErrors = 0; + } + + public void onEvent(CqEvent aCqEvent) { + Operation op = aCqEvent.getBaseOperation(); + if (op.isCreate()) { + ++this.numCreates; + } else if (op.isUpdate()) { + ++this.numUpdates; + } else if (op.isDestroy()) { + ++this.numDestroys; + } else { + ++this.numOtherOps; + } + eventList.add(aCqEvent); + } + + public void onError(CqEvent aCqEvent) { + ++this.numErrors; + } + + public void close() { + this.eventList.clear(); + } + + public int getNumCreates() { + return this.numCreates; + } + + public int getNumUpdates() { + return this.numUpdates; + } + + public int getNumDestroys() { + return this.numDestroys; + } + + public int getNumOtherOps() { + return this.numOtherOps; + } + + public int getNumErrors() { + return this.numErrors; + } + + public void checkPuts(String[] vals, int[] indices) { + for (int indexIndex = 0; indexIndex < indices.length; ++indexIndex) { + int index = indices[indexIndex]; + Iterator eventIter = this.eventList.iterator(); + boolean foundKey = false; + + while (eventIter.hasNext()) { + CqEvent event = (CqEvent)eventIter.next(); + if (KEYS[index].equals(event.getKey())) { + assertEquals(vals[index], event.getNewValue()); + foundKey = true; + break; + } + } + + assertTrue(foundKey); + } + } + } + + /** + * This class specifies flags that can be used to alter the behaviour of + * operations being performed by the <code>doOp</code> function. + * + * @since 5.5 + */ + protected static class OpFlags { + + /** + * Default behaviour. + */ + public static final int NONE = 0x0; + + /** + * Check that the operation should fail. + */ + public static final int CHECK_FAIL = 0x1; + + /** + * Check that the operation should throw <code>NotAuthorizedException</code>. + */ + public static final int CHECK_NOTAUTHZ = 0x2; + + /** + * Check that the region should not be available. + */ + public static final int CHECK_NOREGION = 0x4; + + /** + * Check that the operation should throw an exception other than the + * <code>NotAuthorizedException</code>. + */ + public static final int CHECK_EXCEPTION = 0x8; + + /** + * Check for nvalues[] instead of values[]. + */ + public static final int USE_NEWVAL = 0x10; + + /** + * Register all KEYS. For GET operations indicates using getAll(). + */ + public static final int USE_ALL_KEYS = 0x20; + + /** + * Register a regular expression. + */ + public static final int USE_REGEX = 0x40; + + /** + * Register a list of KEYS. + */ + public static final int USE_LIST = 0x80; + + /** + * Perform the local version of the operation. + */ + public static final int LOCAL_OP = 0x100; + + /** + * Check that the key for the operation should not be present. + */ + public static final int CHECK_NOKEY = 0x200; + + /** + * Use the sub-region for performing the operation. + */ + public static final int USE_SUBREGION = 0x400; + + /** + * Do not try to create the sub-region. + */ + public static final int NO_CREATE_SUBREGION = 0x800; + + /** + * Do not re-connect using new credentials rather use the previous + * connection. + */ + public static final int USE_OLDCONN = 0x1000; + + /** + * Do the connection with unauthorized credentials but do not check that the + * operation throws <code>NotAuthorizedException</code>. + */ + public static final int USE_NOTAUTHZ = 0x2000; + + /** + * Enable {@link DynamicRegionFactory} on the client. + */ + public static final int ENABLE_DRF = 0x4000; + + /** + * Use the {@link InterestResultPolicy#NONE} for register interest. + */ + public static final int REGISTER_POLICY_NONE = 0x8000; + + /** + * Use the {@link LocalRegion#getEntry} under transaction. + */ + public static final int USE_GET_ENTRY_IN_TX = 0x10000; + + public static String description(int f) { + StringBuffer sb = new StringBuffer(); + sb.append("["); + if ((f & CHECK_FAIL) != 0) { + sb.append("CHECK_FAIL,"); + } + if ((f & CHECK_NOTAUTHZ) != 0) { + sb.append("CHECK_NOTAUTHZ,"); + } + if ((f & CHECK_NOREGION) != 0) { + sb.append("CHECK_NOREGION,"); + } + if ((f & CHECK_EXCEPTION) != 0) { + sb.append("CHECK_EXCEPTION,"); + } + if ((f & USE_NEWVAL) != 0) { + sb.append("USE_NEWVAL,"); + } + if ((f & USE_ALL_KEYS) != 0) { + sb.append("USE_ALL_KEYS,"); + } + if ((f & USE_REGEX) != 0) { + sb.append("USE_REGEX,"); + } + if ((f & USE_LIST) != 0) { + sb.append("USE_LIST,"); + } + if ((f & LOCAL_OP) != 0) { + sb.append("LOCAL_OP,"); + } + if ((f & CHECK_NOKEY) != 0) { + sb.append("CHECK_NOKEY,"); + } + if ((f & USE_SUBREGION) != 0) { + sb.append("USE_SUBREGION,"); + } + if ((f & NO_CREATE_SUBREGION) != 0) { + sb.append("NO_CREATE_SUBREGION,"); + } + if ((f & USE_OLDCONN) != 0) { + sb.append("USE_OLDCONN,"); + } + if ((f & USE_NOTAUTHZ) != 0) { + sb.append("USE_NOTAUTHZ"); + } + if ((f & ENABLE_DRF) != 0) { + sb.append("ENABLE_DRF,"); + } + if ((f & REGISTER_POLICY_NONE) != 0) { + sb.append("REGISTER_POLICY_NONE,"); + } + sb.append("]"); + return sb.toString(); + } + } + + /** + * This class encapsulates an {@link OperationCode} with associated flags, the + * client to perform the operation, and the number of operations to perform. + * + * @since 5.5 + */ + protected static class OperationWithAction { + + /** + * The operation to be performed. + */ + private OperationCode opCode; + + /** + * The operation for which authorized or unauthorized credentials have to be + * generated. This is the same as {@link #opCode} when not specified. + */ + private OperationCode authzOpCode; + + /** + * The client number on which the operation has to be performed. + */ + private int clientNum; + + /** + * Bitwise or'd {@link OpFlags} integer to change/specify the behaviour of + * the operations. + */ + private int flags; + + /** + * Indices of the KEYS array to be used for operations. + */ + private int[] indices; + + /** + * An index for the operation used for logging. + */ + private int opNum; + + /** + * Indicates end of an operation block which can be used for testing with + * failover + */ + public static final OperationWithAction OPBLOCK_END = new OperationWithAction(null, 4); + + /** + * Indicates end of an operation block which should not be used for testing + * with failover + */ + public static final OperationWithAction OPBLOCK_NO_FAILOVER = new OperationWithAction(null, 5); + + private void setIndices(int numOps) { + this.indices = new int[numOps]; + for (int index = 0; index < numOps; ++index) { + this.indices[index] = index; + } + } + + public OperationWithAction(OperationCode opCode) { + this.opCode = opCode; + this.authzOpCode = opCode; + this.clientNum = 1; + this.flags = OpFlags.NONE; + setIndices(4); + this.opNum = 0; + } + + public OperationWithAction(OperationCode opCode, int clientNum) { + this.opCode = opCode; + this.authzOpCode = opCode; + this.clientNum = clientNum; + this.flags = OpFlags.NONE; + setIndices(4); + this.opNum = 0; + } + + public OperationWithAction(OperationCode opCode, int clientNum, int flags, int numOps) { + this.opCode = opCode; + this.authzOpCode = opCode; + this.clientNum = clientNum; + this.flags = flags; + setIndices(numOps); + this.opNum = 0; + } + + public OperationWithAction(OperationCode opCode, OperationCode deniedOpCode, int clientNum, int flags, int numOps) { + this.opCode = opCode; + this.authzOpCode = deniedOpCode; + this.clientNum = clientNum; + this.flags = flags; + setIndices(numOps); + this.opNum = 0; + } + + public OperationWithAction(OperationCode opCode, int clientNum, int flags, int[] indices) { + this.opCode = opCode; + this.authzOpCode = opCode; + this.clientNum = clientNum; + this.flags = flags; + this.indices = indices; + this.opNum = 0; + } + + public OperationWithAction(OperationCode opCode, OperationCode deniedOpCode, int clientNum, int flags, int[] indices) { + this.opCode = opCode; + this.authzOpCode = deniedOpCode; + this.clientNum = clientNum; + this.flags = flags; + this.indices = indices; + this.opNum = 0; + } + + public OperationCode getOperationCode() { + return this.opCode; + } + + public OperationCode getAuthzOperationCode() { + return this.authzOpCode; + } + + public int getClientNum() { + return this.clientNum; + } + + public int getFlags() { + return this.flags; + } + + public int[] getIndices() { + return this.indices; + } + + public int getOpNum() { + return this.opNum; + } + + public void setOpNum(int opNum) { + this.opNum = opNum; + } + + @Override + public String toString() { + return "opCode:" + this.opCode + ",authOpCode:" + this.authzOpCode + ",clientNum:" + this.clientNum + ",flags:" + this.flags + ",numOps:" + this.indices.length + ",indices:" + indicesToString(this.indices); + } + } + + /** + * Simple interface to generate credentials with authorization based on key + * indices also. This is utilized by the post-operation authorization tests + * where authorization is based on key indices. + * + * @since 5.5 + */ + protected interface TestCredentialGenerator { + + /** + * Get allowed credentials for the given set of operations in the given + * regions and indices of KEYS in the <code>KEYS</code> array + */ + public Properties getAllowedCredentials(OperationCode[] opCodes, String[] regionNames, int[] keyIndices, int num); + + /** + * Get disallowed credentials for the given set of operations in the given + * regions and indices of KEYS in the <code>KEYS</code> array + */ + public Properties getDisallowedCredentials(OperationCode[] opCodes, String[] regionNames, int[] keyIndices, int num); + + /** + * Get the {@link CredentialGenerator} if any. + */ + public CredentialGenerator getCredentialGenerator(); + } + + /** + * Contains a {@link AuthzCredentialGenerator} and implements the + * {@link TestCredentialGenerator} interface. + * + * @since 5.5 + */ + protected static class TestAuthzCredentialGenerator implements TestCredentialGenerator { + + private AuthzCredentialGenerator authzGen; + + public TestAuthzCredentialGenerator(AuthzCredentialGenerator authzGen) { + this.authzGen = authzGen; + } + + public Properties getAllowedCredentials(OperationCode[] opCodes, String[] regionNames, int[] keyIndices, int num) { + return this.authzGen.getAllowedCredentials(opCodes, regionNames, num); + } + + public Properties getDisallowedCredentials(OperationCode[] opCodes, String[] regionNames, int[] keyIndices, int num) { + return this.authzGen.getDisallowedCredentials(opCodes, regionNames, num); + } + + public CredentialGenerator getCredentialGenerator() { + return authzGen.getCredentialGenerator(); + } + } +}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/310698c1/geode-core/src/test/java/com/gemstone/gemfire/security/ClientMultiUserAuthzDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/ClientMultiUserAuthzDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/security/ClientMultiUserAuthzDUnitTest.java index 835c241..0830104 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/security/ClientMultiUserAuthzDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/security/ClientMultiUserAuthzDUnitTest.java @@ -18,9 +18,9 @@ */ package com.gemstone.gemfire.security; -//import static com.gemstone.gemfire.security.ClientAuthenticationUtils.*; -//import static com.gemstone.gemfire.security.ClientAuthorizationTestBase.*; -import static com.gemstone.gemfire.security.SecurityTestUtil.*; +//import static com.gemstone.gemfire.security.ClientAuthenticationTestUtils.*; +//import static com.gemstone.gemfire.security.ClientAuthorizationTestCase.*; +import static com.gemstone.gemfire.security.SecurityTestUtils.*; import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*; import java.util.Iterator; @@ -40,7 +40,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; @Category(DistributedTest.class) -public class ClientMultiUserAuthzDUnitTest extends ClientAuthorizationTestBase { +public class ClientMultiUserAuthzDUnitTest extends ClientAuthorizationTestCase { @Override public final void preTearDownClientAuthorizationTestBase() throws Exception { @@ -340,6 +340,6 @@ public class ClientMultiUserAuthzDUnitTest extends ClientAuthorizationTestBase { } private int createCacheServerOnVM(final VM server, final Properties javaProps, final Properties serverProps) { - return server.invoke(() -> ClientAuthorizationTestBase.createCacheServer(getLocatorPort(), serverProps, javaProps)); + return server.invoke(() -> ClientAuthorizationTestCase.createCacheServer(getLocatorPort(), serverProps, javaProps)); } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/310698c1/geode-core/src/test/java/com/gemstone/gemfire/security/DeltaClientAuthorizationDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/DeltaClientAuthorizationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/security/DeltaClientAuthorizationDUnitTest.java index 58e05a0..904a53c 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/security/DeltaClientAuthorizationDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/security/DeltaClientAuthorizationDUnitTest.java @@ -18,9 +18,8 @@ */ package com.gemstone.gemfire.security; -import static com.gemstone.gemfire.security.ClientAuthenticationUtils.*; -import static com.gemstone.gemfire.security.ClientAuthorizationTestBase.*; -import static com.gemstone.gemfire.security.SecurityTestUtil.*; +import static com.gemstone.gemfire.security.ClientAuthenticationTestUtils.*; +import static com.gemstone.gemfire.security.SecurityTestUtils.*; import static com.gemstone.gemfire.test.dunit.Assert.*; import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*; @@ -40,7 +39,7 @@ import org.junit.experimental.categories.Category; * @since 6.1 */ @Category(DistributedTest.class) -public final class DeltaClientAuthorizationDUnitTest extends ClientAuthorizationTestBase { +public final class DeltaClientAuthorizationDUnitTest extends ClientAuthorizationTestCase { private DeltaTestImpl[] deltas = new DeltaTestImpl[8]; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/310698c1/geode-core/src/test/java/com/gemstone/gemfire/security/DeltaClientPostAuthorizationDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/DeltaClientPostAuthorizationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/security/DeltaClientPostAuthorizationDUnitTest.java index 7c7fe9b..56d712f 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/security/DeltaClientPostAuthorizationDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/security/DeltaClientPostAuthorizationDUnitTest.java @@ -19,8 +19,7 @@ package com.gemstone.gemfire.security; import static com.gemstone.gemfire.internal.AvailablePort.*; -import static com.gemstone.gemfire.security.DeltaClientPostAuthorizationDUnitTest.*; -import static com.gemstone.gemfire.security.SecurityTestUtil.*; +import static com.gemstone.gemfire.security.SecurityTestUtils.*; import static com.gemstone.gemfire.test.dunit.Assert.*; import static com.gemstone.gemfire.test.dunit.IgnoredException.*; import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*; @@ -45,7 +44,7 @@ import org.junit.experimental.categories.Category; * @since 6.1 */ @Category(DistributedTest.class) -public class DeltaClientPostAuthorizationDUnitTest extends ClientAuthorizationTestBase { +public class DeltaClientPostAuthorizationDUnitTest extends ClientAuthorizationTestCase { private static final int PAUSE = 5 * 1000; // TODO: replace with Awaitility @@ -100,14 +99,14 @@ public class DeltaClientPostAuthorizationDUnitTest extends ClientAuthorizationTe // End of current operation block; execute all the operations on the servers with failover if (opBlock.size() > 0) { // Start the first server and execute the operation block - server1.invoke(() -> ClientAuthorizationTestBase.createCacheServer(getLocatorPort(), port1, serverProps, javaProps )); + server1.invoke(() -> ClientAuthorizationTestCase.createCacheServer(getLocatorPort(), port1, serverProps, javaProps )); server2.invoke(() -> closeCache()); executeOpBlock(opBlock, port1, port2, authInit, extraAuthProps, extraAuthzProps, tgen, rnd); if (!currentOp.equals(OperationWithAction.OPBLOCK_NO_FAILOVER)) { // Failover to the second server and run the block again - server2.invoke(() -> ClientAuthorizationTestBase.createCacheServer(getLocatorPort(), port2, serverProps, javaProps )); + server2.invoke(() -> ClientAuthorizationTestCase.createCacheServer(getLocatorPort(), port2, serverProps, javaProps )); server1.invoke(() -> closeCache()); executeOpBlock(opBlock, port1, port2, authInit, extraAuthProps, extraAuthzProps, tgen, rnd); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/310698c1/geode-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java index e514b1c..1db599f 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java @@ -20,7 +20,7 @@ package com.gemstone.gemfire.security; import static com.gemstone.gemfire.distributed.internal.DistributionConfig.*; import static com.gemstone.gemfire.internal.AvailablePort.*; -import static com.gemstone.gemfire.security.SecurityTestUtil.*; +import static com.gemstone.gemfire.security.SecurityTestUtils.*; import static com.gemstone.gemfire.test.dunit.Assert.*; import static com.gemstone.gemfire.test.dunit.IgnoredException.*; import static com.gemstone.gemfire.test.dunit.NetworkUtils.*; @@ -160,7 +160,7 @@ public class P2PAuthenticationDUnitTest extends JUnit4DistributedTestCase { startTheLocator(props, gen.getJavaProperties(), locatorPort); try { - new SecurityTestUtil("tmp").createSystem(props, null); + new SecurityTestUtils("tmp").createSystem(props, null); fail("AuthenticationFailedException was expected as the AuthInitialize object passed is incorrect"); } catch (AuthenticationFailedException expected) { @@ -191,7 +191,7 @@ public class P2PAuthenticationDUnitTest extends JUnit4DistributedTestCase { startTheLocator(props, null, locatorPort); try { - new SecurityTestUtil("tmp").createSystem(props, null); + new SecurityTestUtils("tmp").createSystem(props, null); fail("AuthenticationFailedException was expected as the Authenticator object passed is incorrect"); } catch (AuthenticationFailedException expected) { @@ -221,7 +221,7 @@ public class P2PAuthenticationDUnitTest extends JUnit4DistributedTestCase { startTheLocator(props, null, locatorPort); try { - new SecurityTestUtil("tmp").createSystem(props, null); + new SecurityTestUtils("tmp").createSystem(props, null); fail("AuthenticationFailedException was expected as no credentials are set"); } catch (AuthenticationFailedException expected) { @@ -291,7 +291,7 @@ public class P2PAuthenticationDUnitTest extends JUnit4DistributedTestCase { props.putAll(gen.getInvalidCredentials(1)); try { - new SecurityTestUtil("tmp").createSystem(props, null); + new SecurityTestUtils("tmp").createSystem(props, null); fail("AuthenticationFailedException was expected as wrong credentials were passed"); } catch (AuthenticationFailedException expected) { @@ -524,7 +524,7 @@ public class P2PAuthenticationDUnitTest extends JUnit4DistributedTestCase { } private static void createDS(final Properties props, final Properties javaProps) { - SecurityTestUtil tmpUtil = new SecurityTestUtil("tmp"); + SecurityTestUtils tmpUtil = new SecurityTestUtils("tmp"); tmpUtil.createSystem(props, javaProps); }
