March 2013 - jbossws-commits - Jboss List Archives

JBossWS SVN: r17409 - thirdparty/wss4j/branches/wss4j-1.6.9/src/main/java/org/apache/ws/security/cache.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2013-03-25 12:16:05 -0400 (Mon, 25 Mar 2013) New Revision: 17409 Modified: thirdparty/wss4j/branches/wss4j-1.6.9/src/main/java/org/apache/ws/security/cache/MemoryReplayCache.java Log: Backporting fix for WSS-431 Modified: thirdparty/wss4j/branches/wss4j-1.6.9/src/main/java/org/apache/ws/security/cache/MemoryReplayCache.java =================================================================== --- thirdparty/wss4j/branches/wss4j-1.6.9/src/main/java/org/apache/ws/security/cache/MemoryReplayCache.java 2013-03-25 16:15:44 UTC (rev 17408) +++ thirdparty/wss4j/branches/wss4j-1.6.9/src/main/java/org/apache/ws/security/cache/MemoryReplayCache.java 2013-03-25 16:16:05 UTC (rev 17409) @@ -19,11 +19,16 @@ package org.apache.ws.security.cache; +import java.util.ArrayList; import java.util.Collections; import java.util.Date; import java.util.HashSet; import java.util.Iterator; +import java.util.List; +import java.util.Map.Entry; import java.util.Set; +import java.util.SortedMap; +import java.util.TreeMap; /** * A simple in-memory HashSet based cache to prevent against replay attacks. The default TTL is 5 minutes @@ -33,8 +38,8 @@ public static final long DEFAULT_TTL = 60L * 5L; public static final long MAX_TTL = DEFAULT_TTL * 12L; - private Set<ReplayCacheIdentifier> cache = - Collections.synchronizedSet(new HashSet<ReplayCacheIdentifier>()); + private SortedMap<Date, List<String>> cache = new TreeMap<Date, List<String>>(); + private Set<String> ids = Collections.synchronizedSet(new HashSet<String>()); /** * Add the given identifier to the cache. It will be cached for a default amount of time. @@ -53,8 +58,6 @@ if (identifier == null || "".equals(identifier)) { return; } - ReplayCacheIdentifier cacheIdentifier = new ReplayCacheIdentifier(); - cacheIdentifier.setIdentifier(identifier); long ttl = timeToLive; if (ttl < 0 || ttl > MAX_TTL) { @@ -64,9 +67,16 @@ Date expires = new Date(); long currentTime = expires.getTime(); expires.setTime(currentTime + (ttl * 1000L)); - cacheIdentifier.setExpiry(expires); - cache.add(cacheIdentifier); + synchronized (cache) { + List<String> list = cache.get(expires); + if (list == null) { + list = new ArrayList<String>(1); + cache.put(expires, list); + } + list.add(identifier); + } + ids.add(identifier); } /** @@ -77,9 +87,7 @@ processTokenExpiry(); if (identifier != null && !"".equals(identifier)) { - ReplayCacheIdentifier cacheIdentifier = new ReplayCacheIdentifier(); - cacheIdentifier.setIdentifier(identifier); - return cache.contains(cacheIdentifier); + return ids.contains(identifier); } return false; } @@ -87,68 +95,18 @@ protected void processTokenExpiry() { Date current = new Date(); synchronized (cache) { - Iterator<ReplayCacheIdentifier> iterator = cache.iterator(); - while (iterator.hasNext()) { - if (iterator.next().getExpiry().before(current)) { - iterator.remove(); + Iterator<Entry<Date, List<String>>> it = cache.entrySet().iterator(); + while (it.hasNext()) { + Entry<Date, List<String>> entry = it.next(); + if (entry.getKey().before(current)) { + for (String id : entry.getValue()) { + ids.remove(id); + } + it.remove(); + } else { + break; } } } } - - private static class ReplayCacheIdentifier { - - private String identifier; - private Date expires; - - /** - * Set the (String) identifier - * @param identifier the (String) identifier - */ - public void setIdentifier(String identifier) { - this.identifier = identifier; - } - - /** - * Set when this identifier is to be removed from the cache - * @param expires when this identifier is to be removed from the cache - */ - public void setExpiry(Date expires) { - this.expires = expires; - } - - /** - * Get when this identifier is to be removed from the cache - * @return when this identifier is to be removed from the cache - */ - public Date getExpiry() { - return expires; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (!(o instanceof ReplayCacheIdentifier)) { - return false; - } - - ReplayCacheIdentifier replayCacheIdentifier = (ReplayCacheIdentifier)o; - - if (identifier == null && replayCacheIdentifier.identifier != null) { - return false; - } else if (identifier != null && !identifier.equals(replayCacheIdentifier.identifier)) { - return false; - } - - return true; - } - - @Override - public int hashCode() { - return identifier != null ? identifier.hashCode() : 0; - } - } - }

11 years, 1 month

1
0
0 / 0

JBossWS SVN: r17408 - thirdparty/wss4j/branches/wss4j-1.6.9/src/main/java/org/apache/ws/security/message.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2013-03-25 12:15:44 -0400 (Mon, 25 Mar 2013) New Revision: 17408 Modified: thirdparty/wss4j/branches/wss4j-1.6.9/src/main/java/org/apache/ws/security/message/WSSecSignature.java Log: Backporting fix for WSS-421 Modified: thirdparty/wss4j/branches/wss4j-1.6.9/src/main/java/org/apache/ws/security/message/WSSecSignature.java =================================================================== --- thirdparty/wss4j/branches/wss4j-1.6.9/src/main/java/org/apache/ws/security/message/WSSecSignature.java 2013-03-25 15:57:11 UTC (rev 17407) +++ thirdparty/wss4j/branches/wss4j-1.6.9/src/main/java/org/apache/ws/security/message/WSSecSignature.java 2013-03-25 16:15:44 UTC (rev 17408) @@ -108,6 +108,7 @@ private X509Certificate useThisCert = null; private Element securityHeader = null; private boolean useCustomSecRef; + private boolean bstAddedToSecurityHeader = false; public WSSecSignature() { super(); @@ -443,10 +444,10 @@ * @param secHeader The security header */ public void prependBSTElementToHeader(WSSecHeader secHeader) { - if (bstToken != null) { + if (bstToken != null && !bstAddedToSecurityHeader) { WSSecurityUtil.prependChildElement(secHeader.getSecurityHeader(), bstToken.getElement()); + bstAddedToSecurityHeader = true; } - bstToken = null; } /** @@ -454,11 +455,11 @@ * @param secHeader The security header */ public void appendBSTElementToHeader(WSSecHeader secHeader) { - if (bstToken != null) { + if (bstToken != null && !bstAddedToSecurityHeader) { Element secHeaderElement = secHeader.getSecurityHeader(); secHeaderElement.appendChild(bstToken.getElement()); + bstAddedToSecurityHeader = true; } - bstToken = null; } /**

11 years, 1 month

1
0
0 / 0

JBossWS SVN: r17407 - thirdparty/wss4j/branches/wss4j-1.6.9.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2013-03-25 11:57:11 -0400 (Mon, 25 Mar 2013) New Revision: 17407 Modified: thirdparty/wss4j/branches/wss4j-1.6.9/ thirdparty/wss4j/branches/wss4j-1.6.9/pom.xml Log: Updating pom.xml and setting svn:ignore Property changes on: thirdparty/wss4j/branches/wss4j-1.6.9 ___________________________________________________________________ Added: svn:ignore + target Modified: thirdparty/wss4j/branches/wss4j-1.6.9/pom.xml =================================================================== --- thirdparty/wss4j/branches/wss4j-1.6.9/pom.xml 2013-03-25 15:51:15 UTC (rev 17406) +++ thirdparty/wss4j/branches/wss4j-1.6.9/pom.xml 2013-03-25 15:57:11 UTC (rev 17407) @@ -22,7 +22,7 @@ <artifactId>wss4j</artifactId> <packaging>bundle</packaging> <name>Apache WSS4J</name> - <version>1.6.9.jbossorg-1</version> + <version>1.6.9.jbossorg-1-SNAPSHOT</version> <description> The Apache WSS4J project provides a Java implementation of the primary security standards for Web Services, namely the OASIS Web Services Security (WS-Security) specifications @@ -543,7 +543,7 @@ </plugins> </reporting> - <distributionManagement> +  + <distributionManagement> + <repository> + <id>jboss-releases-repository</id> + <name>JBoss Releases Repository</name> + <url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/</url> + </repository> + <snapshotRepository> + <id>jboss-snapshots-repository</id> + <name>JBoss Snapshots Repository</name> + <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url> + </snapshotRepository> + </distributionManagement> <!-- Temporarily adding in to get Santuario SNAPSHOT <repositories>

11 years, 1 month

1
0
0 / 0

JBossWS SVN: r17405 - shared-testsuite/branches/jbossws-shared-testsuite-4.1.x.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2013-03-21 05:08:18 -0400 (Thu, 21 Mar 2013) New Revision: 17405 Modified: shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/pom.xml Log: Move to the next release cycle Modified: shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/pom.xml =================================================================== --- shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/pom.xml 2013-03-21 08:19:15 UTC (rev 17404) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/pom.xml 2013-03-21 09:08:18 UTC (rev 17405) @@ -6,7 +6,7 @@ <artifactId>jbossws-shared-testsuite</artifactId> <description>JBossWS Stack Agnostic Testsuite</description> - <version>4.1.2-SNAPSHOT</version> + <version>4.1.3-SNAPSHOT</version>  <parent>

11 years, 1 month

1
0
0 / 0

JBossWS SVN: r17404 - stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2013-03-21 04:19:15 -0400 (Thu, 21 Mar 2013) New Revision: 17404 Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java Log: [JBPAPP-10687]:Fix ClassNotFoundException exception Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2013-03-20 09:27:53 UTC (rev 17403) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2013-03-21 08:19:15 UTC (rev 17404) @@ -234,26 +234,28 @@ } for (String ep : endpoints) { - Class<?> clazz = cl.loadClass(ep); - String wl = null; - if (clazz.isAnnotationPresent(WebService.class)) { - WebService wsa = clazz.getAnnotation(WebService.class); - wl = wsa.wsdlLocation(); - String epIf = wsa.endpointInterface(); - if(epIf != null && !epIf.isEmpty()) { - Class<?> epIfClass = cl.loadClass(epIf); - WebService epIfWsa = epIfClass.getAnnotation(WebService.class); - if (epIfWsa != null && epIfWsa.wsdlLocation() != null && !epIfWsa.wsdlLocation().isEmpty()) { - wl = epIfWsa.wsdlLocation(); + if (!ep.startsWith("#")) { + Class<?> clazz = cl.loadClass(ep); + String wl = null; + if (clazz.isAnnotationPresent(WebService.class)) { + WebService wsa = clazz.getAnnotation(WebService.class); + wl = wsa.wsdlLocation(); + String epIf = wsa.endpointInterface(); + if(epIf != null && !epIf.isEmpty()) { + Class<?> epIfClass = cl.loadClass(epIf); + WebService epIfWsa = epIfClass.getAnnotation(WebService.class); + if (epIfWsa != null && epIfWsa.wsdlLocation() != null && !epIfWsa.wsdlLocation().isEmpty()) { + wl = epIfWsa.wsdlLocation(); + } } + } else { + WebServiceProvider wsp = clazz.getAnnotation(WebServiceProvider.class); + wl = wsp.wsdlLocation(); } - } else { - WebServiceProvider wsp = clazz.getAnnotation(WebServiceProvider.class); - wl = wsp.wsdlLocation(); + if (wl != null && !wl.trim().isEmpty()) { + wsdlLocations.add(wl); + } } - if (wl != null && !wl.trim().isEmpty()) { - wsdlLocations.add(wl); - } } //then check wsdl files for contract first endpoints for (String w : wsdlLocations) { @@ -297,6 +299,14 @@ { endpoints.add(reader.getAttributeValue(null, searchAttributeName).trim()); } + + else if (search && StAXUtils.match(reader, "http://www.springframework.org/schema/beans", "bean")) + { + if (reader.getAttributeValue(null, "id") != null) + { + endpoints.add(reader.getAttributeValue(null, "class").trim()); + } + } } } }

11 years, 1 month

1
0
0 / 0

JBossWS SVN: r17403 - shared-testsuite/tags/jbossws-shared-testsuite-4.1.2.Final.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2013-03-20 05:27:53 -0400 (Wed, 20 Mar 2013) New Revision: 17403 Modified: shared-testsuite/tags/jbossws-shared-testsuite-4.1.2.Final/pom.xml Log: Update the pom.xml to the 4.1.2.Final release version Modified: shared-testsuite/tags/jbossws-shared-testsuite-4.1.2.Final/pom.xml =================================================================== --- shared-testsuite/tags/jbossws-shared-testsuite-4.1.2.Final/pom.xml 2013-03-20 09:15:40 UTC (rev 17402) +++ shared-testsuite/tags/jbossws-shared-testsuite-4.1.2.Final/pom.xml 2013-03-20 09:27:53 UTC (rev 17403) @@ -6,7 +6,7 @@ <artifactId>jbossws-shared-testsuite</artifactId> <description>JBossWS Stack Agnostic Testsuite</description> - <version>4.1.2-SNAPSHOT</version> + <version>4.1.2.Final</version>  <parent> @@ -17,9 +17,9 @@  <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/shared-testsuite/branches/...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/shared-testsuite/branches/jbo...</developerConnection> - <url>http://fisheye.jboss.com/viewrep/JBossWS/shared-testsuite/branches/jbossw...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/shared-testsuite/tags/jbos...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/shared-testsuite/tags/jbossws...</developerConnection> + <url>http://fisheye.jboss.com/viewrep/JBossWS/shared-testsuite/tags/jbossws-sh...</url> </scm> <properties>

11 years, 1 month

1
0
0 / 0

JBossWS SVN: r17402 - shared-testsuite/tags.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2013-03-20 05:15:40 -0400 (Wed, 20 Mar 2013) New Revision: 17402 Added: shared-testsuite/tags/jbossws-shared-testsuite-4.1.2.Final/ Log: Prepare release the jbossws-shared-testsuite-4.1.2.Final

11 years, 1 month

1
0
0 / 0

JBossWS SVN: r17401 - stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2013-03-19 03:13:32 -0400 (Tue, 19 Mar 2013) New Revision: 17401 Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/Helper.java Log: [BZ-921101]:Fix ClientSpringAppTestCase failures on IBM JDK Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/Helper.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/Helper.java 2013-03-19 07:10:51 UTC (rev 17400) +++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/Helper.java 2013-03-19 07:13:32 UTC (rev 17401) @@ -151,7 +151,7 @@ } catch (Throwable t) { - if (!springInAS && (t instanceof NoClassDefFoundError) && t.getMessage().contains("org/springframework")) + if (!springInAS && (t instanceof NoClassDefFoundError) && t.getMessage().contains("springframework")) { //Spring is not installed on AS, so the SpringBus can't be created - fine return true;

11 years, 1 month

1
0
0 / 0

JBossWS SVN: r17400 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2013-03-19 03:10:51 -0400 (Tue, 19 Mar 2013) New Revision: 17400 Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/Helper.java Log: [JBWS-3609]:ClientSpringAppTestCase failures on IBM JDK Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/Helper.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/Helper.java 2013-03-19 05:21:59 UTC (rev 17399) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/Helper.java 2013-03-19 07:10:51 UTC (rev 17400) @@ -151,7 +151,7 @@ } catch (Throwable t) { - if (!springInAS && (t instanceof NoClassDefFoundError) && t.getMessage().contains("org/springframework")) + if (!springInAS && (t instanceof NoClassDefFoundError) && t.getMessage().contains("springframework")) { //Spring is not installed on AS, so the SpringBus can't be created - fine return true;

11 years, 1 month

1
0
0 / 0

JBossWS SVN: r17399 - shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1702.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2013-03-19 01:21:59 -0400 (Tue, 19 Mar 2013) New Revision: 17399 Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1702/JBWS1702TestCase.java Log: [JBWS-3608]:Fix the JBWS1702TestCase failure on IBM JDK7 Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1702/JBWS1702TestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1702/JBWS1702TestCase.java 2013-03-19 04:50:35 UTC (rev 17398) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1702/JBWS1702TestCase.java 2013-03-19 05:21:59 UTC (rev 17399) @@ -24,6 +24,7 @@ import java.net.URL; import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; import javax.xml.ws.Service; import junit.framework.Test; @@ -65,12 +66,14 @@ Service service = Service.create(wsdlURL, serviceName); SampleWSBareSEI port = service.getPort(SampleWSBareSEI.class); + BindingProvider bp = (BindingProvider)port; + bp.getRequestContext().put(BindingProvider.SOAPACTION_URI_PROPERTY, "getClassCAsClassB"); ResponseWrapperB wrapper = port.getClassCAsClassB(); ClassB b = wrapper.getData(); assertTrue("Should be an instance of ClassC, but was " + b, (b instanceof ClassC)); - + bp.getRequestContext().put(BindingProvider.SOAPACTION_URI_PROPERTY, "getClassC"); ResponseWrapperC wrapperC = port.getClassC(); - assertNotNull(wrapperC.getData()); + assertNotNull(wrapperC.getData()); } public void testInheritanceWrapped() throws Exception

11 years, 1 month

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits March 2013