[jboss-svn-commits] JBL Code SVN: r18552 - labs/jbossesb/workspace/chharris/product/rosetta/src/org/jboss/internal/soa/esb/util.

[jboss-svn-commits at lists.jboss.org]

Author: kevin.conner at jboss.com
Date: 2008-02-21 10:25:40 -0500 (Thu, 21 Feb 2008)
New Revision: 18552

Modified:
   labs/jbossesb/workspace/chharris/product/rosetta/src/org/jboss/internal/soa/esb/util/EdtFtpImpl.java
Log:
Add decoding for passwords

Modified: labs/jbossesb/workspace/chharris/product/rosetta/src/org/jboss/internal/soa/esb/util/EdtFtpImpl.java
===================================================================
--- labs/jbossesb/workspace/chharris/product/rosetta/src/org/jboss/internal/soa/esb/util/EdtFtpImpl.java	2008-02-21 15:04:22 UTC (rev 18551)
+++ labs/jbossesb/workspace/chharris/product/rosetta/src/org/jboss/internal/soa/esb/util/EdtFtpImpl.java	2008-02-21 15:25:40 UTC (rev 18552)
@@ -23,9 +23,11 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.net.URLDecoder;
 import java.net.UnknownHostException;
 import java.util.List;
 
@@ -66,6 +68,8 @@
 	private static final Logger _logger = Logger.getLogger(EdtFtpImpl.class);
 
 	private static final String TMP_SUFFIX = ".rosettaPart";
+	
+	private static final String ENCODING = "UTF-8" ;
 
 	private boolean m_bPassive;
 
@@ -147,7 +151,14 @@
 		if (sa == null) sa = new String[] { "", "" };
 
 		m_sUser = (sa.length < 1) ? "" : sa[0];
-		m_sPasswd = (sa.length < 2) ? "" : sa[1];
+		try
+		{
+			m_sPasswd = (sa.length < 2) ? "" : URLDecoder.decode(sa[1], ENCODING);
+		}
+		catch (final UnsupportedEncodingException uee)
+		{
+			throw new ConfigurationException("Failed to decode password", uee) ;
+		}
 
 		m_sRemoteDir = url.getFile();
 
@@ -233,7 +244,14 @@
 		if (null == m_sUser)
 			throw new ConfigurationException("No username specified for FTP");
 
-		m_sPasswd = (null != sa) ? sa[1] : m_oParms.getAttribute(PARMS_PASSWD);
+		try
+		{
+			m_sPasswd = (null != sa) ? URLDecoder.decode(sa[1], ENCODING) : m_oParms.getAttribute(PARMS_PASSWD);
+		}
+		catch (final UnsupportedEncodingException uee)
+		{
+			throw new ConfigurationException("Failed to decode password", uee) ;
+		}
 		if (null == m_sPasswd)
 			throw new ConfigurationException("No password specified for FTP");