This is an automated email from the ASF dual-hosted git repository. robertlazarski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit efd2a38900d0baaf1775e4020482e15250e689a0 Author: Robert Lazarski <[email protected]> AuthorDate: Thu Nov 19 10:41:27 2026 -1000 RAMPART-463: accept a UsernameToken password without a Type attribute The supporting-token check required an explicit PasswordText type, so a password with no Type was rejected even with disableBSPEnforcement set (as a NullPointerException in 2.0.0). The Type attribute is optional and its absence means PasswordText, which is how WSS4J has already verified the token by this point. Co-Authored-By: Claude Fable 5.2 <[email protected]> --- .../rampart/PolicyBasedResultsValidator.java | 20 ++++- .../rampart/PolicyBasedResultsValidatorTest.java | 94 ++++++++++++++++++++++ 2 files changed, 112 insertions(+), 2 deletions(-) diff --git a/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java b/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java index 82489f2f..93c6f072 100644 --- a/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java +++ b/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java @@ -346,6 +346,23 @@ public class PolicyBasedResultsValidator implements ExtendedPolicyValidatorCallb handleSupportingTokens(rmd, results, rpd.getSignedEndorsingEncryptedSupportingTokens()); } + /** + * Whether the received UsernameToken carries a clear-text password. + * <p> + * RAMPART-463: the Type attribute of wsse:Password is optional in the + * UsernameToken Profile and its absence means PasswordText. Such a token only + * gets this far when disableBSPEnforcement is set (BSP R4201 rejects it + * otherwise), and WSS4J has by then verified it as clear text, so a missing + * Type must be read the same way here. + */ + static boolean isPlainTextPassword(org.apache.wss4j.dom.message.token.UsernameToken wssUt) { + if (wssUt.getPassword() == null) { + return false; + } + String type = wssUt.getPasswordType(); + return type == null || type.trim().isEmpty() || WSConstants.PASSWORD_TEXT.equals(type); + } + /** * @param rmd Rampart configuration Object * @param results unused @@ -388,8 +405,7 @@ public class PolicyBasedResultsValidator implements ExtendedPolicyValidatorCallb if (!wssUt.isHashed()) { throw new RampartException("invalidUsernameTokenType"); } - } else if (wssUt.getPassword() == null || - !WSConstants.PASSWORD_TEXT.equals(wssUt.getPasswordType())) { + } else if (!isPlainTextPassword(wssUt)) { throw new RampartException("invalidUsernameTokenType"); } diff --git a/modules/rampart-core/src/test/java/org/apache/rampart/PolicyBasedResultsValidatorTest.java b/modules/rampart-core/src/test/java/org/apache/rampart/PolicyBasedResultsValidatorTest.java index fb4dae26..fb3eb94e 100644 --- a/modules/rampart-core/src/test/java/org/apache/rampart/PolicyBasedResultsValidatorTest.java +++ b/modules/rampart-core/src/test/java/org/apache/rampart/PolicyBasedResultsValidatorTest.java @@ -44,7 +44,13 @@ import javax.security.auth.callback.CallbackHandler; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.crypto.CryptoType; +import org.apache.wss4j.common.bsp.BSPEnforcer; import org.apache.wss4j.common.ext.WSSecurityException; +import org.apache.wss4j.dom.WSConstants; +import org.apache.wss4j.dom.engine.WSSConfig; +import org.apache.wss4j.dom.engine.WSSecurityEngineResult; +import org.apache.ws.secpolicy.SPConstants; +import org.apache.ws.secpolicy.model.SupportingToken; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -161,6 +167,94 @@ public class PolicyBasedResultsValidatorTest extends TestCase { v.callIsCertificateInKeyStore(new StubCrypto(new X509Certificate[]{certB}), certA)); } + // ----------------------------------------------------------------------- + // UsernameToken password type (RAMPART-463) + // ----------------------------------------------------------------------- + + private static final String WSSE_NS = + "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"; + private static final String WSU_NS = + "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"; + private static final String UT_PROFILE_NS = + "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#"; + + /** + * Runs the supporting-token check for a policy asking for a clear-text (or, + * with <code>hashPassword</code>, a digest) UsernameToken against a received + * token whose wsse:Password carries the given attributes. The token is parsed + * by WSS4J with BSP enforcement off, as under disableBSPEnforcement. + */ + private void validateUsernameToken(String passwordAttributes, boolean hashPassword) + throws Exception { + // Nonce and Created are there because WSS4J will not parse a digest without them. + String xml = "<wsse:UsernameToken xmlns:wsse='" + WSSE_NS + "' xmlns:wsu='" + WSU_NS + "'>" + + "<wsse:Username>alice</wsse:Username>" + + "<wsse:Password" + passwordAttributes + ">c2VjcmV0</wsse:Password>" + + "<wsse:Nonce>bm9uY2U=</wsse:Nonce>" + + "<wsu:Created>2026-01-01T00:00:00Z</wsu:Created>" + + "</wsse:UsernameToken>"; + // Parsing a digest password needs the XML security library initialised. + WSSConfig.init(); + DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); + dbf.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true); + dbf.setNamespaceAware(true); + Element element = dbf.newDocumentBuilder() + .parse(new ByteArrayInputStream(xml.getBytes(StandardCharsets.UTF_8))) + .getDocumentElement(); + org.apache.wss4j.dom.message.token.UsernameToken received = + new org.apache.wss4j.dom.message.token.UsernameToken( + element, false, new BSPEnforcer(true)); + + org.apache.ws.secpolicy.model.UsernameToken policyToken = + new org.apache.ws.secpolicy.model.UsernameToken(SPConstants.SP_V12); + policyToken.setHashPassword(hashPassword); + SupportingToken supportingTokens = + new SupportingToken(SPConstants.SUPPORTING_TOKEN_SUPPORTING, SPConstants.SP_V12); + supportingTokens.addToken(policyToken); + + WSSecurityEngineResult result = new WSSecurityEngineResult(WSConstants.UT, received); + new Validator().handleSupportingTokens( + null, Collections.singletonList(result), supportingTokens); + } + + private void assertUsernameTokenRejected(String passwordAttributes, boolean hashPassword) + throws Exception { + try { + validateUsernameToken(passwordAttributes, hashPassword); + fail("expected the UsernameToken to be rejected"); + } catch (RampartException expected) { + // WSS4J reports the same condition differently; only Rampart's verdict matters. + } + } + + /** RAMPART-463: this used to end in a NullPointerException. */ + public void testPasswordWithoutTypeIsClearText() throws Exception { + validateUsernameToken("", false); + } + + public void testPasswordWithEmptyTypeIsClearText() throws Exception { + validateUsernameToken(" Type=''", false); + } + + public void testPasswordTextTypeIsClearText() throws Exception { + validateUsernameToken(" Type='" + UT_PROFILE_NS + "PasswordText'", false); + } + + /** A digest must not pass where the policy asks for clear text. */ + public void testDigestRejectedWhereClearTextRequired() throws Exception { + assertUsernameTokenRejected(" Type='" + UT_PROFILE_NS + "PasswordDigest'", false); + } + + /** Nor may an unknown type be waved through as clear text. */ + public void testUnknownTypeRejectedWhereClearTextRequired() throws Exception { + assertUsernameTokenRejected(" Type='urn:example:other'", false); + } + + /** An untyped password is clear text, so it cannot satisfy a HashPassword policy. */ + public void testPasswordWithoutTypeRejectedWhereDigestRequired() throws Exception { + assertUsernameTokenRejected("", true); + } + // ----------------------------------------------------------------------- // Signature-wrapping tests (RAMPART-428) — unchanged below // -----------------------------------------------------------------------
