You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ng...@apache.org on 2011/01/11 18:38:45 UTC
svn commit: r1057757 - in
/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp:
authorization/SimpleUserAuthorization.java
modules/extension/xep0133_service_administration/ServiceAdministrationModule.java
Author: ngn
Date: Tue Jan 11 17:38:45 2011
New Revision: 1057757
URL: http://svn.apache.org/viewvc?rev=1057757&view=rev
Log:
Fixing issues with authentication done on the full JID
Modified:
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/authorization/SimpleUserAuthorization.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0133_service_administration/ServiceAdministrationModule.java
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/authorization/SimpleUserAuthorization.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/authorization/SimpleUserAuthorization.java?rev=1057757&r1=1057756&r2=1057757&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/authorization/SimpleUserAuthorization.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/authorization/SimpleUserAuthorization.java Tue Jan 11 17:38:45 2011
@@ -23,6 +23,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.vysper.xmpp.addressing.Entity;
+import org.apache.vysper.xmpp.addressing.EntityImpl;
/**
* very simple in-memory {@link org.apache.vysper.xmpp.authorization.UserAuthorization} service
@@ -53,18 +54,18 @@ public class SimpleUserAuthorization imp
}
public boolean verifyCredentials(Entity jid, String passwordCleartext, Object credentials) {
- return verify(jid.getFullQualifiedName(), passwordCleartext);
+ return verify(jid.getBareJID(), passwordCleartext);
}
public boolean verifyCredentials(String username, String passwordCleartext, Object credentials) {
- return verify(username, passwordCleartext);
+ return verify(EntityImpl.parseUnchecked(username).getBareJID(), passwordCleartext);
}
public boolean verifyAccountExists(Entity jid) {
- return userPasswordMap.get(jid.getBareJID().getFullQualifiedName()) != null;
+ return userPasswordMap.get(jid.getBareJID()) != null;
}
- private boolean verify(String username, String passwordCleartext) {
+ private boolean verify(Entity username, String passwordCleartext) {
return passwordCleartext.equals(userPasswordMap.get(username));
}
}
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0133_service_administration/ServiceAdministrationModule.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0133_service_administration/ServiceAdministrationModule.java?rev=1057757&r1=1057756&r2=1057757&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0133_service_administration/ServiceAdministrationModule.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0133_service_administration/ServiceAdministrationModule.java Tue Jan 11 17:38:45 2011
@@ -136,7 +136,7 @@ public class ServiceAdministrationModule
final AccountManagement accountManagement = (AccountManagement)serverRuntimeContext.getStorageProvider(AccountManagement.class);
final ResourceRegistry resourceRegistry = serverRuntimeContext.getResourceRegistry();
- if (!admins.contains(executingUser)) {
+ if (!admins.contains(executingUser.getBareJID())) {
// non-admins can only admin their own accounts
if (commandNode.equals(COMMAND_CHANGE_USER_PASSWORD)) {
return new ChangeUserPasswordCommandHandler(accountManagement, executingUser);