cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [3/4] cxf git commit: Remove default algorithm property
Date Fri, 16 Oct 2015 13:38:02 GMT
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/0975f60b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0975f60b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0975f60b

Branch: refs/heads/3.0.x-fixes
Commit: 0975f60b1d00c6a2d72d0df680494e5d7d84995f
Parents: 1beb90a
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Fri Oct 16 14:19:33 2015 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Fri Oct 16 14:37:49 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/0975f60b/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/0975f60b/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/0975f60b/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 e770b3f..f8e5d2e 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
@@ -232,7 +232,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/0975f60b/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">


Mime
View raw message