Merge branch 'v68a-testing'

conf/dovecot/conf.d/15-mailboxes.conf

@@ -1,63 +0,0 @@
-## NOTE: This file is automatically generated by Mail-in-a-Box.
-##       Do not edit this file. It is continually updated by
-##       Mail-in-a-Box and your changes will be lost.
-##
-##       Mail-in-a-Box machines are not meant to be modified.
-##       If you modify any system configuration you are on
-##       your own --- please do not ask for help from us.
-
-namespace inbox {
-  # Automatically create & subscribe some folders.
-  # * Create and subscribe the INBOX folder.
-  # * Our sieve rule for spam expects that the Spam folder exists.
-  # * Z-Push must be configured with the same settings in conf/zpush/backend_imap.php (#580).
-
-  # MUA notes:
-  # * Roundcube will show an error if the user tries to delete a message before the Trash folder exists (#359).
-  # * K-9 mail will poll every 90 seconds if a Drafts folder does not exist.
-  # * Apple's OS X Mail app will create 'Sent Messages' if it doesn't see a folder with the \Sent flag (#571, #573) and won't be able to archive messages unless 'Archive' exists (#581).
-  # * Thunderbird's default in its UI is 'Archives' (plural) but it will configure new accounts to use whatever we say here (#581).
-
-  # auto:
-  # 'create' will automatically create this mailbox.
-  # 'subscribe' will both create and subscribe to the mailbox.
-
-  # special_use is a space separated list of IMAP SPECIAL-USE
-  # attributes as specified by RFC 6154:
-  # \All \Archive \Drafts \Flagged \Junk \Sent \Trash
-
-  mailbox INBOX {
-    auto = subscribe
-  }
-  mailbox Spam {
-    special_use = \Junk
-    auto = subscribe
-  }
-  mailbox Drafts {
-    special_use = \Drafts
-    auto = subscribe
-  }
-  mailbox Sent {
-    special_use = \Sent
-    auto = subscribe
-  }
-  mailbox Trash {
-    special_use = \Trash
-    auto = subscribe
-  }
-  mailbox Archive {
-    special_use = \Archive
-    auto = subscribe
-  }
-
-  # dovevot's standard mailboxes configuration file marks two sent folders
-  # with the \Sent attribute, just in case clients don't agree about which
-  # they're using. We'll keep that, plus add Junk as an alterative for Spam.
-  # These are not auto-created.
-  mailbox "Sent Messages" {
-    special_use = \Sent
-  }
-  mailbox Junk {
-    special_use = \Junk
-  }
-}

management/cli.py

@@ -9,13 +9,13 @@
 import sys, getpass, urllib.request, urllib.error, json, csv
 import contextlib
 
-def mgmt(cmd, data=None, is_json=False):
+def mgmt(cmd, data=None, is_json=False, method='GET'):
 	# The base URL for the management daemon. (Listens on IPv4 only.)
 	mgmt_uri = 'http://127.0.0.1:10222'
 
 	setup_key_auth(mgmt_uri)
 
-	req = urllib.request.Request(mgmt_uri + cmd, urllib.parse.urlencode(data).encode("utf8") if data else None)
+	req = urllib.request.Request(mgmt_uri + cmd, urllib.parse.urlencode(data).encode("utf8") if data else None, method=method)
 	try:
 		response = urllib.request.urlopen(req)
 	except urllib.error.HTTPError as e:
@@ -66,7 +66,7 @@ if len(sys.argv) < 2:
   {cli} user password user@domain.com [password]
   {cli} user remove user@domain.com
   {cli} user make-admin user@domain.com
-  {cli} user quota user@domain [new-quota]
+  {cli} user quota user@domain [new-quota]       (get or set user quota)
   {cli} user remove-admin user@domain.com
   {cli} user admins                              (lists admins)
   {cli} user mfa show user@domain.com            (shows MFA devices for user, if any)
@@ -124,12 +124,12 @@ elif sys.argv[1] == "user" and sys.argv[2] == "admins":
 				print(user['email'])
 
 elif sys.argv[1] == "user" and sys.argv[2] == "quota" and len(sys.argv) == 4:
-	# Set a user's quota
+	# Get a user's quota
 	print(mgmt("/mail/users/quota?text=1&email=%s" % sys.argv[3]))
 
 elif sys.argv[1] == "user" and sys.argv[2] == "quota" and len(sys.argv) == 5:
 	# Set a user's quota
-	users = mgmt("/mail/users/quota", { "email": sys.argv[3], "quota": sys.argv[4] })
+	users = mgmt("/mail/users/quota", { "email": sys.argv[3], "quota": sys.argv[4] }, method='POST')
 
 elif sys.argv[1] == "user" and len(sys.argv) == 5 and sys.argv[2:4] == ["mfa", "show"]:
 	# Show MFA status for a user.
@@ -161,4 +161,3 @@ elif sys.argv[1] == "system" and sys.argv[2] == "default-quota" and len(sys.argv
 else:
 	print("Invalid command-line arguments.")
 	sys.exit(1)
-

setup/mail-dovecot.sh

@@ -66,7 +66,7 @@ tools/editconf.py /etc/dovecot/conf.d/10-mail.conf \
 	first_valid_uid=0
 
 # Create, subscribe, and mark as special folders: INBOX, Drafts, Sent, Trash, Spam and Archive.
-cp conf/dovecot/conf.d/15-mailboxes.conf /etc/dovecot/conf.d/
+cp conf/dovecot-mailboxes.conf /etc/dovecot/conf.d/15-mailboxes.conf
 sed -i "s/#mail_plugins =\(.*\)/mail_plugins =\1 \$mail_plugins quota/" /etc/dovecot/conf.d/10-mail.conf
 if ! grep -q "mail_plugins.* imap_quota" /etc/dovecot/conf.d/20-imap.conf; then
   sed -i "s/\(mail_plugins =.*\)/\1\n  mail_plugins = \$mail_plugins imap_quota/" /etc/dovecot/conf.d/20-imap.conf

setup/mail-users.sh

@@ -24,8 +24,6 @@ if [ ! -f "$db_path" ]; then
 	echo "CREATE TABLE aliases (id INTEGER PRIMARY KEY AUTOINCREMENT, source TEXT NOT NULL UNIQUE, destination TEXT NOT NULL, permitted_senders TEXT);" | sqlite3 "$db_path";
 	echo "CREATE TABLE mfa (id INTEGER PRIMARY KEY AUTOINCREMENT, user_id INTEGER NOT NULL, type TEXT NOT NULL, secret TEXT NOT NULL, mru_token TEXT, label TEXT, FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE);" | sqlite3 "$db_path";
 	echo "CREATE TABLE auto_aliases (id INTEGER PRIMARY KEY AUTOINCREMENT, source TEXT NOT NULL UNIQUE, destination TEXT NOT NULL, permitted_senders TEXT);" | sqlite3 "$db_path";
-elif sqlite3 $db_path ".schema users" | grep --invert-match quota; then
-  echo "ALTER TABLE users ADD COLUMN quota TEXT NOT NULL DEFAULT '0';" | sqlite3 $db_path;
 fi
 
 # ### User Authentication

setup/migrate.py

@@ -190,6 +190,13 @@ def migration_14(env):
 	db = os.path.join(env["STORAGE_ROOT"], 'mail/users.sqlite')
 	shell("check_call", ["sqlite3", db, "CREATE TABLE auto_aliases (id INTEGER PRIMARY KEY AUTOINCREMENT, source TEXT NOT NULL UNIQUE, destination TEXT NOT NULL, permitted_senders TEXT);"])
 
+def migration_15(env):
+	# Add a column to the users table to store their quota limit.  Default to '0' for unlimited.
+	db = os.path.join(env["STORAGE_ROOT"], 'mail/users.sqlite')
+	shell("check_call", ["sqlite3", db,
+						 "ALTER TABLE users ADD COLUMN quota TEXT NOT NULL DEFAULT '0';"])
+
+
 ###########################################################
 
 def get_current_migration():
@@ -269,4 +276,3 @@ if __name__ == "__main__":
 	elif sys.argv[-1] == "--migrate":
 		# Perform migrations.
 		run_migrations()
-