Rename authkrb plugin to authgssapi
authorRob Crittenden <rcritten@redhat.com>
Tue, 28 Apr 2015 19:15:39 +0000 (15:15 -0400)
committerRob Crittenden <rcritten@redhat.com>
Tue, 28 Apr 2015 21:30:03 +0000 (17:30 -0400)
https://fedorahosted.org/ipsilon/ticket/114

Signed-off-by: Rob Crittenden <rcritten@redhat.com>
ipsilon/login/authgssapi.py [new file with mode: 0644]
ipsilon/login/authkrb.py [deleted file]
templates/login/gssapi.html [new file with mode: 0644]
templates/login/krb.html [deleted file]

diff --git a/ipsilon/login/authgssapi.py b/ipsilon/login/authgssapi.py
new file mode 100644 (file)
index 0000000..dbb531a
--- /dev/null
@@ -0,0 +1,164 @@
+# Copyright (C) 2014  Simo Sorce <simo@redhat.com>
+#
+# see file 'COPYING' for use and warranty information
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from ipsilon.login.common import LoginPageBase, LoginManagerBase, \
+    LoginManagerInstaller
+from ipsilon.util.plugin import PluginObject
+from ipsilon.util.user import UserSession
+from string import Template
+import cherrypy
+import os
+
+
+class Krb(LoginPageBase):
+
+    def root(self, *args, **kwargs):
+        # Someone typed manually or a robot is walking th tree.
+        # Redirect to default page
+        return self.lm.redirect_to_path(self.lm.path)
+
+
+class KrbAuth(LoginPageBase):
+
+    def root(self, *args, **kwargs):
+        trans = self.get_valid_transaction('login', **kwargs)
+        # If we can get here, we must be authenticated and remote_user
+        # was set. Check the session has a user set already or error.
+        us = UserSession()
+        us.remote_login()
+        self.user = us.get_user()
+        if not self.user.is_anonymous:
+            principal = cherrypy.request.wsgi_environ.get('GSS_NAME', None)
+            if principal:
+                userdata = {'krb_principal_name': principal}
+            else:
+                userdata = {'krb_principal_name': self.user.name}
+            return self.lm.auth_successful(trans, self.user.name,
+                                           'krb', userdata)
+        else:
+            return self.lm.auth_failed(trans)
+
+
+class KrbError(LoginPageBase):
+
+    def root(self, *args, **kwargs):
+        cherrypy.log.error('REQUEST: %s' % cherrypy.request.headers)
+        # If we have no negotiate header return whatever mod_auth_gssapi
+        # generated and wait for the next request
+
+        if 'WWW-Authenticate' not in cherrypy.request.headers:
+            cherrypy.response.status = 401
+
+            next_login = self.lm.next_login()
+            if next_login:
+                return next_login.page.root(*args, **kwargs)
+
+            conturl = '%s/login' % self.basepath
+            return self._template('login/krb.html',
+                                  title='Kerberos Login',
+                                  cont=conturl)
+
+        # If we get here, negotiate failed
+        trans = self.get_valid_transaction('login', **kwargs)
+        return self.lm.auth_failed(trans)
+
+
+class LoginManager(LoginManagerBase):
+
+    def __init__(self, *args, **kwargs):
+        super(LoginManager, self).__init__(*args, **kwargs)
+        self.name = 'krb'
+        self.path = 'krb/negotiate'
+        self.page = None
+        self.description = """
+Kerberos Negotiate authentication plugin. Relies on the mod_auth_gssapi
+apache plugin for actual authentication. """
+        self.new_config(self.name)
+
+    def get_tree(self, site):
+        self.page = Krb(site, self)
+        self.page.__dict__['negotiate'] = KrbAuth(site, self)
+        self.page.__dict__['unauthorized'] = KrbError(site, self)
+        self.page.__dict__['failed'] = KrbError(site, self)
+        return self.page
+
+
+CONF_TEMPLATE = """
+
+<Location /${instance}/login/krb/negotiate>
+  AuthType GSSAPI
+  AuthName "GSSAPI Single Sign On Login"
+  $keytab
+  GssapiSSLonly $gssapisslonly
+  GssapiLocalName on
+  Require valid-user
+
+  ErrorDocument 401 /${instance}/login/krb/unauthorized
+  ErrorDocument 500 /${instance}/login/krb/failed
+</Location>
+"""
+
+
+class Installer(LoginManagerInstaller):
+
+    def __init__(self, *pargs):
+        super(Installer, self).__init__()
+        self.name = 'krb'
+        self.pargs = pargs
+
+    def install_args(self, group):
+        group.add_argument('--krb', choices=['yes', 'no'], default='no',
+                           help='Configure Kerberos authentication')
+        group.add_argument('--krb-httpd-keytab',
+                           default='/etc/httpd/conf/http.keytab',
+                           help='Kerberos keytab location for HTTPD')
+
+    def configure(self, opts):
+        if opts['krb'] != 'yes':
+            return
+
+        confopts = {'instance': opts['instance']}
+
+        if os.path.exists(opts['krb_httpd_keytab']):
+            confopts['keytab'] = 'GssapiCredStore keytab:%s' % (
+                opts['krb_httpd_keytab'])
+        else:
+            raise Exception('Keytab not found')
+
+        if opts['secure'] == 'no':
+            confopts['gssapisslonly'] = 'Off'
+        else:
+            confopts['gssapisslonly'] = 'On'
+
+        tmpl = Template(CONF_TEMPLATE)
+        hunk = tmpl.substitute(**confopts)  # pylint: disable=star-args
+        with open(opts['httpd_conf'], 'a') as httpd_conf:
+            httpd_conf.write(hunk)
+
+        # Add configuration data to database
+        po = PluginObject(*self.pargs)
+        po.name = 'krb'
+        po.wipe_data()
+
+        # Update global config, put 'krb' always first
+        ph = self.pargs[0]
+        ph.refresh_enabled()
+        if 'krb' not in ph.enabled:
+            enabled = []
+            enabled.extend(ph.enabled)
+            enabled.insert(0, 'krb')
+            ph.save_enabled(enabled)
diff --git a/ipsilon/login/authkrb.py b/ipsilon/login/authkrb.py
deleted file mode 100644 (file)
index dbb531a..0000000
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright (C) 2014  Simo Sorce <simo@redhat.com>
-#
-# see file 'COPYING' for use and warranty information
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-from ipsilon.login.common import LoginPageBase, LoginManagerBase, \
-    LoginManagerInstaller
-from ipsilon.util.plugin import PluginObject
-from ipsilon.util.user import UserSession
-from string import Template
-import cherrypy
-import os
-
-
-class Krb(LoginPageBase):
-
-    def root(self, *args, **kwargs):
-        # Someone typed manually or a robot is walking th tree.
-        # Redirect to default page
-        return self.lm.redirect_to_path(self.lm.path)
-
-
-class KrbAuth(LoginPageBase):
-
-    def root(self, *args, **kwargs):
-        trans = self.get_valid_transaction('login', **kwargs)
-        # If we can get here, we must be authenticated and remote_user
-        # was set. Check the session has a user set already or error.
-        us = UserSession()
-        us.remote_login()
-        self.user = us.get_user()
-        if not self.user.is_anonymous:
-            principal = cherrypy.request.wsgi_environ.get('GSS_NAME', None)
-            if principal:
-                userdata = {'krb_principal_name': principal}
-            else:
-                userdata = {'krb_principal_name': self.user.name}
-            return self.lm.auth_successful(trans, self.user.name,
-                                           'krb', userdata)
-        else:
-            return self.lm.auth_failed(trans)
-
-
-class KrbError(LoginPageBase):
-
-    def root(self, *args, **kwargs):
-        cherrypy.log.error('REQUEST: %s' % cherrypy.request.headers)
-        # If we have no negotiate header return whatever mod_auth_gssapi
-        # generated and wait for the next request
-
-        if 'WWW-Authenticate' not in cherrypy.request.headers:
-            cherrypy.response.status = 401
-
-            next_login = self.lm.next_login()
-            if next_login:
-                return next_login.page.root(*args, **kwargs)
-
-            conturl = '%s/login' % self.basepath
-            return self._template('login/krb.html',
-                                  title='Kerberos Login',
-                                  cont=conturl)
-
-        # If we get here, negotiate failed
-        trans = self.get_valid_transaction('login', **kwargs)
-        return self.lm.auth_failed(trans)
-
-
-class LoginManager(LoginManagerBase):
-
-    def __init__(self, *args, **kwargs):
-        super(LoginManager, self).__init__(*args, **kwargs)
-        self.name = 'krb'
-        self.path = 'krb/negotiate'
-        self.page = None
-        self.description = """
-Kerberos Negotiate authentication plugin. Relies on the mod_auth_gssapi
-apache plugin for actual authentication. """
-        self.new_config(self.name)
-
-    def get_tree(self, site):
-        self.page = Krb(site, self)
-        self.page.__dict__['negotiate'] = KrbAuth(site, self)
-        self.page.__dict__['unauthorized'] = KrbError(site, self)
-        self.page.__dict__['failed'] = KrbError(site, self)
-        return self.page
-
-
-CONF_TEMPLATE = """
-
-<Location /${instance}/login/krb/negotiate>
-  AuthType GSSAPI
-  AuthName "GSSAPI Single Sign On Login"
-  $keytab
-  GssapiSSLonly $gssapisslonly
-  GssapiLocalName on
-  Require valid-user
-
-  ErrorDocument 401 /${instance}/login/krb/unauthorized
-  ErrorDocument 500 /${instance}/login/krb/failed
-</Location>
-"""
-
-
-class Installer(LoginManagerInstaller):
-
-    def __init__(self, *pargs):
-        super(Installer, self).__init__()
-        self.name = 'krb'
-        self.pargs = pargs
-
-    def install_args(self, group):
-        group.add_argument('--krb', choices=['yes', 'no'], default='no',
-                           help='Configure Kerberos authentication')
-        group.add_argument('--krb-httpd-keytab',
-                           default='/etc/httpd/conf/http.keytab',
-                           help='Kerberos keytab location for HTTPD')
-
-    def configure(self, opts):
-        if opts['krb'] != 'yes':
-            return
-
-        confopts = {'instance': opts['instance']}
-
-        if os.path.exists(opts['krb_httpd_keytab']):
-            confopts['keytab'] = 'GssapiCredStore keytab:%s' % (
-                opts['krb_httpd_keytab'])
-        else:
-            raise Exception('Keytab not found')
-
-        if opts['secure'] == 'no':
-            confopts['gssapisslonly'] = 'Off'
-        else:
-            confopts['gssapisslonly'] = 'On'
-
-        tmpl = Template(CONF_TEMPLATE)
-        hunk = tmpl.substitute(**confopts)  # pylint: disable=star-args
-        with open(opts['httpd_conf'], 'a') as httpd_conf:
-            httpd_conf.write(hunk)
-
-        # Add configuration data to database
-        po = PluginObject(*self.pargs)
-        po.name = 'krb'
-        po.wipe_data()
-
-        # Update global config, put 'krb' always first
-        ph = self.pargs[0]
-        ph.refresh_enabled()
-        if 'krb' not in ph.enabled:
-            enabled = []
-            enabled.extend(ph.enabled)
-            enabled.insert(0, 'krb')
-            ph.save_enabled(enabled)
diff --git a/templates/login/gssapi.html b/templates/login/gssapi.html
new file mode 100644 (file)
index 0000000..e5c0844
--- /dev/null
@@ -0,0 +1,7 @@
+{% extends "master.html" %}
+{% block main %}
+<div id="login">
+    <p>Press <a href="{{ cont }}">here</a> if your browser does not
+       redirect you in a few seconds</p>
+</div>
+{% endblock %}
diff --git a/templates/login/krb.html b/templates/login/krb.html
deleted file mode 100644 (file)
index e5c0844..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-{% extends "master.html" %}
-{% block main %}
-<div id="login">
-    <p>Press <a href="{{ cont }}">here</a> if your browser does not
-       redirect you in a few seconds</p>
-</div>
-{% endblock %}