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

PAYARA-4141 fixes throwing NotAuthorizedException using the wrong constructor #4176

Merged
merged 1 commit into from
Sep 17, 2019
Merged

PAYARA-4141 fixes throwing NotAuthorizedException using the wrong constructor #4176

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
22 changes: 16 additions & 6 deletions ...h-roles/src/main/java/fish/payara/appserver/cdi/auth/roles/RolesPermittedInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.NotAuthorizedException;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;

import static org.glassfish.soteria.cdi.AnnotationELPProcessor.evalELExpression;
import static org.glassfish.soteria.cdi.AnnotationELPProcessor.hasAnyELExpression;
import static org.glassfish.soteria.cdi.CdiUtils.getAnnotation;
Expand Down Expand Up @@ -120,6 +122,7 @@ public RolesPermittedInterceptor(@Intercepted Bean<?> interceptedBean, BeanManag
* @param invocationContext Context provided by Weld.
* @return Proceed to next interceptor in chain.
* @throws java.lang.Exception
* @throws fish.payara.cdi.auth.roles.CallerAccessException if access is not permitted
*/
@AroundInvoke
public Object method(InvocationContext invocationContext) throws Exception {
Expand All @@ -142,7 +145,6 @@ public Object method(InvocationContext invocationContext) throws Exception {
* @return True if access is allowed, false otherwise
*/
public boolean checkAccessPermitted(RolesPermitted roles, InvocationContext invocationContext) {
List<String> permittedRoles = asList(roles.value());

authenticate(roles.value());

Expand All @@ -151,7 +153,9 @@ public boolean checkAccessPermitted(RolesPermitted roles, InvocationContext invo
eLProcessor = getElProcessor(invocationContext);
}

if (roles.semantics().equals(OR)) {
List<String> permittedRoles = asList(roles.value());

if (OR.equals(roles.semantics())) {
for (String role : permittedRoles) {
if (eLProcessor != null && hasAnyELExpression(role)) {
role = evalELExpression(eLProcessor, role);
Expand All @@ -160,7 +164,7 @@ public boolean checkAccessPermitted(RolesPermitted roles, InvocationContext invo
return true;
}
}
} else if (roles.semantics().equals(AND)) {
} else if (AND.equals(roles.semantics())) {
for (String role : permittedRoles) {
if (eLProcessor != null && hasAnyELExpression(role)) {
role = evalELExpression(eLProcessor, role);
Expand All @@ -186,7 +190,7 @@ private RolesPermitted getRolesPermitted(InvocationContext invocationContext) {
optionalRolesPermitted = bindings.stream()
.filter(annotation -> annotation.annotationType().equals(RolesPermitted.class))
.findAny()
.map(annotation -> RolesPermitted.class.cast(annotation));
.map(RolesPermitted.class::cast);

if (optionalRolesPermitted.isPresent()) {
return optionalRolesPermitted.get();
Expand Down Expand Up @@ -269,12 +273,18 @@ private void authenticate(String[] roles) {
// Authentication was not done at all (i.e. no credentials present) or
// authentication failed (i.e. wrong credentials, credentials expired, etc)
if (status == NOT_DONE || status == SEND_FAILURE) {
throw new NotAuthorizedException("Authentication resulted in " + status);
throw new NotAuthorizedException(
"Authentication resulted in " + status,
Response.status(Response.Status.UNAUTHORIZED).build()
);
}

// compensate for possible Soteria bug, need to investigate
if (status == SUCCESS && !isAuthenticated()) {
throw new NotAuthorizedException("Authentication not done (i.e. no credential found)");
throw new NotAuthorizedException(
"Authentication not done (i.e. no credential found)",
Response.status(Response.Status.UNAUTHORIZED).build()
);
}
}
}
Expand Down