diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-09-14 09:34:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-14 09:34:20 +0200 |
| commit | 7b52e6984c04d3e6aa5d056382d748886111e14f (patch) | |
| tree | c8557d29096d3a5a9d79f6edf968bbb06236ec92 | |
| parent | 869ee3d4381178f8ff20e3a1dcb07067b7b07845 (diff) | |
| parent | 1a0b538166134963fcb3a250caa78a7b625d6266 (diff) | |
Merge pull request #2018 from SamWhited/sasl_anonymous
SASL ANONYMOUS (no UI)
| -rw-r--r-- | src/main/java/eu/siacs/conversations/crypto/sasl/Anonymous.java | 28 | ||||
| -rw-r--r-- | src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java | 5 |
2 files changed, 32 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/crypto/sasl/Anonymous.java b/src/main/java/eu/siacs/conversations/crypto/sasl/Anonymous.java new file mode 100644 index 00000000..4672bc1f --- /dev/null +++ b/src/main/java/eu/siacs/conversations/crypto/sasl/Anonymous.java @@ -0,0 +1,28 @@ +package eu.siacs.conversations.crypto.sasl; + +import java.security.SecureRandom; + +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.xml.TagWriter; + +public class Anonymous extends SaslMechanism { + + public Anonymous(TagWriter tagWriter, Account account, SecureRandom rng) { + super(tagWriter, account, rng); + } + + @Override + public int getPriority() { + return 0; + } + + @Override + public String getMechanism() { + return "ANONYMOUS"; + } + + @Override + public String getClientFirstMessage() { + return ""; + } +} diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java index 964444af..fca5c566 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java +++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java @@ -55,6 +55,7 @@ import javax.net.ssl.X509TrustManager; import de.duenndns.ssl.MemorizingTrustManager; import eu.siacs.conversations.Config; import eu.siacs.conversations.crypto.XmppDomainVerifier; +import eu.siacs.conversations.crypto.sasl.Anonymous; import eu.siacs.conversations.crypto.sasl.DigestMd5; import eu.siacs.conversations.crypto.sasl.External; import eu.siacs.conversations.crypto.sasl.Plain; @@ -841,6 +842,8 @@ public class XmppConnection implements Runnable { saslMechanism = new Plain(tagWriter, account); } else if (mechanisms.contains("DIGEST-MD5")) { saslMechanism = new DigestMd5(tagWriter, account, mXmppConnectionService.getRNG()); + } else if (mechanisms.contains("ANONYMOUS")) { + saslMechanism = new Anonymous(tagWriter, account, mXmppConnectionService.getRNG()); } if (saslMechanism != null) { final JSONObject keys = account.getKeys(); @@ -978,7 +981,7 @@ public class XmppConnection implements Runnable { final Element jid = bind.findChild("jid"); if (jid != null && jid.getContent() != null) { try { - account.setResource(Jid.fromString(jid.getContent()).getResourcepart()); + account.setJid(Jid.fromString(jid.getContent())); if (streamFeatures.hasChild("session") && !streamFeatures.findChild("session").hasChild("optional")) { sendStartSession(); |