root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 17 Packages Projects Releases Wiki Activity

Merge branch '2.6.x' into 2.7.x 

Closes gh-29261
This commit is contained in:
Phillip Webb 2022-01-04 12:13:55 -08:00
parent 3e6c8bc78b 8e583f6f73
commit c839ebbce4
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/IncludeExcludeGroupMemberPredicate.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2021 the original author or authors. * Copyright 2012-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -41,10 +41,7 @@ class IncludeExcludeGroupMemberPredicate implements Predicate<String> {
@Override @Override
public boolean test(String name) { public boolean test(String name) {
return testCleanName(clean(name)); name = clean(name);
}
private boolean testCleanName(String name) {
return isIncluded(name) && !isExcluded(name); return isIncluded(name) && !isExcluded(name);
} }
@ -64,7 +61,18 @@ class IncludeExcludeGroupMemberPredicate implements Predicate<String> {
} }
private boolean isExcluded(String name) { private boolean isExcluded(String name) {
return this.exclude.contains("*") || this.exclude.contains(name); return this.exclude.contains("*") || isExcludedName(name);
}
private boolean isExcludedName(String name) {
if (this.exclude.contains(name)) {
return true;
}
if (name.contains("/")) {
String parent = name.substring(0, name.lastIndexOf("/"));
return isExcludedName(parent);
}
return false;
} }
private Set<String> clean(Set<String> names) { private Set<String> clean(Set<String> names) {

8
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/IncludeExcludeGroupMemberPredicateTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2021 the original author or authors. * Copyright 2012-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -112,6 +112,12 @@ class IncludeExcludeGroupMemberPredicateTests {
assertThat(predicate).accepts("test/a").rejects("test/b").rejects("foo"); assertThat(predicate).accepts("test/a").rejects("test/b").rejects("foo");
} }
@Test // gh-29251
void specifiedExcludeShouldExcludeNestedChildren() {
Predicate<String> predicate = include("*").exclude("test");
assertThat(predicate).rejects("test").rejects("test/a").rejects("test/a").accepts("other");
}
private Builder include(String... include) { private Builder include(String... include) {
return new Builder(include); return new Builder(include);
} }