From: Simo Sorce Date: Fri, 24 Jan 2014 19:20:42 +0000 (-0500) Subject: Add infrastructure to configure server X-Git-Tag: v0.2.2~119 X-Git-Url: http://git.cascardo.info/?p=cascardo%2Fipsilon.git;a=commitdiff_plain;h=cd30057eec4c772171c5558d9fac2c1f73bc12dd Add infrastructure to configure server Signed-off-by: Simo Sorce --- diff --git a/ipsilon/admin/__init__.py b/ipsilon/admin/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/ipsilon/admin/common.py b/ipsilon/admin/common.py new file mode 100755 index 0000000..7620d3f --- /dev/null +++ b/ipsilon/admin/common.py @@ -0,0 +1,126 @@ +#!/usr/bin/python +# +# Copyright (C) 2014 Simo Sorce +# +# 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 . + +from ipsilon.util.data import Store +from ipsilon.util.page import Page +from ipsilon.util.user import UserSession +import cherrypy +from ipsilon.login.common import FACILITY as LOGIN_FACILITY + + +def admin_protect(fn): + + def check(*args, **kwargs): + if UserSession().get_user().is_admin: + return fn(*args, **kwargs) + + raise cherrypy.HTTPError(403) + + return check + + +class LoginPluginPage(Page): + + def __init__(self, obj, site, baseurl): + super(LoginPluginPage, self).__init__(site) + self._obj = obj + self.url = '%s/%s' % (baseurl, obj.name) + + # Get the defaults + self.plugin_config = obj.get_config_desc() + if not self.plugin_config: + self.plugin_config = [] + + # Now overlay the actual config + for option in self.plugin_config: + self.plugin_config[option][2] = obj.get_config_value(option) + + @admin_protect + def GET(self, *args, **kwargs): + return self._template('admin/login_plugin.html', + title='%s plugin' % self._obj.name, + name='admin_login_%s_form' % self._obj.name, + action=self.url, + options=self.plugin_config) + + @admin_protect + def POST(self, *args, **kwargs): + + message = "Nothing was modified." + new_values = dict() + + for key, value in kwargs.iteritems(): + if key in self.plugin_config: + if value != self.plugin_config[key][2]: + cherrypy.log.error("Storing [%s]: %s = %s" % + (self._obj.name, key, value)) + new_values[key] = value + + if len(new_values) != 0: + # First we try to save in the database + try: + store = Store() + store.save_plugin_config(LOGIN_FACILITY, + self._obj.name, new_values) + message = "New configuration saved." + except Exception: # pylint: disable=broad-except + message = "Failed to save data!" + + # And only if it succeeds we change the live object + for name, value in new_values.items(): + self._obj.set_config_value(name, value) + self.plugin_config[name][2] = value + + return self._template('admin/login_plugin.html', + message=message, + title='%s plugin' % self._obj.name, + name='admin_login_%s_form' % self._obj.name, + action=self.url, + options=self.plugin_config) + + def root(self, *args, **kwargs): + cherrypy.log.error("method: %s" % cherrypy.request.method) + op = getattr(self, cherrypy.request.method, self.GET) + if callable(op): + return op(*args, **kwargs) + + +class LoginPlugins(Page): + def __init__(self, site, baseurl): + super(LoginPlugins, self).__init__(site) + self.url = '%s/login' % baseurl + + for plugin in self._site[LOGIN_FACILITY]['available']: + cherrypy.log.error('Admin login plugin: %s' % plugin) + obj = self._site[LOGIN_FACILITY]['available'][plugin] + self.__dict__[plugin] = LoginPluginPage(obj, self._site, self.url) + + +class Admin(Page): + + def __init__(self, *args, **kwargs): + super(Admin, self).__init__(*args, **kwargs) + self.url = '%s/admin' % self.basepath + self.login = LoginPlugins(self._site, self.url) + + def root(self, *args, **kwargs): + login_plugins = self._site[LOGIN_FACILITY] + return self._template('admin/index.html', title='Administration', + available=login_plugins['available'], + enabled=login_plugins['enabled']) diff --git a/ipsilon/root.py b/ipsilon/root.py index 30f6b43..279cbd4 100755 --- a/ipsilon/root.py +++ b/ipsilon/root.py @@ -20,6 +20,7 @@ from ipsilon.util.page import Page from ipsilon.login.common import Login from ipsilon.login.common import Logout +from ipsilon.admin.common import Admin sites = dict() @@ -37,5 +38,8 @@ class Root(Page): self.login = Login(self._site) self.logout = Logout(self._site) + # after all plugins are setup we can instantiate the admin pages + self.admin = Admin(self._site) + def root(self): return self._template('index.html', title='Root') diff --git a/setup.py b/setup.py index 30a6239..80e03b5 100755 --- a/setup.py +++ b/setup.py @@ -23,7 +23,7 @@ setup( name = 'ipsilon', version = '0.1', license = 'GPLv3+', - packages = ['ipsilon', 'ipsilon.login', 'ipsilon.util'], + packages = ['ipsilon', 'ipsilon.admin', 'ipsilon.login', 'ipsilon.util'], data_files = [('share/man/man7', ["man/ipsilon.7"]), ('doc', ['COPYING']), ('examples', ['examples/ipsilon.conf'])] diff --git a/templates/admin/index.html b/templates/admin/index.html new file mode 100644 index 0000000..5af8497 --- /dev/null +++ b/templates/admin/index.html @@ -0,0 +1,41 @@ + + + + + {{ title }} + + + + +
+ +
+

Log Out

+
+
+ {% if user.is_admin %} +

Login plugins:

+
    + {% for p in available %} +
  • {{ p }} - + {% if p in enabled %} + Disable - + Configure + {% else %} + Enable + {% endif %} +
    • + {% endfor %} +
+

Plugins order: [list here and form button to change?]

+ {% endif %} +
+
+

Home

+
+
+ + + diff --git a/templates/admin/login_plugin.html b/templates/admin/login_plugin.html new file mode 100644 index 0000000..43adac6 --- /dev/null +++ b/templates/admin/login_plugin.html @@ -0,0 +1,42 @@ + + + + + {{ title }} + + + + +
+ +
+

Log Out

+
+
+

{{ message }}

+
+
+
+
    + {% for o in options %} +
  • {{ o }}: +

    {{ options[o][0] }}

    + +
    • + {% endfor %} +
+ +
+
+
+

+ Admin - + Home +

+
+
+ + + diff --git a/templates/index.html b/templates/index.html index c983af2..1e21948 100644 --- a/templates/index.html +++ b/templates/index.html @@ -13,7 +13,7 @@
{% if user.is_admin %} - admin + admin {% endif %}