Skip to content

Make obtaining Spring beans a little more safe #2110

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 2 commits into from
Apr 11, 2023
Merged

Make obtaining Spring beans a little more safe #2110

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
acffe9f
Make obtaining Spring beans a little more safe
EgorkaKulikov Apr 7, 2023
c1716cc
Merge branch 'main' into egor/load_spring_classes_safe
EgorkaKulikov Apr 11, 2023
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
17 changes: 13 additions & 4 deletions utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/Api.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1276,10 +1276,19 @@ class SpringApplicationContext(
private val springInjectedClasses: Set<ClassId>
get() {
if (!areInjectedClassesInitialized) {
springInjectedClassesStorage += beanQualifiedNames
.map { fqn -> utContext.classLoader.loadClass(fqn) }
.filterNot { it.isAbstract || it.isInterface || it.isLocalClass || it.isMemberClass && !it.isStatic }
.mapTo(mutableSetOf()) { it.id }
for (beanFqn in beanQualifiedNames) {
try {
val beanClass = utContext.classLoader.loadClass(beanFqn)
if (!beanClass.isAbstract && !beanClass.isInterface &&
!beanClass.isLocalClass && (!beanClass.isMemberClass || beanClass.isStatic)) {
springInjectedClassesStorage += beanClass.id
}
} catch (e: ClassNotFoundException) {
// For some Spring beans (e.g. with anonymous classes)
// it is possible to have problems with classes loading.
continue
}
}

// This is done to be sure that this storage is not empty after the first class loading iteration.
// So, even if all loaded classes were filtered out, we will not try to load them again.
Expand Down