You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by bu...@apache.org on 2020/03/06 15:25:31 UTC
[cxf] branch master updated: cxf-systests-rs-security: include key
id
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new cdf7685 cxf-systests-rs-security: include key id
cdf7685 is described below
commit cdf7685cf7a7583ee076e97706d82d5271f582b1
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Fri Mar 6 18:24:20 2020 +0300
cxf-systests-rs-security: include key id
---
.../cxf/systest/jaxrs/security/oauth2/common/OAuth2TestUtils.java | 6 ++++++
.../jaxrs/security/oidc/filters/JwsSignatureVerifierProvider.java | 3 +++
.../apache/cxf/systest/jaxrs/security/oidc/filters/oidc-server.xml | 1 +
3 files changed, 10 insertions(+)
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/OAuth2TestUtils.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/OAuth2TestUtils.java
index 1c7edee..ce488b2 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/OAuth2TestUtils.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/OAuth2TestUtils.java
@@ -309,6 +309,12 @@ public final class OAuth2TestUtils {
return new HTTPConduitConfigurer() {
public void configure(String name, String address, HTTPConduit c) {
c.setTlsClientParameters(tlsCP);
+ // 5 mins for long debug session
+// org.apache.cxf.transports.http.configuration.HTTPClientPolicy httpClientPolicy =
+// new org.apache.cxf.transports.http.configuration.HTTPClientPolicy();
+// httpClientPolicy.setConnectionTimeout(300000L);
+// httpClientPolicy.setReceiveTimeout(300000L);
+// c.setClient(httpClientPolicy);
}
};
}
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/filters/JwsSignatureVerifierProvider.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/filters/JwsSignatureVerifierProvider.java
index b0b5e9b..787f55f 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/filters/JwsSignatureVerifierProvider.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/filters/JwsSignatureVerifierProvider.java
@@ -18,6 +18,8 @@
*/
package org.apache.cxf.systest.jaxrs.security.oidc.filters;
+import java.util.Objects;
+
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.rs.security.jose.jwk.JsonWebKey;
import org.apache.cxf.rs.security.jose.jwk.JsonWebKeys;
@@ -34,6 +36,7 @@ public class JwsSignatureVerifierProvider {
public JwsSignatureVerifier getJwsSignatureVerifier() {
for (JsonWebKey jwk : jwksClient.get(JsonWebKeys.class).getKeys()) {
+ Objects.requireNonNull(jwk.getKeyId());
return JwsUtils.getSignatureVerifier(jwk);
}
return null;
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/filters/oidc-server.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/filters/oidc-server.xml
index 4ddfe97..cc2ce76 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/filters/oidc-server.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/filters/oidc-server.xml
@@ -132,6 +132,7 @@ under the License.
<entry key="rs.security.key.password" value="password"/>
<entry key="rs.security.keystore.file" value="keys/alice.jks" />
<entry key="rs.security.signature.algorithm" value="RS256" />
+ <entry key="rs.security.signature.include.key.id" value="true" />
</jaxrs:properties>
</jaxrs:server>