Apply exclusion rules to child contributors

Update `IncludeExcludeGroupMemberPredicate` so that exclusion rules are
also applied to child contributors. The restores the behavior of Spring
Boot 2.5.x where `management.endpoint.health.group.mygroup.exclude=db`
would exclude 'db/one', 'db/two' etc.

Fixes gh-29251
pull/30003/head
Phillip Webb 3 years ago
parent 438b7553da
commit 8e583f6f73

@ -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");
* you may not use this file except in compliance with the License.
@ -41,10 +41,7 @@ class IncludeExcludeGroupMemberPredicate implements Predicate<String> {
@Override
public boolean test(String name) {
return testCleanName(clean(name));
}
private boolean testCleanName(String name) {
name = clean(name);
return isIncluded(name) && !isExcluded(name);
}
@ -64,7 +61,18 @@ class IncludeExcludeGroupMemberPredicate implements Predicate<String> {
}
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) {

@ -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");
* 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");
}
@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) {
return new Builder(include);
}

Loading…
Cancel
Save