Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-22 06:12:05 +01:00
Code Issues Releases Wiki Activity

Fix SASL EXTERNAL with client cert provided JID

Browse source 
isAnonymous() is now a bit weakened since it also considers
allowNullorEmptyUsername.

SaslExternalMechanism of smack-sasl-provided now also doesn't throw an
UnsupportedOperationException.

Follow up on 7e4e3699a1
This commit is contained in:
Florian Schmaus 2015-01-12 15:38:56 +01:00
parent 1d83db898e
commit c682091a47
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java
View file

@ -532,7 +532,8 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
@Override @Override
public final boolean isAnonymous() { public final boolean isAnonymous() {
return config.getUsername() == null && usedUsername == null; return config.getUsername() == null && usedUsername == null
&& !config.allowNullOrEmptyUsername;
} }
private String serviceName; private String serviceName;

3
smack-sasl-provided/src/main/java/org/jivesoftware/smack/sasl/provided/SASLExternalMechanism.java
View file

@ -34,7 +34,8 @@ public class SASLExternalMechanism extends SASLMechanism {
@Override @Override
protected void authenticateInternal(CallbackHandler cbh) throws SmackException { protected void authenticateInternal(CallbackHandler cbh) throws SmackException {
throw new UnsupportedOperationException("CallbackHandler not (yet) supported"); // Do nothing. Auth will be done external to Smack and which will receive the localpart
// after the resource binding
} }
@Override @Override