You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/03/17 23:58:26 UTC
[26/33] incubator-geode git commit: GEODE-949: refactor and repackage
security test code
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8de59df1/geode-core/src/test/resources/com/gemstone/gemfire/security/templates/authz6_0.dtd
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/security/templates/authz6_0.dtd b/geode-core/src/test/resources/com/gemstone/gemfire/security/templates/authz6_0.dtd
new file mode 100755
index 0000000..a77563a
--- /dev/null
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/security/templates/authz6_0.dtd
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
+<!--
+
+This is the XML DTD for the GemFire sample XML based authorization callback
+in com.gemstone.gemfire.security.templates.XmlAuthorization.
+
+All XMLs must include a DOCTYPE of the following form:
+
+ <!DOCTYPE acl PUBLIC
+ "-//GemStone Systems, Inc.//GemFire XML Authorization 1.0//EN"
+ "http://www.gemstone.com/dtd/authz5_5.dtd">
+
+The contents of a declarative XML file correspond to APIs found in the
+
+ com.gemstone.gemfire.security.AccessControl
+
+package. The sample implementation may be used to specify access control
+policies.
+
+-->
+
+<!--
+
+The following conventions apply to all GemFire sample authorization
+XML file elements unless indicated otherwise.
+
+- In elements that contain PCDATA, leading and trailing whitespace in
+ the data may be ignored.
+
+- In elements whose value is an "enumerated type", the value is case
+ sensitive.
+
+-->
+
+
+<!--
+The "acl" element is the root element of the authorization file.
+This element contains the role to user mappings and role to permissions
+mapping on a per region per operation basis.
+-->
+
+<!ELEMENT acl (role+,permission+)>
+
+<!--
+The "role" element contains the set of users that have the permissions of
+given role. A user can be present in more than one "role" elements in
+which case the union of the permissions to all those roles determines
+the full set of permissions to be given to the user.
+-->
+
+<!ELEMENT role (user*)>
+<!ATTLIST role
+ name CDATA #REQUIRED
+>
+
+<!--
+The "user" element is contained within the "role" element and contains
+the name of a user having the permissions of that role.
+-->
+
+<!ELEMENT user (#PCDATA)>
+
+<!--
+The "permission" element specifies the list of operations that are allowed
+for a particular role in the given regions as provided in the optional
+"regions" attribute. The value of "regions" attribute should be a comma
+separated list of region names for which permissions are to be provided.
+If no "regions" attribute is provided then those permissions are provided
+for all the other regions (i.e. other than those that have been explicitly
+specified). Permissions for cache level operations REGION_DESTROY,
+REGION_CREATE, QUERY and CQ operations should be specified with no "regions"
+attribute. If cache-level permission is not provided for QUERY or CQ operations
+then the permission for all the region names in the query string is checked.
+-->
+
+<!ELEMENT permission (operation*)>
+<!ATTLIST permission
+ role CDATA #REQUIRED
+ regions CDATA #IMPLIED
+>
+
+
+<!--
+The operation should be one of the following strings:
+ GET, PUT, PUTALL, DESTROY, REGISTER_INTEREST, UNREGISTER_INTEREST,
+ CONTAINS_KEY, KEY_SET, QUERY, EXECUTE_CQ, STOP_CQ, CLOSE_CQ, REGION_CLEAR,
+ REGION_CREATE, REGION_DESTROY
+-->
+<!ELEMENT operation (#PCDATA)>
+<!ATTLIST operation
+ functionIds CDATA #IMPLIED
+ optimizeForWrite CDATA #IMPLIED
+ keySet CDATA #IMPLIED
+>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8de59df1/geode-core/src/test/resources/lib/authz-dummy.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/lib/authz-dummy.xml b/geode-core/src/test/resources/lib/authz-dummy.xml
deleted file mode 100644
index 7f73808..0000000
--- a/geode-core/src/test/resources/lib/authz-dummy.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-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.
--->
-
-<!DOCTYPE acl PUBLIC "-//GemStone Systems, Inc.//GemFire XML Authorization 1.0//EN"
- "authz6_0.dtd" >
-<acl>
-
- <role name="reader">
- <user>reader0</user>
- <user>reader1</user>
- <user>reader2</user>
- <user>root</user>
- <user>admin</user>
- <user>administrator</user>
- </role>
-
- <role name="writer">
- <user>writer0</user>
- <user>writer1</user>
- <user>writer2</user>
- <user>root</user>
- <user>admin</user>
- <user>administrator</user>
- </role>
-
- <role name="cacheOps">
- <user>root</user>
- <user>admin</user>
- <user>administrator</user>
- </role>
-
- <role name="queryRegions">
- <user>reader3</user>
- <user>reader4</user>
- </role>
-
- <role name="registerInterest">
- <user>reader5</user>
- <user>reader6</user>
- </role>
-
- <role name="unregisterInterest">
- <user>reader5</user>
- <user>reader7</user>
- </role>
-
- <role name="onRegionFunctionExecutor">
- <user>reader8</user>
- </role>
-
- <role name="onServerFunctionExecutor">
- <user>reader9</user>
- </role>
-
- <permission role="cacheOps">
- <operation>QUERY</operation>
- <operation>EXECUTE_CQ</operation>
- <operation>STOP_CQ</operation>
- <operation>CLOSE_CQ</operation>
- <operation>REGION_CREATE</operation>
- <operation>REGION_DESTROY</operation>
- </permission>
-
- <permission role="reader">
- <operation>GET</operation>
- <operation>REGISTER_INTEREST</operation>
- <operation>UNREGISTER_INTEREST</operation>
- <operation>KEY_SET</operation>
- <operation>CONTAINS_KEY</operation>
- <operation>EXECUTE_FUNCTION</operation>
- </permission>
-
- <permission role="writer">
- <operation>PUT</operation>
- <operation>PUTALL</operation>
- <operation>DESTROY</operation>
- <operation>INVALIDATE</operation>
- <operation>REGION_CLEAR</operation>
- </permission>
-
- <permission role="queryRegions" regions="//Portfolios,/Positions/,AuthRegion">
- <operation>QUERY</operation>
- <operation>EXECUTE_CQ</operation>
- <operation>STOP_CQ</operation>
- <operation>CLOSE_CQ</operation>
- </permission>
-
- <permission role="onRegionFunctionExecutor" regions="secureRegion,Positions">
- <operation>PUT</operation>
- <operation functionIds="SecureFunction,OptimizationFunction" optimizeForWrite="false" keySet="KEY-0,KEY-1">EXECUTE_FUNCTION</operation>
- </permission>
-
- <permission role="onServerFunctionExecutor" >
- <operation>PUT</operation>
- <operation functionIds="SecureFunction,OptimizationFunction">EXECUTE_FUNCTION</operation>
- </permission>
-
- <permission role="registerInterest">
- <operation>REGISTER_INTEREST</operation>
- <operation>GET</operation>
- </permission>
-
- <permission role="unregisterInterest">
- <operation>UNREGISTER_INTEREST</operation>
- <operation>GET</operation>
- </permission>
-
-</acl>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8de59df1/geode-core/src/test/resources/lib/authz-ldap.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/lib/authz-ldap.xml b/geode-core/src/test/resources/lib/authz-ldap.xml
deleted file mode 100644
index e63c23b..0000000
--- a/geode-core/src/test/resources/lib/authz-ldap.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-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.
--->
-
-<!DOCTYPE acl PUBLIC "-//GemStone Systems, Inc.//GemFire XML Authorization 1.0//EN"
- "authz5_5.dtd" >
-<acl>
-
- <role name="reader">
- <user>gemfire1</user>
- <user>gemfire2</user>
- <user>gemfire3</user>
- <user>gemfire4</user>
- <user>gemfire5</user>
- </role>
-
- <role name="writer">
- <user>gemfire1</user>
- <user>gemfire2</user>
- <user>gemfire6</user>
- <user>gemfire7</user>
- <user>gemfire8</user>
- </role>
-
- <role name="cacheOps">
- <user>gemfire1</user>
- <user>gemfire2</user>
- </role>
-
- <role name="queryRegions">
- <user>gemfire9</user>
- <user>gemfire10</user>
- </role>
-
- <permission role="cacheOps">
- <operation>QUERY</operation>
- <operation>EXECUTE_CQ</operation>
- <operation>STOP_CQ</operation>
- <operation>CLOSE_CQ</operation>
- <operation>REGION_CREATE</operation>
- <operation>REGION_DESTROY</operation>
- </permission>
-
- <permission role="reader">
- <operation>GET</operation>
- <operation>REGISTER_INTEREST</operation>
- <operation>UNREGISTER_INTEREST</operation>
- <operation>KEY_SET</operation>
- <operation>CONTAINS_KEY</operation>
- <operation>EXECUTE_FUNCTION</operation>
- </permission>
-
- <permission role="writer">
- <operation>PUT</operation>
- <operation>PUTALL</operation>
- <operation>DESTROY</operation>
- <operation>INVALIDATE</operation>
- <operation>REGION_CLEAR</operation>
- </permission>
-
- <permission role="queryRegions" regions="Portfolios,/Positions//,/AuthRegion">
- <operation>QUERY</operation>
- <operation>EXECUTE_CQ</operation>
- <operation>STOP_CQ</operation>
- <operation>CLOSE_CQ</operation>
- </permission>
-
-</acl>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8de59df1/geode-core/src/test/resources/lib/authz-multiUser-dummy.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/lib/authz-multiUser-dummy.xml b/geode-core/src/test/resources/lib/authz-multiUser-dummy.xml
deleted file mode 100644
index 0f3bbab..0000000
--- a/geode-core/src/test/resources/lib/authz-multiUser-dummy.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-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.
--->
-
-<!DOCTYPE acl PUBLIC "-//GemStone Systems, Inc.//GemFire XML Authorization 1.0//EN"
- "authz6_0.dtd" >
-<acl>
-
- <role name="reader">
- <user>user1</user>
- <user>user2</user>
- <user>root</user>
- <user>admin</user>
- <user>administrator</user>
- </role>
-
- <role name="writer">
- <user>user3</user>
- <user>user4</user>
- <user>root</user>
- <user>admin</user>
- <user>administrator</user>
- </role>
-
- <role name="cacheOps">
- <user>user1</user>
- <user>user2</user>
- <user>root</user>
- <user>admin</user>
- <user>administrator</user>
- </role>
-
- <role name="queryRegions">
- <user>user5</user>
- <user>user6</user>
- </role>
-
- <role name="registerInterest">
- <user>user7</user>
- <user>user8</user>
- </role>
-
- <role name="unregisterInterest">
- <user>user5</user>
- <user>user7</user>
- </role>
-
- <permission role="cacheOps">
- <operation>QUERY</operation>
- <operation>EXECUTE_CQ</operation>
- <operation>STOP_CQ</operation>
- <operation>CLOSE_CQ</operation>
- </permission>
-
- <permission role="reader">
- <operation>GET</operation>
- <operation>REGISTER_INTEREST</operation>
- <operation>UNREGISTER_INTEREST</operation>
- <operation>KEY_SET</operation>
- <operation>CONTAINS_KEY</operation>
- <operation>EXECUTE_FUNCTION</operation>
- </permission>
-
- <permission role="writer">
- <operation>PUT</operation>
- <operation>PUTALL</operation>
- <operation>DESTROY</operation>
- <operation>INVALIDATE</operation>
- <operation>REGION_CLEAR</operation>
- </permission>
-
- <permission role="queryRegions" regions="//Portfolios,/Positions/,AuthRegion">
- <operation>QUERY</operation>
- <operation>EXECUTE_CQ</operation>
- <operation>STOP_CQ</operation>
- <operation>CLOSE_CQ</operation>
- </permission>
-
- <permission role="registerInterest">
- <operation>REGISTER_INTEREST</operation>
- <operation>GET</operation>
- </permission>
-
- <permission role="unregisterInterest">
- <operation>UNREGISTER_INTEREST</operation>
- <operation>GET</operation>
- </permission>
-
-</acl>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8de59df1/geode-core/src/test/resources/lib/authz-multiUser-ldap.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/lib/authz-multiUser-ldap.xml b/geode-core/src/test/resources/lib/authz-multiUser-ldap.xml
deleted file mode 100644
index a8e5392..0000000
--- a/geode-core/src/test/resources/lib/authz-multiUser-ldap.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-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.
--->
-
-<!DOCTYPE acl PUBLIC "-//GemStone Systems, Inc.//GemFire XML Authorization 1.0//EN"
- "authz5_5.dtd" >
-<acl>
-
- <role name="reader">
- <user>gemfire1</user>
- <user>gemfire2</user>
- <user>gemfire3</user>
- <user>gemfire4</user>
- <user>gemfire5</user>
- </role>
-
- <role name="writer">
- <user>gemfire1</user>
- <user>gemfire2</user>
- <user>gemfire6</user>
- <user>gemfire7</user>
- <user>gemfire8</user>
- </role>
-
- <role name="cacheOps">
- <user>gemfire1</user>
- <user>gemfire2</user>
- </role>
-
- <role name="queryRegions">
- <user>gemfire9</user>
- <user>gemfire10</user>
- </role>
-
- <permission role="cacheOps">
- <operation>QUERY</operation>
- <operation>EXECUTE_CQ</operation>
- <operation>STOP_CQ</operation>
- <operation>CLOSE_CQ</operation>
- </permission>
-
- <permission role="reader">
- <operation>GET</operation>
- <operation>REGISTER_INTEREST</operation>
- <operation>UNREGISTER_INTEREST</operation>
- <operation>KEY_SET</operation>
- <operation>CONTAINS_KEY</operation>
- <operation>EXECUTE_FUNCTION</operation>
- </permission>
-
- <permission role="writer">
- <operation>PUT</operation>
- <operation>PUTALL</operation>
- <operation>DESTROY</operation>
- <operation>INVALIDATE</operation>
- <operation>REGION_CLEAR</operation>
- </permission>
-
- <permission role="queryRegions" regions="Portfolios,/Positions//,/AuthRegion">
- <operation>QUERY</operation>
- <operation>EXECUTE_CQ</operation>
- <operation>STOP_CQ</operation>
- <operation>CLOSE_CQ</operation>
- </permission>
-
-</acl>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8de59df1/geode-core/src/test/resources/lib/keys/gemfire1.keystore
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/lib/keys/gemfire1.keystore b/geode-core/src/test/resources/lib/keys/gemfire1.keystore
deleted file mode 100644
index 15270bb..0000000
Binary files a/geode-core/src/test/resources/lib/keys/gemfire1.keystore and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8de59df1/geode-core/src/test/resources/lib/keys/gemfire10.keystore
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/lib/keys/gemfire10.keystore b/geode-core/src/test/resources/lib/keys/gemfire10.keystore
deleted file mode 100644
index bb6f827..0000000
Binary files a/geode-core/src/test/resources/lib/keys/gemfire10.keystore and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8de59df1/geode-core/src/test/resources/lib/keys/gemfire11.keystore
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/lib/keys/gemfire11.keystore b/geode-core/src/test/resources/lib/keys/gemfire11.keystore
deleted file mode 100644
index 6839c74..0000000
Binary files a/geode-core/src/test/resources/lib/keys/gemfire11.keystore and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8de59df1/geode-core/src/test/resources/lib/keys/gemfire2.keystore
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/lib/keys/gemfire2.keystore b/geode-core/src/test/resources/lib/keys/gemfire2.keystore
deleted file mode 100644
index fcb7ab8..0000000
Binary files a/geode-core/src/test/resources/lib/keys/gemfire2.keystore and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8de59df1/geode-core/src/test/resources/lib/keys/gemfire3.keystore
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/lib/keys/gemfire3.keystore b/geode-core/src/test/resources/lib/keys/gemfire3.keystore
deleted file mode 100644
index 19afc4b..0000000
Binary files a/geode-core/src/test/resources/lib/keys/gemfire3.keystore and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8de59df1/geode-core/src/test/resources/lib/keys/gemfire4.keystore
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/lib/keys/gemfire4.keystore b/geode-core/src/test/resources/lib/keys/gemfire4.keystore
deleted file mode 100644
index c65916a..0000000
Binary files a/geode-core/src/test/resources/lib/keys/gemfire4.keystore and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8de59df1/geode-core/src/test/resources/lib/keys/gemfire5.keystore
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/lib/keys/gemfire5.keystore b/geode-core/src/test/resources/lib/keys/gemfire5.keystore
deleted file mode 100644
index d738cca..0000000
Binary files a/geode-core/src/test/resources/lib/keys/gemfire5.keystore and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8de59df1/geode-core/src/test/resources/lib/keys/gemfire6.keystore
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/lib/keys/gemfire6.keystore b/geode-core/src/test/resources/lib/keys/gemfire6.keystore
deleted file mode 100644
index 1fea2d3..0000000
Binary files a/geode-core/src/test/resources/lib/keys/gemfire6.keystore and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8de59df1/geode-core/src/test/resources/lib/keys/gemfire7.keystore
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/lib/keys/gemfire7.keystore b/geode-core/src/test/resources/lib/keys/gemfire7.keystore
deleted file mode 100644
index 7a3187c..0000000
Binary files a/geode-core/src/test/resources/lib/keys/gemfire7.keystore and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8de59df1/geode-core/src/test/resources/lib/keys/gemfire8.keystore
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/lib/keys/gemfire8.keystore b/geode-core/src/test/resources/lib/keys/gemfire8.keystore
deleted file mode 100644
index a3bb886..0000000
Binary files a/geode-core/src/test/resources/lib/keys/gemfire8.keystore and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8de59df1/geode-core/src/test/resources/lib/keys/gemfire9.keystore
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/lib/keys/gemfire9.keystore b/geode-core/src/test/resources/lib/keys/gemfire9.keystore
deleted file mode 100644
index 674b4e6..0000000
Binary files a/geode-core/src/test/resources/lib/keys/gemfire9.keystore and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8de59df1/geode-core/src/test/resources/lib/keys/ibm/gemfire1.keystore
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/lib/keys/ibm/gemfire1.keystore b/geode-core/src/test/resources/lib/keys/ibm/gemfire1.keystore
deleted file mode 100644
index 4f9120c..0000000
Binary files a/geode-core/src/test/resources/lib/keys/ibm/gemfire1.keystore and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8de59df1/geode-core/src/test/resources/lib/keys/ibm/gemfire10.keystore
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/lib/keys/ibm/gemfire10.keystore b/geode-core/src/test/resources/lib/keys/ibm/gemfire10.keystore
deleted file mode 100644
index 0bd97d7..0000000
Binary files a/geode-core/src/test/resources/lib/keys/ibm/gemfire10.keystore and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8de59df1/geode-core/src/test/resources/lib/keys/ibm/gemfire11.keystore
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/lib/keys/ibm/gemfire11.keystore b/geode-core/src/test/resources/lib/keys/ibm/gemfire11.keystore
deleted file mode 100644
index 62ae3c7..0000000
Binary files a/geode-core/src/test/resources/lib/keys/ibm/gemfire11.keystore and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8de59df1/geode-core/src/test/resources/lib/keys/ibm/gemfire2.keystore
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/lib/keys/ibm/gemfire2.keystore b/geode-core/src/test/resources/lib/keys/ibm/gemfire2.keystore
deleted file mode 100644
index c65bc81..0000000
Binary files a/geode-core/src/test/resources/lib/keys/ibm/gemfire2.keystore and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8de59df1/geode-core/src/test/resources/lib/keys/ibm/gemfire3.keystore
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/lib/keys/ibm/gemfire3.keystore b/geode-core/src/test/resources/lib/keys/ibm/gemfire3.keystore
deleted file mode 100644
index b0796e0..0000000
Binary files a/geode-core/src/test/resources/lib/keys/ibm/gemfire3.keystore and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8de59df1/geode-core/src/test/resources/lib/keys/ibm/gemfire4.keystore
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/lib/keys/ibm/gemfire4.keystore b/geode-core/src/test/resources/lib/keys/ibm/gemfire4.keystore
deleted file mode 100644
index 9c94018..0000000
Binary files a/geode-core/src/test/resources/lib/keys/ibm/gemfire4.keystore and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8de59df1/geode-core/src/test/resources/lib/keys/ibm/gemfire5.keystore
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/lib/keys/ibm/gemfire5.keystore b/geode-core/src/test/resources/lib/keys/ibm/gemfire5.keystore
deleted file mode 100644
index 33f6937..0000000
Binary files a/geode-core/src/test/resources/lib/keys/ibm/gemfire5.keystore and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8de59df1/geode-core/src/test/resources/lib/keys/ibm/gemfire6.keystore
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/lib/keys/ibm/gemfire6.keystore b/geode-core/src/test/resources/lib/keys/ibm/gemfire6.keystore
deleted file mode 100644
index 568f674..0000000
Binary files a/geode-core/src/test/resources/lib/keys/ibm/gemfire6.keystore and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8de59df1/geode-core/src/test/resources/lib/keys/ibm/gemfire7.keystore
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/lib/keys/ibm/gemfire7.keystore b/geode-core/src/test/resources/lib/keys/ibm/gemfire7.keystore
deleted file mode 100644
index 80e2d80..0000000
Binary files a/geode-core/src/test/resources/lib/keys/ibm/gemfire7.keystore and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8de59df1/geode-core/src/test/resources/lib/keys/ibm/gemfire8.keystore
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/lib/keys/ibm/gemfire8.keystore b/geode-core/src/test/resources/lib/keys/ibm/gemfire8.keystore
deleted file mode 100644
index a15def5..0000000
Binary files a/geode-core/src/test/resources/lib/keys/ibm/gemfire8.keystore and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8de59df1/geode-core/src/test/resources/lib/keys/ibm/gemfire9.keystore
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/lib/keys/ibm/gemfire9.keystore b/geode-core/src/test/resources/lib/keys/ibm/gemfire9.keystore
deleted file mode 100644
index 72087f3..0000000
Binary files a/geode-core/src/test/resources/lib/keys/ibm/gemfire9.keystore and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8de59df1/geode-core/src/test/resources/lib/keys/ibm/publickeyfile
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/lib/keys/ibm/publickeyfile b/geode-core/src/test/resources/lib/keys/ibm/publickeyfile
deleted file mode 100644
index 1b13872..0000000
Binary files a/geode-core/src/test/resources/lib/keys/ibm/publickeyfile and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8de59df1/geode-core/src/test/resources/lib/keys/publickeyfile
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/lib/keys/publickeyfile b/geode-core/src/test/resources/lib/keys/publickeyfile
deleted file mode 100644
index 9c2daa3..0000000
Binary files a/geode-core/src/test/resources/lib/keys/publickeyfile and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8de59df1/geode-core/src/test/resources/templates/security/authz5_5.dtd
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/templates/security/authz5_5.dtd b/geode-core/src/test/resources/templates/security/authz5_5.dtd
deleted file mode 100644
index 81a8150..0000000
--- a/geode-core/src/test/resources/templates/security/authz5_5.dtd
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
--->
-<!--
-
-This is the XML DTD for the GemFire sample XML based authorization callback
-in templates.security.XmlAuthorization.
-
-All XMLs must include a DOCTYPE of the following form:
-
- <!DOCTYPE acl PUBLIC
- "-//GemStone Systems, Inc.//GemFire XML Authorization 1.0//EN"
- "http://www.gemstone.com/dtd/authz5_5.dtd">
-
-The contents of a declarative XML file correspond to APIs found in the
-
- com.gemstone.gemfire.security.AccessControl
-
-package. The sample implementation may be used to specify access control
-policies.
-
--->
-
-<!--
-
-The following conventions apply to all GemFire sample authorization
-XML file elements unless indicated otherwise.
-
-- In elements that contain PCDATA, leading and trailing whitespace in
- the data may be ignored.
-
-- In elements whose value is an "enumerated type", the value is case
- sensitive.
-
--->
-
-
-<!--
-The "acl" element is the root element of the authorization file.
-This element contains the role to user mappings and role to permissions
-mapping on a per region per operation basis.
--->
-
-<!ELEMENT acl (role+,permission+)>
-
-<!--
-The "role" element contains the set of users that have the permissions of
-given role. A user can be present in more than one "role" elements in
-which case the union of the permissions to all those roles determines
-the full set of permissions to be given to the user.
--->
-
-<!ELEMENT role (user*)>
-<!ATTLIST role
- name CDATA #REQUIRED
->
-
-<!--
-The "user" element is contained within the "role" element and contains
-the name of a user having the permissions of that role.
--->
-
-<!ELEMENT user (#PCDATA)>
-
-<!--
-The "permission" element specifies the list of operations that are allowed
-for a particular role in the given regions as provided in the optional
-"regions" attribute. The value of "regions" attribute should be a comma
-separated list of region names for which permissions are to be provided.
-If no "regions" attribute is provided then those permissions are provided
-for all the other regions (i.e. other than those that have been explicitly
-specified). Permissions for cache level operations REGION_DESTROY,
-REGION_CREATE, QUERY and CQ operations should be specified with no "regions"
-attribute. If cache-level permission is not provided for QUERY or CQ operations
-then the permission for all the region names in the query string is checked.
--->
-
-<!ELEMENT permission (operation*)>
-<!ATTLIST permission
- role CDATA #REQUIRED
- regions CDATA #IMPLIED
->
-
-
-<!--
-The operation should be one of the following strings:
- GET, PUT, PUTALL, DESTROY, REGISTER_INTEREST, UNREGISTER_INTEREST,
- CONTAINS_KEY, KEY_SET, QUERY, EXECUTE_CQ, STOP_CQ, CLOSE_CQ, REGION_CLEAR,
- REGION_CREATE, REGION_DESTROY
--->
-<!ELEMENT operation (#PCDATA)>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8de59df1/geode-core/src/test/resources/templates/security/authz6_0.dtd
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/templates/security/authz6_0.dtd b/geode-core/src/test/resources/templates/security/authz6_0.dtd
deleted file mode 100755
index 06cceff..0000000
--- a/geode-core/src/test/resources/templates/security/authz6_0.dtd
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
--->
-<!--
-
-This is the XML DTD for the GemFire sample XML based authorization callback
-in templates.security.XmlAuthorization.
-
-All XMLs must include a DOCTYPE of the following form:
-
- <!DOCTYPE acl PUBLIC
- "-//GemStone Systems, Inc.//GemFire XML Authorization 1.0//EN"
- "http://www.gemstone.com/dtd/authz5_5.dtd">
-
-The contents of a declarative XML file correspond to APIs found in the
-
- com.gemstone.gemfire.security.AccessControl
-
-package. The sample implementation may be used to specify access control
-policies.
-
--->
-
-<!--
-
-The following conventions apply to all GemFire sample authorization
-XML file elements unless indicated otherwise.
-
-- In elements that contain PCDATA, leading and trailing whitespace in
- the data may be ignored.
-
-- In elements whose value is an "enumerated type", the value is case
- sensitive.
-
--->
-
-
-<!--
-The "acl" element is the root element of the authorization file.
-This element contains the role to user mappings and role to permissions
-mapping on a per region per operation basis.
--->
-
-<!ELEMENT acl (role+,permission+)>
-
-<!--
-The "role" element contains the set of users that have the permissions of
-given role. A user can be present in more than one "role" elements in
-which case the union of the permissions to all those roles determines
-the full set of permissions to be given to the user.
--->
-
-<!ELEMENT role (user*)>
-<!ATTLIST role
- name CDATA #REQUIRED
->
-
-<!--
-The "user" element is contained within the "role" element and contains
-the name of a user having the permissions of that role.
--->
-
-<!ELEMENT user (#PCDATA)>
-
-<!--
-The "permission" element specifies the list of operations that are allowed
-for a particular role in the given regions as provided in the optional
-"regions" attribute. The value of "regions" attribute should be a comma
-separated list of region names for which permissions are to be provided.
-If no "regions" attribute is provided then those permissions are provided
-for all the other regions (i.e. other than those that have been explicitly
-specified). Permissions for cache level operations REGION_DESTROY,
-REGION_CREATE, QUERY and CQ operations should be specified with no "regions"
-attribute. If cache-level permission is not provided for QUERY or CQ operations
-then the permission for all the region names in the query string is checked.
--->
-
-<!ELEMENT permission (operation*)>
-<!ATTLIST permission
- role CDATA #REQUIRED
- regions CDATA #IMPLIED
->
-
-
-<!--
-The operation should be one of the following strings:
- GET, PUT, PUTALL, DESTROY, REGISTER_INTEREST, UNREGISTER_INTEREST,
- CONTAINS_KEY, KEY_SET, QUERY, EXECUTE_CQ, STOP_CQ, CLOSE_CQ, REGION_CLEAR,
- REGION_CREATE, REGION_DESTROY
--->
-<!ELEMENT operation (#PCDATA)>
-<!ATTLIST operation
- functionIds CDATA #IMPLIED
- optimizeForWrite CDATA #IMPLIED
- keySet CDATA #IMPLIED
->
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8de59df1/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java
index 344c977..efc8f48 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java
@@ -21,10 +21,12 @@ import java.util.List;
import java.util.Properties;
import java.util.Random;
-import security.CredentialGenerator;
-import security.DummyAuthzCredentialGenerator;
-import security.DummyCredentialGenerator;
-import templates.security.UserPasswordAuthInit;
+import com.gemstone.gemfire.internal.security.FilterPostAuthorization;
+import com.gemstone.gemfire.internal.security.FilterPreAuthorization;
+import com.gemstone.gemfire.security.generator.CredentialGenerator;
+import com.gemstone.gemfire.security.generator.DummyAuthzCredentialGenerator;
+import com.gemstone.gemfire.security.generator.DummyCredentialGenerator;
+import com.gemstone.gemfire.security.templates.UserPasswordAuthInit;
import com.gemstone.gemfire.DataSerializable;
import com.gemstone.gemfire.Instantiator;
@@ -62,11 +64,9 @@ public class ClientAuthzObjectModDUnitTest extends ClientAuthorizationTestBase {
super(name);
}
- private static final String preAccessor = "com.gemstone.gemfire.internal."
- + "security.FilterPreAuthorization.create";
+ private static final String preAccessor = FilterPreAuthorization.class.getName() + ".create";
- private static final String postAccessor = "com.gemstone.gemfire.internal."
- + "security.FilterPostAuthorization.create";
+ private static final String postAccessor = FilterPostAuthorization.class.getName() + ".create";
private static class TestPostCredentialGenerator implements
TestCredentialGenerator {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8de59df1/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientCQPostAuthorizationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientCQPostAuthorizationDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientCQPostAuthorizationDUnitTest.java
index 0cb125f..138b90b 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientCQPostAuthorizationDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientCQPostAuthorizationDUnitTest.java
@@ -22,9 +22,6 @@ import java.util.Map;
import java.util.Properties;
import java.util.Random;
-import security.AuthzCredentialGenerator;
-import security.CredentialGenerator;
-
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.operations.OperationContext.OperationCode;
import com.gemstone.gemfire.cache.query.CqAttributes;
@@ -42,6 +39,8 @@ import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.internal.logging.InternalLogWriter;
+import com.gemstone.gemfire.security.generator.AuthzCredentialGenerator;
+import com.gemstone.gemfire.security.generator.CredentialGenerator;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.Invoke;
import com.gemstone.gemfire.test.dunit.LogWriterUtils;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8de59df1/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java
index 62bff2b..6cef09a 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java
@@ -22,10 +22,10 @@ import java.util.List;
import java.util.Properties;
import java.util.Random;
-import security.AuthzCredentialGenerator;
-import security.CredentialGenerator;
import com.gemstone.gemfire.cache.operations.OperationContext.OperationCode;
import com.gemstone.gemfire.internal.AvailablePort;
+import com.gemstone.gemfire.security.generator.AuthzCredentialGenerator;
+import com.gemstone.gemfire.security.generator.CredentialGenerator;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.LogWriterUtils;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8de59df1/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java
index 7161830..8693217 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java
@@ -16,6 +16,8 @@
*/
package com.gemstone.gemfire.security;
+import com.gemstone.gemfire.security.generator.CredentialGenerator;
+import com.gemstone.gemfire.security.generator.DummyCredentialGenerator;
import hydra.Log;
import java.io.IOException;
@@ -24,8 +26,6 @@ import java.util.Properties;
import javax.net.ssl.SSLException;
import javax.net.ssl.SSLHandshakeException;
-import security.CredentialGenerator;
-
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.client.Pool;
import com.gemstone.gemfire.cache.execute.FunctionService;
@@ -41,8 +41,6 @@ import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.LogWriterUtils;
import com.gemstone.gemfire.test.dunit.VM;
-import security.DummyCredentialGenerator;
-
public class MultiuserAPIDUnitTest extends ClientAuthorizationTestBase {
/** constructor */
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8de59df1/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiuserDurableCQAuthzDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiuserDurableCQAuthzDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiuserDurableCQAuthzDUnitTest.java
index 9f9d4c0..6c641d0 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiuserDurableCQAuthzDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiuserDurableCQAuthzDUnitTest.java
@@ -21,9 +21,6 @@ import java.util.Map;
import java.util.Properties;
import java.util.Random;
-import security.AuthzCredentialGenerator;
-import security.CredentialGenerator;
-
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.operations.OperationContext.OperationCode;
import com.gemstone.gemfire.cache.query.CqAttributes;
@@ -38,6 +35,8 @@ import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.internal.logging.InternalLogWriter;
+import com.gemstone.gemfire.security.generator.AuthzCredentialGenerator;
+import com.gemstone.gemfire.security.generator.CredentialGenerator;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.Invoke;
import com.gemstone.gemfire.test.dunit.LogWriterUtils;
@@ -140,7 +139,7 @@ public class MultiuserDurableCQAuthzDUnitTest extends
}
private void doTest(Integer numOfUsers, Integer numOfPuts,
- Boolean[] postAuthzAllowed, AuthzCredentialGenerator gen, Boolean keepAlive)
+ Boolean[] postAuthzAllowed, AuthzCredentialGenerator gen, Boolean keepAlive)
throws Exception {
CredentialGenerator cGen = gen.getCredentialGenerator();
Properties extraAuthProps = cGen.getSystemProperties();