From 931705be94167075267c928b21a96bf7e73ed039 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Mon, 18 Mar 2013 09:10:50 -0400
Subject: allow communication passwords with URL special chars (@, /, etc.) in
 them

---
 src/lib/Bcfg2/Compat.py | 3 ++-
 src/lib/Bcfg2/Proxy.py  | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/Bcfg2/Compat.py b/src/lib/Bcfg2/Compat.py
index beb534791..57f96274f 100644
--- a/src/lib/Bcfg2/Compat.py
+++ b/src/lib/Bcfg2/Compat.py
@@ -19,12 +19,13 @@ except ImportError:
 
 # urllib imports
 try:
+    from urllib import quote_plus
     from urlparse import urljoin, urlparse
     from urllib2 import HTTPBasicAuthHandler, \
         HTTPPasswordMgrWithDefaultRealm, build_opener, install_opener, \
         urlopen, HTTPError, URLError
 except ImportError:
-    from urllib.parse import urljoin, urlparse
+    from urllib.parse import urljoin, urlparse, quote_plus
     from urllib.request import HTTPBasicAuthHandler, \
         HTTPPasswordMgrWithDefaultRealm, build_opener, install_opener, urlopen
     from urllib.error import HTTPError, URLError
diff --git a/src/lib/Bcfg2/Proxy.py b/src/lib/Bcfg2/Proxy.py
index 3b406c78e..224028b6a 100644
--- a/src/lib/Bcfg2/Proxy.py
+++ b/src/lib/Bcfg2/Proxy.py
@@ -1,6 +1,6 @@
-import logging
 import re
 import socket
+import logging
 
 # The ssl module is provided by either Python 2.6 or a separate ssl
 # package that works on older versions of Python (see
@@ -20,7 +20,7 @@ import sys
 import time
 
 # Compatibility imports
-from Bcfg2.Compat import httplib, xmlrpclib, urlparse
+from Bcfg2.Compat import httplib, xmlrpclib, urlparse, quote_plus
 
 version = sys.version_info[:2]
 has_py26 = version >= (2, 6)
@@ -349,7 +349,8 @@ def ComponentProxy(url, user=None, password=None, key=None, cert=None, ca=None,
 
     if user and password:
         method, path = urlparse(url)[:2]
-        newurl = "%s://%s:%s@%s" % (method, user, password, path)
+        newurl = "%s://%s:%s@%s" % (method, quote_plus(user, ''),
+                                    quote_plus(password, ''), path)
     else:
         newurl = url
     ssl_trans = XMLRPCTransport(key, cert, ca,
-- 
cgit v1.2.3-1-g7c22