Skip to content

Commit 46e81e5

Browse files
Use *auth* instead of authorization for sanitizing fields (elastic#2326)
1 parent 4063989 commit 46e81e5

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

CHANGELOG.asciidoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ endif::[]
2626
[float]
2727
===== Features
2828
* Exceptions that are logged using the fatal log level are now captured (log4j2 only) - {pull}2377[#2377]
29+
* Replaced `authorization` in the default value of `sanitize_field_names` with `*auth*` - {pull}2326[#2326]
2930
3031
[float]
3132
===== Bug fixes

apm-agent-core/src/main/java/co/elastic/apm/agent/configuration/CoreConfiguration.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,7 @@ public class CoreConfiguration extends ConfigurationOptionProvider {
229229
WildcardMatcher.valueOf("*session*"),
230230
WildcardMatcher.valueOf("*credit*"),
231231
WildcardMatcher.valueOf("*card*"),
232-
// HTTP request header for basic auth, contains passwords
233-
WildcardMatcher.valueOf("authorization"),
232+
WildcardMatcher.valueOf("*auth*"),
234233
// HTTP response header which can contain session ids
235234
WildcardMatcher.valueOf("set-cookie")
236235
));

docs/configuration.asciidoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -701,7 +701,7 @@ you should add an additional entry to this list (make sure to also include the d
701701
[options="header"]
702702
|============
703703
| Default | Type | Dynamic
704-
| `password, passwd, pwd, secret, *key, *token*, *session*, *credit*, *card*, authorization, set-cookie` | List | true
704+
| `password, passwd, pwd, secret, *key, *token*, *session*, *credit*, *card*, *auth*, set-cookie` | List | true
705705
|============
706706

707707

@@ -2992,9 +2992,9 @@ The default unit for this option is `ms`.
29922992
#
29932993
# This setting can be changed at runtime
29942994
# Type: comma separated list
2995-
# Default value: password,passwd,pwd,secret,*key,*token*,*session*,*credit*,*card*,authorization,set-cookie
2995+
# Default value: password,passwd,pwd,secret,*key,*token*,*session*,*credit*,*card*,*auth*,set-cookie
29962996
#
2997-
# sanitize_field_names=password,passwd,pwd,secret,*key,*token*,*session*,*credit*,*card*,authorization,set-cookie
2997+
# sanitize_field_names=password,passwd,pwd,secret,*key,*token*,*session*,*credit*,*card*,*auth*,set-cookie
29982998
29992999
# A list of instrumentations which should be selectively enabled.
30003000
# Valid options are `annotations`, `apache-commons-exec`, `apache-httpclient`, `asynchttpclient`, `aws-lambda`, `cassandra`, `concurrent`, `dubbo`, `elasticsearch-restclient`, `exception-handler`, `executor`, `executor-collection`, `experimental`, `fork-join`, `grails`, `grpc`, `hibernate-search`, `http-client`, `javalin`, `jax-rs`, `jax-ws`, `jdbc`, `jdk-httpclient`, `jdk-httpserver`, `jedis`, `jms`, `jsf`, `kafka`, `lettuce`, `log4j1-ecs`, `log4j2-ecs`, `log4j2-error`, `logback-ecs`, `logging`, `micrometer`, `mongodb-client`, `okhttp`, `opentracing`, `process`, `public-api`, `quartz`, `rabbitmq`, `reactor`, `redis`, `redisson`, `render`, `scala-future`, `scheduled`, `servlet-api`, `servlet-api-async`, `servlet-api-dispatch`, `servlet-input-stream`, `slf4j-error`, `sparkjava`, `spring-amqp`, `spring-mvc`, `spring-resttemplate`, `spring-service-name`, `spring-view-render`, `spring-webflux`, `ssl-context`, `struts`, `timer-task`, `urlconnection`, `vertx`, `vertx-web`, `vertx-webclient`.

0 commit comments

Comments
 (0)