Skip to content

Block updates to log level for org.apache.http if less specific than INFO #105020

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.

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 27 commits into from
Feb 21, 2024
Merged
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
2b7b3fb
Block updates to log level for org.apache.http if less specific than …
mosche Feb 1, 2024
0129fb4
Merge branch 'main' into ES-7617_restricted_loggers
mosche Feb 1, 2024
d2acdb5
Don't expand public surface of Loggers, move settings update test
mosche Feb 2, 2024
6e95008
Merge branch 'main' into ES-7617_restricted_loggers
mosche Feb 2, 2024
9de8689
fix failure in EvilLoggerConfigurationTests
mosche Feb 2, 2024
55d0b0b
Remove DEBUG level for org.apache.http.wire in S3SnapshotRepoTestKitIT
mosche Feb 2, 2024
a95418e
Use TestLoggers in OpenIdConnectAuthenticatorTests to set restricted …
mosche Feb 2, 2024
8ef1aed
Fix assert
mosche Feb 2, 2024
1beb51f
PR feedback
mosche Feb 5, 2024
69e593d
Restrict Apache http logger / AWS request logger unless TRACE_ENABLED…
mosche Feb 5, 2024
7d53005
Update documentation
mosche Feb 5, 2024
ccf5c50
validate logger settings in REST layer, separate task testNetworkTrac…
mosche Feb 12, 2024
b123d48
fix
mosche Feb 12, 2024
779fdf1
fix
mosche Feb 12, 2024
75be712
Merge branch 'main' into ES-7617_restricted_loggers
mosche Feb 12, 2024
e4154d4
Merge branch 'main' into ES-7617_restricted_loggers
mosche Feb 12, 2024
b20f493
Merge branch 'main' into ES-7617_restricted_loggers
mosche Feb 12, 2024
dd0164d
fix
mosche Feb 12, 2024
e301d69
fix bug
mosche Feb 12, 2024
59ab7b0
More selective test filter
mosche Feb 12, 2024
54f8ae7
let 'check' depend on 'testNetworkTraceNotEnabled'
mosche Feb 13, 2024
7f57feb
Test setting restricted loggers using internal API that isn't impacte…
mosche Feb 14, 2024
cae9cc1
Remove copy paste comment
mosche Feb 19, 2024
4e8a52e
Merge branch 'main' into ES-7617_restricted_loggers
elasticmachine Feb 19, 2024
1079443
Merge branch 'main' into ES-7617_restricted_loggers
elasticmachine Feb 21, 2024
06f09e2
package private RESTRICTED_LOGGERS
mosche Feb 21, 2024
da5a04c
Merge branch 'main' into ES-7617_restricted_loggers
mosche Feb 21, 2024
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
Prev Previous commit
Next Next commit
let 'check' depend on 'testNetworkTraceNotEnabled'
  • Loading branch information
mosche committed Feb 13, 2024
commit 54f8ae78ea24f397394e75174d13d63fb72ac3be
6 changes: 4 additions & 2 deletions server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ tasks.register('testNetworkTraceNotEnabled', Test) {
classpath = testing.suites.test.sources.runtimeClasspath

filter {
//include specific method in any of the tests
// following test require es.insecure_network_trace_enabled to NOT be enabled
includeTestsMatching "org.elasticsearch.common.logging.LoggersTests.testCheckRestrictedLoggers"
includeTestsMatching "org.elasticsearch.common.logging.LoggersTests.testSetLevelWithRestrictions"
includeTestsMatching "org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsRequestTests.testValidateLoggers"
Expand All @@ -166,10 +166,12 @@ tasks.register('testNetworkTraceNotEnabled', Test) {
systemProperties.remove('es.insecure_network_trace_enabled')
}

tasks.named("check").configure {
dependsOn testNetworkTraceNotEnabled
}

tasks.named("test").configure {
systemProperty 'es.insecure_network_trace_enabled', 'true'
dependsOn testNetworkTraceNotEnabled
}

tasks.named("thirdPartyAudit").configure {
Expand Down