Skip to content

O
Openfire
Commit 62a64a25 authored by Guus der Kinderen's avatar Guus der Kinderen Committed by daryl herzmann
Browse files
Options

OF-477: SASL realm should be XMPP domain. (#591)

parent d0f20e90
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 5 deletions
src/java/org/jivesoftware/openfire/net/XMPPCallbackHandler.java
View file @ 62a64a25
...@@ -29,6 +29,7 @@ import javax.security.auth.callback.UnsupportedCallbackException; ...@@ -29,6 +29,7 @@ import javax.security.auth.callback.UnsupportedCallbackException;
import javax.security.sasl.AuthorizeCallback; import javax.security.sasl.AuthorizeCallback;
import javax.security.sasl.RealmCallback; import javax.security.sasl.RealmCallback;
import org.jivesoftware.openfire.XMPPServer;
import org.jivesoftware.openfire.auth.AuthFactory; import org.jivesoftware.openfire.auth.AuthFactory;
import org.jivesoftware.openfire.auth.AuthToken; import org.jivesoftware.openfire.auth.AuthToken;
import org.jivesoftware.openfire.auth.AuthorizationManager; import org.jivesoftware.openfire.auth.AuthorizationManager;
...@@ -66,11 +67,7 @@ public class XMPPCallbackHandler implements CallbackHandler { ...@@ -66,11 +67,7 @@ public class XMPPCallbackHandler implements CallbackHandler {
for (Callback callback : callbacks) { for (Callback callback : callbacks) {
if (callback instanceof RealmCallback) { if (callback instanceof RealmCallback) {
realm = ((RealmCallback) callback).getText(); ((RealmCallback) callback).setText( XMPPServer.getInstance().getServerInfo().getXMPPDomain() );
if (realm == null) {
realm = ((RealmCallback) callback).getDefaultText();
}
//Log.debug("XMPPCallbackHandler: RealmCallback: " + realm);
} }
else if (callback instanceof NameCallback) { else if (callback instanceof NameCallback) {
name = ((NameCallback) callback).getName(); name = ((NameCallback) callback).getName();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023