@ -53,6 +53,7 @@ import sys
from django . db import models
from django . db . models import Q
from django import forms
from django . forms import ValidationError
from django . db . models . signals import post_save , post_delete , m2m_changed
from django . dispatch import receiver
from django . utils . functional import cached_property
@ -131,6 +132,7 @@ def get_fresh_gid():
class UserManager ( BaseUserManager ) :
""" User manager basique de django """
def _create_user (
self ,
pseudo ,
@ -195,14 +197,18 @@ class User(RevMixin, FieldPermissionModelMixin, AbstractBaseUser,
help_text = " Doit contenir uniquement des lettres, chiffres, ou tirets " ,
validators = [ linux_user_validator ]
)
email = models . EmailField ( )
email = models . EmailField (
blank = True ,
null = True ,
help_text = " External email address allowing us to contact you. "
)
local_email_redirect = models . BooleanField (
default = False ,
help_text = " Whether or not to redirect the local email messages to the main email. "
help_text = " Enable redirection of the local email messages to the main email."
)
local_email_enabled = models . BooleanField (
default = False ,
help_text = " Wether or not to e nable the local email account."
help_text = " E nable the local email account."
)
school = models . ForeignKey (
' School ' ,
@ -286,7 +292,7 @@ class User(RevMixin, FieldPermissionModelMixin, AbstractBaseUser,
if not OptionalUser . get_cached_value ( ' local_email_accounts_enabled ' ) or not self . local_email_enabled or self . local_email_redirect :
return str ( self . email )
else :
return str ( self . emailaddress_set . get ( local_part = self . pseudo ) )
return str ( self . emailaddress_set . get ( local_part = self . pseudo . lower ( ) ) )
@cached_property
def class_name ( self ) :
@ -560,13 +566,15 @@ class User(RevMixin, FieldPermissionModelMixin, AbstractBaseUser,
user_ldap . gid = LDAP [ ' user_gid ' ]
if ' {SSHA} ' in self . password or ' {SMD5} ' in self . password :
# We remove the extra $ added at import from ldap
user_ldap . user_password = self . password [ : 6 ] + self . password [ 7 : ]
user_ldap . user_password = self . password [ : 6 ] + \
self . password [ 7 : ]
elif ' {crypt} ' in self . password :
# depending on the length, we need to remove or not a $
if len ( self . password ) == 41 :
if len ( self . password ) == 41 :
user_ldap . user_password = self . password
else :
user_ldap . user_password = self . password [ : 7 ] + self . password [ 8 : ]
else :
user_ldap . user_password = self . password [ : 7 ] + \
self . password [ 8 : ]
user_ldap . sambat_nt_password = self . pwd_ntlm . upper ( )
if self . get_shell :
@ -611,7 +619,7 @@ class User(RevMixin, FieldPermissionModelMixin, AbstractBaseUser,
send_mail (
' Bienvenue au %(name)s / Welcome to %(name)s ' % {
' name ' : AssoOption . get_cached_value ( ' name ' )
} ,
} ,
' ' ,
GeneralOption . get_cached_value ( ' email_from ' ) ,
[ self . email ] ,
@ -654,8 +662,8 @@ class User(RevMixin, FieldPermissionModelMixin, AbstractBaseUser,
une machine inconnue sur le compte de l ' user " " "
all_interfaces = self . user_interfaces ( active = False )
if all_interfaces . count ( ) > OptionalMachine . get_cached_value (
' max_lambdauser_interfaces '
) :
' max_lambdauser_interfaces '
) :
return False , " Maximum de machines enregistrees atteinte "
if not nas_type :
return False , " Re2o ne sait pas à quel machinetype affecter cette \
@ -958,7 +966,7 @@ class User(RevMixin, FieldPermissionModelMixin, AbstractBaseUser,
' force ' : self . can_change_force ,
' selfpasswd ' : self . check_selfpasswd ,
' local_email_redirect ' : self . can_change_local_email_redirect ,
' local_email_enabled ' : self . can_change_local_email_enabled ,
' local_email_enabled ' : self . can_change_local_email_enabled ,
}
self . __original_state = self . state
@ -966,9 +974,22 @@ class User(RevMixin, FieldPermissionModelMixin, AbstractBaseUser,
""" Check if this pseudo is already used by any mailalias.
Better than raising an error in post - save and catching it """
if ( EMailAddress . objects
. filter ( local_part = self . pseudo )
. exclude ( user = self ) ) :
. filter ( local_part = self . pseudo . lower ( ) ) . exclude ( user_id = self . id )
) :
raise ValidationError ( " This pseudo is already in use. " )
if not self . local_email_enabled and not self . email :
raise ValidationError (
{ ' email ' : (
' There is neither a local email address nor an external '
' email address for this user. '
) , }
)
if self . local_email_redirect and not self . email :
raise ValidationError (
{ ' local_email_redirect ' : (
' You cannot redirect your local email if no external email '
' has been set. ' ) , }
)
def __str__ ( self ) :
return self . pseudo
@ -1106,7 +1127,8 @@ def user_post_save(**kwargs):
Synchronise le ldap """
is_created = kwargs [ ' created ' ]
user = kwargs [ ' instance ' ]
EMailAddress . objects . get_or_create ( local_part = user . pseudo , user = user )
EMailAddress . objects . get_or_create (
local_part = user . pseudo . lower ( ) , user = user )
if is_created :
user . notif_inscription ( )
user . state_sync ( )
@ -1129,6 +1151,7 @@ def user_group_relation_changed(**kwargs):
mac_refresh = False ,
group_refresh = True )
@receiver ( post_delete , sender = Adherent )
@receiver ( post_delete , sender = Club )
@receiver ( post_delete , sender = User )
@ -1517,7 +1540,7 @@ class Request(models.Model):
hours = GeneralOption . get_cached_value (
' req_expire_hrs '
)
) )
) )
if not self . token :
self . token = str ( uuid . uuid4 ( ) ) . replace ( ' - ' , ' ' ) # remove hyphens
super ( Request , self ) . save ( )
@ -1768,10 +1791,10 @@ class EMailAddress(RevMixin, AclMixin, models.Model):
a message and a boolean which is True if the user can delete
the local email account .
"""
if self . local_part == self . user . pseudo :
if self . local_part == self . user . pseudo . lower ( ) :
return False , ( " You cannot delete a local email account whose "
" local part is the same as the username. " )
if user_request . has_perm ( ' users.delete_emailaddress ' ) :
if user_request . has_perm ( ' users.delete_emailaddress ' ) :
return True , None
if not OptionalUser . get_cached_value ( ' local_email_accounts_enabled ' ) :
return False , " The local email accounts are not enabled. "
@ -1790,7 +1813,7 @@ class EMailAddress(RevMixin, AclMixin, models.Model):
a message and a boolean which is True if the user can edit
the local email account .
"""
if self . local_part == self . user . pseudo :
if self . local_part == self . user . pseudo . lower ( ) :
return False , ( " You cannot edit a local email account whose "
" local part is the same as the username. " )
if user_request . has_perm ( ' users.change_emailaddress ' ) :
@ -1803,7 +1826,7 @@ class EMailAddress(RevMixin, AclMixin, models.Model):
" local email account " )
def clean ( self , * args , * * kwargs ) :
self . local_part = self . local_part . lower ( )
if " @ " in self . local_part :
raise ValidationError ( " The local part cannot contain a @ " )
super ( EMailAddress , self ) . clean ( * args , * * kwargs )
klafyvel
7 years ago