JM-1419: Added encoding for non-ASCII characters in many webservice URL...

JM-1419: Added encoding for non-ASCII characters in many webservice URL requests. To be reviewed by Gabriel.

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@10639 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/jivesoftware/openfire/clearspace/ClearspaceAdminProvider.java

@@ -65,7 +65,7 @@ public class ClearspaceAdminProvider implements AdminProvider {
         }
         catch (ConnectException e) {
             Log.error(e);
-            return new ArrayList();
+            return new ArrayList<JID>();
         }
         catch (Exception e) {
             // It is not supported exception, wrap it into an UnsupportedOperationException

src/java/org/jivesoftware/openfire/clearspace/ClearspaceAuthProvider.java

@@ -16,6 +16,7 @@ import static org.jivesoftware.openfire.clearspace.ClearspaceManager.HttpType.GE
 import org.jivesoftware.openfire.net.SASLAuthentication;
 import org.jivesoftware.openfire.user.UserNotFoundException;
 import org.xmpp.packet.JID;
+import org.jdesktop.jdic.desktop.internal.impl.URLUTF8Encoder;
 
 /**
  * The ClearspaceAuthProvider uses the PermissionService web service inside of Clearspace
@@ -52,7 +53,7 @@ public class ClearspaceAuthProvider implements AuthProvider {
     }
 
     /**
-     * Authenticates the user using permissionService/authenticate servicie of Clearspace.
+     * Authenticates the user using permissionService/authenticate service of Clearspace.
      * Throws an UnauthorizedException if the user or password are incorrect.
      *
      * @param username the username.
@@ -63,6 +64,8 @@ public class ClearspaceAuthProvider implements AuthProvider {
         try {
             // Un-escape username.
             username = JID.unescapeNode(username);
+            // Encode potentially non-ASCII characters
+            username = URLUTF8Encoder.encode(username);
             String path = URL_PREFIX + "authenticate/" + username + "/" + password;
             ClearspaceManager.getInstance().executeRequest(GET, path);
         } catch (UnauthorizedException ue) {

src/java/org/jivesoftware/openfire/clearspace/ClearspaceGroupProvider.java

@@ -22,6 +22,7 @@ import org.jivesoftware.openfire.group.GroupNotFoundException;
 import org.jivesoftware.openfire.group.GroupProvider;
 import org.jivesoftware.openfire.user.UserNotFoundException;
 import org.xmpp.packet.JID;
+import org.jdesktop.jdic.desktop.internal.impl.URLUTF8Encoder;
 
 import java.util.*;
 
@@ -229,6 +230,8 @@ public class ClearspaceGroupProvider implements GroupProvider {
      */
     private Element getGroupByName(String name) throws GroupNotFoundException {
         try {
+            // Encode potentially non-ASCII characters
+            name = URLUTF8Encoder.encode(name);
             String path = URL_PREFIX + "socialGroupsByName/" + name;
 
             return ClearspaceManager.getInstance().executeRequest(GET, path);

src/java/org/jivesoftware/openfire/clearspace/ClearspaceLockOutProvider.java

@@ -22,6 +22,7 @@ import org.jivesoftware.openfire.lockout.LockOutProvider;
 import org.jivesoftware.openfire.user.UserNotFoundException;
 import org.jivesoftware.util.Log;
 import org.xmpp.packet.JID;
+import org.jdesktop.jdic.desktop.internal.impl.URLUTF8Encoder;
 
 import java.util.List;
 
@@ -209,6 +210,8 @@ public class ClearspaceLockOutProvider implements LockOutProvider {
         try {
             // Un-escape username.
             username = JID.unescapeNode(username);
+            // Encode potentially non-ASCII characters
+            username = URLUTF8Encoder.encode(username);
             // Requests the user
             String path = USER_URL_PREFIX + "users/" + username;
             // return the response

src/java/org/jivesoftware/openfire/clearspace/ClearspaceManager.java

@@ -47,6 +47,7 @@ import org.xmlpull.v1.XmlPullParserException;
 import org.xmlpull.v1.XmlPullParserFactory;
 import org.xmpp.packet.IQ;
 import org.xmpp.packet.JID;
+import org.jdesktop.jdic.desktop.internal.impl.URLUTF8Encoder;
 
 import java.io.IOException;
 import java.lang.reflect.Constructor;
@@ -330,6 +331,8 @@ public class ClearspaceManager extends BasicModule implements ExternalComponentM
         try {
             // Un-escape username.
             username = JID.unescapeNode(username);
+            // Encode potentially non-ASCII characters
+            username = URLUTF8Encoder.encode(username);
             String path = ClearspaceAuthProvider.URL_PREFIX + "authenticate/" + username + "/" + password;
             executeRequest(GET, path);
             return true;
@@ -985,6 +988,8 @@ public class ClearspaceManager extends BasicModule implements ExternalComponentM
 
         // Un-escape username.
         String unescapedUsername = JID.unescapeNode(username);
+        // Encode potentially non-ASCII characters
+        unescapedUsername = URLUTF8Encoder.encode(unescapedUsername);
         // Gets the user's ID from Clearspace
         try {
             String path = ClearspaceUserProvider.USER_URL_PREFIX + "users/" + unescapedUsername;
@@ -1070,6 +1075,8 @@ public class ClearspaceManager extends BasicModule implements ExternalComponentM
             return groupIDCache.get(groupname);
         }
         try {
+            // Encode potentially non-ASCII characters
+            groupname = URLUTF8Encoder.encode(groupname);
             String path = ClearspaceGroupProvider.URL_PREFIX + "groups/" + groupname;
             Element element = executeRequest(org.jivesoftware.openfire.clearspace.ClearspaceManager.HttpType.GET, path);
 

src/java/org/jivesoftware/openfire/clearspace/ClearspaceSecurityAuditProvider.java

@@ -19,6 +19,7 @@ import org.jivesoftware.openfire.security.SecurityAuditEvent;
 import org.jivesoftware.openfire.security.SecurityAuditProvider;
 import org.jivesoftware.util.Log;
 import org.xmpp.packet.JID;
+import org.jdesktop.jdic.desktop.internal.impl.URLUTF8Encoder;
 
 import java.util.Date;
 import java.util.List;
@@ -56,6 +57,8 @@ public class ClearspaceSecurityAuditProvider implements SecurityAuditProvider {
             Element userE = rootE.addElement("username");
             // Un-escape username.
             username = JID.unescapeNode(username);
+            // Encode potentially non-ASCII characters
+            username = URLUTF8Encoder.encode(username);
             userE.addText(username);
             Element descE = rootE.addElement("description");
             if (summary != null) {

src/java/org/jivesoftware/openfire/clearspace/ClearspaceUserProvider.java

@@ -124,7 +124,7 @@ public class ClearspaceUserProvider implements UserProvider {
     }
 
     /**
-     * Creates user using the userService/users DELETE service. If the user is not found returns.
+     * Deletes a user using the userService/users DELETE service. If the user is not found returns.
      *
      * @param username the username of the user to delete
      */
@@ -135,7 +135,7 @@ public class ClearspaceUserProvider implements UserProvider {
         }
 
         try {
-             // Encode potentially non-ASCII characters
+            // Encode potentially non-ASCII characters
             username = URLUTF8Encoder.encode(username);
             long userID = ClearspaceManager.getInstance().getUserID(username);
             String path = USER_URL_PREFIX + "users/" + userID;

src/java/org/jivesoftware/openfire/user/User.java

@@ -158,7 +158,7 @@ public class User implements Cacheable, Externalizable, Result {
      * Sets a new password for this user.
      *
      * @param password the new password for the user.
-     * @throws UnsupportedOperationException
+     * @throws UnsupportedOperationException exception
      */
     public void setPassword(String password) throws UnsupportedOperationException {
         if (UserManager.getUserProvider().isReadOnly()) {