Spring/spring-security
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SEC-2853: Rename WebSocket XML Namespace elements

Browse Source
This commit is contained in:
Rob Winch
2015-02-18 16:38:52 -06:00
parent 706e7fd7a2
commit fea03536d6
10 changed files with 93 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
config/src/main/resources/org/springframework/security/config/spring-security-4.0.rnc
View File

@@ -272,22 +272,22 @@ protect-pointcut.attlist &=
## Access configuration attributes list that applies to all methods matching the pointcut, e.g. "ROLE_A,ROLE_B"
attribute access {xsd:token}
messages =
websocket-message-broker =
## Allows securing a Message Broker. There are two modes. If no id is specified: ensures that any SimpAnnotationMethodMessageHandler has the AuthenticationPrincipalArgumentResolver registered as a custom argument resolver; ensures that the SecurityContextChannelInterceptor is automatically registered for the clientInboundChannel; and that a ChannelSecurityInterceptor is registered with the clientInboundChannel. If the id is specified, creates a ChannelSecurityInterceptor that can be manually registered with the clientInboundChannel.
element messages { messages.attrlist, (message-interceptor*) }
element websocket-message-broker { websocket-message-broker.attrlist, (intercept-message*) }
messages.attrlist &=
websocket-message-broker.attrlist &=
## A bean identifier, used for referring to the bean elsewhere in the context. If specified, explicit configuration within clientInboundChannel is required. If not specified, ensures that any SimpAnnotationMethodMessageHandler has the AuthenticationPrincipalArgumentResolver registered as a custom argument resolver; ensures that the SecurityContextChannelInterceptor is automatically registered for the clientInboundChannel; and that a ChannelSecurityInterceptor is registered with the clientInboundChannel.
attribute id {xsd:token}?
message-interceptor =
## Creates an authorization rule for a message.
element message-interceptor {message-interceptor.attrlist}
intercept-message =
## Creates an authorization rule for a websocket message.
element intercept-message {intercept-message.attrlist}
message-interceptor.attrlist &=
intercept-message.attrlist &=
## The destination ant pattern which will be mapped to the access attribute. For example, /** matches any message with a destination, /admin/** matches any message that has a destination that starts with admin.
attribute pattern {xsd:token}?
message-interceptor.attrlist &=
intercept-message.attrlist &=
## The access configuration attributes that apply for the configured message. For example, permitAll grants access to anyone, hasRole('ROLE_ADMIN') requires the user have the role 'ROLE_ADMIN'.
attribute access {xsd:token}?

16
config/src/main/resources/org/springframework/security/config/spring-security-4.0.xsd
View File

@@ -839,7 +839,7 @@
</xs:annotation>
</xs:attribute>
</xs:attributeGroup>
<xs:element name="messages">
<xs:element name="websocket-message-broker">
<xs:annotation>
<xs:documentation>Allows securing a Message Broker. There are two modes. If no id is specified: ensures that
any SimpAnnotationMethodMessageHandler has the AuthenticationPrincipalArgumentResolver
@@ -852,12 +852,12 @@
</xs:annotation>
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="security:message-interceptor"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="security:intercept-message"/>
</xs:sequence>
<xs:attributeGroup ref="security:messages.attrlist"/>
<xs:attributeGroup ref="security:websocket-message-broker.attrlist"/>
</xs:complexType>
</xs:element>
<xs:attributeGroup name="messages.attrlist">
<xs:attributeGroup name="websocket-message-broker.attrlist">
<xs:attribute name="id" type="xs:token">
<xs:annotation>
<xs:documentation>A bean identifier, used for referring to the bean elsewhere in the context. If specified,
@@ -871,16 +871,16 @@
</xs:annotation>
</xs:attribute>
</xs:attributeGroup>
<xs:element name="message-interceptor">
<xs:element name="intercept-message">
<xs:annotation>
<xs:documentation>Creates an authorization rule for a message.
<xs:documentation>Creates an authorization rule for a websocket message.
</xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:attributeGroup ref="security:message-interceptor.attrlist"/>
<xs:attributeGroup ref="security:intercept-message.attrlist"/>
</xs:complexType>
</xs:element>
<xs:attributeGroup name="message-interceptor.attrlist">
<xs:attributeGroup name="intercept-message.attrlist">
<xs:attribute name="pattern" type="xs:token">
<xs:annotation>
<xs:documentation>The destination ant pattern which will be mapped to the access attribute. For example, /**