external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2025-04-04 00:17:06 +00:00
Code Issues Releases Wiki Activity

Use sha1 hash of maildrop instead of a generated UUID

Browse Source
This commit is contained in:
downtownallday 2020-06-09 20:24:46 -04:00
parent 81950592a7
commit d2f418a363
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
management/mailconfig.py
View File

@ -10,7 +10,7 @@
# Python 3 in setup/questions.sh to validate the email # Python 3 in setup/questions.sh to validate the email
# address entered by the user. # address entered by the user.
import subprocess, shutil, os, sqlite3, re, ldap3, uuid import subprocess, shutil, os, sqlite3, re, ldap3, uuid, hashlib
import utils, backend import utils, backend
from email_validator import validate_email as validate_email_, EmailNotValidError from email_validator import validate_email as validate_email_, EmailNotValidError
import idna import idna
@ -637,8 +637,12 @@ def add_mail_user(email, pw, privs, env):
if conn.wait(id).count() > 0: if conn.wait(id).count() > 0:
return ("An alias exists with that address.", 400) return ("An alias exists with that address.", 400)
# Generate a unique id for uid ## Generate a unique id for uid
uid = '%s' % uuid.uuid4() #uid = '%s' % uuid.uuid4()
# use a sha-1 hash of maildrop for uid
m = hashlib.sha1()
m.update(bytearray(email.lower(),'utf-8'))
uid = m.hexdigest()
# choose a common name and surname (required attributes) # choose a common name and surname (required attributes)
cn = email.split("@")[0].replace('.',' ').replace('_',' ') cn = email.split("@")[0].replace('.',' ').replace('_',' ')

12
setup/migration_13.py
View File

@ -5,7 +5,7 @@
# helper functions for migration #13 # helper functions for migration #13
# #
import uuid, os, sqlite3, ldap3 import uuid, os, sqlite3, ldap3, hashlib
def add_user(env, ldapconn, search_base, users_base, domains_base, email, password, privs, cn=None): def add_user(env, ldapconn, search_base, users_base, domains_base, email, password, privs, cn=None):
@ -29,9 +29,13 @@ def add_user(env, ldapconn, search_base, users_base, domains_base, email, passwo
print("user already exists: %s" % email) print("user already exists: %s" % email)
return ldapconn.response[0]['dn'] return ldapconn.response[0]['dn']
# Generate a unique id for uid ## Generate a unique id for uid
uid = '%s' % uuid.uuid4() #uid = '%s' % uuid.uuid4()
# use a sha-1 hash of the email address for uid
m = hashlib.sha1()
m.update(bytearray(email.lower(),'utf-8'))
uid = m.hexdigest()
# Attributes to apply to the new ldap entry # Attributes to apply to the new ldap entry
attrs = { attrs = {
"mail" : email, "mail" : email,