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

Add AbstractXMPPConnection.getUsedSaslMechanism()

Browse source 
and improve isAnonymous(). Also some minor changes to
SASLAuthentication.
This commit is contained in:
Florian Schmaus 2015-05-18 18:21:05 +02:00
parent f369a009ac
commit 3c2ba0ec43
2 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -73,6 +73,7 @@ import org.jivesoftware.smack.packet.XMPPError;
import org.jivesoftware.smack.parsing.ParsingExceptionCallback; import org.jivesoftware.smack.parsing.ParsingExceptionCallback;
import org.jivesoftware.smack.provider.ExtensionElementProvider; import org.jivesoftware.smack.provider.ExtensionElementProvider;
import org.jivesoftware.smack.provider.ProviderManager; import org.jivesoftware.smack.provider.ProviderManager;
import org.jivesoftware.smack.sasl.core.SASLAnonymous;
import org.jivesoftware.smack.util.DNSUtil; import org.jivesoftware.smack.util.DNSUtil;
import org.jivesoftware.smack.util.Objects; import org.jivesoftware.smack.util.Objects;
import org.jivesoftware.smack.util.PacketParserUtils; import org.jivesoftware.smack.util.PacketParserUtils;
@ -551,8 +552,19 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
@Override @Override
public final boolean isAnonymous() { public final boolean isAnonymous() {
return config.getUsername() == null && usedUsername == null return isAuthenticated() && SASLAnonymous.NAME.equals(getUsedSaslMechansism());
&& !config.allowNullOrEmptyUsername; }
/**
* Get the name of the SASL mechanism that was used to authenticate this connection. This returns the name of
* mechanism which was used the last time this conneciton was authenticated, and will return <code>null</code> if
* this connection was not authenticated before.
*
* @return the name of the used SASL mechanism.
* @since 4.2
*/
public final String getUsedSaslMechansism() {
return saslAuthentication.getNameOfLastUsedSaslMechansism();
} }
private DomainBareJid xmppServiceDomain; private DomainBareJid xmppServiceDomain;

12
smack-core/src/main/java/org/jivesoftware/smack/SASLAuthentication.java
View file

@ -56,7 +56,7 @@ import java.util.logging.Logger;
* @author Gaston Dombiak * @author Gaston Dombiak
* @author Jay Kline * @author Jay Kline
*/ */
public class SASLAuthentication { public final class SASLAuthentication {
private static final Logger LOGGER = Logger.getLogger(SASLAuthentication.class.getName()); private static final Logger LOGGER = Logger.getLogger(SASLAuthentication.class.getName());
@ -294,11 +294,19 @@ public class SASLAuthentication {
* is used by the connection at the first login and then reused after the connection * is used by the connection at the first login and then reused after the connection
* is disconnected and then reconnected. * is disconnected and then reconnected.
*/ */
protected void init() { void init() {
authenticationSuccessful = false; authenticationSuccessful = false;
saslException = null; saslException = null;
} }
String getNameOfLastUsedSaslMechansism() {
SASLMechanism lastUsedMech = currentMechanism;
if (lastUsedMech == null) {
return null;
}
return lastUsedMech.getName();
}
private SASLMechanism selectMechanism() throws SmackException { private SASLMechanism selectMechanism() throws SmackException {
Iterator<SASLMechanism> it = REGISTERED_MECHANISMS.iterator(); Iterator<SASLMechanism> it = REGISTERED_MECHANISMS.iterator();
final List<String> serverMechanisms = getServerMechanisms(); final List<String> serverMechanisms = getServerMechanisms();