Author: klape Date: 2013-12-19 20:32:43 -0500 (Thu, 19 Dec 2013) New Revision: 18216 Modified: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-10940/ stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-10940/modules/core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-10940/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java Log: [JBPAPP-10940] Operation-specific WSS config doesn't get applied when SOAP body is encrypted Property changes on: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-10940 ___________________________________________________________________ Added: svn:mergeinfo + /stack/native/branches/jbossws-native-3.1.2:18168,18198 Modified: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-10940/modules/core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-10940/modules/core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java 2013-12-20 01:31:55 UTC (rev 18215) +++ stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-10940/modules/core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java 2013-12-20 01:32:43 UTC (rev 18216) @@ -201,7 +201,12 @@ // supply the response action OperationMetaData opMetaData = ((CommonMessageContext)msgContext).getOperationMetaData(); - + if (opMetaData == null) + { + // Apparently the operation couldn't be determined + return; + } + if (!isFault && !opMetaData.isOneWay()) { Modified: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-10940/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-10940/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2013-12-20 01:31:55 UTC (rev 18215) +++ stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-10940/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2013-12-20 01:32:43 UTC (rev 18216) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * Copyright 2013, Red Hat Middleware LLC, and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -302,9 +302,10 @@ private Config getActualConfig(WSSecurityConfiguration configuration, Config operationConfig) { - if (operationConfig == null) + if (operationConfig == null && hasSubConfigs(configuration)) { - //if no configuration override, we try getting the right operation config + //if no configuration override and the provided configuration has port / + //operation configs, we try getting the right operation config //according to the invoked operation that can be found using the context CommonMessageContext ctx = MessageContextAssociation.peekMessageContext(); if (ctx != null) @@ -328,13 +329,27 @@ } } if (opMetaData != null) + { operationConfig = selectOperationConfig(configuration, port, opMetaData.getQName()); + } + else + { + //No operation metadata matched, meaning we don't know what operationConfig to use. + //This is to be solved either by removing useless operation configs or by requiring + //WS-Addressing to be used for telling the server which operation is being invoked + throw new WebServiceException("Could not determine the operation configuration to be used for processing the request"); + } } } //null operationConfig means default behavior return operationConfig != null ? operationConfig : configuration.getDefaultConfig(); } + private boolean hasSubConfigs(WSSecurityConfiguration configuration) + { + return !configuration.getPorts().isEmpty(); + } + private Config selectOperationConfig(WSSecurityConfiguration configuration, QName portName, QName opName) { Port port = configuration.getPorts().get(portName != null ? portName.getLocalPart() : null);