external
/
mailinabox
mirror of https://github.com/mail-in-a-box/mailinabox.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge 5734fcdc1b into a332be6a7b

This commit is contained in:
axd 2024-04-04 06:45:41 +08:00 committed by GitHub
parent a332be6a7b 5734fcdc1b
commit 3d14da88ff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
management/mailconfig.py
View File

@ -88,8 +88,8 @@ def is_dcv_address(email):
email = email.lower() email = email.lower()
return any(email.startswith((localpart + "@", localpart + "+")) for localpart in ("admin", "administrator", "postmaster", "hostmaster", "webmaster", "abuse")) return any(email.startswith((localpart + "@", localpart + "+")) for localpart in ("admin", "administrator", "postmaster", "hostmaster", "webmaster", "abuse"))
def open_database(env, with_connection=False): def open_database(env, with_connection=False, db_path="/mail/users.sqlite"):
conn = sqlite3.connect(env["STORAGE_ROOT"] + "/mail/users.sqlite") conn = sqlite3.connect(env["STORAGE_ROOT"] + db_path)
if not with_connection: if not with_connection:
return conn.cursor() return conn.cursor()
else: else:
@ -292,8 +292,9 @@ def add_mail_user(email, pw, privs, env):
validation = validate_privilege(p) validation = validate_privilege(p)
if validation: return validation if validation: return validation
# get the database # get the system database and OwnCloud database
conn, c = open_database(env, with_connection=True) conn, c = open_database(env, with_connection=True)
conn_oc, c_oc = open_database(env, with_connection=True, db_path="/owncloud/owncloud.db")
# hash the password # hash the password
pw = hash_password(pw) pw = hash_password(pw)
@ -308,6 +309,15 @@ def add_mail_user(email, pw, privs, env):
# write databasebefore next step # write databasebefore next step
conn.commit() conn.commit()
#fix sync cardDav error on Exchange connections, adding the user into OwnCloud DB
try:
c_oc.execute("INSERT INTO oc_users_external (backend, uid) VALUES (?, ?)",
("{127.0.0.1:993/imap/ssl/novalidate-cert}", email))
except sqlite3.IntegrityError:
return ("User already exists on calendar/contact server.", 400)
conn_oc.commit()
# Update things in case any new domains are added. # Update things in case any new domains are added.
return kick(env, "mail user added") return kick(env, "mail user added")
@ -352,6 +362,13 @@ def remove_mail_user(email, env):
return ("That's not a user (%s)." % email, 400) return ("That's not a user (%s)." % email, 400)
conn.commit() conn.commit()
#delete user from OwnCloud DB too
conn_oc, c_oc = open_database(env, with_connection=True, db_path="/owncloud/owncloud.db")
c_oc.execute("DELETE FROM oc_users_external WHERE email=?", (email,))
if c.rowcount != 1:
return ("This email (%s) wasn't in contacts/calendar server.", % email, 400)
conn_oc.commit()
# Update things in case any domains are removed. # Update things in case any domains are removed.
return kick(env, "mail user removed") return kick(env, "mail user removed")