This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 116d9babd8 More clean-up
116d9babd8 is described below
commit 116d9babd8563d77e51ffaaef9832afea085db71
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Sep 8 19:51:42 2022 +0100
More clean-up
---
java/org/apache/tomcat/websocket/BasicAuthenticator.java | 4 ++--
java/org/apache/tomcat/websocket/DigestAuthenticator.java | 7 +++----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/tomcat/websocket/BasicAuthenticator.java
b/java/org/apache/tomcat/websocket/BasicAuthenticator.java
index 439a7bbc2b..02f34ebee2 100644
--- a/java/org/apache/tomcat/websocket/BasicAuthenticator.java
+++ b/java/org/apache/tomcat/websocket/BasicAuthenticator.java
@@ -30,7 +30,7 @@ public class BasicAuthenticator extends Authenticator {
public static final String charsetparam = "charset";
@Override
- public String getAuthorization(String requestUri, String WWWAuthenticate,
+ public String getAuthorization(String requestUri, String
authenticateHeader,
Map<String, Object> userProperties) throws AuthenticationException
{
String userName = (String)
userProperties.get(Constants.WS_AUTHENTICATION_USER_NAME);
@@ -41,7 +41,7 @@ public class BasicAuthenticator extends Authenticator {
"Failed to perform Basic authentication due to missing
user/password");
}
- Map<String, String> parameterMap =
parseWWWAuthenticateHeader(WWWAuthenticate);
+ Map<String, String> parameterMap =
parseWWWAuthenticateHeader(authenticateHeader);
String userPass = userName + ":" + userPassword;
Charset charset;
diff --git a/java/org/apache/tomcat/websocket/DigestAuthenticator.java
b/java/org/apache/tomcat/websocket/DigestAuthenticator.java
index 0ea037afde..53c3f45a28 100644
--- a/java/org/apache/tomcat/websocket/DigestAuthenticator.java
+++ b/java/org/apache/tomcat/websocket/DigestAuthenticator.java
@@ -36,7 +36,7 @@ public class DigestAuthenticator extends Authenticator {
private long cNonce;
@Override
- public String getAuthorization(String requestUri, String WWWAuthenticate,
+ public String getAuthorization(String requestUri, String
authenticateHeader,
Map<String, Object> userProperties) throws AuthenticationException
{
String userName = (String)
userProperties.get(Constants.WS_AUTHENTICATION_USER_NAME);
@@ -47,13 +47,12 @@ public class DigestAuthenticator extends Authenticator {
"Failed to perform Digest authentication due to missing
user/password");
}
- Map<String, String> parameterMap =
parseWWWAuthenticateHeader(WWWAuthenticate);
+ Map<String, String> parameterMap =
parseWWWAuthenticateHeader(authenticateHeader);
String realm = parameterMap.get("realm");
String nonce = parameterMap.get("nonce");
String messageQop = parameterMap.get("qop");
- String algorithm = parameterMap.get("algorithm") == null ? "MD5"
- : parameterMap.get("algorithm");
+ String algorithm = parameterMap.get("algorithm") == null ? "MD5" :
parameterMap.get("algorithm");
String opaque = parameterMap.get("opaque");
StringBuilder challenge = new StringBuilder();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
