Apache/httpcomponents-client
1
0
Fork 0
mirror of https://github.com/apache/httpcomponents-client.git synced 2025-02-16 15:07:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Convert QOP constants into an enum.

Browse Source
This commit is contained in:
Arturo Bernal 2021-11-18 22:50:21 +01:00 committed by Oleg Kalnichevski
parent d2c59fd5e4
commit ef9f8ba9ab
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/DigestScheme.java
View File

@ -100,10 +100,12 @@ public class DigestScheme implements AuthScheme, Serializable {
'e', 'f'
};
private static final int QOP_UNKNOWN = -1;
private static final int QOP_MISSING = 0;
private static final int QOP_AUTH_INT = 1;
private static final int QOP_AUTH = 2;
/**
* Represent the possible values of quality of protection.
*/
private enum QualityOfProtection {
UNKNOWN, MISSING, AUTH_INT, AUTH
}
private transient Charset defaultCharset;
private final Map<String, String> paramMap;
@ -250,7 +252,7 @@ private String createDigestResponse(final HttpRequest request) throws Authentica
}
final Set<String> qopset = new HashSet<>(8);
int qop = QOP_UNKNOWN;
QualityOfProtection qop = QualityOfProtection.UNKNOWN;
final String qoplist = this.paramMap.get("qop");
if (qoplist != null) {
final StringTokenizer tok = new StringTokenizer(qoplist, ",");
@ -260,17 +262,17 @@ private String createDigestResponse(final HttpRequest request) throws Authentica
}
final HttpEntity entity = request instanceof ClassicHttpRequest ? ((ClassicHttpRequest) request).getEntity() : null;
if (entity != null && qopset.contains("auth-int")) {
qop = QOP_AUTH_INT;
qop = QualityOfProtection.AUTH_INT;
} else if (qopset.contains("auth")) {
qop = QOP_AUTH;
qop = QualityOfProtection.AUTH;
} else if (qopset.contains("auth-int")) {
qop = QOP_AUTH_INT;
qop = QualityOfProtection.AUTH_INT;
}
} else {
qop = QOP_MISSING;
qop = QualityOfProtection.MISSING;
}
if (qop == QOP_UNKNOWN) {
if (qop == QualityOfProtection.UNKNOWN) {
throw new AuthenticationException("None of the qop methods is supported: " + qoplist);
}
@ -334,16 +336,16 @@ private String createDigestResponse(final HttpRequest request) throws Authentica
final String hasha1 = formatHex(digester.digest(a1));
buffer.reset();
if (qop == QOP_AUTH) {
if (qop == QualityOfProtection.AUTH) {
// Method ":" digest-uri-value
a2 = buffer.append(method).append(":").append(uri).toByteArray();
} else if (qop == QOP_AUTH_INT) {
} else if (qop == QualityOfProtection.AUTH_INT) {
// Method ":" digest-uri-value ":" H(entity-body)
final HttpEntity entity = request instanceof ClassicHttpRequest ? ((ClassicHttpRequest) request).getEntity() : null;
if (entity != null && !entity.isRepeatable()) {
// If the entity is not repeatable, try falling back onto QOP_AUTH
if (qopset.contains("auth")) {
qop = QOP_AUTH;
qop = QualityOfProtection.AUTH;
a2 = buffer.append(method).append(":").append(uri).toByteArray();
} else {
throw new AuthenticationException("Qop auth-int cannot be used with " +
@ -372,11 +374,11 @@ private String createDigestResponse(final HttpRequest request) throws Authentica
// 3.2.2.1
final byte[] digestInput;
if (qop == QOP_MISSING) {
if (qop == QualityOfProtection.MISSING) {
buffer.append(hasha1).append(":").append(nonce).append(":").append(hasha2);
} else {
buffer.append(hasha1).append(":").append(nonce).append(":").append(nc).append(":")
.append(cnonce).append(":").append(qop == QOP_AUTH_INT ? "auth-int" : "auth")
.append(cnonce).append(":").append(qop == QualityOfProtection.AUTH_INT ? "auth-int" : "auth")
.append(":").append(hasha2);
}
digestInput = buffer.toByteArray();
@ -394,8 +396,8 @@ private String createDigestResponse(final HttpRequest request) throws Authentica
params.add(new BasicNameValuePair("uri", uri));
params.add(new BasicNameValuePair("response", digest));
if (qop != QOP_MISSING) {
params.add(new BasicNameValuePair("qop", qop == QOP_AUTH_INT ? "auth-int" : "auth"));
if (qop != QualityOfProtection.MISSING) {
params.add(new BasicNameValuePair("qop", qop == QualityOfProtection.AUTH_INT ? "auth-int" : "auth"));
params.add(new BasicNameValuePair("nc", nc));
params.add(new BasicNameValuePair("cnonce", cnonce));
}