Merge branch 'maint'

8 files changed, 30 insertions, 23 deletions

diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/base.py b/src/lib/Bcfg2/Client/Tools/POSIX/base.py
index b867fa3d8..f46875743 100644
--- a/src/lib/Bcfg2/Client/Tools/POSIX/base.py
+++ b/src/lib/Bcfg2/Client/Tools/POSIX/base.py
@@ -687,7 +687,7 @@ class POSIXTool(Bcfg2.Client.Tools.Tool):
         if path is None:
             path = entry.get("name")
         cur = path
-        while cur != '/':
+        while cur and cur != '/':
             if not os.path.exists(cur):
                 created.append(cur)
             cur = os.path.dirname(cur)
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/Options.py b/src/lib/Bcfg2/Options.py
index fd096b75a..5f079f0b4 100644
--- a/src/lib/Bcfg2/Options.py
+++ b/src/lib/Bcfg2/Options.py
@@ -621,17 +621,19 @@ WEB_CFILE = \
            default="/etc/bcfg2-web.conf",
            cmd='-W',
            odesc='<conffile>',
-           cf=('statistics', 'config'),)
+           cf=('reporting', 'config'),
+           deprecated_cf=('statistics', 'web_prefix'),)
 DJANGO_TIME_ZONE = \
     Option('Django timezone',
            default=None,
-           cf=('statistics', 'time_zone'),)
+           cf=('reporting', 'time_zone'),
+           deprecated_cf=('statistics', 'web_prefix'),)
 DJANGO_DEBUG = \
     Option('Django debug',
            default=None,
-           cf=('statistics', 'web_debug'),
+           cf=('reporting', 'web_debug'),
+           deprecated_cf=('statistics', 'web_prefix'),
            cook=get_bool,)
-# Django options
 DJANGO_WEB_PREFIX = \
     Option('Web prefix',
            default=None,
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,
diff --git a/src/lib/Bcfg2/Reporting/templates/widgets/filter_bar.html b/src/lib/Bcfg2/Reporting/templates/widgets/filter_bar.html
index 759415507..bb4f650d1 100644
--- a/src/lib/Bcfg2/Reporting/templates/widgets/filter_bar.html
+++ b/src/lib/Bcfg2/Reporting/templates/widgets/filter_bar.html
@@ -16,7 +16,7 @@
 <label for="id_group">Group filter:</label>
 <select id="id_group" name="group" onchange="javascript:url=document.forms['filter_form'].group.value; if(url) { location.href=url }">
   {% for group, group_url, selected in groups %}
-    <option label="{{group}}" value="{{group_url}}" {% if selected %}selected {% endif %}/>
+    <option value="{{group_url}}" {% if selected %}selected {% endif %}>{{group}}</option>
   {% endfor %}
 </select>
 {% endif %}
diff --git a/src/lib/Bcfg2/Server/Admin/Init.py b/src/lib/Bcfg2/Server/Admin/Init.py
index f2d6d7efa..3e642ee49 100644
--- a/src/lib/Bcfg2/Server/Admin/Init.py
+++ b/src/lib/Bcfg2/Server/Admin/Init.py
@@ -212,7 +212,7 @@ class Init(Bcfg2.Server.Admin.Mode):
         """Ask for the repository path."""
         while True:
             newrepo = safe_input("Location of Bcfg2 repository [%s]: " %
-                            self.data['repopath'])
+                                 self.data['repopath'])
             if newrepo != '':
                 self.data['repopath'] = os.path.abspath(newrepo)
             if os.path.isdir(self.data['repopath']):
@@ -318,6 +318,16 @@ class Init(Bcfg2.Server.Admin.Mode):
     def init_repo(self):
         """Setup a new repo and create the content of the
         configuration file."""
+        # Create the repository
+        path = os.path.join(self.data['repopath'], 'etc')
+        try:
+            os.makedirs(path)
+            self._init_plugins()
+            print("Repository created successfuly in %s" %
+                  self.data['repopath'])
+        except OSError:
+            print("Failed to create %s." % path)
+
         confdata = CONFIG % (self.data['repopath'],
                              ','.join(self.plugins),
                              self.data['sendmail'],
@@ -333,13 +343,3 @@ class Init(Bcfg2.Server.Admin.Mode):
         create_key(self.data['shostname'], self.data['keypath'],
                    self.data['certpath'], self.data['country'],
                    self.data['state'], self.data['location'])
-
-        # Create the repository
-        path = os.path.join(self.data['repopath'], 'etc')
-        try:
-            os.makedirs(path)
-            self._init_plugins()
-            print("Repository created successfuly in %s" %
-                  self.data['repopath'])
-        except OSError:
-            print("Failed to create %s." % path)
diff --git a/src/lib/Bcfg2/Server/models.py b/src/lib/Bcfg2/Server/models.py
index 0328c6bea..1f64111e7 100644
--- a/src/lib/Bcfg2/Server/models.py
+++ b/src/lib/Bcfg2/Server/models.py
@@ -1,6 +1,7 @@
 """ Django database models for all plugins """
 
 import sys
+import copy
 import logging
 import Bcfg2.Options
 import Bcfg2.Server.Plugins
@@ -19,7 +20,7 @@ def load_models(plugins=None, cfile='/etc/bcfg2.conf', quiet=True):
         # we want to provide a different default plugin list --
         # namely, _all_ plugins, so that the database is guaranteed to
         # work, even if /etc/bcfg2.conf isn't set up properly
-        plugin_opt = Bcfg2.Options.SERVER_PLUGINS
+        plugin_opt = copy.deepcopy(Bcfg2.Options.SERVER_PLUGINS)
         plugin_opt.default = Bcfg2.Server.Plugins.__all__
 
         setup = \
diff --git a/src/sbin/bcfg2-test b/src/sbin/bcfg2-test
index 5b751af93..f62155850 100755
--- a/src/sbin/bcfg2-test
+++ b/src/sbin/bcfg2-test
@@ -64,7 +64,9 @@ class ClientTest(TestCase):
             "Configuration is missing bundle(s): %s" % ':'.join(missing)
 
         # check for unknown packages
-        unknown_pkgs = config.xpath('//Package[@type="unknown"]')
+        unknown_pkgs = [el.get("name")
+                        for el in config.xpath('//Package[@type="unknown"]')
+                        if not self.ignore_entry(el.tag, el.get("name"))]
         assert len(unknown_pkgs) == 0, \
             "Configuration contains unknown packages: %s" % \
             ", ".join(unknown_pkgs)