JBossWS SVN: r5744 - framework/trunk/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-02-20 03:18:59 -0500 (Wed, 20 Feb 2008)
New Revision: 5744
Modified:
framework/trunk/ant-import/build-hudson.xml
Log:
chmod go+w same fileset as copy
Modified: framework/trunk/ant-import/build-hudson.xml
===================================================================
--- framework/trunk/ant-import/build-hudson.xml 2008-02-20 08:17:07 UTC (rev 5743)
+++ framework/trunk/ant-import/build-hudson.xml 2008-02-20 08:18:59 UTC (rev 5744)
@@ -104,8 +104,10 @@
</filterset>
</copy>
<chmod perm="go+w">
- <fileset dir="${hudson.home}">
- <include name="jobs/*/config.xml"/>
+ <fileset dir="${framework.dir}/hudson/hudson-home">
+ <include name="jobs/**"/>
+ <include name="users/**"/>
+ <include name="*.xml"/>
</fileset>
</chmod>
16 years, 10 months
JBossWS SVN: r5743 - framework/trunk/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-02-20 03:17:07 -0500 (Wed, 20 Feb 2008)
New Revision: 5743
Modified:
framework/trunk/ant-import/build-hudson.xml
Log:
chmod go+w jobs/*/config.xml
Modified: framework/trunk/ant-import/build-hudson.xml
===================================================================
--- framework/trunk/ant-import/build-hudson.xml 2008-02-20 08:13:00 UTC (rev 5742)
+++ framework/trunk/ant-import/build-hudson.xml 2008-02-20 08:17:07 UTC (rev 5743)
@@ -105,7 +105,7 @@
</copy>
<chmod perm="go+w">
<fileset dir="${hudson.home}">
- <include name="**/*.xml"/>
+ <include name="jobs/*/config.xml"/>
</fileset>
</chmod>
16 years, 10 months
JBossWS SVN: r5742 - framework/trunk/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-02-20 03:13:00 -0500 (Wed, 20 Feb 2008)
New Revision: 5742
Modified:
framework/trunk/ant-import/build-hudson.xml
Log:
chmod go+w
Modified: framework/trunk/ant-import/build-hudson.xml
===================================================================
--- framework/trunk/ant-import/build-hudson.xml 2008-02-20 07:26:54 UTC (rev 5741)
+++ framework/trunk/ant-import/build-hudson.xml 2008-02-20 08:13:00 UTC (rev 5742)
@@ -48,8 +48,8 @@
<mkdir dir="${hudson.root}"/>
<unzip src="${thirdparty.dir}/apache-tomcat.zip" dest="${hudson.root}"/>
<move file="${hudson.root}/apache-tomcat-${apache-tomcat}" tofile="${hudson.tomcat}"/>
- <chmod file="${hudson.tomcat}/bin/catalina.sh" perm="+x"/>
- <chmod file="${hudson.tomcat}/bin/setclasspath.sh" perm="+x"/>
+ <chmod file="${hudson.tomcat}/bin/catalina.sh" perm="go+x"/>
+ <chmod file="${hudson.tomcat}/bin/setclasspath.sh" perm="go+x"/>
<!-- Configure Tomcat -->
<copy todir="${hudson.tomcat}/webapps" file="${thirdparty.dir}/hudson.war"/>
@@ -103,6 +103,11 @@
<filtersfile file="${framework.dir}/ant.properties"/>
</filterset>
</copy>
+ <chmod perm="go+w">
+ <fileset dir="${hudson.home}">
+ <include name="**/*.xml"/>
+ </fileset>
+ </chmod>
<echo/>
<echo message="*************************************"/>
16 years, 10 months
JBossWS SVN: r5741 - stack/metro/trunk/ant-import.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-02-20 02:26:54 -0500 (Wed, 20 Feb 2008)
New Revision: 5741
Modified:
stack/metro/trunk/ant-import/build-release.xml
Log:
exclude ant.properties from build
Modified: stack/metro/trunk/ant-import/build-release.xml
===================================================================
--- stack/metro/trunk/ant-import/build-release.xml 2008-02-20 07:09:57 UTC (rev 5740)
+++ stack/metro/trunk/ant-import/build-release.xml 2008-02-20 07:26:54 UTC (rev 5741)
@@ -115,6 +115,7 @@
<exclude name="**/output*/**"/>
<exclude name="**/thirdparty/**"/>
<exclude name="mergeinfo.txt"/>
+ <exclude name="ant.properties"/>
<exclude name="glassfish-metro/**"/>
</fileset>
</copy>
16 years, 10 months
JBossWS SVN: r5740 - stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws.
by jbossws-commits＠lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2008-02-20 02:09:57 -0500 (Wed, 20 Feb 2008)
New Revision: 5740
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
Log:
[JBWS-1938] Assign message name instead of IN and OUT for Inbound/Outbound Addressing Property
Modified: stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2008-02-19 20:07:55 UTC (rev 5739)
+++ stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2008-02-20 07:09:57 UTC (rev 5740)
@@ -548,10 +548,11 @@
// TODO: figure out a way to assign message name instead of IN and OUT
String tns = epMetaData.getPortName().getNamespaceURI();
String portTypeName = epMetaData.getPortName().getLocalPart();
- addrExt.setInboundAction(tns + "/" + portTypeName + "/IN");
+ String opName = opMetaData.getQName().getLocalPart();
+ addrExt.setInboundAction(tns + "/" + portTypeName + "/" + opName + "/IN");
if (!opMetaData.isOneWay())
- addrExt.setOutboundAction(tns + "/" + portTypeName + "/OUT");
+ addrExt.setOutboundAction(tns + "/" + portTypeName + "/" + opName + "/OUT");
}
opMetaData.addExtension(addrExt);
16 years, 10 months
JBossWS SVN: r5739 - stack/native/trunk/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-02-19 15:07:55 -0500 (Tue, 19 Feb 2008)
New Revision: 5739
Modified:
stack/native/trunk/ant-import/build-release.xml
Log:
exclude ant.properties from src build
Modified: stack/native/trunk/ant-import/build-release.xml
===================================================================
--- stack/native/trunk/ant-import/build-release.xml 2008-02-19 20:02:45 UTC (rev 5738)
+++ stack/native/trunk/ant-import/build-release.xml 2008-02-19 20:07:55 UTC (rev 5739)
@@ -155,6 +155,7 @@
<exclude name="**/output*/**"/>
<exclude name="**/thirdparty/**"/>
<exclude name="mergeinfo.txt"/>
+ <exclude name="ant.properties"/>
</fileset>
</copy>
<zip destfile="${core.dir}/output/jbossws-${version.id}-src.zip" basedir="${build.src.dist}"
16 years, 10 months
JBossWS SVN: r5738 - in stack/native/trunk/src/test/resources/jaxws/webserviceref: META-INF-secure and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-02-19 15:02:45 -0500 (Tue, 19 Feb 2008)
New Revision: 5738
Modified:
stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF-override/wsdl/TestEndpoint.wsdl
stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF-secure/jboss-client.xml
Log:
JBWS-1981 - Framework has a dependency on native that needs to be removed
Modified: stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF-override/wsdl/TestEndpoint.wsdl
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF-override/wsdl/TestEndpoint.wsdl 2008-02-19 19:17:38 UTC (rev 5737)
+++ stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF-override/wsdl/TestEndpoint.wsdl 2008-02-19 20:02:45 UTC (rev 5738)
@@ -32,7 +32,7 @@
<service name='TestEndpointService'>
<port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
- <soap:address location='http://@jboss.bind.address@:8080/jaxws-samples-webserviceref'/>
+ <soap:address location='http://@jboss.bind.address@:8080/jaxws-webserviceref'/>
</port>
</service>
Modified: stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF-secure/jboss-client.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF-secure/jboss-client.xml 2008-02-19 19:17:38 UTC (rev 5737)
+++ stack/native/trunk/src/test/resources/jaxws/webserviceref/META-INF-secure/jboss-client.xml 2008-02-19 20:02:45 UTC (rev 5738)
@@ -21,7 +21,7 @@
<prop-value>thefrog</prop-value>
</stub-property>
</port-component-ref>
- <wsdl-override>http://@jboss.bind.address@:8080/jaxws-samples-webserviceref-secure/SecureEndpointImpl?wsdl</wsdl-override>
+ <wsdl-override>http://@jboss.bind.address@:8080/jaxws-webserviceref-secure/SecureEndpointImpl?wsdl</wsdl-override>
</service-ref>
<service-ref>
@@ -38,7 +38,7 @@
<prop-value>thefrog</prop-value>
</stub-property>
</port-component-ref>
- <wsdl-override>http://@jboss.bind.address@:8080/jaxws-samples-webserviceref-secure/SecureEndpointImpl?wsdl</wsdl-override>
+ <wsdl-override>http://@jboss.bind.address@:8080/jaxws-webserviceref-secure/SecureEndpointImpl?wsdl</wsdl-override>
</service-ref>
<service-ref>
@@ -55,7 +55,7 @@
<prop-value>thefrog</prop-value>
</stub-property>
</port-component-ref>
- <wsdl-override>http://@jboss.bind.address@:8080/jaxws-samples-webserviceref-secure/SecureEndpointImpl?wsdl</wsdl-override>
+ <wsdl-override>http://@jboss.bind.address@:8080/jaxws-webserviceref-secure/SecureEndpointImpl?wsdl</wsdl-override>
</service-ref>
</jboss-client>
\ No newline at end of file
16 years, 10 months
JBossWS SVN: r5736 - framework/trunk.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-02-19 12:39:21 -0500 (Tue, 19 Feb 2008)
New Revision: 5736
Modified:
framework/trunk/ant.properties.example
Log:
hudson.root=/usr/share/java/workspace
Modified: framework/trunk/ant.properties.example
===================================================================
--- framework/trunk/ant.properties.example 2008-02-19 16:47:20 UTC (rev 5735)
+++ framework/trunk/ant.properties.example 2008-02-19 17:39:21 UTC (rev 5736)
@@ -18,7 +18,7 @@
hudson.username=changeme
hudson.password=changeme
-hudson.root=/home/tdiesler/workspace
+hudson.root=/usr/share/java/workspace
hudson.host=jbws.dyndns.org
hudson.admin.port=8150
hudson.http.port=8180
16 years, 10 months
JBossWS SVN: r5735 - in stack/native/trunk/src/main: resources/schema and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-02-19 11:47:20 -0500 (Tue, 19 Feb 2008)
New Revision: 5735
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/Constants.java
stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/EncryptionOperation.java
stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/SecurityStore.java
stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/SignatureVerificationOperation.java
stack/native/trunk/src/main/resources/schema/jboss-ws-security_1_0.xsd
Log:
[JBWS-1814] Fixing issue
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/Constants.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/Constants.java 2008-02-19 16:46:08 UTC (rev 5734)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/Constants.java 2008-02-19 16:47:20 UTC (rev 5735)
@@ -71,4 +71,6 @@
public static final String XENC_CONTENT_TYPE = EncryptionConstants.TYPE_CONTENT;
public static final QName WSSE_HEADER_QNAME = new QName(WSSE_NS, "Security");
+
+ public static final String SIGNATURE_KEYS = "org.jboss.ws.wsse.signaturePublicKeys";
}
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/EncryptionOperation.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/EncryptionOperation.java 2008-02-19 16:46:08 UTC (rev 5734)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/EncryptionOperation.java 2008-02-19 16:47:20 UTC (rev 5735)
@@ -23,6 +23,7 @@
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
+import java.security.PublicKey;
import java.security.cert.X509Certificate;
import java.util.HashMap;
import java.util.List;
@@ -36,6 +37,7 @@
import org.apache.xml.security.encryption.XMLCipher;
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.jboss.util.NotImplementedException;
+import org.jboss.ws.core.soap.MessageContextAssociation;
import org.jboss.ws.extensions.security.element.EncryptedKey;
import org.jboss.ws.extensions.security.element.Reference;
import org.jboss.ws.extensions.security.element.ReferenceList;
@@ -159,8 +161,8 @@
for (Target target : targets)
processTarget(cipher, message, target, list, secretKey);
}
-
- X509Certificate cert = store.getCertificate(alias);
+
+ X509Certificate cert = getCertificate(alias);
X509Token token = (X509Token) header.getSharedToken(cert);
// Can we reuse an existing token?
@@ -175,7 +177,30 @@
header.addSecurityProcess(eKey);
}
+ @SuppressWarnings("unchecked")
+ private X509Certificate getCertificate(String alias) throws WSSecurityException
+ {
+ X509Certificate cert = null;
+ if (alias != null)
+ {
+ cert = store.getCertificate(alias);
+ if (cert == null)
+ throw new WSSecurityException("Cannot load certificate from keystore; alias = " + alias);
+ }
+ else
+ {
+ List<PublicKey> publicKeys = (List<PublicKey>)MessageContextAssociation.peekMessageContext().get(Constants.SIGNATURE_KEYS);
+ if (publicKeys != null && publicKeys.size() == 1)
+ cert = store.getCertificateByPublicKey(publicKeys.iterator().next());
+ if (cert == null)
+ throw new WSSecurityException("Cannot get the certificate for message encryption! Verify the keystore contents, " +
+ "considering the certificate is obtained through the alias specified in the encrypt configuration element " +
+ "or (server side only) through a single key used to sign the incoming message.");
+ }
+ return cert;
+ }
+
public static boolean probeUnlimitedCrypto() throws WSSecurityException
{
try
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/SecurityStore.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/SecurityStore.java 2008-02-19 16:46:08 UTC (rev 5734)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/SecurityStore.java 2008-02-19 16:47:20 UTC (rev 5735)
@@ -35,6 +35,7 @@
import java.security.KeyStore;
import java.security.KeyStoreException;
import java.security.PrivateKey;
+import java.security.PublicKey;
import java.security.cert.CertPath;
import java.security.cert.CertPathValidator;
import java.security.cert.CertPathValidatorException;
@@ -333,7 +334,38 @@
return cert;
}
+
+ public X509Certificate getCertificateByPublicKey(PublicKey key) throws WSSecurityException
+ {
+ if (key == null)
+ return null;
+
+ if (keyStore == null)
+ {
+ throw new WSSecurityException("KeyStore not set.");
+ }
+
+ try
+ {
+ Enumeration<String> i = keyStore.aliases();
+ while (i.hasMoreElements())
+ {
+ String alias = (String)i.nextElement();
+ Certificate cert = keyStore.getCertificate(alias);
+ if (!(cert instanceof X509Certificate))
+ continue;
+ if (cert.getPublicKey().equals(key))
+ return (X509Certificate)cert;
+ }
+ return null;
+ }
+ catch (KeyStoreException e)
+ {
+ throw new WSSecurityException("Problems retrieving cert: " + e.getMessage(), e);
+ }
+ }
+
public X509Certificate getCertificateBySubjectKeyIdentifier(byte[] identifier) throws WSSecurityException
{
if (identifier == null)
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/SignatureVerificationOperation.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/SignatureVerificationOperation.java 2008-02-19 16:46:08 UTC (rev 5734)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/SignatureVerificationOperation.java 2008-02-19 16:47:20 UTC (rev 5735)
@@ -21,13 +21,18 @@
*/
package org.jboss.ws.extensions.security;
+import java.security.PublicKey;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.signature.SignedInfo;
import org.apache.xml.security.signature.XMLSignature;
import org.apache.xml.security.signature.XMLSignatureException;
+import org.jboss.ws.core.CommonMessageContext;
+import org.jboss.ws.core.soap.MessageContextAssociation;
import org.jboss.ws.extensions.security.element.SecurityHeader;
import org.jboss.ws.extensions.security.element.SecurityProcess;
import org.jboss.ws.extensions.security.element.Signature;
@@ -59,6 +64,8 @@
{
if (! xmlSig.checkSignatureValue(signature.getPublicKey()))
throw new FailedCheckException("Signature is invalid.");
+
+ savePublicKey(signature.getPublicKey());
}
catch (XMLSignatureException e)
{
@@ -88,4 +95,24 @@
return processed;
}
+
+ /**
+ * Save the public key the incoming message was signed with into the context;
+ * this way it could be retrieved and used by the encryption operation
+ * when handling the outbound message.
+ *
+ * @param key
+ */
+ @SuppressWarnings("unchecked")
+ private void savePublicKey(PublicKey key)
+ {
+ CommonMessageContext ctx = MessageContextAssociation.peekMessageContext();
+ List<PublicKey> pkList = (List<PublicKey>)ctx.get(Constants.SIGNATURE_KEYS);
+ if (pkList == null)
+ {
+ pkList = new LinkedList<PublicKey>();
+ ctx.put(Constants.SIGNATURE_KEYS, pkList);
+ }
+ pkList.add(key);
+ }
}
Modified: stack/native/trunk/src/main/resources/schema/jboss-ws-security_1_0.xsd
===================================================================
--- stack/native/trunk/src/main/resources/schema/jboss-ws-security_1_0.xsd 2008-02-19 16:46:08 UTC (rev 5734)
+++ stack/native/trunk/src/main/resources/schema/jboss-ws-security_1_0.xsd 2008-02-19 16:47:20 UTC (rev 5735)
@@ -165,7 +165,7 @@
</xs:restriction>
</xs:simpleType>
</xs:attribute>
- <xs:attribute name="alias" type="xs:string" use="required">
+ <xs:attribute name="alias" type="xs:string">
<xs:annotation>
<xs:documentation>The name of the certificate to use.</xs:documentation>
</xs:annotation>
16 years, 10 months