Author: nandana
Date: Tue Jan 29 06:40:03 2008
New Revision: 616349
URL: http://svn.apache.org/viewvc?rev=616349&view=rev
Log:
rampart-policy related changes to support WS Security Policy 1.2
Added:
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/ContentEncryptedElementsBuilder.java
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/RequiredElementsBuilder.java
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/RequiredPartsBuilder.java
Modified:
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedPartsBuilder.java
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/UsernameTokenBuilder.java
Added:
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/ContentEncryptedElementsBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/ContentEncryptedElementsBuilder.java?rev=616349&view=auto
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/ContentEncryptedElementsBuilder.java
(added)
+++
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/ContentEncryptedElementsBuilder.java
Tue Jan 29 06:40:03 2008
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed 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.apache.ws.secpolicy12.builders;
+
+import java.util.Iterator;
+
+import javax.xml.namespace.QName;
+
+import org.apache.axiom.om.OMAttribute;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMNamespace;
+import org.apache.neethi.Assertion;
+import org.apache.neethi.AssertionBuilderFactory;
+import org.apache.neethi.builders.AssertionBuilder;
+import org.apache.ws.secpolicy.SPConstants;
+import org.apache.ws.secpolicy.SP12Constants;
+import org.apache.ws.secpolicy.model.ContentEncryptedElements;
+
+public class ContentEncryptedElementsBuilder implements AssertionBuilder {
+
+
+ public Assertion build(OMElement element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
+
+ ContentEncryptedElements contentEncryptedElements = new
ContentEncryptedElements(SPConstants.SP_V12);
+ OMAttribute attrXPathVersion =
element.getAttribute(SP12Constants.ATTR_XPATH_VERSION);
+
+ if (attrXPathVersion != null) {
+
contentEncryptedElements.setXPathVersion(attrXPathVersion.getAttributeValue());
+ }
+
+ for (Iterator iterator = element.getChildElements();
iterator.hasNext();) {
+ processElement((OMElement)
iterator.next(),contentEncryptedElements);
+ }
+
+ return contentEncryptedElements;
+ }
+
+ public QName[] getKnownElements() {
+ return new QName[] {SP12Constants.CONTENT_ENCRYPTED_ELEMENTS};
+ }
+
+ private void processElement(OMElement element, ContentEncryptedElements
parent) {
+ QName name = element.getQName();
+ if (SP12Constants.XPATH.equals(name)) {
+ parent.addXPathExpression(element.getText());
+ Iterator namespaces = element.getAllDeclaredNamespaces();
+ while (namespaces.hasNext()) {
+ OMNamespace nm = (OMNamespace) namespaces.next();
+ parent.addDeclaredNamespaces(nm.getNamespaceURI(),
nm.getPrefix());
+ }
+ }
+ }
+
+}
Added:
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/RequiredElementsBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/RequiredElementsBuilder.java?rev=616349&view=auto
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/RequiredElementsBuilder.java
(added)
+++
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/RequiredElementsBuilder.java
Tue Jan 29 06:40:03 2008
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed 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.apache.ws.secpolicy12.builders;
+
+import java.util.Iterator;
+
+import javax.xml.namespace.QName;
+
+import org.apache.axiom.om.OMAttribute;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMNamespace;
+import org.apache.neethi.Assertion;
+import org.apache.neethi.AssertionBuilderFactory;
+import org.apache.neethi.builders.AssertionBuilder;
+import org.apache.ws.secpolicy.SPConstants;
+import org.apache.ws.secpolicy.SP12Constants;
+import org.apache.ws.secpolicy.model.ContentEncryptedElements;
+import org.apache.ws.secpolicy.model.RequiredElements;
+
+public class RequiredElementsBuilder implements AssertionBuilder {
+
+
+ public Assertion build(OMElement element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
+
+ RequiredElements requiredElements = new
RequiredElements(SPConstants.SP_V12);
+ OMAttribute attrXPathVersion =
element.getAttribute(SP12Constants.ATTR_XPATH_VERSION);
+
+ if (attrXPathVersion != null) {
+
requiredElements.setXPathVersion(attrXPathVersion.getAttributeValue());
+ }
+
+ for (Iterator iterator = element.getChildElements();
iterator.hasNext();) {
+ processElement((OMElement) iterator.next(),requiredElements);
+ }
+
+ return requiredElements;
+ }
+
+ public QName[] getKnownElements() {
+ return new QName[] {SP12Constants.REQUIRED_ELEMENTS};
+ }
+
+ private void processElement(OMElement element, RequiredElements parent) {
+ QName name = element.getQName();
+ if (SP12Constants.XPATH.equals(name)) {
+ parent.addXPathExpression(element.getText());
+ Iterator namespaces = element.getAllDeclaredNamespaces();
+ while (namespaces.hasNext()) {
+ OMNamespace nm = (OMNamespace) namespaces.next();
+ parent.addDeclaredNamespaces(nm.getNamespaceURI(),
nm.getPrefix());
+ }
+ }
+ }
+
+}
Added:
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/RequiredPartsBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/RequiredPartsBuilder.java?rev=616349&view=auto
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/RequiredPartsBuilder.java
(added)
+++
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/RequiredPartsBuilder.java
Tue Jan 29 06:40:03 2008
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed 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.apache.ws.secpolicy12.builders;
+
+import java.util.Iterator;
+
+import javax.xml.namespace.QName;
+
+import org.apache.axiom.om.OMAttribute;
+import org.apache.axiom.om.OMElement;
+import org.apache.neethi.Assertion;
+import org.apache.neethi.AssertionBuilderFactory;
+import org.apache.neethi.builders.AssertionBuilder;
+import org.apache.ws.secpolicy.SPConstants;
+import org.apache.ws.secpolicy.SP12Constants;
+import org.apache.ws.secpolicy.model.Header;
+import org.apache.ws.secpolicy.model.RequiredParts;
+import org.apache.ws.secpolicy.model.SignedEncryptedParts;
+
+public class RequiredPartsBuilder implements AssertionBuilder {
+
+ public Assertion build(OMElement element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
+ RequiredParts requiredParts = new RequiredParts(SPConstants.SP_V12);
+
+ for (Iterator iterator = element.getChildElements();
iterator.hasNext();) {
+ processElement((OMElement) iterator.next(), requiredParts);
+ }
+
+ return requiredParts;
+ }
+
+ public QName[] getKnownElements() {
+ return new QName[] {SP12Constants.REQUIRED_PARTS};
+ }
+
+ private void processElement(OMElement element, RequiredParts parent) {
+
+ QName name = element.getQName();
+
+ if (SP12Constants.HEADER.equals(name)) {
+ Header header = new Header();
+
+ OMAttribute nameAttribute = element.getAttribute(SPConstants.NAME);
+ if( nameAttribute != null ) {
+ header.setName(nameAttribute.getAttributeValue());
+ }
+
+ OMAttribute namespaceAttribute =
element.getAttribute(SPConstants.NAMESPACE);
+ header.setNamespace(namespaceAttribute.getAttributeValue());
+
+ parent.addHeader(header);
+
+ }
+ }
+}
Modified:
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedPartsBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedPartsBuilder.java?rev=616349&r1=616348&r2=616349&view=diff
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedPartsBuilder.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedPartsBuilder.java
Tue Jan 29 06:40:03 2008
@@ -64,6 +64,8 @@
} else if (SP12Constants.BODY.equals(name)) {
parent.setBody(true);
- }
+ } else if (SPConstants.ATTACHMENTS.equals(name)){
+ parent.setAttachments(true);
+ }
}
}
Modified:
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/UsernameTokenBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/UsernameTokenBuilder.java?rev=616349&r1=616348&r2=616349&view=diff
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/UsernameTokenBuilder.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/UsernameTokenBuilder.java
Tue Jan 29 06:40:03 2008
@@ -46,7 +46,7 @@
OMElement policyElement = element.getFirstElement();
- if (policyElement != null &&
!policyElement.getQName().equals(org.apache.neethi.Constants.Q_ELEM_POLICY)) {
+ if (policyElement != null &&
policyElement.getQName().equals(org.apache.neethi.Constants.Q_ELEM_POLICY)) {
Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
policy = (Policy) policy.normalize(false);
@@ -69,16 +69,25 @@
}
private void processAlternative(List assertions, UsernameToken parent) {
-
+
for (Iterator iterator = assertions.iterator(); iterator.hasNext();) {
Assertion assertion = (Assertion) iterator.next();
QName qname = assertion.getName();
if (SP12Constants.WSS_USERNAME_TOKEN10.equals(qname)) {
- parent.setUseUTProfile10(true);
-
+ parent.setUseUTProfile10(true);
} else if (SP12Constants.WSS_USERNAME_TOKEN11.equals(qname)) {
parent.setUseUTProfile11(true);
+ } else if (SP12Constants.NO_PASSWORD.equals(qname)) {
+ parent.setNoPassword(true);
+ } else if (SP12Constants.HASH_PASSWORD.equals(qname)) {
+ parent.setHashPassword(true);
+ } else if (SP12Constants.REQUIRE_DERIVED_KEYS.equals(qname)) {
+ parent.setDerivedKeys(true);
+ } else if
(SP12Constants.REQUIRE_EXPLICIT_DERIVED_KEYS.equals(qname)) {
+ parent.setExplicitDerivedKeys(true);
+ } else if
(SP12Constants.REQUIRE_IMPLIED_DERIVED_KEYS.equals(qname)) {
+ parent.setImpliedDerivedKeys(true);
}
}
}
