Skip to content

Commit c8aa831

Browse files
committed
Sync documentation of main branch
1 parent 38d7798 commit c8aa831

File tree

5 files changed

+109
-8
lines changed

5 files changed

+109
-8
lines changed

_generated-doc/main/config/quarkus-all-config.adoc

Lines changed: 46 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17400,7 +17400,9 @@ If this is the string `common`, `combined` or `long` then this will use one of t
1740017400

1740117401
- common: `%h %l %u %t "%r" %s %b` - combined: `%h %l %u %t "%r" %s %b "%++{++i,Referer++}++" "%++{++i,User-Agent++}++"` - long: `%r++\++n%++{++ALL_REQUEST_HEADERS++}++`
1740217402

17403-
Otherwise, consult the Quarkus documentation for the full list of variables that can be used.
17403+
Otherwise, consult the Quarkus documentation for the full list of variables that can be used. Note that enabling the `%++{++ALL_REQUEST_HEADERS++}++` attribute directly or with a `long` named format introduces a risk of sensitive header values being logged.
17404+
17405+
HTTP `Authorization` header value is always masked. Use the `masked-headers()` property to mask other sensitive headers.
1740417406

1740517407

1740617408
ifdef::add-copy-button-to-env-var[]
@@ -17413,6 +17415,48 @@ endif::add-copy-button-to-env-var[]
1741317415
|string
1741417416
|`+++common+++`
1741517417

17418+
a| [[quarkus-vertx-http_quarkus-http-access-log-masked-headers]] [.property-path]##link:#quarkus-vertx-http_quarkus-http-access-log-masked-headers[`quarkus.http.access-log.masked-headers`]##
17419+
ifdef::add-copy-button-to-config-props[]
17420+
config_property_copy_button:+++quarkus.http.access-log.masked-headers+++[]
17421+
endif::add-copy-button-to-config-props[]
17422+
17423+
17424+
[.description]
17425+
--
17426+
Set of HTTP headers whose values must be masked when the `%++{++ALL_REQUEST_HEADERS++}++` attribute is enabled with the `pattern()` property.
17427+
17428+
17429+
ifdef::add-copy-button-to-env-var[]
17430+
Environment variable: env_var_with_copy_button:+++QUARKUS_HTTP_ACCESS_LOG_MASKED_HEADERS+++[]
17431+
endif::add-copy-button-to-env-var[]
17432+
ifndef::add-copy-button-to-env-var[]
17433+
Environment variable: `+++QUARKUS_HTTP_ACCESS_LOG_MASKED_HEADERS+++`
17434+
endif::add-copy-button-to-env-var[]
17435+
--
17436+
|list of string
17437+
|
17438+
17439+
a| [[quarkus-vertx-http_quarkus-http-access-log-masked-cookies]] [.property-path]##link:#quarkus-vertx-http_quarkus-http-access-log-masked-cookies[`quarkus.http.access-log.masked-cookies`]##
17440+
ifdef::add-copy-button-to-config-props[]
17441+
config_property_copy_button:+++quarkus.http.access-log.masked-cookies+++[]
17442+
endif::add-copy-button-to-config-props[]
17443+
17444+
17445+
[.description]
17446+
--
17447+
Set of HTTP Cookie headers whose values must be masked when the `%++{++ALL_REQUEST_HEADERS++}++` attribute is enabled with the `pattern()` property.
17448+
17449+
17450+
ifdef::add-copy-button-to-env-var[]
17451+
Environment variable: env_var_with_copy_button:+++QUARKUS_HTTP_ACCESS_LOG_MASKED_COOKIES+++[]
17452+
endif::add-copy-button-to-env-var[]
17453+
ifndef::add-copy-button-to-env-var[]
17454+
Environment variable: `+++QUARKUS_HTTP_ACCESS_LOG_MASKED_COOKIES+++`
17455+
endif::add-copy-button-to-env-var[]
17456+
--
17457+
|list of string
17458+
|
17459+
1741617460
a| [[quarkus-vertx-http_quarkus-http-access-log-log-to-file]] [.property-path]##link:#quarkus-vertx-http_quarkus-http-access-log-log-to-file[`quarkus.http.access-log.log-to-file`]##
1741717461
ifdef::add-copy-button-to-config-props[]
1741817462
config_property_copy_button:+++quarkus.http.access-log.log-to-file+++[]
@@ -86830,7 +86874,7 @@ Environment variable: `+++QUARKUS_REST_CLIENT__CLIENT__DISABLE_DEFAULT_MAPPER+++
8683086874
endif::add-copy-button-to-env-var[]
8683186875
--
8683286876
|boolean
86833-
|`+++${microprofile.rest.client.disable.default.mapper:false}+++`
86877+
|`+++false+++`
8683486878

8683586879
a| [[quarkus-rest-client-config_quarkus-rest-client-client-logging-scope]] [.property-path]##link:#quarkus-rest-client-config_quarkus-rest-client-client-logging-scope[`quarkus.rest-client."client".logging.scope`]##
8683686880
ifdef::add-copy-button-to-config-props[]

_generated-doc/main/config/quarkus-rest-client-config.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1818,7 +1818,7 @@ Environment variable: `+++QUARKUS_REST_CLIENT__CLIENT__DISABLE_DEFAULT_MAPPER+++
18181818
endif::add-copy-button-to-env-var[]
18191819
--
18201820
|boolean
1821-
|`+++${microprofile.rest.client.disable.default.mapper:false}+++`
1821+
|`+++false+++`
18221822

18231823
a| [[quarkus-rest-client-config_quarkus-rest-client-client-logging-scope]] [.property-path]##link:#quarkus-rest-client-config_quarkus-rest-client-client-logging-scope[`quarkus.rest-client."client".logging.scope`]##
18241824
ifdef::add-copy-button-to-config-props[]

_generated-doc/main/config/quarkus-rest-client-config_quarkus.rest-client.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1818,7 +1818,7 @@ Environment variable: `+++QUARKUS_REST_CLIENT__CLIENT__DISABLE_DEFAULT_MAPPER+++
18181818
endif::add-copy-button-to-env-var[]
18191819
--
18201820
|boolean
1821-
|`+++${microprofile.rest.client.disable.default.mapper:false}+++`
1821+
|`+++false+++`
18221822

18231823
a| [[quarkus-rest-client-config_quarkus-rest-client-client-logging-scope]] [.property-path]##link:#quarkus-rest-client-config_quarkus-rest-client-client-logging-scope[`quarkus.rest-client."client".logging.scope`]##
18241824
ifdef::add-copy-button-to-config-props[]

_generated-doc/main/config/quarkus-vertx-http_quarkus.http.access-log.adoc

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,9 @@ If this is the string `common`, `combined` or `long` then this will use one of t
6363

6464
- common: `%h %l %u %t "%r" %s %b` - combined: `%h %l %u %t "%r" %s %b "%++{++i,Referer++}++" "%++{++i,User-Agent++}++"` - long: `%r++\++n%++{++ALL_REQUEST_HEADERS++}++`
6565
66-
Otherwise, consult the Quarkus documentation for the full list of variables that can be used.
66+
Otherwise, consult the Quarkus documentation for the full list of variables that can be used. Note that enabling the `%++{++ALL_REQUEST_HEADERS++}++` attribute directly or with a `long` named format introduces a risk of sensitive header values being logged.
67+
68+
HTTP `Authorization` header value is always masked. Use the `masked-headers()` property to mask other sensitive headers.
6769

6870

6971
ifdef::add-copy-button-to-env-var[]
@@ -76,6 +78,48 @@ endif::add-copy-button-to-env-var[]
7678
|string
7779
|`+++common+++`
7880

81+
a| [[quarkus-vertx-http_quarkus-http-access-log_quarkus-http-access-log-masked-headers]] [.property-path]##link:#quarkus-vertx-http_quarkus-http-access-log_quarkus-http-access-log-masked-headers[`quarkus.http.access-log.masked-headers`]##
82+
ifdef::add-copy-button-to-config-props[]
83+
config_property_copy_button:+++quarkus.http.access-log.masked-headers+++[]
84+
endif::add-copy-button-to-config-props[]
85+
86+
87+
[.description]
88+
--
89+
Set of HTTP headers whose values must be masked when the `%++{++ALL_REQUEST_HEADERS++}++` attribute is enabled with the `pattern()` property.
90+
91+
92+
ifdef::add-copy-button-to-env-var[]
93+
Environment variable: env_var_with_copy_button:+++QUARKUS_HTTP_ACCESS_LOG_MASKED_HEADERS+++[]
94+
endif::add-copy-button-to-env-var[]
95+
ifndef::add-copy-button-to-env-var[]
96+
Environment variable: `+++QUARKUS_HTTP_ACCESS_LOG_MASKED_HEADERS+++`
97+
endif::add-copy-button-to-env-var[]
98+
--
99+
|list of string
100+
|
101+
102+
a| [[quarkus-vertx-http_quarkus-http-access-log_quarkus-http-access-log-masked-cookies]] [.property-path]##link:#quarkus-vertx-http_quarkus-http-access-log_quarkus-http-access-log-masked-cookies[`quarkus.http.access-log.masked-cookies`]##
103+
ifdef::add-copy-button-to-config-props[]
104+
config_property_copy_button:+++quarkus.http.access-log.masked-cookies+++[]
105+
endif::add-copy-button-to-config-props[]
106+
107+
108+
[.description]
109+
--
110+
Set of HTTP Cookie headers whose values must be masked when the `%++{++ALL_REQUEST_HEADERS++}++` attribute is enabled with the `pattern()` property.
111+
112+
113+
ifdef::add-copy-button-to-env-var[]
114+
Environment variable: env_var_with_copy_button:+++QUARKUS_HTTP_ACCESS_LOG_MASKED_COOKIES+++[]
115+
endif::add-copy-button-to-env-var[]
116+
ifndef::add-copy-button-to-env-var[]
117+
Environment variable: `+++QUARKUS_HTTP_ACCESS_LOG_MASKED_COOKIES+++`
118+
endif::add-copy-button-to-env-var[]
119+
--
120+
|list of string
121+
|
122+
79123
a| [[quarkus-vertx-http_quarkus-http-access-log_quarkus-http-access-log-log-to-file]] [.property-path]##link:#quarkus-vertx-http_quarkus-http-access-log_quarkus-http-access-log-log-to-file[`quarkus.http.access-log.log-to-file`]##
80124
ifdef::add-copy-button-to-config-props[]
81125
config_property_copy_button:+++quarkus.http.access-log.log-to-file+++[]

_versions/main/guides/security-oidc-bearer-token-authentication.adoc

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1706,10 +1706,13 @@ Or, if you need more flexibility, write a <<jose4j-validator-bearer>>:
17061706
----
17071707
package io.quarkus.it.oidc;
17081708
1709+
import java.util.Collections;
1710+
import java.util.List;
17091711
import java.util.Map;
17101712
17111713
import jakarta.enterprise.context.ApplicationScoped;
17121714
1715+
import org.eclipse.microprofile.jwt.Claims;
17131716
import org.jose4j.jwt.MalformedClaimException;
17141717
import org.jose4j.jwt.consumer.JwtContext;
17151718
import org.jose4j.jwt.consumer.Validator;
@@ -1727,9 +1730,19 @@ public class AcrValueValidator implements Validator {
17271730
@Override
17281731
public String validate(JwtContext jwtContext) throws MalformedClaimException {
17291732
var jwtClaims = jwtContext.getJwtClaims();
1730-
if (jwtClaims.hasClaim("acr")) {
1731-
var acrClaim = jwtClaims.getStringListClaimValue("acr");
1732-
if (acrClaim.contains("myACR") && acrClaim.contains("yourACR")) {
1733+
var acrClaimName = Claims.acr.name();
1734+
1735+
if (jwtClaims.hasClaim(acrClaimName)) {
1736+
// The claim 'acr' could be a String or a list
1737+
List<String> acrClaimValues;
1738+
if (jwtClaims.isClaimValueStringList(acrClaimName)) {
1739+
acrClaimValues = jwtClaims.getStringListClaimValue(acrClaimName);
1740+
} else if (jwtClaims.isClaimValueString(acrClaimName)) {
1741+
acrClaimValues = List.of(jwtClaims.getStringClaimValue(acrClaimName));
1742+
} else {
1743+
throw new MalformedClaimException("Claim '" + acrClaimName + "' is not a String or List of Strings.");
1744+
}
1745+
if (acrClaimValues.contains("myACR") && acrClaimValues.contains("yourACR")) {
17331746
return null;
17341747
}
17351748
}

0 commit comments

Comments
 (0)