Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

The replicationmap-permission support added to configuration persistance handlers #17810

Merged
merged 1 commit into from Nov 2, 2020
Merged

The replicationmap-permission support added to configuration persistance handlers #17810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion hazelcast-spring-tests/src/test/java/com/hazelcast/spring/TestFullApplicationContext.java
View file
Open in desktop
Expand Up @@ -595,7 +595,7 @@ public void testSecurity() {
final Set<PermissionConfig> clientPermissionConfigs = securityConfig.getClientPermissionConfigs();
assertFalse(securityConfig.getClientBlockUnmappedActions());
assertTrue(isNotEmpty(clientPermissionConfigs));
assertEquals(24, clientPermissionConfigs.size());
assertEquals(PermissionType.values().length, clientPermissionConfigs.size());
final PermissionConfig pnCounterPermission = new PermissionConfig(PermissionType.PN_COUNTER, "pnCounterPermission", "*")
.addAction("create")
.setEndpoints(Collections.emptySet());
Expand Down
7 changes: 6 additions & 1 deletion ...tests/src/test/resources/com/hazelcast/spring/fullConfig-applicationContext-hazelcast.xml
View file
Open in desktop
Expand Up @@ -21,7 +21,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.hazelcast.com/schema/spring
http://www.hazelcast.com/schema/spring/hazelcast-spring-4.1.xsd">
http://www.hazelcast.com/schema/spring/hazelcast-spring-4.2.xsd">

<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"
p:systemPropertiesModeName="SYSTEM_PROPERTIES_MODE_OVERRIDE">
Expand Down Expand Up @@ -867,6 +867,11 @@
<hz:action>all</hz:action>
</hz:actions>
</hz:reliable-topic-permission>
<hz:replicatedmap-permission name="*">
<hz:actions>
<hz:action>all</hz:action>
</hz:actions>
</hz:replicatedmap-permission>
</hz:client-permissions>
<hz:client-block-unmapped-actions>false</hz:client-block-unmapped-actions>
</hz:security>
Expand Down
2 changes: 2 additions & 0 deletions hazelcast-spring/src/main/resources/hazelcast-spring-4.1.xsd
View file
Open in desktop
Expand Up @@ -2866,6 +2866,8 @@
maxOccurs="unbounded"/>
<xs:element name="reliable-topic-permission" type="instance-permission" minOccurs="0"
maxOccurs="unbounded"/>
<xs:element name="replicatedmap-permission" type="instance-permission" minOccurs="0"
maxOccurs="unbounded"/>
</xs:choice>
<xs:attribute name="on-join-operation" type="permission-on-join-operation" use="optional" default="RECEIVE"/>
</xs:complexType>
Expand Down
2 changes: 2 additions & 0 deletions hazelcast-spring/src/main/resources/hazelcast-spring-4.2.xsd
View file
Open in desktop
Expand Up @@ -2866,6 +2866,8 @@
maxOccurs="unbounded"/>
<xs:element name="reliable-topic-permission" type="instance-permission" minOccurs="0"
maxOccurs="unbounded"/>
<xs:element name="replicatedmap-permission" type="instance-permission" minOccurs="0"
maxOccurs="unbounded"/>
</xs:choice>
<xs:attribute name="on-join-operation" type="permission-on-join-operation" use="optional" default="RECEIVE"/>
</xs:complexType>
Expand Down
7 changes: 6 additions & 1 deletion hazelcast/src/main/java/com/hazelcast/config/PermissionConfig.java
View file
Open in desktop
Expand Up @@ -160,7 +160,12 @@ public enum PermissionType {
/**
* ReliableTopic
*/
RELIABLE_TOPIC("reliable-topic-permission");
RELIABLE_TOPIC("reliable-topic-permission"),
/**
* ReplicatedMap
*/
REPLICATEDMAP("replicatedmap-permission")
;
private final String nodeName;

PermissionType(String nodeName) {
Expand Down
1 change: 1 addition & 0 deletions hazelcast/src/main/resources/hazelcast-config-4.1.xsd
View file
Open in desktop
Expand Up @@ -2686,6 +2686,7 @@
<xs:element name="config-permission" type="base-permission" minOccurs="0" maxOccurs="1"/>
<xs:element name="ring-buffer-permission" type="instance-permission" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="reliable-topic-permission" type="instance-permission" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="replicatedmap-permission" type="instance-permission" minOccurs="0" maxOccurs="unbounded"/>
</xs:choice>
<xs:attribute name="on-join-operation" type="permission-on-join-operation" use="optional" default="RECEIVE"/>
</xs:complexType>
Expand Down
1 change: 1 addition & 0 deletions hazelcast/src/main/resources/hazelcast-config-4.2.xsd
View file
Open in desktop
Expand Up @@ -2686,6 +2686,7 @@
<xs:element name="config-permission" type="base-permission" minOccurs="0" maxOccurs="1"/>
<xs:element name="ring-buffer-permission" type="instance-permission" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="reliable-topic-permission" type="instance-permission" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="replicatedmap-permission" type="instance-permission" minOccurs="0" maxOccurs="unbounded"/>
</xs:choice>
<xs:attribute name="on-join-operation" type="permission-on-join-operation" use="optional" default="RECEIVE"/>
</xs:complexType>
Expand Down
5 changes: 5 additions & 0 deletions hazelcast/src/main/resources/hazelcast-full-example.xml
View file
Open in desktop
Expand Up @@ -2490,6 +2490,11 @@
<action>all</action>
</actions>
</pn-counter-permission>
<replicatedmap-permission name="*">
<actions>
<action>all</action>
</actions>
</replicatedmap-permission>
</client-permissions>
<client-block-unmapped-actions>true</client-block-unmapped-actions>
<security-interceptors>
Expand Down
4 changes: 4 additions & 0 deletions hazelcast/src/main/resources/hazelcast-full-example.yaml
View file
Open in desktop
Expand Up @@ -2412,6 +2412,10 @@ hazelcast:
- name: "*"
actions:
- all
replicatedmap:
- name: "*"
actions:
- all
client-block-unmapped-actions: true
security-interceptors:
- com.your-package.YourSecurityInterceptorImplementation
Expand Down
10 changes: 8 additions & 2 deletions hazelcast/src/test/java/com/hazelcast/config/ConfigXmlGeneratorTest.java
View file
Open in desktop
Expand Up @@ -537,13 +537,19 @@ public void testSecurityConfig() {
.setUsage(LoginModuleConfig.LoginModuleUsage.REQUIRED))))
.setUsernamePasswordIdentityConfig("username", "password"))
.setMemberRealmConfig("mr", memberRealm)
.setClientPermissionConfigs(new HashSet<>(singletonList(
.setClientPermissionConfigs(new HashSet<>(asList(
new PermissionConfig()
.setActions(newHashSet("read", "remove"))
.setEndpoints(newHashSet("127.0.0.1", "127.0.0.2"))
.setType(PermissionConfig.PermissionType.ATOMIC_LONG)
.setName("mycounter")
.setPrincipal("devos"))));
.setPrincipal("devos"),
new PermissionConfig()
.setActions(newHashSet("read", "create"))
.setType(PermissionConfig.PermissionType.REPLICATEDMAP)
.setName("rmap")
.setPrincipal("monitor")
)));

cfg.setSecurityConfig(expectedConfig);

Expand Down
5 changes: 5 additions & 0 deletions hazelcast/src/test/resources/hazelcast-fullconfig-without-network.xml
View file
Open in desktop
Expand Up @@ -894,6 +894,11 @@
<action>all</action>
</actions>
</reliable-topic-permission>
<replicatedmap-permission name="*">
<actions>
<action>all</action>
</actions>
</replicatedmap-permission>
</client-permissions>
<client-block-unmapped-actions>true</client-block-unmapped-actions>
</security>
Expand Down
5 changes: 5 additions & 0 deletions hazelcast/src/test/resources/hazelcast-fullconfig-without-network.yaml
View file
Open in desktop
Expand Up @@ -841,6 +841,11 @@ hazelcast:
principal: "*"
actions:
- all
replicatedmap:
- name: "*"
principal: "*"
actions:
- all
reliable-topic:
- name: "*"
principal: "*"
Expand Down