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

do not accept fast token w/o channel binding for channel bound login

Browse source
This commit is contained in:
Daniel Gultsch 2023-10-21 14:22:38 +02:00
parent 822f3f4d22
commit c44f4b102a
No known key found for this signature in database
GPG key ID: F43D18AD2A0982C2
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
View file

@ -65,6 +65,7 @@ import eu.siacs.conversations.R;
import eu.siacs.conversations.crypto.XmppDomainVerifier; import eu.siacs.conversations.crypto.XmppDomainVerifier;
import eu.siacs.conversations.crypto.axolotl.AxolotlService; import eu.siacs.conversations.crypto.axolotl.AxolotlService;
import eu.siacs.conversations.crypto.sasl.ChannelBinding; import eu.siacs.conversations.crypto.sasl.ChannelBinding;
import eu.siacs.conversations.crypto.sasl.ChannelBindingMechanism;
import eu.siacs.conversations.crypto.sasl.HashedToken; import eu.siacs.conversations.crypto.sasl.HashedToken;
import eu.siacs.conversations.crypto.sasl.SaslMechanism; import eu.siacs.conversations.crypto.sasl.SaslMechanism;
import eu.siacs.conversations.entities.Account; import eu.siacs.conversations.entities.Account;
@ -826,10 +827,15 @@ public class XmppConnection implements Runnable {
tokenMechanism = null; tokenMechanism = null;
} }
if (tokenMechanism != null && !Strings.isNullOrEmpty(token)) { if (tokenMechanism != null && !Strings.isNullOrEmpty(token)) {
this.account.setFastToken(tokenMechanism, token); if (ChannelBinding.priority(tokenMechanism.channelBinding) >= ChannelBindingMechanism.getPriority(currentSaslMechanism)) {
Log.d( this.account.setFastToken(tokenMechanism, token);
Config.LOGTAG, Log.d(
account.getJid().asBareJid() + ": storing hashed token " + tokenMechanism); Config.LOGTAG,
account.getJid().asBareJid() + ": storing hashed token " + tokenMechanism);
} else {
Log.d(Config.LOGTAG,account.getJid().asBareJid()+": not accepting hashed token "+ tokenMechanism.name()+" for log in mechanism "+currentSaslMechanism.getMechanism());
this.account.resetFastToken();
}
} else if (this.hashTokenRequest != null) { } else if (this.hashTokenRequest != null) {
Log.w( Log.w(
Config.LOGTAG, Config.LOGTAG,