[eucalyptus/f18] Fix missing import in wss4j patch
madsa
madsa at fedoraproject.org
Mon Oct 28 05:41:03 UTC 2013
commit c76308d3bb6af952668d48d5786c0872dee0bebd
Author: Matt Spaulding <mspaulding06 at gmail.com>
Date: Sat Oct 26 17:13:51 2013 -0700
Fix missing import in wss4j patch
eucalyptus-wss4j-support.patch | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/eucalyptus-wss4j-support.patch b/eucalyptus-wss4j-support.patch
index 0f38815..39d3794 100644
--- a/eucalyptus-wss4j-support.patch
+++ b/eucalyptus-wss4j-support.patch
@@ -10,16 +10,17 @@ Index: eucalyptus-3.3.2/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/uti
import java.util.Vector;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-@@ -79,7 +80,7 @@ import org.apache.ws.security.WSConstant
+@@ -79,7 +80,8 @@ import org.apache.ws.security.WSConstant
import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngineResult;
import org.apache.ws.security.WSSecurityException;
-import org.apache.ws.security.message.EnvelopeIdResolver;
+import org.apache.ws.security.handler.RequestData;
++import org.apache.ws.security.message.EnvelopeIdResolver;
import org.apache.ws.security.message.token.BinarySecurity;
import org.apache.ws.security.message.token.Reference;
import org.apache.ws.security.message.token.SecurityTokenReference;
-@@ -111,6 +112,7 @@ import com.eucalyptus.ws.WebServicesExce
+@@ -111,6 +113,7 @@ import com.eucalyptus.ws.WebServicesExce
public class WSSecurity {
private static Logger LOG = Logger.getLogger( WSSecurity.class );
private static CertificateFactory factory;
@@ -27,7 +28,7 @@ Index: eucalyptus-3.3.2/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/uti
private static final String SYSTEM_PROPERTY_SKIP_SECURITY_CHECK = "com.eucalyptus.crypto.util.skipWsSecurityConfigurationChecks";
static {
-@@ -120,9 +122,12 @@ public class WSSecurity {
+@@ -120,9 +123,12 @@ public class WSSecurity {
LOG.fatal("XML Security configuration not applied, set system property "+SYSTEM_PROPERTY_SKIP_SECURITY_CHECK+"=true to skip check");
throw new RuntimeException("XML Security Configuration not applied");
}
@@ -43,7 +44,7 @@ Index: eucalyptus-3.3.2/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/uti
}
public static void init() {
-@@ -166,12 +171,9 @@ public class WSSecurity {
+@@ -166,12 +172,9 @@ public class WSSecurity {
throws WSSecurityException, XMLSignatureException, XMLSecurityException {
final SecurityTokenReference secRef = WSSecurity.getSecurityTokenReference( sig.getKeyInfo( ) );
final Reference tokenRef = secRef.getReference( );
@@ -58,7 +59,7 @@ Index: eucalyptus-3.3.2/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/uti
}
BinarySecurity token = new BinarySecurity( bstDirect );
String type = token.getValueType( );
-@@ -276,15 +278,17 @@ public class WSSecurity {
+@@ -276,15 +279,17 @@ public class WSSecurity {
// can't call handleTimestamp() directly because
// the config will not be set in that case
// all null-params are not used by handleToken()
@@ -79,7 +80,7 @@ Index: eucalyptus-3.3.2/clc/modules/msgs/src/main/java/com/eucalyptus/crypto/uti
if(!SecurityContext.validateTimestampPeriod(expires)) {
LOG.warn("[security] ]Timestamp expiration is further in the future than replay cache expiration");
-@@ -338,12 +342,12 @@ public class WSSecurity {
+@@ -338,12 +343,12 @@ public class WSSecurity {
} catch ( XMLSecurityException e2 ) {
throw new WSSecurityException( WSSecurityException.FAILED_CHECK, "noXMLSig", null, e2 );
}
More information about the scm-commits
mailing list