You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2017/03/08 10:19:46 UTC
svn commit: r1785944 - in
/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom:
action/ engine/ handler/ message/ message/token/ saml/ str/ transform/ util/
Author: coheigea
Date: Wed Mar 8 10:19:46 2017
New Revision: 1785944
URL: http://svn.apache.org/viewvc?rev=1785944&view=rev
Log:
More log work
Modified:
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenSignedAction.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureConfirmationAction.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/engine/WSSConfig.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/engine/WSSecurityEngine.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecBase.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncrypt.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncryptedKey.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignature.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/KerberosSecurity.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/UsernameToken.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/STRParserUtil.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/STRTransformUtil.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/X509Util.java
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenSignedAction.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenSignedAction.java?rev=1785944&r1=1785943&r2=1785944&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenSignedAction.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenSignedAction.java Wed Mar 8 10:19:46 2017
@@ -50,9 +50,7 @@ public class SAMLTokenSignedAction imple
try {
crypto = handler.loadSignatureCrypto(reqData);
} catch (Exception ex) {
- if (LOG.isDebugEnabled()) {
- LOG.debug(ex.getMessage(), ex);
- }
+ LOG.debug(ex.getMessage(), ex);
}
CallbackHandler samlCallbackHandler =
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureConfirmationAction.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureConfirmationAction.java?rev=1785944&r1=1785943&r2=1785944&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureConfirmationAction.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureConfirmationAction.java Wed Mar 8 10:19:46 2017
@@ -40,9 +40,7 @@ public class SignatureConfirmationAction
@SuppressWarnings("unchecked")
public void execute(WSHandler handler, SecurityActionToken actionToken, RequestData reqData)
throws WSSecurityException {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Perform Signature confirmation");
- }
+ LOG.debug("Perform Signature confirmation");
List<WSHandlerResult> results =
(List<WSHandlerResult>) handler.getProperty(
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/engine/WSSConfig.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/engine/WSSConfig.java?rev=1785944&r1=1785943&r2=1785944&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/engine/WSSConfig.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/engine/WSSConfig.java Wed Mar 8 10:19:46 2017
@@ -122,9 +122,7 @@ public final class WSSConfig {
org.apache.wss4j.dom.action.CustomTokenAction.class
);
} catch (final Exception ex) {
- if (LOG.isDebugEnabled()) {
- LOG.debug(ex.getMessage(), ex);
- }
+ LOG.debug(ex.getMessage(), ex);
}
DEFAULT_ACTIONS = java.util.Collections.unmodifiableMap(tmp);
}
@@ -197,9 +195,7 @@ public final class WSSConfig {
org.apache.wss4j.dom.processor.EncryptedDataProcessor.class
);
} catch (final Exception ex) {
- if (LOG.isDebugEnabled()) {
- LOG.debug(ex.getMessage(), ex);
- }
+ LOG.debug(ex.getMessage(), ex);
}
DEFAULT_PROCESSORS = java.util.Collections.unmodifiableMap(tmp);
}
@@ -232,9 +228,7 @@ public final class WSSConfig {
org.apache.wss4j.dom.validate.UsernameTokenValidator.class
);
} catch (final Exception ex) {
- if (LOG.isDebugEnabled()) {
- LOG.debug(ex.getMessage(), ex);
- }
+ LOG.debug(ex.getMessage(), ex);
}
DEFAULT_VALIDATORS = java.util.Collections.unmodifiableMap(tmp);
}
@@ -305,9 +299,7 @@ public final class WSSConfig {
Transform.register(WSConstants.SWA_ATTACHMENT_CIPHERTEXT_TRANS,
AttachmentCiphertextTransform.class);
} catch (Exception e) {
- if (LOG.isDebugEnabled()) {
- LOG.debug(e.getMessage(), e);
- }
+ LOG.debug(e.getMessage(), e);
}
ResourceResolver.register(new ResolverAttachment(), false);
@@ -417,9 +409,7 @@ public final class WSSConfig {
try {
return (Action)((Class<?>)actionObject).newInstance();
} catch (Exception ex) {
- if (LOG.isDebugEnabled()) {
- LOG.debug(ex.getMessage(), ex);
- }
+ LOG.debug(ex.getMessage(), ex);
throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, ex,
"unableToLoadClass", new Object[] {((Class<?>)actionObject).getName()});
}
@@ -509,9 +499,7 @@ public final class WSSConfig {
try {
return (Validator)((Class<?>)validatorObject).newInstance();
} catch (Exception ex) {
- if (LOG.isDebugEnabled()) {
- LOG.debug(ex.getMessage(), ex);
- }
+ LOG.debug(ex.getMessage(), ex);
throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, ex,
"unableToLoadClass", new Object[] {((Class<?>)validatorObject).getName()});
}
@@ -535,9 +523,7 @@ public final class WSSConfig {
try {
return (Processor)((Class<?>)processorObject).newInstance();
} catch (Exception ex) {
- if (LOG.isDebugEnabled()) {
- LOG.debug(ex.getMessage(), ex);
- }
+ LOG.debug(ex.getMessage(), ex);
throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, ex,
"unableToLoadClass", new Object[] {((Class<?>)processorObject).getName()});
}
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/engine/WSSecurityEngine.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/engine/WSSecurityEngine.java?rev=1785944&r1=1785943&r2=1785944&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/engine/WSSecurityEngine.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/engine/WSSecurityEngine.java Wed Mar 8 10:19:46 2017
@@ -156,10 +156,7 @@ public class WSSecurityEngine {
Crypto sigVerCrypto,
Crypto decCrypto
) throws WSSecurityException {
- doDebug = LOG.isDebugEnabled();
- if (doDebug) {
- LOG.debug("enter processSecurityHeader()");
- }
+ LOG.debug("enter processSecurityHeader()");
if (actor == null) {
actor = "";
@@ -167,9 +164,7 @@ public class WSSecurityEngine {
WSHandlerResult wsResult = null;
Element elem = WSSecurityUtil.getSecurityHeader(doc, actor);
if (elem != null) {
- if (doDebug) {
- LOG.debug("Processing WS-Security header for '" + actor + "' actor.");
- }
+ LOG.debug("Processing WS-Security header for '{}' actor.", actor);
wsResult = processSecurityHeader(elem, actor, cb, sigVerCrypto, decCrypto);
}
return wsResult;
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java?rev=1785944&r1=1785943&r2=1785944&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java Wed Mar 8 10:19:46 2017
@@ -66,8 +66,6 @@ public abstract class WSHandler {
org.slf4j.LoggerFactory.getLogger(WSHandler.class);
protected Map<String, Crypto> cryptos = new ConcurrentHashMap<String, Crypto>();
- private boolean doDebug = LOG.isDebugEnabled();
-
/**
* Performs all defined security actions to set-up the SOAP request.
*
@@ -230,9 +228,7 @@ public abstract class WSHandler {
* action(s).
*/
for (HandlerAction actionToDo : actionsToPerform) {
- if (doDebug) {
- LOG.debug("Performing Action: " + actionToDo.getAction());
- }
+ LOG.debug("Performing Action: {}", actionToDo.getAction());
if (WSConstants.NO_SECURITY != actionToDo.getAction()) {
wssConfig.getAction(actionToDo.getAction()).execute(
@@ -428,9 +424,7 @@ public abstract class WSHandler {
RequestData reqData,
WSHandlerResult handlerResults
) throws WSSecurityException {
- if (doDebug) {
- LOG.debug("Check Signature confirmation");
- }
+ LOG.debug("Check Signature confirmation");
//
// First get all Signature values stored during sending the request
//
@@ -1234,9 +1228,7 @@ public abstract class WSHandler {
String[] partDef = rawParts[i].split("}");
if (partDef.length == 1) {
- if (doDebug) {
- LOG.debug("single partDef: '" + partDef[0] + "'");
- }
+ LOG.debug("single partDef: '{}'", partDef[0]);
encPart =
new WSEncryptionPart(partDef[0].trim(),
reqData.getSoapConstants().getEnvelopeURI(),
@@ -1262,7 +1254,7 @@ public abstract class WSHandler {
}
}
String element = partDef[2].trim();
- if (doDebug) {
+ if (LOG.isDebugEnabled()) {
LOG.debug(
"partDefs: '" + mode + "' ,'" + nmSpace + "' ,'" + element + "'"
);
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecBase.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecBase.java?rev=1785944&r1=1785943&r2=1785944&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecBase.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecBase.java Wed Mar 8 10:19:46 2017
@@ -44,7 +44,6 @@ public class WSSecBase {
protected String user;
protected String password;
protected int keyIdentifierType = WSConstants.ISSUER_SERIAL;
- protected boolean doDebug;
protected CallbackLookup callbackLookup;
protected CallbackHandler attachmentCallbackHandler;
protected boolean storeBytesInAttachment;
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncrypt.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncrypt.java?rev=1785944&r1=1785943&r2=1785944&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncrypt.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncrypt.java Wed Mar 8 10:19:46 2017
@@ -165,13 +165,10 @@ public class WSSecEncrypt extends WSSecE
*/
public Document build(Crypto crypto)
throws WSSecurityException {
- doDebug = LOG.isDebugEnabled();
prepare(crypto);
- if (doDebug) {
- LOG.debug("Beginning Encryption...");
- }
+ LOG.debug("Beginning Encryption...");
Element refs = encrypt();
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncryptedKey.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncryptedKey.java?rev=1785944&r1=1785943&r2=1785944&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncryptedKey.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncryptedKey.java Wed Mar 8 10:19:46 2017
@@ -282,9 +282,7 @@ public class WSSecEncryptedKey extends W
);
}
int blockSize = cipher.getBlockSize();
- if (doDebug) {
- LOG.debug("cipher blksize: " + blockSize);
- }
+ LOG.debug("cipher blksize: {}", blockSize);
try {
encryptedEphemeralKey = cipher.wrap(keyToBeEncrypted);
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignature.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignature.java?rev=1785944&r1=1785943&r2=1785944&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignature.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignature.java Wed Mar 8 10:19:46 2017
@@ -353,11 +353,8 @@ public class WSSecSignature extends WSSe
*/
public Document build(Crypto cr)
throws WSSecurityException {
- doDebug = LOG.isDebugEnabled();
- if (doDebug) {
- LOG.debug("Beginning signing...");
- }
+ LOG.debug("Beginning signing...");
prepare(cr);
if (getParts().isEmpty()) {
@@ -830,9 +827,7 @@ public class WSSecSignature extends WSSe
//
if (sigAlgo == null) {
String pubKeyAlgo = certs[0].getPublicKey().getAlgorithm();
- if (LOG.isDebugEnabled()) {
- LOG.debug("Automatic signature algorithm detection: " + pubKeyAlgo);
- }
+ LOG.debug("Automatic signature algorithm detection: {}", pubKeyAlgo);
if (pubKeyAlgo.equalsIgnoreCase("DSA")) {
sigAlgo = WSConstants.DSA;
} else if (pubKeyAlgo.equalsIgnoreCase("RSA")) {
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/KerberosSecurity.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/KerberosSecurity.java?rev=1785944&r1=1785943&r2=1785944&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/KerberosSecurity.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/KerberosSecurity.java Wed Mar 8 10:19:46 2017
@@ -195,18 +195,14 @@ public class KerberosSecurity extends Bi
}
loginContext.login();
} catch (LoginException ex) {
- if (LOG.isDebugEnabled()) {
- LOG.debug(ex.getMessage(), ex);
- }
+ LOG.debug(ex.getMessage(), ex);
throw new WSSecurityException(
WSSecurityException.ErrorCode.FAILURE, ex,
"kerberosLoginError",
new Object[] {ex.getMessage()}
);
}
- if (LOG.isDebugEnabled()) {
- LOG.debug("Successfully authenticated to the TGT");
- }
+ LOG.debug("Successfully authenticated to the TGT");
Subject clientSubject = loginContext.getSubject();
Set<Principal> clientPrincipals = clientSubject.getPrincipals();
@@ -239,12 +235,10 @@ public class KerberosSecurity extends Bi
}
}
- if (LOG.isDebugEnabled()) {
- if (secretKey == null) {
- LOG.debug("No secret key for kerberos was found");
- } else {
- LOG.debug("Successfully retrieved a secret key for kerberos");
- }
+ if (secretKey == null) {
+ LOG.debug("No secret key for kerberos was found");
+ } else {
+ LOG.debug("Successfully retrieved a secret key for kerberos");
}
setToken(krbCtx.getKerberosToken());
@@ -262,9 +256,7 @@ public class KerberosSecurity extends Bi
krbCtx.dispose();
}
}
- if (LOG.isDebugEnabled()) {
- LOG.debug("Successfully retrieved a service ticket");
- }
+ LOG.debug("Successfully retrieved a service ticket");
if ("".equals(getValueType())) {
setValueType(WSConstants.WSS_GSS_KRB_V5_AP_REQ);
@@ -280,9 +272,7 @@ public class KerberosSecurity extends Bi
private KerberosTicket getKerberosTicket(Subject clientSubject, KerberosTicket previousTicket) {
Set<KerberosTicket> privateCredentials = clientSubject.getPrivateCredentials(KerberosTicket.class);
if (privateCredentials == null || privateCredentials.isEmpty()) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Kerberos client subject private credentials are null");
- }
+ LOG.debug("Kerberos client subject private credentials are null");
return null;
}
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/UsernameToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/UsernameToken.java?rev=1785944&r1=1785943&r2=1785944&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/UsernameToken.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/UsernameToken.java Wed Mar 8 10:19:46 2017
@@ -72,7 +72,6 @@ public class UsernameToken {
private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(UsernameToken.class);
- private static final boolean DO_DEBUG = LOG.isDebugEnabled();
private Element element;
private Element elementUsername;
@@ -539,9 +538,7 @@ public class UsernameToken {
elementPassword.setAttributeNS(null, "Type", passwordType);
}
} catch (Exception e) {
- if (DO_DEBUG) {
- LOG.debug(e.getMessage(), e);
- }
+ LOG.debug(e.getMessage(), e);
}
}
@@ -562,9 +559,7 @@ public class UsernameToken {
try {
callbackHandler.handle(new Callback[]{pwCb});
} catch (IOException | UnsupportedCallbackException e) {
- if (LOG.isDebugEnabled()) {
- LOG.debug(e.getMessage(), e);
- }
+ LOG.debug(e.getMessage(), e);
throw new WSSecurityException(
WSSecurityException.ErrorCode.FAILED_AUTHENTICATION, e
);
@@ -605,9 +600,7 @@ public class UsernameToken {
byte[] digestBytes = KeyUtils.generateDigest(b4);
passwdDigest = Base64.getMimeEncoder().encodeToString(digestBytes);
} catch (Exception e) {
- if (DO_DEBUG) {
- LOG.debug(e.getMessage(), e);
- }
+ LOG.debug(e.getMessage(), e);
}
return passwdDigest;
}
@@ -617,9 +610,7 @@ public class UsernameToken {
try {
passwdDigest = doPasswordDigest(nonce, created, password.getBytes(StandardCharsets.UTF_8));
} catch (Exception e) {
- if (DO_DEBUG) {
- LOG.debug(e.getMessage(), e);
- }
+ LOG.debug(e.getMessage(), e);
}
return passwdDigest;
}
@@ -783,9 +774,7 @@ public class UsernameToken {
result = 31 * result + Arrays.hashCode(salt);
}
} catch (WSSecurityException ex) {
- if (LOG.isDebugEnabled()) {
- LOG.debug(ex.getMessage(), ex);
- }
+ LOG.debug(ex.getMessage(), ex);
}
result = 31 * result + Integer.valueOf(getIteration()).hashCode();
@@ -819,9 +808,7 @@ public class UsernameToken {
return false;
}
} catch (WSSecurityException ex) {
- if (LOG.isDebugEnabled()) {
- LOG.debug(ex.getMessage(), ex);
- }
+ LOG.debug(ex.getMessage(), ex);
}
int iteration = usernameToken.getIteration();
if (iteration != getIteration()) {
@@ -850,9 +837,7 @@ public class UsernameToken {
);
// We can only have one password element
if (passwordElements.size() > 1) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("The Username Token had more than one password element");
- }
+ LOG.debug("The Username Token had more than one password element");
bspEnforcer.handleBSPRule(BSPRule.R4222);
}
@@ -861,9 +846,7 @@ public class UsernameToken {
Element passwordChild = passwordElements.get(0);
String type = passwordChild.getAttributeNS(null, WSConstants.PASSWORD_TYPE_ATTR);
if (type == null || "".equals(type)) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("The Username Token password does not have a Type attribute");
- }
+ LOG.debug("The Username Token password does not have a Type attribute");
bspEnforcer.handleBSPRule(BSPRule.R4201);
}
}
@@ -874,9 +857,7 @@ public class UsernameToken {
);
// We can only have one created element
if (createdElements.size() > 1) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("The Username Token has more than one created element");
- }
+ LOG.debug("The Username Token has more than one created element");
bspEnforcer.handleBSPRule(BSPRule.R4223);
}
@@ -886,9 +867,7 @@ public class UsernameToken {
);
// We can only have one nonce element
if (nonceElements.size() > 1) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("The Username Token has more than one nonce element");
- }
+ LOG.debug("The Username Token has more than one nonce element");
bspEnforcer.handleBSPRule(BSPRule.R4225);
}
@@ -899,9 +878,7 @@ public class UsernameToken {
if (encodingType == null || "".equals(encodingType)) {
bspEnforcer.handleBSPRule(BSPRule.R4220);
} else if (!WSConstants.BASE64_ENCODING.equals(encodingType)) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("The Username Token's nonce element has a bad encoding type");
- }
+ LOG.debug("The Username Token's nonce element has a bad encoding type");
bspEnforcer.handleBSPRule(BSPRule.R4221);
}
}
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java?rev=1785944&r1=1785943&r2=1785944&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java Wed Mar 8 10:19:46 2017
@@ -78,12 +78,10 @@ public class WSSecSignatureSAML extends
*/
public WSSecSignatureSAML(WSSecHeader securityHeader) {
super(securityHeader);
- doDebug = LOG.isDebugEnabled();
}
public WSSecSignatureSAML(Document doc) {
super(doc);
- doDebug = LOG.isDebugEnabled();
}
/**
@@ -187,9 +185,7 @@ public class WSSecSignatureSAML extends
String iKeyName, String iKeyPW
) throws WSSecurityException {
- if (doDebug) {
- LOG.debug("Beginning ST signing...");
- }
+ LOG.debug("Beginning ST signing...");
userCrypto = uCrypto;
issuerCrypto = iCrypto;
@@ -281,9 +277,7 @@ public class WSSecSignatureSAML extends
}
String pubKeyAlgo = key.getAlgorithm();
- if (doDebug) {
- LOG.debug("automatic sig algo detection: " + pubKeyAlgo);
- }
+ LOG.debug("automatic sig algo detection: {}", pubKeyAlgo);
if (pubKeyAlgo.equalsIgnoreCase("DSA")) {
setSignatureAlgorithm(WSConstants.DSA);
} else if (pubKeyAlgo.equalsIgnoreCase("RSA")) {
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/STRParserUtil.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/STRParserUtil.java?rev=1785944&r1=1785943&r2=1785944&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/STRParserUtil.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/STRParserUtil.java Wed Mar 8 10:19:46 2017
@@ -291,10 +291,8 @@ public final class STRParserUtil {
Document doc, WSDocInfo docInfo, CallbackHandler cb,
String uri, String valueType
) throws WSSecurityException {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Token reference uri: " + uri);
- LOG.debug("Token reference ValueType: " + valueType);
- }
+ LOG.debug("Token reference uri: {}", uri);
+ LOG.debug("Token reference ValueType: {}", valueType);
if (uri == null) {
throw new WSSecurityException(
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/STRTransformUtil.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/STRTransformUtil.java?rev=1785944&r1=1785943&r2=1785944&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/STRTransformUtil.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/STRTransformUtil.java Wed Mar 8 10:19:46 2017
@@ -64,9 +64,7 @@ public final class STRTransformUtil {
// reference to the BST or Assertion. Copying is done by the caller.
//
if (secRef.containsReference()) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("STR: Reference");
- }
+ LOG.debug("STR: Reference");
Reference reference = secRef.getReference();
return STRParserUtil.getTokenElement(doc, wsDocInfo, null, reference.getURI(), reference.getValueType());
@@ -75,9 +73,7 @@ public final class STRTransformUtil {
// second case: IssuerSerial, lookup in keystore, wrap in BST according
// to specification
//
- if (LOG.isDebugEnabled()) {
- LOG.debug("STR: IssuerSerial");
- }
+ LOG.debug("STR: IssuerSerial");
X509Certificate[] certs =
secRef.getX509IssuerSerial(wsDocInfo.getCrypto());
if (certs == null || certs.length == 0 || certs[0] == null) {
@@ -90,9 +86,7 @@ public final class STRTransformUtil {
// BST according to specification. Otherwise if it's a wsse:KeyIdentifier it could
// be a SAML assertion, so try and find the referenced element.
//
- if (LOG.isDebugEnabled()) {
- LOG.debug("STR: KeyIdentifier");
- }
+ LOG.debug("STR: KeyIdentifier");
if (WSConstants.WSS_SAML_KI_VALUE_TYPE.equals(secRef.getKeyIdentifierValueType())
|| WSConstants.WSS_SAML2_KI_VALUE_TYPE.equals(secRef.getKeyIdentifierValueType())) {
return STRParserUtil.getTokenElement(doc, wsDocInfo, null, secRef.getKeyIdentifierValue(),
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java?rev=1785944&r1=1785943&r2=1785944&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java Wed Mar 8 10:19:46 2017
@@ -129,11 +129,9 @@ public final class WSSecurityUtil {
if (WSSecurityUtil.isActorEqual(actor, hActor)) {
if (foundSecurityHeader != null) {
- if (LOG.isDebugEnabled()) {
- LOG.debug(
- "Two or more security headers have the same actor name: " + actor
- );
- }
+ LOG.debug(
+ "Two or more security headers have the same actor name: {}", actor
+ );
throw new WSSecurityException(WSSecurityException.ErrorCode.INVALID_SECURITY);
}
foundSecurityHeader = elem;
@@ -356,11 +354,9 @@ public final class WSSecurityUtil {
if (WSSecurityUtil.isActorEqual(actor, hActor)) {
if (foundSecurityHeader != null) {
- if (LOG.isDebugEnabled()) {
- LOG.debug(
- "Two or more security headers have the same actor name: " + actor
- );
- }
+ LOG.debug(
+ "Two or more security headers have the same actor name: {}", actor
+ );
throw new WSSecurityException(WSSecurityException.ErrorCode.INVALID_SECURITY);
}
foundSecurityHeader = elem;
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/X509Util.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/X509Util.java?rev=1785944&r1=1785943&r2=1785944&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/X509Util.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/X509Util.java Wed Mar 8 10:19:46 2017
@@ -73,9 +73,7 @@ public final class X509Util {
);
}
}
- if (LOG.isDebugEnabled()) {
- LOG.debug("Sym Enc Algo: " + symEncAlgo);
- }
+ LOG.debug("Sym Enc Algo: {}", symEncAlgo);
return symEncAlgo;
}