Fixes on 2.6.x
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c49437d8 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c49437d8 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c49437d8 Branch: refs/heads/2.6.x-fixes Commit: c49437d8981b646524a5e626b1569191fbf46e6f Parents: 5408d13 Author: Colm O hEigeartaigh <[email protected]> Authored: Mon May 26 17:24:14 2014 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Mon May 26 17:24:14 2014 +0100 ---------------------------------------------------------------------- .../policy/interceptors/NegotiationUtils.java | 9 ---- .../cxf/ws/security/wss4j/WSS4JUtils.java | 50 -------------------- 2 files changed, 59 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/c49437d8/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/NegotiationUtils.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/NegotiationUtils.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/NegotiationUtils.java index 2ca43fa..f48ac5b 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/NegotiationUtils.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/NegotiationUtils.java @@ -110,22 +110,13 @@ public final class NegotiationUtils { if (create && tokenStore == null) { TokenStoreFactory tokenStoreFactory = TokenStoreFactory.newInstance(); String cacheKey = SecurityConstants.TOKEN_STORE_CACHE_INSTANCE; -<<<<<<< HEAD if (info.getName() != null) { - cacheKey += "-" + info.getName().toString(); -======= - String cacheIdentifier = - (String)message.getContextualProperty(SecurityConstants.CACHE_IDENTIFIER); - if (cacheIdentifier != null) { - cacheKey += "-" + cacheIdentifier; - } else if (info.getName() != null) { int hashcode = info.getName().toString().hashCode(); if (hashcode < 0) { cacheKey += hashcode; } else { cacheKey += "-" + hashcode; } ->>>>>>> 0fe383e... Fix for CXF-5766 on 2.7.x } tokenStore = tokenStoreFactory.newTokenStore(cacheKey, message); info.setProperty(SecurityConstants.TOKEN_STORE_CACHE_INSTANCE, tokenStore); http://git-wip-us.apache.org/repos/asf/cxf/blob/c49437d8/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java index bc7f642..603497c 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java @@ -111,56 +111,6 @@ public final class WSS4JUtils { } /** -<<<<<<< HEAD -======= - * Fetch the result of a given action from a given result list. - * - * @param resultList The result list to fetch an action from - * @param action The action to fetch - * @return The result fetched from the result list, null if the result - * could not be found - */ - public static List<WSSecurityEngineResult> fetchAllActionResults( - List<WSSecurityEngineResult> resultList, - int action - ) { - return fetchAllActionResults(resultList, Collections.singletonList(action)); - } - - /** - * Fetch the results of a given number of actions action from a given result list. - * - * @param resultList The result list to fetch an action from - * @param actions The list of actions to fetch - * @return The list of matching results fetched from the result list - */ - public static List<WSSecurityEngineResult> fetchAllActionResults( - List<WSSecurityEngineResult> resultList, - List<Integer> actions - ) { - List<WSSecurityEngineResult> actionResultList = Collections.emptyList(); - if (actions == null || actions.isEmpty()) { - return actionResultList; - } - - for (WSSecurityEngineResult result : resultList) { - // - // Check the result of every action whether it matches the given action - // - int resultAction = - ((java.lang.Integer)result.get(WSSecurityEngineResult.TAG_ACTION)).intValue(); - if (actions.contains(resultAction)) { - if (actionResultList.isEmpty()) { - actionResultList = new ArrayList<WSSecurityEngineResult>(); - } - actionResultList.add(result); - } - } - return actionResultList; - } - - /** ->>>>>>> 49a9e00... [CXF-5766] - Caching nonces to disk may not work if the service QName is too long * Map a WSSecurityException FaultCode to a standard error String, so as not to leak * internal configuration to an attacker. */
