Use python logging in install / log cherrypy at right severity

[cascardo/ipsilon.git] / ipsilon / login / authform.py

diff --git a/ipsilon/login/authform.py b/ipsilon/login/authform.py
old mode 100755 (executable)
new mode 100644 (file)
index 9e8e56c..ecce919
--- a/ipsilon/login/authform.py
+++ b/ipsilon/login/authform.py
@@ -1,5 +1,3 @@
-#!/usr/bin/python
-#

 # Copyright (C) 2014  Simo Sorce <simo@redhat.com>
 #
 # see file 'COPYING' for use and warranty information
 # Copyright (C) 2014  Simo Sorce <simo@redhat.com>
 #
 # see file 'COPYING' for use and warranty information


@@ -17,57 +15,32 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # 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
-from ipsilon.login.common import FACILITY
+from ipsilon.login.common import LoginFormBase, LoginManagerBase, \
+    LoginManagerInstaller

 from ipsilon.util.plugin import PluginObject
 from ipsilon.util.user import UserSession
 from ipsilon.util.plugin import PluginObject
 from ipsilon.util.user import UserSession

+from ipsilon.util import config as pconfig

 from string import Template
 import cherrypy
 import subprocess
 from string import Template
 import cherrypy
 import subprocess

+import logging

 
 
 
 

-class Form(LoginPageBase):
-
-    def GET(self, *args, **kwargs):
-        context = self.create_tmpl_context()
-        # pylint: disable=star-args
-        return self._template('login/form.html', **context)
+class Form(LoginFormBase):

 
     def POST(self, *args, **kwargs):
         us = UserSession()
         us.remote_login()
         user = us.get_user()
         if not user.is_anonymous:
 
     def POST(self, *args, **kwargs):
         us = UserSession()
         us.remote_login()
         user = us.get_user()
         if not user.is_anonymous:

-            return self.lm.auth_successful(user.name)
+            return self.lm.auth_successful(self.trans, user.name, 'password')

         else:
             try:
                 error = cherrypy.request.headers['EXTERNAL_AUTH_ERROR']
             except KeyError:
                 error = "Unknown error using external authentication"
         else:
             try:
                 error = cherrypy.request.headers['EXTERNAL_AUTH_ERROR']
             except KeyError:
                 error = "Unknown error using external authentication"

-                cherrypy.log.error("Error: %s" % error)
-            return self.lm.auth_failed()
-
-    def root(self, *args, **kwargs):
-        op = getattr(self, cherrypy.request.method, self.GET)
-        if callable(op):
-            return op(*args, **kwargs)
-
-    def create_tmpl_context(self, **kwargs):
-        next_url = None
-        if self.lm.next_login is not None:
-            next_url = self.lm.next_login.path
-
-        context = {
-            "title": 'Login',
-            "action": '%s/login/form' % self.basepath,
-            "service_name": self.lm.service_name,
-            "username_text": self.lm.username_text,
-            "password_text": self.lm.password_text,
-            "description": self.lm.help_text,
-            "next_url": next_url,
-        }
-        context.update(kwargs)
-        return context
+                cherrypy.log.error("Error: %s" % error, logging.ERROR)
+            return self.lm.auth_failed(self.trans)

 
 
 class LoginManager(LoginManagerBase):
 
 
 class LoginManager(LoginManagerBase):


@@ -77,35 +50,25 @@ class LoginManager(LoginManagerBase):
         self.name = 'form'
         self.path = 'form'
         self.page = None
         self.name = 'form'
         self.path = 'form'
         self.page = None

+        self.service_name = 'form'

         self.description = """
 Form based login Manager. Relies on mod_intercept_form_submit plugin for
  actual authentication. """
         self.description = """
 Form based login Manager. Relies on mod_intercept_form_submit plugin for
  actual authentication. """

-        self._options = {
-            'service name': [
-                """ The name of the PAM service used to authenticate. """,
-                'string',
-                'remote'
-            ],
-            'help text': [
-                """ The text shown to guide the user at login time. """,
-                'string',
-                'Insert your Username and Password and then submit.'
-            ],
-            'username text': [
-                """ The text shown to ask for the username in the form. """,
-                'string',
-                'Username'
-            ],
-            'password text': [
-                """ The text shown to ask for the password in the form. """,
-                'string',
-                'Password'
-            ],
-        }
-
-    @property
-    def service_name(self):
-        return self.get_config_value('service name')
+        self.new_config(
+            self.name,
+            pconfig.String(
+                'username text',
+                'Text used to ask for the username at login time.',
+                'Username'),
+            pconfig.String(
+                'password text',
+                'Text used to ask for the password at login time.',
+                'Password'),
+            pconfig.String(
+                'help text',
+                'Text used to guide the user at login time.',
+                'Insert your Username and Password and then submit.')
+        )

 
     @property
     def help_text(self):
 
     @property
     def help_text(self):


@@ -120,7 +83,7 @@ Form based login Manager. Relies on mod_intercept_form_submit plugin for
         return self.get_config_value('password text')
 
     def get_tree(self, site):
         return self.get_config_value('password text')
 
     def get_tree(self, site):

-        self.page = Form(site, self)
+        self.page = Form(site, self, 'login/form')

         return self.page
 
 
         return self.page
 
 


@@ -139,11 +102,12 @@ LoadModule authnz_pam_module modules/mod_authnz_pam.so
 """
 
 
 """
 
 

-class Installer(object):
+class Installer(LoginManagerInstaller):

 
 

-    def __init__(self):
+    def __init__(self, *pargs):
+        super(Installer, self).__init__()

         self.name = 'form'
         self.name = 'form'

-        self.ptype = 'login'
+        self.pargs = pargs

 
     def install_args(self, group):
         group.add_argument('--form', choices=['yes', 'no'], default='no',
 
     def install_args(self, group):
         group.add_argument('--form', choices=['yes', 'no'], default='no',


@@ -164,22 +128,14 @@ class Installer(object):
             httpd_conf.write(hunk)
 
         # Add configuration data to database
             httpd_conf.write(hunk)
 
         # Add configuration data to database

-        po = PluginObject()
+        po = PluginObject(*self.pargs)

         po.name = 'form'
         po.wipe_data()
         po.name = 'form'
         po.wipe_data()

-        po.wipe_config_values(FACILITY)
+        po.wipe_config_values()

 
 

-        # Update global config, put 'krb' always first
-        po.name = 'global'
-        globalconf = po.get_plugin_config(FACILITY)
-        if 'order' in globalconf:
-            order = globalconf['order'].split(',')
-        else:
-            order = []
-        order.append('form')
-        globalconf['order'] = ','.join(order)
-        po.set_config(globalconf)
-        po.save_plugin_config(FACILITY)
+        # Update global config to add login plugin
+        po.is_enabled = True
+        po.save_enabled_state()

 
         # for selinux enabled platforms, ignore if it fails just report
         try:
 
         # for selinux enabled platforms, ignore if it fails just report
         try: