Remove default algorithm property
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9c4af77d Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9c4af77d Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9c4af77d Branch: refs/heads/master Commit: 9c4af77dba47a0cdaf4a5fb615b4ca3e8e965c03 Parents: 247dbcb Author: Colm O hEigeartaigh <[email protected]> Authored: Fri Oct 16 14:19:33 2015 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Fri Oct 16 14:34:01 2015 +0100 ---------------------------------------------------------------------- .../org/apache/cxf/rs/security/jose/common/JoseConstants.java | 1 - .../apache/cxf/rs/security/jose/common/KeyManagementUtils.java | 3 +-- .../apache/cxf/systest/jaxrs/security/jwt/JAXRSJweJwsTest.java | 1 - .../java/org/apache/cxf/systest/jaxrs/security/jwt/server.xml | 1 - 4 files changed, 1 insertion(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/9c4af77d/rt/rs/security/jose/jose-core/src/main/java/org/apache/cxf/rs/security/jose/common/JoseConstants.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/jose/jose-core/src/main/java/org/apache/cxf/rs/security/jose/common/JoseConstants.java b/rt/rs/security/jose/jose-core/src/main/java/org/apache/cxf/rs/security/jose/common/JoseConstants.java index 89dd079..5e46d86 100644 --- a/rt/rs/security/jose/jose-core/src/main/java/org/apache/cxf/rs/security/jose/common/JoseConstants.java +++ b/rt/rs/security/jose/jose-core/src/main/java/org/apache/cxf/rs/security/jose/common/JoseConstants.java @@ -94,7 +94,6 @@ public final class JoseConstants { /** * TODO documentation for these */ - public static final String RSSEC_DEFAULT_ALGORITHMS = "rs.security.default.algorithms"; public static final String RSSEC_REPORT_KEY_PROP = "rs.security.report.public.key"; public static final String RSSEC_REPORT_KEY_ID_PROP = "rs.security.report.public.key.id"; public static final String RSSEC_ACCEPT_PUBLIC_KEY_PROP = "rs.security.accept.public.key.properties"; http://git-wip-us.apache.org/repos/asf/cxf/blob/9c4af77d/rt/rs/security/jose/jose-core/src/main/java/org/apache/cxf/rs/security/jose/common/KeyManagementUtils.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/jose/jose-core/src/main/java/org/apache/cxf/rs/security/jose/common/KeyManagementUtils.java b/rt/rs/security/jose/jose-core/src/main/java/org/apache/cxf/rs/security/jose/common/KeyManagementUtils.java index 23370ef..e54356a 100644 --- a/rt/rs/security/jose/jose-core/src/main/java/org/apache/cxf/rs/security/jose/common/KeyManagementUtils.java +++ b/rt/rs/security/jose/jose-core/src/main/java/org/apache/cxf/rs/security/jose/common/KeyManagementUtils.java @@ -42,7 +42,6 @@ import java.util.logging.Logger; import org.apache.cxf.Bus; import org.apache.cxf.common.logging.LogUtils; -import org.apache.cxf.common.util.PropertyUtils; import org.apache.cxf.message.Message; import org.apache.cxf.message.MessageUtils; import org.apache.cxf.phase.PhaseInterceptorChain; @@ -283,7 +282,7 @@ public final class KeyManagementUtils { if (algo == null) { algo = (String)m.getContextualProperty(propName); } - if (algo == null && PropertyUtils.isTrue(m.getContextualProperty(JoseConstants.RSSEC_DEFAULT_ALGORITHMS))) { + if (algo == null) { algo = defaultAlg; } return algo; http://git-wip-us.apache.org/repos/asf/cxf/blob/9c4af77d/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/JAXRSJweJwsTest.java ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/JAXRSJweJwsTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/JAXRSJweJwsTest.java index 79f418e..90e6b53 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/JAXRSJweJwsTest.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/JAXRSJweJwsTest.java @@ -211,7 +211,6 @@ public class JAXRSJweJwsTest extends AbstractBusClientServerTestBase { WebClient.getConfig(bs).getRequestContext().put("rs.security.keystore.alias.jwe.out", "AliceCert"); WebClient.getConfig(bs).getRequestContext().put("rs.security.keystore.alias.jws.in", "AliceCert"); - WebClient.getConfig(bs).getRequestContext().put("rs.security.default.algorithms", "true"); String text = bs.echoText("book"); assertEquals("book", text); } http://git-wip-us.apache.org/repos/asf/cxf/blob/9c4af77d/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/server.xml ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/server.xml b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/server.xml index 3e5e1d3..5c1786d2 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/server.xml +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/server.xml @@ -114,7 +114,6 @@ under the License. <entry key="rs.security.keystore.alias.jws.in" value="BobCert"/> <entry key="rs.security.signature.key.password.provider" value-ref="keyPasswordProvider"/> <entry key="rs.security.decryption.key.password.provider" value-ref="keyPasswordProvider"/> - <entry key="rs.security.default.algorithms" value="true"/> </jaxrs:properties> </jaxrs:server> <jaxrs:server address="https://localhost:${testutil.ports.jaxrs-jwt}/jwejwsrsaCertInHeaders";>
