Ticket #52

From now, users can store their own "preferences" inside MailNG.

lib/__init__.py

@@ -25,7 +25,7 @@ def _render_error(request, errortpl="error", user_context={}):
 
 def exec_as_vuser(cmd):
     code, output = exec_cmd("sudo -u %s %s" \
-                                % (parameters.get("admin", "VIRTUAL_UID"), cmd))
+                                % (parameters.get_admin("admin", "VIRTUAL_UID"), cmd))
     if code:
         exec_cmd("echo '%s' >> /tmp/vmail.log" % output)
         return False
@@ -57,13 +57,13 @@ def decode(s, encodings=('utf8', 'latin1', 'windows-1252', 'ascii')):
 
 def is_not_localadmin(errortpl="error"):
     def dec(f):
-        def wrapped_f(request, **kwargs):
+        def wrapped_f(request, *args, **kwargs):
             if request.user.id == 1:
                 return _render_error(request, errortpl, {
                         "error" : _("Invalid action, %s is a local user" \
                                         % request.user.username)
                         })
-            return f(request, **kwargs)
+            return f(request, *args, **kwargs)
         return wrapped_f
     return dec
 

lib/authbackends.py

@@ -27,7 +27,7 @@ class SimpleBackend:
             return None
 
 def check_password(password, crypted):
-    scheme = parameters.get("admin", "PASSWORD_SCHEME")
+    scheme = parameters.get_admin("admin", "PASSWORD_SCHEME")
     if scheme == "crypt":
         return crypt.crypt(password, crypted) == crypted
     if scheme == "md5":
@@ -35,7 +35,7 @@ def check_password(password, crypted):
     return password
 
 def crypt_password(password):
-    scheme = parameters.get("admin", "PASSWORD_SCHEME")
+    scheme = parameters.get_admin("admin", "PASSWORD_SCHEME")
     if scheme == "crypt":
         salt = ''.join(Random().sample(string.letters + string.digits, 2))
         return crypt.crypt(password, salt)

lib/migrations/0001_initial.py

@@ -15,20 +15,75 @@ class Migration(SchemaMigration):
             ('name', self.gf('django.db.models.fields.CharField')(max_length=255)),
         ))
         db.send_create_signal('lib', ['Parameter'])
+
+        # Adding model 'UserParameter'
+        db.create_table('lib_userparameter', (
+            ('value', self.gf('django.db.models.fields.CharField')(max_length=255)),
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=255)),
+            ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
+        ))
+        db.send_create_signal('lib', ['UserParameter'])
     
     
     def backwards(self, orm):
         
         # Deleting model 'Parameter'
         db.delete_table('lib_parameter')
+
+        # Deleting model 'UserParameter'
+        db.delete_table('lib_userparameter')
     
     
     models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
         'lib.parameter': {
             'Meta': {'object_name': 'Parameter'},
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
             'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        'lib.userparameter': {
+            'Meta': {'object_name': 'UserParameter'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
         }
     }
     

lib/models.py

@@ -1,5 +1,11 @@
 from django.db import models
+from django.contrib.auth.models import User
 
 class Parameter(models.Model):
     name = models.CharField(max_length=255)
     value = models.CharField(max_length=255)
+
+class UserParameter(models.Model):
+    user = models.ForeignKey(User)
+    name = models.CharField(max_length=255)
+    value = models.CharField(max_length=255)

lib/parameters.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import string
-from mailng.lib.models import Parameter
+from mailng.lib.models import *
 
 """
 This interface provides a simple way to declare and store parameters
@@ -14,6 +14,7 @@ Only super users will be able to access this part of the web interface.
 """
 
 _params = {}
+_levels = {'A' : 'admin', 'U' : 'user'}
 
 class NotDefined(Exception):
     def __init__(self, app, name):
@@ -24,16 +25,32 @@ class NotDefined(Exception):
         return "Application '%s' and/or parameter '%s' not defined" \
             % (self.app, self.name)
 
-def register(app, name, type="string", deflt=None, help=None, **kwargs):
+def __is_defined(app, level, name):
+    if not level in _levels.keys() \
+            or not app in _params.keys() \
+            or not name in _params[app][level].keys():
+        raise NotDefined(app, name)
+
+def __register(app, level, name, type="string", deflt=None, help=None, **kwargs):
     """Register a new parameter.
 
     app corresponds to a core component (admin, main) or an extension.
     """
     if not app in _params.keys():
         _params[app] = {}
-    _params[app][name] = {"type" : type, "default" : deflt, "help" : help}
+        for lvl in _levels.keys():
+            _params[app][lvl] = {}
+    if not level in _levels.keys():
+        return
+    _params[app][level][name] = {"type" : type, "default" : deflt, "help" : help}
     for k, v in kwargs.iteritems():
-        _params[app][name][k] = v
+        _params[app][level][name][k] = v
+
+def register_admin(app, name, **kwargs):
+    return __register(app, 'A', name, **kwargs)
+
+def register_user(app, name, **kwargs):
+    return __register(app, 'U', name, **kwargs)
 
 def unregister_app(app):
     if not _params.has_key(app):
@@ -41,9 +58,9 @@ def unregister_app(app):
     del _params[app]
     return True
 
-def save(app, name, value):
-    if not app in _params.keys() or not name in _params[app].keys():
-        raise NotDefined(app, name)
+def save_admin(app, name, value):
+    __is_defined(app, 'A', name)
+
     fullname = "%s.%s" % (app, name)
     try:
         p = Parameter.objects.get(name=fullname)
@@ -55,11 +72,32 @@ def save(app, name, value):
         p.save()
     return True
 
-def get(app, name):
-    if not app in _params.keys() or not name in _params[app].keys():
-        raise NotDefined(app, name)
+def save_user(user, app, name, value):
+    __is_defined(app, 'U', name)
+    fullname = "%s.%s" % (app, name)
+    try:
+        p = UserParameter.objects.get(user=user, name=fullname)
+    except UserParameter.DoesNotExist:
+        p = UserParameter()
+        p.user = user
+        p.name = fullname
+    if p.value != value:
+        p.value = value
+        p.save()
+    return True
+
+def get_admin(app, name):
+    __is_defined(app, "A", name)
     try:
         p = Parameter.objects.get(name="%s.%s" % (app, name))
     except Parameter.DoesNotExist:
-        return _params[app][name]["default"]
+        return _params[app]["A"][name]["default"]
+    return p.value
+
+def get_user(user, app, name):
+    __is_defined(app, "U", name)
+    try:
+        p = UserParameter.objects.get(user=user, name="%s.%s" % (app, name))
+    except UserParameter.DoesNotExist:
+        return _params[app]["U"][name]["default"]
     return p.value