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.

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

Wire up @Authenticated when used with JAX-RS #4221

Merged
merged 1 commit into from
Sep 27, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion bom/runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,8 @@
<mockito.version>3.0.0</mockito.version>
<jna.version>5.3.1</jna.version>
<antlr.version>4.7.2</antlr.version>
<quarkus-security.version>1.0.0.Alpha1</quarkus-security.version>
<quarkus-security.version>1.0.0.Alpha2</quarkus-security.version>
<javax.interceptor-api.version>1.2</javax.interceptor-api.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -1125,6 +1126,12 @@
<artifactId>validation-api</artifactId>
<version>${validation-api.version}</version>
</dependency>

<dependency>
<groupId>javax.interceptor</groupId>
<artifactId>javax.interceptor-api</artifactId>
<version>${javax.interceptor-api.version}</version>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public class RolesAllowedFilter implements ContainerRequestFilter {
private final Set<String> allowedRoles;
private final boolean allRolesAllowed;

public RolesAllowedFilter(String[] allowedRoles) {
public RolesAllowedFilter(String... allowedRoles) {
this.allowedRoles = new HashSet<>(asList(allowedRoles));
this.allRolesAllowed = this.allowedRoles.stream().anyMatch("*"::equals);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
import javax.ws.rs.core.FeatureContext;
import javax.ws.rs.ext.Provider;

import io.quarkus.security.Authenticated;

/**
* A JAXRS provider that installs security filters to support the RBAC access to endpoints based on the
* common security annotations.
Expand All @@ -30,7 +32,7 @@ public class RolesFilterRegistrar implements DynamicFeature {

private static final DenyAllFilter denyAllFilter = new DenyAllFilter();
private final Set<Class<? extends Annotation>> mpJwtAnnotations = new HashSet<>(
asList(DenyAll.class, PermitAll.class, RolesAllowed.class));
asList(DenyAll.class, PermitAll.class, RolesAllowed.class, Authenticated.class));

@Override
public void configure(ResourceInfo resourceInfo, FeatureContext context) {
Expand All @@ -40,6 +42,8 @@ public void configure(ResourceInfo resourceInfo, FeatureContext context) {
configureDenyAll(context);
} else if (mpJwtAnnotation instanceof RolesAllowed) {
configureRolesAllowed((RolesAllowed) mpJwtAnnotation, context);
} else if (mpJwtAnnotation instanceof Authenticated) {
configureAuthenticated(context);
}
} else {
// the resource method is not annotated and the class is not annotated either
Expand All @@ -54,6 +58,10 @@ private void configureRolesAllowed(RolesAllowed mpJwtAnnotation, FeatureContext
context.register(new RolesAllowedFilter(mpJwtAnnotation.value()));
}

private void configureAuthenticated(FeatureContext context) {
context.register(new RolesAllowedFilter("*"));
}

private void configureDenyAll(FeatureContext context) {
context.register(denyAllFilter);
}
Expand Down
4 changes: 4 additions & 0 deletions extensions/security/runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-arc</artifactId>
</dependency>
<dependency>
<groupId>javax.interceptor</groupId>
<artifactId>javax.interceptor-api</artifactId>
</dependency>
<dependency>
<groupId>com.oracle.substratevm</groupId>
<artifactId>svm</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,25 @@ public void callEchoNoAuth() {
.statusCode(HttpURLConnection.HTTP_UNAUTHORIZED);
}

@Test()
public void testAuthenticatedAnnotation() {
RestAssured.given()
.when()
.queryParam("input", "hello")
.get("/endp/authenticated")
.then()
.statusCode(HttpURLConnection.HTTP_UNAUTHORIZED);

io.restassured.response.Response response = RestAssured.given().auth()
.oauth2(token)
.when()
.get("/endp/authenticated").andReturn();

Assertions.assertEquals(HttpURLConnection.HTTP_OK, response.getStatusCode());
String replyString = response.body().asString();
Assertions.assertEquals("[email protected]", replyString);
}

/**
* Validate a request without an MP-JWT to unsecured endpoint has HTTP_OK with expected response
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
import org.eclipse.microprofile.jwt.ClaimValue;
import org.eclipse.microprofile.jwt.JsonWebToken;

import io.quarkus.security.Authenticated;

@Path("/endp")
@DenyAll
@RequestScoped
Expand Down Expand Up @@ -124,6 +126,16 @@ public String getReasonPhrase() {
return response;
}

@GET
@Path("/authenticated")
@Authenticated
public String checkAuthenticated(@Context SecurityContext sec) {
if (sec.getUserPrincipal() != null) {
return sec.getUserPrincipal().getName();
}
return "FAILED";
}

@GET
@Path("/getInjectedPrincipal")
@RolesAllowed("Tester")
Expand Down