Author: tmckay
Date: 2012-05-30 19:52:07 +0000 (Wed, 30 May 2012)
New Revision: 5393
Modified:
trunk/cumin/bin/cumin-admin
trunk/cumin/bin/cumin-web
trunk/cumin/etc/cumin.conf
trunk/cumin/python/cumin/authenticator.py
trunk/cumin/python/cumin/config.py
trunk/cumin/python/cumin/main.py
Log:
Change the default for "auth:" to empty string instead of "internal".
Since the internal database is always checked first, the "internal" keyword
is not needed and may confuse users. The word will still be allowed and
will not generate an error in log files but it means nothing.
BZ737979 (mod)
Modified: trunk/cumin/bin/cumin-admin
===================================================================
--- trunk/cumin/bin/cumin-admin 2012-05-30 18:00:55 UTC (rev 5392)
+++ trunk/cumin/bin/cumin-admin 2012-05-30 19:52:07 UTC (rev 5393)
@@ -66,7 +66,7 @@
print "Command '%s' is unknown" % name
sys.exit(1)
- authmech = [x.strip() for x in values.common.auth.split(";")]
+ authmech = [x.strip() for x in values.common.auth.split(";") if x !=
""]
app = Cumin(config.get_home(), [], opts.database, authmech=authmech)
Modified: trunk/cumin/bin/cumin-web
===================================================================
--- trunk/cumin/bin/cumin-web 2012-05-30 18:00:55 UTC (rev 5392)
+++ trunk/cumin/bin/cumin-web 2012-05-30 19:52:07 UTC (rev 5393)
@@ -193,7 +193,7 @@
raise ArgError
broker_uris = [x.strip() for x in opts.brokers.split(",")]
- authmech = [x.strip() for x in values.auth.split(";")]
+ authmech = [x.strip() for x in values.auth.split(";") if x !=
""]
cumin = Cumin(config.get_home(), broker_uris, opts.database,
opts.host, opts.port,
opts.server_cert, opts.server_key,
Modified: trunk/cumin/etc/cumin.conf
===================================================================
--- trunk/cumin/etc/cumin.conf 2012-05-30 18:00:55 UTC (rev 5392)
+++ trunk/cumin/etc/cumin.conf 2012-05-30 19:52:07 UTC (rev 5393)
@@ -112,7 +112,7 @@
# max-qmf-table-sort: 1000
# persona: grid
# authorize: False
-# auth: internal
+# auth:
# ldap_tls_cacertfile:
# ldap_tls_cacertdir:
# ldap_timeout: 30
@@ -307,7 +307,7 @@
## role will not see the 'Administrator' tab.
## The default role for a new user is 'user'.
-## auth: internal
+## auth:
## Allows specification of LDAP servers for external authentication of
## users during login. A server must support simple bind for authentication.
## This is a semicolon separated list of URLs of the following form:
Modified: trunk/cumin/python/cumin/authenticator.py
===================================================================
--- trunk/cumin/python/cumin/authenticator.py 2012-05-30 18:00:55 UTC (rev 5392)
+++ trunk/cumin/python/cumin/authenticator.py 2012-05-30 19:52:07 UTC (rev 5393)
@@ -397,7 +397,10 @@
log.info("Authenticator: import of ldap modules failed, "\
"ldap mechanism not available")
for authmech in app.authmech:
- if authmech != "internal":
+ # let the 'internal' word be used here since it has been
+ # on the trunk for a while. It means nothing, since the
+ # internal database will always be consulted first.
+ if authmech not in ("internal", ""):
# Allow initial ldap= to be skipped
try:
if authmech.startswith("ldap://"):
Modified: trunk/cumin/python/cumin/config.py
===================================================================
--- trunk/cumin/python/cumin/config.py 2012-05-30 18:00:55 UTC (rev 5392)
+++ trunk/cumin/python/cumin/config.py 2012-05-30 19:52:07 UTC (rev 5393)
@@ -124,7 +124,7 @@
# Put this here, because authentication is something that
# might need to be done commonly
param = ConfigParameter(self, "auth", str)
- param.default = 'internal'
+ param.default = ""
param = ConfigParameter(self, "ldap_tls_cacertfile", str)
param.default = ""
@@ -171,13 +171,6 @@
param = ConfigParameter(self, "authorize", bool)
param.default = False
- # Turn these off for now...
-# param = ConfigParameter(self, "authz-provider", str)
-# param.default = "internal"
-
-# param = ConfigParameter(self, "auth-create-ondemand", bool)
-# param.default = False
-
# param = ConfigParameter(self, "auth-proxy", bool)
# param.default = False
Modified: trunk/cumin/python/cumin/main.py
===================================================================
--- trunk/cumin/python/cumin/main.py 2012-05-30 18:00:55 UTC (rev 5392)
+++ trunk/cumin/python/cumin/main.py 2012-05-30 19:52:07 UTC (rev 5393)
@@ -36,7 +36,7 @@
host="localhost", port=45672,
server_cert="", server_key="",
persona="default",
- authmech=["internal"]):
+ authmech=[]):
super(Cumin, self).__init__()
self.home = home