Updating code to use UTF-8 encoding

Fixing bug #974 partially : Error 401 whith special chars in username.


git-svn-id: https://www.silverpeas.org/svn/silverpeas/services/office-online/trunk@2278 a8e77078-a1c7-4fa5-b8fc-53c5178a176c

Author: Emmanuel Hugonnet

pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.silverpeas</groupId>
     <artifactId>parent</artifactId>
-    <version>6.0</version>
+    <version>14</version>
   </parent>
 
   <scm>
@@ -134,12 +134,4 @@
   </properties>
 
 
-</project>
-
-
-
-
-
-
-
-
+</project>

src/main/java/com/silverpeas/openoffice/Launcher.java

@@ -64,7 +64,7 @@ public static void main(final String[] args) throws OfficeNotFoundException {
       logger.log(Level.INFO, "{0}{1}", new Object[] { MessageUtil.getMessage("info.url.decoded"),
           url });
       if (args[1] != null && !"".equals(args[1].trim())) {
-        logger.log(Level.INFO, "{0} {2}", new Object[] {
+        logger.log(Level.INFO, "{0} {1}", new Object[] {
             MessageUtil.getMessage("info.default.path"), UrlExtractor.decodePath(args[1]) });
         MsOfficePathFinder.basePath = UrlExtractor.decodePath(args[1]);
       }

src/main/java/com/silverpeas/openoffice/util/PasswordManager.java

@@ -32,6 +32,7 @@
 import com.silverpeas.openoffice.Launcher;
 import java.io.UnsupportedEncodingException;
 import java.math.BigInteger;
+import java.net.URLDecoder;
 import java.security.GeneralSecurityException;
 import java.security.Key;
 import java.util.logging.Level;
@@ -59,8 +60,7 @@ public static String decodePassword(String encodedPassword) throws
     Cipher cipher = Cipher.getInstance("DES");
     cipher.init(Cipher.DECRYPT_MODE, decryptionKey);
     byte[] bytes = new BigInteger(encodedPassword, 16).toByteArray();
-    Logger.getLogger(Launcher.class.getName()).log(Level.INFO,
-        "decrypted password byte array length : " + bytes.length);
+    Logger.getLogger(Launcher.class.getName()).log(Level.INFO, "decrypted password byte array length : {0}", bytes.length);
     int nbCaracToRemove = (bytes.length) % 8;
     byte[] result = new byte[bytes.length - nbCaracToRemove];
     System.arraycopy(bytes, nbCaracToRemove, result, 0, bytes.length -
@@ -78,7 +78,7 @@ public static String encodePassword(String password) throws
     Cipher cipher = Cipher.getInstance("DES");
     cipher.init(Cipher.ENCRYPT_MODE, decryptionKey);
     byte[] cipherText = cipher.doFinal(password.getBytes("UTF-8"));
-    StringBuffer buf = new StringBuffer();
+    StringBuilder buf = new StringBuilder();
     for (int i = 0; i != cipherText.length; i++) {
       int v = cipherText[i] & 0xff;
       buf.append(DIGITS.charAt(v >> 4));
@@ -92,16 +92,17 @@ public static String encodePassword(String password) throws
    * @param args arguments passed through JNLP
    * @return the Authentication object
    */
-  public static AuthenticationInfo extractAuthenticationInfo(String login,
-      String encodedPassword) {
+  public static AuthenticationInfo extractAuthenticationInfo(String login, String encodedPassword) {
     String clearPwd = null;
+    String decodedLogin = login;
     try {
       clearPwd = decodePassword(encodedPassword);
+      decodedLogin = URLDecoder.decode(login, "UTF-8");
     } catch (Exception e) {
-      Logger.getLogger(Launcher.class.getName()).log(Level.SEVERE,
-          "can't retrieve credentials", e);
+      Logger.getLogger(Launcher.class.getName()).log(Level.SEVERE, "can't retrieve credentials", e);
       System.exit(-1);
     }
-    return new AuthenticationInfo(login, clearPwd);
+
+    return new AuthenticationInfo(decodedLogin, clearPwd);
   }
 }

src/main/java/com/silverpeas/openoffice/windows/FileWebDavAccessManager.java

@@ -45,8 +45,7 @@ public class FileWebDavAccessManager {
   private String userName;
   private String password;
   private String lockToken = null;
-  static Logger logger = Logger.getLogger(
-      FileWebDavAccessManager.class.getName());
+  static Logger logger = Logger.getLogger(FileWebDavAccessManager.class.getName());
 
   /**
    * The AccessManager is inited with authentication info to avoid login prompt
@@ -69,11 +68,11 @@ public String retrieveFile(String url) throws HttpException, IOException {
     WebdavManager webdav = new WebdavManager(uri.getHost(), userName, password);
     // Let's lock the file
     lockToken = webdav.lockFile(uri, userName);
-    logger.log(Level.INFO, MessageUtil.getMessage("info.webdav.locked") + ' '
-        + lockToken);
+    logger.log(Level.INFO, "{0}{1}{2}", new Object[]{MessageUtil.getMessage("info.webdav.locked"),
+          ' ', lockToken});
     String tmpFile = webdav.getFile(uri, lockToken);
-    logger.log(Level.INFO, MessageUtil.getMessage("info.webdav.file.locally.saved") + ' '
-        + tmpFile);
+    logger.log(Level.INFO, "{0}{1}{2}", new Object[]{MessageUtil.getMessage(
+          "info.webdav.file.locally.saved"), ' ', tmpFile});
     return tmpFile;
   }
 
@@ -88,11 +87,9 @@ public void pushFile(String tmpFilePath, String url) throws HttpException,
       IOException {
     URI uri = getURI(url);
     WebdavManager webdav = new WebdavManager(uri.getHost(), userName, password);
-    logger.log(Level.INFO, MessageUtil.getMessage("info.webdav.put")
-        + ' ' + tmpFilePath);
+    logger.log(Level.INFO, "{0}{1}{2}", new Object[]{MessageUtil.getMessage("info.webdav.put"), ' ', tmpFilePath});
     webdav.putFile(uri, tmpFilePath, lockToken);
-    logger.log(Level.INFO, MessageUtil.getMessage("info.webdav.unlocking")
-        + ' ' + uri.getEscapedURI());
+    logger.log(Level.INFO, "{0}{1}{2}", new Object[]{MessageUtil.getMessage("info.webdav.unlocking"), ' ', uri.getEscapedURI()});
     // Let's unlock the file
     webdav.unlockFile(uri, lockToken);
     // delete temp file

src/main/java/com/silverpeas/openoffice/windows/webdav/WebdavManager.java

@@ -84,7 +84,7 @@ public WebdavManager(String host, String login, String password) {
     connectionParams.setMaxConnectionsPerHost(hostConfig, maxHostConnections);
     connectionManager.setParams(connectionParams);
     HttpClientParams clientParams = new HttpClientParams();
-    clientParams.setParameter(HttpClientParams.CREDENTIAL_CHARSET, "ISO-8859-1");
+    clientParams.setParameter(HttpClientParams.CREDENTIAL_CHARSET, "UTF-8");
     clientParams.setParameter(HttpClientParams.PROTOCOL_VERSION, HttpVersion.HTTP_1_1);
     client = new HttpClient(clientParams, connectionManager);
     Credentials creds = new UsernamePasswordCredentials(login, password);

src/test/java/com/silverpeas/openoffice/util/PasswordManagerTest.java

@@ -21,12 +21,6 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
 package com.silverpeas.openoffice.util;
 
 import com.silverpeas.openoffice.AuthenticationInfo;
@@ -37,7 +31,7 @@
  * @author ehugonnet
  */
 public class PasswordManagerTest extends TestCase {
-    
+
     public PasswordManagerTest(String testName) {
         super(testName);
     }
@@ -84,12 +78,16 @@ public void testEncodePassword() throws Exception {
    * Test of extractAuthenticationInfo method, of class PasswordManager.
    */
   public void testExtractAuthenticationInfo() {
-    System.out.println("extractAuthenticationInfo");
     String login = "bart";
     String encodedPassword = "5f6b7130460e9b316ca968ec952d3fa3";
     AuthenticationInfo expResult = new AuthenticationInfo("bart", "helloworld");
-    AuthenticationInfo result =
-        PasswordManager.extractAuthenticationInfo(login, encodedPassword);
+    AuthenticationInfo result = PasswordManager.extractAuthenticationInfo(login, encodedPassword);
+    assertEquals(expResult, result);
+
+    login = "homer%40simpson.com";
+    encodedPassword = "046e010f9c0cfaa5";
+    expResult = new AuthenticationInfo("homer@simpson.com", "homer");
+    result = PasswordManager.extractAuthenticationInfo(login, encodedPassword);
     assertEquals(expResult, result);
   }