narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

Merge pull request #744 from SamWhited/development

Browse source 
Fix DIGEST-MD5 auth
This commit is contained in:
Daniel Gultsch 2014-12-03 01:43:23 +01:00
parent 46b2760069 feec659b08
commit 605998c966
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/crypto/sasl/DigestMd5.java
View file

@ -39,7 +39,7 @@ public class DigestMd5 extends SaslMechanism {
final Tokenizer tokenizer = new Tokenizer(Base64.decode(challenge, Base64.DEFAULT)); final Tokenizer tokenizer = new Tokenizer(Base64.decode(challenge, Base64.DEFAULT));
String nonce = ""; String nonce = "";
for (final String token : tokenizer) { for (final String token : tokenizer) {
final String[] parts = token.split("="); final String[] parts = token.split("=", 2);
if (parts[0].equals("nonce")) { if (parts[0].equals("nonce")) {
nonce = parts[1].replace("\"", ""); nonce = parts[1].replace("\"", "");
} else if (parts[0].equals("rspauth")) { } else if (parts[0].equals("rspauth")) {

4
src/main/java/eu/siacs/conversations/crypto/sasl/Tokenizer.java
View file

@ -16,6 +16,10 @@ public final class Tokenizer implements Iterator<String>, Iterable<String> {
public Tokenizer(final byte[] challenge) { public Tokenizer(final byte[] challenge) {
final String challengeString = new String(challenge); final String challengeString = new String(challenge);
parts = new ArrayList<>(Arrays.asList(challengeString.split(","))); parts = new ArrayList<>(Arrays.asList(challengeString.split(",")));
// Trim parts.
for (int i = 0; i < parts.size(); i++) {
parts.set(i, parts.get(i).trim());
}
index = 0; index = 0;
} }