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

Obtaining the actual class when instance is injected by the CDI #2897

Merged
merged 1 commit into from
Mar 30, 2021
Merged

Obtaining the actual class when instance is injected by the CDI #2897

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
34 changes: 25 additions & 9 deletions ...tegration/jersey/src/main/java/io/helidon/security/integration/jersey/SecurityFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -276,9 +276,10 @@ protected Logger logger() {
}

private SecurityDefinition securityForClass(Class<?> theClass, SecurityDefinition parent) {
Authenticated atn = theClass.getAnnotation(Authenticated.class);
Authorized atz = theClass.getAnnotation(Authorized.class);
Audited audited = theClass.getAnnotation(Audited.class);
Class<?> realClass = getRealClass(theClass);
Authenticated atn = realClass.getAnnotation(Authenticated.class);
Authorized atz = realClass.getAnnotation(Authorized.class);
Audited audited = realClass.getAnnotation(Audited.class);

// as sometimes we may want to prevent calls to authorization provider unless
// explicitly invoked by developer
Expand All @@ -294,9 +295,9 @@ private SecurityDefinition securityForClass(Class<?> theClass, SecurityDefinitio
}

Map<Class<? extends Annotation>, List<Annotation>> customAnnotsMap = new HashMap<>();
addCustomAnnotations(customAnnotsMap, theClass);
addCustomAnnotations(customAnnotsMap, realClass);

SecurityLevel securityLevel = SecurityLevel.create(theClass.getName())
SecurityLevel securityLevel = SecurityLevel.create(realClass.getName())
.withClassAnnotations(customAnnotsMap)
.build();
definition.getSecurityLevels().add(securityLevel);
Expand All @@ -305,9 +306,9 @@ private SecurityDefinition securityForClass(Class<?> theClass, SecurityDefinitio
AnnotationAnalyzer.AnalyzerResponse analyzerResponse;

if (null == parent) {
analyzerResponse = analyzer.analyze(theClass);
analyzerResponse = analyzer.analyze(realClass);
} else {
analyzerResponse = analyzer.analyze(theClass, parent.analyzerResponse(analyzer));
analyzerResponse = analyzer.analyze(realClass, parent.analyzerResponse(analyzer));
}

definition.analyzerResponse(analyzer, analyzerResponse);
Expand All @@ -316,6 +317,20 @@ private SecurityDefinition securityForClass(Class<?> theClass, SecurityDefinitio
return definition;
}

/**
* Returns the real class of this object, skipping proxies.
*
* @param object The object.
* @return Its class.
*/
private Class<?> getRealClass(Class<?> object) {
Class<?> result = object;
while (result.isSynthetic()) {
result = result.getSuperclass();
}
return result;
}

private SecurityDefinition getMethodSecurity(InvokedResource invokedResource,
Method definitionMethod,
ExtendedUriInfo uriInfo) {
Expand All @@ -326,8 +341,9 @@ private SecurityDefinition getMethodSecurity(InvokedResource invokedResource,
// and abstract classes implemented by the definition method.

// Jersey model does not have a 'definition class', so we have to find it from a handler class
Class<?> definitionClass = invokedResource.definitionClass()
Class<?> obtainedClass = invokedResource.definitionClass()
.orElseThrow(() -> new SecurityException("Got definition method, cannot get definition class"));
Class<?> definitionClass = getRealClass(obtainedClass);

if (definitionClass.getAnnotation(Path.class) == null) {
// this is a sub-resource
Expand Down