Skip to content

Add hasAuthority method to RSocketSecurity #7478

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

Merged
merged 1 commit into from
Sep 27, 2019
Merged

Add hasAuthority method to RSocketSecurity #7478

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ...src/main/java/org/springframework/security/config/annotation/rsocket/RSocketSecurity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@
* </pre>
* @author Rob Winch
* @author Jesús Ascama Arias
* @author Luis Felipe Vega
* @since 5.2
*/
public class RSocketSecurity {
Expand Down Expand Up @@ -312,6 +313,10 @@ public AuthorizePayloadsSpec authenticated() {
return access(AuthenticatedReactiveAuthorizationManager.authenticated());
}

public AuthorizePayloadsSpec hasAuthority(String authority) {
return access(AuthorityReactiveAuthorizationManager.hasAuthority(authority));
}

public AuthorizePayloadsSpec hasRole(String role) {
return access(AuthorityReactiveAuthorizationManager.hasRole(role));
}
Expand Down
19 changes: 19 additions & 0 deletions ...ngframework/security/config/annotation/rsocket/RSocketMessageHandlerConnectionITests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@

/**
* @author Rob Winch
* @author Luis Felipe Vega
*/
@ContextConfiguration
@RunWith(SpringRunner.class)
Expand Down Expand Up @@ -135,6 +136,23 @@ public void routeWhenStreamCredentialsAuthorized() {
assertThat(hiRob).isEqualTo("Hi rob");
}

@Test
public void routeWhenStreamCredentialsHaveAuthority() {
UsernamePasswordMetadata connectCredentials = new UsernamePasswordMetadata("user", "password");
this.requester = requester()
.setupMetadata(connectCredentials, UsernamePasswordMetadata.BASIC_AUTHENTICATION_MIME_TYPE)
.connectTcp(this.server.address().getHostName(), this.server.address().getPort())
.block();

String hiUser = this.requester.route("secure.authority.retrieve-mono")
.metadata(new UsernamePasswordMetadata("admin", "password"), UsernamePasswordMetadata.BASIC_AUTHENTICATION_MIME_TYPE)
.data("Felipe")
.retrieveMono(String.class)
.block();

assertThat(hiUser).isEqualTo("Hi Felipe");
}

@Test
public void connectWhenNotAuthenticated() {
this.requester = requester()
Expand Down Expand Up @@ -225,6 +243,7 @@ PayloadSocketAcceptorInterceptor rsocketInterceptor(RSocketSecurity rsocket) {
.setup().hasRole("SETUP")
.route("secure.admin.*").hasRole("ADMIN")
.route("secure.**").hasRole("USER")
.route("secure.authority.*").hasAuthority("ROLE_USER")
.anyRequest().permitAll()
)
.basicAuthentication(Customizer.withDefaults());
Expand Down