Author: coheigea
Date: Fri Jan 4 11:28:22 2013
New Revision: 1428795
URL: http://svn.apache.org/viewvc?rev=1428795&view=rev
Log:
Some minor WS-Security changes
Modified:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java
Modified:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java?rev=1428795&r1=1428794&r2=1428795&view=diff
==============================================================================
---
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java
(original)
+++
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java
Fri Jan 4 11:28:22 2013
@@ -59,7 +59,6 @@ public abstract class AbstractWSS4JInter
}
private Map<String, Object> properties = new ConcurrentHashMap<String,
Object>();
- private Map<String, Crypto> cryptoMap = new ConcurrentHashMap<String,
Crypto>();
private Set<String> before = new HashSet<String>();
private Set<String> after = new HashSet<String>();
private String phase;
@@ -218,48 +217,4 @@ public abstract class AbstractWSS4JInter
}
}
- // TODO Remove once we pick up WSS4J 1.6.8
- @Override
- protected Crypto loadCrypto(
- String cryptoPropertyFile,
- String cryptoPropertyRefId,
- RequestData requestData
- ) throws WSSecurityException {
- Object mc = requestData.getMsgContext();
- Crypto crypto = null;
-
- //
- // Try the Property Ref Id first
- //
- String refId = getString(cryptoPropertyRefId, mc);
- if (refId != null) {
- crypto = cryptoMap.get(refId);
- if (crypto == null) {
- Object obj = getProperty(mc, refId);
- if (obj instanceof Properties) {
- crypto = CryptoFactory.getInstance((Properties)obj);
- cryptoMap.put(refId, crypto);
- } else if (obj instanceof Crypto) {
- crypto = (Crypto)obj;
- cryptoMap.put(refId, crypto);
- }
- }
- }
-
- //
- // Now try loading the properties file
- //
- if (crypto == null) {
- String propFile = getString(cryptoPropertyFile, mc);
- if (propFile != null) {
- crypto = cryptoMap.get(propFile);
- if (crypto == null) {
- crypto = loadCryptoFromPropertiesFile(propFile,
requestData);
- cryptoMap.put(propFile, crypto);
- }
- }
- }
- return crypto;
- }
-
}
Modified:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java?rev=1428795&r1=1428794&r2=1428795&view=diff
==============================================================================
---
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
(original)
+++
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
Fri Jan 4 11:28:22 2013
@@ -162,12 +162,13 @@ public abstract class AbstractBindingBui
protected List<byte[]> signatures = new ArrayList<byte[]>();
- Element lastSupportingTokenElement;
- Element lastEncryptedKeyElement;
- Element lastDerivedKeyElement;
- Element bottomUpElement;
- Element topDownElement;
- Element bstElement;
+ protected Element bottomUpElement;
+ protected Element topDownElement;
+ protected Element bstElement;
+
+ private Element lastSupportingTokenElement;
+ private Element lastEncryptedKeyElement;
+ private Element lastDerivedKeyElement;
public AbstractBindingBuilder(
WSSConfig config,
@@ -397,7 +398,6 @@ public abstract class AbstractBindingBui
ttl = 300;
}
timestampEl = new WSSecTimestamp(wssConfig);
- timestampEl.setWsConfig(wssConfig);
timestampEl.setTimeToLive(ttl);
timestampEl.prepare(saaj.getSOAPPart());
for (AssertionInfo ai : ais) {
Modified:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java?rev=1428795&r1=1428794&r2=1428795&view=diff
==============================================================================
---
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java
(original)
+++
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java
Fri Jan 4 11:28:22 2013
@@ -725,7 +725,6 @@ public class SymmetricBindingHandler ext
return doSignatureDK(sigs, policyTokenWrapper, policyToken, tok,
included);
} else {
WSSecSignature sig = new WSSecSignature(wssConfig);
- sig.setWsConfig(wssConfig);
// If a EncryptedKeyToken is used, set the correct value type to
// be used in the wsse:Reference in ds:KeyInfo
int type = included ? WSConstants.CUSTOM_SYMM_SIGNING
