Url escape password

2 files changed, 31 insertions, 3 deletions

diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index 858ef41..3ee80e9 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -188,6 +188,33 @@ std::string cmCTest::MakeXMLSafe(const std::string& str)
   return ost.str();
 }
 
+std::string cmCTest::MakeURLSafe(const std::string& str)
+{
+  std::string::size_type pos = 0;
+  cmOStringStream ost;
+  char buffer[10];
+  for ( pos = 0; pos < str.size(); pos ++ )
+    {
+    unsigned char ch = str[pos];
+    if ( ( ch > 126 || ch < 32 ||
+           ch == '&' ||
+           ch == '%' ||
+           ch == '+' ||
+           ch == '=' || 
+           ch == '@'
+          ) && ch != 9 )
+      {
+      sprintf(buffer, "%02x;", (unsigned int)ch);
+      ost << buffer;
+      }
+    else
+      {
+      ost << ch;
+      }
+    }
+  return ost.str();
+}
+
 bool TryExecutable(const char *dir, const char *file,
                    std::string *fullPath, const char *subdir)
 {
@@ -1831,10 +1858,10 @@ int cmCTest::SubmitResults()
     {
     std::cout << "FTP submit method" << std::endl;
     std::string url = "ftp://";
-    url += m_DartConfiguration["DropSiteUser"] + ":" + 
-      m_DartConfiguration["DropSitePassword"] + "@" + 
+    url += cmCTest::MakeURLSafe(m_DartConfiguration["DropSiteUser"]) + ":" + 
+      cmCTest::MakeURLSafe(m_DartConfiguration["DropSitePassword"]) + "@" + 
       m_DartConfiguration["DropSite"] + 
-      m_DartConfiguration["DropLocation"];
+      cmCTest::MakeURLSafe(m_DartConfiguration["DropLocation"]);
     if ( !submit.SubmitUsingFTP(m_ToplevelPath+"/Testing/"+m_CurrentTag, 
         files, prefix, url) )
       {
diff --git a/Source/cmCTest.h b/Source/cmCTest.h
index 7f81aea..5e252c3 100644
--- a/Source/cmCTest.h
+++ b/Source/cmCTest.h
@@ -216,6 +216,7 @@ private:
   bool OpenOutputFile(const std::string& path, 
                       const std::string& name, std::ofstream& stream);  
   std::string MakeXMLSafe(const std::string&);
+  std::string MakeURLSafe(const std::string&);
 };
 
 #endif