Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/DecryptInputProcessor.java URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/DecryptInputProcessor.java?rev=1210233&r1=1210232&r2=1210233&view=diff ============================================================================== --- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/DecryptInputProcessor.java (original) +++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/DecryptInputProcessor.java Sun Dec 4 21:40:55 2011 @@ -58,12 +58,12 @@ public class DecryptInputProcessor exten && ((WSSDocumentContext) inputProcessorChain.getDocumentContext()).isInSOAPBody()) { //soap:body content encryption counts as EncryptedPart EncryptedPartSecurityEvent encryptedPartSecurityEvent = - new EncryptedPartSecurityEvent(SecurityEvent.Event.EncryptedPart, false); + new EncryptedPartSecurityEvent(SecurityEvent.Event.EncryptedPart, true); encryptedPartSecurityEvent.setElement(parentElement); ((WSSecurityContext) inputProcessorChain.getSecurityContext()).registerSecurityEvent(encryptedPartSecurityEvent); } else { ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent = - new ContentEncryptedElementSecurityEvent(SecurityEvent.Event.ContentEncrypted, false); + new ContentEncryptedElementSecurityEvent(SecurityEvent.Event.ContentEncrypted, true); contentEncryptedElementSecurityEvent.setElement(parentElement); ((WSSecurityContext) inputProcessorChain.getSecurityContext()).registerSecurityEvent(contentEncryptedElementSecurityEvent); } @@ -115,12 +115,12 @@ public class DecryptInputProcessor exten if (inputProcessorChain.getDocumentContext().getDocumentLevel() == 3 && ((WSSDocumentContext) inputProcessorChain.getDocumentContext()).isInSOAPHeader()) { EncryptedPartSecurityEvent encryptedPartSecurityEvent = - new EncryptedPartSecurityEvent(SecurityEvent.Event.EncryptedPart, false); + new EncryptedPartSecurityEvent(SecurityEvent.Event.EncryptedPart, true); encryptedPartSecurityEvent.setElement(xmlEvent.asStartElement().getName()); ((WSSecurityContext) inputProcessorChain.getSecurityContext()).registerSecurityEvent(encryptedPartSecurityEvent); } else { EncryptedElementSecurityEvent encryptedElementSecurityEvent = - new EncryptedElementSecurityEvent(SecurityEvent.Event.EncryptedElement, false); + new EncryptedElementSecurityEvent(SecurityEvent.Event.EncryptedElement, true); encryptedElementSecurityEvent.setElement(xmlEvent.asStartElement().getName()); ((WSSecurityContext) inputProcessorChain.getSecurityContext()).registerSecurityEvent(encryptedElementSecurityEvent); }
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/DerivedKeyTokenInputHandler.java URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/DerivedKeyTokenInputHandler.java?rev=1210233&r1=1210232&r2=1210233&view=diff ============================================================================== --- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/DerivedKeyTokenInputHandler.java (original) +++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/DerivedKeyTokenInputHandler.java Sun Dec 4 21:40:55 2011 @@ -124,8 +124,7 @@ public class DerivedKeyTokenInputHandler } public SecurityToken getKeyWrappingToken() { - //todo? - return null; + return referencedSecurityToken; } public String getKeyWrappingTokenAlgorithm() { Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/EncryptedKeyInputHandler.java URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/EncryptedKeyInputHandler.java?rev=1210233&r1=1210232&r2=1210233&view=diff ============================================================================== --- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/EncryptedKeyInputHandler.java (original) +++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/EncryptedKeyInputHandler.java Sun Dec 4 21:40:55 2011 @@ -23,14 +23,10 @@ import org.swssf.binding.wss10.Reference import org.swssf.binding.wss10.SecurityTokenReferenceType; import org.swssf.binding.xmldsig.KeyInfoType; import org.swssf.binding.xmlenc.EncryptedKeyType; -import org.swssf.wss.ext.WSSConstants; -import org.swssf.wss.ext.WSSSecurityProperties; -import org.swssf.wss.ext.WSSecurityContext; -import org.swssf.wss.ext.WSSecurityException; +import org.swssf.wss.ext.*; import org.swssf.wss.impl.securityToken.AbstractAlgorithmSuiteSecurityEventFiringSecurityToken; import org.swssf.wss.impl.securityToken.SecurityTokenFactoryImpl; -import org.swssf.wss.securityEvent.EncryptionTokenSecurityEvent; -import org.swssf.wss.securityEvent.SecurityEvent; +import org.swssf.wss.securityEvent.TokenSecurityEvent; import org.swssf.xmlsec.config.JCEAlgorithmMapper; import org.swssf.xmlsec.crypto.Crypto; import org.swssf.xmlsec.ext.*; @@ -166,12 +162,12 @@ public class EncryptedKeyInputHandler ex }; final SecurityToken securityToken = securityTokenProvider.getSecurityToken(securityProperties.getDecryptionCrypto()); - //fire a RecipientSecurityTokenEvent - EncryptionTokenSecurityEvent encryptionTokenSecurityEvent = - new EncryptionTokenSecurityEvent(SecurityEvent.Event.EncryptionToken); - encryptionTokenSecurityEvent.setSecurityToken(securityToken.getKeyWrappingToken()); - ((WSSecurityContext) inputProcessorChain.getSecurityContext()).registerSecurityEvent(encryptionTokenSecurityEvent); + //fire a RecipientSecurityTokenEvent + TokenSecurityEvent tokenSecurityEvent = WSSUtils.createTokenSecurityEvent(securityToken); + //todo: is this always the main encryption? + tokenSecurityEvent.setTokenUsage(TokenSecurityEvent.TokenUsage.Encryption); + ((WSSecurityContext) inputProcessorChain.getSecurityContext()).registerSecurityEvent(tokenSecurityEvent); //register the key token for decryption: inputProcessorChain.getSecurityContext().registerSecurityTokenProvider(encryptedKeyType.getId(), securityTokenProvider); Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/SecurityContextTokenInputHandler.java URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/SecurityContextTokenInputHandler.java?rev=1210233&r1=1210232&r2=1210233&view=diff ============================================================================== --- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/SecurityContextTokenInputHandler.java (original) +++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/SecurityContextTokenInputHandler.java Sun Dec 4 21:40:55 2011 @@ -88,7 +88,7 @@ public class SecurityContextTokenInputHa public WSSConstants.TokenType getTokenType() { //todo and set externalUriRef - return null; + return WSSConstants.SecurityContextToken; } }; Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/SignatureInputHandler.java URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/SignatureInputHandler.java?rev=1210233&r1=1210232&r2=1210233&view=diff ============================================================================== --- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/SignatureInputHandler.java (original) +++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/SignatureInputHandler.java Sun Dec 4 21:40:55 2011 @@ -20,10 +20,12 @@ package org.swssf.wss.impl.processor.inp import org.swssf.binding.xmldsig.SignatureType; import org.swssf.wss.ext.WSSConstants; +import org.swssf.wss.ext.WSSUtils; import org.swssf.wss.ext.WSSecurityContext; import org.swssf.wss.securityEvent.AlgorithmSuiteSecurityEvent; import org.swssf.wss.securityEvent.SecurityEvent; -import org.swssf.wss.securityEvent.SignatureTokenSecurityEvent; +import org.swssf.wss.securityEvent.SignatureValueSecurityEvent; +import org.swssf.wss.securityEvent.TokenSecurityEvent; import org.swssf.xmlsec.ext.InputProcessorChain; import org.swssf.xmlsec.ext.SecurityToken; import org.swssf.xmlsec.ext.XMLSecurityException; @@ -66,11 +68,16 @@ public class SignatureInputHandler exten final WSSecurityContext securityContext = (WSSecurityContext) inputProcessorChain.getSecurityContext(); SignatureVerifier signatureVerifier = new SignatureVerifier(signatureType, inputProcessorChain.getSecurityContext(), securityProperties) { @Override - protected void createSignatureAlgorithm(SecurityToken securityToken) throws NoSuchAlgorithmException, NoSuchProviderException, InvalidKeyException, CertificateException, XMLSecurityException { - SignatureTokenSecurityEvent signatureTokenSecurityEvent = new SignatureTokenSecurityEvent(SecurityEvent.Event.SignatureToken); - signatureTokenSecurityEvent.setSecurityToken(securityToken); - signatureTokenSecurityEvent.setSignatureValue(signatureType.getSignatureValue().getValue()); - securityContext.registerSecurityEvent(signatureTokenSecurityEvent); + protected void createSignatureAlgorithm(SecurityToken securityToken) + throws NoSuchAlgorithmException, NoSuchProviderException, InvalidKeyException, CertificateException, XMLSecurityException { + TokenSecurityEvent tokenSecurityEvent = WSSUtils.createTokenSecurityEvent(securityToken); + //todo: is this always the main signature? + tokenSecurityEvent.setTokenUsage(TokenSecurityEvent.TokenUsage.Signature); + securityContext.registerSecurityEvent(tokenSecurityEvent); + + SignatureValueSecurityEvent signatureValueSecurityEvent = new SignatureValueSecurityEvent(SecurityEvent.Event.SignatureValue); + signatureValueSecurityEvent.setSignatureValue(signatureType.getSignatureValue().getValue()); + securityContext.registerSecurityEvent(signatureValueSecurityEvent); AlgorithmSuiteSecurityEvent algorithmSuiteSecurityEvent = new AlgorithmSuiteSecurityEvent(SecurityEvent.Event.AlgorithmSuite); algorithmSuiteSecurityEvent.setAlgorithmURI(signatureType.getSignedInfo().getCanonicalizationMethod().getAlgorithm()); Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/SignatureReferenceVerifyInputProcessor.java URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/SignatureReferenceVerifyInputProcessor.java?rev=1210233&r1=1210232&r2=1210233&view=diff ============================================================================== --- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/SignatureReferenceVerifyInputProcessor.java (original) +++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/SignatureReferenceVerifyInputProcessor.java Sun Dec 4 21:40:55 2011 @@ -99,11 +99,11 @@ public class SignatureReferenceVerifyInp //fire a SecurityEvent: if (inputProcessorChain.getDocumentContext().getDocumentLevel() == 3 && ((WSSDocumentContext) inputProcessorChain.getDocumentContext()).isInSOAPHeader()) { - SignedPartSecurityEvent signedPartSecurityEvent = new SignedPartSecurityEvent(SecurityEvent.Event.SignedPart, false); + SignedPartSecurityEvent signedPartSecurityEvent = new SignedPartSecurityEvent(SecurityEvent.Event.SignedPart, true); signedPartSecurityEvent.setElement(startElement.getName()); ((WSSecurityContext) inputProcessorChain.getSecurityContext()).registerSecurityEvent(signedPartSecurityEvent); } else { - SignedElementSecurityEvent signedElementSecurityEvent = new SignedElementSecurityEvent(SecurityEvent.Event.SignedElement, false); + SignedElementSecurityEvent signedElementSecurityEvent = new SignedElementSecurityEvent(SecurityEvent.Event.SignedElement, true); signedElementSecurityEvent.setElement(startElement.getName()); ((WSSecurityContext) inputProcessorChain.getSecurityContext()).registerSecurityEvent(signedElementSecurityEvent); } Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/BinarySecurityTokenOutputProcessor.java URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/BinarySecurityTokenOutputProcessor.java?rev=1210233&r1=1210232&r2=1210233&view=diff ============================================================================== --- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/BinarySecurityTokenOutputProcessor.java (original) +++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/BinarySecurityTokenOutputProcessor.java Sun Dec 4 21:40:55 2011 @@ -19,11 +19,9 @@ package org.swssf.wss.impl.processor.output; import org.swssf.wss.ext.*; -import org.swssf.wss.impl.securityToken.DelegatingSecurityToken; import org.swssf.wss.impl.securityToken.ProcessorInfoSecurityToken; -import org.swssf.wss.impl.securityToken.X509SecurityToken; import org.swssf.wss.securityEvent.SecurityEvent; -import org.swssf.wss.securityEvent.SignatureTokenSecurityEvent; +import org.swssf.wss.securityEvent.TokenSecurityEvent; import org.swssf.xmlsec.crypto.Crypto; import org.swssf.xmlsec.ext.*; @@ -200,15 +198,14 @@ public class BinarySecurityTokenOutputPr for (int i = 0; i < securityEventList.size(); i++) { SecurityEvent securityEvent = securityEventList.get(i); //todo find correct message signature token...however... - if (securityEvent.getSecurityEventType() == SecurityEvent.Event.SignatureToken) { - SignatureTokenSecurityEvent signatureTokenSecurityEvent = (SignatureTokenSecurityEvent) securityEvent; - SecurityToken securityToken = signatureTokenSecurityEvent.getSecurityToken(); - if (securityToken instanceof DelegatingSecurityToken) { - securityToken = ((DelegatingSecurityToken) securityToken).getDelegatedSecurityToken(); + if (securityEvent instanceof TokenSecurityEvent) { + TokenSecurityEvent tokenSecurityEvent = (TokenSecurityEvent) securityEvent; + if (tokenSecurityEvent.getTokenUsage() != TokenSecurityEvent.TokenUsage.Signature) { + continue; } - if (securityToken instanceof X509SecurityToken) { - X509SecurityToken x509SecurityToken = (X509SecurityToken) securityToken; - return x509SecurityToken.getX509Certificates()[0]; + X509Certificate[] x509Certificates = tokenSecurityEvent.getSecurityToken().getX509Certificates(); + if (x509Certificates != null && x509Certificates.length > 0) { + return x509Certificates[0]; } } } Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/SignatureConfirmationOutputProcessor.java URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/SignatureConfirmationOutputProcessor.java?rev=1210233&r1=1210232&r2=1210233&view=diff ============================================================================== --- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/SignatureConfirmationOutputProcessor.java (original) +++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/SignatureConfirmationOutputProcessor.java Sun Dec 4 21:40:55 2011 @@ -23,7 +23,7 @@ import org.swssf.wss.ext.WSSConstants; import org.swssf.wss.ext.WSSDocumentContext; import org.swssf.wss.ext.WSSSecurityProperties; import org.swssf.wss.securityEvent.SecurityEvent; -import org.swssf.wss.securityEvent.SignatureTokenSecurityEvent; +import org.swssf.wss.securityEvent.SignatureValueSecurityEvent; import org.swssf.xmlsec.ext.AbstractOutputProcessor; import org.swssf.xmlsec.ext.OutputProcessorChain; import org.swssf.xmlsec.ext.XMLSecurityConstants; @@ -63,9 +63,9 @@ public class SignatureConfirmationOutput List<SecurityEvent> requestSecurityEvents = outputProcessorChain.getSecurityContext().getAsList(SecurityEvent.class); for (int i = 0; i < requestSecurityEvents.size(); i++) { SecurityEvent securityEvent = requestSecurityEvents.get(i); - if (securityEvent.getSecurityEventType() == SecurityEvent.Event.SignatureToken) { + if (securityEvent.getSecurityEventType() == SecurityEvent.Event.SignatureValue) { aSignatureFound = true; - SignatureTokenSecurityEvent signatureTokenSecurityEvent = (SignatureTokenSecurityEvent) securityEvent; + SignatureValueSecurityEvent signatureTokenSecurityEvent = (SignatureValueSecurityEvent) securityEvent; Map<QName, String> attributes = new HashMap<QName, String>(); attributes.put(WSSConstants.ATT_wsu_Id, "SigConf-" + UUID.randomUUID().toString()); Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/UsernameSecurityToken.java URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/UsernameSecurityToken.java?rev=1210233&r1=1210232&r2=1210233&view=diff ============================================================================== --- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/UsernameSecurityToken.java (original) +++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/UsernameSecurityToken.java Sun Dec 4 21:40:55 2011 @@ -242,6 +242,6 @@ public class UsernameSecurityToken exten } public WSSConstants.TokenType getTokenType() { - return null; + return WSSConstants.UsernameToken; } } Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/X509SecurityToken.java URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/X509SecurityToken.java?rev=1210233&r1=1210232&r2=1210233&view=diff ============================================================================== --- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/X509SecurityToken.java (original) +++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/X509SecurityToken.java Sun Dec 4 21:40:55 2011 @@ -37,7 +37,7 @@ public abstract class X509SecurityToken private X509Certificate[] x509Certificates = null; private XMLSecurityConstants.TokenType tokenType; - X509SecurityToken(XMLSecurityConstants.TokenType tokenType, SecurityContext securityContext, Crypto crypto, CallbackHandler callbackHandler, String id, Object processor) { + protected X509SecurityToken(XMLSecurityConstants.TokenType tokenType, SecurityContext securityContext, Crypto crypto, CallbackHandler callbackHandler, String id, Object processor) { super(securityContext, crypto, callbackHandler, id, processor); this.tokenType = tokenType; } Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/ContentEncryptedElementSecurityEvent.java URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/ContentEncryptedElementSecurityEvent.java?rev=1210233&r1=1210232&r2=1210233&view=diff ============================================================================== --- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/ContentEncryptedElementSecurityEvent.java (original) +++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/ContentEncryptedElementSecurityEvent.java Sun Dec 4 21:40:55 2011 @@ -28,11 +28,11 @@ public class ContentEncryptedElementSecu //todo xpath or something unique private QName element; //this contents parent element - private boolean notEncrypted; //if true this element is not encrypted. + private boolean encrypted; //if true this element is not encrypted. - public ContentEncryptedElementSecurityEvent(Event securityEventType, boolean notEncrypted) { + public ContentEncryptedElementSecurityEvent(Event securityEventType, boolean encrypted) { super(securityEventType); - this.notEncrypted = notEncrypted; + this.encrypted = encrypted; } public QName getElement() { @@ -43,11 +43,11 @@ public class ContentEncryptedElementSecu this.element = element; } - public boolean isNotEncrypted() { - return notEncrypted; + public boolean isEncrypted() { + return encrypted; } - public void setNotEncrypted(boolean notEncrypted) { - this.notEncrypted = notEncrypted; + public void setEncrypted(boolean encrypted) { + this.encrypted = encrypted; } } Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/EncryptedElementSecurityEvent.java URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/EncryptedElementSecurityEvent.java?rev=1210233&r1=1210232&r2=1210233&view=diff ============================================================================== --- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/EncryptedElementSecurityEvent.java (original) +++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/EncryptedElementSecurityEvent.java Sun Dec 4 21:40:55 2011 @@ -28,11 +28,11 @@ public class EncryptedElementSecurityEve //todo xpath or something unique private QName element; - private boolean notEncrypted; //if true this element is not encrypted. + private boolean encrypted; //if true this element is not encrypted. - public EncryptedElementSecurityEvent(Event securityEventType, boolean notEncrypted) { + public EncryptedElementSecurityEvent(Event securityEventType, boolean encrypted) { super(securityEventType); - this.notEncrypted = notEncrypted; + this.encrypted = encrypted; } public QName getElement() { @@ -43,11 +43,11 @@ public class EncryptedElementSecurityEve this.element = element; } - public boolean isNotEncrypted() { - return notEncrypted; + public boolean isEncrypted() { + return encrypted; } - public void setNotEncrypted(boolean notEncrypted) { - this.notEncrypted = notEncrypted; + public void setEncrypted(boolean encrypted) { + this.encrypted = encrypted; } } Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/EncryptedPartSecurityEvent.java URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/EncryptedPartSecurityEvent.java?rev=1210233&r1=1210232&r2=1210233&view=diff ============================================================================== --- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/EncryptedPartSecurityEvent.java (original) +++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/EncryptedPartSecurityEvent.java Sun Dec 4 21:40:55 2011 @@ -28,11 +28,11 @@ public class EncryptedPartSecurityEvent //todo xpath or something unique private QName element; - private boolean notEncrypted; //if true this element is not encrypted. + private boolean encrypted; //if true this element is not encrypted. - public EncryptedPartSecurityEvent(Event securityEventType, boolean notEncrypted) { + public EncryptedPartSecurityEvent(Event securityEventType, boolean encrypted) { super(securityEventType); - this.notEncrypted = notEncrypted; + this.encrypted = encrypted; } public QName getElement() { @@ -43,11 +43,11 @@ public class EncryptedPartSecurityEvent this.element = element; } - public boolean isNotEncrypted() { - return notEncrypted; + public boolean isEncrypted() { + return encrypted; } - public void setNotEncrypted(boolean notEncrypted) { - this.notEncrypted = notEncrypted; + public void setEncrypted(boolean encrypted) { + this.encrypted = encrypted; } } Copied: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/KerberosTokenSecurityEvent.java (from r1207047, webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/IssuedTokenSecurityEvent.java) URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/KerberosTokenSecurityEvent.java?p2=webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/KerberosTokenSecurityEvent.java&p1=webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/IssuedTokenSecurityEvent.java&r1=1207047&r2=1210233&rev=1210233&view=diff ============================================================================== --- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/IssuedTokenSecurityEvent.java (original) +++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/KerberosTokenSecurityEvent.java Sun Dec 4 21:40:55 2011 @@ -22,25 +22,14 @@ package org.swssf.wss.securityEvent; * @author $Author$ * @version $Revision$ $Date$ */ -public class IssuedTokenSecurityEvent extends TokenSecurityEvent { +public class KerberosTokenSecurityEvent extends TokenSecurityEvent { - //todo Use this event. Per spec this could also be a SamlTokenSecurityEvent or a SecurityContextToken - - private boolean internalReference; private String issuerName; - public IssuedTokenSecurityEvent(Event securityEventType) { + public KerberosTokenSecurityEvent(Event securityEventType) { super(securityEventType); } - public boolean isInternalReference() { - return internalReference; - } - - public void setInternalReference(boolean internalReference) { - this.internalReference = internalReference; - } - public String getIssuerName() { return issuerName; } Copied: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/KeyValueTokenSecurityEvent.java (from r1207047, webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/IssuedTokenSecurityEvent.java) URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/KeyValueTokenSecurityEvent.java?p2=webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/KeyValueTokenSecurityEvent.java&p1=webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/IssuedTokenSecurityEvent.java&r1=1207047&r2=1210233&rev=1210233&view=diff ============================================================================== --- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/IssuedTokenSecurityEvent.java (original) +++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/KeyValueTokenSecurityEvent.java Sun Dec 4 21:40:55 2011 @@ -22,30 +22,11 @@ package org.swssf.wss.securityEvent; * @author $Author$ * @version $Revision$ $Date$ */ -public class IssuedTokenSecurityEvent extends TokenSecurityEvent { +public class KeyValueTokenSecurityEvent extends TokenSecurityEvent { - //todo Use this event. Per spec this could also be a SamlTokenSecurityEvent or a SecurityContextToken + //todo implement - private boolean internalReference; - private String issuerName; - - public IssuedTokenSecurityEvent(Event securityEventType) { + public KeyValueTokenSecurityEvent(Event securityEventType) { super(securityEventType); } - - public boolean isInternalReference() { - return internalReference; - } - - public void setInternalReference(boolean internalReference) { - this.internalReference = internalReference; - } - - public String getIssuerName() { - return issuerName; - } - - public void setIssuerName(String issuerName) { - this.issuerName = issuerName; - } } Copied: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/RelTokenSecurityEvent.java (from r1207047, webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/IssuedTokenSecurityEvent.java) URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/RelTokenSecurityEvent.java?p2=webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/RelTokenSecurityEvent.java&p1=webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/IssuedTokenSecurityEvent.java&r1=1207047&r2=1210233&rev=1210233&view=diff ============================================================================== --- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/IssuedTokenSecurityEvent.java (original) +++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/RelTokenSecurityEvent.java Sun Dec 4 21:40:55 2011 @@ -22,30 +22,11 @@ package org.swssf.wss.securityEvent; * @author $Author$ * @version $Revision$ $Date$ */ -public class IssuedTokenSecurityEvent extends TokenSecurityEvent { +public class RelTokenSecurityEvent extends TokenSecurityEvent { - //todo Use this event. Per spec this could also be a SamlTokenSecurityEvent or a SecurityContextToken + //todo implement - private boolean internalReference; - private String issuerName; - - public IssuedTokenSecurityEvent(Event securityEventType) { + public RelTokenSecurityEvent(Event securityEventType) { super(securityEventType); } - - public boolean isInternalReference() { - return internalReference; - } - - public void setInternalReference(boolean internalReference) { - this.internalReference = internalReference; - } - - public String getIssuerName() { - return issuerName; - } - - public void setIssuerName(String issuerName) { - this.issuerName = issuerName; - } } Copied: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/SecureConversationTokenSecurityEvent.java (from r1207047, webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/SecureConversationSecurityEvent.java) URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/SecureConversationTokenSecurityEvent.java?p2=webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/SecureConversationTokenSecurityEvent.java&p1=webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/SecureConversationSecurityEvent.java&r1=1207047&r2=1210233&rev=1210233&view=diff ============================================================================== --- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/SecureConversationSecurityEvent.java (original) +++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/SecureConversationTokenSecurityEvent.java Sun Dec 4 21:40:55 2011 @@ -22,12 +22,12 @@ package org.swssf.wss.securityEvent; * @author $Author$ * @version $Revision$ $Date$ */ -public class SecureConversationSecurityEvent extends TokenSecurityEvent { +public class SecureConversationTokenSecurityEvent extends TokenSecurityEvent { private boolean externalUriRef; private String issuerName; - public SecureConversationSecurityEvent(Event securityEventType) { + public SecureConversationTokenSecurityEvent(Event securityEventType) { super(securityEventType); } Propchange: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/SecureConversationTokenSecurityEvent.java ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/SecurityEvent.java URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/SecurityEvent.java?rev=1210233&r1=1210232&r2=1210233&view=diff ============================================================================== --- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/SecurityEvent.java (original) +++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/SecurityEvent.java Sun Dec 4 21:40:55 2011 @@ -36,13 +36,18 @@ public abstract class SecurityEvent { RequiredElement, RequiredPart, AlgorithmSuite, - SignatureToken, - EncryptionToken, + IssuedToken, + KerberosToken, + SpnegoContextToken, SamlToken, SecurityContextToken, + SecureConversationToken, + RelToken, UsernameToken, + KeyValueToken, + X509Token, + HttpsToken, SupportingToken, - TransportToken, } private Event securityEventType; Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/SignedElementSecurityEvent.java URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/SignedElementSecurityEvent.java?rev=1210233&r1=1210232&r2=1210233&view=diff ============================================================================== --- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/SignedElementSecurityEvent.java (original) +++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/SignedElementSecurityEvent.java Sun Dec 4 21:40:55 2011 @@ -29,11 +29,11 @@ public class SignedElementSecurityEvent //todo xpath or something unique //todo message signature or supporting sig private QName element; - private boolean notSigned; + private boolean signed; - public SignedElementSecurityEvent(Event securityEventType, boolean notSigned) { + public SignedElementSecurityEvent(Event securityEventType, boolean signed) { super(securityEventType); - this.notSigned = notSigned; + this.signed = signed; } public QName getElement() { @@ -44,11 +44,11 @@ public class SignedElementSecurityEvent this.element = element; } - public boolean isNotSigned() { - return notSigned; + public boolean isSigned() { + return signed; } - public void setNotSigned(boolean notSigned) { - this.notSigned = notSigned; + public void setSigned(boolean signed) { + this.signed = signed; } } Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/SignedPartSecurityEvent.java URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/SignedPartSecurityEvent.java?rev=1210233&r1=1210232&r2=1210233&view=diff ============================================================================== --- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/SignedPartSecurityEvent.java (original) +++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/SignedPartSecurityEvent.java Sun Dec 4 21:40:55 2011 @@ -29,11 +29,11 @@ public class SignedPartSecurityEvent ext //todo xpath or something unique //todo message signature or supporting sig private QName element; - private boolean notSigned; + private boolean signed; - public SignedPartSecurityEvent(Event securityEventType, boolean notSigned) { + public SignedPartSecurityEvent(Event securityEventType, boolean signed) { super(securityEventType); - this.notSigned = notSigned; + this.signed = signed; } public QName getElement() { @@ -44,11 +44,11 @@ public class SignedPartSecurityEvent ext this.element = element; } - public boolean isNotSigned() { - return notSigned; + public boolean isSigned() { + return signed; } - public void setNotSigned(boolean notSigned) { - this.notSigned = notSigned; + public void setSigned(boolean signed) { + this.signed = signed; } } Added: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/SpnegoContextTokenSecurityEvent.java URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/SpnegoContextTokenSecurityEvent.java?rev=1210233&view=auto ============================================================================== --- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/SpnegoContextTokenSecurityEvent.java (added) +++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/SpnegoContextTokenSecurityEvent.java Sun Dec 4 21:40:55 2011 @@ -0,0 +1,40 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.swssf.wss.securityEvent; + +/** + * @author $Author: giger $ + * @version $Revision: 1195414 $ $Date: 2011-10-31 12:26:48 +0100 (Mon, 31 Oct 2011) $ + */ +public class SpnegoContextTokenSecurityEvent extends TokenSecurityEvent { + + private String issuerName; + + public SpnegoContextTokenSecurityEvent(Event securityEventType) { + super(securityEventType); + } + + public String getIssuerName() { + return issuerName; + } + + public void setIssuerName(String issuerName) { + this.issuerName = issuerName; + } +} Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/TokenSecurityEvent.java URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/TokenSecurityEvent.java?rev=1210233&r1=1210232&r2=1210233&view=diff ============================================================================== --- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/TokenSecurityEvent.java (original) +++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/TokenSecurityEvent.java Sun Dec 4 21:40:55 2011 @@ -26,7 +26,13 @@ import org.swssf.xmlsec.ext.SecurityToke */ public abstract class TokenSecurityEvent extends SecurityEvent { + public enum TokenUsage { + Signature, + Encryption + } + private SecurityToken securityToken; + private TokenUsage tokenUsage; public TokenSecurityEvent(Event securityEventType) { super(securityEventType); @@ -39,4 +45,12 @@ public abstract class TokenSecurityEvent public void setSecurityToken(SecurityToken securityToken) { this.securityToken = securityToken; } + + public TokenUsage getTokenUsage() { + return tokenUsage; + } + + public void setTokenUsage(TokenUsage tokenUsage) { + this.tokenUsage = tokenUsage; + } } Copied: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/X509TokenSecurityEvent.java (from r1207047, webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/SignatureTokenSecurityEvent.java) URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/X509TokenSecurityEvent.java?p2=webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/X509TokenSecurityEvent.java&p1=webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/SignatureTokenSecurityEvent.java&r1=1207047&r2=1210233&rev=1210233&view=diff ============================================================================== --- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/SignatureTokenSecurityEvent.java (original) +++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/X509TokenSecurityEvent.java Sun Dec 4 21:40:55 2011 @@ -22,19 +22,9 @@ package org.swssf.wss.securityEvent; * @author $Author$ * @version $Revision$ $Date$ */ -public class SignatureTokenSecurityEvent extends TokenSecurityEvent { +public class X509TokenSecurityEvent extends TokenSecurityEvent { - private byte[] signatureValue; - - public SignatureTokenSecurityEvent(Event securityEventType) { + public X509TokenSecurityEvent(Event securityEventType) { super(securityEventType); } - - public byte[] getSignatureValue() { - return signatureValue; - } - - public void setSignatureValue(byte[] signatureValue) { - this.signatureValue = signatureValue; - } }
