Author: dkulp Date: Thu Sep 11 13:50:33 2008 New Revision: 694471 URL: http://svn.apache.org/viewvc?rev=694471&view=rev Log: Merged revisions 692500 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes
................ r692500 | dkulp | 2008-09-05 13:51:14 -0400 (Fri, 05 Sep 2008) | 10 lines Merged revisions 692499 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r692499 | dkulp | 2008-09-05 13:48:52 -0400 (Fri, 05 Sep 2008) | 3 lines Don't put the logging interceptor on the fault in as the normal in takes care of it before it's known to be a fault. If the soap message is a fault and the security stuff wasn't found, let the fault propogate. ........ ................ Modified: cxf/branches/2.0.x-fixes/ (props changed) cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/feature/LoggingFeature.java cxf/branches/2.0.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Sep 11 13:50:33 2008 @@ -1,3 +1,3 @@ -/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468 -/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466 +/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500 +/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499 /incubator/cxf/trunk:434594-651668 Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Thu Sep 11 13:50:33 2008 @@ -1 +1 @@ -/cxf/branches/2.1.x-fixes:1-686313,686315-686332,686334-686346,686348-686828,687097,687464-687465,689109,689112,689122,690841,691316,691357,691491,691711,691715,691745,692162-692163,692344,692468 +/cxf/branches/2.1.x-fixes:1-686313,686315-686332,686334-686346,686348-686828,687097,687464-687465,689109,689112,689122,690841,691316,691357,691491,691711,691715,691745,692162-692163,692344,692468,692500 Modified: cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/feature/LoggingFeature.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/feature/LoggingFeature.java?rev=694471&r1=694470&r2=694471&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/feature/LoggingFeature.java (original) +++ cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/feature/LoggingFeature.java Thu Sep 11 13:50:33 2008 @@ -34,14 +34,12 @@ protected void initializeProvider(InterceptorProvider provider, Bus bus) { if (limit == DEFAULT_LIMIT) { provider.getInInterceptors().add(IN); - provider.getInFaultInterceptors().add(IN); provider.getOutInterceptors().add(OUT); provider.getOutFaultInterceptors().add(OUT); } else { LoggingInInterceptor in = new LoggingInInterceptor(limit); LoggingOutInterceptor out = new LoggingOutInterceptor(limit); provider.getInInterceptors().add(in); - provider.getInFaultInterceptors().add(in); provider.getOutInterceptors().add(out); provider.getOutFaultInterceptors().add(out); } Modified: cxf/branches/2.0.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java?rev=694471&r1=694470&r2=694471&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java (original) +++ cxf/branches/2.0.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java Thu Sep 11 13:50:33 2008 @@ -164,6 +164,10 @@ if (wsResult == null) { // no security header found if (doAction == WSConstants.NO_SECURITY) { return; + } else if (doc.getSOAPPart().getEnvelope().getBody().hasFault()) { + LOG.warning("Request does not contain required Security header, " + + "but it's a fault."); + return; } else { LOG.warning("Request does not contain required Security header"); throw new WSSecurityException(WSSecurityException.INVALID_SECURITY);
