Skip to content

services: Reject wildcards and options in binary log exclusions #13168

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

Open
hidingmyname wants to merge 1 commit into
base: master
Choose a base branch
from
Open

services: Reject wildcards and options in binary log exclusions #13168

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
5 changes: 5 additions & 0 deletions services/src/main/java/io/grpc/protobuf/services/BinlogHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,6 +635,11 @@ static final class FactoryImpl implements Factory {
if (methodOrSvc.isEmpty()) {
throw new IllegalArgumentException("Illegal log config pattern: " + configuration);
}
if (methodOrSvc.startsWith("-")
&& (binlogOptionStr != null || methodOrSvc.contains("*"))) {
// An exclusion names exactly one method; '*' and '{...}' are not allowed
throw new IllegalArgumentException("Illegal log config pattern: " + configuration);
}
if (methodOrSvc.equals("*")) {
// parse config for "*"
checkState(
Expand Down
12 changes: 12 additions & 0 deletions services/src/test/java/io/grpc/protobuf/services/BinlogHelperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,18 @@ public void configBinLog_blacklist() {
assertNotNull(makeLog("-p.s/blacklisted,p.s/*", "p.s/allowed"));
}

@Test
public void configBinLog_blacklist_wildcardOrOptionsRejected() {
for (String configStr : new String[] {"*,-p.s/*", "-p.s/*", "-*", "-p.s/m{h}"}) {
try {
new FactoryImpl(sink, configStr);
fail("Expected IllegalArgumentException for " + configStr);
} catch (IllegalArgumentException expected) {
assertThat(expected).hasMessageThat().startsWith("Illegal log config pattern");
}
}
}

private void assertDuplicatelPatternDetected(String factoryConfigStr) {
try {
new BinlogHelper.FactoryImpl(sink, factoryConfigStr);
Expand Down
Loading