Skip to content

Ensure AnnotationLiterals for java.lang annotations don't throw security exceptions #4661

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
Oct 21, 2019
Merged

Ensure AnnotationLiterals for java.lang annotations don't throw security exceptions #4661

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
1 change: 1 addition & 0 deletions ...ons/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigArrayConverterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ public void testFoo() {
@Singleton
static class Configured {

@Deprecated
@Inject
@ConfigProperty(name = "foos")
String[] foos;
Expand Down
15 changes: 13 additions & 2 deletions ...ects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationLiteralGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,13 +252,24 @@ static String componentType(MethodInfo method) {
}

static String generatedSharedName(DotName annotationName) {
// when the annotation is a java.lang annotation we need to use a different package in which to generate the literal
// otherwise a security exception will be thrown when the literal is loaded
String nameToUse = isJavaLang(annotationName.toString())
? AbstractGenerator.DEFAULT_PACKAGE + annotationName.withoutPackagePrefix()
: annotationName.toString();

// com.foo.MyQualifier -> com.foo.MyQualifier1_Shared_AnnotationLiteral
return annotationName + SHARED_SUFFIX + ANNOTATION_LITERAL_SUFFIX;
return nameToUse + SHARED_SUFFIX + ANNOTATION_LITERAL_SUFFIX;
}

private static boolean isJavaLang(String s) {
return s.startsWith("java.lang");
}

static String generatedLocalName(String targetPackage, String simpleName, String hash) {
// com.foo.MyQualifier -> com.bar.MyQualifier_somehashvalue_AnnotationLiteral
return targetPackage + "." + simpleName + hash + AnnotationLiteralGenerator.ANNOTATION_LITERAL_SUFFIX;
return (isJavaLang(targetPackage) ? AbstractGenerator.DEFAULT_PACKAGE : targetPackage) + "." + simpleName + hash
+ AnnotationLiteralGenerator.ANNOTATION_LITERAL_SUFFIX;
}

}