From 7e55b2ead25d1e9f9b0ccdf333d7159ccffcd81a Mon Sep 17 00:00:00 2001 From: Luke Macken Date: Tue, 19 Feb 2008 21:55:16 -0500 Subject: Now that funcweb can auth against PAM, we only have to require that the user is not anonymous, and not that they are from localhost. --- funcweb/funcweb/controllers.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/funcweb/funcweb/controllers.py b/funcweb/funcweb/controllers.py index df4c05c..c08844f 100644 --- a/funcweb/funcweb/controllers.py +++ b/funcweb/funcweb/controllers.py @@ -7,8 +7,7 @@ from func.overlord.client import Client class Root(controllers.RootController): @expose(template="funcweb.templates.minions") - @identity.require(identity.Any( - identity.from_host("127.0.0.1"), identity.not_anonymous())) + @identity.require(identity.not_anonymous()) def minions(self, glob='*'): """ Return a list of our minions that match a given glob """ fc = Client(glob) @@ -17,8 +16,7 @@ class Root(controllers.RootController): index = minions # start with our minion view, for now @expose(template="funcweb.templates.minion") - @identity.require(identity.Any( - identity.from_host("127.0.0.1"), identity.not_anonymous())) + @identity.require(identity.not_anonymous()) def minion(self, name, module=None, method=None): """ Display module or method details for a specific minion. @@ -42,8 +40,7 @@ class Root(controllers.RootController): @expose(template="funcweb.templates.run") - @identity.require(identity.Any( - identity.from_host("127.0.0.1"), identity.not_anonymous())) + @identity.require(identity.not_anonymous()) def run(self, minion="*", module=None, method=None, arguments=''): fc = Client(minion) results = getattr(getattr(fc, module), method)(*arguments.split()) -- cgit