diff options
author | Michael DeHaan <mdehaan@redhat.com> | 2007-12-05 15:52:55 -0500 |
---|---|---|
committer | Michael DeHaan <mdehaan@redhat.com> | 2007-12-05 15:52:55 -0500 |
commit | d0b9491bd3cea8c46d22d9e44d75bac556e03985 (patch) | |
tree | 57055c3f2339a4363f054a206c7dc8cb2376688d | |
parent | ad2786aca0720eb4b70f2692224ef97b4f48e086 (diff) | |
download | third_party-cobbler-d0b9491bd3cea8c46d22d9e44d75bac556e03985.tar.gz third_party-cobbler-d0b9491bd3cea8c46d22d9e44d75bac556e03985.tar.xz third_party-cobbler-d0b9491bd3cea8c46d22d9e44d75bac556e03985.zip |
Fixes + changelog.
-rw-r--r-- | CHANGELOG | 2 | ||||
-rw-r--r-- | cobbler/webui/CobblerWeb.py | 2 | ||||
-rwxr-xr-x | scripts/index.py | 6 |
3 files changed, 7 insertions, 3 deletions
@@ -7,6 +7,8 @@ Cobbler CHANGELOG - Make CLI functions modular and use optparse - Quote wget args to avoid creating stray files on target system - Support Xen FV as virt type (requires F8+) +- Implemented fully pluggable authn/authz system +- WebUI is now mod_python based - ... * Wed Nov 14 2007 - 0.6.4 diff --git a/cobbler/webui/CobblerWeb.py b/cobbler/webui/CobblerWeb.py index 9985994..a081574 100644 --- a/cobbler/webui/CobblerWeb.py +++ b/cobbler/webui/CobblerWeb.py @@ -195,7 +195,7 @@ class CobblerWeb(object): # as you could disable a lot of functionality if you aren't careful # including your ability to fix it back. - def settings_view(self): + def settings_view(self,**args): if not self.__xmlrpc_setup(): return self.xmlrpc_auth_failure() diff --git a/scripts/index.py b/scripts/index.py index c5ff4c0..f7193f8 100755 --- a/scripts/index.py +++ b/scripts/index.py @@ -120,12 +120,14 @@ def authenhandler(req): apache.log_error("authenhandler called: %s" % my_user) try: token = xmlrpc_server.login(my_user,my_pw) - except: + except Exception, e: + apache.log_error(str(e)) return apache.HTTP_UNAUTHORIZED try: ok = xmlrpc_server.check_access(token,my_uri) - except: + except Exception, e: + apache.log_error(str(e)) return apache.HTTP_FORBIDDEN |