add a mandatory-pgp-encryption submission port

CHANGELOG.md

@@ -1,382 +0,0 @@
-CHANGELOG
-=========
-
-v0.14 (November 4, 2015)
-------------------------
-
-Mail:
-
-* Spamassassin's network-based tests (Pyzor, others) and DKIM tests are now enabled. (Pyzor had always been installed but was not active due to a misconfiguration.)
-* Moving spam out of the Spam folder and into Trash would incorrectly train Spamassassin that those messages were not spam.
-* Automatically create the Sent and Archive folders for new users.
-* The HTML5_Notifier plugin for Roundcube is now included, which when turned on in Roundcube settings provides desktop notifications for new mail.
-* The Exchange/ActiveSync backend Z-Push has been updated to fix a problem with CC'd emails not being sent to the CC recipients.
-
-Calender/Contacts:
-
-* CalDAV/CardDAV and Exchange/ActiveSync for calendar/contacts wasn't working in some network configurations.
-
-Web:
-
-* When a new domain is added to the box, rather than applying a new self-signed certificate for that domain, the SSL certificate for the box's primary hostname will be used instead.
-* If a custom DNS record is set on a domain or 'www'+domain, web would not be served for that domain. If the custom DNS record is just the box's IP address, that's a configuration mistake, but allow it and let web continue to be served.
-* Accommodate really long domain names by increasing an nginx setting.
-
-Control panel:
-
-* Added an option to check for new Mail-in-a-Box versions within status checks. It is off by default so that boxes don't "phone home" without permission.
-* Added a random password generator on the users page to simplify creating new accounts.
-* When S3 backup credentials are set, the credentials are now no longer ever sent back from the box to the client, for better security.
-* Fixed the jumpiness when a modal is displayed.
-* Focus is put into the login form fields when the login form is displayed.
-* Status checks now include a warning if a custom DNS record has been set on a domain that would normally serve web and as a result that domain no longer is serving web.
-* Status checks now check that secondary nameservers, if specified, are actually serving the domains.
-* Some errors in the control panel when there is invalid data in the database or an improperly named archived user account have been suppressed.
-* Added subresource integrity attributes to all remotely-sourced resources (i.e. via CDNs) to guard against CDNs being used as an attack vector.
-
-System:
-
-* Tweaks to fail2ban settings.
-* Fixed a spurrious warning while installing munin.
-
-v0.13b (August 30, 2015)
-------------------------
-
-Another ownCloud 8.1.1 issue was found. New installations left ownCloud improperly setup ("You are accessing the server from an untrusted domain."). Upgrading to this version will fix that.
-
-v0.13a (August 23, 2015)
-------------------------
-
-Note: v0.13 (no 'a', August 19, 2015) was pulled immediately due to an ownCloud bug that prevented upgrades. v0.13a works around that problem.
-
-Mail:
-
-* Outbound mail headers (the Recieved: header) are tweaked to possibly improve deliverability.
-* Some MIME messages would hang Roundcube due to a missing package.
-* The users permitted to send as an alias can now be different from where an alias forwards to.
-
-DNS:
-
-* The secondary nameservers option in the control panel now accepts more than one nameserver and a special xfr:IP format to specify zone-transfer-only IP addresses.
-* A TLSA record is added for HTTPS for DNSSEC-aware clients that support it.
-
-System:
-
-* Backups can now be turned off, or stored in Amazon S3, through new control panel options.
-* Munin was not working on machines confused about their hostname and had lots of errors related to PANGO, NTP peers and network interfaces that were not up.
-* ownCloud updated to version 8.1.1 (with upgrade work-around), its memcached caching enabled.
-* When upgrading, network checks like blocked port 25 are now skipped.
-* Tweaks to the intrusion detection rules for IMAP.
-* Mail-in-a-Box's setup is a lot quieter, hiding lots of irrelevant messages.
-
-Control panel:
-
-* SSL certificate checks were failing on OVH/OpenVZ servers due to missing /dev/stdin.
-* Improve the sort order of the domains in the status checks.
-* Some links in the control panel were only working in Chrome.
-
-v0.12c (July 19, 2015)
-----------------------
-
-v0.12c was posted to work around the current Sourceforge.net outage: pyzor's remote server is now hard-coded rather than accessing a file hosted on Sourceforge, and roundcube is now downloaded from a Mail-in-a-Box mirror rather than from Sourceforge.
-
-v0.12b (July 4, 2015)
----------------------
-
-This version corrects a minor regression in v0.12 related to creating aliases targetting multiple addresses.
-
-v0.12 (July 3, 2015)
---------------------
-
-This is a minor update to v0.11, which was a major update. Please read v0.11's advisories.
-
-* The administrator@ alias was incorrectly created starting with v0.11. If your first install was v0.11, check that the administrator@ alias forwards mail to you.
-* Intrusion detection rules (fail2ban) are relaxed (i.e. less is blocked).
-* SSL certificates could not be installed for the new automatic 'www.' redirect domains.
-* PHP's default character encoding is changed from no default to UTF8. The effect of this change is unclear but should prevent possible future text conversion issues.
-* User-installed SSL private keys in the BEGIN PRIVATE KEY format were not accepted.
-* SSL certificates with SAN domains with IDNA encoding were broken in v0.11.
-* Some IDNA functionality was using IDNA 2003 rather than IDNA 2008.
-
-v0.11b (June 29, 2015)
-----------------------
-
-v0.11b was posted shortly after the initial posting of v0.11 to correct a missing dependency for the new PPA.
-
-v0.11 (June 29, 2015)
----------------------
-
-Advisories:
-* Users can no longer spoof arbitrary email addresses in outbound mail. When sending mail, the email address configured in your mail client must match the SMTP login username being used, or the email address must be an alias with the SMTP login username listed as one of the alias's targets.
-* This update replaces your DKIM signing key with a stronger key. Because of DNS caching/propagation, mail sent within a few hours after this update could be marked as spam by recipients. If you use External DNS, you will need to update your DNS records.
-* The box will now install software from a new Mail-in-a-Box PPA on Launchpad.net, where we are distributing two of our own packages: a patched postgrey and dovecot-lucene.
-
-Mail:
-* Greylisting will now let some reputable senders pass through immediately.
-* Searching mail (via IMAP) will now be much faster using the dovecot lucene full text search plugin.
-* Users can no longer spoof arbitrary email addresses in outbound mail (see above).
-* Fix for deleting admin@ and postmaster@ addresses.
-* Roundcube is updated to version 1.1.2, plugins updated.
-* Exchange/ActiveSync autoconfiguration was not working on all devices (e.g. iPhone) because of a case-sensitive URL.
-* The DKIM signing key has been increased to 2048 bits, from 1024, replacing the existing key.
-
-Web:
-* 'www' subdomains now automatically redirect to their parent domain (but you'll need to install an SSL certificate).
-* OCSP no longer uses Google Public DNS.
-* The installed PHP version is no longer exposed through HTTP response headers, for better security.
-
-DNS:
-* Default IPv6 AAAA records were missing since version 0.09.
-
-Control panel:
-* Resetting a user's password now forces them to log in again everywhere.
-* Status checks were not working if an ssh server was not installed.
-* SSL certificate validation now uses the Python cryptography module in some places where openssl was used.
-* There is a new tab to show the installed version of Mail-in-a-Box and to fetch the latest released version.
-
-System:
-* The munin system monitoring tool is now installed and accessible at /admin/munin.
-* ownCloud updated to version 8.0.4. The ownCloud installation step now is reslient to download problems. The ownCloud configuration file is now stored in STORAGE_ROOT to fix loss of data when moving STORAGE_ROOT to a new machine.
-* The setup scripts now run `apt-get update` prior to installing anything to ensure the apt database is in sync with the packages actually available.
-
-
-v0.10 (June 1, 2015)
---------------------
-
-* SMTP Submission (port 587) began offering the insecure SSLv3 protocol due to a misconfiguration in the previous version.
-* Roundcube now allows persistent logins using Roundcube-Persistent-Login-Plugin.
-* ownCloud is updated to version 8.0.3.
-* SPF records for non-mail domains were tightened.
-* The minimum greylisting delay has been reduced from 5 minutes to 3 minutes.
-* Users and aliases weren't working if they were entered with any uppercase letters. Now only lowercase is allowed.
-* After installing an SSL certificate from the control panel, the page wasn't being refreshed.
-* Backups broke if the box's hostname was changed after installation.
-* Dotfiles (i.e. .svn) stored in ownCloud Files were not accessible from ownCloud's mobile/desktop clients.
-* Fix broken install on OVH VPS's.
-
-
-v0.09 (May 8, 2015)
--------------------
-
-Mail:
-
-* Spam checking is now performed on messages larger than the previous limit of 64KB.
-* POP3S is now enabled (port 995).
-* Roundcube is updated to version 1.1.1.
-* Minor security improvements (more mail headers with user agent info are anonymized; crypto settings were tightened).
-
-ownCloud:
-
-* Downloading files you uploaded to ownCloud broke because of a change in ownCloud 8.
-
-DNS:
-
-* Internationalized Domain Names (IDNs) should now work in email. If you had custom DNS or custom web settings for internationalized domains, check that they are still working.
-* It is now possible to set multiple TXT and other types of records on the same domain in the control panel.
-* The custom DNS API was completely rewritten to support setting multiple records of the same type on a domain. Any existing client code using the DNS API will have to be rewritten. (Existing code will just get 404s back.)
-* On some systems the `nsd` service failed to start if network inferfaces were not ready.
-
-System / Control Panel:
-
-* In order to guard against misconfiguration that can lead to domain control validation hijacking, email addresses that begin with admin, administrator, postmaster, hostmaster, and webmaster can no longer be used for (new) mail user accounts, and aliases for these addresses may direct mail only to the box's administrator(s).
-* Backups now use duplicity's built-in gpg symmetric AES256 encryption rather than my home-brewed encryption. Old backups will be incorporated inside the first backup after this update but then deleted from disk (i.e. your backups from the previous few days will be backed up).
-* There was a race condition between backups and the new nightly status checks.
-* The control panel would sometimes lock up with an unnecessary loading indicator.
-* You can no longer delete your own account from the control panel.
-
-Setup:
-
-* All Mail-in-a-Box release tags are now signed on github, instructions for verifying the signature are added to the README, and the integrity of some packages downloaded during setup is now verified against a SHA1 hash stored in the tag itself.
-* Bugs in first user account creation were fixed.
-
-v0.08 (April 1, 2015)
----------------------
-
-Mail:
-
-* The Roundcube vacation_sieve plugin by @arodier is now installed to make it easier to set vacation auto-reply messages from within Roundcube.
-* Authentication-Results headers for DMARC, added in v0.07, were mistakenly added for outbound mail --- that's now removed.
-* The Trash folder is now created automatically for new mail accounts, addressing a Roundcube error.
-
-DNS:
-
-* Custom DNS TXT records were not always working and they can now override the default SPF, DKIM, and DMARC records.
-
-System:
-
-* ownCloud updated to version 8.0.2.
-* Brute-force SSH and IMAP login attempts are now prevented by properly configuring fail2ban.
-* Status checks are run each night and any changes from night to night are emailed to the box administrator (the first user account).
-
-Control panel:
-
-* The new check that system services are running mistakenly checked that the Dovecot Managesieve service is publicly accessible. Although the service binds to the public network interface we don't open the port in ufw. On some machines it seems that ufw blocks the connection from the status checks (which seems correct) and on some machines (mine) it doesn't, which is why I didn't notice the problem.
-* The current backup chain will now try to predict how many days until it is deleted (always at least 3 days after the next full backup).
-* The list of aliases that forward to a user are removed from the Mail Users page because when there are many alises it is slow and times-out.
-* Some status check errors are turned into warnings, especially those that might not apply if External DNS is used.
-
-v0.07 (February 28, 2015)
--------------------------
-
-Mail:
-
-* If the box manages mail for a domain and a subdomain of that domain, outbound mail from the subdomain was not DKIM-signed and would therefore fail DMARC tests on the receiving end, possibly result in the mail heading into spam folders.
-* Auto-configuration for Mozilla Thunderbird, Evolution, KMail, and Kontact is now available.
-* Domains that only have a catch-all alias or domain alias no longer automatically create/require admin@ and postmaster@ addresses since they'll forward anyway.
-* Roundcube is updated to version 1.1.0.
-* Authentication-Results headers for DMARC are now added to incoming mail.
-
-DNS:
-
-* If a custom CNAME record is set on a 'www' subdomain, the default A/AAAA records were preventing the CNAME from working.
-* If a custom DNS A record overrides one provided by the box, the a corresponding default IPv6 record by the box is removed since it will probably be incorrect.
-* Internationalized domain names (IDNs) are now supported for DNS and web, but email is not yet tested.
-
-Web:
-
-* Static websites now deny access to certain dot (.) files and directories which typically have sensitive info: .ht*, .svn*, .git*, .hg*, .bzr*.
-* The nginx server no longer reports its version and OS for better privacy.
-* The HTTP->HTTPS redirect is now more efficient.
-* When serving a 'www.' domain, reuse the SSL certificate for the parent domain if it covers the 'www' subdomain too
-* If a custom DNS CNAME record is set on a domain, don't offer to put a website on that domain. (Same logic already applies to custom A/AAAA records.)
-
-Control panel:
-
-* Status checks now check that system services are actually running by pinging each port that should have something running on it.
-* The status checks are now parallelized so they may be a little faster.
-* The status check for MX records now allow any priority, in case an unusual setup is required.
-* The interface for setting website domain-specific directories is simplified.
-* The mail guide now says that to use Outlook, Outlook 2007 or later on Windows 7 and later is required.
-* External DNS settings now skip the special "_secondary_nameserver" key which is used for storing secondary NS information.
-
-Setup:
-
-* Install cron if it isn't already installed.
-* Fix a units problem in the minimum memory check.
-* If you override the STORAGE_ROOT, your setting will now persist if you re-run setup.
-* Hangs due to apt wanting the user to resolve a conflict should now be fixed (apt will just clobber the problematic file now).
-
-v0.06 (January 4, 2015)
------------------------
-
-Mail:
-
-* Set better default system limits to accommodate boxes handling mail for 20+ users.
-
-Contacts/calendar:
-
-* Update to ownCloud to 7.0.4.
-* Contacts syncing via ActiveSync wasn't working.
-
-Control panel:
-
-* New control panel for setting custom DNS settings (without having to use the API).
-* Status checks showed a false positive for Spamhause blacklists and for secondary DNS in some cases.
-* Status checks would fail to load if openssh-sever was not pre-installed, but openssh-server is not required.
-* The local DNS cache is cleared before running the status checks using 'rncd' now rather than restarting 'bind9', which should be faster and wont interrupt other services.
-* Multi-domain and wildcard certificate can now be installed through the control panel.
-* The DNS API now allows the setting of SRV records.
-
-Misc:
-
-* IPv6 configuration error in postgrey, nginx.
-* Missing dependency on sudo.
-
-v0.05 (November 18, 2014)
--------------------------
-
-Mail:
-
-* The maximum size of outbound mail sent via webmail and Exchange/ActiveSync has been increased to 128 MB, the same as when using SMTP.
-* Spam is no longer wrapped as an attachment inside a scary Spamassassin explanation. The original message is simply moved straight to the Spam folder unchanged.
-* There is a new iOS/Mac OS X Configuration Profile link in the control panel which makes it easier to configure IMAP/SMTP/CalDAV/CardDAV on iOS devices and Macs.
-* "Domain aliases" can now be configured in the control panel.
-* Updated to [Roundcube 1.0.3](http://trac.roundcube.net/wiki/Changelog).
-* IMAP/SMTP is now recommended even on iOS devices as Exchange/ActiveSync is terribly buggy.
-
-Control panel:
-
-* Installing an SSL certificate for the primary hostname would cause problems until a restart (services needed to be restarted).
-* Installing SSL certificates would fail if /tmp was on a different filesystem.
-* Better error messages when installing a SSL certificate fails.
-* The local DNS cache is now cleared each time the system status checks are run.
-* Documented how to use +tag addressing.
-* Minor UI tweaks.
-
-Other:
-
-* Updated to [ownCloud 7.0.3](http://owncloud.org/changelog/).
-* The ownCloud API is now exposed properly.
-* DNSSEC now works on `.guide` domains now too (RSASHA256).
-
-v0.04 (October 15, 2014)
-------------------------
-
-Breaking changes:
-
-* On-disk backups are now retained for a minimum of 3 days instead of 14. Beyond that the user is responsible for making off-site copies.
-* IMAP no longer supports the legacy SSLv3 protocol. SSLv3 is now known to be insecure. I don't believe any modern devices will be affected by this. HTTPS and SMTP submission already had SSLv3 disabled.
-
-Control panel:
-
-* The control panel has a new page for installing SSL certificates.
-* The control panel has a new page for hosting static websites.
-* The control panel now shows mailbox sizes on disk.
-* It is now possible to create catch-all aliases from the control panel.
-* Many usability improvements in the control panel.
-
-DNS:
-
-* Custom DNS A/AAAA records on subdomains were ignored.
-* It is now possible to set up a secondary DNS server.
-* DNS zones were updating even when nothing changed.
-* Strict SPF and DMARC settings are now set on all subdomains not used for mail.
-
-Security:
-
-* DNSSEC is now supported for the .email TLD which required a different key algorithm.
-* Nginx and Postfix now use 2048 bits of DH parameters instead of 1024.
-
-Other:
-
-* Spam filter learning by dragging mail in and out of the Spam folder should hopefully be working now.
-* Some things were broken if the machine had an IPv6 address.
-* Other things were broken if the machine was on a non-utf8 locale.
-* No longer implementing webfinger.
-* Removes apache before installing nginx, in case it has been installed by distro.
-
-v0.03 (September 24, 2014)
---------------------------
-
-* Update existing installs of Roundcube.
-* Disabled catch-alls pending figuring out how to get users to take precedence.
-* Z-Push was not working because in v0.02 we had accidentally moved to a different version.
-* Z-Push is now locked to a specific commit so it doesn't change on us accidentally.
-* The start script is now symlinked to /usr/local/bin/mailinabox.
-
-v0.02 (September 21, 2014)
---------------------------
-
-* Open the firewall to an alternative SSH port if set.
-* Fixed missing dependencies.
-* Set Z-Push to use sync command with ownCloud.
-* Support more concurrent connections for z-push.
-* In the status checks, handle wildcard certificates.
-* Show the status of backups in the control panel.
-* The control panel can now update a user's password.
-* Some usability improvements in the control panel.
-* Warn if a SSL cert is expiring in 30 days.
-* Use SHA2 to generate CSRs.
-* Better logic for determining when to take a full backup.
-* Reduce DNS TTL, not that it seems to really matter.
-* Add SSHFP DNS records.
-* Add an API for setting custom DNS records 
-* Update to ownCloud 7.0.2.
-* Some things were broken if the machine had an IPv6 address.
-* Use a dialogs library to ask users questions during setup.
-* Other fixes.
-
-v0.01 (August 19, 2014)
------------------------
-
-First release.

README.md

@@ -1,99 +1,55 @@
 Mail-in-a-Box
 =============
 
-By [@JoshData](https://github.com/JoshData) and [contributors](https://github.com/mail-in-a-box/mailinabox/graphs/contributors).
-
 Mail-in-a-Box helps individuals take back control of their email by defining a one-click, easy-to-deploy SMTP+everything else server: a mail server in a box.
 
-**Please see [https://mailinabox.email](https://mailinabox.email) for the project's website and setup guide!**
+**This is a work in progress. I work on this in my limited free time.**
 
-* * *
+Why build this? Mass electronic surveillance by governments revealed over the last year has spurred a new movement to [re-decentralize](http://redecentralize.org/) the web, that is, to empower netizens to be their own service providers again. SMTP, the protocol of email, is decentralized in principle but highly centralized in practice due to the high cost of implementing all of the modern protocols that surround it. As a result, most individuals trade their independence for access to a “free” email service.
 
-I am trying to:
-
-* Make deploying a good mail server easy.
-* Promote [decentralization](http://redecentralize.org/), innovation, and privacy on the web.
-* Have automated, auditable, and [idempotent](http://sharknet.us/2014/02/01/automated-configuration-management-challenges-with-idempotency/) configuration.
-* **Not** make a totally unhackable, NSA-proof server.
-* **Not** make something customizable by power users.
-
-This setup is what has been powering my own personal email since September 2013.
 
 The Box
 -------
 
-Mail-in-a-Box turns a fresh Ubuntu 14.04 LTS 64-bit machine into a working mail server by installing and configuring various components.
+Mail-in-a-Box turns a fresh Ubuntu 14.04 LTS 64-bit machine into a working mail server, including [SMTP](http://www.postfix.org/), [IMAP](http://dovecot.org/), [webmail](http://roundcube.net/), [spam filtering](https://spamassassin.apache.org/), [greylisting](http://postgrey.schweikert.ch/), DNS, [SPF](https://en.wikipedia.org/wiki/Sender_Policy_Framework), [DKIM](https://en.wikipedia.org/wiki/DomainKeys_Identified_Mail), [DMARC](https://en.wikipedia.org/wiki/DMARC), [DNSSEC](https://en.wikipedia.org/wiki/DNSSEC), [DANE TLSA](https://en.wikipedia.org/wiki/DNS-based_Authentication_of_Named_Entities), and basic system services like a firewall, intrusion protection, and setting the system clock.
 
-It is a one-click email appliance. There are no user-configurable setup options. It "just works".
+This setup is what has been powering my own personal email since September 2013.
 
-The components installed are:
+Please see [mailinabox.email](https://mailinabox.email) for more information and how to set up a Mail-in-a-Box.
 
-* SMTP ([postfix](http://www.postfix.org/)), IMAP ([dovecot](http://dovecot.org/)), CardDAV/CalDAV ([ownCloud](http://owncloud.org/)), Exchange ActiveSync ([z-push](https://github.com/fmbiete/Z-Push-contrib))
+In short, it's like this:
-* Webmail ([Roundcube](http://roundcube.net/)), static website hosting ([nginx](http://nginx.org/))
-* Spam filtering ([spamassassin](https://spamassassin.apache.org/)), greylisting ([postgrey](http://postgrey.schweikert.ch/))
-* DNS ([nsd4](http://www.nlnetlabs.nl/projects/nsd/)) with [SPF](https://en.wikipedia.org/wiki/Sender_Policy_Framework), DKIM ([OpenDKIM](http://www.opendkim.org/)), [DMARC](https://en.wikipedia.org/wiki/DMARC), [DNSSEC](https://en.wikipedia.org/wiki/DNSSEC), [DANE TLSA](https://en.wikipedia.org/wiki/DNS-based_Authentication_of_Named_Entities), and [SSHFP](https://tools.ietf.org/html/rfc4255) records automatically set
-* Backups ([duplicity](http://duplicity.nongnu.org/)), firewall ([ufw](https://launchpad.net/ufw)), intrusion protection ([fail2ban](http://www.fail2ban.org/wiki/index.php/Main_Page)), system monitoring ([munin](http://munin-monitoring.org/))
 
-It also includes:
+	# do this on a fresh install of Ubuntu 14.04 only!
+	sudo apt-get install -y git
+	git clone https://github.com/joshdata/mailinabox
+	cd mailinabox
+	sudo setup/start.sh
 
-* A control panel and API for adding/removing mail users, aliases, custom DNS records, etc. and detailed system monitoring.
+**Status**: This is a work in progress. It works for what it is, but it is missing such things as quotas, backup/restore, etc.
-* Our own builds of postgrey (adding better whitelisting) and dovecot-lucene (faster search for mail) distributed via the [Mail-in-a-Box PPA](https://launchpad.net/~mail-in-a-box/+archive/ubuntu/ppa) on Launchpad.
 
-For more information on how Mail-in-a-Box handles your privacy, see the [security details page](security.md).
+The Goals
+---------
 
-Installation
+* Create a push-button "Email Appliance" for everyday users.
-------------
+* Promote decentralization, innovation, and privacy on the web.
+* Have automated, auditable, and [idempotent](http://sharknet.us/2014/02/01/automated-configuration-management-challenges-with-idempotency/) configuration.
 
-See the [setup guide](https://mailinabox.email/guide.html) for detailed, user-friendly instructions.
+For more background, see [The Rationale](https://github.com/JoshData/mailinabox/wiki).
 
-For experts, start with a completely fresh (really, I mean it) Ubuntu 14.04 LTS 64-bit machine. On the machine...
+What I am not trying to do:
 
-Clone this repository:
+* **Not** to be a mail server that the NSA cannot hack.
-
+* **Not** to be customizable by power users.
-	$ git clone https://github.com/mail-in-a-box/mailinabox
-	$ cd mailinabox
-
-_Optional:_ Download my PGP key and then verify that the sources were signed
-by me:
-
-	$ curl -s https://keybase.io/joshdata/key.asc | gpg --import
-	gpg: key C10BDD81: public key "Joshua Tauberer <jt@occams.info>" imported
-
-	$ git verify-tag v0.14
-	gpg: Signature made ..... using RSA key ID C10BDD81
-	gpg: Good signature from "Joshua Tauberer <jt@occams.info>"
-	gpg: WARNING: This key is not certified with a trusted signature!
-	gpg:          There is no indication that the signature belongs to the owner.
-	Primary key fingerprint: 5F4C 0E73 13CC D744 693B  2AEA B920 41F4 C10B DD81
-
-You'll get a lot of warnings, but that's OK. Check that the primary key fingerprint matchs the
-fingerprint in the key details at [https://keybase.io/joshdata](https://keybase.io/joshdata)
-and on my [personal homepage](https://razor.occams.info/). (Of course, if this repository has been compromised you can't trust these instructions.)
-
-Checkout the tag corresponding to the most recent release:
-
-	$ git checkout v0.14
-
-Begin the installation.
-
-	$ sudo setup/start.sh
-
-For help, DO NOT contact me directly --- I don't do tech support by email or tweet (no exceptions).
-
-Post your question on the [discussion forum](https://discourse.mailinabox.email/) instead, where me and other Mail-in-a-Box users may be able to help you.
 
 The Acknowledgements
 --------------------
 
 This project was inspired in part by the ["NSA-proof your email in 2 hours"](http://sealedabstract.com/code/nsa-proof-your-e-mail-in-2-hours/) blog post by Drew Crawford, [Sovereign](https://github.com/al3x/sovereign) by Alex Payne, and conversations with <a href="http://twitter.com/shevski" target="_blank">@shevski</a>, <a href="https://github.com/konklone" target="_blank">@konklone</a>, and <a href="https://github.com/gregelin" target="_blank">@GregElin</a>.
 
-Mail-in-a-Box is similar to [iRedMail](http://www.iredmail.org/) and [Modoboa](https://github.com/tonioo/modoboa).
+Mail-in-a-Box is similar to [iRedMail](http://www.iredmail.org/).
 
 The History
 -----------
 
 * In 2007 I wrote a relatively popular Mozilla Thunderbird extension that added client-side SPF and DKIM checks to mail to warn users about possible phishing: [add-on page](https://addons.mozilla.org/en-us/thunderbird/addon/sender-verification-anti-phish/), [source](https://github.com/JoshData/thunderbird-spf).
-* In August 2013 I began Mail-in-a-Box by combining my own mail server configuration with the setup in ["NSA-proof your email in 2 hours"](http://sealedabstract.com/code/nsa-proof-your-e-mail-in-2-hours/) and making the setup steps reproducible with bash scripts.
 * Mail-in-a-Box was a semifinalist in the 2014 [Knight News Challenge](https://www.newschallenge.org/challenge/2014/submissions/mail-in-a-box), but it was not selected as a winner.
-* Mail-in-a-Box hit the front page of Hacker News in [April](https://news.ycombinator.com/item?id=7634514) 2014, [September](https://news.ycombinator.com/item?id=8276171) 2014, and [May](https://news.ycombinator.com/item?id=9624267) 2015.
-* FastCompany mentioned Mail-in-a-Box a [roundup of privacy projects](http://www.fastcompany.com/3047645/your-own-private-cloud) on June 26, 2015.

Vagrantfile

@@ -18,12 +18,10 @@ Vagrant.configure("2") do |config|
 	# machine figure out its own public IP and it'll take a
 	# subdomain on our justtesting.email domain so we can get
 	# started quickly.
-    export NONINTERACTIVE=1
     export PUBLIC_IP=auto
     export PUBLIC_IPV6=auto
     export PRIMARY_HOSTNAME=auto-easy
     export CSR_COUNTRY=US
-    #export SKIP_NETWORK_CHECKS=1
 
     # Start the setup script.
     cd /vagrant

conf/dovecot-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
-  }
-}

conf/fail2ban/dovecotimap.conf

@@ -1,22 +0,0 @@
-# Fail2Ban filter Dovecot authentication and pop3/imap server
-# For Mail-in-a-Box
-
-[INCLUDES]
-
-before = common.conf
-
-[Definition]
-
-_daemon = (auth|dovecot(-auth)?|auth-worker)
-
-failregex = ^%(__prefix_line)s(pop3|imap)-login: (Info: )?(Aborted login|Disconnected)(: Inactivity)? \(((no auth attempts|auth failed, \d+ attempts)( in \d+ secs)?|tried to use (disabled|disallowed) \S+ auth)\):( user=<\S*>,)?( method=\S+,)? rip=<HOST>, lip=(\d{1,3}\.){3}\d{1,3}(, TLS( handshaking)?(: Disconnected)?)?(, session=<\S+>)?\s*$
-
-ignoreregex =
-
-# DEV Notes:
-# * the first regex is essentially a copy of pam-generic.conf
-# * Probably doesn't do dovecot sql/ldap backends properly
-#
-# Author: Martin Waschbuesch
-#         Daniel Black (rewrote with begin and end anchors)
-#         Mail-in-a-Box (swapped session=...)

conf/fail2ban/jail.local

@@ -1,19 +0,0 @@
-# Fail2Ban configuration file for Mail-in-a-Box
-
-# JAILS
-
-[ssh]
-maxretry = 7
-bantime = 3600
-
-[ssh-ddos]
-enabled  = true
-
-[sasl]
-enabled  = true
-
-[dovecot]
-enabled = true
-filter  = dovecotimap
-findtime = 30
-maxretry = 20

conf/ios-profile.xml

@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<!--
- iOS/OS X Configuration Profile
-
- Mobileconfig for iOS/OS X users to setup IMAP, SMTP, Contacts & Calendar
-
- https://developer.apple.com/library/ios/featuredarticles/iPhoneConfigurationProfileRef/Introduction/Introduction.html
--->
-<plist version="1.0">
-<dict>
-  <key>PayloadContent</key>
-  <array>
-    <dict>
-      <key>CalDAVAccountDescription</key>
-      <string>PRIMARY_HOSTNAME calendar</string>
-      <key>CalDAVHostName</key>
-      <string>PRIMARY_HOSTNAME</string>
-      <key>CalDAVPort</key>
-      <real>443</real>
-      <key>CalDAVPrincipalURL</key>
-      <string>/cloud/remote.php/caldav/calendars/</string>
-      <key>CalDAVUseSSL</key>
-      <true/>
-      <key>PayloadDescription</key>
-      <string>PRIMARY_HOSTNAME (Mail-in-a-Box)</string>
-      <key>PayloadDisplayName</key>
-      <string>PRIMARY_HOSTNAME calendar</string>
-      <key>PayloadIdentifier</key>
-      <string>email.mailinabox.mobileconfig.PRIMARY_HOSTNAME.CalDAV</string>
-      <key>PayloadOrganization</key>
-      <string></string>
-      <key>PayloadType</key>
-      <string>com.apple.caldav.account</string>
-      <key>PayloadUUID</key>
-      <string>UUID1</string>
-      <key>PayloadVersion</key>
-      <integer>1</integer>
-    </dict>
-    <dict>
-      <key>EmailAccountDescription</key>
-      <string>PRIMARY_HOSTNAME mail</string>
-      <key>EmailAccountType</key>
-      <string>EmailTypeIMAP</string>
-      <key>IncomingMailServerAuthentication</key>
-      <string>EmailAuthPassword</string>
-      <key>IncomingMailServerHostName</key>
-      <string>PRIMARY_HOSTNAME</string>
-      <key>IncomingMailServerPortNumber</key>
-      <integer>993</integer>
-      <key>IncomingMailServerUseSSL</key>
-      <true/>
-      <key>OutgoingMailServerAuthentication</key>
-      <string>EmailAuthPassword</string>
-      <key>OutgoingMailServerHostName</key>
-      <string>PRIMARY_HOSTNAME</string>
-      <key>OutgoingMailServerPortNumber</key>
-      <integer>587</integer>
-      <key>OutgoingMailServerUseSSL</key>
-      <true/>
-      <key>OutgoingPasswordSameAsIncomingPassword</key>
-      <true/>
-      <key>PayloadDescription</key>
-      <string>PRIMARY_HOSTNAME (Mail-in-a-Box)</string>
-      <key>PayloadDisplayName</key>
-      <string>PRIMARY_HOSTNAME mail</string>
-      <key>PayloadIdentifier</key>
-      <string>email.mailinabox.mobileconfig.PRIMARY_HOSTNAME.E-Mail</string>
-      <key>PayloadOrganization</key>
-      <string></string>
-      <key>PayloadType</key>
-      <string>com.apple.mail.managed</string>
-      <key>PayloadUUID</key>
-      <string>UUID2</string>
-      <key>PayloadVersion</key>
-      <integer>1</integer>
-      <key>PreventAppSheet</key>
-      <false/>
-      <key>PreventMove</key>
-      <false/>
-      <key>SMIMEEnabled</key>
-      <false/>
-    </dict>
-    <dict>
-      <key>CardDAVAccountDescription</key>
-      <string>PRIMARY_HOSTNAME contacts</string>
-      <key>CardDAVHostName</key>
-      <string>PRIMARY_HOSTNAME</string>
-      <key>CardDAVPort</key>
-      <integer>443</integer>
-      <key>CardDAVPrincipalURL</key>
-      <string>/cloud/remote.php/carddav/addressbooks/</string>
-      <key>CardDAVUseSSL</key>
-      <true/>
-      <key>PayloadDescription</key>
-      <string>PRIMARY_HOSTNAME (Mail-in-a-Box)</string>
-      <key>PayloadDisplayName</key>
-      <string>PRIMARY_HOSTNAME contacts</string>
-      <key>PayloadIdentifier</key>
-      <string>email.mailinabox.mobileconfig.PRIMARY_HOSTNAME.carddav</string>
-      <key>PayloadOrganization</key>
-      <string></string>
-      <key>PayloadType</key>
-      <string>com.apple.carddav.account</string>
-      <key>PayloadUUID</key>
-      <string>UUID3</string>
-      <key>PayloadVersion</key>
-      <integer>1</integer>
-    </dict>
-  </array>
-  <key>PayloadDescription</key>
-  <string>PRIMARY_HOSTNAME (Mail-in-a-Box)</string>
-  <key>PayloadDisplayName</key>
-  <string>PRIMARY_HOSTNAME</string>
-  <key>PayloadIdentifier</key>
-  <string>email.mailinabox.mobileconfig.PRIMARY_HOSTNAME</string>
-  <key>PayloadOrganization</key>
-  <string></string>
-  <key>PayloadRemovalDisallowed</key>
-  <false/>
-  <key>PayloadType</key>
-  <string>Configuration</string>
-  <key>PayloadUUID</key>
-  <string>UUID4</string>
-  <key>PayloadVersion</key>
-  <integer>1</integer>
-</dict>
-</plist>

conf/management-initscript

@@ -12,7 +12,7 @@
 # Adapted from http://blog.codefront.net/2007/06/11/nginx-php-and-a-php-fastcgi-daemon-init-script/
 
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="Mail-in-a-Box Management Daemon"
+DESC="Mail-in-a-Box Mgmt"
 NAME=mailinabox
 DAEMON=/usr/local/bin/mailinabox-daemon
 PIDFILE=/var/run/$NAME.pid
@@ -25,16 +25,6 @@ SCRIPTNAME=/etc/init.d/$NAME
 START=yes
 EXEC_AS_USER=root
 
-# Ensure Python reads/writes files in UTF-8. If the machine
-# triggers some other locale in Python, like ASCII encoding,
-# Python may not be able to read/write files. Here and in
-# setup/start.sh (where the locale is also installed if not
-# already present).
-export LANGUAGE=en_US.UTF-8
-export LC_ALL=en_US.UTF-8
-export LANG=en_US.UTF-8
-export LC_TYPE=en_US.UTF-8
-
 # Read configuration variable file if it is present
 [ -r /etc/default/$NAME ] && . /etc/default/$NAME
 

conf/mozilla-autoconfig.xml

@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-<clientConfig version="1.1">
-    <emailProvider id="PRIMARY_HOSTNAME">
-      <domain>PRIMARY_HOSTNAME</domain>
-
-      <displayName>PRIMARY_HOSTNAME (Mail-in-a-Box)</displayName>
-      <displayShortName>PRIMARY_HOSTNAME</displayShortName>
-
-      <incomingServer type="imap">
-         <hostname>PRIMARY_HOSTNAME</hostname>
-         <port>993</port>
-         <socketType>SSL</socketType>
-         <username>%EMAILADDRESS%</username>
-         <authentication>password-cleartext</authentication>
-      </incomingServer>
-
-      <outgoingServer type="smtp">
-         <hostname>PRIMARY_HOSTNAME</hostname>
-         <port>587</port>
-         <socketType>STARTTLS</socketType>
-         <username>%EMAILADDRESS%</username>
-         <authentication>password-cleartext</authentication>
-         <addThisServer>true</addThisServer>
-         <useGlobalPreferredServer>true</useGlobalPreferredServer>
-      </outgoingServer>
-
-      <documentation url="https://PRIMARY_HOSTNAME/">
-         <descr lang="en">PRIMARY_HOSTNAME website.</descr>
-      </documentation>
-    </emailProvider>
-
-    <webMail>
-      <loginPage url="https://PRIMARY_HOSTNAME/mail/" />
-      <loginPageInfo url="https://PRIMARY_HOSTNAME/mail/" >
-        <username>%EMAILADDRESS%</username>
-        <usernameField id="rcmloginuser" name="_user" />
-        <passwordField id="rcmloginpwd" name="_pass" />
-        <loginButton id="rcmloginsubmit" />
-      </loginPageInfo>
-    </webMail>
-
-    <clientConfigUpdate url="https://PRIMARY_HOSTNAME/.well-known/autoconfig/mail/config-v1.1.xml" />
-
-</clientConfig>

conf/nginx-alldomains.conf

@@ -1,79 +0,0 @@
-	# Expose this directory as static files.
-	root $ROOT;
-	index index.html index.htm;
-
-	location = /robots.txt {
-		log_not_found off;
-		access_log off;
-	}
-
-	location = /favicon.ico {
-		log_not_found off;
-		access_log off;
-	}
-
-	location = /mailinabox.mobileconfig {
-		alias /var/lib/mailinabox/mobileconfig.xml;
-	}
-	location = /.well-known/autoconfig/mail/config-v1.1.xml {
-		alias /var/lib/mailinabox/mozilla-autoconfig.xml;
-	}
-
-	# Roundcube Webmail configuration.
-	rewrite ^/mail$ /mail/ redirect;
-	rewrite ^/mail/$ /mail/index.php;
-	location /mail/ {
-		index index.php;
-		alias /usr/local/lib/roundcubemail/;
-	}
-	location ~ /mail/config/.* {
-		# A ~-style location is needed to give this precedence over the next block.
-		return 403;
-	}
-	location ~ /mail/.*\.php {
-		# note: ~ has precendence over a regular location block
-		include fastcgi_params;
-		fastcgi_split_path_info ^/mail(/.*)()$;
-		fastcgi_index index.php;
-		fastcgi_param SCRIPT_FILENAME /usr/local/lib/roundcubemail/$fastcgi_script_name;
-		fastcgi_pass php-fpm;
-
-		# Outgoing mail also goes through this endpoint, so increase the maximum
-		# file upload limit to match the corresponding Postfix limit.
-		client_max_body_size 128M;
-	}
-
-	# Z-Push (Microsoft Exchange ActiveSync)
-	location /Microsoft-Server-ActiveSync {
-		include /etc/nginx/fastcgi_params;
-		fastcgi_param SCRIPT_FILENAME /usr/local/lib/z-push/index.php;
-		fastcgi_param PHP_VALUE "include_path=.:/usr/share/php:/usr/share/pear:/usr/share/awl/inc";
-		fastcgi_read_timeout 630;
-		fastcgi_pass php-fpm;
-
-		# Outgoing mail also goes through this endpoint, so increase the maximum
-		# file upload limit to match the corresponding Postfix limit.
-		client_max_body_size 128M;
-	}
-	location ~* ^/autodiscover/autodiscover.xml$ {
-		include fastcgi_params;
-		fastcgi_param SCRIPT_FILENAME /usr/local/lib/z-push/autodiscover/autodiscover.php;
-		fastcgi_param PHP_VALUE "include_path=.:/usr/share/php:/usr/share/pear:/usr/share/awl/inc";
-		fastcgi_pass php-fpm;
-	}
-
-
-	# ADDITIONAL DIRECTIVES HERE
-
-	# Disable viewing dotfiles (.htaccess, .svn, .git, etc.)
-	# This block is placed at the end. Nginx's precedence rules means this block
-	# takes precedence over all non-regex matches and only regex matches that
-	# come after it (i.e. none of those, since this is the last one.) That means
-	# we're blocking dotfiles in the static hosted sites but not the FastCGI-
-	# handled locations for ownCloud (which serves user-uploaded files that might
-	# have this pattern, see #414) or some of the other services.
-	location ~ /\.(ht|svn|git|hg|bzr) {
-		log_not_found off;
-		access_log off;
-		deny all;
-	}

conf/nginx-primaryonly.conf

@@ -1,60 +0,0 @@
-	# Control Panel
-	# Proxy /admin to our Python based control panel daemon. It is
-	# listening on IPv4 only so use an IP address and not 'localhost'.
-	rewrite ^/admin$ /admin/;
-	rewrite ^/admin/munin$ /admin/munin/ redirect;
-	location /admin/ {
-		proxy_pass http://127.0.0.1:10222/;
-		proxy_set_header X-Forwarded-For $remote_addr;
-	}
-
-	# ownCloud configuration.
-	rewrite ^/cloud$ /cloud/ redirect;
-	rewrite ^/cloud/$ /cloud/index.php;
-	rewrite ^/cloud/(contacts|calendar|files)$ /cloud/index.php/apps/$1/ redirect;
-	rewrite ^(/cloud/core/doc/[^\/]+/)$ $1/index.html;
-	location /cloud/ {
-		alias /usr/local/lib/owncloud/;
-		location ~ ^/(data|config|\.ht|db_structure\.xml|README) {
-			deny all;
-	 	}
-	}
-	location ~ ^(/cloud)((?:/ocs)?/[^/]+\.php)(/.*)?$ {
-		# note: ~ has precendence over a regular location block
-		# Accept URLs like:
-		# /cloud/index.php/apps/files/
-		# /cloud/index.php/apps/files/ajax/scan.php (it's really index.php; see 6fdef379adfdeac86cc2220209bdf4eb9562268d)
-		# /cloud/ocs/v1.php/apps/files_sharing/api/v1 (see #240)
-		# /cloud/remote.php/webdav/yourfilehere...
-		include fastcgi_params;
-		fastcgi_param SCRIPT_FILENAME /usr/local/lib/owncloud/$2;
-		fastcgi_param SCRIPT_NAME $1$2;
-		fastcgi_param PATH_INFO $3;
-		fastcgi_param MOD_X_ACCEL_REDIRECT_ENABLED on;
-		fastcgi_param MOD_X_ACCEL_REDIRECT_PREFIX /owncloud-xaccel;
-		fastcgi_read_timeout 630;
-		fastcgi_pass php-fpm;
-		error_page 403 /cloud/core/templates/403.php;
-		error_page 404 /cloud/core/templates/404.php;
-		client_max_body_size 1G;
-		fastcgi_buffers 64 4K;
-	}
-	location ^~ /owncloud-xaccel/ {
-		# This directory is for MOD_X_ACCEL_REDIRECT_ENABLED. ownCloud sends the full file
-		# path on disk as a subdirectory under this virtual path.
-		# We must only allow 'internal' redirects within nginx so that the filesystem
-		# is not exposed to the world.
-		internal;
-		alias /;
-	}
-	location ~ ^/((caldav|carddav|webdav).*)$ {
-		# Z-Push doesn't like getting a redirect, and a plain rewrite didn't work either.
-		# Properly proxying like this seems to work fine.
-		proxy_pass https://127.0.0.1/cloud/remote.php/$1;
-	}
-	rewrite ^/.well-known/host-meta /cloud/public.php?service=host-meta last;
-	rewrite ^/.well-known/host-meta.json /cloud/public.php?service=host-meta-json last;
-	rewrite ^/.well-known/carddav /cloud/remote.php/carddav/ redirect;
-	rewrite ^/.well-known/caldav /cloud/remote.php/caldav/ redirect;
-
-	# ADDITIONAL DIRECTIVES HERE

conf/nginx-ssl.conf

@@ -16,9 +16,7 @@
 #ssl_certificate_key /path/to/my-private-decrypted.key;
 
 # Tell browsers to require SSL (warning: difficult to change your mind)
-# Handled by the management daemon because we can toggle this version or a
+add_header Strict-Transport-Security max-age=31536000;
-# preload version.
-#add_header Strict-Transport-Security max-age=31536000;
 
 # Prefer certain ciphersuites, to enforce Forward Secrecy and avoid known vulnerabilities.
 # 
@@ -38,7 +36,7 @@ ssl_protocols TLSv1.2 TLSv1.1 TLSv1;
 # as recommended by http://nginx.org/en/docs/http/configuring_https_servers.html
 ssl_session_cache   shared:SSL:10m;
 ssl_session_timeout 10m;
-#keepalive_timeout   70; # in Ubuntu 14.04/nginx 1.4.6 the default is 65, so plenty good
+keepalive_timeout   70;
 
 # Buffer size of 1400 bytes fits in one MTU.
 # nginx 1.5.9+ ONLY
@@ -57,7 +55,7 @@ spdy_headers_comp 0;
 #   openssl dhparam -outform pem -out dhparam2048.pem 2048
 # 
 # Note: raising the bits to 2048 excludes Java 6 clients. Comment out if a problem.
-ssl_dhparam STORAGE_ROOT/ssl/dh2048.pem;
+#ssl_dhparam /path/to/dhparam2048.pem;
 
 
 # OCSP stapling - means nginx will poll the CA for signed OCSP responses, 
@@ -72,5 +70,6 @@ ssl_dhparam STORAGE_ROOT/ssl/dh2048.pem;
 # nginx will use them to talk to the CA.
 ssl_stapling on;
 ssl_stapling_verify on;
-resolver 127.0.0.1 valid=86400;
+resolver 8.8.8.8 8.8.4.4 valid=86400;
 resolver_timeout 10;
+#ssl_trusted_certificate /path/to/all-certs-in-chain.crt;

conf/nginx-top.conf

@@ -1,12 +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.
-
-upstream php-fpm {
-	server unix:/var/run/php5-fpm.sock;
-}
-

conf/nginx.conf

@@ -1,4 +1,6 @@
-## $HOSTNAME
+## NOTE: This file is automatically generated by Mail-in-a-Box.
+##       Do not edit this file. It will be replaced each time
+##       Mail-in-a-Box needs up update the web configuration.
 
 # Redirect all HTTP to HTTPS.
 server {
@@ -7,30 +9,64 @@ server {
 
 	server_name $HOSTNAME;
 	root /tmp/invalid-path-nothing-here;
-
+	rewrite ^/(.*)$ https://$HOSTNAME/$1 permanent;
-	# Improve privacy: Hide version an OS information on
-	# error pages and in the "Server" HTTP-Header.
-	server_tokens off;
-
-	# Redirect using the 'return' directive and the built-in
-	# variable '$request_uri' to avoid any capturing, matching
-	# or evaluation of regular expressions.
-	return 301 https://$HOSTNAME$request_uri;
 }
 
 # The secure HTTPS server.
 server {
 	listen 443 ssl;
-	listen [::]:443 ssl;
 
 	server_name $HOSTNAME;
 
-	# Improve privacy: Hide version an OS information on
-	# error pages and in the "Server" HTTP-Header.
-	server_tokens off;
-
 	ssl_certificate $SSL_CERTIFICATE;
 	ssl_certificate_key $SSL_KEY;
+	include /etc/nginx/nginx-ssl.conf;
+
+	# Expose this directory as static files.
+	root $ROOT;
+	index index.html index.htm;
+
+	# Roundcube Webmail configuration.
+	rewrite ^/mail$ /mail/ redirect;
+	rewrite ^/mail/$ /mail/index.php;
+	location /mail/ {
+		index index.php;
+		alias /usr/local/lib/roundcubemail/;
+	}
+	location ~ /mail/config/.* {
+		# A ~-style location is needed to give this precedence over the next block.
+		return 403;
+	}
+	location ~ /mail/.*\.php {
+		include fastcgi_params;
+		fastcgi_split_path_info ^/mail(/.*)()$;
+		fastcgi_index index.php;
+		fastcgi_param SCRIPT_FILENAME /usr/local/lib/roundcubemail/$fastcgi_script_name;
+		fastcgi_pass unix:/tmp/php-fastcgi.www-data.sock;
+		client_max_body_size 20M;
+	}
+
+	# Webfinger configuration.
+	location = /.well-known/webfinger {
+		include fastcgi_params;
+		fastcgi_param SCRIPT_FILENAME /usr/local/bin/mailinabox-webfinger.php;
+		fastcgi_pass unix:/tmp/php-fastcgi.www-data.sock;
+	}
+
+	# Microsoft Exchange autodiscover.xml for email
+	location /autodiscover/autodiscover.xml {
+		include fastcgi_params;
+		fastcgi_param SCRIPT_FILENAME /usr/local/bin/mailinabox-exchange-autodiscover.php;
+		fastcgi_pass unix:/tmp/php-fastcgi.www-data.sock;
+	}
+
+	# Z-Push (Microsoft Exchange ActiveSync)
+	location /Microsoft-Server-ActiveSync {
+	        include /etc/nginx/fastcgi_params;
+		fastcgi_param SCRIPT_FILENAME /usr/local/lib/z-push/index.php;
+		fastcgi_pass unix:/tmp/php-fastcgi.www-data.sock;
+	}
 
 	# ADDITIONAL DIRECTIVES HERE
 }
+

conf/phpfcgi-initscript

@@ -0,0 +1,134 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          php-fastcgi
+# Required-Start:    $all
+# Required-Stop:     $all
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start and stop php-cgi in external FASTCGI mode
+# Description:       Start and stop php-cgi in external FASTCGI mode
+### END INIT INFO
+
+# Author: Kurt Zankl
+# via: http://blog.codefront.net/2007/06/11/nginx-php-and-a-php-fastcgi-daemon-init-script/
+# But modified by JT.
+
+# Do NOT "set -e"
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="php-fastcgi"
+NAME=php-fastcgi
+DAEMON=/usr/bin/php-cgi
+PIDFILE=/var/run/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+PHP_CONFIG_FILE=/etc/php5/cgi/php.ini
+
+# Exit if the package is not installed
+[ -x "$DAEMON" ] || exit 0
+
+# Set defaults.
+START=yes
+EXEC_AS_USER=www-data
+#FCGI_SOCKET=localhost:9000
+FCGI_SOCKET=/tmp/php-fastcgi.$EXEC_AS_USER.sock
+PHP_FCGI_CHILDREN=4
+PHP_FCGI_MAX_REQUESTS=1000
+
+# Read configuration variable file if it is present
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
+
+# Define LSB log_* functions.
+# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
+. /lib/lsb/init-functions
+
+# If the daemon is not enabled, give the user a warning and then exit,
+# unless we are stopping the daemon
+if [ "$START" != "yes" -a "$1" != "stop" ]; then
+        log_warning_msg "To enable $NAME, edit /etc/default/$NAME and set START=yes"
+        exit 0
+fi
+
+# Process configuration
+export PHP_FCGI_CHILDREN PHP_FCGI_MAX_REQUESTS
+DAEMON_ARGS="-q -b $FCGI_SOCKET -c $PHP_CONFIG_FILE"
+
+
+do_start()
+{
+        # Return
+        #   0 if daemon has been started
+        #   1 if daemon was already running
+        #   2 if daemon could not be started
+        start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
+                || return 1
+        start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON \
+                --background --make-pidfile --chuid $EXEC_AS_USER --startas $DAEMON -- \
+                $DAEMON_ARGS \
+                || return 2
+}
+
+do_stop()
+{
+        # Return
+        #   0 if daemon has been stopped
+        #   1 if daemon was already stopped
+        #   2 if daemon could not be stopped
+        #   other if a failure occurred
+        start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE > /dev/null # --name $DAEMON
+        RETVAL="$?"
+        [ "$RETVAL" = 2 ] && return 2
+        # Wait for children to finish too if this is a daemon that forks
+        # and if the daemon is only ever run from this initscript.
+        # If the above conditions are not satisfied then add some other code
+        # that waits for the process to drop all resources that could be
+        # needed by services started subsequently.  A last resort is to
+        # sleep for some time.
+        start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
+        [ "$?" = 2 ] && return 2
+        # Many daemons don't delete their pidfiles when they exit.
+        rm -f $PIDFILE
+        return "$RETVAL"
+}
+case "$1" in
+  start)
+        [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
+        do_start
+        case "$?" in
+                0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+                2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+        esac
+        ;;
+  stop)
+        [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+        do_stop
+        case "$?" in
+                0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+                2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+        esac
+        ;;
+  restart|force-reload)
+        log_daemon_msg "Restarting $DESC" "$NAME"
+        do_stop
+        case "$?" in
+          0|1)
+                do_start
+                case "$?" in
+                        0) log_end_msg 0 ;;
+                        1) log_end_msg 1 ;; # Old process is still running
+                        *) log_end_msg 1 ;; # Failed to start
+                esac
+                ;;
+          *)
+                # Failed to stop
+                log_end_msg 1
+                ;;
+        esac
+        ;;
+  *)
+        echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
+        exit 3
+        ;;
+esac

conf/postfix_outgoing_mail_header_filters

@@ -1,14 +1,10 @@
 # Remove the first line of the Received: header. Note that we cannot fully remove the Received: header
 # because OpenDKIM requires that a header be present when signing outbound mail. The first line is
 # where the user's home IP address would be.
-/^\s*Received:[^\n]*(.*)/         REPLACE Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP])$1
+/^\s*Received:[^\n]*(.*)/         REPLACE Received: from authenticated-user (unknown [127.0.0.1])$1
 
 # Remove other typically private information.
 /^\s*User-Agent:/        IGNORE
 /^\s*X-Enigmail:/        IGNORE
 /^\s*X-Mailer:/          IGNORE
 /^\s*X-Originating-IP:/  IGNORE
-/^\s*X-Pgp-Agent:/       IGNORE
-
-# The Mime-Version header can leak the user agent too, e.g. in Mime-Version: 1.0 (Mac OS X Mail 8.1 \(2010.6\)).
-/^\s*(Mime-Version:\s*[0-9\.]+)\s.+/  REPLACE $1

conf/sieve-spam.txt

@@ -1,6 +1,7 @@
 require ["regex", "fileinto", "imap4flags"];
 
 if allof (header :regex "X-Spam-Status" "^Yes") {
+  setflag "\\Seen";
   fileinto "Spam";
   stop;
 }

conf/zpush/autodiscover_config.php

@@ -1,24 +0,0 @@
-<?php
-/***********************************************
-* File      :   config.php
-* Project   :   Z-Push
-* Descr     :   Autodiscover configuration file
-************************************************/
-
-// Defines the base path on the server
-define('BASE_PATH', dirname($_SERVER['SCRIPT_FILENAME']). '/');
-
-// The Z-Push server location for the autodiscover response
-define('SERVERURL', 'https://PRIMARY_HOSTNAME/Microsoft-Server-ActiveSync');
-
-define('USE_FULLEMAIL_FOR_LOGIN', true);
-
-define('LOGFILEDIR', '/var/log/z-push/');
-define('LOGFILE', LOGFILEDIR . 'autodiscover.log');
-define('LOGERRORFILE', LOGFILEDIR . 'autodiscover-error.log');
-define('LOGLEVEL', LOGLEVEL_INFO);
-define('LOGUSERLEVEL', LOGLEVEL);
-
-// the backend data provider
-define('BACKEND_PROVIDER', 'BackendCombined');
-?>

conf/zpush/backend_caldav.php

@@ -1,16 +0,0 @@
-<?php
-/***********************************************
-* File      :   config.php
-* Project   :   Z-Push
-* Descr     :   CalDAV backend configuration file
-************************************************/
-
-define('CALDAV_PROTOCOL', 'https');
-define('CALDAV_SERVER', 'localhost');
-define('CALDAV_PORT', '443');
-define('CALDAV_PATH', '/caldav/calendars/%u/');
-define('CALDAV_PERSONAL', 'PRINCIPAL');
-define('CALDAV_SUPPORTS_SYNC', false);
-define('CALDAV_MAX_SYNC_PERIOD', 2147483647);
-
-?>

conf/zpush/backend_carddav.php

@@ -1,31 +0,0 @@
-<?php
-/***********************************************
-* File      :   config.php
-* Project   :   Z-Push
-* Descr     :   CardDAV backend configuration file
-************************************************/
-
-
-define('CARDDAV_PROTOCOL', 'https'); /* http or https */
-define('CARDDAV_SERVER', 'localhost');
-define('CARDDAV_PORT', '443');
-define('CARDDAV_PATH', '/carddav/addressbooks/%u/');
-define('CARDDAV_DEFAULT_PATH', '/carddav/addressbooks/%u/contacts/'); /* subdirectory of the main path */
-define('CARDDAV_GAL_PATH', ''); /* readonly, searchable, not syncd */
-define('CARDDAV_GAL_MIN_LENGTH', 5);
-define('CARDDAV_CONTACTS_FOLDER_NAME', '%u Addressbook');
-define('CARDDAV_SUPPORTS_SYNC', false);
-
-// If the CardDAV server supports the FN attribute for searches
-// DAViCal supports it, but SabreDav, Owncloud and SOGo don't
-// Setting this to true will search by FN. If false will search by sn, givenName and email
-// It's safe to leave it as false
-define('CARDDAV_SUPPORTS_FN_SEARCH', false);
-
-
-// If your carddav server needs to use file extension to recover a vcard.
-//    Davical needs it
-//    SOGo official demo online needs it, but some SOGo installation don't need it, so test it
-define('CARDDAV_URL_VCARD_EXTENSION', '.vcf');
-
-?>

conf/zpush/backend_combined.php

@@ -1,49 +0,0 @@
-<?php
-/***********************************************
-* File      :   backend/combined/config.php
-* Project   :   Z-Push
-* Descr     :   configuration file for the
-*               combined backend.
-************************************************/
-
-class BackendCombinedConfig {
-    public static function GetBackendCombinedConfig() {
-        return array(
-			'backends' => array(
-				'i' => array(
-					'name' => 'BackendIMAP',
-				),
-				'c' => array(
-					'name' => 'BackendCalDAV',
-				),
-				'd' => array(
-					'name' => 'BackendCardDAV',
-				),
-			),
-			'delimiter' => '/',
-			'folderbackend' => array(
-				SYNC_FOLDER_TYPE_INBOX => 'i',
-				SYNC_FOLDER_TYPE_DRAFTS => 'i',
-				SYNC_FOLDER_TYPE_WASTEBASKET => 'i',
-				SYNC_FOLDER_TYPE_SENTMAIL => 'i',
-				SYNC_FOLDER_TYPE_OUTBOX => 'i',
-				SYNC_FOLDER_TYPE_TASK => 'c',
-				SYNC_FOLDER_TYPE_APPOINTMENT => 'c',
-				SYNC_FOLDER_TYPE_CONTACT => 'd',
-				SYNC_FOLDER_TYPE_NOTE => 'c',
-				SYNC_FOLDER_TYPE_JOURNAL => 'c',
-				SYNC_FOLDER_TYPE_OTHER => 'i',
-				SYNC_FOLDER_TYPE_USER_MAIL => 'i',
-				SYNC_FOLDER_TYPE_USER_APPOINTMENT => 'c',
-				SYNC_FOLDER_TYPE_USER_CONTACT => 'd',
-				SYNC_FOLDER_TYPE_USER_TASK => 'c',
-				SYNC_FOLDER_TYPE_USER_JOURNAL => 'c',
-				SYNC_FOLDER_TYPE_USER_NOTE => 'c',
-				SYNC_FOLDER_TYPE_UNKNOWN => 'i',
-			),
-			'rootcreatefolderbackend' => 'i',
-		);
-    }
-}
-
-?>

conf/zpush/backend_imap.php

@@ -1,50 +0,0 @@
-<?php
-/***********************************************
-* File      :   config.php
-* Project   :   Z-Push
-* Descr     :   IMAP backend configuration file
-************************************************/
-
-define('IMAP_SERVER', 'localhost');
-define('IMAP_PORT', 993);
-define('IMAP_OPTIONS', '/ssl/norsh/novalidate-cert');
-define('IMAP_DEFAULTFROM', '');
-
-define('SYSTEM_MIME_TYPES_MAPPING', '/etc/mime.types');
-define('IMAP_AUTOSEEN_ON_DELETE', false);
-define('IMAP_FOLDER_CONFIGURED', true);
-define('IMAP_FOLDER_PREFIX', '');
-define('IMAP_FOLDER_PREFIX_IN_INBOX', false);
-// see our conf/dovecot-mailboxes.conf file for IMAP special flags settings
-define('IMAP_FOLDER_INBOX', 'INBOX');
-define('IMAP_FOLDER_SENT', 'SENT');
-define('IMAP_FOLDER_DRAFT', 'DRAFTS');
-define('IMAP_FOLDER_TRASH', 'TRASH');
-define('IMAP_FOLDER_SPAM', 'SPAM');
-define('IMAP_FOLDER_ARCHIVE', 'ARCHIVE');
-
-
-// not used
-define('IMAP_FROM_SQL_DSN', '');
-define('IMAP_FROM_SQL_USER', '');
-define('IMAP_FROM_SQL_PASSWORD', '');
-define('IMAP_FROM_SQL_OPTIONS', serialize(array(PDO::ATTR_PERSISTENT => true)));
-define('IMAP_FROM_SQL_QUERY', "select first_name, last_name, mail_address from users where mail_address = '#username@#domain'");
-define('IMAP_FROM_SQL_FIELDS', serialize(array('first_name', 'last_name', 'mail_address')));
-define('IMAP_FROM_SQL_FROM', '#first_name #last_name <#mail_address>');
-define('IMAP_FROM_LDAP_SERVER', '');
-define('IMAP_FROM_LDAP_SERVER_PORT', '389');
-define('IMAP_FROM_LDAP_USER', 'cn=zpush,ou=servers,dc=zpush,dc=org');
-define('IMAP_FROM_LDAP_PASSWORD', 'password');
-define('IMAP_FROM_LDAP_BASE', 'dc=zpush,dc=org');
-define('IMAP_FROM_LDAP_QUERY', '(mail=#username@#domain)');
-define('IMAP_FROM_LDAP_FIELDS', serialize(array('givenname', 'sn', 'mail')));
-define('IMAP_FROM_LDAP_FROM', '#givenname #sn <#mail>');
-
-
-global $imap_smtp_params;
-$imap_smtp_params = array('host' => 'ssl://localhost', 'port' => 587, 'auth' => true, 'username' => 'imap_username', 'password' => 'imap_password');
-
-define('MAIL_MIMEPART_CRLF', "\r\n");
-
-?>

management/auth.py

@@ -1,10 +1,7 @@
-import base64, os, os.path, hmac
+import base64, os, os.path
 
 from flask import make_response
 
-import utils
-from mailconfig import get_mail_password, get_mail_user_privileges
-
 DEFAULT_KEY_PATH   = '/var/lib/mailinabox/api.key'
 DEFAULT_AUTH_REALM = 'Mail-in-a-Box Management Server'
 
@@ -40,98 +37,32 @@ class KeyAuthService:
 		with create_file_with_mode(self.key_path, 0o640) as key_file:
 			key_file.write(self.key + '\n')
 
-	def authenticate(self, request, env):
+	def is_authenticated(self, request):
-		"""Test if the client key passed in HTTP Authorization header matches the service key
+		"""Test if the client key passed in HTTP header matches the service key"""
-		or if the or username/password passed in the header matches an administrator user.
-		Returns a tuple of the user's email address and list of user privileges (e.g.
-		('my@email', []) or ('my@email', ['admin']); raises a ValueError on login failure.
-		If the user used an API key, the user's email is returned as None."""
 
 		def decode(s):
-			return base64.b64decode(s.encode('ascii')).decode('ascii')
+			return base64.b64decode(s.encode('utf-8')).decode('ascii')
+
+		def parse_api_key(header):
+			if header is None:
+				return
 
-		def parse_basic_auth(header):
-			if " " not in header:
-				return None, None
 			scheme, credentials = header.split(maxsplit=1)
 			if scheme != 'Basic':
-				return None, None
+				return
 
-			credentials = decode(credentials)
+			username, password = decode(credentials).split(':', maxsplit=1)
-			if ":" not in credentials:
+			return username
-				return None, None
-			username, password = credentials.split(':', maxsplit=1)
-			return username, password
 
-		header = request.headers.get('Authorization')
+		request_key = parse_api_key(request.headers.get('Authorization'))
-		if not header:
-			raise ValueError("No authorization header provided.")
 
-		username, password = parse_basic_auth(header)
+		return request_key == self.key
 
-		if username in (None, ""):
+	def make_unauthorized_response(self):
-			raise ValueError("Authorization header invalid.")
+		return make_response(
-		elif username == self.key:
+			'You must pass the API key from "{0}" as the username\n'.format(self.key_path),
-			# The user passed the API key which grants administrative privs.
+			401,
-			return (None, ["admin"])
+			{ 'WWW-Authenticate': 'Basic realm="{0}"'.format(self.auth_realm) })
-		else:
-			# The user is trying to log in with a username and user-specific
-			# API key or password. Raises or returns privs.
-			return (username, self.get_user_credentials(username, password, env))
-
-	def get_user_credentials(self, email, pw, env):
-		# Validate a user's credentials. On success returns a list of
-		# privileges (e.g. [] or ['admin']). On failure raises a ValueError
-		# with a login error message. 
-
-		# Sanity check.
-		if email == "" or pw == "":
-			raise ValueError("Enter an email address and password.")
-
-		# The password might be a user-specific API key. create_user_key raises
-		# a ValueError if the user does not exist.
-		if hmac.compare_digest(self.create_user_key(email, env), pw):
-			# OK.
-			pass
-		else:
-			# Get the hashed password of the user. Raise a ValueError if the
-			# email address does not correspond to a user.
-			pw_hash = get_mail_password(email, env)
-
-			# Authenticate.
-			try:
-				# Use 'doveadm pw' to check credentials. doveadm will return
-				# a non-zero exit status if the credentials are no good,
-				# and check_call will raise an exception in that case.
-				utils.shell('check_call', [
-					"/usr/bin/doveadm", "pw",
-					"-p", pw,
-					"-t", pw_hash,
-					])
-			except:
-				# Login failed.
-				raise ValueError("Invalid password.")
-
-		# Get privileges for authorization. This call should never fail because by this
-		# point we know the email address is a valid user. But on error the call will
-		# return a tuple of an error message and an HTTP status code.
-		privs = get_mail_user_privileges(email, env)
-		if isinstance(privs, tuple): raise ValueError(privs[0])
-
-		# Return a list of privileges.
-		return privs
-
-	def create_user_key(self, email, env):
-		# Store an HMAC with the client. The hashed message of the HMAC will be the user's
-		# email address & hashed password and the key will be the master API key. The user of
-		# course has their own email address and password. We assume they do not have the master
-		# API key (unless they are trusted anyway). The HMAC proves that they authenticated
-		# with us in some other way to get the HMAC. Including the password means that when
-		# a user's password is reset, the HMAC changes and they will correctly need to log
-		# in to the control panel again. This method raises a ValueError if the user does
-		# not exist, due to get_mail_password.
-		msg = b"AUTH:" + email.encode("utf8") + b" " + get_mail_password(email, env).encode("utf8")
-		return hmac.new(self.key.encode('ascii'), msg, digestmod="sha256").hexdigest()
 
 	def _generate_key(self):
 		raw_key = os.urandom(32)

management/backup.py

@@ -2,441 +2,109 @@
 
 # This script performs a backup of all user data:
 # 1) System services are stopped while a copy of user data is made.
-# 2) An incremental encrypted backup is made using duplicity into the
+# 2) An incremental backup is made using rdiff-backup into the
-#    directory STORAGE_ROOT/backup/encrypted. The password used for
+#    directory STORAGE_ROOT/backup/rdiff-history. This directory
-#    encryption is stored in backup/secret_key.txt.
+#    will contain the latest files plus a complete history for
+#    all prior backups.
 # 3) The stopped services are restarted.
-# 5) STORAGE_ROOT/backup/after-backup is executd if it exists.
+# 4) The backup directory is compressed into a single file using tar.
+# 5) That file is encrypted with a long password stored in backup/secret_key.txt.
 
-import os, os.path, shutil, glob, re, datetime
+import sys, os, os.path, shutil
-import dateutil.parser, dateutil.relativedelta, dateutil.tz
-import rtyaml
 
-from utils import exclusive_process, load_environment, shell, wait_for_service
+from utils import exclusive_process, load_environment, shell
 
-def backup_status(env):
+# settings
-	# Root folder
+full_backup = "--full" in sys.argv
-	backup_root = os.path.join(env["STORAGE_ROOT"], 'backup')
+keep_backups_for = "31D" # destroy backups older than 31 days
 
-	# What is the current status of backups?
+env = load_environment()
-	# Query duplicity to get a list of all backups.
-	# Use the number of volumes to estimate the size.
-	config = get_backup_config(env)
-	now = datetime.datetime.now(dateutil.tz.tzlocal())
 
-	# Are backups dissbled?
+exclusive_process("backup")
-	if config["target"] == "off":
-		return { }
 
-	backups = { }
+# Ensure the backup directory exists.
-	backup_cache_dir = os.path.join(backup_root, 'cache')
+backup_dir = os.path.join(env["STORAGE_ROOT"], 'backup')
+backup_duplicity_dir = os.path.join(backup_dir, 'duplicity')
+os.makedirs(backup_dir, exist_ok=True)
 
-	def reldate(date, ref, clip):
+# Stop services.
-		if ref < date: return clip
+shell('check_call', ["/usr/sbin/service", "dovecot", "stop"])
-		rd = dateutil.relativedelta.relativedelta(ref, date)
+shell('check_call', ["/usr/sbin/service", "postfix", "stop"])
-		if rd.months > 1: return "%d months, %d days" % (rd.months, rd.days)
-		if rd.months == 1: return "%d month, %d days" % (rd.months, rd.days)
-		if rd.days >= 7: return "%d days" % rd.days
-		if rd.days > 1: return "%d days, %d hours" % (rd.days, rd.hours)
-		if rd.days == 1: return "%d day, %d hours" % (rd.days, rd.hours)
-		return "%d hours, %d minutes" % (rd.hours, rd.minutes)
 
-	# Get duplicity collection status and parse for a list of backups.
+# Update the backup mirror directory which mirrors the current
-	def parse_line(line):
+# STORAGE_ROOT (but excluding the backups themselves!).
-		keys = line.strip().split()
+try:
-		date = dateutil.parser.parse(keys[1])
-		return {
-			"date": keys[1],
-			"date_str": date.strftime("%x %X"),
-			"date_delta": reldate(date, now, "the future?"),
-			"full": keys[0] == "full",
-			"size": 0, # collection-status doesn't give us the size
-			"volumes": keys[2], # number of archive volumes for this backup (not really helpful)
-		}
-	code, collection_status = shell('check_output', [
-		"/usr/bin/duplicity",
-		"collection-status",
-		"--archive-dir", backup_cache_dir,
-		"--gpg-options", "--cipher-algo=AES256",
-		"--log-fd", "1",
-		config["target"],
-		],
-		get_env(env),
-		trap=True)
-	if code != 0:
-		# Command failed. This is likely due to an improperly configured remote
-		# destination for the backups.
-		return { }
-	for line in collection_status.split('\n'):
-		if line.startswith(" full") or line.startswith(" inc"):
-			backup = parse_line(line)
-			backups[backup["date"]] = backup
-
-	# Look at the target to get the sizes of each of the backups. There is more than one file per backup.
-	for fn, size in list_target_files(config):
-		m = re.match(r"duplicity-(full|full-signatures|(inc|new-signatures)\.(?P<incbase>\d+T\d+Z)\.to)\.(?P<date>\d+T\d+Z)\.", fn)
-		if not m: continue # not a part of a current backup chain
-		key = m.group("date")
-		backups[key]["size"] += size
-
-	# Ensure the rows are sorted reverse chronologically.
-	# This is relied on by should_force_full() and the next step.
-	backups = sorted(backups.values(), key = lambda b : b["date"], reverse=True)
-
-	# Get the average size of incremental backups and the size of the
-	# most recent full backup.
-	incremental_count = 0
-	incremental_size = 0
-	first_full_size = None
-	for bak in backups:
-		if bak["full"]:
-			first_full_size = bak["size"]
-			break
-		incremental_count += 1
-		incremental_size += bak["size"]
-
-	# Predict how many more increments until the next full backup,
-	# and add to that the time we hold onto backups, to predict
-	# how long the most recent full backup+increments will be held
-	# onto. Round up since the backup occurs on the night following
-	# when the threshold is met.
-	deleted_in = None
-	if incremental_count > 0 and first_full_size is not None:
-		deleted_in = "approx. %d days" % round(config["min_age_in_days"] + (.5 * first_full_size - incremental_size) / (incremental_size/incremental_count) + .5)
-
-	# When will a backup be deleted?
-	saw_full = False
-	days_ago = now - datetime.timedelta(days=config["min_age_in_days"])
-	for bak in backups:
-		if deleted_in:
-			# Subsequent backups are deleted when the most recent increment
-			# in the chain would be deleted.
-			bak["deleted_in"] = deleted_in
-		if bak["full"]:
-			# Reset when we get to a full backup. A new chain start next.
-			saw_full = True
-			deleted_in = None
-		elif saw_full and not deleted_in:
-			# Mark deleted_in only on the first increment after a full backup.
-			deleted_in = reldate(days_ago, dateutil.parser.parse(bak["date"]), "on next daily backup")
-			bak["deleted_in"] = deleted_in
-
-	return {
-		"tz": now.tzname(),
-		"backups": backups,
-	}
-
-def should_force_full(env):
-	# Force a full backup when the total size of the increments
-	# since the last full backup is greater than half the size
-	# of that full backup.
-	inc_size = 0
-	for bak in backup_status(env)["backups"]:
-		if not bak["full"]:
-			# Scan through the incremental backups cumulating
-			# size...
-			inc_size += bak["size"]
-		else:
-			# ...until we reach the most recent full backup.
-			# Return if we should to a full backup.
-			return inc_size > .5*bak["size"]
-	else:
-		# If we got here there are no (full) backups, so make one.
-		# (I love for/else blocks. Here it's just to show off.)
-		return True
-
-def get_passphrase(env):
-	# Get the encryption passphrase. secret_key.txt is 2048 random
-	# bits base64-encoded and with line breaks every 65 characters.
-	# gpg will only take the first line of text, so sanity check that
-	# that line is long enough to be a reasonable passphrase. It
-	# only needs to be 43 base64-characters to match AES256's key
-	# length of 32 bytes.
-	backup_root = os.path.join(env["STORAGE_ROOT"], 'backup')
-	with open(os.path.join(backup_root, 'secret_key.txt')) as f:
-		passphrase = f.readline().strip()
-	if len(passphrase) < 43: raise Exception("secret_key.txt's first line is too short!")
-	
-	return passphrase
-
-def get_env(env):
-	config = get_backup_config(env)
-	
-	env = { "PASSPHRASE" : get_passphrase(env) }
-	
-	if get_target_type(config) == 's3':
-		env["AWS_ACCESS_KEY_ID"] = config["target_user"]
-		env["AWS_SECRET_ACCESS_KEY"] = config["target_pass"]
-	
-	return env
-	
-def get_target_type(config):
-	protocol = config["target"].split(":")[0]
-	return protocol
-	
-def perform_backup(full_backup):
-	env = load_environment()
-
-	exclusive_process("backup")
-	config = get_backup_config(env)
-	backup_root = os.path.join(env["STORAGE_ROOT"], 'backup')
-	backup_cache_dir = os.path.join(backup_root, 'cache')
-	backup_dir = os.path.join(backup_root, 'encrypted')
-
-	# Are backups dissbled?
-	if config["target"] == "off":
-		return
-
-	# In an older version of this script, duplicity was called
-	# such that it did not encrypt the backups it created (in
-	# backup/duplicity), and instead openssl was called separately
-	# after each backup run, creating AES256 encrypted copies of
-	# each file created by duplicity in backup/encrypted.
-	#
-	# We detect the transition by the presence of backup/duplicity
-	# and handle it by 'dupliception': we move all the old *un*encrypted
-	# duplicity files up out of the backup/duplicity directory (as
-	# backup/ is excluded from duplicity runs) in order that it is
-	# included in the next run, and we delete backup/encrypted (which
-	# duplicity will output files directly to, post-transition).
-	old_backup_dir = os.path.join(backup_root, 'duplicity')
-	migrated_unencrypted_backup_dir = os.path.join(env["STORAGE_ROOT"], "migrated_unencrypted_backup")
-	if os.path.isdir(old_backup_dir):
-		# Move the old unencrypted files to a new location outside of
-		# the backup root so they get included in the next (new) backup.
-		# Then we'll delete them. Also so that they do not get in the
-		# way of duplicity doing a full backup on the first run after
-		# we take care of this.
-		shutil.move(old_backup_dir, migrated_unencrypted_backup_dir)
-
-		# The backup_dir (backup/encrypted) now has a new purpose.
-		# Clear it out.
-		shutil.rmtree(backup_dir)
-
-	# On the first run, always do a full backup. Incremental
-	# will fail. Otherwise do a full backup when the size of
-	# the increments since the most recent full backup are
-	# large.
-	full_backup = full_backup or should_force_full(env)
-
-	# Stop services.
-	shell('check_call', ["/usr/sbin/service", "dovecot", "stop"])
-	shell('check_call', ["/usr/sbin/service", "postfix", "stop"])
-
-	# Run a backup of STORAGE_ROOT (but excluding the backups themselves!).
-	# --allow-source-mismatch is needed in case the box's hostname is changed
-	# after the first backup. See #396.
-	try:
-		shell('check_call', [
-			"/usr/bin/duplicity",
-			"full" if full_backup else "incr",
-			"--archive-dir", backup_cache_dir,
-			"--exclude", backup_root,
-			"--volsize", "250",
-			"--gpg-options", "--cipher-algo=AES256",
-			env["STORAGE_ROOT"],
-			config["target"],
-			"--allow-source-mismatch"
-			],
-			get_env(env))
-	finally:
-		# Start services again.
-		shell('check_call', ["/usr/sbin/service", "dovecot", "start"])
-		shell('check_call', ["/usr/sbin/service", "postfix", "start"])
-
-	# Once the migrated backup is included in a new backup, it can be deleted.
-	if os.path.isdir(migrated_unencrypted_backup_dir):
-		shutil.rmtree(migrated_unencrypted_backup_dir)
-
-	# Remove old backups. This deletes all backup data no longer needed
-	# from more than 3 days ago.
 	shell('check_call', [
 		"/usr/bin/duplicity",
-		"remove-older-than",
+		"full" if full_backup else "incr",
-		"%dD" % config["min_age_in_days"],
+		"--no-encryption",
-		"--archive-dir", backup_cache_dir,
+		"--archive-dir", "/tmp/duplicity-archive-dir",
-		"--force",
+		"--name", "mailinabox",
-		config["target"]
+		"--exclude", backup_dir,
-		],
+		"--volsize", "100",
-		get_env(env))
+		"--verbosity", "warning",
-
-	# From duplicity's manual:
-	# "This should only be necessary after a duplicity session fails or is
-	# aborted prematurely."
-	# That may be unlikely here but we may as well ensure we tidy up if
-	# that does happen - it might just have been a poorly timed reboot.
-	shell('check_call', [
-		"/usr/bin/duplicity",
-		"cleanup",
-		"--archive-dir", backup_cache_dir,
-		"--force",
-		config["target"]
-		],
-		get_env(env))
-
-	# Change ownership of backups to the user-data user, so that the after-bcakup
-	# script can access them.
-	if get_target_type(config) == 'file':
-		shell('check_call', ["/bin/chown", "-R", env["STORAGE_USER"], backup_dir])
-
-	# Execute a post-backup script that does the copying to a remote server.
-	# Run as the STORAGE_USER user, not as root. Pass our settings in
-	# environment variables so the script has access to STORAGE_ROOT.
-	post_script = os.path.join(backup_root, 'after-backup')
-	if os.path.exists(post_script):
-		shell('check_call',
-			['su', env['STORAGE_USER'], '-c', post_script, config["target"]],
-			env=env)
-
-	# Our nightly cron job executes system status checks immediately after this
-	# backup. Since it checks that dovecot and postfix are running, block for a
-	# bit (maximum of 10 seconds each) to give each a chance to finish restarting
-	# before the status checks might catch them down. See #381.
-	wait_for_service(25, True, env, 10)
-	wait_for_service(993, True, env, 10)
-
-def run_duplicity_verification():
-	env = load_environment()
-	backup_root = os.path.join(env["STORAGE_ROOT"], 'backup')
-	config = get_backup_config(env)
-	backup_cache_dir = os.path.join(backup_root, 'cache')
-
-	shell('check_call', [
-		"/usr/bin/duplicity",
-		"--verbosity", "info",
-		"verify",
-		"--compare-data",
-		"--archive-dir", backup_cache_dir,
-		"--exclude", backup_root,
-		config["target"],
 		env["STORAGE_ROOT"],
-	], get_env(env))
+		"file://" + backup_duplicity_dir
+		])
+finally:
+	# Start services again.
+	shell('check_call', ["/usr/sbin/service", "dovecot", "start"])
+	shell('check_call', ["/usr/sbin/service", "postfix", "start"])
 
-def list_target_files(config):
+# Remove old backups. This deletes all backup data no longer needed
-	import urllib.parse
+# from more than 31 days ago. Must do this before destroying the
-	try:
+# cache directory or else this command will re-create it.
-		p = urllib.parse.urlparse(config["target"])
+shell('check_call', [
-	except ValueError:
+	"/usr/bin/duplicity",
-		return "invalid target"
+	"remove-older-than",
+	keep_backups_for,
+	"--archive-dir", "/tmp/duplicity-archive-dir",
+	"--name", "mailinabox",
+	"--force",
+	"--verbosity", "warning",
+	"file://" + backup_duplicity_dir
+	])
 
-	if p.scheme == "file":
+# Remove old increments. This deletes incremental data obsoleted by
-		return [(fn, os.path.getsize(os.path.join(p.path, fn))) for fn in os.listdir(p.path)]
+# any subsequent full backups.
+shell('check_call', [
+	"/usr/bin/duplicity",
+	"remove-all-inc-of-but-n-full",
+	"1",
+	"--archive-dir", "/tmp/duplicity-archive-dir",
+	"--name", "mailinabox",
+	"--force",
+	"--verbosity", "warning",
+	"file://" + backup_duplicity_dir
+	])
 
-	elif p.scheme == "s3":
+# Remove duplicity's cache directory because it's redundant with our backup directory.
-		# match to a Region
+shutil.rmtree("/tmp/duplicity-archive-dir")
-		import boto.s3
-		from boto.exception import BotoServerError
-		for region in boto.s3.regions():
-			if region.endpoint == p.hostname:
-				break
-		else:
-			raise ValueError("Invalid S3 region/host.")
 
-		bucket = p.path[1:].split('/')[0]
+# Encrypt all of the new files.
-		path = '/'.join(p.path[1:].split('/')[1:]) + '/'
+backup_encrypted_dir = os.path.join(backup_dir, 'encrypted')
+os.makedirs(backup_encrypted_dir, exist_ok=True)
+for fn in os.listdir(backup_duplicity_dir):
+	fn2 = os.path.join(backup_encrypted_dir, fn) + ".enc"
+	if os.path.exists(fn2): continue
 
-		# If no prefix is specified, set the path to '', otherwise boto won't list the files
+	# Encrypt the backup using the backup private key.
-		if path == '/':
+	shell('check_call', [
-			path = ''
+		"/usr/bin/openssl",
+		"enc",
+		"-aes-256-cbc",
+		"-a",
+		"-salt",
+		"-in", os.path.join(backup_duplicity_dir, fn),
+		"-out", fn2,
+		"-pass", "file:%s" % os.path.join(backup_dir, "secret_key.txt"),
+		])
 
-		if bucket == "":
+	# The backup can be decrypted with:
-			raise ValueError("Enter an S3 bucket name.")
+	# openssl enc -d -aes-256-cbc -a -in latest.tgz.enc -out /dev/stdout -pass file:secret_key.txt | tar -z
 
-		# connect to the region & bucket
+# Remove encrypted backups that are no longer needed.
-		try:
+for fn in os.listdir(backup_encrypted_dir):
-			conn = region.connect(aws_access_key_id=config["target_user"], aws_secret_access_key=config["target_pass"])
+	fn2 = os.path.join(backup_duplicity_dir, fn.replace(".enc", ""))
-			bucket = conn.get_bucket(bucket)
+	if os.path.exists(fn2): continue
-		except BotoServerError as e:
+	os.unlink(os.path.join(backup_encrypted_dir, fn))
-			if e.status == 403:
-				raise ValueError("Invalid S3 access key or secret access key.")
-			elif e.status == 404:
-				raise ValueError("Invalid S3 bucket name.")
-			elif e.status == 301:
-				raise ValueError("Incorrect region for this bucket.")
-			raise ValueError(e.reason)
-
-		return [(key.name[len(path):], key.size) for key in bucket.list(prefix=path)]
-
-	else:
-		raise ValueError(config["target"])
-
-
-def backup_set_custom(env, target, target_user, target_pass, min_age):
-	config = get_backup_config(env, for_save=True)
-	
-	# min_age must be an int
-	if isinstance(min_age, str):
-		min_age = int(min_age)
-
-	config["target"] = target
-	config["target_user"] = target_user
-	config["target_pass"] = target_pass
-	config["min_age_in_days"] = min_age
-
-	# Validate.
-	try:
-		if config["target"] not in ("off", "local"):
-			# these aren't supported by the following function, which expects a full url in the target key,
-			# which is what is there except when loading the config prior to saving
-			list_target_files(config)
-	except ValueError as e:
-		return str(e)
-	
-	write_backup_config(env, config)
-
-	return "OK"
-	
-def get_backup_config(env, for_save=False, for_ui=False):
-	backup_root = os.path.join(env["STORAGE_ROOT"], 'backup')
-
-	# Defaults.
-	config = {
-		"min_age_in_days": 3,
-		"target": "local",
-	}
-
-	# Merge in anything written to custom.yaml.
-	try:
-		custom_config = rtyaml.load(open(os.path.join(backup_root, 'custom.yaml')))
-		if not isinstance(custom_config, dict): raise ValueError() # caught below
-		config.update(custom_config)
-	except:
-		pass
-
-	# When updating config.yaml, don't do any further processing on what we find.
-	if for_save:
-		return config
-
-	# When passing this back to the admin to show the current settings, do not include
-	# authentication details. The user will have to re-enter it.
-	if for_ui:
-		for field in ("target_user", "target_pass"):
-			if field in config:
-				del config[field]
-
-	# helper fields for the admin
-	config["file_target_directory"] = os.path.join(backup_root, 'encrypted')
-	config["enc_pw_file"] = os.path.join(backup_root, 'secret_key.txt')
-	if config["target"] == "local":
-		# Expand to the full URL.
-		config["target"] = "file://" + config["file_target_directory"]
-
-	return config
-
-def write_backup_config(env, newconfig):
-	backup_root = os.path.join(env["STORAGE_ROOT"], 'backup')
-	with open(os.path.join(backup_root, 'custom.yaml'), "w") as f:
-		f.write(rtyaml.dump(newconfig))
-
-if __name__ == "__main__":
-	import sys
-	if sys.argv[-1] == "--verify":
-		# Run duplicity's verification command to check a) the backup files
-		# are readable, and b) report if they are up to date.
-		run_duplicity_verification()
-
-	else:
-		# Perform a backup. Add --full to force a full backup rather than
-		# possibly performing an incremental backup.
-		full_backup = "--full" in sys.argv
-		perform_backup(full_backup)

management/buy_certificate.py

@@ -0,0 +1,155 @@
+#!/usr/bin/python3
+
+# Helps you purchase a SSL certificate from Gandi.net using
+# their API.
+#
+# Before you begin:
+#  1) Create an account on Gandi.net.
+#  2) Pre-pay $16 into your account at https://www.gandi.net/prepaid/operations. Wait until the payment goes through.
+#  3) Activate your API key first on the test platform (wait a while, refresh the page) and then activate the production API at https://www.gandi.net/admin/api_key.
+
+import sys, re,  os.path, urllib.request
+import xmlrpc.client
+import rtyaml
+
+from utils import load_environment, shell
+from web_update import get_web_domains, get_domain_ssl_files, get_web_root
+from whats_next import check_certificate
+
+def buy_ssl_certificate(api_key, domain, command, env):
+	if domain != env['PRIMARY_HOSTNAME'] \
+		and domain not in get_web_domains(env):
+		raise ValueError("Domain is not %s or a domain we're serving a website for." % env['PRIMARY_HOSTNAME'])
+
+	# Initialize.
+
+	gandi = xmlrpc.client.ServerProxy('https://rpc.gandi.net/xmlrpc/')
+
+	try:
+		existing_certs = gandi.cert.list(api_key)
+	except Exception as e:
+		if "Invalid API key" in str(e):
+			print("Invalid API key. Check that you copied the API Key correctly from https://www.gandi.net/admin/api_key.")
+			sys.exit(1)
+		else:
+			raise
+
+	# Where is the SSL cert stored?
+
+	ssl_key, ssl_certificate, ssl_csr_path = get_domain_ssl_files(domain, env)	
+
+	# Have we already created a cert for this domain?
+
+	for cert in existing_certs:
+		if cert['cn'] == domain:
+			break
+	else:
+		# No existing cert found. Purchase one.
+		if command != 'purchase':
+			print("No certificate or order found yet. If you haven't yet purchased a certificate, run ths script again with the 'purchase' command. Otherwise wait a moment and try again.")
+			sys.exit(1)
+		else:
+			# Start an order for a single standard SSL certificate.
+			# Use DNS validation. Web-based validation won't work because they
+			# require a file on HTTP but not HTTPS w/o redirects and we don't
+			# serve anything plainly over HTTP. Email might be another way but
+			# DNS is easier to automate.
+			op = gandi.cert.create(api_key, {
+				"csr": open(ssl_csr_path).read(),
+				"dcv_method": "dns",
+				"duration": 1, # year?
+				"package": "cert_std_1_0_0",
+				})
+			print("An SSL certificate has been ordered.")
+			print()
+			print(op)
+			print()
+			print("In a moment please run this script again with the 'setup' command.")
+
+	if cert['status'] == 'pending':
+		# Get the information we need to update our DNS with a code so that
+		# Gandi can verify that we own the domain.
+
+		dcv = gandi.cert.get_dcv_params(api_key, {
+				"csr": open(ssl_csr_path).read(),
+				"cert_id": cert['id'],
+				"dcv_method": "dns",
+				"duration": 1, # year?
+				"package": "cert_std_1_0_0",
+				})
+		if dcv["dcv_method"] != "dns":
+			raise Exception("Certificate ordered with an unknown validation method.")
+
+		# Update our DNS data.
+
+		dns_config = env['STORAGE_ROOT'] + '/dns/custom.yaml'
+		if os.path.exists(dns_config):
+			dns_records = rtyaml.load(open(dns_config))
+		else:
+			dns_records = { }
+
+		qname = dcv['md5'] + '.' + domain
+		value = dcv['sha1'] + '.comodoca.com.'
+		dns_records[qname] = { "CNAME": value }
+
+		with open(dns_config, 'w') as f:
+			f.write(rtyaml.dump(dns_records))
+
+		shell('check_call', ['tools/dns_update'])
+
+		# Okay, done with this step.
+
+		print("DNS has been updated. Gandi will check within 60 minutes.")
+		print()
+		print("See https://www.gandi.net/admin/ssl/%d/details for the status of this order." % cert['id'])
+
+	elif cert['status'] == 'valid':
+		# The certificate is ready.
+
+		# Check before we overwrite something we shouldn't.
+		if os.path.exists(ssl_certificate):
+			cert_status = check_certificate(None, ssl_certificate, None)
+			if cert_status != "SELF-SIGNED":
+				print("Please back up and delete the file %s so I can save your new certificate." % ssl_certificate)
+				sys.exit(1)
+
+		# Form the certificate.
+
+		# The certificate comes as a long base64-encoded string. Break in
+		# into lines in the usual way.
+		pem = "-----BEGIN CERTIFICATE-----\n"
+		pem += "\n".join(chunk for chunk in re.split(r"(.{64})", cert['cert']) if chunk != "")
+		pem += "\n-----END CERTIFICATE-----\n\n"
+
+		# Append intermediary certificates.
+		pem += urllib.request.urlopen("https://www.gandi.net/static/CAs/GandiStandardSSLCA.pem").read().decode("ascii")
+
+		# Write out.
+
+		with open(ssl_certificate, "w") as f:
+			f.write(pem)
+
+		print("The certificate has been installed in %s. Restarting services..." % ssl_certificate)
+
+		# Restart dovecot and if this is for PRIMARY_HOSTNAME.
+
+		if domain == env['PRIMARY_HOSTNAME']:
+			shell('check_call', ["/usr/sbin/service", "dovecot", "restart"])
+			shell('check_call', ["/usr/sbin/service", "postfix", "restart"])
+
+		# Restart nginx in all cases.
+
+		shell('check_call', ["/usr/sbin/service", "nginx", "restart"])
+
+	else:
+		print("The certificate has an unknown status. Please check https://www.gandi.net/admin/ssl/%d/details for the status of this order." % cert['id'])
+
+if __name__ == "__main__":
+	if len(sys.argv) < 4:
+		print("Usage: python management/buy_certificate.py gandi_api_key domain_name {purchase, setup}")
+		sys.exit(1)
+	api_key = sys.argv[1]
+	domain_name = sys.argv[2]
+	cmd = sys.argv[3]
+	buy_ssl_certificate(api_key, domain_name, cmd, load_environment())
+

management/daemon.py

@@ -1,461 +1,113 @@
 #!/usr/bin/python3
 
-import os, os.path, re, json
+import os, os.path, re
 
-from functools import wraps
+from flask import Flask, request, render_template, abort
-
+app = Flask(__name__)
-from flask import Flask, request, render_template, abort, Response, send_from_directory
 
 import auth, utils
-from mailconfig import get_mail_users, get_mail_users_ex, get_admins, add_mail_user, set_mail_password, remove_mail_user
+from mailconfig import get_mail_users, add_mail_user, set_mail_password, remove_mail_user, get_mail_aliases, get_mail_domains, add_mail_alias, remove_mail_alias
-from mailconfig import get_mail_user_privileges, add_remove_mail_user_privilege
-from mailconfig import get_mail_aliases, get_mail_aliases_ex, get_mail_domains, add_mail_alias, remove_mail_alias
-
-# Create a worker pool for the status checks. The pool should
-# live across http requests so we don't baloon the system with
-# processes.
-import multiprocessing.pool
-pool = multiprocessing.pool.Pool(processes=10)
 
 env = utils.load_environment()
 
 auth_service = auth.KeyAuthService()
 
-# We may deploy via a symbolic link, which confuses flask's template finding.
+@app.before_request
-me = __file__
+def require_auth_key():
-try:
+	if not auth_service.is_authenticated(request):
-	me = os.readlink(__file__)
+		abort(401)
-except OSError:
-	pass
-
-app = Flask(__name__, template_folder=os.path.abspath(os.path.join(os.path.dirname(me), "templates")))
-
-# Decorator to protect views that require a user with 'admin' privileges.
-def authorized_personnel_only(viewfunc):
-	@wraps(viewfunc)
-	def newview(*args, **kwargs):
-		# Authenticate the passed credentials, which is either the API key or a username:password pair.
-		error = None
-		try:
-			email, privs = auth_service.authenticate(request, env)
-		except ValueError as e:
-			# Authentication failed.
-			privs = []
-			error = str(e)
-
-		# Authorized to access an API view?
-		if "admin" in privs:
-			# Call view func.
-			return viewfunc(*args, **kwargs)
-		elif not error:
-			error = "You are not an administrator."
-
-		# Not authorized. Return a 401 (send auth) and a prompt to authorize by default.
-		status = 401
-		headers = {
-			'WWW-Authenticate': 'Basic realm="{0}"'.format(auth_service.auth_realm),
-			'X-Reason': error,
-		}
-
-		if request.headers.get('X-Requested-With') == 'XMLHttpRequest':
-			# Don't issue a 401 to an AJAX request because the user will
-			# be prompted for credentials, which is not helpful.
-			status = 403
-			headers = None
-
-		if request.headers.get('Accept') in (None, "", "*/*"):
-			# Return plain text output.
-			return Response(error+"\n", status=status, mimetype='text/plain', headers=headers)
-		else:
-			# Return JSON output.
-			return Response(json.dumps({
-				"status": "error",
-				"reason": error,
-				})+"\n", status=status, mimetype='application/json', headers=headers)
-
-	return newview
 
 @app.errorhandler(401)
 def unauthorized(error):
 	return auth_service.make_unauthorized_response()
 
-def json_response(data):
-	return Response(json.dumps(data, indent=2, sort_keys=True)+'\n', status=200, mimetype='application/json')
-
-###################################
-
-# Control Panel (unauthenticated views)
-
 @app.route('/')
 def index():
-	# Render the control panel. This route does not require user authentication
+    return render_template('index.html')
-	# so it must be safe!
-
-	no_users_exist = (len(get_mail_users(env)) == 0)
-	no_admins_exist = (len(get_admins(env)) == 0)
-
-	import boto.s3
-	backup_s3_hosts = [(r.name, r.endpoint) for r in boto.s3.regions()]
-
-	return render_template('index.html',
-		hostname=env['PRIMARY_HOSTNAME'],
-		storage_root=env['STORAGE_ROOT'],
-		no_users_exist=no_users_exist,
-		no_admins_exist=no_admins_exist,
-		backup_s3_hosts=backup_s3_hosts,
-	)
-
-@app.route('/me')
-def me():
-	# Is the caller authorized?
-	try:
-		email, privs = auth_service.authenticate(request, env)
-	except ValueError as e:
-		return json_response({
-			"status": "invalid",
-			"reason": str(e),
-			})
-
-	resp = {
-		"status": "ok",
-		"email": email,
-		"privileges": privs,
-	}
-
-	# Is authorized as admin? Return an API key for future use.
-	if "admin" in privs:
-		resp["api_key"] = auth_service.create_user_key(email, env)
-
-	# Return.
-	return json_response(resp)
 
 # MAIL
 
 @app.route('/mail/users')
-@authorized_personnel_only
 def mail_users():
-	if request.args.get("format", "") == "json":
+    return "".join(x+"\n" for x in get_mail_users(env))
-		return json_response(get_mail_users_ex(env, with_archived=True, with_slow_info=True))
-	else:
-		return "".join(x+"\n" for x in get_mail_users(env))
 
 @app.route('/mail/users/add', methods=['POST'])
-@authorized_personnel_only
 def mail_users_add():
-	try:
+	return add_mail_user(request.form.get('email', ''), request.form.get('password', ''), env)
-		return add_mail_user(request.form.get('email', ''), request.form.get('password', ''), request.form.get('privileges', ''), env)
-	except ValueError as e:
-		return (str(e), 400)
 
 @app.route('/mail/users/password', methods=['POST'])
-@authorized_personnel_only
 def mail_users_password():
-	try:
+	return set_mail_password(request.form.get('email', ''), request.form.get('password', ''), env)
-		return set_mail_password(request.form.get('email', ''), request.form.get('password', ''), env)
-	except ValueError as e:
-		return (str(e), 400)
 
 @app.route('/mail/users/remove', methods=['POST'])
-@authorized_personnel_only
 def mail_users_remove():
 	return remove_mail_user(request.form.get('email', ''), env)
 
-
-@app.route('/mail/users/privileges')
-@authorized_personnel_only
-def mail_user_privs():
-	privs = get_mail_user_privileges(request.args.get('email', ''), env)
-	if isinstance(privs, tuple): return privs # error
-	return "\n".join(privs)
-
-@app.route('/mail/users/privileges/add', methods=['POST'])
-@authorized_personnel_only
-def mail_user_privs_add():
-	return add_remove_mail_user_privilege(request.form.get('email', ''), request.form.get('privilege', ''), "add", env)
-
-@app.route('/mail/users/privileges/remove', methods=['POST'])
-@authorized_personnel_only
-def mail_user_privs_remove():
-	return add_remove_mail_user_privilege(request.form.get('email', ''), request.form.get('privilege', ''), "remove", env)
-
-
 @app.route('/mail/aliases')
-@authorized_personnel_only
 def mail_aliases():
-	if request.args.get("format", "") == "json":
+    return "".join(x+"\t"+y+"\n" for x, y in get_mail_aliases(env))
-		return json_response(get_mail_aliases_ex(env))
-	else:
-		return "".join(address+"\t"+receivers+"\t"+(senders or "")+"\n" for address, receivers, senders in get_mail_aliases(env))
 
 @app.route('/mail/aliases/add', methods=['POST'])
-@authorized_personnel_only
 def mail_aliases_add():
-	return add_mail_alias(
+	return add_mail_alias(request.form.get('source', ''), request.form.get('destination', ''), env)
-		request.form.get('address', ''),
-		request.form.get('forwards_to', ''),
-		request.form.get('permitted_senders', ''),
-		env,
-		update_if_exists=(request.form.get('update_if_exists', '') == '1')
-		)
 
 @app.route('/mail/aliases/remove', methods=['POST'])
-@authorized_personnel_only
 def mail_aliases_remove():
-	return remove_mail_alias(request.form.get('address', ''), env)
+	return remove_mail_alias(request.form.get('source', ''), env)
 
 @app.route('/mail/domains')
-@authorized_personnel_only
 def mail_domains():
     return "".join(x+"\n" for x in get_mail_domains(env))
 
 # DNS
 
-@app.route('/dns/zones')
-@authorized_personnel_only
-def dns_zones():
-	from dns_update import get_dns_zones
-	return json_response([z[0] for z in get_dns_zones(env)])
-
 @app.route('/dns/update', methods=['POST'])
-@authorized_personnel_only
 def dns_update():
 	from dns_update import do_dns_update
 	try:
-		return do_dns_update(env, force=request.form.get('force', '') == '1')
+		return do_dns_update(env)
 	except Exception as e:
 		return (str(e), 500)
 
-@app.route('/dns/secondary-nameserver')
+@app.route('/dns/ds')
-@authorized_personnel_only
+def dns_get_ds_records():
-def dns_get_secondary_nameserver():
+	from dns_update import get_ds_records
-	from dns_update import get_custom_dns_config, get_secondary_dns
-	return json_response({ "hostnames": get_secondary_dns(get_custom_dns_config(env), mode=None) })
-
-@app.route('/dns/secondary-nameserver', methods=['POST'])
-@authorized_personnel_only
-def dns_set_secondary_nameserver():
-	from dns_update import set_secondary_dns
 	try:
-		return set_secondary_dns([ns.strip() for ns in re.split(r"[, ]+", request.form.get('hostnames') or "") if ns.strip() != ""], env)
+		return get_ds_records(env).replace("\t", " ") # tabs confuse godaddy
-	except ValueError as e:
+	except Exception as e:
-		return (str(e), 400)
+		return (str(e), 500)
-
-@app.route('/dns/custom')
-@authorized_personnel_only
-def dns_get_records(qname=None, rtype=None):
-	from dns_update import get_custom_dns_config
-	return json_response([
-	{
-		"qname": r[0],
-		"rtype": r[1],
-		"value": r[2],
-	}
-	for r in get_custom_dns_config(env)
-	if r[0] != "_secondary_nameserver"
-		and (not qname or r[0] == qname)
-		and (not rtype or r[1] == rtype) ])
-
-@app.route('/dns/custom/<qname>', methods=['GET', 'POST', 'PUT', 'DELETE'])
-@app.route('/dns/custom/<qname>/<rtype>', methods=['GET', 'POST', 'PUT', 'DELETE'])
-@authorized_personnel_only
-def dns_set_record(qname, rtype="A"):
-	from dns_update import do_dns_update, set_custom_dns_record
-	try:
-		# Normalize.
-		rtype = rtype.upper()
-
-		# Read the record value from the request BODY, which must be
-		# ASCII-only. Not used with GET.
-		value = request.stream.read().decode("ascii", "ignore").strip()
-
-		if request.method == "GET":
-			# Get the existing records matching the qname and rtype.
-			return dns_get_records(qname, rtype)
-
-		elif request.method in ("POST", "PUT"):
-			# There is a default value for A/AAAA records.
-			if rtype in ("A", "AAAA") and value == "":
-				value = request.environ.get("HTTP_X_FORWARDED_FOR") # normally REMOTE_ADDR but we're behind nginx as a reverse proxy
-
-			# Cannot add empty records.
-			if value == '':
-				return ("No value for the record provided.", 400)
-
-			if request.method == "POST":
-				# Add a new record (in addition to any existing records
-				# for this qname-rtype pair).
-				action = "add"
-			elif request.method == "PUT":
-				# In REST, PUT is supposed to be idempotent, so we'll
-				# make this action set (replace all records for this
-				# qname-rtype pair) rather than add (add a new record).
-				action = "set"
-
-		elif request.method == "DELETE":
-			if value == '':
-				# Delete all records for this qname-type pair.
-				value = None
-			else:
-				# Delete just the qname-rtype-value record exactly.
-				pass
-			action = "remove"
-
-		if set_custom_dns_record(qname, rtype, value, action, env):
-			return do_dns_update(env) or "Something isn't right."
-		return "OK"
-
-	except ValueError as e:
-		return (str(e), 400)
-
-@app.route('/dns/dump')
-@authorized_personnel_only
-def dns_get_dump():
-	from dns_update import build_recommended_dns
-	return json_response(build_recommended_dns(env))
-
-# SSL
-
-@app.route('/ssl/csr/<domain>', methods=['POST'])
-@authorized_personnel_only
-def ssl_get_csr(domain):
-	from web_update import create_csr
-	ssl_private_key = os.path.join(os.path.join(env["STORAGE_ROOT"], 'ssl', 'ssl_private_key.pem'))
-	return create_csr(domain, ssl_private_key, env)
-
-@app.route('/ssl/install', methods=['POST'])
-@authorized_personnel_only
-def ssl_install_cert():
-	from web_update import install_cert
-	domain = request.form.get('domain')
-	ssl_cert = request.form.get('cert')
-	ssl_chain = request.form.get('chain')
-	return install_cert(domain, ssl_cert, ssl_chain, env)
 
 # WEB
 
-@app.route('/web/domains')
-@authorized_personnel_only
-def web_get_domains():
-	from web_update import get_web_domains_info
-	return json_response(get_web_domains_info(env))
-
 @app.route('/web/update', methods=['POST'])
-@authorized_personnel_only
 def web_update():
 	from web_update import do_web_update
 	return do_web_update(env)
 
 # System
 
-@app.route('/system/version', methods=["GET"])
-@authorized_personnel_only
-def system_version():
-	from status_checks import what_version_is_this
-	try:
-		return what_version_is_this(env)
-	except Exception as e:
-		return (str(e), 500)
-
-@app.route('/system/latest-upstream-version', methods=["POST"])
-@authorized_personnel_only
-def system_latest_upstream_version():
-	from status_checks import get_latest_miab_version
-	try:
-		return get_latest_miab_version()
-	except Exception as e:
-		return (str(e), 500)
-
-@app.route('/system/status', methods=["POST"])
-@authorized_personnel_only
-def system_status():
-	from status_checks import run_checks
-	class WebOutput:
-		def __init__(self):
-			self.items = []
-		def add_heading(self, heading):
-			self.items.append({ "type": "heading", "text": heading, "extra": [] })
-		def print_ok(self, message):
-			self.items.append({ "type": "ok", "text": message, "extra": [] })
-		def print_error(self, message):
-			self.items.append({ "type": "error", "text": message, "extra": [] })
-		def print_warning(self, message):
-			self.items.append({ "type": "warning", "text": message, "extra": [] })
-		def print_line(self, message, monospace=False):
-			self.items[-1]["extra"].append({ "text": message, "monospace": monospace })
-	output = WebOutput()
-	run_checks(False, env, output, pool)
-	return json_response(output.items)
-
 @app.route('/system/updates')
-@authorized_personnel_only
 def show_updates():
-	from status_checks import list_apt_updates
+	utils.shell("check_call", ["/usr/bin/apt-get", "-qq", "update"])
-	return "".join(
+	simulated_install = utils.shell("check_output", ["/usr/bin/apt-get", "-qq", "-s", "upgrade"])
-		"%s (%s)\n"
+	pkgs = []
-		% (p["package"], p["version"])
+	for line in simulated_install.split('\n'):
-		for p in list_apt_updates())
+		if re.match(r'^Conf .*', line): continue # remove these lines, not informative
+		line = re.sub(r'^Inst (.*) \[(.*)\] \((\S*).*', r'Updated Package Available: \1 (\3)', line) # make these lines prettier
+		pkgs.append(line)
+	return "\n".join(pkgs)
 
 @app.route('/system/update-packages', methods=["POST"])
-@authorized_personnel_only
 def do_updates():
 	utils.shell("check_call", ["/usr/bin/apt-get", "-qq", "update"])
 	return utils.shell("check_output", ["/usr/bin/apt-get", "-y", "upgrade"], env={
 		"DEBIAN_FRONTEND": "noninteractive"
 	})
 
-@app.route('/system/backup/status')
-@authorized_personnel_only
-def backup_status():
-	from backup import backup_status
-	return json_response(backup_status(env))
-
-@app.route('/system/backup/config', methods=["GET"])
-@authorized_personnel_only
-def backup_get_custom():
-	from backup import get_backup_config
-	return json_response(get_backup_config(env, for_ui=True))
-
-@app.route('/system/backup/config', methods=["POST"])
-@authorized_personnel_only
-def backup_set_custom():
-	from backup import backup_set_custom
-	return json_response(backup_set_custom(env,
-		request.form.get('target', ''),
-		request.form.get('target_user', ''),
-		request.form.get('target_pass', ''),
-		request.form.get('min_age', '')
-	))
-
-@app.route('/system/privacy', methods=["GET"])
-@authorized_personnel_only
-def privacy_status_get():
-	config = utils.load_settings(env)
-	return json_response(config.get("privacy", True))
-
-@app.route('/system/privacy', methods=["POST"])
-@authorized_personnel_only
-def privacy_status_set():
-	config = utils.load_settings(env)
-	config["privacy"] = (request.form.get('value') == "private")
-	utils.write_settings(config, env)
-	return "OK"
-
-# MUNIN
-
-@app.route('/munin/')
-@app.route('/munin/<path:filename>')
-@authorized_personnel_only
-def munin(filename=""):
-	# Checks administrative access (@authorized_personnel_only) and then just proxies
-	# the request to static files.
-	if filename == "": filename = "index.html"
-	return send_from_directory("/var/cache/munin/www", filename)
-
 # APP
 
 if __name__ == '__main__':
 	if "DEBUG" in os.environ: app.debug = True
-	if "APIKEY" in os.environ: auth_service.key = os.environ["APIKEY"]
 
 	if not app.debug:
 		app.logger.addHandler(utils.create_syslog_handler())
@@ -468,5 +120,5 @@ if __name__ == '__main__':
 	# debug console and enter that as the username
 	app.logger.info('API key: ' + auth_service.key)
 
-	# Start the application server. Listens on 127.0.0.1 (IPv4 only).
 	app.run(port=10222)
+

management/dns_update.py

@@ -4,10 +4,8 @@
 # and mail aliases and restarts nsd.
 ########################################################################
 
-import sys, os, os.path, urllib.parse, datetime, re, hashlib, base64
+import os, os.path, urllib.parse, datetime, re, hashlib
-import ipaddress
 import rtyaml
-import dns.resolver
 
 from mailconfig import get_mail_domains
 from utils import shell, load_env_vars_from_file, safe_domain_name, sort_domains
@@ -24,7 +22,7 @@ def get_dns_zones(env):
 	# What domains should we create DNS zones for? Never create a zone for
 	# a domain & a subdomain of that domain.
 	domains = get_dns_domains(env)
-
+	
 	# Exclude domains that are subdomains of other domains we know. Proceed
 	# by looking at shorter domains first.
 	zone_domains = set()
@@ -49,27 +47,31 @@ def get_dns_zones(env):
 	zonefiles.sort(key = lambda zone : zone_order.index(zone[0]) )
 
 	return zonefiles
+	
+def get_custom_dns_config(env):
+	try:
+		return rtyaml.load(open(os.path.join(env['STORAGE_ROOT'], 'dns/custom.yaml')))
+	except:
+		return { }
 
-def do_dns_update(env, force=False):
+def do_dns_update(env):
 	# What domains (and their zone filenames) should we build?
 	domains = get_dns_domains(env)
 	zonefiles = get_dns_zones(env)
 
 	# Custom records to add to zones.
-	additional_records = list(get_custom_dns_config(env))
+	additional_records = get_custom_dns_config(env)
-	from web_update import get_default_www_redirects
-	www_redirect_domains = get_default_www_redirects(env)
 
 	# Write zone files.
 	os.makedirs('/etc/nsd/zones', exist_ok=True)
 	updated_domains = []
 	for i, (domain, zonefile) in enumerate(zonefiles):
 		# Build the records to put in the zone.
-		records = build_zone(domain, domains, additional_records, www_redirect_domains, env)
+		records = build_zone(domain, domains, additional_records, env)
 
 		# See if the zone has changed, and if so update the serial number
 		# and write the zone file.
-		if not write_nsd_zone(domain, "/etc/nsd/zones/" + zonefile, records, env, force):
+		if not write_nsd_zone(domain, "/etc/nsd/zones/" + zonefile, records, env):
 			# Zone was not updated. There were no changes.
 			continue
 
@@ -91,7 +93,7 @@ def do_dns_update(env, force=False):
 		# Thus we only sign a zone if write_nsd_zone returned True
 		# indicating the zone changed, and thus it got a new serial number.
 		# write_nsd_zone is smart enough to check if a zone's signature
-		# is nearing expiration and if so it'll bump the serial number
+		# is nearing experiation and if so it'll bump the serial number
 		# and return True so we get a chance to re-sign it.
 		sign_zone(domain, zonefile, env)
 
@@ -102,7 +104,7 @@ def do_dns_update(env, force=False):
 		zonefiles[i][1] += ".signed"
 
 	# Write the main nsd.conf file.
-	if write_nsd_conf(zonefiles, additional_records, env):
+	if write_nsd_conf(zonefiles):
 		# Make sure updated_domains contains *something* if we wrote an updated
 		# nsd.conf so that we know to restart nsd.
 		if len(updated_domains) == 0:
@@ -113,16 +115,10 @@ def do_dns_update(env, force=False):
 		shell('check_call', ["/usr/sbin/service", "nsd", "restart"])
 
 	# Write the OpenDKIM configuration tables.
-	if write_opendkim_tables(domains, env):
+	write_opendkim_tables(zonefiles, env)
-		# Settings changed. Kick opendkim.
-		shell('check_call', ["/usr/sbin/service", "opendkim", "restart"])
-		if len(updated_domains) == 0:
-			# If this is the only thing that changed?
-			updated_domains.append("OpenDKIM configuration")
 
-	# Clear bind9's DNS cache so our own DNS resolver is up to date.
+	# Kick opendkim.
-	# (ignore errors with trap=True)
+	shell('check_call', ["/usr/sbin/service", "opendkim", "restart"])
-	shell('check_call', ["/usr/sbin/rndc", "flush"], trap=True)
 
 	if len(updated_domains) == 0:
 		# if nothing was updated (except maybe OpenDKIM's files), don't show any output
@@ -132,28 +128,15 @@ def do_dns_update(env, force=False):
 
 ########################################################################
 
-def build_zone(domain, all_domains, additional_records, www_redirect_domains, env, is_zone=True):
+def build_zone(domain, all_domains, additional_records, env, is_zone=True):
 	records = []
 
-	# For top-level zones, define the authoritative name servers.
+	# For top-level zones, define ourselves as the authoritative name server.
-	#
-	# Normally we are our own nameservers. Some TLDs require two distinct IP addresses,
-	# so we allow the user to override the second nameserver definition so that
-	# secondary DNS can be set up elsewhere.
-	#
 	# 'False' in the tuple indicates these records would not be used if the zone
 	# is managed outside of the box.
 	if is_zone:
-		# Obligatory definition of ns1.PRIMARY_HOSTNAME.
 		records.append((None,  "NS",  "ns1.%s." % env["PRIMARY_HOSTNAME"], False))
-
+		records.append((None,  "NS",  "ns2.%s." % env["PRIMARY_HOSTNAME"], False))
-		# Define ns2.PRIMARY_HOSTNAME or whatever the user overrides.
-		# User may provide one or more additional nameservers
-		secondary_ns_list = get_secondary_dns(additional_records, mode="NS") \
-			or ["ns2." + env["PRIMARY_HOSTNAME"]] 
-		for secondary_ns in secondary_ns_list:
-			records.append((None,  "NS", secondary_ns+'.', False))
-
 
 	# In PRIMARY_HOSTNAME...
 	if domain == env["PRIMARY_HOSTNAME"]:
@@ -174,22 +157,19 @@ def build_zone(domain, all_domains, additional_records, www_redirect_domains, en
 		# Add a DANE TLSA record for SMTP.
 		records.append(("_25._tcp", "TLSA", build_tlsa_record(env), "Recommended when DNSSEC is enabled. Advertises to mail servers connecting to the box that mandatory encryption should be used."))
 
-		# Add a DANE TLSA record for HTTPS, which some browser extensions might make use of.
-		records.append(("_443._tcp", "TLSA", build_tlsa_record(env), "Optional. When DNSSEC is enabled, provides out-of-band HTTPS certificate validation for a few web clients that support it."))
-
-		# Add a SSHFP records to help SSH key validation. One per available SSH key on this system.
-		for value in build_sshfp_records():
-			records.append((None, "SSHFP", value, "Optional. Provides an out-of-band method for verifying an SSH key before connecting. Use 'VerifyHostKeyDNS yes' (or 'VerifyHostKeyDNS ask') when connecting with ssh."))
-
 	# The MX record says where email for the domain should be delivered: Here!
-	records.append((None,  "MX",  "10 %s." % env["PRIMARY_HOSTNAME"], "Required. Specifies the hostname (and priority) of the machine that handles @%s mail." % domain))
+	records.append((None,  "MX",  "10 %s." % env["PRIMARY_HOSTNAME"], "Required. Specifies the hostname of the machine that handles @%s mail." % domain))
+
+	# SPF record: Permit the box ('mx', see above) to send mail on behalf of
+	# the domain, and no one else.
+	records.append((None,  "TXT", '"v=spf1 mx -all"', "Recomended. Specifies that only the box is permitted to send @%s mail." % domain))
 
 	# Add DNS records for any subdomains of this domain. We should not have a zone for
 	# both a domain and one of its subdomains.
 	subdomains = [d for d in all_domains if d.endswith("." + domain)]
 	for subdomain in subdomains:
 		subdomain_qname = subdomain[0:-len("." + domain)]
-		subzone = build_zone(subdomain, [], additional_records, www_redirect_domains, env, is_zone=False)
+		subzone = build_zone(subdomain, [], {}, env, is_zone=False)
 		for child_qname, child_rtype, child_value, child_explanation in subzone:
 			if child_qname == None:
 				child_qname = subdomain_qname
@@ -197,88 +177,40 @@ def build_zone(domain, all_domains, additional_records, www_redirect_domains, en
 				child_qname += "." + subdomain_qname
 			records.append((child_qname, child_rtype, child_value, child_explanation))
 
-	has_rec_base = list(records) # clone current state
+	def has_rec(qname, rtype):
-	def has_rec(qname, rtype, prefix=None):
+		for rec in records:
-		for rec in has_rec_base:
+			if rec[0] == qname and rec[1] == rtype:
-			if rec[0] == qname and rec[1] == rtype and (prefix is None or rec[2].startswith(prefix)):
 				return True
 		return False
 
 	# The user may set other records that don't conflict with our settings.
-	# Don't put any TXT records above this line, or it'll prevent any custom TXT records.
+	for qname, rtype, value in get_custom_records(domain, additional_records, env):
-	for qname, rtype, value in filter_custom_records(domain, additional_records):
-		# Don't allow custom records for record types that override anything above.
-		# But allow multiple custom records for the same rtype --- see how has_rec_base is used.
 		if has_rec(qname, rtype): continue
-
-		# The "local" keyword on A/AAAA records are short-hand for our own IP.
-		# This also flags for web configuration that the user wants a website here.
-		if rtype == "A" and value == "local":
-			value = env["PUBLIC_IP"]
-		if rtype == "AAAA" and value == "local":
-			if "PUBLIC_IPV6" in env:
-				value = env["PUBLIC_IPV6"]
-			else:
-				continue
 		records.append((qname, rtype, value, "(Set by user.)"))
 
-	# Add defaults if not overridden by the user's custom settings (and not otherwise configured).
+	# Add defaults if not overridden by the user's custom settings.
-	# Any CNAME or A record on the qname overrides A and AAAA. But when we set the default A record,
-	# we should not cause the default AAAA record to be skipped because it thinks a custom A record
-	# was set. So set has_rec_base to a clone of the current set of DNS settings, and don't update
-	# during this process.
-	has_rec_base = list(records)
 	defaults = [
-		(None,  "A",    env["PUBLIC_IP"],       "Required. May have a different value. Sets the IP address that %s resolves to for web hosting and other services besides mail. The A record must be present but its value does not affect mail delivery." % domain),
+		(None,  "A",    env["PUBLIC_IP"],       "Optional. Sets the IP address that %s resolves to, e.g. for web hosting." % domain),
-		(None,  "AAAA", env.get('PUBLIC_IPV6'), "Optional. Sets the IPv6 address that %s resolves to, e.g. for web hosting. (It is not necessary for receiving mail on this domain.)" % domain),
+		("www", "A",    env["PUBLIC_IP"],       "Optional. Sets the IP address that www.%s resolves to, e.g. for web hosting." % domain),
+		(None,  "AAAA", env.get('PUBLIC_IPV6'), "Optional. Sets the IPv6 address that %s resolves to, e.g. for web hosting." % domain),
+		("www", "AAAA", env.get('PUBLIC_IPV6'), "Optional. Sets the IPv6 address that www.%s resolves to, e.g. for web hosting." % domain),
 	]
-	if "www." + domain in www_redirect_domains:
-		defaults += [
-			("www", "A",    env["PUBLIC_IP"],       "Optional. Sets the IP address that www.%s resolves to so that the box can provide a redirect to the parent domain." % domain),
-			("www", "AAAA", env.get('PUBLIC_IPV6'), "Optional. Sets the IPv6 address that www.%s resolves to so that the box can provide a redirect to the parent domain." % domain),
-		]
 	for qname, rtype, value, explanation in defaults:
 		if value is None or value.strip() == "": continue # skip IPV6 if not set
 		if not is_zone and qname == "www": continue # don't create any default 'www' subdomains on what are themselves subdomains
-		# Set the default record, but not if:
+		if not has_rec(qname, rtype):
-		# (1) there is not a user-set record of the same type already
-		# (2) there is not a CNAME record already, since you can't set both and who knows what takes precedence
-		# (2) there is not an A record already (if this is an A record this is a dup of (1), and if this is an AAAA record then don't set a default AAAA record if the user sets a custom A record, since the default wouldn't make sense and it should not resolve if the user doesn't provide a new AAAA record)
-		if not has_rec(qname, rtype) and not has_rec(qname, "CNAME") and not has_rec(qname, "A"):
 			records.append((qname, rtype, value, explanation))
 
-	# Don't pin the list of records that has_rec checks against anymore.
+	# If OpenDKIM is in use..
-	has_rec_base = records
-
-	# SPF record: Permit the box ('mx', see above) to send mail on behalf of
-	# the domain, and no one else.
-	# Skip if the user has set a custom SPF record.
-	if not has_rec(None, "TXT", prefix="v=spf1 "):
-		records.append((None,  "TXT", 'v=spf1 mx -all', "Recommended. Specifies that only the box is permitted to send @%s mail." % domain))
-
-	# Append the DKIM TXT record to the zone as generated by OpenDKIM.
-	# Skip if the user has set a DKIM record already.
 	opendkim_record_file = os.path.join(env['STORAGE_ROOT'], 'mail/dkim/mail.txt')
-	with open(opendkim_record_file) as orf:
+	if os.path.exists(opendkim_record_file):
-		m = re.match(r'(\S+)\s+IN\s+TXT\s+\( ((?:"[^"]+"\s+)+)\)', orf.read(), re.S)
+		# Append the DKIM TXT record to the zone as generated by OpenDKIM, after string formatting above.
-		val = "".join(re.findall(r'"([^"]+)"', m.group(2)))
+		with open(opendkim_record_file) as orf:
-		if not has_rec(m.group(1), "TXT", prefix="v=DKIM1; "):
+			m = re.match(r"(\S+)\s+IN\s+TXT\s+(\(.*\))\s*;", orf.read(), re.S)
-			records.append((m.group(1), "TXT", val, "Recommended. Provides a way for recipients to verify that this machine sent @%s mail." % domain))
+			records.append((m.group(1), "TXT", m.group(2), "Recommended. Specifies that only the box is permitted to send mail at this domain."))
-
-	# Append a DMARC record.
-	# Skip if the user has set a DMARC record already.
-	if not has_rec("_dmarc", "TXT", prefix="v=DMARC1; "):
-		records.append(("_dmarc", "TXT", 'v=DMARC1; p=quarantine', "Recommended. Specifies that mail that does not originate from the box but claims to be from @%s or which does not have a valid DKIM signature is suspect and should be quarantined by the recipient's mail system." % domain))
-
-	# For any subdomain with an A record but no SPF or DMARC record, add strict policy records.
-	all_resolvable_qnames = set(r[0] for r in records if r[1] in ("A", "AAAA"))
-	for qname in all_resolvable_qnames:
-		if not has_rec(qname, "TXT", prefix="v=spf1 "):
-			records.append((qname,  "TXT", 'v=spf1 -all', "Recommended. Prevents use of this domain name for outbound mail by specifying that no servers are valid sources for mail from @%s. If you do send email from this domain name you should either override this record such that the SPF rule does allow the originating server, or, take the recommended approach and have the box handle mail for this domain (simply add any receiving alias at this domain name to make this machine treat the domain name as one of its mail domains)." % (qname + "." + domain)))
-		dmarc_qname = "_dmarc" + ("" if qname is None else "." + qname)
-		if not has_rec(dmarc_qname, "TXT", prefix="v=DMARC1; "):
-			records.append((dmarc_qname, "TXT", 'v=DMARC1; p=reject', "Recommended. Prevents use of this domain name for outbound mail by specifying that the SPF rule should be honoured for mail from @%s." % (qname + "." + domain)))
 
+		# Append a DMARC record.
+		records.append(("_dmarc", "TXT", '"v=DMARC1; p=quarantine"', "Optional. Specifies that mail that does not originate from the box but claims to be from @%s is suspect and should be quarantined by the recipient's mail system." % domain))
 
 	# Sort the records. The None records *must* go first in the nsd zone file. Otherwise it doesn't matter.
 	records.sort(key = lambda rec : list(reversed(rec[0].split(".")) if rec[0] is not None else ""))
@@ -287,6 +219,50 @@ def build_zone(domain, all_domains, additional_records, www_redirect_domains, en
 
 ########################################################################
 
+def get_custom_records(domain, additional_records, env):
+	for qname, value in additional_records.items():
+		# Is this record for the domain or one of its subdomains?
+		if qname != domain and not qname.endswith("." + domain): continue
+
+		# Turn the fully qualified domain name in the YAML file into
+		# our short form (None => domain, or a relative QNAME).
+		if qname == domain:
+			qname = None
+		else:
+			qname = qname[0:len(qname)-len("." + domain)]
+
+		# Short form. Mapping a domain name to a string is short-hand
+		# for creating A records.
+		if isinstance(value, str):
+			values = [("A", value)]
+			if value == "local" and env.get("PUBLIC_IPV6"):
+				values.appnd( ("AAAA", value) )
+
+		# A mapping creates multiple records.
+		elif isinstance(value, dict):
+			values = value.items()
+
+		# No other type of data is allowed.
+		else:
+			raise ValueError()
+
+		for rtype, value2 in values:
+			# The "local" keyword on A/AAAA records are short-hand for our own IP.
+			# This also flags for web configuration that the user wants a website here.
+			if rtype == "A" and value2 == "local":
+				value2 = env["PUBLIC_IP"]
+			if rtype == "AAAA" and value2 == "local":
+				if "PUBLIC_IPV6" not in env: continue # no IPv6 address is available so don't set anything
+				value2 = env["PUBLIC_IPV6"]
+
+			# For typical zone file output, quote a text record.
+			if rtype == "TXT":
+				value2 = "\"" + value2 + "\""
+
+			yield (qname, rtype, value2)
+
+########################################################################
+
 def build_tlsa_record(env):
 	# A DANE TLSA record in DNS specifies that connections on a port
 	# must use TLS and the certificate must match a particular certificate.
@@ -310,67 +286,26 @@ def build_tlsa_record(env):
 	# 1: The certificate is SHA256'd here.
 	return "3 0 1 " + certhash
 
-def build_sshfp_records():
-	# The SSHFP record is a way for us to embed this server's SSH public
-	# key fingerprint into the DNS so that remote hosts have an out-of-band
-	# method to confirm the fingerprint. See RFC 4255 and RFC 6594. This
-	# depends on DNSSEC.
-	#
-	# On the client side, set SSH's VerifyHostKeyDNS option to 'ask' to
-	# include this info in the key verification prompt or 'yes' to trust
-	# the SSHFP record.
-	#
-	# See https://github.com/xelerance/sshfp for inspiriation.
-
-	algorithm_number = {
-		"ssh-rsa": 1,
-		"ssh-dss": 2,
-		"ecdsa-sha2-nistp256": 3,
-	}
-
-	# Get our local fingerprints by running ssh-keyscan. The output looks
-	# like the known_hosts file: hostname, keytype, fingerprint. The order
-	# of the output is arbitrary, so sort it to prevent spurrious updates
-	# to the zone file (that trigger bumping the serial number).
-	keys = shell("check_output", ["ssh-keyscan", "localhost"])
-	for key in sorted(keys.split("\n")):
-		if key.strip() == "" or key[0] == "#": continue
-		try:
-			host, keytype, pubkey = key.split(" ")
-			yield "%d %d ( %s )" % (
-				algorithm_number[keytype],
-				2, # specifies we are using SHA-256 on next line
-				hashlib.sha256(base64.b64decode(pubkey)).hexdigest().upper(),
-				)
-		except:
-			# Lots of things can go wrong. Don't let it disturb the DNS
-			# zone.
-			pass
-
 ########################################################################
 
-def write_nsd_zone(domain, zonefile, records, env, force):
+def write_nsd_zone(domain, zonefile, records, env):
+	# We set the administrative email address for every domain to domain_contact@[domain.com].
+	# You should probably create an alias to your email address.
+
 	# On the $ORIGIN line, there's typically a ';' comment at the end explaining
 	# what the $ORIGIN line does. Any further data after the domain confuses
 	# ldns-signzone, however. It used to say '; default zone domain'.
 
-	# The SOA contact address for all of the domains on this system is hostmaster
-	# @ the PRIMARY_HOSTNAME. Hopefully that's legit.
-
-	# For the refresh through TTL fields, a good reference is:
-	# http://www.peerwisdom.org/2013/05/15/dns-understanding-the-soa-record/
-
-
 	zone = """
 $ORIGIN {domain}.
-$TTL 1800           ; default time to live
+$TTL 86400           ; default time to live
 
 @ IN SOA ns1.{primary_domain}. hostmaster.{primary_domain}. (
            __SERIAL__     ; serial number
-           7200     ; Refresh (secondary nameserver update interval)
+           28800       ; Refresh
-           1800     ; Retry (when refresh fails, how often to try again)
+           7200        ; Retry
-           1209600  ; Expire (when refresh fails, how long secondary nameserver will keep records around anyway)
+           864000      ; Expire
-           1800     ; Negative TTL (how long negative responses are cached)
+           86400       ; Min TTL
            )
 """
 
@@ -382,17 +317,6 @@ $TTL 1800           ; default time to live
 		if subdomain:
 			zone += subdomain
 		zone += "\tIN\t" + querytype + "\t"
-		if querytype == "TXT":
-			# Divide into 255-byte max substrings.
-			v2 = ""
-			while len(value) > 0:
-				s = value[0:255]
-				value = value[255:]
-				s = s.replace('\\', '\\\\') # escape backslashes
-				s = s.replace('"', '\\"') # escape quotes
-				s = '"' + s + '"' # wrap in quotes
-				v2 += s + " "
-			value = v2
 		zone += value + "\n"
 
 	# DNSSEC requires re-signing a zone periodically. That requires
@@ -439,7 +363,7 @@ $TTL 1800           ; default time to live
 
 				# If the existing zone is the same as the new zone (modulo the serial number),
 				# there is no need to update the file. Unless we're forcing a bump.
-				if zone == existing_zone and not force_bump and not force:
+				if zone == existing_zone and not force_bump:
 					return False
 
 				# If the existing serial is not less than a serial number
@@ -459,10 +383,28 @@ $TTL 1800           ; default time to live
 
 ########################################################################
 
-def write_nsd_conf(zonefiles, additional_records, env):
+def write_nsd_conf(zonefiles):
-	# Write the list of zones to a configuration file.
+	# Basic header.
-	nsd_conf_file = "/etc/nsd/zones.conf"
+	nsdconf = """
-	nsdconf = ""
+server:
+  hide-version: yes
+
+  # identify the server (CH TXT ID.SERVER entry).
+  identity: ""
+
+  # The directory for zonefile: files.
+  zonesdir: "/etc/nsd/zones"
+"""
+	
+	# Since we have bind9 listening on localhost for locally-generated
+	# DNS queries that require a recursive nameserver, we must have
+	# nsd listen only on public network interfaces. Those interfaces
+	# may have addresses different from the public IP address that the
+	# Internet sees this machine on. Get those interface addresses
+	# from `hostname -i` (which omits all localhost addresses).
+	for ipaddr in shell("check_output", ["/bin/hostname", "-I"]).strip().split(" "):
+		nsdconf += "  ip-address: %s\n" % ipaddr
+
 
 	# Append the zones.
 	for domain, zonefile in zonefiles:
@@ -472,48 +414,27 @@ zone:
 	zonefile: %s
 """ % (domain, zonefile)
 
-		# If custom secondary nameservers have been set, allow zone transfers
+	# Check if the nsd.conf is changing. If it isn't changing,
-		# and notifies to them.
-		for ipaddr in get_secondary_dns(additional_records, mode="xfr"):
-			nsdconf += "\n\tnotify: %s NOKEY\n\tprovide-xfr: %s NOKEY\n" % (ipaddr, ipaddr)
-
-	# Check if the file is changing. If it isn't changing,
 	# return False to flag that no change was made.
-	if os.path.exists(nsd_conf_file):
+	with open("/etc/nsd/nsd.conf") as f:
-		with open(nsd_conf_file) as f:
+		if f.read() == nsdconf:
-			if f.read() == nsdconf:
+			return False
-				return False
 
-	# Write out new contents and return True to signal that
+	with open("/etc/nsd/nsd.conf", "w") as f:
-	# configuration changed.
-	with open(nsd_conf_file, "w") as f:
 		f.write(nsdconf)
+
 	return True
 
 ########################################################################
 
-def dnssec_choose_algo(domain, env):
-	if '.' in domain and domain.rsplit('.')[-1] in \
-		("email", "guide", "fund"):
-		# At GoDaddy, RSASHA256 is the only algorithm supported
-		# for .email and .guide.
-		# A variety of algorithms are supported for .fund. This
-		# is preferred.
-		return "RSASHA256"
-
-	# For any domain we were able to sign before, don't change the algorithm
-	# on existing users. We'll probably want to migrate to SHA256 later.
-	return "RSASHA1-NSEC3-SHA1"
-
 def sign_zone(domain, zonefile, env):
-	algo = dnssec_choose_algo(domain, env)
+	dnssec_keys = load_env_vars_from_file(os.path.join(env['STORAGE_ROOT'], 'dns/dnssec/keys.conf'))
-	dnssec_keys = load_env_vars_from_file(os.path.join(env['STORAGE_ROOT'], 'dns/dnssec/%s.conf' % algo))
 
 	# In order to use the same keys for all domains, we have to generate
 	# a new .key file with a DNSSEC record for the specific domain. We
 	# can reuse the same key, but it won't validate without a DNSSEC
 	# record specifically for the domain.
-	#
+	# 
 	# Copy the .key and .private files to /tmp to patch them up.
 	#
 	# Use os.umask and open().write() to securely create a copy that only
@@ -559,18 +480,13 @@ def sign_zone(domain, zonefile, env):
 	# zone being signed, so we can't use the .ds files generated when we created the keys.
 	# The DS record points to the KSK only. Write this next to the zone file so we can
 	# get it later to give to the user with instructions on what to do with it.
-	#
+	rr_ds = shell('check_output', ["/usr/bin/ldns-key2ds",
-	# We want to be able to validate DS records too, but multiple forms may be valid depending
+		"-n", # output to stdout
-	# on the digest type. So we'll write all (both) valid records. Only one DS record should
+		"-2", # SHA256
-	# actually be deployed. Preferebly the first.
+		dnssec_keys["KSK"] + ".key"
+	])
 	with open("/etc/nsd/zones/" + zonefile + ".ds", "w") as f:
-		for digest_type in ('2', '1'):
+		f.write(rr_ds)
-			rr_ds = shell('check_output', ["/usr/bin/ldns-key2ds",
-				"-n", # output to stdout
-				"-" + digest_type, # 1=SHA1, 2=SHA256
-				dnssec_keys["KSK"] + ".key"
-			])
-			f.write(rr_ds)
 
 	# Remove our temporary file.
 	for fn in files_to_kill:
@@ -578,284 +494,46 @@ def sign_zone(domain, zonefile, env):
 
 ########################################################################
 
-def write_opendkim_tables(domains, env):
+def get_ds_records(env):
-	# Append a record to OpenDKIM's KeyTable and SigningTable for each domain
+	zonefiles = get_dns_zones(env)
-	# that we send mail from (zones and all subdomains).
+	ret = ""
+	for domain, zonefile in zonefiles:
+		fn = "/etc/nsd/zones/" + zonefile + ".ds"
+		if os.path.exists(fn):
+			with open(fn, "r") as fr:
+				ret += fr.read().strip() + "\n"
+	return ret
+	
+	
+########################################################################
+
+def write_opendkim_tables(zonefiles, env):
+	# Append a record to OpenDKIM's KeyTable and SigningTable for each domain.
+	#
+	# The SigningTable maps email addresses to signing information. The KeyTable
+	# maps specify the hostname, the selector, and the path to the private key.
+	#
+	# DKIM ADSP and DMARC both only support policies where the signing domain matches
+	# the From address, so the KeyTable must specify that the signing domain for a
+	# sender matches the sender's domain.
+	#
+	# In SigningTable, we map every email address to a key record named after the domain.
+	# Then we specify for the key record its domain, selector, and key.
 
 	opendkim_key_file = os.path.join(env['STORAGE_ROOT'], 'mail/dkim/mail.private')
+	if not os.path.exists(opendkim_key_file): return
 
-	if not os.path.exists(opendkim_key_file):
+	with open("/etc/opendkim/KeyTable", "w") as f:
-		# Looks like OpenDKIM is not installed.
+		f.write("\n".join(
-		return False
+			"{domain} {domain}:mail:{key_file}".format(domain=domain, key_file=opendkim_key_file)
+			for domain, zonefile in zonefiles
+		))
 
-	config = {
+	with open("/etc/opendkim/SigningTable", "w") as f:
-		# The SigningTable maps email addresses to a key in the KeyTable that
+		f.write("\n".join(
-		# specifies signing information for matching email addresses. Here we
+			"*@{domain} {domain}".format(domain=domain)
-		# map each domain to a same-named key.
+			for domain, zonefile in zonefiles
-		#
+		))
-		# Elsewhere we set the DMARC policy for each domain such that mail claiming
-		# to be From: the domain must be signed with a DKIM key on the same domain.
-		# So we must have a separate KeyTable entry for each domain.
-		"SigningTable":
-			"".join(
-				"*@{domain} {domain}\n".format(domain=domain)
-				for domain in domains
-			),
-
-		# The KeyTable specifies the signing domain, the DKIM selector, and the
-		# path to the private key to use for signing some mail. Per DMARC, the
-		# signing domain must match the sender's From: domain.
-		"KeyTable":
-			"".join(
-				"{domain} {domain}:mail:{key_file}\n".format(domain=domain, key_file=opendkim_key_file)
-				for domain in domains
-			),
-	}
-
-	did_update = False
-	for filename, content in config.items():
-		# Don't write the file if it doesn't need an update.
-		if os.path.exists("/etc/opendkim/" + filename):
-			with open("/etc/opendkim/" + filename) as f:
-				if f.read() == content:
-					continue
-
-		# The contents needs to change.
-		with open("/etc/opendkim/" + filename, "w") as f:
-			f.write(content)
-		did_update = True
-
-	# Return whether the files changed. If they didn't change, there's
-	# no need to kick the opendkim process.
-	return did_update
-
-########################################################################
-
-def get_custom_dns_config(env):
-	try:
-		custom_dns = rtyaml.load(open(os.path.join(env['STORAGE_ROOT'], 'dns/custom.yaml')))
-		if not isinstance(custom_dns, dict): raise ValueError() # caught below
-	except:
-		return [ ]
-
-	for qname, value in custom_dns.items():
-		# Short form. Mapping a domain name to a string is short-hand
-		# for creating A records.
-		if isinstance(value, str):
-			values = [("A", value)]
-
-		# A mapping creates multiple records.
-		elif isinstance(value, dict):
-			values = value.items()
-
-		# No other type of data is allowed.
-		else:
-			raise ValueError()
-
-		for rtype, value2 in values:
-			if isinstance(value2, str):
-				yield (qname, rtype, value2)
-			elif isinstance(value2, list):
-				for value3 in value2:
-					yield (qname, rtype, value3)
-			# No other type of data is allowed.
-			else:
-				raise ValueError()
-
-def filter_custom_records(domain, custom_dns_iter):
-	for qname, rtype, value in custom_dns_iter:
-		# We don't count the secondary nameserver config (if present) as a record - that would just be
-		# confusing to users. Instead it is accessed/manipulated directly via (get/set)_custom_dns_config.
-		if qname == "_secondary_nameserver": continue
-
-		# Is this record for the domain or one of its subdomains?
-		# If `domain` is None, return records for all domains.
-		if domain is not None and qname != domain and not qname.endswith("." + domain): continue
-
-		# Turn the fully qualified domain name in the YAML file into
-		# our short form (None => domain, or a relative QNAME) if
-		# domain is not None.
-		if domain is not None:
-			if qname == domain:
-				qname = None
-			else:
-				qname = qname[0:len(qname)-len("." + domain)]
-
-		yield (qname, rtype, value)
-
-def write_custom_dns_config(config, env):
-	# We get a list of (qname, rtype, value) triples. Convert this into a
-	# nice dictionary format for storage on disk.
-	from collections import OrderedDict
-	config = list(config)
-	dns = OrderedDict()
-	seen_qnames = set()
-
-	# Process the qnames in the order we see them.
-	for qname in [rec[0] for rec in config]:
-		if qname in seen_qnames: continue
-		seen_qnames.add(qname)
-
-		records = [(rec[1], rec[2]) for rec in config if rec[0] == qname]
-		if len(records) == 1 and records[0][0] == "A":
-			dns[qname] = records[0][1]
-		else:
-			dns[qname] = OrderedDict()
-			seen_rtypes = set()
-
-			# Process the rtypes in the order we see them.
-			for rtype in [rec[0] for rec in records]:
-				if rtype in seen_rtypes: continue
-				seen_rtypes.add(rtype)
-
-				values = [rec[1] for rec in records if rec[0] == rtype]
-				if len(values) == 1:
-					values = values[0]
-				dns[qname][rtype] = values
-
-	# Write.
-	config_yaml = rtyaml.dump(dns)
-	with open(os.path.join(env['STORAGE_ROOT'], 'dns/custom.yaml'), "w") as f:
-		f.write(config_yaml)
-
-def set_custom_dns_record(qname, rtype, value, action, env):
-	# validate qname
-	for zone, fn in get_dns_zones(env):
-		# It must match a zone apex or be a subdomain of a zone
-		# that we are otherwise hosting.
-		if qname == zone or qname.endswith("."+zone):
-			break
-	else:
-		# No match.
-		if qname != "_secondary_nameserver":
-			raise ValueError("%s is not a domain name or a subdomain of a domain name managed by this box." % qname)
-
-	# validate rtype
-	rtype = rtype.upper()
-	if value is not None and qname != "_secondary_nameserver":
-		if rtype in ("A", "AAAA"):
-			if value != "local": # "local" is a special flag for us
-				v = ipaddress.ip_address(value) # raises a ValueError if there's a problem
-				if rtype == "A" and not isinstance(v, ipaddress.IPv4Address): raise ValueError("That's an IPv6 address.")
-				if rtype == "AAAA" and not isinstance(v, ipaddress.IPv6Address): raise ValueError("That's an IPv4 address.")
-		elif rtype in ("CNAME", "TXT", "SRV", "MX"):
-			# anything goes
-			pass
-		else:
-			raise ValueError("Unknown record type '%s'." % rtype)
-
-	# load existing config
-	config = list(get_custom_dns_config(env))
-
-	# update
-	newconfig = []
-	made_change = False
-	needs_add = True
-	for _qname, _rtype, _value in config:
-		if action == "add":
-			if (_qname, _rtype, _value) == (qname, rtype, value):
-				# Record already exists. Bail.
-				return False
-		elif action == "set":
-			if (_qname, _rtype) == (qname, rtype):
-				if _value == value:
-					# Flag that the record already exists, don't
-					# need to add it.
-					needs_add = False
-				else:
-					# Drop any other values for this (qname, rtype).
-					made_change = True
-					continue
-		elif action == "remove":
-			if (_qname, _rtype, _value) == (qname, rtype, value):
-				# Drop this record.
-				made_change = True
-				continue
-			if value == None and (_qname, _rtype) == (qname, rtype):
-				# Drop all qname-rtype records.
-				made_change = True
-				continue
-		else:
-			raise ValueError("Invalid action: " + action)
-
-		# Preserve this record.
-		newconfig.append((_qname, _rtype, _value))
-
-	if action in ("add", "set") and needs_add and value is not None:
-		newconfig.append((qname, rtype, value))
-		made_change = True
-
-	if made_change:
-		# serialize & save
-		write_custom_dns_config(newconfig, env)
-	return made_change
-
-########################################################################
-
-def get_secondary_dns(custom_dns, mode=None):
-	resolver = dns.resolver.get_default_resolver()
-
-	values = []
-	for qname, rtype, value in custom_dns:
-		if qname != '_secondary_nameserver': continue
-		for hostname in value.split(" "):
-			hostname = hostname.strip()
-			if mode == None:
-				# Just return the setting.
-				values.append(hostname)
-				continue
-
-			# This is a hostname. Before including in zone xfr lines,
-			# resolve to an IP address. Otherwise just return the hostname.
-			if not hostname.startswith("xfr:"):
-				if mode == "xfr":
-					response = dns.resolver.query(hostname+'.', "A")
-					hostname = str(response[0])
-				values.append(hostname)
-
-			# This is a zone-xfer-only IP address. Do not return if
-			# we're querying for NS record hostnames. Only return if
-			# we're querying for zone xfer IP addresses - return the
-			# IP address.
-			elif mode == "xfr":
-				values.append(hostname[4:])
-
-	return values
-
-def set_secondary_dns(hostnames, env):
-	if len(hostnames) > 0:
-		# Validate that all hostnames are valid and that all zone-xfer IP addresses are valid.
-		resolver = dns.resolver.get_default_resolver()
-		for item in hostnames:
-			if not item.startswith("xfr:"):
-				# Resolve hostname.
-				try:
-					response = dns.resolver.query(item, "A")
-				except (dns.resolver.NoNameservers, dns.resolver.NXDOMAIN, dns.resolver.NoAnswer):
-					raise ValueError("Could not resolve the IP address of %s." % item)
-			else:
-				# Validate IP address.
-				try:
-					v = ipaddress.ip_address(item[4:]) # raises a ValueError if there's a problem
-					if not isinstance(v, ipaddress.IPv4Address): raise ValueError("That's an IPv6 address.")
-				except ValueError:
-					raise ValueError("'%s' is not an IPv4 address." % item[4:])
-
-		# Set.
-		set_custom_dns_record("_secondary_nameserver", "A", " ".join(hostnames), "set", env)
-	else:
-		# Clear.
-		set_custom_dns_record("_secondary_nameserver", "A", None, "set", env)
-
-	# Apply.
-	return do_dns_update(env)
-
-
-def get_custom_dns_record(custom_dns, qname, rtype):
-	for qname1, rtype1, value in custom_dns:
-		if qname1 == qname and rtype1 == rtype:
-			return value
-	return None
 
 ########################################################################
 
@@ -900,48 +578,26 @@ def justtestingdotemail(domain, records):
 
 ########################################################################
 
-def build_recommended_dns(env):
+if __name__ == "__main__":
-	ret = []
+	from utils import load_environment
+	env = load_environment()
 	domains = get_dns_domains(env)
 	zonefiles = get_dns_zones(env)
-	additional_records = list(get_custom_dns_config(env))
-	from web_update import get_default_www_redirects
-	www_redirect_domains = get_default_www_redirects(env)
 	for domain, zonefile in zonefiles:
-		records = build_zone(domain, domains, additional_records, www_redirect_domains, env)
+		records = build_zone(domain, domains, {}, env)
 
 		# remove records that we don't dislay
 		records = [r for r in records if r[3] is not False]
 
-		# put Required at the top, then Recommended, then everythiing else
+		# put Required at the top
 		records.sort(key = lambda r : 0 if r[3].startswith("Required.") else (1 if r[3].startswith("Recommended.") else 2))
 
-		# expand qnames
+		# print
-		for i in range(len(records)):
+		for qname, rtype, value, explanation in records:
-			if records[i][0] == None:
+			print("; " + explanation)
+			if qname == None:
 				qname = domain
 			else:
-				qname = records[i][0] + "." + domain
+				qname = qname + "." + domain
-
+			print(qname, rtype, value)
-			records[i] = {
+			print()
-				"qname": qname,
-				"rtype": records[i][1],
-				"value": records[i][2],
-				"explanation": records[i][3],
-			}
-
-		# return
-		ret.append((domain, records))
-	return ret
-
-if __name__ == "__main__":
-	from utils import load_environment
-	env = load_environment()
-	if sys.argv[-1] == "--lint":
-		write_custom_dns_config(get_custom_dns_config(env), env)
-	else:
-		for zone, records in build_recommended_dns(env):
-			for record in records:
-				print("; " + record['explanation'])
-				print(record['qname'], record['rtype'], record['value'], sep="\t")
-				print()

management/mail_log.py

@@ -1,136 +0,0 @@
-#!/usr/bin/python3
-
-from collections import defaultdict
-import re, os.path
-import dateutil.parser
-
-import mailconfig
-import utils
-
-def scan_mail_log(logger, env):
-	collector = {
-		"other-services": set(),
-		"imap-logins": { },
-		"postgrey": { },
-		"rejected-mail": { },
-		"activity-by-hour": { "imap-logins": defaultdict(int), "smtp-sends": defaultdict(int) },
-	}
-
-	collector["real_mail_addresses"] = set(mailconfig.get_mail_users(env)) | set(alias[0] for alias in mailconfig.get_mail_aliases(env))
-
-	for fn in ('/var/log/mail.log.1', '/var/log/mail.log'):
-		if not os.path.exists(fn): continue
-		with open(fn, 'rb') as log:
-			for line in log:
-				line = line.decode("utf8", errors='replace')
-				scan_mail_log_line(line.strip(), collector)
-
-	if collector["imap-logins"]:
-		logger.add_heading("Recent IMAP Logins")
-		logger.print_block("The most recent login from each remote IP adddress is show.")
-		for k in utils.sort_email_addresses(collector["imap-logins"], env):
-			for ip, date in sorted(collector["imap-logins"][k].items(), key = lambda kv : kv[1]):
-				logger.print_line(k + "\t" + str(date) + "\t" + ip)
-
-	if collector["postgrey"]:
-		logger.add_heading("Greylisted Mail")
-		logger.print_block("The following mail was greylisted, meaning the emails were temporarily rejected. Legitimate senders will try again within ten minutes.")
-		logger.print_line("recipient" + "\t" + "received" + "\t" + "sender" + "\t" + "delivered")
-		for recipient in utils.sort_email_addresses(collector["postgrey"], env):
-			for (client_address, sender), (first_date, delivered_date) in sorted(collector["postgrey"][recipient].items(), key = lambda kv : kv[1][0]):
-				logger.print_line(recipient + "\t" + str(first_date) + "\t" + sender + "\t" + (("delivered " + str(delivered_date)) if delivered_date else "no retry yet"))
-
-	if collector["rejected-mail"]:
-		logger.add_heading("Rejected Mail")
-		logger.print_block("The following incoming mail was rejected.")
-		for k in utils.sort_email_addresses(collector["rejected-mail"], env):
-			for date, sender, message in collector["rejected-mail"][k]:
-				logger.print_line(k + "\t" + str(date) + "\t" + sender + "\t" + message)
-
-	logger.add_heading("Activity by Hour")
-	for h in range(24):
-		logger.print_line("%d\t%d\t%d" % (h, collector["activity-by-hour"]["imap-logins"][h], collector["activity-by-hour"]["smtp-sends"][h] ))
-
-	if len(collector["other-services"]) > 0:
-		logger.add_heading("Other")
-		logger.print_block("Unrecognized services in the log: " + ", ".join(collector["other-services"]))
-
-def scan_mail_log_line(line, collector):
-	m = re.match(r"(\S+ \d+ \d+:\d+:\d+) (\S+) (\S+?)(\[\d+\])?: (.*)", line)
-	if not m: return
-
-	date, system, service, pid, log = m.groups()
-	date = dateutil.parser.parse(date)
-	
-	if service == "dovecot":
-		scan_dovecot_line(date, log, collector)
-
-	elif service == "postgrey":
-		scan_postgrey_line(date, log, collector)
-
-	elif service == "postfix/smtpd":
-		scan_postfix_smtpd_line(date, log, collector)
-
-	elif service == "postfix/submission/smtpd":
-		scan_postfix_submission_line(date, log, collector)
-
-	elif service in ("postfix/qmgr", "postfix/pickup", "postfix/cleanup",
-			"postfix/scache", "spampd", "postfix/anvil", "postfix/master",
-			"opendkim", "postfix/lmtp", "postfix/tlsmgr"):
-		# nothing to look at
-		pass
-
-	else:
-		collector["other-services"].add(service)
-
-def scan_dovecot_line(date, log, collector):
-	m = re.match("imap-login: Login: user=<(.*?)>, method=PLAIN, rip=(.*?),", log)
-	if m:
-		login, ip = m.group(1), m.group(2)
-		if ip != "127.0.0.1": # local login from webmail/zpush
-			collector["imap-logins"].setdefault(login, {})[ip] = date
-		collector["activity-by-hour"]["imap-logins"][date.hour] += 1
-
-def scan_postgrey_line(date, log, collector):
-	m = re.match("action=(greylist|pass), reason=(.*?), (?:delay=\d+, )?client_name=(.*), client_address=(.*), sender=(.*), recipient=(.*)", log)
-	if m:
-		action, reason, client_name, client_address, sender, recipient = m.groups()
-		key = (client_address, sender)
-		if action == "greylist" and reason == "new":
-			collector["postgrey"].setdefault(recipient, {})[key] = (date, None)
-		elif action == "pass" and reason == "triplet found" and key in collector["postgrey"].get(recipient, {}):
-			collector["postgrey"][recipient][key] = (collector["postgrey"][recipient][key][0], date)
-
-def scan_postfix_smtpd_line(date, log, collector):
-	m = re.match("NOQUEUE: reject: RCPT from .*?: (.*?); from=<(.*?)> to=<(.*?)>", log)
-	if m:
-		message, sender, recipient = m.groups()
-		if recipient in collector["real_mail_addresses"]:
-			# only log mail to real recipients
-
-			# skip this, is reported in the greylisting report
-			if "Recipient address rejected: Greylisted" in message:
-				return
-
-			# simplify this one
-			m = re.search(r"Client host \[(.*?)\] blocked using zen.spamhaus.org; (.*)", message)
-			if m:
-				message = "ip blocked: " + m.group(2)
-
-			# simplify this one too
-			m = re.search(r"Sender address \[.*@(.*)\] blocked using dbl.spamhaus.org; (.*)", message)
-			if m:
-				message = "domain blocked: " + m.group(2)
-
-			collector["rejected-mail"].setdefault(recipient, []).append( (date, sender, message) )
-
-def scan_postfix_submission_line(date, log, collector):
-	m = re.match("([A-Z0-9]+): client=(\S+), sasl_method=PLAIN, sasl_username=(\S+)", log)
-	if m:
-		procid, client, user = m.groups()
-		collector["activity-by-hour"]["smtp-sends"][date.hour] += 1
-
-if __name__ == "__main__":
-	from status_checks import ConsoleOutput
-	env = utils.load_environment()
-	scan_mail_log(ConsoleOutput(), env)

management/mailconfig.py

@@ -2,85 +2,42 @@
 
 import subprocess, shutil, os, sqlite3, re
 import utils
-from email_validator import validate_email as validate_email_, EmailNotValidError
-import idna
 
 def validate_email(email, mode=None):
-	# Checks that an email address is syntactically valid. Returns True/False.
+	# There are a lot of characters permitted in email addresses, but
-	# Until Postfix supports SMTPUTF8, an email address may contain ASCII
+	# Dovecot's sqlite driver seems to get confused if there are any
-	# characters only; IDNs must be IDNA-encoded.
+	# unusual characters in the address. Bah. Also note that since
-	#
+	# the mailbox path name is based on the email address, the address
-	# When mode=="user", we're checking that this can be a user account name.
+	# shouldn't be absurdly long and must not have a forward slash.
-	# Dovecot has tighter restrictions - letters, numbers, underscore, and
-	# dash only!
-	#
-	# When mode=="alias", we're allowing anything that can be in a Postfix
-	# alias table, i.e. omitting the local part ("@domain.tld") is OK.
 
-	# Check the syntax of the address.
+	if len(email) > 255: return False
-	try:
-		validate_email_(email,
-			allow_smtputf8=False,
-			check_deliverability=False,
-			allow_empty_local=(mode=="alias")
-			)
-	except EmailNotValidError:
-		return False
 
 	if mode == 'user':
-		# There are a lot of characters permitted in email addresses, but
+		# For Dovecot's benefit, only allow basic characters.
-		# Dovecot's sqlite auth driver seems to get confused if there are any
+		ATEXT = r'[\w\-]'
-		# unusual characters in the address. Bah. Also note that since
+	elif mode == 'alias':
-		# the mailbox path name is based on the email address, the address
+		# For aliases, we can allow any valid email address.
-		# shouldn't be absurdly long and must not have a forward slash.
+		# Based on RFC 2822 and https://github.com/SyrusAkbary/validate_email/blob/master/validate_email.py,
-		# Our database is case sensitive (oops), which affects mail delivery
+		# these characters are permitted in email addresses.
-		# (Postfix always queries in lowercase?), so also only permit lowercase
+		ATEXT = r'[\w!#$%&\'\*\+\-/=\?\^`\{\|\}~]' # see 3.2.4
-		# letters.
+	else:
-		if len(email) > 255: return False
+		raise ValueError(mode)
-		if re.search(r'[^\@\.a-z0-9_\-]+', email):
-			return False
 
-	# Everything looks good.
+	# per RFC 2822 3.2.4
-	return True
+	DOT_ATOM_TEXT_LOCAL = ATEXT + r'+(?:\.' + ATEXT + r'+)*'
+	if mode == 'alias':
+		# For aliases, Postfix accepts '@domain.tld' format for
+		# catch-all addresses. Make the local part optional.
+		DOT_ATOM_TEXT_LOCAL = '(?:' + DOT_ATOM_TEXT_LOCAL + ')?'
 
-def sanitize_idn_email_address(email):
+	# as above, but we can require that the host part have at least
-	# The user may enter Unicode in an email address. Convert the domain part
+	# one period in it, so use a "+" rather than a "*" at the end
-	# to IDNA before going into our database. Leave the local part alone ---
+	DOT_ATOM_TEXT_HOST = ATEXT + r'+(?:\.' + ATEXT + r'+)+'
-	# although validate_email will reject non-ASCII characters.
-	#
-	# The domain name system only exists in ASCII, so it doesn't make sense
-	# to store domain names in Unicode. We want to store what is meaningful
-	# to the underlying protocols.
-	try:
-		localpart, domainpart = email.split("@")
-		domainpart = idna.encode(domainpart).decode('ascii')
-		return localpart + "@" + domainpart
-	except (ValueError, idna.IDNAError):
-		# ValueError: String does not have a single @-sign, so it is not
-		# a valid email address. IDNAError: Domain part is not IDNA-valid.
-		# Validation is not this function's job, so return value unchanged.
-		# If there are non-ASCII characters it will be filtered out by
-		# validate_email.
-		return email
 
-def prettify_idn_email_address(email):
+	# per RFC 2822 3.4.1
-	# This is the opposite of sanitize_idn_email_address. We store domain
+	ADDR_SPEC = '^%s@%s$' % (DOT_ATOM_TEXT_LOCAL, DOT_ATOM_TEXT_HOST)
-	# names in IDNA in the database, but we want to show Unicode to the user.
-	try:
-		localpart, domainpart = email.split("@")
-		domainpart = idna.decode(domainpart.encode("ascii"))
-		return localpart + "@" + domainpart
-	except (ValueError, UnicodeError, idna.IDNAError):
-		# Failed to decode IDNA, or the email address does not have a
-		# single @-sign. Should never happen.
-		return email
 
-def is_dcv_address(email):
+	return re.match(ADDR_SPEC, email)
-	email = email.lower()
-	for localpart in ("admin", "administrator", "postmaster", "hostmaster", "webmaster"):
-		if email.startswith(localpart+"@") or email.startswith(localpart+"+"):
-			return True
-	return False
 
 def open_database(env, with_connection=False):
 	conn = sqlite3.connect(env["STORAGE_ROOT"] + "/mail/users.sqlite")
@@ -90,228 +47,62 @@ def open_database(env, with_connection=False):
 		return conn, conn.cursor()
 
 def get_mail_users(env):
-	# Returns a flat, sorted list of all user accounts.
 	c = open_database(env)
 	c.execute('SELECT email FROM users')
-	users = [ row[0] for row in c.fetchall() ]
+	return [row[0] for row in c.fetchall()]
-	return utils.sort_email_addresses(users, env)
-
-def get_mail_users_ex(env, with_archived=False, with_slow_info=False):
-	# Returns a complex data structure of all user accounts, optionally
-	# including archived (status="inactive") accounts.
-	#
-	# [
-	#   {
-	#     domain: "domain.tld",
-	#     users: [
-	#       {
-	#         email: "name@domain.tld",
-	#         privileges: [ "priv1", "priv2", ... ],
-	#         status: "active" | "inactive",
-	#       },
-	#       ...
-	#     ]
-	#   },
-	#   ...
-	# ]
-
-	# Get users and their privileges.
-	users = []
-	active_accounts = set()
-	c = open_database(env)
-	c.execute('SELECT email, privileges FROM users')
-	for email, privileges in c.fetchall():
-		active_accounts.add(email)
-
-		user = {
-			"email": email,
-			"privileges": parse_privs(privileges),
-			"status": "active",
-		}
-		users.append(user)
-
-		if with_slow_info:
-			user["mailbox_size"] = utils.du(os.path.join(env['STORAGE_ROOT'], 'mail/mailboxes', *reversed(email.split("@"))))
-
-	# Add in archived accounts.
-	if with_archived:
-		root = os.path.join(env['STORAGE_ROOT'], 'mail/mailboxes')
-		for domain in os.listdir(root):
-			for user in os.listdir(os.path.join(root, domain)):
-				email = user + "@" + domain
-				mbox = os.path.join(root, domain, user)
-				if email in active_accounts: continue
-				user = {
-					"email": email,
-					"privileges": "",
-					"status": "inactive",
-					"mailbox": mbox,
-				}
-				users.append(user)
-				if with_slow_info:
-					user["mailbox_size"] = utils.du(mbox)
-
-	# Group by domain.
-	domains = { }
-	for user in users:
-		domain = get_domain(user["email"])
-		if domain not in domains:
-			domains[domain] = {
-				"domain": domain,
-				"users": []
-				}
-		domains[domain]["users"].append(user)
-
-	# Sort domains.
-	domains = [domains[domain] for domain in utils.sort_domains(domains.keys(), env)]
-
-	# Sort users within each domain first by status then lexicographically by email address.
-	for domain in domains:
-		domain["users"].sort(key = lambda user : (user["status"] != "active", user["email"]))
-
-	return domains
-
-def get_admins(env):
-	# Returns a set of users with admin privileges.
-	users = set()
-	for domain in get_mail_users_ex(env):
-		for user in domain["users"]:
-			if "admin" in user["privileges"]:
-				users.add(user["email"])
-	return users
 
 def get_mail_aliases(env):
-	# Returns a sorted list of tuples of (address, forward-tos, permitted-senders).
 	c = open_database(env)
-	c.execute('SELECT source, destination, permitted_senders FROM aliases')
+	c.execute('SELECT source, destination FROM aliases')
-	aliases = { row[0]: row for row in c.fetchall() } # make dict
+	return [(row[0], row[1]) for row in c.fetchall()]
-
-	# put in a canonical order: sort by domain, then by email address lexicographically
-	aliases = [ aliases[address] for address in utils.sort_email_addresses(aliases.keys(), env) ]
-	return aliases
-
-def get_mail_aliases_ex(env):
-	# Returns a complex data structure of all mail aliases, similar
-	# to get_mail_users_ex.
-	#
-	# [
-	#   {
-	#     domain: "domain.tld",
-	#     alias: [
-	#       {
-	#         address: "name@domain.tld", # IDNA-encoded
-	#         address_display: "name@domain.tld", # full Unicode
-	#         forwards_to: ["user1@domain.com", "receiver-only1@domain.com", ...],
-	#         permitted_senders: ["user1@domain.com", "sender-only1@domain.com", ...] OR null,
-	#         required: True|False
-	#       },
-	#       ...
-	#     ]
-	#   },
-	#   ...
-	# ]
-
-	required_aliases = get_required_aliases(env)
-	domains = {}
-	for address, forwards_to, permitted_senders in get_mail_aliases(env):
-		# get alias info
-		domain = get_domain(address)
-		required = (address in required_aliases)
-
-		# add to list
-		if not domain in domains:
-			domains[domain] = {
-				"domain": domain,
-				"aliases": [],
-			}
-		domains[domain]["aliases"].append({
-			"address": address,
-			"address_display": prettify_idn_email_address(address),
-			"forwards_to": [prettify_idn_email_address(r.strip()) for r in forwards_to.split(",")],
-			"permitted_senders": [prettify_idn_email_address(s.strip()) for s in permitted_senders.split(",")] if permitted_senders is not None else None,
-			"required": required,
-		})
-
-	# Sort domains.
-	domains = [domains[domain] for domain in utils.sort_domains(domains.keys(), env)]
-
-	# Sort aliases within each domain first by required-ness then lexicographically by address.
-	for domain in domains:
-		domain["aliases"].sort(key = lambda alias : (alias["required"], alias["address"]))
-	return domains
-
-def get_domain(emailaddr, as_unicode=True):
-	# Gets the domain part of an email address. Turns IDNA
-	# back to Unicode for display.
-	ret = emailaddr.split('@', 1)[1]
-	if as_unicode:
-		try:
-			ret = idna.decode(ret.encode('ascii'))
-		except (ValueError, UnicodeError, idna.IDNAError):
-			# Looks like we have an invalid email address in
-			# the database. Now is not the time to complain.
-			pass
-	return ret
 
 def get_mail_domains(env, filter_aliases=lambda alias : True):
-	# Returns the domain names (IDNA-encoded) of all of the email addresses
+	def get_domain(emailaddr):
-	# configured on the system.
+		return emailaddr.split('@', 1)[1]
 	return set(
-		   [get_domain(login, as_unicode=False) for login in get_mail_users(env)]
+		   [get_domain(addr) for addr in get_mail_users(env)]
-		 + [get_domain(address, as_unicode=False) for address, *_ in get_mail_aliases(env) if filter_aliases(address) ]
+		 + [get_domain(source) for source, target in get_mail_aliases(env) if filter_aliases((source, target)) ]
 		 )
 
-def add_mail_user(email, pw, privs, env):
+def add_mail_user(email, pw, env):
-	# validate email
+	if not validate_email(email, mode='user'):
-	if email.strip() == "":
-		return ("No email address provided.", 400)
-	elif not validate_email(email):
 		return ("Invalid email address.", 400)
-	elif not validate_email(email, mode='user'):
-		return ("User account email addresses may only use the lowercase ASCII letters a-z, the digits 0-9, underscore (_), hyphen (-), and period (.).", 400)
-	elif is_dcv_address(email) and len(get_mail_users(env)) > 0:
-		# Make domain control validation hijacking a little harder to mess up by preventing the usual
-		# addresses used for DCV from being user accounts. Except let it be the first account because
-		# during box setup the user won't know the rules.
-		return ("You may not make a user account for that address because it is frequently used for domain control validation. Use an alias instead if necessary.", 400)
-
-	# validate password
-	validate_password(pw)
-
-	# validate privileges
-	if privs is None or privs.strip() == "":
-		privs = []
-	else:
-		privs = privs.split("\n")
-		for p in privs:
-			validation = validate_privilege(p)
-			if validation: return validation
 
 	# get the database
 	conn, c = open_database(env, with_connection=True)
 
 	# hash the password
-	pw = hash_password(pw)
+	pw = utils.shell('check_output', ["/usr/bin/doveadm", "pw", "-s", "SHA512-CRYPT", "-p", pw]).strip()
 
 	# add the user to the database
 	try:
-		c.execute("INSERT INTO users (email, password, privileges) VALUES (?, ?, ?)",
+		c.execute("INSERT INTO users (email, password) VALUES (?, ?)", (email, pw))
-			(email, pw, "\n".join(privs)))
 	except sqlite3.IntegrityError:
 		return ("User already exists.", 400)
 
 	# write databasebefore next step
 	conn.commit()
 
+	# Create the user's INBOX and Spam folders and subscribe them.
+
+	# Check if the mailboxes exist before creating them. When creating a user that had previously
+	# been deleted, the mailboxes will still exist because they are still on disk.
+	try:
+		existing_mboxes = utils.shell('check_output', ["doveadm", "mailbox", "list", "-u", email, "-8"], capture_stderr=True).split("\n")
+	except subprocess.CalledProcessError as e:
+		c.execute("DELETE FROM users WHERE email=?", (email,))
+		conn.commit()
+		return ("Failed to initialize the user: " + e.output.decode("utf8"), 400)
+
+	if "INBOX" not in existing_mboxes: utils.shell('check_call', ["doveadm", "mailbox", "create", "-u", email, "-s", "INBOX"])
+	if "Spam" not in existing_mboxes: utils.shell('check_call', ["doveadm", "mailbox", "create", "-u", email, "-s", "Spam"])
+
 	# Update things in case any new domains are added.
 	return kick(env, "mail user added")
 
 def set_mail_password(email, pw, env):
-	# validate that password is acceptable
-	validate_password(pw)
-
 	# hash the password
-	pw = hash_password(pw)
+	pw = utils.shell('check_output', ["/usr/bin/doveadm", "pw", "-s", "SHA512-CRYPT", "-p", pw]).strip()
 
 	# update the database
 	conn, c = open_database(env, with_connection=True)
@@ -321,26 +112,7 @@ def set_mail_password(email, pw, env):
 	conn.commit()
 	return "OK"
 
-def hash_password(pw):
-	# Turn the plain password into a Dovecot-format hashed password, meaning
-	# something like "{SCHEME}hashedpassworddata".
-	# http://wiki2.dovecot.org/Authentication/PasswordSchemes
-	return utils.shell('check_output', ["/usr/bin/doveadm", "pw", "-s", "SHA512-CRYPT", "-p", pw]).strip()
-
-def get_mail_password(email, env):
-	# Gets the hashed password for a user. Passwords are stored in Dovecot's
-	# password format, with a prefixed scheme.
-	# http://wiki2.dovecot.org/Authentication/PasswordSchemes
-	# update the database
-	c = open_database(env)
-	c.execute('SELECT password FROM users WHERE email=?', (email,))
-	rows = c.fetchall()
-	if len(rows) != 1:
-		raise ValueError("That's not a user (%s)." % email)
-	return rows[0][0]
-
 def remove_mail_user(email, env):
-	# remove
 	conn, c = open_database(env, with_connection=True)
 	c.execute("DELETE FROM users WHERE email=?", (email,))
 	if c.rowcount != 1:
@@ -350,178 +122,68 @@ def remove_mail_user(email, env):
 	# Update things in case any domains are removed.
 	return kick(env, "mail user removed")
 
-def parse_privs(value):
+def add_mail_alias(source, destination, env, do_kick=True):
-	return [p for p in value.split("\n") if p.strip() != ""]
+	if not validate_email(source, mode='alias'):
-
+		return ("Invalid email address.", 400)
-def get_mail_user_privileges(email, env, empty_on_error=False):
-	# get privs
-	c = open_database(env)
-	c.execute('SELECT privileges FROM users WHERE email=?', (email,))
-	rows = c.fetchall()
-	if len(rows) != 1:
-		if empty_on_error: return []
-		return ("That's not a user (%s)." % email, 400)
-	return parse_privs(rows[0][0])
-
-def validate_privilege(priv):
-	if "\n" in priv or priv.strip() == "":
-		return ("That's not a valid privilege (%s)." % priv, 400)
-	return None
-
-def add_remove_mail_user_privilege(email, priv, action, env):
-	# validate
-	validation = validate_privilege(priv)
-	if validation: return validation
-
-	# get existing privs, but may fail
-	privs = get_mail_user_privileges(email, env)
-	if isinstance(privs, tuple): return privs # error
-
-	# update privs set
-	if action == "add":
-		if priv not in privs:
-			privs.append(priv)
-	elif action == "remove":
-		privs = [p for p in privs if p != priv]
-	else:
-		return ("Invalid action.", 400)
-
-	# commit to database
-	conn, c = open_database(env, with_connection=True)
-	c.execute("UPDATE users SET privileges=? WHERE email=?", ("\n".join(privs), email))
-	if c.rowcount != 1:
-		return ("Something went wrong.", 400)
-	conn.commit()
-
-	return "OK"
-
-def add_mail_alias(address, forwards_to, permitted_senders, env, update_if_exists=False, do_kick=True):
-	# convert Unicode domain to IDNA
-	address = sanitize_idn_email_address(address)
-
-	# Our database is case sensitive (oops), which affects mail delivery
-	# (Postfix always queries in lowercase?), so force lowercase.
-	address = address.lower()
-
-	# validate address
-	address = address.strip()
-	if address == "":
-		return ("No email address provided.", 400)
-	if not validate_email(address, mode='alias'):
-		return ("Invalid email address (%s)." % address, 400)
-
-	# validate forwards_to
-	validated_forwards_to = []
-	forwards_to = forwards_to.strip()
-
-	# extra checks for email addresses used in domain control validation
-	is_dcv_source = is_dcv_address(address)
-
-	# Postfix allows a single @domain.tld as the destination, which means
-	# the local part on the address is preserved in the rewrite. We must
-	# try to convert Unicode to IDNA first before validating that it's a
-	# legitimate alias address. Don't allow this sort of rewriting for
-	# DCV source addresses.
-	r1 = sanitize_idn_email_address(forwards_to)
-	if validate_email(r1, mode='alias') and not is_dcv_source:
-		validated_forwards_to.append(r1)
-
-	else:
-		# Parse comma and \n-separated destination emails & validate. In this
-		# case, the forwards_to must be complete email addresses.
-		for line in forwards_to.split("\n"):
-			for email in line.split(","):
-				email = email.strip()
-				if email == "": continue
-				email = sanitize_idn_email_address(email) # Unicode => IDNA
-				if not validate_email(email):
-					return ("Invalid receiver email address (%s)." % email, 400)
-				if is_dcv_source and not is_dcv_address(email) and "admin" not in get_mail_user_privileges(email, env, empty_on_error=True):
-					# Make domain control validation hijacking a little harder to mess up by
-					# requiring aliases for email addresses typically used in DCV to forward
-					# only to accounts that are administrators on this system.
-					return ("This alias can only have administrators of this system as destinations because the address is frequently used for domain control validation.", 400)
-				validated_forwards_to.append(email)
-
-	# validate permitted_senders
-	valid_logins = get_mail_users(env)
-	validated_permitted_senders = []
-	permitted_senders = permitted_senders.strip()
-
-	# Parse comma and \n-separated sender logins & validate. The permitted_senders must be
-	# valid usernames.
-	for line in permitted_senders.split("\n"):
-		for login in line.split(","):
-			login = login.strip()
-			if login == "": continue
-			if login not in valid_logins:
-				return ("Invalid permitted sender: %s is not a user on this system." % login, 400)
-			validated_permitted_senders.append(login)
-
-	# Make sure the alias has either a forwards_to or a permitted_sender.
-	if len(validated_forwards_to) + len(validated_permitted_senders) == 0:
-		return ("The alias must either forward to an address or have a permitted sender.", 400)
-
-	# save to db
-
-	forwards_to = ",".join(validated_forwards_to)
-
-	if len(validated_permitted_senders) == 0:
-		permitted_senders = None
-	else:
-		permitted_senders = ",".join(validated_permitted_senders)
 
 	conn, c = open_database(env, with_connection=True)
 	try:
-		c.execute("INSERT INTO aliases (source, destination, permitted_senders) VALUES (?, ?, ?)", (address, forwards_to, permitted_senders))
+		c.execute("INSERT INTO aliases (source, destination) VALUES (?, ?)", (source, destination))
-		return_status = "alias added"
 	except sqlite3.IntegrityError:
-		if not update_if_exists:
+		return ("Alias already exists (%s)." % source, 400)
-			return ("Alias already exists (%s)." % address, 400)
-		else:
-			c.execute("UPDATE aliases SET destination = ?, permitted_senders = ? WHERE source = ?", (forwards_to, permitted_senders, address))
-			return_status = "alias updated"
-
 	conn.commit()
 
 	if do_kick:
 		# Update things in case any new domains are added.
-		return kick(env, return_status)
+		return kick(env, "alias added")
 
-def remove_mail_alias(address, env, do_kick=True):
+def remove_mail_alias(source, env, do_kick=True):
-	# convert Unicode domain to IDNA
-	address = sanitize_idn_email_address(address)
-
-	# remove
 	conn, c = open_database(env, with_connection=True)
-	c.execute("DELETE FROM aliases WHERE source=?", (address,))
+	c.execute("DELETE FROM aliases WHERE source=?", (source,))
 	if c.rowcount != 1:
-		return ("That's not an alias (%s)." % address, 400)
+		return ("That's not an alias (%s)." % source, 400)
 	conn.commit()
 
 	if do_kick:
 		# Update things in case any domains are removed.
 		return kick(env, "alias removed")
 
-def get_system_administrator(env):
+def kick(env, mail_result=None):
-	return "administrator@" + env['PRIMARY_HOSTNAME']
+	results = []
 
-def get_required_aliases(env):
+	# Inclde the current operation's result in output.
-	# These are the aliases that must exist.
-	aliases = set()
 
-	# The system administrator alias is required.
+	if mail_result is not None:
-	aliases.add(get_system_administrator(env))
+		results.append(mail_result + "\n")
 
-	# The hostmaster alias is exposed in the DNS SOA for each zone.
+	# Create hostmaster@ for the primary domain if it does not already exist.
-	aliases.add("hostmaster@" + env['PRIMARY_HOSTNAME'])
+	# Default the target to administrator@ which the user is responsible for
+	# setting and keeping up to date.
+
+	existing_aliases = get_mail_aliases(env)
+
+	administrator = "administrator@" + env['PRIMARY_HOSTNAME']
+
+	def ensure_admin_alias_exists(source):
+		# Does this alias exists?
+		for s, t in existing_aliases:
+			if s == source:
+				return
+
+		# Doesn't exist.
+		add_mail_alias(source, administrator, env, do_kick=False)
+		results.append("added alias %s (=> %s)\n" % (source, administrator))
+
+	ensure_admin_alias_exists("hostmaster@" + env['PRIMARY_HOSTNAME'])
 
 	# Get a list of domains we serve mail for, except ones for which the only
-	# email on that domain are the required aliases or a catch-all/domain-forwarder.
+	# email on that domain is a postmaster/admin alias to the administrator.
+
 	real_mail_domains = get_mail_domains(env,
-		filter_aliases = lambda alias :
+		filter_aliases = lambda alias : \
-			not alias.startswith("postmaster@") and not alias.startswith("admin@")
+			(not alias[0].startswith("postmaster@") \
-			and not alias.startswith("@")
+			 and not alias[0].startswith("admin@")) \
+			or alias[1] != administrator \
 			)
 
 	# Create postmaster@ and admin@ for all domains we serve mail on.
@@ -529,54 +191,17 @@ def get_required_aliases(env):
 	# isn't anything, but it might save the user some trouble e.g. when
 	# buying an SSL certificate.
 	for domain in real_mail_domains:
-		aliases.add("postmaster@" + domain)
+		ensure_admin_alias_exists("postmaster@" + domain)
-		aliases.add("admin@" + domain)
+		ensure_admin_alias_exists("admin@" + domain)
 
-	return aliases
+	# Remove auto-generated hostmaster/postmaster/admin on domains we no
-
-def kick(env, mail_result=None):
-	results = []
-
-	# Include the current operation's result in output.
-
-	if mail_result is not None:
-		results.append(mail_result + "\n")
-
-	# Ensure every required alias exists.
-
-	existing_users = get_mail_users(env)
-	existing_alias_records = get_mail_aliases(env)
-	existing_aliases = set(a for a, *_ in existing_alias_records) # just first entry in tuple
-	required_aliases = get_required_aliases(env)
-
-	def ensure_admin_alias_exists(address):
-		# If a user account exists with that address, we're good.
-		if address in existing_users:
-			return
-
-		# If the alias already exists, we're good.
-		if address in existing_aliases:
-			return
-
-		# Doesn't exist.
-		administrator = get_system_administrator(env)
-		if address == administrator: return # don't make an alias from the administrator to itself --- this alias must be created manually
-		add_mail_alias(address, administrator, "", env, do_kick=False)
-		if administrator not in existing_aliases: return # don't report the alias in output if the administrator alias isn't in yet -- this is a hack to supress confusing output on initial setup
-		results.append("added alias %s (=> %s)\n" % (address, administrator))
-
-	for address in required_aliases:
-		ensure_admin_alias_exists(address)
-
-	# Remove auto-generated postmaster/admin on domains we no
 	# longer have any other email addresses for.
-	for address, forwards_to, *_ in existing_alias_records:
+	for source, target in existing_aliases:
-		user, domain = address.split("@")
+		user, domain = source.split("@")
-		if user in ("postmaster", "admin") \
+		if user in ("postmaster", "admin") and domain not in real_mail_domains \
-			and address not in required_aliases \
+			and target == administrator:
-			and forwards_to == get_system_administrator(env):
+			remove_mail_alias(source, env, do_kick=False)
-			remove_mail_alias(address, env, do_kick=False)
+			results.append("removed alias %s (was to %s; domain no longer used for email)\n" % (source, target))
-			results.append("removed alias %s (was to %s; domain no longer used for email)\n" % (address, forwards_to))
 
 	# Update DNS and nginx in case any domains are added/removed.
 
@@ -588,16 +213,6 @@ def kick(env, mail_result=None):
 
 	return "".join(s for s in results if s != "")
 
-def validate_password(pw):
-	# validate password
-	if pw.strip() == "":
-		raise ValueError("No password provided.")
-	if re.search(r"[\s]", pw):
-		raise ValueError("Passwords cannot contain spaces.")
-	if len(pw) < 4:
-		raise ValueError("Passwords must be at least four characters.")
-
-
 if __name__ == "__main__":
 	import sys
 	if len(sys.argv) > 2 and sys.argv[1] == "validate-email":

management/templates/aliases.html

@@ -1,266 +0,0 @@
-<style>
-#alias_table .actions > * { padding-right: 3px; }
-#alias_table .alias-required .remove { display: none }
-</style>
-
-<h2>Aliases</h2>
-
-<h3>Add a mail alias</h3>
-
-<p>Aliases are email forwarders. An alias can forward email to a <a href="#" onclick="return show_panel('users')">mail user</a> or to any email address.</p>
-
-<p>To use an alias or any address besides your own login username in outbound mail, the sending user must be included as a permitted sender for the alias.</p>
-
-<form id="addalias-form" class="form-horizontal" role="form" onsubmit="do_add_alias(); return false;">
-  <div class="form-group">
-    <div class="col-sm-offset-1 col-sm-11">
-      <div id="alias_type_buttons" class="btn-group btn-group-xs">
-        <button type="button" class="btn btn-default" data-mode="regular">Regular</button>
-        <button type="button" class="btn btn-default" data-mode="catchall">Catch-All</button>
-        <button type="button" class="btn btn-default" data-mode="domainalias">Domain Alias</button>
-      </div>
-      <div id="alias_mode_info" class="text-info small" style="display: none; margin: .5em 0 0 0;">
-        <span class="catchall hidden">A catch-all alias captures all otherwise unmatched email to a domain.</span>
-        <span class="domainalias hidden">A domain alias forwards all otherwise unmatched email from one domain to another domain, preserving the part before the @-sign.</span>
-      </div>
-    </div>
-  </div>
-  <div class="form-group">
-    <label for="addaliasAddress" class="col-sm-1 control-label">Alias</label>
-    <div class="col-sm-10">
-      <input type="email" class="form-control" id="addaliasAddress">
-      <div style="margin-top: 3px; padding-left: 3px; font-size: 90%" class="text-muted">
-        <span class="catchall domainalias">Enter just the part of an email address starting with the @-sign.</span>
-        You may use international (non-ASCII) characters for the domain part of the email address only.
-      </div>
-    </div>
-  </div>
-  <div class="form-group">
-    <label for="addaliasForwardsTo" class="col-sm-1 control-label">Forwards To</label>
-    <div class="col-sm-10">
-      <textarea class="form-control" rows="3" id="addaliasForwardsTo"></textarea>
-      <div style="margin-top: 3px; padding-left: 3px; font-size: 90%" class="text-muted">
-        <span class="domainalias">Enter just the part of an email address starting with the @-sign.</span>
-      </div>
-    </div>
-  </div>
-  <div class="form-group">
-    <label for="addaliasSenders" class="col-sm-1 control-label">Permitted Senders</label>
-    <div class="col-sm-10">
-      <div class="radio">
-        <label>
-          <input id="addaliasForwardsToNotAdvanced" name="addaliasForwardsToDivToggle" type="radio" checked onclick="$('#addaliasForwardsToDiv').toggle(false)">
-          Any mail user listed in the Fowards To box can send mail claiming to be from <span class="regularalias">the alias address</span><span class="catchall domainalias">any address on the alias domain</span>.
-        </label>
-      </div>
-      <div class="radio">
-        <label>
-          <input id="addaliasForwardsToAdvanced" name="addaliasForwardsToDivToggle" type="radio" id="addaliasForwardsToDivShower" onclick="$('#addaliasForwardsToDiv').toggle(true)">
-          I&rsquo;ll enter the mail users that can send mail claiming to be from <span class="regularalias">the alias address</span><span class="catchall domainalias">any address on the alias domain</span>.
-        </label>
-      </div>
-      <div id="addaliasForwardsToDiv" style="margin-top: .5em; margin-left: 1.4em; display: none;">
-        <textarea class="form-control" rows="3" id="addaliasSenders" placeholder="one user per line or separated by commas"></textarea>
-      </div>
-    </div>
-  </div>
-  <div class="form-group">
-    <div class="col-sm-offset-1 col-sm-11">
-      <button id="add-alias-button" type="submit" class="btn btn-primary">Add Alias</button>
-      <button id="alias-cancel" class="btn btn-default hidden" onclick="aliases_reset_form(); return false;">Cancel</button>
-    </div>
-  </div>
-</form>
-
-<h3>Existing mail aliases</h3>
-<table id="alias_table" class="table" style="width: auto">
-  <thead>
-    <tr>
-      <th></th>
-      <th>Alias<br></th>
-      <th>Forwards To</th>
-      <th>Permitted Senders</th>
-    </tr>
-  </thead>
-  <tbody>
-  </tbody>
-</table>
-
-<p style="margin-top: 1.5em"><small>hostmaster@, postmaster@, and admin@ email addresses are required on some domains.</small></p>
-
-<div style="display: none">
-  <table>
-  <tr id="alias-template">
-    <td class='actions'>
-        <a href="#" onclick="aliases_edit(this); scroll_top(); return false;" class='edit' title="Edit Alias">
-          <span class="glyphicon glyphicon-pencil"></span>
-        </a>
-        <a href="#" onclick="aliases_remove(this); return false;" class='remove' title="Remove Alias">
-          <span class="glyphicon glyphicon-trash"></span>
-        </a>
-    </td>
-    <td class='address'> </td>
-    <td class='forwardsTo'> </td>
-    <td class='senders'> </td>
-  </tr>
-  </table>
-</div>
-
-
-<script>
-function show_aliases() {
-  $('#alias_table tbody').html("<tr><td colspan='2' class='text-muted'>Loading...</td></tr>")
-  api(
-    "/mail/aliases",
-    "GET",
-    { format: 'json' },
-    function(r) {
-      $('#alias_table tbody').html("");
-      for (var i = 0; i < r.length; i++) {
-        var hdr = $("<tr><td colspan='3'><h4/></td></tr>");
-        hdr.find('h4').text(r[i].domain);
-        $('#alias_table tbody').append(hdr);
-
-        for (var k = 0; k < r[i].aliases.length; k++) {
-          var alias = r[i].aliases[k];
-
-          var n = $("#alias-template").clone();
-          n.attr('id', '');
-
-          if (alias.required) n.addClass('alias-required');
-          n.attr('data-address', alias.address_display); // this is decoded from IDNA, but will get re-coded to IDNA on the backend
-          n.find('td.address').text(alias.address_display)
-          for (var j = 0; j < alias.forwards_to.length; j++)
-            n.find('td.forwardsTo').append($("<div></div>").text(alias.forwards_to[j]))
-          for (var j = 0; j < (alias.permitted_senders ? alias.permitted_senders.length : 0); j++)
-            n.find('td.senders').append($("<div></div>").text(alias.permitted_senders[j]))
-          $('#alias_table tbody').append(n);
-        }
-      }
-    })
-
-  $(function() {
-    $('#alias_type_buttons button').off('click').click(function() {
-      $('#alias_type_buttons button').removeClass('active');
-      $(this).addClass('active');
-      $('#addalias-form .regularalias, #addalias-form .catchall, #addalias-form .domainalias').addClass('hidden');
-      if ($(this).attr('data-mode') == "regular") {
-        $('#addaliasAddress').attr('type', 'email');
-        $('#addaliasAddress').attr('placeholder', 'you@yourdomain.com (incoming email address)');
-        $('#addaliasForwardsTo').attr('placeholder', 'one address per line or separated by commas');
-        $('#alias_mode_info').slideUp();
-        $('#addalias-form .regularalias').removeClass('hidden');
-      } else if ($(this).attr('data-mode') == "catchall") {
-        $('#addaliasAddress').attr('type', 'text');
-        $('#addaliasAddress').attr('placeholder', '@yourdomain.com (incoming catch-all domain)');
-        $('#addaliasForwardsTo').attr('placeholder', 'one address per line or separated by commas');
-        $('#alias_mode_info').slideDown();
-        $('#addalias-form .catchall').removeClass('hidden');
-      } else if ($(this).attr('data-mode') == "domainalias") {
-        $('#addaliasAddress').attr('type', 'text');
-        $('#addaliasAddress').attr('placeholder', '@yourdomain.com (incoming catch-all domain)');
-        $('#addaliasForwardsTo').attr('placeholder', '@otherdomain.com (forward to other domain)');
-        $('#alias_mode_info').slideDown();
-        $('#addalias-form .domainalias').removeClass('hidden');
-      }
-    })
-    $('#alias_type_buttons button[data-mode="regular"]').click(); // init
-  })
-}
-
-var is_alias_add_update = false;
-function do_add_alias() {
-  var title = (!is_alias_add_update) ? "Add Alias" : "Update Alias";
-  var form_address = $("#addaliasAddress").val();
-  var form_forwardsto = $("#addaliasForwardsTo").val();
-  var form_senders = ($('#addaliasForwardsToAdvanced').prop('checked') ? $("#addaliasSenders").val() : '');
-  if ($('#addaliasForwardsToAdvanced').prop('checked') && !/\S/.exec($("#addaliasSenders").val())) {
-    show_modal_error(title, "You did not enter any permitted senders.");
-    return false;
-  }
-  api(
-    "/mail/aliases/add",
-    "POST",
-    {
-      update_if_exists: is_alias_add_update ? '1' : '0',
-      address: form_address,
-      forwards_to: form_forwardsto,
-      permitted_senders: form_senders
-    },
-    function(r) {
-      // Responses are multiple lines of pre-formatted text.
-      show_modal_error(title, $("<pre/>").text(r));
-      show_aliases()
-      aliases_reset_form();
-    },
-    function(r) {
-      show_modal_error(title, r);
-    });
-  return false;
-}
-
-function aliases_reset_form() {
-  $("#addaliasAddress").prop('disabled', false);
-  $("#addaliasAddress").val('')
-  $("#addaliasForwardsTo").val('')
-  $("#addaliasSenders").val('')
-  $('#alias-cancel').addClass('hidden');
-  $('#add-alias-button').text('Add Alias');
-  is_alias_add_update = false;
-}
-
-function aliases_edit(elem) {
-  var address = $(elem).parents('tr').attr('data-address');
-  var receiverdivs = $(elem).parents('tr').find('.forwardsTo div');
-  var senderdivs = $(elem).parents('tr').find('.senders div');
-  var forwardsTo = "";
-  for (var i = 0; i < receiverdivs.length; i++)
-    forwardsTo += $(receiverdivs[i]).text() + "\n";
-  var senders = "";
-  for (var i = 0; i < senderdivs.length; i++)
-    senders += $(senderdivs[i]).text() + "\n";
-  if (address.charAt(0) == '@' && forwardsTo.charAt(0) == '@')
-    $('#alias_type_buttons button[data-mode="domainalias"]').click();
-  else if (address.charAt(0) == '@')
-    $('#alias_type_buttons button[data-mode="catchall"]').click();
-  else
-    $('#alias_type_buttons button[data-mode="regular"]').click();
-  $('#alias-cancel').removeClass('hidden');
-  $("#addaliasAddress").prop('disabled', true);
-  $("#addaliasAddress").val(address);
-  $("#addaliasForwardsTo").val(forwardsTo);
-  $('#addaliasForwardsToAdvanced').prop('checked', senders != "");
-  $('#addaliasForwardsToNotAdvanced').prop('checked', senders == "");
-  $("#addaliasSenders").val(senders);
-  $('#add-alias-button').text('Update');
-  $('body').animate({ scrollTop: 0 })
-  is_alias_add_update = true;
-}
-
-function aliases_remove(elem) {
-  var row_address = $(elem).parents('tr').attr('data-address');
-  show_modal_confirm(
-    "Remove Alias",
-    "Remove " + row_address + "?",
-    "Remove",
-    function() {
-      api(
-        "/mail/aliases/remove",
-        "POST",
-        {
-          address: row_address
-        },
-        function(r) {
-          // Responses are multiple lines of pre-formatted text.
-          show_modal_error("Remove User", $("<pre/>").text(r));
-          show_aliases();
-        });
-    });
-}
-
-function scroll_top() {
-        $('html, body').animate({
-            scrollTop: $("#panel_aliases").offset().top
-        }, 1000);
-}
-</script>

management/templates/custom-dns.html

@@ -1,258 +0,0 @@
-<style>
-#custom-dns-current td.long {
-  word-break: break-all;
-}
-</style>
-
-<h2>Custom DNS</h2>
-
-<p class="text-warning">This is an advanced configuration page.</p>
-
-<p>It is possible to set custom DNS records on domains hosted here.</p>
-
-<h3>Set Custom DNS Records</h3>
-
-<p>You can set additional DNS records, such as if you have a website running on another server, to add DKIM records for external mail providers, or for various confirmation-of-ownership tests.</p>
-
-<form class="form-horizontal" role="form" onsubmit="do_set_custom_dns(); return false;">
-  <div class="form-group">
-    <label for="customdnsQname" class="col-sm-1 control-label">Name</label>
-    <div class="col-sm-10">
-      <table style="max-width: 400px">
-      <tr><td>
-        <input type="text" class="form-control" id="customdnsQname" placeholder="subdomain">
-      </td><td style="padding: 0 1em; font-weight: bold;">.</td><td>
-        <select id="customdnsZone" class="form-control"> </select>
-      </td></tr></table>
-      <div class="text-info" style="margin-top: .5em">Leave the left field blank to set a record on the chosen domain name, or enter a subdomain.</div>
-    </div>
-  </div>
-  <div class="form-group">
-    <label for="customdnsType" class="col-sm-1 control-label">Type</label>
-    <div class="col-sm-10">
-      <select id="customdnsType" class="form-control" style="max-width: 400px" onchange="show_customdns_rtype_hint()">
-        <option value="A" data-hint="Enter an IPv4 address (i.e. a dotted quad, such as 123.456.789.012).">A (IPv4 address)</option>
-        <option value="AAAA" data-hint="Enter an IPv6 address.">AAAA (IPv6 address)</option>
-        <option value="CNAME" data-hint="Enter another domain name followed by a period at the end (e.g. mypage.github.io.).">CNAME (DNS forwarding)</option>
-        <option value="TXT" data-hint="Enter arbitrary text.">TXT (text record)</option>
-        <option value="MX" data-hint="Enter record in the form of PRIORIY DOMAIN., including trailing period (e.g. 20 mx.example.com.).">MX (mail exchanger)</option>
-      </select>
-    </div>
-  </div>
-  <div class="form-group">
-    <label for="customdnsValue" class="col-sm-1 control-label">Value</label>
-    <div class="col-sm-10">
-      <input type="text" class="form-control" id="customdnsValue" placeholder="">
-      <div id="customdnsTypeHint" class="text-info" style="margin-top: .5em"></div>
-    </div>
-  </div>
-  <div class="form-group">
-    <div class="col-sm-offset-1 col-sm-11">
-      <button type="submit" class="btn btn-primary">Set Record</button>
-    </div>
-  </div>
-</form>
-
-<table id="custom-dns-current" class="table" style="width: auto; display: none">
-  <thead>
-    <th>Domain Name</th>
-    <th>Record Type</th>
-    <th>Value</th>
-    <th></th>
-  </thead>
-  <tbody>
-    <tr><td colspan="4">Loading...</td></tr>
-  </tbody>
-</table>
-
-<h3>Using a Secondary Nameserver</h3>
-
-<p>If your TLD requires you to have two separate nameservers, you can either set up <a href="#" onclick="return show_panel('external_dns')">external DNS</a> and ignore the DNS server on this box entirely, or use the DNS server on this box but add a secondary (aka &ldquo;slave&rdquo;) nameserver.</p>
-<p>If you choose to use a seconday nameserver, you must find a seconday nameserver service provider. Your domain name registrar or virtual cloud provider may provide this service for you. Once you set up the seconday nameserver service, enter the hostname (not the IP address) of <em>their</em> secondary nameserver in the box below.</p>
-
-<form class="form-horizontal" role="form" onsubmit="do_set_secondary_dns(); return false;">
-  <div class="form-group">
-    <label for="secondarydnsHostname" class="col-sm-1 control-label">Hostname</label>
-    <div class="col-sm-10">
-      <input type="text" class="form-control" id="secondarydnsHostname" placeholder="ns1.cloudprovider.com">
-    </div>
-  </div>
-  <div class="form-group">
-    <div class="col-sm-offset-1 col-sm-11">
-      <button type="submit" class="btn btn-primary">Update</button>
-    </div>
-  </div>
-  <div id="secondarydns-clear-instructions" class="form-group" style="display: none">
-    <div class="col-sm-offset-1 col-sm-11">
-      <p class="small">
-        Multiple secondary servers can be separated with commas or spaces (i.e., <code>ns2.hostingcompany.com ns3.hostingcompany.com</code>). 
-        To enable zone transfers to additional servers without listing them as secondary nameservers, add <code>xfr:IPADDRESS</code>.
-        Clear the input field above and click Update to use this machine itself as secondary DNS, which is the default/normal setup.
-      </p>
-    </div>
-  </div>
-</form>
-
-
-<h3>Custom DNS API</h3>
-
-<p>Use your box&rsquo;s DNS API to set custom DNS records on domains hosted here. For instance, you can create your own dynamic DNS service.</p>
-
-<p>Usage:</p>
-
-<pre>curl -X <b>VERB</b> [-d "<b>value</b>"] --user {email}:{password} https://{{hostname}}/admin/dns/custom[/<b>qname</b>[/<b>rtype</b>]]</pre>
-
-<p>(Brackets denote an optional argument.)</p>
-
-<h4>Verbs</h4>
-
-<table class="table">
-<thead><th>Verb</th> <th>Usage</th></thead>
-<tr><td>GET</td> <td>Returns matching custom DNS records as a JSON array of objects. Each object has the keys <code>qname</code>, <code>rtype</code>, and <code>value</code>. The optional <code>qname</code> and <code>rtype</code> parameters in the request URL filter the records returned in the response. The request body (<code>-d "..."</code>) must be omitted.</td></tr>
-<tr><td>PUT</td> <td>Sets a custom DNS record replacing any existing records with the same <code>qname</code> and <code>rtype</code>. Use PUT (instead of POST) when you only have one value for a <code>qname</code> and <code>rtype</code>, such as typical <code>A</code> records (without round-robin).</td></tr>
-<tr><td>POST</td> <td>Adds a new custom DNS record. Use POST when you have multiple <code>TXT</code> records or round-robin <code>A</code> records. (PUT would delete previously added records.)</td></tr>
-<tr><td>DELETE</td> <td>Deletes custom DNS records. If the request body (<code>-d "..."</code>) is empty or omitted, deletes all records matching the <code>qname</code> and <code>rtype</code>. If the request body is present, deletes only the record matching the <code>qname</code>, <code>rtype</code> and value.</td></tr>
-</table>
-
-<h4>Parameters</h4>
-
-<table class="table">
-<thead><th>Parameter</th> <th>Value</th></thead>
-<tr><td>email</td> <td>The email address of any administrative user here.</td></tr>
-<tr><td>password</td> <td>That user&rsquo;s password.</td></tr>
-<tr><td>qname</td> <td>The fully qualified domain name for the record you are trying to set. It must be one of the domain names or a subdomain of one of the domain names hosted on this box. (Add mail users or aliases to add new domains.)</td></tr>
-<tr><td>rtype</td> <td>The resource type. Defaults to <code>A</code> if omitted. Possible values: <code>A</code> (an IPv4 address), <code>AAAA</code> (an IPv6 address), <code>TXT</code> (a text string), <code>CNAME</code> (an alias, which is a fully qualified domain name &mdash; don&rsquo;t forget the final period), <code>MX</code>, or <code>SRV</code>.</td></tr>
-<tr><td>value</td> <td>For PUT, POST, and DELETE, the record&rsquo;s value. If the <code>rtype</code> is <code>A</code> or <code>AAAA</code> and <code>value</code> is empty or omitted, the IPv4 or IPv6 address of the remote host is used (be sure to use the <code>-4</code> or <code>-6</code> options to curl). This is handy for dynamic DNS!</td></tr>
-</table>
-
-<p>Strict <a href="http://tools.ietf.org/html/rfc4408">SPF</a> and <a href="https://datatracker.ietf.org/doc/draft-kucherawy-dmarc-base/?include_text=1">DMARC</a> records will be added to all custom domains unless you override them.</p>
-
-<h4>Examples:</h4>
-
-<p>Try these examples. For simplicity the examples omit the <code>--user me@mydomain.com:yourpassword</code> command line argument which you must fill in with your email address and password.</p>
-
-<pre># sets laptop.mydomain.com to point to the IP address of the machine you are executing curl on
-curl -X PUT https://{{hostname}}/admin/dns/custom/laptop.mydomain.com
-
-# deletes that record and all A records for that domain name
-curl -X DELETE https://{{hostname}}/admin/dns/custom/laptop.mydomain.com
-
-# sets a CNAME alias
-curl -X PUT -d "bar.mydomain.com." https://{{hostname}}/admin/dns/custom/foo.mydomain.com/cname
-
-# deletes that CNAME and all CNAME records for that domain name
-curl -X DELETE https://{{hostname}}/admin/dns/custom/foo.mydomain.com/cname
-
-# adds a TXT record using POST to preserve any previous TXT records
-curl -X POST -d "some text here" https://{{hostname}}/admin/dns/custom/foo.mydomain.com/txt
-
-# deletes that one TXT record while preserving other TXT records
-curl -X DELETE -d "some text here" https://{{hostname}}/admin/dns/custom/foo.mydomain.com/txt
-</pre>
-
-<script>
-function show_custom_dns() {
-  api(
-    "/dns/secondary-nameserver",
-    "GET",
-    { },
-    function(data) {
-      $('#secondarydnsHostname').val(data.hostnames.join(' '));
-      $('#secondarydns-clear-instructions').toggle(data.hostnames.length > 0);
-    });
-
-  api(
-    "/dns/zones",
-    "GET",
-    { },
-    function(data) {
-      $('#customdnsZone').text('');
-      for (var i = 0; i < data.length; i++) {
-        $('#customdnsZone').append($('<option/>').text(data[i]));
-      }
-    });
-
-  show_current_custom_dns();
-  show_customdns_rtype_hint();
-}
-
-function show_current_custom_dns() {
-  api(
-    "/dns/custom",
-    "GET",
-    { },
-    function(data) {
-      if (data.length > 0)
-        $('#custom-dns-current').fadeIn();
-      else
-        $('#custom-dns-current').fadeOut();
-
-      $('#custom-dns-current').find("tbody").text('');
-      for (var i = 0; i < data.length; i++) {
-        var tr = $("<tr/>");
-        $('#custom-dns-current').find("tbody").append(tr);
-        tr.attr('data-qname', data[i].qname);
-        tr.attr('data-rtype', data[i].rtype);
-        tr.attr('data-value', data[i].value);
-        tr.append($('<td class="long"/>').text(data[i].qname));
-        tr.append($('<td/>').text(data[i].rtype));
-        tr.append($('<td class="long"/>').text(data[i].value));
-        tr.append($('<td>[<a href="#" onclick="return delete_custom_dns_record(this)">delete</a>]</td>'));
-      }
-    });
-}
-
-function delete_custom_dns_record(elem) {
-  var qname = $(elem).parents('tr').attr('data-qname');
-  var rtype = $(elem).parents('tr').attr('data-rtype');
-  var value = $(elem).parents('tr').attr('data-value');
-  do_set_custom_dns(qname, rtype, value, "DELETE");
-  return false;
-}
-
-function do_set_secondary_dns() {
- api(
-    "/dns/secondary-nameserver",
-    "POST",
-    {
-      hostnames: $('#secondarydnsHostname').val()
-    },
-    function(data) {
-      if (data == "") return; // nothing updated
-      show_modal_error("Secondary DNS", $("<pre/>").text(data));
-      $('#secondarydns-clear-instructions').slideDown();
-    },
-    function(err) {
-      show_modal_error("Secondary DNS", $("<pre/>").text(err));
-    });
-}
-
-function do_set_custom_dns(qname, rtype, value, method) {
-  if (!qname) {
-    if ($('#customdnsQname').val() != '')
-      qname = $('#customdnsQname').val() + '.' + $('#customdnsZone').val();
-    else
-      qname = $('#customdnsZone').val();
-    rtype = $('#customdnsType').val();
-    value = $('#customdnsValue').val();
-    method = 'POST';
-  }
-
-  api(
-    "/dns/custom/" + qname + "/" + rtype,
-    method,
-    value,
-    function(data) {
-      if (data == "") return; // nothing updated
-      show_modal_error("Custom DNS", $("<pre/>").text(data));
-      show_current_custom_dns();
-    },
-    function(err) {
-      show_modal_error("Custom DNS (Error)", $("<pre/>").text(err));
-    });
-}
-
-function show_customdns_rtype_hint() {
-  $('#customdnsTypeHint').text($("#customdnsType").find('option:selected').attr('data-hint'));
-}
-</script>

management/templates/external-dns.html

@@ -1,87 +0,0 @@
-<style>
-#external_dns_settings .heading td {
-  font-weight: bold;
-  font-size: 120%;
-  padding-top: 1.5em;
-}
-#external_dns_settings .heading.first td {
-  border-top: none;
-  padding-top: 0;
-}
-#external_dns_settings .values td {
-  border: 0;
-	padding-top: .75em;
-	padding-bottom: 0;
-}
-#external_dns_settings .value {
-	word-break: break-all;
-}
-#external_dns_settings .explanation td {
-	border: 0;
-	padding-top: .5em;
-	padding-bottom: .75em;
-	font-style: italic;
-  font-size: 95%;
-	color: #777;
-}
-</style>
-
-<h2>External DNS</h2>
-
-<p class="text-warning">This is an advanced configuration page.</p>
-
-<p>Although your box is configured to serve its own DNS, it is possible to host your DNS elsewhere &mdash; such as in the DNS control panel provided by your domain name registrar or virtual cloud provider &mdash; by copying the DNS zone information shown in the table below into your external DNS server&rsquo;s control panel.</p>
-
-<p>If you do so, you are responsible for keeping your DNS entries up to date! If you previously enabled DNSSEC on your domain name by setting a DS record at your registrar, you will likely have to turn it off before changing nameservers.</p>
-
-
-<p class="alert" role="alert">
-	<span class="glyphicon glyphicon-info-sign"></span>
-	You may encounter zone file errors when attempting to create a TXT record with a long string.
-	<a href="http://tools.ietf.org/html/rfc4408#section-3.1.3">RFC 4408</a> states a TXT record is allowed to contain multiple strings, and this technique can be used to construct records that would exceed the 255-byte maximum length.
-	You may need to adopt this technique when adding DomainKeys. Use a tool like <code>named-checkzone</code> to validate your zone file.
-</p>
-
-
-<table id="external_dns_settings" class="table">
-	<thead>
-		<tr>
-			<th>QName</th>
-			<th>Type</th>
-			<th>Value</th>
-		</tr>
-	</thead>
-	<tbody>
-	</tbody>
-</table>
-
-<script>
-function show_external_dns() {
-  $('#external_dns_settings tbody').html("<tr><td colspan='2' class='text-muted'>Loading...</td></tr>")
-  api(
-    "/dns/dump",
-    "GET",
-    { },
-    function(zones) {
-      $('#external_dns_settings tbody').html("");
-      for (var j = 0; j < zones.length; j++) {
-        var h = $("<tr class='heading'><td colspan='3'></td></tr>");
-        h.find("td").text(zones[j][0]);
-        $('#external_dns_settings tbody').append(h);
-
-        var r = zones[j][1];
-        for (var i = 0; i < r.length; i++) {
-          var n = $("<tr class='values'><td class='qname'/><td class='rtype'/><td class='value'/></tr>");
-          n.find('.qname').text(r[i].qname);
-          n.find('.rtype').text(r[i].rtype);
-          n.find('.value').text(r[i].value);
-          $('#external_dns_settings tbody').append(n);
-
-          var n = $("<tr class='explanation'><td colspan='3'/></tr>");
-          n.find('td').text(r[i].explanation);
-          $('#external_dns_settings tbody').append(n);
-        }
-      }
-    })
-}
-</script>

management/templates/index.html

@@ -1,396 +1,11 @@
-<!DOCTYPE html>
+<!doctype html>
-<html lang="en">
+<html>
-    <head>
+	<head>
-        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+		<title>Mail-in-a-Box Management Server</title>
-        <meta charset="utf-8">
+	</head>
-        <meta name="viewport" content="width=device-width, initial-scale=1">
+	<body>
+		<h1>Mail-in-a-Box Management Server</h1>
 
-        <title>{{hostname}} - Mail-in-a-Box Control Panel</title>
+		<p>Use this server to issue commands to the Mail-in-a-Box management daemon.</p>
-
+	</body>
-        <meta name="robots" content="noindex, nofollow">
+</html>
-
-        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" integrity="sha256-MfvZlkHCEqatNoGiOXveE8FIwMzZg4W85qfrfIFBfYc=" crossorigin="anonymous">
-        <style>
-	    body {
-		overflow-y: scroll;
-                padding-bottom: 20px;
-            }
-
-            p {
-              margin-bottom: 1.25em;
-            }
-
-            h1, h2, h3, h4 {
-              font-family: sans-serif;
-              font-weight: bold;
-            }
-
-            h2 {
-              margin: 1em 0;
-            }
-
-            h3 {
-              font-size: 130%;
-              border-bottom: 1px solid black;
-              padding-bottom: 3px;
-              margin-bottom: 13px;
-              margin-top: 30px;
-            }
-              .panel-heading h3 {
-                border: none;
-                padding: 0;
-                margin: 0;
-              }
-
-            h4 {
-              font-size: 110%;
-              margin-bottom: 13px;
-              margin-top: 18px;
-            }
-              h4:first-child {
-                margin-top: 6px;
-              }
-
-            .admin_panel {
-              display: none;
-            }
-
-            table.table {
-              margin: 1.5em 0;
-            }
-
-	    ol li {
-	       margin-bottom: 1em;
-	    }
-        </style>
-        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap-theme.min.css" integrity="sha256-bHQiqcFbnJb1Qhh61RY9cMh6kR0gTuQY6iFOBj1yj00=" crossorigin="anonymous">
-    </head>
-    <body>
-
-    <!--[if lt IE 8]><p>Internet Explorer version 8 or any modern web browser is required to use this website, sorry.<![endif]-->
-    <!--[if gt IE 7]><!-->
-
-    <div class="navbar navbar-inverse" role="navigation">
-      <div class="container">
-        <div class="navbar-header">
-          <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
-            <span class="sr-only">Toggle navigation</span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </button>
-          <a class="navbar-brand" href="#">{{hostname}}</a>
-        </div>
-        <div class="navbar-collapse collapse">
-          <ul class="nav navbar-nav">
-            <li class="dropdown">
-              <a href="#" class="dropdown-toggle" data-toggle="dropdown">System <b class="caret"></b></a>
-              <ul class="dropdown-menu">
-                <li><a href="#system_status" onclick="return show_panel(this);">Status Checks</a></li>
-                <li><a href="#ssl" onclick="return show_panel(this);">SSL Certificates</a></li>
-                <li><a href="#system_backup" onclick="return show_panel(this);">Backup Status</a></li>
-                <li class="divider"></li>
-                <li class="dropdown-header">Advanced Pages</li>
-                <li><a href="#custom_dns" onclick="return show_panel(this);">Custom DNS</a></li>
-                <li><a href="#external_dns" onclick="return show_panel(this);">External DNS</a></li>
-                <li><a href="/admin/munin">Munin Monitoring</a></li>
-              </ul>
-            </li>
-            <li class="dropdown">
-              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Mail <b class="caret"></b></a>
-              <ul class="dropdown-menu">
-                <li><a href="#mail-guide" onclick="return show_panel(this);">Instructions</a></li>
-                <li><a href="#users" onclick="return show_panel(this);">Users</a></li>
-                <li><a href="#aliases" onclick="return show_panel(this);">Aliases</a></li>
-              </ul>
-            </li>
-            <li><a href="#sync_guide" onclick="return show_panel(this);">Contacts/Calendar</a></li>
-            <li><a href="#web" onclick="return show_panel(this);">Web</a></li>
-          </ul>
-          <ul class="nav navbar-nav navbar-right">
-            <li><a href="#" onclick="do_logout(); return false;" style="color: white">Log out?</a></li>
-          </ul>
-        </div><!--/.navbar-collapse -->
-      </div>
-    </div>
-
-    <div class="container">
-      <div id="panel_system_status" class="admin_panel">
-      {% include "system-status.html" %}
-      </div>
-
-      <div id="panel_system_backup" class="admin_panel">
-      {% include "system-backup.html" %}
-      </div>
-
-      <div id="panel_external_dns" class="admin_panel">
-      {% include "external-dns.html" %}
-      </div>
-
-      <div id="panel_custom_dns" class="admin_panel">
-      {% include "custom-dns.html" %}
-      </div>
-
-      <div id="panel_login" class="admin_panel">
-      {% include "login.html" %}
-      </div>
-
-      <div id="panel_mail-guide" class="admin_panel">
-      {% include "mail-guide.html" %}
-      </div>
-
-      <div id="panel_users" class="admin_panel">
-      {% include "users.html" %}
-      </div>
-
-      <div id="panel_aliases" class="admin_panel">
-      {% include "aliases.html" %}
-      </div>
-
-      <div id="panel_sync_guide" class="admin_panel">
-      {% include "sync-guide.html" %}
-      </div>
-
-      <div id="panel_web" class="admin_panel">
-      {% include "web.html" %}
-      </div>
-
-      <div id="panel_ssl" class="admin_panel">
-      {% include "ssl.html" %}
-      </div>
-
-      <hr>
-
-      <footer>
-        <p>This is a <a href="https://mailinabox.email">Mail-in-a-Box</a>.</p>
-      </footer>
-    </div> <!-- /container -->
-
-        <div id="ajax_loading_indicator" style="display: none; position: fixed; left: 0; top: 0; width: 100%; height: 100%; z-index: 100000; text-align: center; background-color: rgba(255,255,255,.75)">
-          <div style="margin: 20% auto">
-            <div><span class="fa fa-spinner fa-pulse"></span></div>
-            <div>Loading...</div>
-          </div>
-        </div>
-
-        <div id="global_modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="errorModalTitle" aria-hidden="true">
-          <div class="modal-dialog modal-sm">
-            <div class="modal-content">
-              <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-                <h4 class="modal-title" id="errorModalTitle"> </h4>
-              </div>
-              <div class="modal-body">
-                <p> </p>
-              </div>
-              <div class="modal-footer">
-                <button type="button" class="btn btn-default" data-dismiss="modal">OK</button>
-                <button type="button" class="btn btn-danger" data-dismiss="modal">Yes</button>
-              </div>
-            </div>
-          </div>
-        </div>
-
-        <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js" integrity="sha256-rsPUGdUPBXgalvIj4YKJrrUlmLXbOb6Cp7cdxn1qeUc=" crossorigin="anonymous"></script>
-        <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js" integrity="sha256-Sk3nkD6mLTMOF0EOpNtsIry+s1CsaqQC1rVLTAy+0yc=" crossorigin="anonymous"></script>
-
-        <script>
-var global_modal_state = null;
-var global_modal_funcs = null;
-
-$(function() {
-  $('#global_modal').on('shown.bs.modal', function (e) {
-    // set focus to first input in the global modal's body
-    var input = $('#global_modal .modal-body input');
-    if (input.length > 0) $(input[0]).focus();
-  })
-  $('#global_modal .btn-danger').click(function() {
-    // Don't take action now. Wait for the modal to be totally hidden
-    // so that we don't attempt to show another modal while this one
-    // is closing.
-    global_modal_state = 0; // OK
-  })
-  $('#global_modal .btn-default').click(function() {
-    global_modal_state = 1; // Cancel
-  })
-  $('#global_modal').on('hidden.bs.modal', function (e) {
-    // do the cancel function
-    if (global_modal_state == null) global_modal_state = 1; // cancel if the user hit ESC or clicked outside of the modal
-    if (global_modal_funcs && global_modal_funcs[global_modal_state])
-      global_modal_funcs[global_modal_state]();
-  })  
-})
-
-function show_modal_error(title, message, callback) {
-  $('#global_modal h4').text(title);
-  $('#global_modal .modal-body').html("<p/>");
-  if (typeof question == 'string') {
-    $('#global_modal p').text(message);
-    $('#global_modal .modal-dialog').addClass("modal-sm");
-  } else {
-    $('#global_modal p').html("").append(message);
-    $('#global_modal .modal-dialog').removeClass("modal-sm");
-  }
-  $('#global_modal .btn-default').show().text("OK");
-  $('#global_modal .btn-danger').hide();
-  global_modal_funcs = [callback, callback];
-  global_modal_state = null;
-  $('#global_modal').modal({});
-  return false; // handy when called from onclick
-}
-
-function show_modal_confirm(title, question, verb, yes_callback, cancel_callback) {
-  $('#global_modal h4').text(title);
-  if (typeof question == 'string') {
-    $('#global_modal .modal-dialog').addClass("modal-sm");
-    $('#global_modal .modal-body').html("<p/>");
-    $('#global_modal p').text(question);
-  } else {
-    $('#global_modal .modal-dialog').removeClass("modal-sm");
-    $('#global_modal .modal-body').html("").append(question);
-  }
-  if (typeof verb == 'string') {
-    $('#global_modal .btn-default').show().text("Cancel");
-    $('#global_modal .btn-danger').show().text(verb);
-  } else {
-    $('#global_modal .btn-default').show().text(verb[1]);
-    $('#global_modal .btn-danger').show().text(verb[0]);
-  }
-  global_modal_funcs = [yes_callback, cancel_callback];
-  global_modal_state = null;
-  $('#global_modal').modal({});
-  return false; // handy when called from onclick
-}
-
-var ajax_num_executing_requests = 0;
-function ajax_with_indicator(options) {
-  setTimeout("if (ajax_num_executing_requests > 0) $('#ajax_loading_indicator').fadeIn()", 100);
-  function hide_loading_indicator() {
-    ajax_num_executing_requests--;
-    if (ajax_num_executing_requests == 0)
-      $('#ajax_loading_indicator').stop(true).hide(); // stop() prevents an ongoing fade from causing the thing to be shown again after this call
-  }
-  var old_success = options.success;
-  var old_error = options.error;
-  options.success = function(data) {
-    hide_loading_indicator();
-    if (data.status == "error")
-      show_modal_error("Error", data.message);
-    else if (old_success)
-      old_success(data);
-  };
-  options.error = function(jqxhr) {
-    hide_loading_indicator();
-    if (!old_error) 
-      show_modal_error("Error", "Something went wrong, sorry.")
-    else
-      old_error(jqxhr.responseText, jqxhr);
-  };
-  ajax_num_executing_requests++;
-  $.ajax(options);
-  return false; // handy when called from onclick
-}
-
-var api_credentials = ["", ""];
-function api(url, method, data, callback, callback_error) {
-  // from http://www.webtoolkit.info/javascript-base64.html
-  function base64encode(input) {
-    _keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
-    var output = "";
-    var chr1, chr2, chr3, enc1, enc2, enc3, enc4;
-    var i = 0;
-    while (i < input.length) {
-        chr1 = input.charCodeAt(i++);
-        chr2 = input.charCodeAt(i++);
-        chr3 = input.charCodeAt(i++);
-        enc1 = chr1 >> 2;
-        enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
-        enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
-        enc4 = chr3 & 63;
-        if (isNaN(chr2)) {
-            enc3 = enc4 = 64;
-        } else if (isNaN(chr3)) {
-            enc4 = 64;
-        }
-        output = output +
-        _keyStr.charAt(enc1) + _keyStr.charAt(enc2) +
-        _keyStr.charAt(enc3) + _keyStr.charAt(enc4);
-    }
-
-    return output;
-  }
-
-  function default_error(text, xhr) {
-    if (xhr.status != 403) // else handled below
-      show_modal_error("Error", "Something went wrong, sorry.")
-  }
-
-  ajax_with_indicator({
-    url: "/admin" + url,
-    method: method,
-    cache: false,
-    data: data,
-
-    // the custom DNS api sends raw POST/PUT bodies --- prevent URL-encoding
-    processData: typeof data != "string",
-    mimeType: typeof data == "string" ? "text/plain; charset=ascii" : null,
-
-    beforeSend: function(xhr) {
-      // We don't store user credentials in a cookie to avoid the hassle of CSRF
-      // attacks. The Authorization header only gets set in our AJAX calls triggered
-      // by user actions.
-      xhr.setRequestHeader(
-        'Authorization',
-        'Basic ' + base64encode(api_credentials[0] + ':' + api_credentials[1]));
-    },
-    success: callback,
-    error: callback_error || default_error,
-    statusCode: {
-      403: function(xhr) {
-        // Credentials are no longer valid. Try to login again.
-        var p = current_panel;
-        show_panel('login');
-        switch_back_to_panel = p;
-      }
-    }
-  })
-}
-
-var current_panel = null;
-var switch_back_to_panel = null;
-function show_panel(panelid) {
-  if (panelid.getAttribute)
-    // we might be passed an HTMLElement <a>.
-    panelid = panelid.getAttribute('href').substring(1);
-
-  $('.admin_panel').hide();
-  $('#panel_' + panelid).show();
-  if (typeof localStorage != 'undefined')
-    localStorage.setItem("miab-cp-lastpanel", panelid);
-  if (window["show_" + panelid])
-    window["show_" + panelid]();
-
-  current_panel = panelid;
-  switch_back_to_panel = null;
-
-  return false; // when called from onclick, cancel navigation
-}
-
-$(function() {
-  // Recall saved user credentials.
-  if (typeof sessionStorage != 'undefined' && sessionStorage.getItem("miab-cp-credentials"))
-    api_credentials = sessionStorage.getItem("miab-cp-credentials").split(":");
-  else if (typeof localStorage != 'undefined' && localStorage.getItem("miab-cp-credentials"))
-    api_credentials = localStorage.getItem("miab-cp-credentials").split(":");
-
-  // Recall what the user was last looking at.
-  if (typeof localStorage != 'undefined' && localStorage.getItem("miab-cp-lastpanel")) {
-    show_panel(localStorage.getItem("miab-cp-lastpanel"));
-  } else {
-    show_panel('login');
-  }
-})
-
-        </script>
-    </body>
-</html>

management/templates/login.html

@@ -1,143 +0,0 @@
-<h1 style="margin: 1em; text-align: center">{{hostname}}</h1>
-
-{% if no_users_exist or no_admins_exist %}
-<div class="row">
-<div class="col-md-offset-2 col-md-8">
-  {% if no_users_exist %}
-  <p class="text-danger">There are no users on this system! To make an administrative user,
-  log into this machine using SSH (like when you first set it up) and run:</p>
-  <pre>cd mailinabox
-sudo tools/mail.py user add me@{{hostname}}
-sudo tools/mail.py user make-admin me@{{hostname}}</pre>
-  {% else %}
-  <p class="text-danger">There are no administrative users on this system! To make an administrative user,
-  log into this machine using SSH (like when you first set it up) and run:</p>
-  <pre>cd mailinabox
-sudo tools/mail.py user make-admin me@{{hostname}}</pre>
-  {% endif %}
-  <hr>
-</div>
-</div>  
-{% endif %}
-
-<p style="margin: 2em; text-align: center;">Log in here for your Mail-in-a-Box control panel.</p>
-
-<div style="margin: 0 auto; max-width: 32em;">
-  <form class="form-horizontal" role="form" onsubmit="do_login(); return false;">
-    <div class="form-group">
-      <label for="inputEmail3" class="col-sm-3 control-label">Email</label>
-      <div class="col-sm-9">
-        <input name="email" type="email" class="form-control" id="loginEmail" placeholder="Email">
-      </div>
-    </div>
-    <div class="form-group">
-      <label for="inputPassword3" class="col-sm-3 control-label">Password</label>
-      <div class="col-sm-9">
-        <input name="password" type="password" class="form-control" id="loginPassword" placeholder="Password">
-      </div>
-    </div>
-    <div class="form-group">
-      <div class="col-sm-offset-3 col-sm-9">
-        <div class="checkbox">
-          <label>
-            <input name='remember' type="checkbox" id="loginRemember"> Remember me
-          </label>
-        </div>
-      </div>
-    </div>
-    <div class="form-group">
-      <div class="col-sm-offset-3 col-sm-9">
-        <button type="submit" class="btn btn-default">Sign in</button>
-      </div>
-    </div>
-  </form>
-</div>
-
-
-<script>
-function do_login() {
-  if ($('#loginEmail').val() == "") {
-    show_modal_error("Login Failed", "Enter your email address.", function() {
-	$('#loginEmail').focus();
-    });
-    return false;
-  }
-  if ($('#loginPassword').val() == "") {
-    show_modal_error("Login Failed", "Enter your email password.", function() {
-        $('#loginPassword').focus();
-    });
-    return false;
-  }
-
-  // Exchange the email address & password for an API key.
-  api_credentials = [$('#loginEmail').val(), $('#loginPassword').val()]
-
-  api(
-  "/me",
-  "GET",
-  { },
-  function(response){ 
-    // This API call always succeeds. It returns a JSON object indicating
-    // whether the request was authenticated or not.
-    if (response.status != "ok") {
-      // Show why the login failed.
-      show_modal_error("Login Failed", response.reason)
-
-      // Reset any saved credentials.
-      do_logout();
-
-    } else if (!("api_key" in response)) {
-      // Login succeeded but user might not be authorized!
-      show_modal_error("Login Failed", "You are not an administrator on this system.")
-
-      // Reset any saved credentials.
-      do_logout();
-
-    } else {
-      // Login succeeded.
-
-      // Save the new credentials.
-      api_credentials = [response.email, response.api_key];
-
-      // Try to wipe the username/password information.
-      $('#loginEmail').val('');
-      $('#loginPassword').val('');
-
-      // Remember the credentials.
-      if (typeof localStorage != 'undefined' && typeof sessionStorage != 'undefined') {
-        if ($('#loginRemember').val()) {
-          localStorage.setItem("miab-cp-credentials", api_credentials.join(":"));
-          sessionStorage.removeItem("miab-cp-credentials");
-        } else {
-          localStorage.removeItem("miab-cp-credentials");
-          sessionStorage.setItem("miab-cp-credentials", api_credentials.join(":"));
-        }
-      }
-
-      // Open the next panel the user wants to go to. Do this after the XHR response
-      // is over so that we don't start a new XHR request while this one is finishing,
-      // which confuses the loading indicator.
-      setTimeout(function() { show_panel(!switch_back_to_panel ? 'system_status' : switch_back_to_panel) }, 300);
-    }
-  })
-}
-
-function do_logout() {
-  api_credentials = ["", ""];
-  if (typeof localStorage != 'undefined')
-    localStorage.removeItem("miab-cp-credentials");
-  if (typeof sessionStorage != 'undefined')
-    sessionStorage.removeItem("miab-cp-credentials");
-  show_panel('login');
-}
-
-function show_login() {
-  $('#loginEmail,#loginPassword').each(function() {
-    var input = $(this);
-    if (!$.trim(input.val())) {
-      input.focus();
-      return false;
-    }
-  });
-}
-</script>

management/templates/mail-guide.html

@@ -1,71 +0,0 @@
-<style>#panel_mail-guide table.table { width: auto; margin-left: .5em; }</style>
-
-<div>
-	<h2 style="margin-bottom: 0">Checking and Sending Mail</h2>
-
-	<div class="row">
-		<div class="col-sm-7">
-			<h3>Webmail</h3>
-
-			<p>Webmail lets you check your email from any web browser. Your webmail site is:</p>
-			<p style="margin-left: 2em"><strong><a href="https://{{hostname}}/mail">https://{{hostname}}/mail</a></strong></p>
-			<p>Your username is your whole email address.</p>
-
-
-			<h3>Mobile/desktop apps</h3>
-
-				<h4>Automatic configuration</h4>
-
-					<p>iOS and OS X only: Open <a style="font-weight: bold" href="https://{{hostname}}/mailinabox.mobileconfig">this configuration link</a> on your iOS device or on your Mac desktop to easily set up mail (IMAP/SMTP), Contacts, and Calendar. Your username is your whole email address.</p>
-	
-				<h4>Manual configuration</h4>
-
-					<p>Use the following settings when you set up your email on your phone, desktop, or other device:</p>
-
-					<table class="table">
-					<thead>
-						<tr><th>Option</th> <th>Value</th></tr>
-					</thead>
-					<tr><th>Protocol/Method</th> <td>IMAP</td></tr>
-					<tr><th>Mail server</th> <td>{{hostname}}</td>
-					<tr><th>IMAP Port</th> <td>993</td></tr>
-					<tr><th>IMAP Security</th> <td>SSL</td></tr>
-					<tr><th>SMTP Port</th> <td>587</td></tr>
-					<tr><th>SMTP Security</td> <td>STARTTLS <small>(&ldquo;always&rdquo; or &ldquo;required&rdquo;, if prompted)</small></td></tr>
-					<tr><th>Username:</th> <td>Your whole email address.</td></tr>
-					<tr><th>Password:</th> <td>Your mail password.</td></tr>
-					</table>
-
-					<p>In addition to setting up your email, you&rsquo;ll also need to set up <a href="#sync_guide" onclick="return show_panel(this);">contacts and calendar synchronization</a> separately.</p>
-
-				<h4>Exchange/ActiveSync settings</h4>
-
-					<p>On iOS devices, devices on this <a href="http://z-push.org/compatibility/">compatibility list</a>, or using Outlook 2007 or later on Windows 7 and later, you may set up your mail as an Exchange or ActiveSync server. However, we&rsquo;ve found this to be more buggy than using IMAP as described above. If you encounter any problems, please use the manual settings above.</p>
-
-					<table class="table">
-					<tr><th>Server</th> <td>{{hostname}}</td></tr>
-					<tr><th>Options</th> <td>Secure Connection</td></tr>
-					</table>
-
-					<p>Your device should also provide a contacts list and calendar that syncs to this box when you use this method.</p>
-		</div>
-
-		<div class="col-sm-5">
-		<div class="panel panel-default">
-		<div class="panel-heading">
-			<h3>Other information about mail on your box</h3>
-		</div>
-		<div class="panel-body">
-			<h4>Greylisting</h4>
-			<p>Your box using a technique called greylisting to cut down on spam. Greylisting works by delaying mail from people you haven&rsquo;t received mail from before for up to about 10 minutes. The vast majority of spam gets tricked by this. If you are waiting for an email from someone new, such as if you are registering on a new website and are waiting for an email confirmation, please give it up to 10-15 minutes to arrive.</p>
-
-			<h4>+tag addresses</h4>
-			<p>Every incoming email address also receives mail for <code>+tag</code> addresses. If your email address is <code>you@yourdomain.com</code>, you&rsquo;ll also automatically get mail sent to <code>you+anythinghere@yourdomain.com</code>. Use this as a fast way to segment incoming mail for your own filtering rules without having to create aliases in this control panel.</p>
-
-			<h4>Use only this box to send as you</h4>
-			<p>Your box sets strict email sending policies for your domain names to make it harder for spam and other fraudulent mail to claim to be you. Only this machine is authorized to send email on behalf of your domain names. If you use any other service to send email as you, it will likely get spam filtered by recipients.</p>
-		</div>
-		</div>
-		</div>
-	</div>
-</div>

management/templates/ssl.html

@@ -1,121 +0,0 @@
-<style>
-</style>
-
-<h2>SSL Certificates</h2>
-
-<h3>Certificate Status</h3>
-
-
-<table id="ssl_domains" class="table" style="margin-bottom: 2em; width: auto;">
-  <thead>
-    <tr>
-      <th>Domain</th>
-      <th>Certificate Status</th>
-      <th>Actions</th>
-    </tr>
-  </thead>
-  <tbody>
-  </tbody>
-</table>
-
-<p>A multi-domain or wildcard certificate will be automatically applied to any domains it is valid for.</p>
-
-<h3 id="ssl_install_header">Install SSL Certificate</h3>
-
-<p>There are many places where you can get a free or cheap SSL certificate. We recommend <a href="https://www.namecheap.com/security/ssl-certificates/domain-validation.aspx">Namecheap&rsquo;s $9 certificate</a>, <a href="https://www.startssl.com/">StartSSL&rsquo;s free express lane</a> or <a href="https://buy.wosign.com/free/">Wosign&rsquo;s free SSL</a></a>.</p>
-
-<p>Which domain are you getting an SSL certificate for?</p>
-
-<p><select id="ssldomain" onchange="show_csr()" class="form-control" style="width: auto"></select></p>
-
-<div id="csr_info" style="display: none">
-  <p>You will need to provide the SSL certificate provider this Certificate Signing Request (CSR):</p>
-
-  <pre id="ssl_csr"></pre>
-
-  <p><small>The CSR is safe to share. It can only be used in combination with a secret key stored on this machine.</small></p>
-
-  <p>The SSL certificate provider will then provide you with an SSL certificate. They may also provide you with an intermediate chain. Paste each separately into the boxes below:</p>
-
-  <p style="margin-bottom: .5em">SSL certificate:</p>
-  <p><textarea id="ssl_paste_cert" class="form-control" style="max-width: 40em; height: 8em" placeholder="-----BEGIN CERTIFICATE-----&#xA;stuff here&#xA;-----END CERTIFICATE-----"></textarea></p>
-
-  <p style="margin-bottom: .5em">SSL intermediate chain (if provided):</p>
-  <p><textarea id="ssl_paste_chain" class="form-control" style="max-width: 40em; height: 8em" placeholder="-----BEGIN CERTIFICATE-----&#xA;stuff here&#xA;-----END CERTIFICATE-----&#xA;-----BEGIN CERTIFICATE-----&#xA;more stuff here&#xA;-----END CERTIFICATE-----"></textarea></p>
-
-  <p>After you paste in the information, click the install button.</p>
-
-  <button class="btn-primary" onclick="install_cert()">Install</button>
-</div>
-
-<script>
-function show_ssl() {
- api(
-    "/web/domains",
-    "GET",
-    {
-    },
-    function(domains) {
-      var tb = $('#ssl_domains tbody');
-      tb.text('');
-      $('#ssldomain').html('<option value="">(select)</option>');
-
-      for (var i = 0; i < domains.length; i++) {
-        var row = $("<tr><th class='domain'><a href=''></a></th><td class='status'></td> <td class='actions'><a href='#' onclick='return ssl_install(this);' class='btn btn-xs'>Install Certificate</a></td></tr>");
-        tb.append(row);
-        row.attr('data-domain', domains[i].domain);
-        row.find('.domain a').text(domains[i].domain);
-        row.find('.domain a').attr('href', 'https://' + domains[i].domain);
-        row.addClass("text-" + domains[i].ssl_certificate[0]);
-        row.find('.status').text(domains[i].ssl_certificate[1]);
-        if (domains[i].ssl_certificate[0] == "success") {
-          row.find('.actions a').addClass('btn-default').text('Replace Certificate');
-        } else {
-          row.find('.actions a').addClass('btn-primary').text('Install Certificate');
-        }
-
-        $('#ssldomain').append($('<option>').text(domains[i].domain));
-      }
-    });
-}
-
-function ssl_install(elem) {
-  var domain = $(elem).parents('tr').attr('data-domain');
-  $('#ssldomain').val(domain);
-  $('#csr_info').slideDown();
-  $('#ssl_csr').text('Loading...');
-  show_csr();
-  $('html, body').animate({ scrollTop: $('#ssl_install_header').offset().top - $('.navbar-fixed-top').height() - 20 })
-  return false;
-}
-
-function show_csr() {
- api(
-    "/ssl/csr/" + $('#ssldomain').val(),
-    "POST",
-    {
-    },
-    function(data) {
-      $('#ssl_csr').text(data);
-    });
-}
-
-function install_cert() {
- api(
-    "/ssl/install",
-    "POST",
-    {
-      domain: $('#ssldomain').val(),
-      cert: $('#ssl_paste_cert').val(),
-      chain: $('#ssl_paste_chain').val()
-    },
-    function(status) {
-      if (/^OK($|\n)/.test(status)) {
-        console.log(status)
-        show_modal_error("SSL Certificate Installation", "Certificate has been installed. Check that you have no connection problems to the domain.", function() { show_ssl(); $('#csr_info').slideUp(); });
-      } else {
-        show_modal_error("SSL Certificate Installation", status);
-      }
-    });
-}
-</script>

management/templates/sync-guide.html

@@ -1,49 +0,0 @@
-<div>
-	<h2>Contacts &amp; Calendar Synchronization</h2>
-
-	<p>This box can hold your contacts and calendar, just like it holds your email.</p>
-
-	<hr>
-
-	<div class="row">
-		<div class="col-sm-6">
-			<h4>In your browser</h4>
-
-			<p>You can edit your contacts and calendar from your web browser.</p>
-
-			<table class="table">
-			<thead><tr><th>For...</th> <th>Visit this URL</th></tr></thead>
-			<tr><th>Contacts</td> <td><a href="https://{{hostname}}/cloud/contacts">https://{{hostname}}/cloud/contacts</a></td></tr>
-			<tr><th>Calendar</td> <td><a href="https://{{hostname}}/cloud/calendar">https://{{hostname}}/cloud/calendar</a></td></tr>
-			</table>
-
-			<p>Log in settings are the same as with <a href="#mail-guide" onclick="return show_panel(this);">mail</a>: your
-			complete email address and your mail password.</p>
-		</div>
-
-		<div class="col-sm-6">
-			<h4>On your mobile device</h4>
-
-			<p>If you set up your <a href="#mail-guide" onclick="return show_panel(this);">mail</a> using Exchange/ActiveSync,
-			your contacts and calendar may already appear on your device.</p>
-			<p>Otherwise, here are some apps that can synchronize your contacts and calendar to your Android phone.</p>
-
-			<table class="table">
-			<thead><tr><th>For...</th> <th>Use...</th></tr></thead>
-			<tr><td>Contacts and Calendar</td> <td><a href="https://play.google.com/store/apps/details?id=at.bitfire.davdroid">DAVdroid</a> ($3.69; free <a href="https://f-droid.org/repository/browse/?fdfilter=dav&fdid=at.bitfire.davdroid">here</a>)</td></tr>
-			<tr><td>Only Contacts</td> <td><a href="https://play.google.com/store/apps/details?id=org.dmfs.carddav.sync">CardDAV-Sync free beta</a> (free)</td></tr>
-			<tr><td>Only Calendar</td> <td><a href="https://play.google.com/store/apps/details?id=org.dmfs.caldav.lib">CalDAV-Sync</a> ($2.89)</td></tr>
-			</table>
-
-			<p>Use the following settings:</p>
-
-			<table class="table">
-			<tr><td>Account Type</td> <td>CardDAV or CalDAV</td></tr>
-			<tr><td>Server Name</td> <td>{{hostname}}</td></tr>
-			<tr><td>Use SSL</td> <td>Yes</td></tr>
-			<tr><td>Username</td> <td>Your complete email address.</td></tr>
-			<tr><td>Password</td> <td>Your mail password.</td></tr>
-			</table>
-		</div>
-	</div>
-</div>

management/templates/system-backup.html

@@ -1,214 +0,0 @@
-<style>
-#backup-status th { text-align: center; }
-#backup-status tr.full-backup td { font-weight: bold; }
-</style>
-
-<h2>Backup Status</h2>
-
-<p>The box makes an incremental backup each night. By default the backup is stored on the machine itself, but you can also have it stored on Amazon S3.</p>
-
-<h3>Configuration</h3>
-
-<form class="form-horizontal" role="form" onsubmit="set_custom_backup(); return false;">
-  <div class="form-group">
-    <label for="backup-target-type" class="col-sm-2 control-label">Backup to:</label>
-    <div class="col-sm-2">
-      <select class="form-control" rows="1" id="backup-target-type" onchange="toggle_form()">
-        <option value="off">Nowhere (Disable Backups)</option>
-        <option value="local">{{hostname}}</option>
-        <option value="s3">Amazon S3</option>
-      </select>
-    </div>
-  </div>
-  <div class="form-group backup-target-local">
-    <div class="col-sm-10 col-sm-offset-2">
-      <p>Backups are stored on this machine&rsquo;s own hard disk. You are responsible for periodically using SFTP (FTP over SSH) to copy the backup files from <tt id="backup-location"></tt> to a safe location. These files are encrypted, so they are safe to store anywhere.</p>
-      <p>Separately copy the encryption password from <tt class="backup-encpassword-file"></tt> to a safe and secure location. You will need this file to decrypt backup files.</p>
-    </div>
-  </div>
-  <div class="form-group backup-target-s3">
-    <div class="col-sm-10 col-sm-offset-2">
-      <p>Backups are stored in an Amazon Web Services S3 bucket. You must have an AWS account already.</p>
-      <p>You MUST manually copy the encryption password from <tt class="backup-encpassword-file"></tt> to a safe and secure location. You will need this file to decrypt backup files. It is NOT stored in your Amazon S3 bucket.</p>
-    </div>
-  </div>
-  <div class="form-group backup-target-local backup-target-s3">
-    <label for="min-age" class="col-sm-2 control-label">How many days should backups be kept?</label>
-    <div class="col-sm-8">
-      <input type="number" class="form-control" rows="1" id="min-age">
-    </div>
-  </div>
-  <div class="form-group backup-target-s3">
-    <label for="backup-target-s3-host" class="col-sm-2 control-label">S3 Region</label>
-    <div class="col-sm-8">
-      <select class="form-control" rows="1" id="backup-target-s3-host">
-        {% for name, host in backup_s3_hosts %}
-          <option value="{{host}}">{{name}}</option>
-        {% endfor %}
-      </select>
-    </div>
-  </div>
-  <div class="form-group backup-target-s3">
-    <label for="backup-target-s3-path" class="col-sm-2 control-label">S3 Path</label>
-    <div class="col-sm-8">
-      <input type="text" placeholder="your-bucket-name/backup-directory" class="form-control" rows="1" id="backup-target-s3-path">
-    </div>
-  </div>
-  <div class="form-group backup-target-s3">
-    <label for="backup-target-user" class="col-sm-2 control-label">S3 Access Key</label>
-    <div class="col-sm-8">
-      <input type="text" class="form-control" rows="1" id="backup-target-user">
-    </div>
-  </div>
-  <div class="form-group backup-target-s3">
-    <label for="backup-target-pass" class="col-sm-2 control-label">S3 Secret Access Key</label>
-    <div class="col-sm-8">
-      <input type="text" class="form-control" rows="1" id="backup-target-pass">
-    </div>
-  </div>
-  <div class="form-group">
-    <div class="col-sm-offset-2 col-sm-10">
-      <button id="set-s3-backup-button" type="submit" class="btn btn-primary">Save</button>
-    </div>
-  </div>
-</form>
-
-<h3>Available Backups</h3>
-
-<p>The backup location currently contains the backups listed below. The total size of the backups is currently <span id="backup-total-size"></span>.</p>
-
-<table id="backup-status" class="table" style="width: auto">
-  <thead>
-    <th colspan="2">When</th>
-    <th>Type</th>
-    <th>Size</th>
-    <th>Deleted in...</th>
-  </thead>
-  <tbody>
-  </tbody>
-</table>
-<script>
-
-function toggle_form() {
-  var target_type = $("#backup-target-type").val();
-  $(".backup-target-local, .backup-target-s3").hide();
-  $(".backup-target-" + target_type).show();
-}
-
-function nice_size(bytes) {
-  var powers = ['bytes', 'KB', 'MB', 'GB', 'TB'];
-  while (true) {
-    if (powers.length == 1) break;
-    if (bytes < 1000) break;
-    bytes /= 1024;
-    powers.shift();
-  }
-  // round to have three significant figures but at most one decimal place
-  if (bytes >= 100)
-    bytes = Math.round(bytes)
-  else
-    bytes = Math.round(bytes*10)/10;
-  return bytes + " " + powers[0];
-}
-
-function show_system_backup() {
-  show_custom_backup()
-  
-  $('#backup-status tbody').html("<tr><td colspan='2' class='text-muted'>Loading...</td></tr>")
-  api(
-    "/system/backup/status",
-    "GET",
-    { },
-    function(r) {
-      $('#backup-status tbody').html("");
-      var total_disk_size = 0;
-
-      if (typeof r.backups == "undefined") {
-        var tr = $('<tr><td colspan="3">Backups are turned off.</td></tr>');
-        $('#backup-status tbody').append(tr);
-        return;
-      } else if (r.backups.length == 0) {
-        var tr = $('<tr><td colspan="3">No backups have been made yet.</td></tr>');
-        $('#backup-status tbody').append(tr);
-      }
-
-      for (var i = 0; i < r.backups.length; i++) {
-        var b = r.backups[i];
-        var tr = $('<tr/>');
-        if (b.full) tr.addClass("full-backup");
-        tr.append( $('<td/>').text(b.date_str + " " + r.tz) );
-        tr.append( $('<td/>').text(b.date_delta + " ago") );
-        tr.append( $('<td/>').text(b.full ? "full" : "increment") );
-        tr.append( $('<td style="text-align: right"/>').text( nice_size(b.size)) );
-        if (b.deleted_in)
-          tr.append( $('<td/>').text(b.deleted_in) );
-        else
-          tr.append( $('<td class="text-muted">unknown</td>') );
-        $('#backup-status tbody').append(tr);
-
-        total_disk_size += b.size;
-      }
-
-      $('#backup-total-size').text(nice_size(total_disk_size));
-    })
-}
-
-function show_custom_backup() {
-    $(".backup-target-local, .backup-target-s3").hide();
-    api(
-      "/system/backup/config",
-      "GET",
-      { },
-      function(r) {
-        if (r.target == "file://" + r.file_target_directory) {
-          $("#backup-target-type").val("local");
-        } else if (r.target == "off") {
-          $("#backup-target-type").val("off");
-        } else if (r.target.substring(0, 5) == "s3://") {
-          $("#backup-target-type").val("s3");
-	  var hostpath = r.target.substring(5).split('/');
-          var host = hostpath.shift();
-          $("#backup-target-s3-host").val(host);
-          $("#backup-target-s3-path").val(hostpath.join('/'));
-        }
-        $("#backup-target-user").val(r.target_user);
-        $("#backup-target-pass").val(r.target_pass);
-        $("#min-age").val(r.min_age_in_days);
-        $('#backup-location').text(r.file_target_directory);
-        $('.backup-encpassword-file').text(r.enc_pw_file);
-        toggle_form()
-      })
-}
-
-function set_custom_backup() {
-  var target_type = $("#backup-target-type").val();
-  var target_user = $("#backup-target-user").val();
-  var target_pass = $("#backup-target-pass").val();
-  
-  var target;
-  if (target_type == "local" || target_type == "off")
-    target = target_type;
-  else if (target_type == "s3")
-    target = "s3://" + $("#backup-target-s3-host").val() + "/" + $("#backup-target-s3-path").val();
-
-  var min_age = $("#min-age").val();
-  api(
-    "/system/backup/config",
-    "POST",
-    {
-      target: target,
-      target_user: target_user,
-      target_pass: target_pass,
-      min_age: min_age
-    },
-    function(r) {
-      // use .text() --- it's a text response, not html
-      show_modal_error("Backup configuration", $("<p/>").text(r), function() { if (r == "OK") show_system_backup(); }); // refresh after modal on success
-    },
-    function(r) {
-      // use .text() --- it's a text response, not html
-      show_modal_error("Backup configuration", $("<p/>").text(r));
-    });
-  return false;
-}
-</script>

management/templates/system-status.html

@@ -1,125 +0,0 @@
-<h2>System Status Checks</h2>
-
-<style>
-#system-checks .heading td {
-  font-weight: bold;
-  font-size: 120%;
-  padding-top: 1.5em;
-}
-#system-checks .heading.first td {
-  border-top: none;
-  padding-top: 0;
-}
-#system-checks .status-error td {
-  color: #733;
-}
-#system-checks .status-warning td {
-  color: #770;
-}
-#system-checks .status-ok td {
-  color: #040;
-}
-#system-checks div.extra {
-  display: none;
-  margin-top: 1em;
-  max-width: 50em;
-  word-wrap: break-word;
-}
-#system-checks a.showhide {
-  display: none;
-  font-size: 85%;
-}
-#system-checks .pre {
-  margin: 1em;
-  font-family: monospace;
-  white-space: pre-wrap;
-}
-
-#system-privacy-setting {
-  float: right;
-  max-width: 20em;
-  margin-bottom: 1em;
-}
-</style>
-
-<div id="system-privacy-setting" style="display: none">
-	<div><a onclick="return enable_privacy(!current_privacy_setting)" href="#"><span>Enable/Disable</span> New-Version Check</a></div>
-	<p style="line-height: 125%"><small>(When enabled, status checks phone-home to check for a new release of Mail-in-a-Box.)</small></p>
-</div>
-
-
-<table id="system-checks" class="table" style="max-width: 60em">
-  <thead>
-  </thead>
-  <tbody>
-  </tbody>
-</table>
-
-<script>
-function show_system_status() {
-  $('#system-checks tbody').html("<tr><td colspan='2' class='text-muted'>Loading...</td></tr>")
-
-  api(
-    "/system/privacy",
-    "GET",
-    { },
-    function(r) {
-      current_privacy_setting = r;
-      $('#system-privacy-setting').show();
-      $('#system-privacy-setting a span').text(r ? "Enable" : "Disable");
-      $('#system-privacy-setting p').toggle(r);
-    });
-
-  api(
-    "/system/status",
-    "POST",
-    { },
-    function(r) {
-      $('#system-checks tbody').html("");
-      for (var i = 0; i < r.length; i++) {
-        var n = $("<tr><td class='status'/><td class='message'><p style='margin: 0'/><div class='extra'/><a class='showhide' href='#'/></tr>");
-        if (i == 0) n.addClass('first')
-        if (r[i].type == "heading")
-                n.addClass(r[i].type)
-        else
-                n.addClass("status-" + r[i].type)
-        if (r[i].type == "ok") n.find('td.status').text("✓")
-        if (r[i].type == "error") n.find('td.status').text("✖")
-        if (r[i].type == "warning") n.find('td.status').text("?")
-        n.find('td.message p').text(r[i].text)
-        $('#system-checks tbody').append(n);
-
-        if (r[i].extra.length > 0) {
-          n.find('a.showhide').show().text("show more").click(function() {
-            $(this).hide();
-            $(this).parent().find('.extra').fadeIn();
-            return false;
-          });
-        }
-
-        for (var j = 0; j < r[i].extra.length; j++) {
-
-          var m = $("<div/>").text(r[i].extra[j].text)
-          if (r[i].extra[j].monospace)
-            m.addClass("pre");
-          n.find('> td.message > div').append(m);
-        }
-      }
-    })
-
-}
-
-var current_privacy_setting = null;
-function enable_privacy(status) {
-  api(
-    "/system/privacy",
-    "POST",
-    {
-      value: (status ? "private" : "off")
-    },
-    function(res) {
-      show_system_status();
-    });
-  return false; // disable link
-}
-</script>

management/templates/users.html

@@ -1,262 +0,0 @@
-<h2>Users</h2>
-
-<style>
-#user_table h4 { margin: 1em 0 0 0; }
-#user_table tr.account_inactive td.address { color: #888; text-decoration: line-through; }
-#user_table .actions { margin-top: .33em; font-size: 95%; }
-#user_table .account_inactive .if_active { display: none; }
-#user_table .account_active .if_inactive { display: none; }
-#user_table .account_active.if_inactive { display: none; }
-</style>
-
-<h3>Add a mail user</h3>
-
-<p>Add an email address to this system. This will create a new login username/password.</p>
-
-<form class="form-inline" role="form" onsubmit="return do_add_user(); return false;">
-  <div class="form-group">
-    <label class="sr-only" for="adduserEmail">Email address</label>
-    <input type="email" class="form-control" id="adduserEmail" placeholder="Email Address">
-  </div>
-  <div class="form-group">
-    <label class="sr-only" for="adduserPassword">Password</label>
-    <input type="password" class="form-control" id="adduserPassword" placeholder="Password">
-  </div>
-  <div class="form-group">
-    <select class="form-control" id="adduserPrivs">
-      <option value="">Normal User</option>
-      <option value="admin">Administrator</option>
-    </select>
-  </div>
-  <button type="submit" class="btn btn-primary">Add User</button>
-</form>
-<ul style="margin-top: 1em; padding-left: 1.5em; font-size: 90%;">
-  <li>Passwords must be at least four characters and may not contain spaces. For best results, <a href="#" onclick="return generate_random_password()">generate a random password</a>.</li>
-  <li>Use <a href="#" onclick="return show_panel('aliases')">aliases</a> to create email addresses that forward to existing accounts.</li>
-  <li>Administrators get access to this control panel.</li>
-  <li>User accounts cannot contain any international (non-ASCII) characters, but <a href="#" onclick="return show_panel('aliases');">aliases</a> can.</li>
-</ul>
-
-<h3>Existing mail users</h3>
-<table id="user_table" class="table" style="width: auto">
-  <thead>
-    <tr>
-      <th width="50%">Email Address</th>
-      <th>Actions</th>
-      <th>Mailbox Size</th>
-    </tr>
-  </thead>
-  <tbody>
-  </tbody>
-</table>
-
-<div style="display: none">
-  <table>
-  <tr id="user-template">
-    <td class='address'>
-    </td>
-    <td class='actions'>
-        <span class='privs'>
-        </span>
-
-        <span class="if_active">
-          <a href="#" onclick="users_set_password(this); return false;" class='setpw' title="Set Password">
-            set password
-          </a>
-          |
-        </span>
-
-        <span class='add-privs'>
-        </span>
-
-        <a href="#" onclick="users_remove(this); return false;" class='if_active' title="Archive Account">
-          archive account
-        </a>
-    </td>
-    <td class='mailboxsize'>
-    </td>
-  </tr>
-  <tr id="user-extra-template" class="if_inactive">
-    <td colspan="3" style="border: 0; padding-top: 0">
-      <div class='restore_info' style='color: #888; font-size: 90%'>To restore account, create a new account with this email address. Or to permanently delete the mailbox, delete the directory <tt></tt> on the machine.</div>
-    </td>
-  </tr>
-  </table>
-</div>
-
-
-<script>
-function show_users() {
-  $('#user_table tbody').html("<tr><td colspan='2' class='text-muted'>Loading...</td></tr>")
-  api(
-    "/mail/users",
-    "GET",
-    { format: 'json' },
-    function(r) {
-      $('#user_table tbody').html("");
-      for (var i = 0; i < r.length; i++) {
-        var hdr = $("<tr><td colspan='3'><h4/></td></tr>");
-        hdr.find('h4').text(r[i].domain);
-        $('#user_table tbody').append(hdr);
-
-        for (var k = 0; k < r[i].users.length; k++) {
-          var user = r[i].users[k];
-
-          var n = $("#user-template").clone();
-          var n2 = $("#user-extra-template").clone();
-          n.attr('id', '');
-          n2.attr('id', '');
-          $('#user_table tbody').append(n);
-          $('#user_table tbody').append(n2);
-
-          n.addClass("account_" + user.status);
-          n2.addClass("account_" + user.status);
-
-          n.attr('data-email', user.email);
-          n.find('.address').text(user.email)
-          n.find('.mailboxsize').text(nice_size(user.mailbox_size))
-          n2.find('.restore_info tt').text(user.mailbox);
-
-          if (user.status == 'inactive') continue;
-
-          var add_privs = ["admin"];
-
-          for (var j = 0; j < user.privileges.length; j++) {
-            var p = $("<span><b><span class='name'></span></b> (<a href='#' onclick='mod_priv(this, \"remove\"); return false;' title='Remove Privilege'>remove privilege</a>) |</span>");
-            p.find('span.name').text(user.privileges[j]);
-            n.find('.privs').append(p);
-            if (add_privs.indexOf(user.privileges[j]) >= 0)
-              add_privs.splice(add_privs.indexOf(user.privileges[j]), 1);
-          }
-
-          for (var j = 0; j < add_privs.length; j++) {
-            var p = $("<span><a href='#' onclick='mod_priv(this, \"add\"); return false;' title='Add Privilege'>make <span class='name'></span></a> | </span>");
-            p.find('span.name').text(add_privs[j]);
-            n.find('.add-privs').append(p);
-          }
-        }
-      }
-    })
-}
-
-function do_add_user() {
-  var email = $("#adduserEmail").val();
-  var pw = $("#adduserPassword").val();
-  var privs = $("#adduserPrivs").val();
-  api(
-    "/mail/users/add",
-    "POST",
-    {
-      email: email,
-      password: pw,
-      privileges: privs
-    },
-    function(r) {
-      // Responses are multiple lines of pre-formatted text.
-      show_modal_error("Add User", $("<pre/>").text(r));
-      show_users()
-    },
-    function(r) {
-      show_modal_error("Add User", r);
-    });
-  return false;
-}
-
-function users_set_password(elem) {
-  var email = $(elem).parents('tr').attr('data-email');
-
-  var yourpw = "";
-  if (api_credentials != null && email == api_credentials[0])
-    yourpw = "<p class='text-danger'>If you change your own password, you will be logged out of this control panel and will need to log in again.</p>";
-
-  show_modal_confirm(
-    "Archive User",
-    $("<p>Set a new password for <b>" + email + "</b>?</p> <p><label for='users_set_password_pw' style='display: block; font-weight: normal'>New Password:</label><input type='password' id='users_set_password_pw'></p><p><small>Passwords must be at least four characters and may not contain spaces.</small>" + yourpw + "</p>"),
-    "Set Password",
-    function() {
-      api(
-        "/mail/users/password",
-        "POST",
-        {
-          email: email,
-          password: $('#users_set_password_pw').val()
-        },
-        function(r) {
-          // Responses are multiple lines of pre-formatted text.
-          show_modal_error("Set Password", $("<pre/>").text(r));
-        },
-        function(r) {
-          show_modal_error("Set Password", r);
-        });
-    });
-}
-
-function users_remove(elem) {
-  var email = $(elem).parents('tr').attr('data-email');
-
-  // can't remove yourself
-  if (api_credentials != null && email == api_credentials[0]) {
-    show_modal_error("Archive User", "You cannot archive your own account.");
-    return;
-  }
-
-  show_modal_confirm(
-    "Archive User",
-    $("<p>Are you sure you want to archive <b>" + email + "</b>?</p> <p>The user's mailboxes will not be deleted (you can do that later), but the user will no longer be able to log into any services on this machine.</p>"),
-    "Archive",
-    function() {
-      api(
-        "/mail/users/remove",
-        "POST",
-        {
-          email: email
-        },
-        function(r) {
-          // Responses are multiple lines of pre-formatted text.
-          show_modal_error("Remove User", $("<pre/>").text(r));
-          show_users();
-        },
-        function(r) {
-          show_modal_error("Remove User", r);
-        });
-    });
-}
-
-function mod_priv(elem, add_remove) {
-  var email = $(elem).parents('tr').attr('data-email');
-  var priv = $(elem).parents('td').find('.name').text();
-
-  // can't remove your own admin access
-  if (priv == "admin" && add_remove == "remove" && api_credentials != null && email == api_credentials[0]) {
-    show_modal_error("Modify Privileges", "You cannot remove the admin privilege from yourself.");
-    return;
-  }
-
-  var add_remove1 = add_remove.charAt(0).toUpperCase() + add_remove.substring(1);
-  show_modal_confirm(
-    "Modify Privileges",
-    $("<p>Are you sure you want to " + add_remove + " the " + priv + " privilege for <b>" + email + "</b>?</p>"),
-    add_remove1,
-    function() {
-      api(
-        "/mail/users/privileges/" + add_remove,
-        "POST",
-        {
-          email: email,
-          privilege: priv
-        },
-        function(r) {
-          show_users();
-        });
-    });
-}
-
-function generate_random_password() {
-  var pw = "";
-  var charset = "ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz23456789"; // confusable characters skipped
-  for (var i = 0; i < 10; i++)
-    pw += charset.charAt(Math.floor(Math.random() * charset.length));
-  show_modal_error("Random Password", "<p>Here, try this:</p> <p><code style='font-size: 110%'>" + pw + "</code></pr");
-  return false; // cancel click
-}
-</script>

management/templates/web.html

@@ -1,89 +0,0 @@
-<style>
-</style>
-
-<h2>Static Web Hosting</h2>
-
-<p>This machine is serving a simple, static website at <a href="https://{{hostname}}">https://{{hostname}}</a> and at all domain names that you set up an email user or alias for.</p>
-
-<h3>Uploading web files</h3>
-
-<p>You can replace the default website with your own HTML pages and other static files. This control panel won&rsquo;t help you design a website, but once you have <tt>.html</tt> files you can upload them following these instructions:</p>
-
-<ol>
-<li>Ensure that any domains you are publishing a website for have no problems on the <a href="#system_status" onclick="return show_panel(this);">Status Checks</a> page.</li>
-
-<li>On your personal computer, install an SSH file transfer program such as <a href="https://filezilla-project.org/">FileZilla</a> or <a href="http://linuxcommand.org/man_pages/scp1.html">scp</a>.</li>
-
-<li>Log in to this machine with the file transfer program. The server is <strong>{{hostname}}</strong>, the protocol is SSH or SFTP, and use the <strong>SSH login credentials</strong> that you used when you originally created this machine at your cloud host provider. This is <strong>not</strong> what you use to log in either for email or this control panel. Your SSH credentials probably involves a private key file.</li>
-
-<li>Upload your <tt>.html</tt> or other files to the directory <tt>{{storage_root}}/www/default</tt> on this machine. They will appear directly and immediately on the web.</li>
-
-<li>The websites set up on this machine are listed in the table below with where to put the files for each website.</li>
-
-<table id="web_domains_existing" class="table" style="margin-bottom: 1em; width: auto;">
-        <thead>
-                <tr>
-                        <th>Site</th>
-                        <th>Directory for Files</th>
-			<th/>
-                </tr>
-        </thead>
-        <tbody>
-        </tbody>
-</table>
-
-<p>To add a domain to this table, create a dummy <a href="#users" onclick="return show_panel(this);">mail user</a> or <a href="#aliases" onclick="return show_panel(this);">alias</a> on the domain first and see the <a href="https://mailinabox.email/guide.html#domain-name-configuration">setup guide</a> for adding nameserver records to the new domain at your registrar (but <i>not</i> glue records).</p>
-
-</ol>
-
-<script>
-function show_web() {
- api(
-    "/web/domains",
-    "GET",
-    {
-    },
-    function(domains) {
-	var tb = $('#web_domains_existing tbody');
-	tb.text('');
-	for (var i = 0; i < domains.length; i++) {
-		if (!domains[i].static_enabled) continue;
-		var row = $("<tr><th class='domain'><a href=''></a></th><td class='directory'><tt/></td> <td class='change-root hidden'><button class='btn btn-default btn-xs' onclick='show_change_web_root(this)'>Change</button></td></tr>");
-		tb.append(row);
-		row.attr('data-domain', domains[i].domain);
-		row.attr('data-custom-web-root', domains[i].custom_root);
-		row.find('.domain a').text('https://' + domains[i].domain);
-		row.find('.domain a').attr('href', 'https://' + domains[i].domain);
-		row.find('.directory tt').text(domains[i].root);
-		if (domains[i].root != domains[i].custom_root)
-			row.find('.change-root').removeClass('hidden');
-	}
-
-    });
-}
-
-function do_web_update() {
- api(
-    "/web/update",
-    "POST",
-    {
-    },
-    function(data) {
-      if (data == "")
-        data = "Nothing changed.";
-      else
-        data = $("<pre/>").text(data);
-      show_modal_error("Web Update", data, function() { show_web() });
-    });
-}
-
-function show_change_web_root(elem) {
-  var domain = $(elem).parents('tr').attr('data-domain');
-  var root = $(elem).parents('tr').attr('data-custom-web-root');
-  show_modal_confirm(
-    'Change Root Directory for ' + domain,
-    $('<p>You can change the static directory for <tt>' + domain + '</tt> to:</p> <p><tt>' + root + '</tt></p> <p>First create this directory on the server. Then click Update to scan for the directory and update web settings.'),
-    'Update',
-    function() { do_web_update(); });
-}
-</script>

management/utils.py

@@ -1,10 +1,6 @@
 import os.path
 
-# DO NOT import non-standard modules. This module is imported by
+CONF_DIR = os.path.join(os.path.dirname(__file__), "../conf")
-# migrate.py which runs on fresh machines before anything is installed
-# besides Python.
-
-# THE ENVIRONMENT FILE AT /etc/mailinabox.conf
 
 def load_environment():
     # Load settings from /etc/mailinabox.conf.
@@ -22,89 +18,38 @@ def save_environment(env):
         for k, v in env.items():
             f.write("%s=%s\n" % (k, v))
 
-# THE SETTINGS FILE AT STORAGE_ROOT/settings.yaml.
-
-def write_settings(config, env):
-    import rtyaml
-    fn = os.path.join(env['STORAGE_ROOT'], 'settings.yaml')
-    with open(fn, "w") as f:
-        f.write(rtyaml.dump(config))
-
-def load_settings(env):
-    import rtyaml
-    fn = os.path.join(env['STORAGE_ROOT'], 'settings.yaml')
-    try:
-        config = rtyaml.load(open(fn, "r"))
-        if not isinstance(config, dict): raise ValueError() # caught below
-        return config
-    except:
-        return { }
-
-# UTILITIES
-
 def safe_domain_name(name):
     # Sanitize a domain name so it is safe to use as a file name on disk.
     import urllib.parse
     return urllib.parse.quote(name, safe='')
 
 def sort_domains(domain_names, env):
-    # Put domain names in a nice sorted order.
+    # Put domain names in a nice sorted order. For web_update, PRIMARY_HOSTNAME
-
+    # must appear first so it becomes the nginx default server.
-    # The nice order will group domain names by DNS zone, i.e. the top-most
-    # domain name that we serve that ecompasses a set of subdomains. Map
-    # each of the domain names to the zone that contains them. Walk the domains
-    # from shortest to longest since zones are always shorter than their
-    # subdomains.
-    zones = { }
-    for domain in sorted(domain_names, key=lambda d : len(d)):
-        for z in zones.values():
-            if domain.endswith("." + z):
-                # We found a parent domain already in the list.
-                zones[domain] = z
-                break
-        else:
-            # 'break' did not occur: there is no parent domain, so it is its
-            # own zone.
-            zones[domain] = domain
-
-    # Sort the zones.
-    zone_domains = sorted(zones.values(),
-      key = lambda d : (
-        # PRIMARY_HOSTNAME or the zone that contains it is always first.
-        not (d == env['PRIMARY_HOSTNAME'] or env['PRIMARY_HOSTNAME'].endswith("." + d)),
-
-        # Then just dumb lexicographically.
-        d,
-      ))
-
-    # Now sort the domain names that fall within each zone.
-    domain_names = sorted(domain_names,
-      key = lambda d : (
-        # First by zone.
-        zone_domains.index(zones[d]),
-
-        # PRIMARY_HOSTNAME is always first within the zone that contains it.
-        d != env['PRIMARY_HOSTNAME'],
-
-        # Followed by any of its subdomains.
-        not d.endswith("." + env['PRIMARY_HOSTNAME']),
-
-        # Then in right-to-left lexicographic order of the .-separated parts of the name.
-        list(reversed(d.split("."))),
-      ))
     
-    return domain_names
+    # First group PRIMARY_HOSTNAME and its subdomains, then parent domains of PRIMARY_HOSTNAME, then other domains.
+    groups = ( [], [], [] )
+    for d in domain_names:
+        if d == env['PRIMARY_HOSTNAME'] or d.endswith("." + env['PRIMARY_HOSTNAME']):
+            groups[0].append(d)
+        elif env['PRIMARY_HOSTNAME'].endswith("." + d):
+            groups[1].append(d)
+        else:
+            groups[2].append(d)
 
-def sort_email_addresses(email_addresses, env):
+    # Within each group, sort parent domains before subdomains and after that sort lexicographically.
-    email_addresses = set(email_addresses)
+    def sort_group(group):
-    domains = set(email.split("@", 1)[1] for email in email_addresses if "@" in email)
+        # Find the top-most domains.
-    ret = []
+        top_domains = sorted(d for d in group if len([s for s in group if d.endswith("." + s)]) == 0)
-    for domain in sort_domains(domains, env):
+        ret = []
-        domain_emails = set(email for email in email_addresses if email.endswith("@" + domain))
+        for d in top_domains:
-        ret.extend(sorted(domain_emails))
+            ret.append(d)
-        email_addresses -= domain_emails
+            ret.extend( sort_group([s for s in group if s.endswith("." + d)]) )
-    ret.extend(sorted(email_addresses)) # whatever is left
+        return ret
-    return ret
+        
+    groups = [sort_group(g) for g in groups]
+
+    return groups[0] + groups[1] + groups[2]
 
 def exclusive_process(name):
     # Ensure that a process named `name` does not execute multiple
@@ -209,47 +154,3 @@ def create_syslog_handler():
     handler = logging.handlers.SysLogHandler(address='/dev/log')
     handler.setLevel(logging.WARNING)
     return handler
-
-def du(path):
-    # Computes the size of all files in the path, like the `du` command.
-    # Based on http://stackoverflow.com/a/17936789. Takes into account
-    # soft and hard links.
-    total_size = 0
-    seen = set()
-    for dirpath, dirnames, filenames in os.walk(path):
-        for f in filenames:
-            fp = os.path.join(dirpath, f)
-            try:
-                stat = os.lstat(fp)
-            except OSError:
-                continue
-            if stat.st_ino in seen:
-                continue
-            seen.add(stat.st_ino)
-            total_size += stat.st_size
-    return total_size
-
-def wait_for_service(port, public, env, timeout):
-	# Block until a service on a given port (bound privately or publicly)
-	# is taking connections, with a maximum timeout.
-	import socket, time
-	start = time.perf_counter()
-	while True:
-		s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-		s.settimeout(timeout/3)
-		try:
-			s.connect(("127.0.0.1" if not public else env['PUBLIC_IP'], port))
-			return True
-		except OSError:
-			if time.perf_counter() > start+timeout:
-				return False
-		time.sleep(min(timeout/4, 1))
-
-if __name__ == "__main__":
-	from dns_update import get_dns_domains
-	from web_update import get_web_domains, get_default_www_redirects
-	env = load_environment()
-	domains = get_dns_domains(env) | set(get_web_domains(env) + get_default_www_redirects(env))
-	domains = sort_domains(domains, env)
-	for domain in domains:
-		print(domain)

management/web_update.py

@@ -2,10 +2,10 @@
 # domains for which a mail account has been set up.
 ########################################################################
 
-import os, os.path, shutil, re, tempfile, rtyaml
+import os, os.path, re, rtyaml
 
 from mailconfig import get_mail_domains
-from dns_update import get_custom_dns_config, do_dns_update, get_dns_zones
+from dns_update import get_custom_dns_config
 from utils import shell, safe_domain_name, sort_domains
 
 def get_web_domains(env):
@@ -17,76 +17,33 @@ def get_web_domains(env):
 	domains.add(env['PRIMARY_HOSTNAME'])
 
 	# Also serve web for all mail domains so that we might at least
-	# provide auto-discover of email settings, and also a static website
+	# provide Webfinger and ActiveSync auto-discover of email settings
-	# if the user wants to make one. These will require an SSL cert.
+	# (though the latter isn't really working). These will require that
+	# an SSL cert be installed.
+	domains |= get_mail_domains(env)
+
 	# ...Unless the domain has an A/AAAA record that maps it to a different
 	# IP address than this box. Remove those domains from our list.
-	domains |= (get_mail_domains(env) - get_domains_with_a_records(env))
+	dns = get_custom_dns_config(env)
+	for domain, value in dns.items():
+		if domain not in domains: continue
+		if (isinstance(value, str) and (value != "local")) \
+		  or (isinstance(value, dict) and ("A" in value) and (value["A"] != "local")) \
+		  or (isinstance(value, dict) and ("AAAA" in value) and (value["AAAA"] != "local")):
+			domains.remove(domain)
 
-	# Sort the list so the nginx conf gets written in a stable order.
+	# Sort the list. Put PRIMARY_HOSTNAME first so it becomes the
+	# default server (nginx's default_server).
 	domains = sort_domains(domains, env)
 
 	return domains
-
+	
-def get_domains_with_a_records(env):
-	domains = set()
-	dns = get_custom_dns_config(env)
-	for domain, rtype, value in dns:
-		if rtype == "CNAME" or (rtype in ("A", "AAAA") and value not in ("local", env['PUBLIC_IP'])):
-			domains.add(domain)
-	return domains
-
-def get_web_domains_with_root_overrides(env):
-	# Load custom settings so we can tell what domains have a redirect or proxy set up on '/',
-	# which means static hosting is not happening.
-	root_overrides = { }
-	nginx_conf_custom_fn = os.path.join(env["STORAGE_ROOT"], "www/custom.yaml")
-	if os.path.exists(nginx_conf_custom_fn):
-		custom_settings = rtyaml.load(open(nginx_conf_custom_fn))
-		for domain, settings in custom_settings.items():
-			for type, value in [('redirect', settings.get('redirects', {}).get('/')),
-				('proxy', settings.get('proxies', {}).get('/'))]:
-				if value:
-					root_overrides[domain] = (type, value)
-	return root_overrides
-
-
-def get_default_www_redirects(env):
-	# Returns a list of www subdomains that we want to provide default redirects
-	# for, i.e. any www's that aren't domains the user has actually configured
-	# to serve for real. Which would be unusual.
-	web_domains = set(get_web_domains(env))
-	www_domains = set('www.' + zone for zone, zonefile in get_dns_zones(env))
-	return sort_domains(www_domains - web_domains - get_domains_with_a_records(env), env)
-
 def do_web_update(env):
-	# Pre-load what SSL certificates we will use for each domain.
-	ssl_certificates = get_ssl_certificates(env)
-
 	# Build an nginx configuration file.
-	nginx_conf = open(os.path.join(os.path.dirname(__file__), "../conf/nginx-top.conf")).read()
+	nginx_conf = ""
-
+	template = open(os.path.join(os.path.dirname(__file__), "../conf/nginx.conf")).read()
-	# Load the templates.
-	template0 = open(os.path.join(os.path.dirname(__file__), "../conf/nginx.conf")).read()
-	template1 = open(os.path.join(os.path.dirname(__file__), "../conf/nginx-alldomains.conf")).read()
-	template2 = open(os.path.join(os.path.dirname(__file__), "../conf/nginx-primaryonly.conf")).read()
-	template3 = "\trewrite ^(.*) https://$REDIRECT_DOMAIN$1 permanent;\n"
-
-	# Add the PRIMARY_HOST configuration first so it becomes nginx's default server.
-	nginx_conf += make_domain_config(env['PRIMARY_HOSTNAME'], [template0, template1, template2], ssl_certificates, env)
-
-	# Add configuration all other web domains.
-	has_root_proxy_or_redirect = get_web_domains_with_root_overrides(env)
 	for domain in get_web_domains(env):
-		if domain == env['PRIMARY_HOSTNAME']: continue # handled above
+		nginx_conf += make_domain_config(domain, template, env)
-		if domain not in has_root_proxy_or_redirect:
-			nginx_conf += make_domain_config(domain, [template0, template1], ssl_certificates, env)
-		else:
-			nginx_conf += make_domain_config(domain, [template0], ssl_certificates, env)
-
-	# Add default www redirects.
-	for domain in get_default_www_redirects(env):
-		nginx_conf += make_domain_config(domain, [template0, template3], ssl_certificates, env)
 
 	# Did the file change? If not, don't bother writing & restarting nginx.
 	nginx_conf_fn = "/etc/nginx/conf.d/local.conf"
@@ -99,331 +56,123 @@ def do_web_update(env):
 	with open(nginx_conf_fn, "w") as f:
 		f.write(nginx_conf)
 
-	# Kick nginx. Since this might be called from the web admin
+	# Kick nginx.
-	# don't do a 'restart'. That would kill the connection before
+	shell('check_call', ["/usr/sbin/service", "nginx", "restart"])
-	# the API returns its response. A 'reload' should be good
-	# enough and doesn't break any open connections.
-	shell('check_call', ["/usr/sbin/service", "nginx", "reload"])
 
 	return "web updated\n"
 
-def make_domain_config(domain, templates, ssl_certificates, env):
+def make_domain_config(domain, template, env):
-	# GET SOME VARIABLES
+	# How will we configure this domain.
 
 	# Where will its root directory be for static files?
+
 	root = get_web_root(domain, env)
 
 	# What private key and SSL certificate will we use for this domain?
-	ssl_key, ssl_certificate, ssl_via = get_domain_ssl_files(domain, ssl_certificates, env)
+	ssl_key, ssl_certificate, csr_path = get_domain_ssl_files(domain, env)
 
-	# ADDITIONAL DIRECTIVES.
+	# For hostnames created after the initial setup, ensure we have an SSL certificate
+	# available. Make a self-signed one now if one doesn't exist.
+	ensure_ssl_certificate_exists(domain, ssl_key, ssl_certificate, csr_path, env)
 
-	nginx_conf_extra = ""
+	# Replace substitution strings in the template & return.
+	nginx_conf = template
+	nginx_conf = nginx_conf.replace("$HOSTNAME", domain)
+	nginx_conf = nginx_conf.replace("$ROOT", root)
+	nginx_conf = nginx_conf.replace("$SSL_KEY", ssl_key)
+	nginx_conf = nginx_conf.replace("$SSL_CERTIFICATE", ssl_certificate)
 
-	# Because the certificate may change, we should recognize this so we
+	# Add in any user customizations.
-	# can trigger an nginx update.
+	nginx_conf_parts = re.split("(# ADDITIONAL DIRECTIVES HERE\n)", nginx_conf)
-	def hashfile(filepath):
-		import hashlib
-		sha1 = hashlib.sha1()
-		f = open(filepath, 'rb')
-		try:
-			sha1.update(f.read())
-		finally:
-			f.close()
-		return sha1.hexdigest()
-	nginx_conf_extra += "# ssl files sha1: %s / %s\n" % (hashfile(ssl_key), hashfile(ssl_certificate))
-
-	# Add in any user customizations in YAML format.
-	hsts = "yes"
 	nginx_conf_custom_fn = os.path.join(env["STORAGE_ROOT"], "www/custom.yaml")
 	if os.path.exists(nginx_conf_custom_fn):
 		yaml = rtyaml.load(open(nginx_conf_custom_fn))
 		if domain in yaml:
 			yaml = yaml[domain]
+			if "proxy" in yaml:
+				nginx_conf_parts[1] += "\tlocation / {\n\t\tproxy_pass %s;\n\t}\n" % yaml["proxy"]
 
-			# any proxy or redirect here?
+	# Put it all together.	
-			for path, url in yaml.get("proxies", {}).items():
+	nginx_conf = "".join(nginx_conf_parts)
-				nginx_conf_extra += "\tlocation %s {\n\t\tproxy_pass %s;\n\t}\n" % (path, url)
-			for path, url in yaml.get("redirects", {}).items():
-				nginx_conf_extra += "\trewrite %s %s permanent;\n" % (path, url)
-
-			# override the HSTS directive type
-			hsts = yaml.get("hsts", hsts)
-
-	# Add the HSTS header.
-	if hsts == "yes":
-		nginx_conf_extra += "add_header Strict-Transport-Security max-age=31536000;\n"
-	elif hsts == "preload":
-		nginx_conf_extra += "add_header Strict-Transport-Security \"max-age=10886400; includeSubDomains; preload\";\n"
-
-	# Add in any user customizations in the includes/ folder.
-	nginx_conf_custom_include = os.path.join(env["STORAGE_ROOT"], "www", safe_domain_name(domain) + ".conf")
-	if os.path.exists(nginx_conf_custom_include):
-		nginx_conf_extra += "\tinclude %s;\n" % (nginx_conf_custom_include)
-	# PUT IT ALL TOGETHER
-
-	# Combine the pieces. Iteratively place each template into the "# ADDITIONAL DIRECTIVES HERE" placeholder
-	# of the previous template.
-	nginx_conf = "# ADDITIONAL DIRECTIVES HERE\n"
-	for t in templates + [nginx_conf_extra]:
-		nginx_conf = re.sub("[ \t]*# ADDITIONAL DIRECTIVES HERE *\n", t, nginx_conf)
-
-	# Replace substitution strings in the template & return.
-	nginx_conf = nginx_conf.replace("$STORAGE_ROOT", env['STORAGE_ROOT'])
-	nginx_conf = nginx_conf.replace("$HOSTNAME", domain)
-	nginx_conf = nginx_conf.replace("$ROOT", root)
-	nginx_conf = nginx_conf.replace("$SSL_KEY", ssl_key)
-	nginx_conf = nginx_conf.replace("$SSL_CERTIFICATE", ssl_certificate)
-	nginx_conf = nginx_conf.replace("$REDIRECT_DOMAIN", re.sub(r"^www\.", "", domain)) # for default www redirects to parent domain
 
 	return nginx_conf
 
-def get_web_root(domain, env, test_exists=True):
+def get_web_root(domain, env):
 	# Try STORAGE_ROOT/web/domain_name if it exists, but fall back to STORAGE_ROOT/web/default.
 	for test_domain in (domain, 'default'):
 		root = os.path.join(env["STORAGE_ROOT"], "www", safe_domain_name(test_domain))
-		if os.path.exists(root) or not test_exists: break
+		if os.path.exists(root): break
 	return root
 
-def get_ssl_certificates(env):
+def get_domain_ssl_files(domain, env):
-	# Scan all of the installed SSL certificates and map every domain
+	# What SSL private key will we use? Allow the user to override this, but
-	# that the certificates are good for to the best certificate for
+	# in many cases using the same private key for all domains would be fine.
-	# the domain.
+	# Don't allow the user to override the key for PRIMARY_HOSTNAME because
+	# that's what's in the main file.
+	ssl_key = os.path.join(env["STORAGE_ROOT"], 'ssl/ssl_private_key.pem')
+	ssl_key_is_alt = False
+	alt_key = os.path.join(env["STORAGE_ROOT"], 'ssl/%s/private_key.pem' % safe_domain_name(domain))
+	if domain != env['PRIMARY_HOSTNAME'] and os.path.exists(alt_key):
+		ssl_key = alt_key
+		ssl_key_is_alt = True
 
-	from cryptography.hazmat.primitives.asymmetric.rsa import RSAPrivateKey
+	# What SSL certificate will we use?
-	from cryptography.x509 import Certificate
+	ssl_certificate_primary = os.path.join(env["STORAGE_ROOT"], 'ssl/ssl_certificate.pem')
+	if domain == env['PRIMARY_HOSTNAME']:
+		# For PRIMARY_HOSTNAME, use the one we generated at set-up time.
+		ssl_certificate = ssl_certificate_primary
+	else:
+		# For other domains, we'll probably use a certificate in a different path.
+		ssl_certificate = os.path.join(env["STORAGE_ROOT"], 'ssl/%s/ssl_certificate.pem' % safe_domain_name(domain))
 
-	# The certificates are all stored here:
+		# But we can be smart and reuse the main SSL certificate if is has
-	ssl_root = os.path.join(env["STORAGE_ROOT"], 'ssl')
+		# a Subject Alternative Name matching this domain. Don't do this if
+		# the user has uploaded a different private key for this domain.
+		if not ssl_key_is_alt:
+			from whats_next import check_certificate
+			if check_certificate(domain, ssl_certificate_primary, None) == "OK":
+				ssl_certificate = ssl_certificate_primary
 
-	# List all of the files in the SSL directory and one level deep.
+	# Where would the CSR go? As with the SSL cert itself, the CSR must be
-	def get_file_list():
+	# different for each domain name.
-		for fn in os.listdir(ssl_root):
+	if domain == env['PRIMARY_HOSTNAME']:
-			fn = os.path.join(ssl_root, fn)
+		csr_path = os.path.join(env["STORAGE_ROOT"], 'ssl/ssl_cert_sign_req.csr')
-			if os.path.isfile(fn):
+	else:
-				yield fn
+		csr_path = os.path.join(env["STORAGE_ROOT"], 'ssl/%s/certificate_signing_request.csr' % safe_domain_name(domain))
-			elif os.path.isdir(fn):
-				for fn1 in os.listdir(fn):
-					fn1 = os.path.join(fn, fn1)
-					if os.path.isfile(fn1):
-						yield fn1
 
-	# Remember stuff.
+	return ssl_key, ssl_certificate, csr_path
-	private_keys = { }
-	certificates = [ ]
 
-	# Scan each of the files to find private keys and certificates.
+def ensure_ssl_certificate_exists(domain, ssl_key, ssl_certificate, csr_path, env):
-	# We must load all of the private keys first before processing
+	# For domains besides PRIMARY_HOSTNAME, generate a self-signed certificate if
-	# certificates so that we can check that we have a private key
+	# a certificate doesn't already exist. See setup/mail.sh for documentation.
-	# available before using a certificate.
-	from status_checks import load_cert_chain, load_pem
-	for fn in get_file_list():
-		try:
-			pem = load_pem(load_cert_chain(fn)[0])
-		except ValueError:
-			# Not a valid PEM format for a PEM type we care about.
-			continue
-
-		# Remember where we got this object.
-		pem._filename = fn
-
-		# Is it a private key?
-		if isinstance(pem, RSAPrivateKey):
-			private_keys[pem.public_key().public_numbers()] = pem
-
-		# Is it a certificate?
-		if isinstance(pem, Certificate):
-			certificates.append(pem)
-
-	# Process the certificates.
-	domains = { }
-	from status_checks import get_certificate_domains
-	for cert in certificates:
-		# What domains is this certificate good for?
-		cert_domains, primary_domain = get_certificate_domains(cert)
-		cert._primary_domain = primary_domain
-
-		# Is there a private key file for this certificate?
-		private_key = private_keys.get(cert.public_key().public_numbers())
-		if not private_key:
-			continue
-		cert._private_key = private_key
-
-		# Add this cert to the list of certs usable for the domains.
-		for domain in cert_domains:
-			domains.setdefault(domain, []).append(cert)
-
-	# Sort the certificates to prefer good ones.
-	import datetime
-	now = datetime.datetime.utcnow()
-	ret = { }
-	for domain, cert_list in domains.items():
-		cert_list.sort(key = lambda cert : (
-			# must be valid NOW
-			cert.not_valid_before <= now <= cert.not_valid_after,
-
-			# prefer one that is not self-signed
-			cert.issuer != cert.subject,
-
-			# prefer one with the expiration furthest into the future so
-			# that we can easily rotate to new certs as we get them
-			cert.not_valid_after,
-
-			# in case a certificate is installed in multiple paths,
-			# prefer the... lexicographically last one?
-			cert._filename,
-
-		), reverse=True)
-		cert = cert_list.pop(0)
-		ret[domain] = {
-			"private-key": cert._private_key._filename,
-			"certificate": cert._filename,
-			"primary-domain": cert._primary_domain,
-			}
-
-	return ret
-
-def get_domain_ssl_files(domain, ssl_certificates, env, allow_missing_cert=False):
-	# Get the default paths.
-	ssl_private_key = os.path.join(os.path.join(env["STORAGE_ROOT"], 'ssl', 'ssl_private_key.pem'))
-	ssl_certificate = os.path.join(os.path.join(env["STORAGE_ROOT"], 'ssl', 'ssl_certificate.pem'))
 
 	if domain == env['PRIMARY_HOSTNAME']:
-		# The primary domain must use the server certificate because
+		return
-		# it is hard-coded in some service configuration files.
-		return ssl_private_key, ssl_certificate, None
 
-	wildcard_domain = re.sub("^[^\.]+", "*", domain)
+	# Sanity check. Shouldn't happen. A non-primary domain might use this
+	# certificate (see above), but then the certificate should exist anyway.
+	if ssl_certificate == os.path.join(env["STORAGE_ROOT"], 'ssl/ssl_certificate.pem'):
+		return
 
-	if domain in ssl_certificates:
+	if os.path.exists(ssl_certificate):
-		cert_info = ssl_certificates[domain]
+		return
-		cert_type = "multi-domain"
-	elif wildcard_domain in ssl_certificates:
-		cert_info = ssl_certificates[wildcard_domain]
-		cert_type = "wildcard"
-	elif not allow_missing_cert:
-		# No certificate is available for this domain! Return default files.
-		ssl_via = "Using certificate for %s." % env['PRIMARY_HOSTNAME']
-		return ssl_private_key, ssl_certificate, ssl_via
-	else:
-		# No certificate is available - and warn appropriately.
-		return None
 
-	# 'via' is a hint to the user about which certificate is in use for the domain
-	if cert_info['certificate'] == os.path.join(env["STORAGE_ROOT"], 'ssl', 'ssl_certificate.pem'):
-		# Using the server certificate.
-		via = "Using same %s certificate as for %s." % (cert_type, env['PRIMARY_HOSTNAME'])
-	elif cert_info['primary-domain'] != domain and cert_info['primary-domain'] in ssl_certificates and cert_info == ssl_certificates[cert_info['primary-domain']]:
-		via = "Using same %s certificate as for %s." % (cert_type, cert_info['primary-domain'])
-	else:
-		via = None # don't show a hint - show expiration info instead
-
-	return cert_info['private-key'], cert_info['certificate'], via
-
-def create_csr(domain, ssl_key, env):
-	return shell("check_output", [
-                "openssl", "req", "-new",
-                "-key", ssl_key,
-                "-sha256",
-                "-subj", "/C=%s/ST=/L=/O=/CN=%s" % (env["CSR_COUNTRY"], domain)])
-
-def install_cert(domain, ssl_cert, ssl_chain, env):
-	if domain not in get_web_domains(env) + get_default_www_redirects(env):
-		return "Invalid domain name."
-
-	# Write the combined cert+chain to a temporary path and validate that it is OK.
-	# The certificate always goes above the chain.
-	import tempfile, os
-	fd, fn = tempfile.mkstemp('.pem')
-	os.write(fd, (ssl_cert + '\n' + ssl_chain).encode("ascii"))
-	os.close(fd)
-
-	# Do validation on the certificate before installing it.
-	from status_checks import check_certificate
-	ssl_private_key = os.path.join(os.path.join(env["STORAGE_ROOT"], 'ssl', 'ssl_private_key.pem'))
-	cert_status, cert_status_details = check_certificate(domain, fn, ssl_private_key)
-	if cert_status != "OK":
-		if cert_status == "SELF-SIGNED":
-			cert_status = "This is a self-signed certificate. I can't install that."
-		os.unlink(fn)
-		if cert_status_details is not None:
-			cert_status += " " + cert_status_details
-		return cert_status
-
-	# Where to put it?
-	if domain == env['PRIMARY_HOSTNAME']:
-		ssl_certificate = os.path.join(os.path.join(env["STORAGE_ROOT"], 'ssl', 'ssl_certificate.pem'))
-	else:
-		# Make a unique path for the certificate.
-		from status_checks import load_cert_chain, load_pem, get_certificate_domains
-		from cryptography.hazmat.primitives import hashes
-		from binascii import hexlify
-		cert = load_pem(load_cert_chain(fn)[0])
-		all_domains, cn = get_certificate_domains(cert)
-		path = "%s-%s-%s" % (
-			cn, # common name
-			cert.not_valid_after.date().isoformat().replace("-", ""), # expiration date
-			hexlify(cert.fingerprint(hashes.SHA256())).decode("ascii")[0:8], # fingerprint prefix
-			)
-		ssl_certificate = os.path.join(os.path.join(env["STORAGE_ROOT"], 'ssl', path, 'ssl_certificate.pem'))
-
-	# Install the certificate.
 	os.makedirs(os.path.dirname(ssl_certificate), exist_ok=True)
-	shutil.move(fn, ssl_certificate)
 
-	ret = ["OK"]
+	# Generate a new self-signed certificate using the same private key that we already have.
 
-	# When updating the cert for PRIMARY_HOSTNAME, also update DNS because it is
+	# Start with a CSR.
-	# used in the DANE TLSA record and restart postfix and dovecot which use
+	shell("check_call", [
-	# that certificate.
+		"openssl", "req", "-new",
-	if domain == env['PRIMARY_HOSTNAME']:
+		"-key", ssl_key,
-		ret.append( do_dns_update(env) )
+		"-out",  csr_path,
+		"-subj", "/C=%s/ST=/L=/O=/CN=%s" % (env["CSR_COUNTRY"], domain)])
 
-		shell('check_call', ["/usr/sbin/service", "postfix", "restart"])
+	# And then make the certificate.
-		shell('check_call', ["/usr/sbin/service", "dovecot", "restart"])
+	shell("check_call", [
-		ret.append("mail services restarted")
+		"openssl", "x509", "-req",
+		"-days", "365",
+		"-in", csr_path,
+		"-signkey", ssl_key,
+		"-out", ssl_certificate])
 
-	# Kick nginx so it sees the cert.
-	ret.append( do_web_update(env) )
-	return "\n".join(ret)
-
-def get_web_domains_info(env):
-	has_root_proxy_or_redirect = get_web_domains_with_root_overrides(env)
-
-	# for the SSL config panel, get cert status
-	def check_cert(domain):
-		from status_checks import check_certificate
-		ssl_certificates = get_ssl_certificates(env)
-		x = get_domain_ssl_files(domain, ssl_certificates, env, allow_missing_cert=True)
-		if x is None: return ("danger", "No Certificate Installed")
-		ssl_key, ssl_certificate, ssl_via = x
-		cert_status, cert_status_details = check_certificate(domain, ssl_certificate, ssl_key)
-		if cert_status == "OK":
-			if not ssl_via:
-				return ("success", "Signed & valid. " + cert_status_details)
-			else:
-				# This is an alternate domain but using the same cert as the primary domain.
-				return ("success", "Signed & valid. " + ssl_via)
-		elif cert_status == "SELF-SIGNED":
-			return ("warning", "Self-signed. Get a signed certificate to stop warnings.")
-		else:
-			return ("danger", "Certificate has a problem: " + cert_status)
-
-	return [
-		{
-			"domain": domain,
-			"root": get_web_root(domain, env),
-			"custom_root": get_web_root(domain, env, test_exists=False),
-			"ssl_certificate": check_cert(domain),
-			"static_enabled": domain not in has_root_proxy_or_redirect,
-		}
-		for domain in get_web_domains(env)
-	] + \
-	[
-		{
-			"domain": domain,
-			"ssl_certificate": check_cert(domain),
-			"static_enabled": False,
-		}
-		for domain in get_default_www_redirects(env)
-	]

management/whats_next.py

@@ -0,0 +1,392 @@
+#!/usr/bin/python3
+#
+# Checks that the upstream DNS has been set correctly and that
+# SSL certificates have been signed, etc., and if not tells the user
+# what to do next.
+
+__ALL__ = ['check_certificate']
+
+import os, os.path, re, subprocess
+
+import dns.reversename, dns.resolver
+
+from dns_update import get_dns_zones
+from web_update import get_web_domains, get_domain_ssl_files
+from mailconfig import get_mail_domains, get_mail_aliases
+
+from utils import shell, sort_domains
+
+def run_checks(env):
+	run_system_checks(env)
+	run_domain_checks(env)
+
+def run_system_checks(env):
+	print("System")
+	print("======")
+
+	# Check that SSH login with password is disabled.
+	sshd = open("/etc/ssh/sshd_config").read()
+	if re.search("\nPasswordAuthentication\s+yes", sshd) \
+		or not re.search("\nPasswordAuthentication\s+no", sshd):
+		print_error("""The SSH server on this machine permits password-based login. A more secure
+			way to log in is using a public key. Add your SSH public key to $HOME/.ssh/authorized_keys, check
+			that you can log in without a password, set the option 'PasswordAuthentication no' in
+			/etc/ssh/sshd_config, and then restart the openssh via 'sudo service ssh restart'.""")
+	else:
+		print_ok("SSH disallows password-based login.")
+
+	# Check that the administrator alias exists since that's where all
+	# admin email is automatically directed.
+	check_alias_exists("administrator@" + env['PRIMARY_HOSTNAME'], env)
+
+	print()
+
+def run_domain_checks(env):
+	# Get the list of domains we handle mail for.
+	mail_domains = get_mail_domains(env)
+
+	# Get the list of domains we serve DNS zones for (i.e. does not include subdomains).
+	dns_zonefiles = dict(get_dns_zones(env))
+	dns_domains = set(dns_zonefiles)
+
+	# Get the list of domains we serve HTTPS for.
+	web_domains = set(get_web_domains(env))
+
+	# Check the domains.
+	for domain in sort_domains(mail_domains | dns_domains | web_domains, env):
+		print(domain)
+		print("=" * len(domain))
+
+		if domain == env["PRIMARY_HOSTNAME"]:
+			check_primary_hostname_dns(domain, env)
+		
+		if domain in dns_domains:
+			check_dns_zone(domain, env, dns_zonefiles)
+		
+		if domain in mail_domains:
+			check_mail_domain(domain, env)
+
+		if domain in web_domains:
+			check_web_domain(domain, env)
+
+		print()
+
+def check_primary_hostname_dns(domain, env):
+	# Check that the ns1/ns2 hostnames resolve to A records. This information probably
+	# comes from the TLD since the information is set at the registrar.
+	ip = query_dns("ns1." + domain, "A") + '/' + query_dns("ns2." + domain, "A")
+	if ip == env['PUBLIC_IP'] + '/' + env['PUBLIC_IP']:
+		print_ok("Nameserver IPs are correct at registrar. [ns1/ns2.%s => %s]" % (env['PRIMARY_HOSTNAME'], env['PUBLIC_IP']))
+	else:
+		print_error("""Nameserver IP addresses are incorrect. The ns1.%s and ns2.%s nameservers must be configured at your domain name
+			registrar as having the IP address %s. They currently report addresses of %s. It may take several hours for
+			public DNS to update after a change."""
+			% (env['PRIMARY_HOSTNAME'], env['PRIMARY_HOSTNAME'], env['PUBLIC_IP'], ip))
+
+	# Check that PRIMARY_HOSTNAME resolves to PUBLIC_IP in public DNS.
+	ip = query_dns(domain, "A")
+	if ip == env['PUBLIC_IP']:
+		print_ok("Domain resolves to box's IP address. [%s => %s]" % (env['PRIMARY_HOSTNAME'], env['PUBLIC_IP']))
+	else:
+		print_error("""This domain must resolve to your box's IP address (%s) in public DNS but it currently resolves
+			to %s. It may take several hours for public DNS to update after a change. This problem may result from other
+			issues listed here."""
+			% (env['PUBLIC_IP'], ip))
+
+	# Check reverse DNS on the PRIMARY_HOSTNAME. Note that it might not be
+	# a DNS zone if it is a subdomain of another domain we have a zone for.
+	ipaddr_rev = dns.reversename.from_address(env['PUBLIC_IP'])
+	existing_rdns = query_dns(ipaddr_rev, "PTR")
+	if existing_rdns == domain:
+		print_ok("Reverse DNS is set correctly at ISP. [%s => %s]" % (env['PUBLIC_IP'], env['PRIMARY_HOSTNAME']))
+	else:
+		print_error("""Your box's reverse DNS is currently %s, but it should be %s. Your ISP or cloud provider will have instructions
+			on setting up reverse DNS for your box at %s.""" % (existing_rdns, domain, env['PUBLIC_IP']) )
+
+	# Check that the hostmaster@ email address exists.
+	check_alias_exists("hostmaster@" + domain, env)
+
+def check_alias_exists(alias, env):
+	mail_alises = dict(get_mail_aliases(env))
+	if alias in mail_alises:
+		print_ok("%s exists as a mail alias [=> %s]" % (alias, mail_alises[alias]))
+	else:
+		print_error("""You must add a mail alias for %s and direct email to you or another administrator.""" % alias)
+
+def check_dns_zone(domain, env, dns_zonefiles):
+	# We provide a DNS zone for the domain. It should have NS records set up
+	# at the domain name's registrar pointing to this box.
+	existing_ns = query_dns(domain, "NS")
+	correct_ns = "ns1.BOX; ns2.BOX".replace("BOX", env['PRIMARY_HOSTNAME'])
+	if existing_ns == correct_ns:
+		print_ok("Nameservers are set correctly at registrar. [%s]" % correct_ns)
+	else:
+		print_error("""The nameservers set on this domain are incorrect. They are currently %s. Use your domain name registar's
+			control panel to set the nameservers to %s."""
+				% (existing_ns, correct_ns) )
+
+	# See if the domain has a DS record set.
+	ds = query_dns(domain, "DS", nxdomain=None)
+	ds_correct = open('/etc/nsd/zones/' + dns_zonefiles[domain] + '.ds').read().strip()
+	ds_expected = re.sub(r"\S+\.\s+3600\s+IN\s+DS\s*", "", ds_correct)
+	if ds == ds_expected:
+		print_ok("DNS 'DS' record is set correctly at registrar.")
+	elif ds == None:
+		print_error("""This domain's DNS DS record is not set. The DS record is optional. The DS record activates DNSSEC.
+			To set a DS record, you must follow the instructions provided by your domain name registrar and provide to them this information:""")
+		print("")
+		print("   " + ds_correct)
+		print("")
+	else:
+		print_error("""This domain's DNS DS record is incorrect. The chain of trust is broken between the public DNS system
+			and this machine's DNS server. It may take several hours for public DNS to update after a change. If you did not recently
+			make a change, you must resolve this immediately by following the instructions provided by your domain name registrar and
+			provide to them this information:""")
+		print("")
+		print("   " + ds_correct)
+		print("")
+
+def check_mail_domain(domain, env):
+	# Check the MX record.
+
+	mx = query_dns(domain, "MX", nxdomain=None)
+	expected_mx = "10 " + env['PRIMARY_HOSTNAME']
+
+	if mx == expected_mx:
+		print_ok("Domain's email is directed to this domain. [%s => %s]" % (domain, mx))
+
+	elif mx == None:
+		# A missing MX record is okay on the primary hostname because
+		# the primary hostname's A record (the MX fallback) is... itself,
+		# which is what we want the MX to be.
+		if domain == env['PRIMARY_HOSTNAME']:
+			print_ok("Domain's email is directed to this domain. [%s has no MX record, which is ok]" % (domain,))
+
+		# And a missing MX record is okay on other domains if the A record
+		# matches the A record of the PRIMARY_HOSTNAME. Actually this will
+		# probably confuse DANE TLSA, but we'll let that slide for now.
+		else:
+			domain_a = query_dns(domain, "A", nxdomain=None)
+			primary_a = query_dns(env['PRIMARY_HOSTNAME'], "A", nxdomain=None)
+			if domain_a != None and domain_a == primary_a:
+				print_ok("Domain's email is directed to this domain. [%s has no MX record but its A record is OK]" % (domain,))
+			else:
+				print_error("""This domain's DNS MX record is not set. It should be '%s'. Mail will not
+					be delivered to this box. It may take several hours for public DNS to update after a
+					change. This problem may result from other issues listed here.""" % (expected_mx,))
+
+	else:
+		print_error("""This domain's DNS MX record is incorrect. It is currently set to '%s' but should be '%s'. Mail will not
+			be delivered to this box. It may take several hours for public DNS to update after a change. This problem may result from
+			other issues listed here.""" % (mx, expected_mx))
+
+	# Check that the postmaster@ email address exists.
+	check_alias_exists("postmaster@" + domain, env)
+
+def check_web_domain(domain, env):
+	# See if the domain's A record resolves to our PUBLIC_IP. This is already checked
+	# for PRIMARY_HOSTNAME, for which it is required for mail specifically. For it and
+	# other domains, it is required to access its website.
+	if domain != env['PRIMARY_HOSTNAME']:
+		ip = query_dns(domain, "A")
+		if ip == env['PUBLIC_IP']:
+			print_ok("Domain resolves to this box's IP address. [%s => %s]" % (domain, env['PUBLIC_IP']))
+		else:
+			print_error("""This domain should resolve to your box's IP address (%s) if you would like the box to serve
+				webmail or a website on this domain. The domain currently resolves to %s in public DNS. It may take several hours for
+				public DNS to update after a change. This problem may result from other issues listed here.""" % (env['PUBLIC_IP'], ip))
+
+	# We need a SSL certificate for PRIMARY_HOSTNAME because that's where the
+	# user will log in with IMAP or webmail. Any other domain we serve a
+	# website for also needs a signed certificate.
+	check_ssl_cert(domain, env)
+
+def query_dns(qname, rtype, nxdomain='[Not Set]'):
+	resolver = dns.resolver.get_default_resolver()
+	try:
+		response = dns.resolver.query(qname, rtype)
+	except (dns.resolver.NoNameservers, dns.resolver.NXDOMAIN, dns.resolver.NoAnswer):
+		# Host did not have an answer for this query; not sure what the
+		# difference is between the two exceptions.
+		return nxdomain
+
+	# There may be multiple answers; concatenate the response. Remove trailing
+	# periods from responses since that's how qnames are encoded in DNS but is
+	# confusing for us.
+	return "; ".join(str(r).rstrip('.') for r in response)
+
+def check_ssl_cert(domain, env):
+	# Check that SSL certificate is signed.
+
+	# Skip the check if the A record is not pointed here.
+	if query_dns(domain, "A") != env['PUBLIC_IP']: return
+
+	# Where is the SSL stored?
+	ssl_key, ssl_certificate, ssl_csr_path = get_domain_ssl_files(domain, env)
+
+	if not os.path.exists(ssl_certificate):
+		print_error("The SSL certificate file for this domain is missing.")
+		return
+
+	# Check that the certificate is good.
+
+	cert_status = check_certificate(domain, ssl_certificate, ssl_key)
+
+	if cert_status == "SELF-SIGNED":
+		fingerprint = shell('check_output', [
+			"openssl",
+			"x509",
+			"-in", ssl_certificate,
+			"-noout",
+			"-fingerprint"
+			])
+		fingerprint = re.sub(".*Fingerprint=", "", fingerprint).strip()
+
+		if domain == env['PRIMARY_HOSTNAME']:
+			print_error("""The SSL certificate for this domain is currently self-signed. You will get a security
+			warning when you check or send email and when visiting this domain in a web browser (for webmail or
+			static site hosting). You may choose to confirm the security exception, but check that the certificate
+			fingerprint matches the following:""")
+			print()
+			print("   " + fingerprint)
+		else:
+			print_error("""The SSL certificate for this domain is currently self-signed. Visitors to a website on
+			this domain will get a security warning. If you are not serving a website on this domain, then it is
+			safe to leave the self-signed certificate in place.""")
+		print()
+		print_block("""You can purchase a signed certificate from many places. You will need to provide this Certificate Signing Request (CSR)
+			to whoever you purchase the SSL certificate from:""")
+		print()
+		print(open(ssl_csr_path).read().strip())
+		print()
+		print_block("""When you purchase an SSL certificate you will receive a certificate in PEM format and possibly a file containing intermediate certificates in PEM format.
+			If you receive intermediate certificates, use a text editor and paste your certificate on top and then the intermediate certificates
+			below it. Save the file and place it onto this machine at %s. Then run "service nginx restart".""" % ssl_certificate)
+
+	elif cert_status == "OK":
+		print_ok("SSL certificate is signed & valid.")
+
+	else:
+		print_error("The SSL certificate has a problem:")
+		print("")
+		print(cert_status)
+		print("")
+
+def check_certificate(domain, ssl_certificate, ssl_private_key):
+	# Use openssl verify to check the status of a certificate.
+
+	# First check that the certificate is for the right domain. The domain
+	# must be found in the Subject Common Name (CN) or be one of the
+	# Subject Alternative Names.
+	cert_dump = shell('check_output', [
+		"openssl", "x509",
+		"-in", ssl_certificate,
+		"-noout", "-text", "-nameopt", "rfc2253",
+		])
+	cert_dump = cert_dump.split("\n")
+	certificate_names = set()
+	while len(cert_dump) > 0:
+		line = cert_dump.pop(0)
+
+		# Grab from the Subject Common Name. We include the indentation
+		# at the start of the line in case maybe the cert includes the
+		# common name of some other referenced entity (which would be
+		# indented, I hope).
+		m = re.match("        Subject: CN=([^,]+)", line)
+		if m:
+			certificate_names.add(m.group(1))
+	
+		# Grab from the Subject Alternative Name, which is a comma-delim
+		# list of names, like DNS:mydomain.com, DNS:otherdomain.com.
+		m = re.match("            X509v3 Subject Alternative Name:", line)
+		if m:
+			names = re.split(",\s*", cert_dump.pop(0).strip())
+			for n in names:
+				m = re.match("DNS:(.*)", n)
+				if m:
+					certificate_names.add(m.group(1))
+
+	if domain is not None and domain not in certificate_names:
+		return "This certificate is for the wrong domain names. It is for %s." % \
+			", ".join(sorted(certificate_names))
+
+	# Second, check that the certificate matches the private key. Get the modulus of the
+	# private key and of the public key in the certificate. They should match. The output
+	# of each command looks like "Modulus=XXXXX".
+	if ssl_private_key is not None:
+		private_key_modulus = shell('check_output', [
+			"openssl", "rsa",
+			"-inform", "PEM",
+			"-noout", "-modulus",
+			"-in", ssl_private_key])
+		cert_key_modulus = shell('check_output', [
+			"openssl", "x509",
+			"-in", ssl_certificate,
+			"-noout", "-modulus"])
+		if private_key_modulus != cert_key_modulus:
+			return "The certificate installed at %s does not correspond to the private key at %s." % (ssl_certificate, ssl_private_key)
+
+	# Next validate that the certificate is valid. This checks whether the certificate
+	# is self-signed, that the chain of trust makes sense, that it is signed by a CA
+	# that Ubuntu has installed on this machine's list of CAs, and I think that it hasn't
+	# expired.
+
+	# In order to verify with openssl, we need to split out any
+	# intermediary certificates in the chain (if any) from our
+	# certificate (at the top). They need to be passed separately.
+
+	cert = open(ssl_certificate).read()
+	m = re.match(r'(-*BEGIN CERTIFICATE-*.*?-*END CERTIFICATE-*)(.*)', cert, re.S)
+	if m == None:
+		return "The certificate file is an invalid PEM certificate."
+	mycert, chaincerts = m.groups()
+
+	# This command returns a non-zero exit status in most cases, so trap errors.
+
+	retcode, verifyoutput = shell('check_output', [
+		"openssl",
+		"verify", "-verbose",
+		"-purpose", "sslserver", "-policy_check",]
+		+ ([] if chaincerts.strip() == "" else ["-untrusted", "/dev/stdin"])
+		+ [ssl_certificate],
+		input=chaincerts.encode('ascii'),
+		trap=True)
+
+	if "self signed" in verifyoutput:
+		# Certificate is self-signed.
+		return "SELF-SIGNED"
+	elif retcode == 0:
+		# Certificate is OK.
+		return "OK"
+	else:
+		return verifyoutput.strip()
+
+def print_ok(message):
+	print_block(message, first_line="✓  ")
+
+def print_error(message):
+	print_block(message, first_line="✖  ")
+
+try:
+	terminal_columns = int(shell('check_output', ['stty', 'size']).split()[1])
+except:
+	terminal_columns = 76
+def print_block(message, first_line="   "):
+	print(first_line, end='')
+	message = re.sub("\n\s*", " ", message)
+	words = re.split("(\s+)", message)
+	linelen = 0
+	for w in words:
+		if linelen + len(w) > terminal_columns-1-len(first_line):
+			print()
+			print("   ", end="")
+			linelen = 0
+		if linelen == 0 and w.strip() == "": continue
+		print(w, end="")
+		linelen += len(w)
+	if linelen > 0:
+		print()
+
+if __name__ == "__main__":
+	from utils import load_environment
+	run_checks(load_environment())

notes/dspam.sh

@@ -0,0 +1,62 @@
+# Spam filtering with dspam.
+#
+# This mostly works. But dspam crashes. So..... we're not using this.
+
+apt-get -q -y install dspam libdspam7-drv-sqlite3 dovecot-antispam dovecot-sieve
+
+# Let it turn on.
+sed -i "s/START=no/START=yes/" /etc/default/dspam 
+
+# Override some of the basic settings that have default values we don't like.
+# Listen as an SMTP server, and pass messages back directly to dovecot.
+tools/editconf.py /etc/dspam/dspam.conf -s \
+	Home=$STORAGE_ROOT/mail/dspam \
+	ServerMode=standard \
+	ServerHost=127.0.0.1 \
+	ServerParameters=--deliver=innocent \
+	DeliveryProto=LMTP \
+	DeliveryHost=/var/run/dovecot/lmtp \
+	Tokenizer=osb
+
+# Put other settings into a local configuration file.
+cat > /etc/dspam/dspam.d/local.conf << EOF;
+IgnoreHeader X-Spam-Status
+IgnoreHeader X-Spam-Scanned
+IgnoreHeader X-Virus-Scanner-Result
+IgnoreHeader X-Virus-Scanned
+IgnoreHeader X-DKIM
+IgnoreHeader DKIM-Signature
+IgnoreHeader DomainKey-Signature
+IgnoreHeader X-Google-Dkim-Signature
+EOF
+
+# Global preferences.
+tools/editconf.py /etc/dspam/default.prefs \
+	spamAction=deliver \
+	signatureLocation=headers \
+	showFactors=on
+
+# Hook into postfix. Replace dovecot with dspam as the mail delivery agent.
+# dspam is configured above to pass mail on to dovecot next.
+tools/editconf.py /etc/postfix/main.cf virtual_transport=lmtp:[127.0.0.1]:2424
+
+# Hook into dovecot... these aren't tested.
+
+# Automatically move spam into a folder called Spam. Enable the sieve plugin.
+# (Note: Be careful if we want to use multiple plugins later.)
+sudo sed -i "s/#mail_plugins = .*/mail_plugins = \$mail_plugins sieve/" /etc/dovecot/conf.d/20-lmtp.conf
+
+# The sieve scripts are installed by users_update.sh.
+
+# to detect when a message moves between folders so we can
+# pass it to dspam for training. (Be careful if we use multiple plugins later.)
+# This is not finished.
+sudo sed -i "s/#mail_plugins = .*/mail_plugins = \$mail_plugins antispam/" /etc/dovecot/conf.d/20-imap.conf
+	
+# Create storage space.
+mkdir -p $STORAGE_ROOT/mail/dspam
+chown dspam:dspam $STORAGE_ROOT/mail/dspam
+
+service dspam restart
+service postfix restart
+

ppa/Makefile

@@ -1,62 +0,0 @@
-POSTGREY_VERSION=1.35-1+miab1
-DOVECOT_VERSION=2.2.9-1ubuntu2.1+miab1
-
-all: clean build_postgrey build_dovecot_lucene
-
-clean:
-	# Clean.
-	rm -rf /tmp/build
-	mkdir -p /tmp/build
-
-build_postgrey: clean
-	# Download the latest Debian postgrey package. It is ahead of Ubuntu,
-	# and we might as well jump ahead.
-	git clone git://git.debian.org/git/collab-maint/postgrey.git /tmp/build/postgrey
-
-	# Download the corresponding upstream package.
-	wget -O /tmp/build/postgrey_1.35.orig.tar.gz http://postgrey.schweikert.ch/pub/postgrey-1.35.tar.gz
-
-	# Add our source patch to the debian packaging listing.
-	cp postgrey_sources.diff /tmp/build/postgrey/debian/patches/mailinabox
-
-	# Patch the packaging to give it a new version.
-	patch -p1 -d /tmp/build/postgrey < postgrey.diff
-
-	# Build the source package.
-	(cd /tmp/build/postgrey; dpkg-buildpackage -S -us -uc -nc)
-
-	# Sign the packages.
-	debsign /tmp/build/postgrey_$(POSTGREY_VERSION)_source.changes
-
-	# Upload to PPA.
-	dput ppa:mail-in-a-box/ppa /tmp/build/postgrey_$(POSTGREY_VERSION)_source.changes
-
-	# Clear the intermediate files.
-	rm -rf /tmp/build/postgrey
-
-	# TESTING BINARY PACKAGE
-	#sudo apt-get build-dep -y postgrey
-	#(cd /tmp/build/postgrey; dpkg-buildpackage -us -uc -nc)
-
-build_dovecot_lucene: clean
-	# Get the upstream source.
-	(cd /tmp/build; apt-get source dovecot)
-
-	# Patch it so that we build dovecot-lucene (and nothing else).
-	patch -p1 -d /tmp/build/dovecot-2.2.9 < dovecot_lucene.diff
-
-	# Build the source package.
-	(cd /tmp/build/dovecot-2.2.9; dpkg-buildpackage -S -us -uc -nc)
-
-	# Sign the packages.
-	debsign /tmp/build/dovecot_$(DOVECOT_VERSION)_source.changes
-
-	# Upload it.
-	dput ppa:mail-in-a-box/ppa /tmp/build/dovecot_$(DOVECOT_VERSION)_source.changes
-
-	# TESTING BINARY PACKAGE
-	# Install build dependencies and build dependencies we've added in our patch,
-	# and then build the binary package.
-	#sudo apt-get build-dep -y dovecot
-	#sudo apt-get install libclucene-dev liblzma-dev libexttextcat-dev libstemmer-dev
-	#(cd /tmp/build/dovecot-2.2.9; dpkg-buildpackage -us -uc -nc)

ppa/README.md

@@ -1,40 +0,0 @@
-ppa instructions
-================
-
-Mail-in-a-Box maintains a Launchpad.net PPA ([Mail-in-a-Box PPA](https://launchpad.net/~mail-in-a-box/+archive/ubuntu/ppa)) for additional deb's that we want to have installed on systems.
-
-Packages
---------
-
-* postgrey, a fork of [postgrey](http://postgrey.schweikert.ch/) based on the [latest Debian package](http://git.debian.org/?p=collab-maint/postgrey.git), with a modification to whitelist senders that are whitelisted by [dnswl.org](https://www.dnswl.org/) (i.e. don't greylist mail from known good senders).
-
-* dovecot-lucene, [dovecot's lucene full text search plugin](http://wiki2.dovecot.org/Plugins/FTS/Lucene), which isn't built by Ubuntu's dovecot package maintainer unfortunately.
-
-Building
---------
-
-To rebuild the packages in the PPA, you'll need to be @JoshData.
-
-First:
-
-* You should have an account on Launchpad.net.
-* Your account should have your GPG key set (to the fingerprint of a GPG key on your system matching the identity at the top of the debian/changelog files).
-* You should have write permission to the PPA.
-
-To build:
-
-	# Start a clean VM.
-	vagrant up
-
-	# Put your signing keys (on the host machine) into the VM (so it can sign the debs).
-	gpg --export-secret-keys | vagrant ssh -- gpg --import
-
-	# Build & upload to launchpad.
-	vagrant ssh -- "cd /vagrant && make"
-
-Mail-in-a-Box adds our PPA during setup, but if you need to do that yourself for testing:
-
-	apt-add-repository ppa:mail-in-a-box/ppa
-	apt-get update
-	apt-get install postgrey dovecot-lucene
-

ppa/Vagrantfile

@@ -1,12 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant.configure("2") do |config|
-  config.vm.box = "ubuntu14.04"
-  config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box"
-
-  config.vm.provision :shell, :inline => <<-SH
-    sudo apt-get update
-    sudo apt-get install -y git dpkg-dev devscripts dput
-SH
-end

ppa/dovecot_lucene.diff

@@ -1,319 +0,0 @@
---- a/debian/control
-+++ b/debian/control
-@@ -1,210 +1,23 @@
- Source: dovecot
- Section: mail
- Priority: optional
--Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
--XSBC-Original-Maintainer: Dovecot Maintainers <jaldhar-dovecot@debian.org>
--Uploaders: Jaldhar H. Vyas <jaldhar@debian.org>, Fabio Tranchitella <kobold@debian.org>, Joel Johnson <mrjoel@lixil.net>, Marco Nenciarini <mnencia@debian.org>
--Build-Depends: debhelper (>= 7.2.3~), dpkg-dev (>= 1.16.1), pkg-config, libssl-dev, libpam0g-dev, libldap2-dev, libpq-dev, libmysqlclient-dev, libsqlite3-dev, libsasl2-dev, zlib1g-dev, libkrb5-dev, drac-dev (>= 1.12-5), libbz2-dev, libdb-dev, libcurl4-gnutls-dev, libexpat-dev, libwrap0-dev, dh-systemd, po-debconf, lsb-release, hardening-wrapper, dh-autoreconf, autotools-dev
-+Maintainer: Joshua Tauberer <jt@occams.info>
-+XSBC-Original-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-+Build-Depends: debhelper (>= 7.2.3~), dpkg-dev (>= 1.16.1), pkg-config, libssl-dev, libpam0g-dev, libldap2-dev, libpq-dev, libmysqlclient-dev, libsqlite3-dev, libsasl2-dev, zlib1g-dev, libkrb5-dev, drac-dev (>= 1.12-5), libbz2-dev, libdb-dev, libcurl4-gnutls-dev, libexpat-dev, libwrap0-dev, dh-systemd, po-debconf, lsb-release, libclucene-dev (>= 2.3), liblzma-dev, libexttextcat-dev, libstemmer-dev, hardening-wrapper, dh-autoreconf, autotools-dev
- Standards-Version: 3.9.4
- Homepage: http://dovecot.org/
--Vcs-Git: git://git.debian.org/git/collab-maint/dovecot.git
--Vcs-Browser: http://git.debian.org/?p=collab-maint/dovecot.git
-+Vcs-Git: https://github.com/mail-in-a-box/mailinabox
-+Vcs-Browser: https://github.com/mail-in-a-box/mailinabox
- 
--Package: dovecot-core
-+Package: dovecot-lucene
- Architecture: any
--Depends: ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 0.76-13.1), openssl, adduser, ucf (>= 2.0020), ssl-cert (>= 1.0-11ubuntu1), lsb-base (>= 3.2-12ubuntu3)
--Suggests: ntp, dovecot-gssapi, dovecot-sieve, dovecot-pgsql, dovecot-mysql, dovecot-sqlite, dovecot-ldap, dovecot-imapd, dovecot-pop3d, dovecot-lmtpd, dovecot-managesieved, dovecot-solr, ufw
--Recommends: ntpdate
--Provides: dovecot-common
--Replaces: dovecot-common (<< 1:2.0.14-2~), mailavenger (<< 0.8.1-4)
--Breaks: dovecot-common (<< 1:2.0.14-2~), mailavenger (<< 0.8.1-4)
--Description: secure POP3/IMAP server - core files
-+Depends: ${shlibs:Depends}, ${misc:Depends}, dovecot-core (>= 1:2.2.9-1ubuntu2.1)
-+Description: secure POP3/IMAP server - Lucene support
-  Dovecot is a mail server whose major goals are security and extreme
-  reliability. It tries very hard to handle all error conditions and verify
-  that all data is valid, making it nearly impossible to crash. It supports
-  mbox/Maildir and its own dbox/mdbox formats, and should also be pretty
-  fast, extensible, and portable.
-  .
-- This package contains the Dovecot main server and its command line utility.
--
--Package: dovecot-dev
--Architecture: any
--Depends: ${shlibs:Depends}, ${misc:Depends}, dovecot-core (= ${binary:Version})
--Replaces: dovecot-common (<< 1:2.0.14-2~)
--Breaks: dovecot-common (<< 1:2.0.14-2~)
--Description: secure POP3/IMAP server - header files
-- Dovecot is a mail server whose major goals are security and extreme
-- reliability. It tries very hard to handle all error conditions and verify
-- that all data is valid, making it nearly impossible to crash. It supports
-- mbox/Maildir and its own dbox/mdbox formats, and should also be pretty
-- fast, extensible, and portable.
-- .
-- This package contains header files needed to compile plugins for the Dovecot
-- mail server.
--
--Package: dovecot-imapd
--Architecture: any
--Depends: ${shlibs:Depends}, ${misc:Depends}, dovecot-core (= ${binary:Version}), ucf (>= 2.0020)
--Provides: imap-server
--Description: secure POP3/IMAP server - IMAP daemon
-- Dovecot is a mail server whose major goals are security and extreme
-- reliability. It tries very hard to handle all error conditions and verify
-- that all data is valid, making it nearly impossible to crash. It supports
-- mbox/Maildir and its own dbox/mdbox formats, and should also be pretty
-- fast, extensible, and portable.
-- .
-- This package contains the Dovecot IMAP server.
--
--Package: dovecot-pop3d
--Architecture: any
--Depends: ${shlibs:Depends}, ${misc:Depends}, dovecot-core (= ${binary:Version}), ucf (>= 2.0020)
--Provides: pop3-server
--Description: secure POP3/IMAP server - POP3 daemon
-- Dovecot is a mail server whose major goals are security and extreme
-- reliability. It tries very hard to handle all error conditions and verify
-- that all data is valid, making it nearly impossible to crash. It supports
-- mbox/Maildir and its own dbox/mdbox formats, and should also be pretty
-- fast, extensible, and portable.
-- .
-- This package contains the Dovecot POP3 server.
--
--Package: dovecot-lmtpd
--Architecture: any
--Depends: ${shlibs:Depends}, ${misc:Depends}, dovecot-core (= ${binary:Version}), ucf (>= 2.0020)
--Replaces: dovecot-common (<< 1:2.0.14-2~)
--Breaks: dovecot-common (<< 1:2.0.14-2~)
--Description: secure POP3/IMAP server - LMTP server
-- Dovecot is a mail server whose major goals are security and extreme
-- reliability. It tries very hard to handle all error conditions and verify
-- that all data is valid, making it nearly impossible to crash. It supports
-- mbox/Maildir and its own dbox/mdbox formats, and should also be pretty
-- fast, extensible, and portable.
-- .
-- This package contains the Dovecot LMTP server.
--
--Package: dovecot-managesieved
--Architecture: any
--Depends: ${shlibs:Depends}, ${misc:Depends}, dovecot-core (= ${binary:Version}), dovecot-sieve (= ${binary:Version}), ucf (>= 2.0020)
--Replaces: dovecot-common (<< 1:2.0.14-2~)
--Breaks: dovecot-common (<< 1:2.0.14-2~)
--Description: secure POP3/IMAP server - ManageSieve server
-- Dovecot is a mail server whose major goals are security and extreme
-- reliability. It tries very hard to handle all error conditions and verify
-- that all data is valid, making it nearly impossible to crash. It supports
-- mbox/Maildir and its own dbox/mdbox formats, and should also be pretty
-- fast, extensible, and portable.
-- .
-- This package contains the Dovecot ManageSieve server.
--
--Package: dovecot-pgsql
--Architecture: any
--Depends: ${shlibs:Depends}, ${misc:Depends}, dovecot-core (= ${binary:Version})
--Description: secure POP3/IMAP server - PostgreSQL support
-- Dovecot is a mail server whose major goals are security and extreme
-- reliability. It tries very hard to handle all error conditions and verify
-- that all data is valid, making it nearly impossible to crash. It supports
-- mbox/Maildir and its own dbox/mdbox formats, and should also be pretty
-- fast, extensible, and portable.
-- .
-- This package provides PostgreSQL support for Dovecot.
--
--Package: dovecot-mysql
--Architecture: any
--Depends: ${shlibs:Depends}, ${misc:Depends}, dovecot-core (= ${binary:Version})
--Description: secure POP3/IMAP server - MySQL support
-- Dovecot is a mail server whose major goals are security and extreme
-- reliability. It tries very hard to handle all error conditions and verify
-- that all data is valid, making it nearly impossible to crash. It supports
-- mbox/Maildir and its own dbox/mdbox formats, and should also be pretty
-- fast, extensible, and portable.
-- .
-- This package provides MySQL support for Dovecot.
--
--Package: dovecot-sqlite
--Architecture: any
--Depends: ${shlibs:Depends}, ${misc:Depends}, dovecot-core (= ${binary:Version})
--Description: secure POP3/IMAP server - SQLite support
-- Dovecot is a mail server whose major goals are security and extreme
-- reliability. It tries very hard to handle all error conditions and verify
-- that all data is valid, making it nearly impossible to crash. It supports
-- mbox/Maildir and its own dbox/mdbox formats, and should also be pretty
-- fast, extensible, and portable.
-- .
-- This package provides SQLite support for Dovecot.
--
--Package: dovecot-ldap
--Architecture: any
--Depends: ${shlibs:Depends}, ${misc:Depends}, dovecot-core (= ${binary:Version}), ucf (>= 2.0020)
--Description: secure POP3/IMAP server - LDAP support
-- Dovecot is a mail server whose major goals are security and extreme
-- reliability. It tries very hard to handle all error conditions and verify
-- that all data is valid, making it nearly impossible to crash. It supports
-- mbox/Maildir and its own dbox/mdbox formats, and should also be pretty
-- fast, extensible, and portable.
-- .
-- This package provides LDAP support for Dovecot.
--
--Package: dovecot-gssapi
--Architecture: any
--Depends: ${shlibs:Depends}, ${misc:Depends}, dovecot-core (= ${binary:Version})
--Description: secure POP3/IMAP server - GSSAPI support
-- Dovecot is a mail server whose major goals are security and extreme
-- reliability. It tries very hard to handle all error conditions and verify
-- that all data is valid, making it nearly impossible to crash. It supports
-- mbox/Maildir and its own dbox/mdbox formats, and should also be pretty
-- fast, extensible, and portable.
-- .
-- This package provides GSSAPI authentication support for Dovecot.
--
--Package: dovecot-sieve
--Architecture: any
--Depends: ${shlibs:Depends}, ${misc:Depends}, dovecot-core (= ${binary:Version}), ucf (>= 2.0020)
--Description: secure POP3/IMAP server - Sieve filters support
-- Dovecot is a mail server whose major goals are security and extreme
-- reliability. It tries very hard to handle all error conditions and verify
-- that all data is valid, making it nearly impossible to crash. It supports
-- mbox/Maildir and its own dbox/mdbox formats, and should also be pretty
-- fast, extensible, and portable.
-- .
-- This package provides Sieve filters support for Dovecot.
--
--Package: dovecot-solr
--Architecture: any
--Depends: ${shlibs:Depends}, ${misc:Depends}, dovecot-core (= ${binary:Version})
--Description: secure POP3/IMAP server - Solr support
-- Dovecot is a mail server whose major goals are security and extreme
-- reliability. It tries very hard to handle all error conditions and verify
-- that all data is valid, making it nearly impossible to crash. It supports
-- mbox/Maildir and its own dbox/mdbox formats, and should also be pretty
-- fast, extensible, and portable.
-- .
-- This package provides Solr full text search support for Dovecot.
--
--Package: dovecot-dbg
--Section: debug
--Priority: extra
--Architecture: any
--Depends: ${misc:Depends}, dovecot-core (= ${binary:Version})
--Description: secure POP3/IMAP server - debug symbols
-- Dovecot is a mail server whose major goals are security and extreme
-- reliability. It tries very hard to handle all error conditions and verify
-- that all data is valid, making it nearly impossible to crash. It supports
-- mbox/Maildir and its own dbox/mdbox formats, and should also be pretty
-- fast, extensible, and portable.
-- .
-- This package contains debug symbols for Dovecot.
--
--Package: mail-stack-delivery
--Architecture: all
--Depends: dovecot-core, dovecot-imapd, dovecot-pop3d, dovecot-managesieved,
-- postfix, ${misc:Depends}
--Replaces: dovecot-postfix (<< 1:1.2.12-0ubuntu1~)
--Description: mail server delivery agent stack provided by Ubuntu server team
-- Ubuntu's mail stack provides fully operational delivery with
-- safe defaults and additional options. Out of the box it supports IMAP,
-- POP3 and SMTP services with SASL authentication and Maildir as default
-- storage engine.
-- .
-- This package contains configuration files for dovecot.
-- .
-- This package modifies postfix's configuration to integrate with dovecot
-+ This package provides Lucene full text search support for Dovecot. It has been modified by Mail-in-a-Box
-+ to supply a dovecot-lucene package compatible with the official ubuntu trusty dovecot-core.
-
-diff --git a/debian/dovecot-lucene.links b/debian/dovecot-lucene.links
-new file mode 100644
-index 0000000..6ffcbeb
---- /dev/null
-+++ b/debian/dovecot-lucene.links
-@@ -0,0 +1 @@
-+/usr/share/bug/dovecot-core /usr/share/bug/dovecot-lucene
-diff --git a/debian/dovecot-lucene.lintian-overrides b/debian/dovecot-lucene.lintian-overrides
-new file mode 100644
-index 0000000..60d90fd
---- /dev/null
-+++ b/debian/dovecot-lucene.lintian-overrides
-@@ -0,0 +1,2 @@
-+dovecot-lucene: hardening-no-fortify-functions usr/lib/dovecot/modules/lib21_fts_lucene_plugin.so
-+
-diff --git a/debian/dovecot-lucene.substvars b/debian/dovecot-lucene.substvars
-new file mode 100644
-index 0000000..ed54f36
---- /dev/null
-+++ b/debian/dovecot-lucene.substvars
-@@ -0,0 +1,2 @@
-+shlibs:Depends=libc6 (>= 2.4), libclucene-core1 (>= 2.3.3.4), libgcc1 (>= 1:4.1.1), libstdc++6 (>= 4.1.1), libstemmer0d (>= 0+svn527)
-+misc:Depends=
-diff --git a/debian/dovecot-lucene.triggers b/debian/dovecot-lucene.triggers
-new file mode 100644
-index 0000000..3d933a5
---- /dev/null
-+++ b/debian/dovecot-lucene.triggers
-@@ -0,0 +1 @@
-+activate register-dovecot-plugin
---- a/debian/rules
-+++ b/debian/rules
-@@ -40,6 +40,7 @@
- 		        --with-solr \
- 	            --with-ioloop=best \
- 	            --with-libwrap \
-+	            --with-lucene \
- 	            --host=$(DEB_HOST_GNU_TYPE) \
- 	            --build=$(DEB_BUILD_GNU_TYPE) \
- 	            --prefix=/usr \
-@@ -95,6 +96,10 @@
- 	dh_testroot
- 	dh_clean -k
- 	dh_installdirs
-+	mkdir -p $(CURDIR)/debian/dovecot-lucene/usr/lib/dovecot/modules
-+	mv $(CURDIR)/src/plugins/fts-lucene/.libs/* $(CURDIR)/debian/dovecot-lucene/usr/lib/dovecot/modules/
-+
-+rest_disabled_by_miab:
- 	$(MAKE) install DESTDIR=$(CURDIR)/debian/dovecot-core
- 	$(MAKE) -C $(PIGEONHOLE_DIR) install DESTDIR=$(CURDIR)/debian/dovecot-core
- 	rm `find $(CURDIR)/debian -name '*.la'`
-@@ -209,7 +214,7 @@
- 	dh_installdocs -a
- 	dh_installexamples -a
- 	dh_installpam -a
--	mv $(CURDIR)/debian/dovecot-core/etc/pam.d/dovecot-core $(CURDIR)/debian/dovecot-core/etc/pam.d/dovecot
-+	#	mv $(CURDIR)/debian/dovecot-core/etc/pam.d/dovecot-core $(CURDIR)/debian/dovecot-core/etc/pam.d/dovecot
- 	dh_systemd_enable
- 	dh_installinit -pdovecot-core --name=dovecot
- 	dh_systemd_start
-@@ -220,10 +225,10 @@
- 	dh_lintian -a
- 	dh_installchangelogs -a ChangeLog
- 	dh_link -a
--	dh_strip -a --dbg-package=dovecot-dbg
-+	#dh_strip -a --dbg-package=dovecot-dbg
- 	dh_compress -a
- 	dh_fixperms -a
--	chmod 0700 debian/dovecot-core/etc/dovecot/private
-+	#chmod 0700 debian/dovecot-core/etc/dovecot/private
- 	dh_makeshlibs -a -n
- 	dh_installdeb -a
- 	dh_shlibdeps -a
---- a/debian/changelog
-+++ a/debian/changelog
-@@ -1,3 +1,9 @@
-+dovecot (1:2.2.9-1ubuntu2.1+miab1) trusty; urgency=low
-+
-+  * Changed to just build dovecot-lucene for Mail-in-a-box PPA
-+
-+ -- Joshua Tauberer <jt@occams.info>  Sat, 14 May 2015 16:13:00 -0400
-+
- dovecot (1:2.2.9-1ubuntu2.1) trusty-security; urgency=medium
- 
-   * SECURITY UPDATE: denial of service via SSL connection exhaustion
---- a/debian/copyright	2014-03-07 07:26:37.000000000 -0500
-+++ b/debian/copyright	2015-05-23 18:17:42.668005535 -0400
-@@ -1,3 +1,7 @@
-+This package is a fork by Mail-in-a-box (https://mailinabox.email). Original 
-+copyright statement follows:
-+----------------------------------------------------------------------------
-+
- This package was debianized by Jaldhar H. Vyas <jaldhar@debian.org> on
- Tue,  3 Dec 2002 01:10:07 -0500.
- 

ppa/postgrey.diff

@@ -1,80 +0,0 @@
-diff --git a/debian/NEWS b/debian/NEWS
-index dd09744..de7b640 100644
---- a/debian/NEWS
-+++ b/debian/NEWS
-@@ -1,3 +1,9 @@
-+postgrey (1.35-1+miab1)
-+
-+  Added DNSWL.org whitelisting.
-+
-+ -- Joshua Tauberer <jt@occams.info>  Mon May 18 18:58:40 EDT 2015
-+
- postgrey (1.32-1) unstable; urgency=low
- 
-   Postgrey is now listening to port 10023 and not 60000.  The latter was an
-diff --git a/debian/changelog b/debian/changelog
-index 1058e15..e5e3557 100644
---- a/debian/changelog
-+++ b/debian/changelog
-@@ -1,3 +1,9 @@
-+postgrey (1.35-1+miab1) trusty; urgency=low
-+
-+  * Added DNSWL.org whitelisting.
-+
-+ -- Joshua Tauberer <jt@occams.info>  Mon, 18 May 2015 21:58:40 +0000
-+
- postgrey (1.35-1) unstable; urgency=low
- 
-   * New upstream release (Closes: 756486)
-diff --git a/debian/control b/debian/control
-index ce12ba6..0a82855 100644
---- a/debian/control
-+++ b/debian/control
-@@ -1,14 +1,11 @@
- Source: postgrey
- Section: mail
- Priority: optional
--Maintainer: Antonio Radici <antonio@debian.org>
--Uploaders: Jon Daley <jondaley-guest@alioth.debian.org>
-+Maintainer: Joshua Tauberer <jt@occams.info>
- Build-Depends: debhelper (>= 7), quilt
- Build-Depends-Indep: po-debconf
- Standards-Version: 3.9.6
- Homepage: http://postgrey.schweikert.ch/
--Vcs-Browser: http://git.debian.org/?p=collab-maint/postgrey.git
--Vcs-Git: git://git.debian.org/git/collab-maint/postgrey.git
- 
- Package: postgrey
- Architecture: all
-@@ -25,3 +22,6 @@ Description: greylisting implementation for Postfix
-  .
-  While Postgrey is designed for use with Postfix, it can also be used
-  with Exim.
-+ .
-+ This version has been modified by Mail-in-a-Box to whitelist senders
-+ in the DNSWL.org list. See https://mailinabox.email.
-diff --git a/debian/copyright b/debian/copyright
-index 3cbe377..bf09b89 100644
---- a/debian/copyright
-+++ b/debian/copyright
-@@ -1,6 +1,10 @@
-+This package is a fork by Mail-in-a-Box (https://mailinabox.email). Original
-+copyright statement follows:
-+----------------------------------------------------------------------------
-+
- This Debian package was prepared by Adrian von Bidder <cmot@debian.org> in
- July 2004, then the package was adopted by Antonio Radici <antonio@dyne.org>
--in Sept 2009
-+in Sept 2009.
- 
- It was downloaded from http://postgrey.schweikert.ch/
- 
-diff --git a/debian/patches/series b/debian/patches/series
-index f4c5e31..3cd62b8 100644
---- a/debian/patches/series
-+++ b/debian/patches/series
-@@ -1,3 +1,3 @@
- imported-upstream-diff
- disable-transaction-logic
--
-+mailinabox

ppa/postgrey_sources.diff

@@ -1,100 +0,0 @@
-Description: whitelist whatever dnswl.org whitelists
- .
- postgrey (1.35-1+miab1) unstable; urgency=low
- .
-   * Added DNSWL.org whitelisting.
-Author: Joshua Tauberer <jt@occams.info>
-
---- postgrey-1.35.orig/README
-+++ postgrey-1.35/README
-@@ -13,7 +13,7 @@ Requirements
- - BerkeleyDB (Perl Module)
- - Berkeley DB >= 4.1 (Library)
- - Digest::SHA (Perl Module, only for --privacy option)
--
-+- Net::DNS (Perl Module)
- 
- Documentation
- -------------
---- postgrey-1.35.orig/postgrey
-+++ postgrey-1.35/postgrey
-@@ -18,6 +18,7 @@ use Fcntl ':flock'; # import LOCK_* cons
- use Sys::Hostname;
- use Sys::Syslog; # used only to find out which version we use
- use POSIX qw(strftime setlocale LC_ALL);
-+use Net::DNS; # for DNSWL.org whitelisting
- 
- use vars qw(@ISA);
- @ISA = qw(Net::Server::Multiplex);
-@@ -26,6 +27,8 @@ my $VERSION = '1.35';
- my $DEFAULT_DBDIR = '/var/lib/postgrey';
- my $CONFIG_DIR = '/etc/postgrey';
- 
-+my $dns_resolver = Net::DNS::Resolver->new;
-+
- sub cidr_parse($)
- {
-     defined $_[0] or return undef;
-@@ -48,6 +51,36 @@ sub cidr_match($$$)
-     return ($addr & $mask) == $net;
- }
- 
-+sub reverseDottedQuad {
-+    # This is the sub _chkValidPublicIP from Net::DNSBL by PJ Goodwin
-+    # at http://www.the42.net/net-dnsbl.
-+    my ($quad) = @_;
-+    if ($quad =~ /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/) {
-+        my ($ip1,$ip2,$ip3,$ip4) = ($1, $2, $3, $4);
-+        if (
-+           $ip1 == 10 ||                               #10.0.0.0/8 (10/8)
-+          ($ip1 == 172 && $ip2 >= 16 && $ip2 <= 31) || #172.16.0.0/12 (172.16/12)
-+          ($ip1 == 192 && $ip2 == 168) ||              #192.168.0.0/16 (192.168/16)
-+           $quad eq '127.0.0.1'                        # localhost
-+           ) {
-+            # toss the RFC1918 specified privates
-+            return undef;
-+        } elsif (
-+          ($ip1 <= 1 || $ip1 > 254) ||
-+          ($ip2 < 0  || $ip2 > 255) ||
-+          ($ip3 < 0  || $ip3 > 255) ||
-+          ($ip4 < 0  || $ip4 > 255)
-+           ) {
-+            #invalid oct, toss it;
-+            return undef;
-+        }
-+        my $revquad = $ip4 . "." . $ip3 . "." . $ip2 . "." . $ip1;
-+        return $revquad;
-+    } else { # invalid quad
-+        return undef;
-+    }
-+}
-+
- sub read_clients_whitelists($)
- {
-     my ($self) = @_;
-@@ -361,6 +394,25 @@ sub smtpd_access_policy($$)
-         }
-     }
- 
-+    # whitelist clients in dnswl.org
-+    my $revip = reverseDottedQuad($attr->{client_address});
-+    if ($revip) { # valid IP / plausibly in DNSWL
-+        my $answer = $dns_resolver->send($revip . '.list.dnswl.org');
-+        if ($answer && scalar($answer->answer) > 0) {
-+            my @rrs = $answer->answer;
-+            if ($rrs[0]->type eq 'A' && $rrs[0]->address ne '127.0.0.255') {
-+                # Address appears in DNSWL. (127.0.0.255 means we were rate-limited.)
-+                my $code = $rrs[0]->address;
-+		if ($code =~ /^127.0.(\d+)\.([0-3])$/) {
-+                    my %dnswltrust = (0 => 'legitimate', 1 => 'occasional spam', 2 => 'rare spam', 3 => 'highly unlikely to send spam');
-+                    $code = $2 . '/' . $dnswltrust{$2};
-+                }
-+                $self->mylog_action($attr, 'pass', 'client whitelisted by dnswl.org (' . $code . ')');
-+                return 'DUNNO';
-+            }
-+        }
-+    }
-+
-     # auto whitelist clients (see below for explanation)
-     my ($cawl_db, $cawl_key, $cawl_count, $cawl_last);
-     if($self->{postgrey}{awl_clients}) {

security.md

@@ -1,112 +0,0 @@
-Mail-in-a-Box Security Guide
-============================
-
-Mail-in-a-Box turns a fresh Ubuntu 14.04 LTS 64-bit machine into a mail server appliance by installing and configuring various components.
-
-This page documents the security features of Mail-in-a-Box. The term “box” is used below to mean a configured Mail-in-a-Box.
-
-Threat Model
-------------
-
-Nothing is perfectly secure, and an adversary with sufficient resources can always penetrate a system.
-
-The primary goal of Mail-in-a-Box is to make deploying a good mail server easy, so we balance ― as everyone does ― privacy and security concerns with the practicality of actually deploying the system. That means we make certain assumptions about adversaries. We assume that adversaries . . .
-
-* Do not have physical access to the box (i.e., we do not aim to protect the box from physical access).
-* Have not been given Unix accounts on the box (i.e., we assume all users with shell access are trusted).
-
-On the other hand, we do assume that adversaries are performing passive surveillance and, possibly, active man-in-the-middle attacks. And so:
-
-* User credentials are always sent through SSH/TLS, never in the clear, with modern TLS settings.
-* Outbound mail is sent with the highest level of TLS possible.
-* The box advertises its support for [DANE TLSA](https://en.wikipedia.org/wiki/DNS-based_Authentication_of_Named_Entities), when DNSSEC is enabled at the domain name registrar, so that inbound mail is more likely to be transmitted securely.
-
-Additional details follow.
-
-User Credentials
-----------------
-
-The box's administrator and its (non-administrative) mail users must sometimes communicate their credentials to the box.
-
-### Services behind TLS
-
-These services are protected by [TLS](https://en.wikipedia.org/wiki/Transport_Layer_Security):
-
-* SMTP Submission (port 587). Mail users submit outbound mail through SMTP with STARTTLS on port 587.
-* IMAP/POP (ports 993, 995). Mail users check for incoming mail through IMAP or POP over TLS.
-* HTTPS (port 443). Webmail, the Exchange/ActiveSync protocol, the administrative control panel, and any static hosted websites are accessed over HTTPS.
-
-The services all follow these rules:
-
-* SSL certificates are generated with 2048-bit RSA keys and SHA-256 fingerprints. The box provides a self-signed certificate by default. The [setup guide](https://mailinabox.email/guide.html) explains how to verify the certificate fingerprint on first login. Users are encouraged to replace the certificate with a proper CA-signed one. ([source](setup/ssl.sh))
-* Only TLSv1, TLSv1.1 and TLSv1.2 are offered (the older SSL protocols are not offered).
-* Export-grade ciphers, the anonymous DH/ECDH algorithms (aNULL), and clear-text ciphers (eNULL) are not offered.
-* The minimum cipher key length offered is 112 bits. The maximum is 256 bits. Diffie-Hellman ciphers use a 2048-bit key for forward secrecy.
-
-Additionally:
-
-* SMTP Submission (port 587) will not accept user credentials without STARTTLS (true also of SMTP on port 25 in case of client misconfiguration), and the submission port won't accept mail without encryption. The minimum cipher key length is 128 bits. (The box is of course configured not to be an open relay. User credentials are required to send outbound mail.) ([source](setup/mail-postfix.sh))
-* HTTPS (port 443): The HTTPS Strict Transport Security header is set. A redirect from HTTP to HTTPS is offered. The [Qualys SSL Labs test](https://www.ssllabs.com/ssltest) should report an A+ grade. ([source 1](conf/nginx-ssl.conf), [source 2](conf/nginx.conf))
-
-For more details, see the [output of SSLyze for these ports](tests/tls_results.txt).
-
-The cipher and protocol selection are chosen to support the following clients:
-
-* For HTTPS: Firefox 1, Chrome 1, IE 7, Opera 5, Safari 1, Windows XP IE8, Android 2.3, Java 7.
-* For other protocols: TBD.
-
-### Password Storage
-
-The passwords for mail users are stored on disk using the [SHA512-CRYPT](http://man7.org/linux/man-pages/man3/crypt.3.html) hashing scheme. ([source](management/mailconfig.py))
-
-When using the web-based administrative control panel, after logging in an API key is placed in the browser's local storage (rather than, say, the user's actual password). The API key is an HMAC based on the user's email address and current password, and it is keyed by a secret known only to the control panel service. By resetting an administrator's password, any HMACs previously generated for that user will expire.
-
-### Console access
-
-Console access (e.g. via SSH) is configured by the system image used to create the box, typically from by a cloud virtual machine provider (e.g. Digital Ocean). Mail-in-a-Box does not set any console access settings, although it will warn the administrator in the System Status Checks if password-based login is turned on.
-
-The [setup guide video](https://mailinabox.email/) explains how to verify the host key fingerprint on first login.
-
-If DNSSEC is enabled at the box's domain name's registrar, the SSHFP record that the box automatically puts into DNS can also be used to verify the host key fingerprint by setting `VerifyHostKeyDNS yes` in your `ssh/.config` file or by logging in with `ssh -o VerifyHostKeyDNS=yes`. ([source](management/dns_update.py))
-
-Outbound Mail
--------------
-
-The basic protocols of email delivery did not plan for the presence of adversaries on the network. For a number of reasons it is not possible in most cases to guarantee that a connection to a recipient server is secure.
-
-### DNSSEC
-
-The first step in resolving the destination server for an email address is performing a DNS look-up for the MX record of the domain name. The box uses a locally-running [DNSSEC](https://en.wikipedia.org/wiki/DNSSEC)-aware nameserver to perform the lookup. If the domain name has DNSSEC enabled, DNSSEC guards against DNS records being tampered with.
-
-### Encryption
-
-The box (along with the vast majority of mail servers) uses [opportunistic encryption](https://en.wikipedia.org/wiki/Opportunistic_encryption), meaning the mail is encrypted in transit and protected from passive eavesdropping, but it is not protected from an active man-in-the-middle attack. Modern encryption settings will be used to the extent the recipient server supports them. ([source](setup/mail-postfix.sh))
-
-### DANE
-
-If the recipient's domain name supports DNSSEC and has published a [DANE TLSA](https://en.wikipedia.org/wiki/DNS-based_Authentication_of_Named_Entities) record, then on-the-wire encryption is forced between the box and the recipient MTA and this encryption is not subject to a man-in-the-middle attack. The TLSA record contains a certificate fingerprint which the receiving MTA (server) must present to the box. ([source](setup/mail-postfix.sh))
-
-### Domain Policy Records
-
-Domain policy records allow recipient MTAs to detect when the _domain_ part of of the sender address in incoming mail has been spoofed. All outbound mail is signed with [DKIM](https://en.wikipedia.org/wiki/DomainKeys_Identified_Mail) and "quarantine" [DMARC](https://en.wikipedia.org/wiki/DMARC) records are automatically set in DNS. Receiving MTAs that implement DMARC will automatically quarantine mail that is "From:" a domain hosted by the box but which was not sent by the box. (Strong [SPF](https://en.wikipedia.org/wiki/Sender_Policy_Framework) records are also automatically set in DNS.) ([source](management/dns_update.py))
-
-### User Policy
-
-While domain policy records prevent other servers from sending mail with a "From:" header that matches a domain hosted on the box (see above), those policy records do not guarnatee that the user portion of the sender email address matches the actual sender. In enterprise environments where the box may host the mail of untrusted users, it is important to guard against users impersonating other users.
-
-The box restricts the envelope sender address (also called the return path or MAIL FROM address --- this is different from the "From:" header) that users may put into outbound mail. The envelope sender address must be either their own email address (their SMTP login username) or any alias that they are listed as a permitted sender of. (There is currently no restriction on the contents of the "From:" header.)
-
-Incoming Mail
--------------
-
-### Encryption
-
-As discussed above, there is no way to require on-the-wire encryption of mail. When the box receives an incoming email (SMTP on port 25), it offers encryption (STARTTLS) but cannot require that senders use it because some senders may not support STARTTLS at all and other senders may support STARTTLS but not with the latest protocols/ciphers. To give senders the best chance at making use of encryption, the box offers protocols back to SSLv3 and ciphers with key lengths as low as 112 bits. Modern clients (senders) will make use of the 256-bit ciphers and Diffie-Hellman ciphers with a 2048-bit key for forward secrecy, however. ([source](setup/mail-postfix.sh))
-
-### DANE
-
-When DNSSEC is enabled at the box's domain name's registrar, [DANE TLSA](https://en.wikipedia.org/wiki/DNS-based_Authentication_of_Named_Entities) records are automatically published in DNS. Senders supporting DANE will enforce encryption on-the-wire between them and the box --- see the section on DANE for outgoing mail above. ([source](management/dns_update.py))
-
-### Filters
-
-Incoming mail is run through several filters. Email is bounced if the sender's IP address is listed in the [Spamhaus Zen blacklist](http://www.spamhaus.org/zen/) or if the sender's domain is listed in the [Spamhaus Domain Block List](http://www.spamhaus.org/dbl/). Greylisting (with [postgrey](http://postgrey.schweikert.ch/)) is also used to cut down on spam. ([source](setup/mail-postfix.sh))

setup/bootstrap.sh

@@ -1,54 +0,0 @@
-#!/bin/bash
-#########################################################
-# This script is intended to be run like this:
-#
-#   curl https://.../bootstrap.sh | sudo bash
-#
-#########################################################
-
-if [ -z "$TAG" ]; then
-	TAG=v0.14
-fi
-
-# Are we running as root?
-if [[ $EUID -ne 0 ]]; then
-	echo "This script must be run as root. Did you leave out sudo?"
-	exit
-fi
-
-# Clone the Mail-in-a-Box repository if it doesn't exist.
-if [ ! -d $HOME/mailinabox ]; then
-	if [ ! -f /usr/bin/git ]; then
-		echo Installing git . . .
-		apt-get -q -q update
-		DEBIAN_FRONTEND=noninteractive apt-get -q -q install -y git < /dev/null
-		echo
-	fi
-
-	echo Downloading Mail-in-a-Box $TAG. . .
-	git clone \
-		-b $TAG --depth 1 \
-		https://github.com/mail-in-a-box/mailinabox \
-		$HOME/mailinabox \
-		< /dev/null 2> /dev/null
-
-	echo
-fi
-
-# Change directory to it.
-cd $HOME/mailinabox
-
-# Update it.
-if [ "$TAG" != `git describe` ]; then
-	echo Updating Mail-in-a-Box to $TAG . . .
-	git fetch --depth 1 --force --prune origin tag $TAG
-	if ! git checkout -q $TAG; then
-		echo "Update failed. Did you modify something in `pwd`?"
-		exit
-	fi
-	echo
-fi
-
-# Start setup script.
-setup/start.sh
-

setup/csr_country_codes.tsv

@@ -1,253 +0,0 @@
-# This list is derived from https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2.
-# The columns are ISO_3166-1_alpha-2 code, display name, Wikipedia page name.
-# The top 20 countries by number of Internet users are grouped first, see
-# https://en.wikipedia.org/wiki/List_of_countries_by_number_of_Internet_users.
-BR	Brazil	
-CA	Canada	
-CN	China	
-EG	Egypt	
-FR	France	
-DE	Germany	
-IN	India	
-ID	Indonesia	
-IT	Italy	
-JP	Japan	
-MX	Mexico	
-NG	Nigeria	
-PH	Philippines	
-RU	Russian Federation	Russia
-ES	Spain	
-KR	South Korea
-TR	Turkey	
-GB	United Kingdom	
-US	United States	
-VN	Vietnam
-AD	Andorra	
-AE	United Arab Emirates	
-AF	Afghanistan	
-AG	Antigua and Barbuda	
-AI	Anguilla	
-AL	Albania	
-AM	Armenia	
-AO	Angola	
-AQ	Antarctica	
-AR	Argentina	
-AS	American Samoa	
-AT	Austria	
-AU	Australia	
-AW	Aruba	
-AX	Åland Islands	
-AZ	Azerbaijan	
-BA	Bosnia and Herzegovina	
-BB	Barbados	
-BD	Bangladesh	
-BE	Belgium	
-BF	Burkina Faso	
-BG	Bulgaria	
-BH	Bahrain	
-BI	Burundi	
-BJ	Benin	
-BL	Saint Barthélemy	
-BM	Bermuda	
-BN	Brunei
-BO	Bolivia
-BQ	Bonaire, Sint Eustatius and Saba	Caribbean Netherlands
-BS	Bahamas	The Bahamas
-BT	Bhutan	
-BV	Bouvet Island	
-BW	Botswana	
-BY	Belarus	
-BZ	Belize	
-CC	Cocos (Keeling) Islands	
-CD	Congo, the Democratic Republic of the	Democratic Republic of the Congo
-CF	Central African Republic	
-CG	Congo	Republic of the Congo
-CH	Switzerland	
-CI	Côte d'Ivoire	
-CK	Cook Islands	
-CL	Chile	
-CM	Cameroon	
-CO	Colombia	
-CR	Costa Rica	
-CU	Cuba	
-CV	Cabo Verde	
-CW	Curaçao	
-CX	Christmas Island	
-CY	Cyprus	
-CZ	Czech Republic	
-DJ	Djibouti	
-DK	Denmark	
-DM	Dominica	
-DO	Dominican Republic	
-DZ	Algeria	
-EC	Ecuador	
-EE	Estonia	
-EH	Western Sahara	
-ER	Eritrea	
-ET	Ethiopia	
-FI	Finland	
-FJ	Fiji	
-FK	Falkland Islands (Malvinas)	Falkland Islands
-FM	Federated States of Micronesia
-FO	Faroe Islands	
-GA	Gabon	
-GD	Grenada	
-GE	Georgia	Georgia (country)
-GF	French Guiana	
-GG	Guernsey	
-GH	Ghana	
-GI	Gibraltar	
-GL	Greenland	
-GM	Gambia	The Gambia
-GN	Guinea	
-GP	Guadeloupe	
-GQ	Equatorial Guinea	
-GR	Greece	
-GS	South Georgia and the South Sandwich Islands	
-GT	Guatemala	
-GU	Guam	
-GW	Guinea-Bissau	
-GY	Guyana	
-HK	Hong Kong	
-HM	Heard Island and McDonald Islands	
-HN	Honduras	
-HR	Croatia	
-HT	Haiti	
-HU	Hungary	
-IE	Ireland	Republic of Ireland
-IL	Israel	
-IM	Isle of Man	
-IO	British Indian Ocean Territory	
-IQ	Iraq	
-IR	Iran
-IS	Iceland	
-JE	Jersey	
-JM	Jamaica	
-JO	Jordan	
-KE	Kenya	
-KG	Kyrgyzstan	
-KH	Cambodia	
-KI	Kiribati	
-KM	Comoros	
-KN	Saint Kitts and Nevis	
-KP	North Korea
-KW	Kuwait	
-KY	Cayman Islands	
-KZ	Kazakhstan	
-LA	Laos
-LB	Lebanon	
-LC	Saint Lucia	
-LI	Liechtenstein	
-LK	Sri Lanka	
-LR	Liberia	
-LS	Lesotho	
-LT	Lithuania	
-LU	Luxembourg	
-LV	Latvia	
-LY	Libya	
-MA	Morocco	
-MC	Monaco	
-MD	Moldova
-ME	Montenegro	
-MF	Saint Martin (French part)	Collectivity of Saint Martin
-MG	Madagascar	
-MH	Marshall Islands	
-MK	Macedonia	Republic of Macedonia
-ML	Mali	
-MM	Myanmar	
-MN	Mongolia	
-MO	Macao	Macau
-MP	Northern Mariana Islands	
-MQ	Martinique	
-MR	Mauritania	
-MS	Montserrat	
-MT	Malta	
-MU	Mauritius	
-MV	Maldives	
-MW	Malawi	
-MY	Malaysia	
-MZ	Mozambique	
-NA	Namibia	
-NC	New Caledonia	
-NE	Niger	
-NF	Norfolk Island	
-NI	Nicaragua	
-NL	Netherlands	
-NO	Norway	
-NP	Nepal	
-NR	Nauru	
-NU	Niue	
-NZ	New Zealand	
-OM	Oman	
-PA	Panama	
-PE	Peru	
-PF	French Polynesia	
-PG	Papua New Guinea	
-PK	Pakistan	
-PL	Poland	
-PM	Saint Pierre and Miquelon	
-PN	Pitcairn	Pitcairn Islands
-PR	Puerto Rico	
-PS	Palestine	State of Palestine
-PT	Portugal	
-PW	Palau	
-PY	Paraguay	
-QA	Qatar	
-RE	Réunion	
-RO	Romania	
-RS	Serbia	
-RW	Rwanda	
-SA	Saudi Arabia	
-SB	Solomon Islands	
-SC	Seychelles	
-SD	Sudan	
-SE	Sweden	
-SG	Singapore	
-SH	Saint Helena, Ascension and Tristan da Cunha	
-SI	Slovenia	
-SJ	Svalbard and Jan Mayen	
-SK	Slovakia	
-SL	Sierra Leone	
-SM	San Marino	
-SN	Senegal	
-SO	Somalia	
-SR	Suriname	
-SS	South Sudan	
-ST	Sao Tome and Principe
-SV	El Salvador	
-SX	Sint Maarten (Dutch part)	Sint Maarten
-SY	Syria
-SZ	Swaziland	
-TC	Turks and Caicos Islands	
-TD	Chad	
-TF	French Southern Territories	French Southern and Antarctic Lands
-TG	Togo	
-TH	Thailand	
-TJ	Tajikistan	
-TK	Tokelau	
-TL	Timor-Leste	East Timor
-TM	Turkmenistan	
-TN	Tunisia	
-TO	Tonga	
-TT	Trinidad and Tobago	
-TV	Tuvalu	
-TW	Taiwan	
-TZ	Tanzania
-UA	Ukraine	
-UG	Uganda	
-UM	United States Minor Outlying Islands	
-UY	Uruguay	
-UZ	Uzbekistan	
-VA	Vatican City
-VC	Saint Vincent and the Grenadines	
-VE	Venezuela
-VG	Virgin Islands, British	British Virgin Islands
-VI	Virgin Islands, U.S.	United States Virgin Islands
-VU	Vanuatu	
-WF	Wallis and Futuna	
-WS	Samoa	
-YE	Yemen	
-YT	Mayotte	
-ZA	South Africa	
-ZM	Zambia	
-ZW	Zimbabwe	

setup/dkim.sh

@@ -1,17 +1,13 @@
-#!/bin/bash
+# OpenDKIM: Sign outgoing mail with DKIM
-# OpenDKIM
+########################################
-# --------
+
-#
+# After this, you'll still need to run dns_update.sh to get the DKIM
-# OpenDKIM provides a service that puts a DKIM signature on outbound mail.
+# signature in the DNS zones.
-#
-# The DNS configuration for DKIM is done in the management daemon.
 
 source setup/functions.sh # load our functions
-source /etc/mailinabox.conf # load global vars
 
-# Install DKIM...
+# Install DKIM
-echo Installing OpenDKIM/OpenDMARC...
+apt_install opendkim opendkim-tools
-apt_install opendkim opendkim-tools opendmarc
 
 # Make sure configuration directories exist.
 mkdir -p /etc/opendkim;
@@ -22,9 +18,9 @@ mkdir -p $STORAGE_ROOT/mail/dkim
 echo "127.0.0.1" > /etc/opendkim/TrustedHosts
 
 if grep -q "ExternalIgnoreList" /etc/opendkim.conf; then
-	true # already done #NODOC
+	true; # already done
 else
-	# Add various configuration options to the end of `opendkim.conf`.
+	# Add various configuration options to the end.
 	cat >> /etc/opendkim.conf << EOF;
 MinimumKeyBits          1024
 ExternalIgnoreList      refile:/etc/opendkim/TrustedHosts
@@ -36,47 +32,28 @@ RequireSafeKeys         false
 EOF
 fi
 
-# Create a new DKIM key. This creates mail.private and mail.txt
+# Create a new DKIM key if we don't have one already. This creates
-# in $STORAGE_ROOT/mail/dkim. The former is the private key and
+# mail.private and mail.txt in $STORAGE_ROOT/mail/dkim. The former
-# the latter is the suggested DNS TXT entry which we'll include
+# is the actual private key and the latter is the suggested DNS TXT
-# in our DNS setup. Note tha the files are named after the
+# entry which we'll want to include in our DNS setup.
-# 'selector' of the key, which we can change later on to support
-# key rotation.
-#
-# A 1024-bit key is seen as a minimum standard by several providers
-# such as Google. But they and others use a 2048 bit key, so we'll
-# do the same. Keys beyond 2048 bits may exceed DNS record limits.
 if [ ! -f "$STORAGE_ROOT/mail/dkim/mail.private" ]; then
-	opendkim-genkey -b 2048 -r -s mail -D $STORAGE_ROOT/mail/dkim
+	# Should we specify -h rsa-sha256?
+	opendkim-genkey -r -s mail -D $STORAGE_ROOT/mail/dkim
 fi
 
 # Ensure files are owned by the opendkim user and are private otherwise.
 chown -R opendkim:opendkim $STORAGE_ROOT/mail/dkim
 chmod go-rwx $STORAGE_ROOT/mail/dkim
 
-tools/editconf.py /etc/opendmarc.conf -s \
+# Add OpenDKIM as a milter to postfix, which is how it intercepts outgoing
-	"Syslog=true" \
+# mail to perform the signing (by adding a mail header).
-	"Socket=inet:8893@[127.0.0.1]"
+# Be careful. If we add other milters later, it needs to be concatenated on the smtpd_milters line.
-
-# Add OpenDKIM and OpenDMARC as milters to postfix, which is how OpenDKIM
-# intercepts outgoing mail to perform the signing (by adding a mail header)
-# and how they both intercept incoming mail to add Authentication-Results
-# headers. The order possibly/probably matters: OpenDMARC relies on the
-# OpenDKIM Authentication-Results header already being present.
-#
-# Be careful. If we add other milters later, this needs to be concatenated
-# on the smtpd_milters line.
-#
-# The OpenDMARC milter is skipped in the SMTP submission listener by
-# configuring smtpd_milters there to only list the OpenDKIM milter
-# (see mail-postfix.sh).
 tools/editconf.py /etc/postfix/main.cf \
-	"smtpd_milters=inet:127.0.0.1:8891 inet:127.0.0.1:8893"\
+	smtpd_milters=inet:127.0.0.1:8891 \
 	non_smtpd_milters=\$smtpd_milters \
 	milter_default_action=accept
 
 # Restart services.
 restart_service opendkim
-restart_service opendmarc
 restart_service postfix
 

setup/dns.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
-# DNS
+# DNS: Configure a DNS server using nsd
-# -----------------------------------------------
+#######################################
 
 # This script installs packages, but the DNS zone files are only
 # created by the /dns/update API in the management server because
@@ -8,116 +8,62 @@
 # mail users & aliases created by the user later.
 
 source setup/functions.sh # load our functions
-source /etc/mailinabox.conf # load global vars
 
-# Install the packages.
+# Install nsd, our DNS server software, and ldnsutils which helps
-#
+# us sign zones for DNSSEC.
-# * nsd: The non-recursive nameserver that publishes our DNS records.
+
-# * ldnsutils: Helper utilities for signing DNSSEC zones.
+# ...but first, we have to create the user because the 
-# * openssh-client: Provides ssh-keyscan which we use to create SSHFP records.
+# current Ubuntu forgets to do so in the .deb
-echo "Installing nsd (DNS server)..."
+# see issue #25 and https://bugs.launchpad.net/ubuntu/+source/nsd/+bug/1311886
-apt_install nsd ldnsutils openssh-client
+if id nsd > /dev/null 2>&1; then
+	true; #echo "nsd user exists... good";
+else
+	useradd nsd;
+fi
+
+# Okay now install the packages.
+
+apt_install nsd ldnsutils
 
 # Prepare nsd's configuration.
 
-mkdir -p /var/run/nsd
+sudo mkdir -p /var/run/nsd
-
-cat > /etc/nsd/nsd.conf << EOF;
-# No not edit. Overwritten by Mail-in-a-Box setup.
-server:
-  hide-version: yes
-
-  # identify the server (CH TXT ID.SERVER entry).
-  identity: ""
-
-  # The directory for zonefile: files.
-  zonesdir: "/etc/nsd/zones"
-
-  # Allows NSD to bind to IP addresses that are not (yet) added to the
-  # network interface. This allows nsd to start even if the network stack
-  # isn't fully ready, which apparently happens in some cases.
-  # See https://www.nlnetlabs.nl/projects/nsd/nsd.conf.5.html.
-  ip-transparent: yes
-
-EOF
-
-# Since we have bind9 listening on localhost for locally-generated
-# DNS queries that require a recursive nameserver, and the system
-# might have other network interfaces for e.g. tunnelling, we have
-# to be specific about the network interfaces that nsd binds to.
-for ip in $PRIVATE_IP $PRIVATE_IPV6; do
-	echo "  ip-address: $ip" >> /etc/nsd/nsd.conf;
-done
-
-echo "include: /etc/nsd/zones.conf" >> /etc/nsd/nsd.conf;
 
 # Create DNSSEC signing keys.
 
 mkdir -p "$STORAGE_ROOT/dns/dnssec";
+if [ ! -f "$STORAGE_ROOT/dns/dnssec/keys.conf" ]; then
+	# These two steps take a while.
 
-# TLDs don't all support the same algorithms, so we'll generate keys using a few
+	# Create the Key-Signing Key (KSK) (-k) which is the so-called
-# different algorithms. RSASHA1-NSEC3-SHA1 was possibly the first widely used
+	# Secure Entry Point. Use a NSEC3-compatible algorithm (best
-# algorithm that supported NSEC3, which is a security best practice. However TLDs
+	# practice), and a nice and long keylength. The domain name we
-# will probably be moving away from it to a a SHA256-based algorithm.
+	# provide ("_domain_") doesn't matter -- we'll use the same
-#
+	# keys for all our domains.
-# Supports `RSASHA1-NSEC3-SHA1` (didn't test with `RSASHA256`):
+	KSK=$(umask 077; cd $STORAGE_ROOT/dns/dnssec; ldns-keygen -a RSASHA1-NSEC3-SHA1 -b 2048 -k _domain_);
-#
-#  * .info
-#  * .me
-#
-# Requires `RSASHA256`
-#
-#  * .email
-#  * .guide
-#
-# Supports `RSASHA256` (and defaulting to this)
-#
-#  * .fund
-
-FIRST=1 #NODOC
-for algo in RSASHA1-NSEC3-SHA1 RSASHA256; do
-if [ ! -f "$STORAGE_ROOT/dns/dnssec/$algo.conf" ]; then
-	if [ $FIRST == 1 ]; then
-		echo "Generating DNSSEC signing keys. This may take a few minutes..."
-		FIRST=0 #NODOC
-	fi
-
-	# Create the Key-Signing Key (KSK) (with `-k`) which is the so-called
-	# Secure Entry Point. The domain name we provide ("_domain_") doesn't
-	#  matter -- we'll use the same keys for all our domains.
-	#
-	# `ldns-keygen` outputs the new key's filename to stdout, which
-	# we're capturing into the `KSK` variable.
-	KSK=$(umask 077; cd $STORAGE_ROOT/dns/dnssec; ldns-keygen -a $algo -b 2048 -k _domain_);
 
 	# Now create a Zone-Signing Key (ZSK) which is expected to be
 	# rotated more often than a KSK, although we have no plans to
 	# rotate it (and doing so would be difficult to do without
-	# disturbing DNS availability.) Omit `-k` and use a shorter key length.
+	# disturbing DNS availability.) Omit '-k' and use a shorter key.
-	ZSK=$(umask 077; cd $STORAGE_ROOT/dns/dnssec; ldns-keygen -a $algo -b 1024 _domain_);
+	ZSK=$(umask 077; cd $STORAGE_ROOT/dns/dnssec; ldns-keygen -a RSASHA1-NSEC3-SHA1 -b 1024 _domain_);
 
 	# These generate two sets of files like:
-	#
+	# K_domain_.+007+08882.ds <- DS record for adding to NSD configuration files
-	# * `K_domain_.+007+08882.ds`: DS record normally provided to domain name registrar (but it's actually invalid with `_domain_`)
+	# K_domain_.+007+08882.key <- public key (goes into DS record & upstream DNS provider like your registrar)
-	# * `K_domain_.+007+08882.key`: public key
+	# K_domain_.+007+08882.private  <- private key (secret!)
-	# * `K_domain_.+007+08882.private`: private key (secret!)
 
 	# The filenames are unpredictable and encode the key generation
 	# options. So we'll store the names of the files we just generated.
 	# We might have multiple keys down the road. This will identify
 	# what keys are the current keys.
-	cat > $STORAGE_ROOT/dns/dnssec/$algo.conf << EOF;
+	cat > $STORAGE_ROOT/dns/dnssec/keys.conf << EOF;
 KSK=$KSK
 ZSK=$ZSK
 EOF
 fi
 
-	# And loop to do the next algorithm...
+# Force the dns_update script to be run every day to re-sign zones for DNSSEC.
-done
-
-# Force the dns_update script to be run every day to re-sign zones for DNSSEC
-# before they expire. When we sign zones (in `dns_update.py`) we specify a
-# 30-day validation window, so we had better re-sign before then.
 cat > /etc/cron.daily/mailinabox-dnssec << EOF;
 #!/bin/bash
 # Mail-in-a-Box

setup/firstuser.sh

@@ -1,57 +0,0 @@
-# If there aren't any mail users yet, create one.
-if [ -z "`tools/mail.py user`" ]; then
-	# The outut of "tools/mail.py user" is a list of mail users. If there
-	# aren't any yet, it'll be empty.
-
-	# If we didn't ask for an email address at the start, do so now.
-	if [ -z "$EMAIL_ADDR" ]; then
-		# In an interactive shell, ask the user for an email address.
-		if [ -z "$NONINTERACTIVE" ]; then
-			input_box "Mail Account" \
-				"Let's create your first mail account.
-				\n\nWhat email address do you want?" \
-				me@`get_default_hostname` \
-				EMAIL_ADDR
-
-			if [ -z "$EMAIL_ADDR" ]; then
-				# user hit ESC/cancel
-				exit
-			fi
-			while ! management/mailconfig.py validate-email "$EMAIL_ADDR"
-			do
-				input_box "Mail Account" \
-					"That's not a valid email address.
-					\n\nWhat email address do you want?" \
-					$EMAIL_ADDR \
-					EMAIL_ADDR
-				if [ -z "$EMAIL_ADDR" ]; then
-					# user hit ESC/cancel
-					exit
-				fi
-			done
-
-		# But in a non-interactive shell, just make something up.
-		# This is normally for testing.
-		else
-			# Use me@PRIMARY_HOSTNAME
-			EMAIL_ADDR=me@$PRIMARY_HOSTNAME
-			EMAIL_PW=1234
-			echo
-			echo "Creating a new administrative mail account for $EMAIL_ADDR with password $EMAIL_PW."
-			echo
-		fi
-	else
-		echo
-		echo "Okay. I'm about to set up $EMAIL_ADDR for you. This account will also"
-		echo "have access to the box's control panel."
-	fi
-
-	# Create the user's mail account. This will ask for a password if none was given above.
-	tools/mail.py user add $EMAIL_ADDR $EMAIL_PW
-
-	# Make it an admin.
-	hide_output tools/mail.py user make-admin $EMAIL_ADDR
-
-	# Create an alias to which we'll direct all automatically-created administrative aliases.
-	tools/mail.py alias add administrator@$PRIMARY_HOSTNAME $EMAIL_ADDR > /dev/null
-fi

setup/functions.sh

@@ -9,43 +9,55 @@ function hide_output {
 	$@ &> $OUTPUT
 
 	# If the command failed, show the output that was captured in the temporary file.
-	E=$?
+	if [ $? != 0 ]; then
-	if [ $E != 0 ]; then
 		# Something failed.
 		echo
 		echo FAILED: $@
 		echo -----------------------------------------
 		cat $OUTPUT
 		echo -----------------------------------------
-		exit $E
 	fi
 
 	# Remove temporary file.
 	rm -f $OUTPUT
 }
 
-function apt_get_quiet {
+function apt_install {
-	# Run apt-get in a totally non-interactive mode.
+	# Report any packages already installed.
-	#
+	PACKAGES=$@
-	# Somehow all of these options are needed to get it to not ask the user
+	TO_INSTALL=""
-	# questions about a) whether to proceed (-y), b) package options (noninteractive),
+	ALREADY_INSTALLED=""
-	# and c) what to do about files changed locally (we don't cause that to happen but
+	for pkg in $PACKAGES; do
-	# some VM providers muck with their images; -o).
+		if dpkg -s $pkg 2>/dev/null | grep "^Status: install ok installed" > /dev/null; then
+			if [[ ! -z "$ALREADY_INSTALLED" ]]; then ALREADY_INSTALLED="$ALREADY_INSTALLED, "; fi
+			ALREADY_INSTALLED="$ALREADY_INSTALLED$pkg (`dpkg -s $pkg | grep ^Version: | sed -e 's/.*: //'`)"
+		else
+			TO_INSTALL="$TO_INSTALL""$pkg "
+		fi
+	done
+
+	# List the packages already installed.
+	if [[ ! -z "$ALREADY_INSTALLED" ]]; then
+		echo already installed: $ALREADY_INSTALLED
+	fi
+
+	# List the packages about to be installed.
+	if [[ ! -z "$TO_INSTALL" ]]; then
+		echo installing $TO_INSTALL...
+	fi
+
+	# 'DEBIAN_FRONTEND=noninteractive' is to prevent dbconfig-common from asking you questions.
 	#
 	# Although we could pass -qq to apt-get to make output quieter, many packages write to stdout
 	# and stderr things that aren't really important. Use our hide_output function to capture
 	# all of that and only show it if there is a problem (i.e. if apt_get returns a failure exit status).
-	DEBIAN_FRONTEND=noninteractive hide_output apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confnew" "$@"
+	#
-}
+	# Also note that we still include the whole original package list in the apt-get command in
-
+	# case it wants to upgrade anything, I guess? Maybe we can remove it. Doesn't normally make
-function apt_install {
+	# a difference.
-	# Install a bunch of packages. We used to report which packages were already
+	DEBIAN_FRONTEND=noninteractive \
-	# installed and which needed installing, before just running an 'apt-get
+	hide_output \
-	# install' for all of the packages.  Calling `dpkg` on each package is slow,
+	apt-get -y install $PACKAGES
-	# and doesn't affect what we actually do, except in the messages, so let's
-	# not do that anymore.
-	PACKAGES=$@
-	apt_get_quiet install $PACKAGES
 }
 
 function get_default_hostname {
@@ -58,71 +70,69 @@ function get_default_hostname {
 	printf '%s\n' "$1" # return this value
 }
 
+function get_default_publicip {
+	# Get the machine's public IP address. The machine might have
+	# an IP on a private network, but the IP address that we put
+	# into DNS must be one on the public Internet. Try a public
+	# API, but if that fails (maybe we don't have Internet access
+	# right now) then use the IP address that this machine knows
+	# itself as.
+	get_publicip_from_web_service || get_publicip_fallback
+}
+
+function get_default_publicipv6 {
+	get_publicipv6_from_web_service || get_publicipv6_fallback
+}
+
 function get_publicip_from_web_service {
 	# This seems to be the most reliable way to determine the
 	# machine's public IP address: asking a very nice web API
 	# for how they see us. Thanks go out to icanhazip.com.
-	# See: https://major.io/icanhazip-com-faq/
+	curl -4 --fail --silent icanhazip.com 2>/dev/null
-	#
-	# Pass '4' or '6' as an argument to this function to specify
-	# what type of address to get (IPv4, IPv6).
-	curl -$1 --fail --silent --max-time 15 icanhazip.com 2>/dev/null
 }
 
-function get_default_privateip {
+function get_publicipv6_from_web_service {
-	# Return the IP address of the network interface connected
+	curl -6 --fail --silent icanhazip.com 2>/dev/null
-	# to the Internet.
+}
-	#
-	# Pass '4' or '6' as an argument to this function to specify
-	# what type of address to get (IPv4, IPv6).
-	#
-	# We used to use `hostname -I` and then filter for either
-	# IPv4 or IPv6 addresses. However if there are multiple
-	# network interfaces on the machine, not all may be for
-	# reaching the Internet.
-	#
-	# Instead use `ip route get` which asks the kernel to use
-	# the system's routes to select which interface would be
-	# used to reach a public address. We'll use 8.8.8.8 as
-	# the destination. It happens to be Google Public DNS, but
-	# no connection is made. We're just seeing how the box
-	# would connect to it. There many be multiple IP addresses
-	# assigned to an interface. `ip route get` reports the
-	# preferred. That's good enough for us. See issue #121.
-	#
-	# With IPv6, the best route may be via an interface that
-	# only has a link-local address (fe80::*). These addresses
-	# are only unique to an interface and so need an explicit
-	# interface specification in order to use them with bind().
-	# In these cases, we append "%interface" to the address.
-	# See the Notes section in the man page for getaddrinfo and
-	# https://discourse.mailinabox.email/t/update-broke-mailinabox/34/9.
-	#
-	# Also see ae67409603c49b7fa73c227449264ddd10aae6a9 and
-	# issue #3 for why/how we originally added IPv6.
 
-	target=8.8.8.8
+function get_publicip_fallback {
+	# Return the IP address that this machine knows itself as.
+	# It certainly may not be the IP address that this machine
+	# operates as on the public Internet. The machine might
+	# have multiple addresses if it has multiple network adapters.
+	set -- $(hostname --ip-address       2>/dev/null) \
+	       $(hostname --all-ip-addresses 2>/dev/null)
+	while (( $# )) && { ! is_ipv4 "$1" || is_loopback_ip "$1"; }; do
+		shift
+	done
+	printf '%s\n' "$1" # return this value
+}
 
-	# For the IPv6 route, use the corresponding IPv6 address
+function get_publicipv6_fallback {
-	# of Google Public DNS. Again, it doesn't matter so long
+	set -- $(hostname --ip-address       2>/dev/null) \
-	# as it's an address on the public Internet.
+	       $(hostname --all-ip-addresses 2>/dev/null)
-	if [ "$1" == "6" ]; then target=2001:4860:4860::8888; fi
+	while (( $# )) && { ! is_ipv6 "$1" || is_loopback_ipv6 "$1"; }; do
+		shift
+	done
+	printf '%s\n' "$1" # return this value
+}
 
-	# Get the route information.
+function is_ipv4 {
-	route=$(ip -$1 -o route get $target | grep -v unreachable)
+	# helper for get_publicip_fallback
+	[[ "$1" == *.*.*.* ]]
+}
 
-	# Parse the address out of the route information.
+function is_ipv6 {
-	address=$(echo $route | sed "s/.* src \([^ ]*\).*/\1/")
+	[[ "$1" == *:*:* ]]
+}
 
-	if [[ "$1" == "6" && $address == fe80:* ]]; then
+function is_loopback_ip {
-		# For IPv6 link-local addresses, parse the interface out
+	# helper for get_publicip_fallback
-		# of the route information and append it with a '%'.
+	[[ "$1" == 127.* ]]
-		interface=$(echo $route | sed "s/.* dev \([^ ]*\).*/\1/")
+}
-		address=$address%$interface
-	fi
 
-	echo $address
+function is_loopback_ipv6 {
-		
+	[[ "$1" == ::1 ]]
 }
 
 function ufw_allow {
@@ -135,69 +145,3 @@ function ufw_allow {
 function restart_service {
 	hide_output service $1 restart
 }
-
-## Dialog Functions ##
-function message_box {
-	dialog --title "$1" --msgbox "$2" 0 0
-}
-
-function input_box {
-	# input_box "title" "prompt" "defaultvalue" VARIABLE
-	# The user's input will be stored in the variable VARIABLE.
-	# The exit code from dialog will be stored in VARIABLE_EXITCODE.
-	declare -n result=$4
-	declare -n result_code=$4_EXITCODE
-	result=$(dialog --stdout --title "$1" --inputbox "$2" 0 0 "$3")
-	result_code=$?
-}
-
-function input_menu {
-	# input_menu "title" "prompt" "tag item tag item" VARIABLE
-	# The user's input will be stored in the variable VARIABLE.
-	# The exit code from dialog will be stored in VARIABLE_EXITCODE.
-	declare -n result=$4
-	declare -n result_code=$4_EXITCODE
-	local IFS=^$'\n'
-	result=$(dialog --stdout --title "$1" --menu "$2" 0 0 0 $3)
-	result_code=$?
-}
-
-function wget_verify {
-	# Downloads a file from the web and checks that it matches
-	# a provided hash. If the comparison fails, exit immediately.
-	URL=$1
-	HASH=$2
-	DEST=$3
-	CHECKSUM="$HASH  $DEST"
-	rm -f $DEST
-	wget -q -O $DEST $URL || exit 1
-	if ! echo "$CHECKSUM" | sha1sum --check --strict > /dev/null; then
-		echo "------------------------------------------------------------"
-		echo "Download of $URL did not match expected checksum."
-		echo "Found:"
-		sha1sum $DEST
-		echo
-		echo "Expected:"
-		echo "$CHECKSUM"
-		rm -f $DEST
-		exit 1
-	fi
-}
-
-function git_clone {
-	# Clones a git repository, checks out a particular commit or tag,
-	# and moves the repository (or a subdirectory in it) to some path.
-	# We use separate clone and checkout because -b only supports tags
-	# and branches, but we sometimes want to reference a commit hash
-	# directly when the repo doesn't provide a tag.
-	REPO=$1
-	TREEISH=$2
-	SUBDIR=$3
-	TARGETPATH=$4
-	TMPPATH=/tmp/git-clone-$$
-	rm -rf $TMPPATH $TARGETPATH
-	git clone -q $REPO $TMPPATH || exit 1
-	(cd $TMPPATH; git checkout -q $TREEISH;) || exit 1
-	mv $TMPPATH/$SUBDIR $TARGETPATH
-	rm -rf $TMPPATH
-}

setup/mail-dovecot.sh

@@ -1,9 +1,8 @@
 #!/bin/bash
 #
-# Dovecot (IMAP/POP and LDA)
+# Dovecot (IMAP and LDA)
-# ----------------------
 #
-# Dovecot is *both* the IMAP/POP server (the protocol that email applications
+# Dovecot is *both* the IMAP server (the protocol that email applications
 # use to query a mailbox) as well as the local delivery agent (LDA),
 # meaning it is responsible for writing emails to mailbox storage on disk.
 # You could imagine why these things would be bundled together.
@@ -18,48 +17,21 @@
 source setup/functions.sh # load our functions
 source /etc/mailinabox.conf # load global vars
 
+# Install packages.
 
-# Install packages for dovecot. These are all core dovecot plugins,
-# but dovecot-lucene is packaged by *us* in the Mail-in-a-Box PPA,
-# not by Ubuntu.
-
-echo "Installing Dovecot (IMAP server)..."
 apt_install \
-	dovecot-core dovecot-imapd dovecot-pop3d dovecot-lmtpd dovecot-sqlite sqlite3 \
+	dovecot-core dovecot-imapd dovecot-lmtpd dovecot-sqlite sqlite3 \
-	dovecot-sieve dovecot-managesieved dovecot-lucene
+	dovecot-sieve dovecot-managesieved
 
-# The `dovecot-imapd`, `dovecot-pop3d`, and `dovecot-lmtpd` packages automatically
+# The dovecot-imapd dovecot-lmtpd packages automatically enable IMAP and LMTP protocols.
-# enable IMAP, POP and LMTP protocols.
 
-# Set basic daemon options.
+# Set the location where we'll store user mailboxes.
-
-# The `default_process_limit` is 100, which constrains the total number
-# of active IMAP connections (at, say, 5 open connections per user that
-# would be 20 users). Set it to 250 times the number of cores this
-# machine has, so on a two-core machine that's 500 processes/100 users).
-tools/editconf.py /etc/dovecot/conf.d/10-master.conf \
-	default_process_limit=$(echo "`nproc` * 250" | bc)
-
-# The inotify `max_user_instances` default is 128, which constrains
-# the total number of watched (IMAP IDLE push) folders by open connections.
-# See http://www.dovecot.org/pipermail/dovecot/2013-March/088834.html.
-# A reboot is required for this to take effect (which we don't do as
-# as a part of setup). Test with `cat /proc/sys/fs/inotify/max_user_instances`.
-tools/editconf.py /etc/sysctl.conf \
-	fs.inotify.max_user_instances=1024
-
-# Set the location where we'll store user mailboxes. '%d' is the domain name and '%n' is the
-# username part of the user's email address. We'll ensure that no bad domains or email addresses
-# are created within the management daemon.
 tools/editconf.py /etc/dovecot/conf.d/10-mail.conf \
 	mail_location=maildir:$STORAGE_ROOT/mail/mailboxes/%d/%n \
 	mail_privileged_group=mail \
 	first_valid_uid=0
 
-# Create, subscribe, and mark as special folders: INBOX, Drafts, Sent, Trash, Spam and Archive.
+# IMAP
-cp conf/dovecot-mailboxes.conf /etc/dovecot/conf.d/15-mailboxes.conf
-
-# ### IMAP/POP
 
 # Require that passwords are sent over SSL only, and allow the usual IMAP authentication mechanisms.
 # The LOGIN mechanism is supposedly for Microsoft products like Outlook to do SMTP login (I guess
@@ -68,52 +40,23 @@ tools/editconf.py /etc/dovecot/conf.d/10-auth.conf \
 	disable_plaintext_auth=yes \
 	"auth_mechanisms=plain login"
 
-# Enable SSL, specify the location of the SSL certificate and private key files.
+# Enable SSL, specify the location of the SSL certificate and private key files,
-# Disable obsolete SSL protocols and allow only good ciphers per http://baldric.net/2013/12/07/tls-ciphers-in-postfix-and-dovecot/.
+# and allow only good ciphers per http://baldric.net/2013/12/07/tls-ciphers-in-postfix-and-dovecot/.
 tools/editconf.py /etc/dovecot/conf.d/10-ssl.conf \
 	ssl=required \
 	"ssl_cert=<$STORAGE_ROOT/ssl/ssl_certificate.pem" \
 	"ssl_key=<$STORAGE_ROOT/ssl/ssl_private_key.pem" \
-	"ssl_protocols=!SSLv3 !SSLv2" \
 	"ssl_cipher_list=TLSv1+HIGH !SSLv2 !RC4 !aNULL !eNULL !3DES @STRENGTH"
 
-# Disable in-the-clear IMAP/POP because there is no reason for a user to transmit
+# Disable in-the-clear IMAP and POP because we're paranoid (we haven't even
-# login credentials outside of an encrypted connection. Only the over-TLS versions
+# enabled POP).
-# are made available (IMAPS on port 993; POP3S on port 995).
 sed -i "s/#port = 143/port = 0/" /etc/dovecot/conf.d/10-master.conf
 sed -i "s/#port = 110/port = 0/" /etc/dovecot/conf.d/10-master.conf
 
-# Make IMAP IDLE slightly more efficient. By default, Dovecot says "still here"
+# LDA (LMTP)
-# every two minutes. With K-9 mail, the bandwidth and battery usage due to
-# this are minimal. But for good measure, let's go to 4 minutes to halve the
-# bandwidth and number of times the device's networking might be woken up.
-# The risk is that if the connection is silent for too long it might be reset
-# by a peer. See #129 and http://razor.occams.info/blog/2014/08/09/how-bad-is-imap-idle/.
-tools/editconf.py /etc/dovecot/conf.d/20-imap.conf \
-	imap_idle_notify_interval="4 mins"
-
-# Set POP3 UIDL
-# UIDLs are used by POP3 clients to keep track of what messages they've downloaded. 
-# For new POP3 servers, the easiest way to set up UIDLs is to use IMAP's UIDVALIDITY
-# and UID values, the default in Dovecot.
-tools/editconf.py /etc/dovecot/conf.d/20-pop3.conf \
-	pop3_uidl_format="%08Xu%08Xv"
-
-# Full Text Search - Enable full text search of mail using dovecot's lucene plugin, 
-# which *we* package and distribute (dovecot-lucene package).
-tools/editconf.py /etc/dovecot/conf.d/10-mail.conf \
-	mail_plugins="\$mail_plugins fts fts_lucene"
-cat > /etc/dovecot/conf.d/90-plugin-fts.conf << EOF;
-plugin {
-  fts = lucene
-  fts_lucene = whitespace_chars=@.
-}
-EOF
-
-# ### LDA (LMTP)
 
 # Enable Dovecot's LDA service with the LMTP protocol. It will listen
-# on port 10026, and Spamassassin will be configured to pass mail there.
+# in port 10026, and Spamassassin will be configured to pass mail there.
 #
 # The disabled unix socket listener is normally how Postfix and Dovecot
 # would communicate (see the Postfix setup script for the corresponding
@@ -138,40 +81,30 @@ protocol imap {
 }
 EOF
 
-# Setting a `postmaster_address` is required or LMTP won't start. An alias
+# Setting a postmaster_address seems to be required or LMTP won't start.
-# will be created automatically by our management daemon.
 tools/editconf.py /etc/dovecot/conf.d/15-lda.conf \
 	postmaster_address=postmaster@$PRIMARY_HOSTNAME
 
-# ### Sieve
+# SIEVE
 
 # Enable the Dovecot sieve plugin which let's users run scripts that process
-# mail as it comes in.
+# mail as it comes in. We'll also set a global script that moves mail marked
-sed -i "s/#mail_plugins = .*/mail_plugins = \$mail_plugins sieve/" /etc/dovecot/conf.d/20-lmtp.conf
-
-# Configure sieve. We'll create a global script that moves mail marked
 # as spam by Spamassassin into the user's Spam folder.
-#
+sudo sed -i "s/#mail_plugins = .*/mail_plugins = \$mail_plugins sieve/" /etc/dovecot/conf.d/20-lmtp.conf
-# * `sieve_before`: The path to our global sieve which handles moving spam to the Spam folder.
+
-#
-# * `sieve_before2`: The path to our global sieve directory for sieve which can contain .sieve files
-# to run globally for every user before their own sieve files run.
-#
-# * `sieve_after`: The path to our global sieve directory which can contain .sieve files
-# to run globally for every user after their own sieve files run.
-#
-# * `sieve`: The path to the user's main active script. ManageSieve will create a symbolic
-# link here to the actual sieve script. It should not be in the mailbox directory
-# (because then it might appear as a folder) and it should not be in the sieve_dir
-# (because then I suppose it might appear to the user as one of their scripts).
-# * `sieve_dir`: Directory for :personal include scripts for the include extension. This
-# is also where the ManageSieve service stores the user's scripts.
 cat > /etc/dovecot/conf.d/99-local-sieve.conf << EOF;
 plugin {
+  # The path to our global sieve which handles moving spam to the Spam folder.
   sieve_before = /etc/dovecot/sieve-spam.sieve
-  sieve_before2 = $STORAGE_ROOT/mail/sieve/global_before
+
-  sieve_after = $STORAGE_ROOT/mail/sieve/global_after
+  # The path to the user's main active script. ManageSieve will create a symbolic
+  # link here to the actual sieve script. It should not be in the mailbox directory
+  # (because then it might appear as a folder) and it should not be in the sieve_dir
+  # (because then I suppose it might appear to the user as one of their scripts).
   sieve = $STORAGE_ROOT/mail/sieve/%d/%n.sieve
+
+  # Directory for :personal include scripts for the include extension. This
+  # is also where the ManageSieve service stores the user's scripts.
   sieve_dir = $STORAGE_ROOT/mail/sieve/%d/%n
 }
 EOF
@@ -179,7 +112,7 @@ EOF
 # Copy the global sieve script into where we've told Dovecot to look for it. Then
 # compile it. Global scripts must be compiled now because Dovecot won't have
 # permission later.
-cp conf/sieve-spam.txt /etc/dovecot/sieve-spam.sieve
+cp `pwd`/conf/sieve-spam.txt /etc/dovecot/sieve-spam.sieve
 sievec /etc/dovecot/sieve-spam.sieve
 
 # PERMISSIONS
@@ -194,13 +127,10 @@ chown -R mail.mail $STORAGE_ROOT/mail/mailboxes
 
 # Same for the sieve scripts.
 mkdir -p $STORAGE_ROOT/mail/sieve
-mkdir -p $STORAGE_ROOT/mail/sieve/global_before
-mkdir -p $STORAGE_ROOT/mail/sieve/global_after
 chown -R mail.mail $STORAGE_ROOT/mail/sieve
 
-# Allow the IMAP/POP ports in the firewall.
+# Allow the IMAP port in the firewall.
 ufw_allow imaps
-ufw_allow pop3s
 
 # Restart services.
 restart_service dovecot

setup/mail-postfix.sh

@@ -1,7 +1,6 @@
 #!/bin/bash
 #
 # Postfix (SMTP)
-# --------------
 #
 # Postfix handles the transmission of email between servers
 # using the SMTP protocol. It is a Mail Transfer Agent (MTA).
@@ -30,172 +29,115 @@
 source setup/functions.sh # load our functions
 source /etc/mailinabox.conf # load global vars
 
-# ### Install packages.
+# Install packages.
+# python-libmilter is needed by our encryption milter.
 
-# Install postfix's packages.
+apt_install postfix postgrey postfix-pcre
-#
+hide_output pip3 install git+https://github.com/mail-in-a-box/python-libmilter
-# * `postfix`: The SMTP server.
-# * `postfix-pcre`: Enables header filtering.
-# * `postgrey`: A mail policy service that soft-rejects mail the first time
-#   it is received. Spammers don't usually try agian. Legitimate mail
-#   always will.
-# * `ca-certificates`: A trust store used to squelch postfix warnings about
-#   untrusted opportunistically-encrypted connections.
-#
-# postgrey is going to come in via the Mail-in-a-Box PPA, which publishes
-# a modified version of postgrey that lets senders whitelisted by dnswl.org
-# pass through without being greylisted. So please note [dnswl's license terms](https://www.dnswl.org/?page_id=9):
-# > Every user with more than 100’000 queries per day on the public nameserver
-# > infrastructure and every commercial vendor of dnswl.org data (eg through
-# > anti-spam solutions) must register with dnswl.org and purchase a subscription.
 
-echo "Installing Postfix (SMTP server)..."
+# Basic Settings
-apt_install postfix postfix-pcre postgrey ca-certificates
 
-# ### Basic Settings
+# Have postfix listen on all network interfaces, set our name (the Debian default seems to be localhost),
-
+# and set the name of the local machine to localhost for xxx@localhost mail (but I don't think this will have any effect because
-# Set some basic settings...
+# there is no true local mail delivery). Also set the banner (must have the hostname first, then anything).
-#
-# * Have postfix listen on all network interfaces.
-# * Set our name (the Debian default seems to be "localhost" but make it our hostname).
-# * Set the name of the local machine to localhost, which means xxx@localhost is delivered locally, although we don't use it.
-# * Set the SMTP banner (which must have the hostname first, then anything).
 tools/editconf.py /etc/postfix/main.cf \
 	inet_interfaces=all \
 	myhostname=$PRIMARY_HOSTNAME\
-	smtpd_banner="\$myhostname ESMTP Hi, I'm a Mail-in-a-Box (Ubuntu/Postfix; see https://mailinabox.email/)" \
+	smtpd_banner="\$myhostname ESMTP Hi, I'm a Mail-in-a-Box (Ubuntu/Postfix; see https://github.com/joshdata/mailinabox)" \
 	mydestination=localhost
 
-# ### Outgoing Mail
+# Outgoing Mail
 
 # Enable the 'submission' port 587 smtpd server and tweak its settings.
-#
+# a) Require the best ciphers for incoming connections per http://baldric.net/2013/12/07/tls-ciphers-in-postfix-and-dovecot/.
-# * Do not add the OpenDMAC Authentication-Results header. That should only be added
+#    but without affecting opportunistic TLS on incoming mail, which will allow any cipher (it's better than none).
-#   on incoming mail. Omit the OpenDMARC milter by re-setting smtpd_milters to the
+# b) Give it a different name in syslog to distinguish it from the port 25 smtpd server.
-#   OpenDKIM milter only. See dkim.sh.
+# c) Add a new cleanup service specific to the submission service ('authclean')
-# * Even though we dont allow auth over non-TLS connections (smtpd_tls_auth_only below, and without auth the client cant
+#    that filters out privacy-sensitive headers on mail being sent out by
-#   send outbound mail), don't allow non-TLS mail submission on this port anyway to prevent accidental misconfiguration.
+#    authenticated users.
-# * Require the best ciphers for incoming connections per http://baldric.net/2013/12/07/tls-ciphers-in-postfix-and-dovecot/.
+# d) Create an alternative one running on port 10587 that requires that all recipients have findable
-#   By putting this setting here we leave opportunistic TLS on incoming mail at default cipher settings (any cipher is better than none).
+#    OpenPGP keys. Encrypts the message for the recipients using a milter on port 882. The milter
-# * Give it a different name in syslog to distinguish it from the port 25 smtpd server.
+#    precedes the DKIM milter on 8891 so that the message isn't touched after DKIM signing. If the
-# * Add a new cleanup service specific to the submission service ('authclean')
+#    encryption milter isn't running, reject the message so we dont send anything in the clear.
-#   that filters out privacy-sensitive headers on mail being sent out by
-#   authenticated users.
 tools/editconf.py /etc/postfix/master.cf -s -w \
 	"submission=inet n       -       -       -       -       smtpd
 	  -o syslog_name=postfix/submission
-	  -o smtpd_milters=inet:127.0.0.1:8891
+	  -o smtpd_tls_ciphers=high -o smtpd_tls_protocols=!SSLv2,!SSLv3
-	  -o smtpd_tls_security_level=encrypt
-	  -o smtpd_tls_ciphers=high -o smtpd_tls_exclude_ciphers=aNULL,DES,3DES,MD5,DES+MD5,RC4 -o smtpd_tls_mandatory_protocols=!SSLv2,!SSLv3
 	  -o cleanup_service_name=authclean" \
+	"10587=inet n       -       -       -       -       smtpd
+	  -o syslog_name=postfix/submission-encrypted
+	  -o smtpd_tls_ciphers=high -o smtpd_tls_protocols=!SSLv2,!SSLv3
+	  -o cleanup_service_name=authclean
+	  -o smtpd_milters=inet:127.0.0.1:8892,inet:127.0.0.1:8891 -o milter_default_action=reject" \
 	"authclean=unix  n       -       -       -       0       cleanup
 	  -o header_checks=pcre:/etc/postfix/outgoing_mail_header_filters"
 
 # Install the `outgoing_mail_header_filters` file required by the new 'authclean' service.
 cp conf/postfix_outgoing_mail_header_filters /etc/postfix/outgoing_mail_header_filters
 
-# Modify the `outgoing_mail_header_filters` file to use the local machine name and ip 
+# Enable TLS on incoming connections (i.e. ports 25 *and* 587) and
-# on the first received header line.  This may help reduce the spam score of email by
-# removing the 127.0.0.1 reference.
-sed -i "s/PRIMARY_HOSTNAME/$PRIMARY_HOSTNAME/" /etc/postfix/outgoing_mail_header_filters
-sed -i "s/PUBLIC_IP/$PUBLIC_IP/" /etc/postfix/outgoing_mail_header_filters
-
-# Enable TLS on these and all other connections (i.e. ports 25 *and* 587) and
 # require TLS before a user is allowed to authenticate. This also makes
 # opportunistic TLS available on *incoming* mail.
-# Set stronger DH parameters, which via openssl tend to default to 1024 bits
-# (see ssl.sh).
 tools/editconf.py /etc/postfix/main.cf \
 	smtpd_tls_security_level=may\
 	smtpd_tls_auth_only=yes \
 	smtpd_tls_cert_file=$STORAGE_ROOT/ssl/ssl_certificate.pem \
 	smtpd_tls_key_file=$STORAGE_ROOT/ssl/ssl_private_key.pem \
-	smtpd_tls_dh1024_param_file=$STORAGE_ROOT/ssl/dh2048.pem \
-	smtpd_tls_ciphers=medium \
-	smtpd_tls_exclude_ciphers=aNULL \
 	smtpd_tls_received_header=yes
 
-# Prevent non-authenticated users from sending mail that requires being
-# relayed elsewhere. We don't want to be an "open relay". On outbound
-# mail, require one of:
-#
-# * `permit_sasl_authenticated`: Authenticated users (i.e. on port 587).
-# * `permit_mynetworks`: Mail that originates locally.
-# * `reject_unauth_destination`: No one else. (Permits mail whose destination is local and rejects other mail.)
-tools/editconf.py /etc/postfix/main.cf \
-	smtpd_relay_restrictions=permit_sasl_authenticated,permit_mynetworks,reject_unauth_destination
-
-
-# ### DANE
-
 # When connecting to remote SMTP servers, prefer TLS and use DANE if available.
-#
+# Postfix queries for the TLSA record on the destination MX host. If no TLSA records are found,
-# Prefering ("opportunistic") TLS means Postfix will use TLS if the remote end
-# offers it, otherwise it will transmit the message in the clear. Postfix will
-# accept whatever SSL certificate the remote end provides. Opportunistic TLS
-# protects against passive easvesdropping (but not man-in-the-middle attacks).
-# DANE takes this a step further:
-#
-# Postfix queries DNS for the TLSA record on the destination MX host. If no TLSA records are found,
 # then opportunistic TLS is used. Otherwise the server certificate must match the TLSA records
 # or else the mail bounces. TLSA also requires DNSSEC on the MX host. Postfix doesn't do DNSSEC
 # itself but assumes the system's nameserver does and reports DNSSEC status. Thus this also
-# relies on our local bind9 server being present and `smtp_dns_support_level=dnssec`.
+# relies on our local bind9 server being present and smtp_dns_support_level being set to dnssec
-#
+# to use it.
-# The `smtp_tls_CAfile` is superflous, but it eliminates warnings in the logs about untrusted certs,
-# which we don't care about seeing because Postfix is doing opportunistic TLS anyway. Better to encrypt,
-# even if we don't know if it's to the right party, than to not encrypt at all. Instead we'll
-# now see notices about trusted certs. The CA file is provided by the package `ca-certificates`.
 tools/editconf.py /etc/postfix/main.cf \
 	smtp_tls_security_level=dane \
 	smtp_dns_support_level=dnssec \
-	smtp_tls_CAfile=/etc/ssl/certs/ca-certificates.crt \
 	smtp_tls_loglevel=2
 
-# ### Incoming Mail
+# Incoming Mail
 
 # Pass any incoming mail over to a local delivery agent. Spamassassin
 # will act as the LDA agent at first. It is listening on port 10025
 # with LMTP. Spamassassin will pass the mail over to Dovecot after.
 #
-# In a basic setup we would pass mail directly to Dovecot by setting
+# In a basic setup we would pass mail directly to Dovecot like so:
-# virtual_transport to `lmtp:unix:private/dovecot-lmtp`.
+# tools/editconf.py /etc/postfix/main.cf virtual_transport=lmtp:unix:private/dovecot-lmtp
 #
 tools/editconf.py /etc/postfix/main.cf virtual_transport=lmtp:[127.0.0.1]:10025
 
+# Who can send outbound mail? The purpose of this is to prevent
+# non-authenticated users from sending mail that requires being
+# relayed elsewhere. We don't want to be an "open relay".
+#
+# permit_sasl_authenticated: Authenticated users (i.e. on port 587).
+# permit_mynetworks: Mail that originates locally.
+# reject_unauth_destination: No one else. (Permits mail whose destination is local and rejects other mail.)
+tools/editconf.py /etc/postfix/main.cf \
+	smtpd_relay_restrictions=permit_sasl_authenticated,permit_mynetworks,reject_unauth_destination
+
 # Who can send mail to us? Some basic filters.
 #
-# * `reject_non_fqdn_sender`: Reject not-nice-looking return paths.
+# reject_non_fqdn_sender: Reject not-nice-looking return paths.
-# * `reject_unknown_sender_domain`: Reject return paths with invalid domains.
+# reject_unknown_sender_domain: Reject return paths with invalid domains.
-# * `reject_authenticated_sender_login_mismatch`: Reject if mail FROM address does not match the client SASL login
+# reject_rhsbl_sender: Reject return paths that use blacklisted domains.
-# * `reject_rhsbl_sender`: Reject return paths that use blacklisted domains.
+# permit_sasl_authenticated: Authenticated users (i.e. on port 587).
-# * `permit_sasl_authenticated`: Authenticated users (i.e. on port 587) can skip further checks.
+# permit_mynetworks: Mail that originates locally.
-# * `permit_mynetworks`: Mail that originates locally can skip further checks.
+# reject_rbl_client: Reject connections from IP addresses blacklisted in zen.spamhaus.org
-# * `reject_rbl_client`: Reject connections from IP addresses blacklisted in zen.spamhaus.org
+# check_policy_service: Apply greylisting using postgrey.
-# * `reject_unlisted_recipient`: Although Postfix will reject mail to unknown recipients, it's nicer to reject such mail ahead of greylisting rather than after.
-# * `check_policy_service`: Apply greylisting using postgrey.
 #
-# Notes: #NODOC
+# Notes:
-# permit_dnswl_client can pass through mail from whitelisted IP addresses, which would be good to put before greylisting #NODOC
+# permit_dnswl_client can pass through mail from whitelisted IP addresses, which would be good to put before greylisting
-# so these IPs get mail delivered quickly. But when an IP is not listed in the permit_dnswl_client list (i.e. it is not #NODOC
+# so these IPs get mail delivered quickly. But when an IP is not listed in the permit_dnswl_client list (i.e. it is not
-# whitelisted) then postfix does a DEFER_IF_REJECT, which results in all "unknown user" sorts of messages turning into #NODOC
+# whitelisted) then postfix does a DEFER_IF_REJECT, which results in all "unknown user" sorts of messages turning into
-# "450 4.7.1 Client host rejected: Service unavailable". This is a retry code, so the mail doesn't properly bounce. #NODOC
+# "450 4.7.1 Client host rejected: Service unavailable". This is a retry code, so the mail doesn't properly bounce.
 tools/editconf.py /etc/postfix/main.cf \
-	smtpd_sender_restrictions="reject_non_fqdn_sender,reject_unknown_sender_domain,reject_authenticated_sender_login_mismatch,reject_rhsbl_sender dbl.spamhaus.org" \
+	smtpd_sender_restrictions="reject_non_fqdn_sender,reject_unknown_sender_domain,reject_rhsbl_sender dbl.spamhaus.org" \
-	smtpd_recipient_restrictions=permit_sasl_authenticated,permit_mynetworks,"reject_rbl_client zen.spamhaus.org",reject_unlisted_recipient,"check_policy_service inet:127.0.0.1:10023"
+	smtpd_recipient_restrictions=permit_sasl_authenticated,permit_mynetworks,"reject_rbl_client zen.spamhaus.org","check_policy_service inet:127.0.0.1:10023"
-
-# Postfix connects to Postgrey on the 127.0.0.1 interface specifically. Ensure that
-# Postgrey listens on the same interface (and not IPv6, for instance).
-# A lot of legit mail servers try to resend before 300 seconds.
-# As a matter of fact RFC is not strict about retry timer so postfix and
-# other MTA have their own intervals. To fix the problem of receiving
-# e-mails really latter, delay of greylisting has been set to
-# 180 seconds (default is 300 seconds).
-tools/editconf.py /etc/default/postgrey \
-	POSTGREY_OPTS=\"'--inet=127.0.0.1:10023 --delay=180'\"
 
 # Increase the message size limit from 10MB to 128MB.
-# The same limit is specified in nginx.conf for mail submitted via webmail and Z-Push.
 tools/editconf.py /etc/postfix/main.cf \
 	message_size_limit=134217728
 
@@ -203,8 +145,8 @@ tools/editconf.py /etc/postfix/main.cf \
 
 ufw_allow smtp
 ufw_allow submission
+ufw_allow 10587
 
 # Restart services
 
 restart_service postfix
-restart_service postgrey

setup/mail-users.sh

@@ -1,17 +1,14 @@
 #!/bin/bash
 #
 # User Authentication and Destination Validation
-# ----------------------------------------------
 #
 # This script configures user authentication for Dovecot
 # and Postfix (which relies on Dovecot) and destination
-# validation by quering an Sqlite3 database of mail users.
+# validation by quering an Sqlite3 database of mail users. 
 
 source setup/functions.sh # load our functions
 source /etc/mailinabox.conf # load global vars
 
-# ### User and Alias Database
-
 # The database of mail users (i.e. authenticated users, who have mailboxes)
 # and aliases (forwarders).
 
@@ -20,11 +17,12 @@ db_path=$STORAGE_ROOT/mail/users.sqlite
 # Create an empty database if it doesn't yet exist.
 if [ ! -f $db_path ]; then
 	echo Creating new user database: $db_path;
-	echo "CREATE TABLE users (id INTEGER PRIMARY KEY AUTOINCREMENT, email TEXT NOT NULL UNIQUE, password TEXT NOT NULL, extra, privileges TEXT NOT NULL DEFAULT '');" | sqlite3 $db_path;
+	echo "CREATE TABLE users (id INTEGER PRIMARY KEY AUTOINCREMENT, email TEXT NOT NULL UNIQUE, password TEXT NOT NULL, extra);" | sqlite3 $db_path;
-	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 aliases (id INTEGER PRIMARY KEY AUTOINCREMENT, source TEXT NOT NULL UNIQUE, destination TEXT NOT NULL);" | sqlite3 $db_path;
 fi
 
-# ### User Authentication
+# User Authentication
+#####################
 
 # Have Dovecot query our database, and not system users, for authentication.
 sed -i "s/#*\(\!include auth-system.conf.ext\)/#\1/"  /etc/dovecot/conf.d/10-auth.conf
@@ -53,6 +51,7 @@ EOF
 chmod 0600 /etc/dovecot/dovecot-sql.conf.ext # per Dovecot instructions
 
 # Have Dovecot provide an authorization service that Postfix can access & use.
+# Drew Crawford sets the auth-worker process to run as the mail user, but we don't care if it runs as root.
 cat > /etc/dovecot/conf.d/99-local-auth.conf << EOF;
 service auth {
   unix_listener /var/spool/postfix/private/auth {
@@ -69,28 +68,8 @@ tools/editconf.py /etc/postfix/main.cf \
 	smtpd_sasl_path=private/auth \
 	smtpd_sasl_auth_enable=yes
 
-# ### Sender Validation
+# Destination Validation
-
+########################
-# We use Postfix's reject_authenticated_sender_login_mismatch filter to
-# prevent intra-domain spoofing by logged in but untrusted users in outbound
-# email. In all outbound mail (the sender has authenticated), the MAIL FROM
-# address (aka envelope or return path address) must be "owned" by the user
-# who authenticated. An SQL query will find who are the owners of any given
-# address.
-tools/editconf.py /etc/postfix/main.cf \
-	smtpd_sender_login_maps=sqlite:/etc/postfix/sender-login-maps.cf
-
-# Postfix will query the exact address first, where the priority will be alias
-# records first, then user records. If there are no matches for the exact
-# address, then Postfix will query just the domain part, which we call
-# catch-alls and domain aliases. A NULL permitted_senders column means to
-# take the value from the destination column.
-cat > /etc/postfix/sender-login-maps.cf << EOF;
-dbpath=$db_path
-query = SELECT permitted_senders FROM (SELECT permitted_senders, 0 AS priority FROM aliases WHERE source='%s' AND permitted_senders IS NOT NULL UNION SELECT destination AS permitted_senders, 1 AS priority FROM aliases WHERE source='%s' AND permitted_senders IS NULL UNION SELECT email as permitted_senders, 2 AS priority FROM users WHERE email='%s') ORDER BY priority LIMIT 1;
-EOF
-
-# ### Destination Validation
 
 # Use a Sqlite3 database to check whether a destination email address exists,
 # and to perform any email alias rewrites in Postfix.
@@ -100,45 +79,22 @@ tools/editconf.py /etc/postfix/main.cf \
 	virtual_alias_maps=sqlite:/etc/postfix/virtual-alias-maps.cf \
 	local_recipient_maps=\$virtual_mailbox_maps
 
-# SQL statement to check if we handle incoming mail for a domain, either for users or aliases.
+# SQL statement to check if we handle mail for a domain, either for users or aliases.
 cat > /etc/postfix/virtual-mailbox-domains.cf << EOF;
 dbpath=$db_path
 query = SELECT 1 FROM users WHERE email LIKE '%%@%s' UNION SELECT 1 FROM aliases WHERE source LIKE '%%@%s'
 EOF
 
-# SQL statement to check if we handle incoming mail for a user.
+# SQL statement to check if we handle mail for a user.
 cat > /etc/postfix/virtual-mailbox-maps.cf << EOF;
 dbpath=$db_path
 query = SELECT 1 FROM users WHERE email='%s'
 EOF
 
 # SQL statement to rewrite an email address if an alias is present.
-#
-# Postfix makes multiple queries for each incoming mail. It first
-# queries the whole email address, then just the user part in certain
-# locally-directed cases (but we don't use this), then just `@`+the
-# domain part. The first query that returns something wins. See
-# http://www.postfix.org/virtual.5.html.
-#
-# virtual-alias-maps has precedence over virtual-mailbox-maps, but
-# we don't want catch-alls and domain aliases to catch mail for users
-# that have been defined on those domains. To fix this, we not only
-# query the aliases table but also the users table when resolving
-# aliases, i.e. we turn users into aliases from themselves to
-# themselves. That means users will match in postfix's first query
-# before postfix gets to the third query for catch-alls/domain alises.
-#
-# If there is both an alias and a user for the same address either
-# might be returned by the UNION, so the whole query is wrapped in
-# another select that prioritizes the alias definition to preserve
-# postfix's preference for aliases for whole email addresses.
-#
-# Since we might have alias records with an empty destination because
-# it might have just permitted_senders, skip any records with an
-# empty destination here so that other lower priority rules might match.
 cat > /etc/postfix/virtual-alias-maps.cf << EOF;
 dbpath=$db_path
-query = SELECT destination from (SELECT destination, 0 as priority FROM aliases WHERE source='%s' AND destination<>'' UNION SELECT email as destination, 1 as priority FROM users WHERE email='%s') ORDER BY priority LIMIT 1;
+query = SELECT destination FROM aliases WHERE source='%s'
 EOF
 
 # Restart Services

setup/management.sh

@@ -2,22 +2,13 @@
 
 source setup/functions.sh
 
-echo "Installing Mail-in-a-Box system management daemon..."
+apt_install python3-flask links duplicity libyaml-dev python3-dnspython
-
+hide_output pip3 install rtyaml
-# build-essential libssl-dev libffi-dev python3-dev: Required to pip install cryptography.
-apt_install python3-flask links duplicity libyaml-dev python3-dnspython python3-dateutil \
-	build-essential libssl-dev libffi-dev python3-dev python-pip
-hide_output pip3 install --upgrade rtyaml email_validator>=1.0.0 idna>=2.0.0 cryptography>=1.0.2 boto
-
-# duplicity uses python 2 so we need to use the python 2 package of boto
-hide_output pip install --upgrade boto
-
-# email_validator is repeated in setup/questions.sh
 
 # Create a backup directory and a random key for encrypting backups.
 mkdir -p $STORAGE_ROOT/backup
 if [ ! -f $STORAGE_ROOT/backup/secret_key.txt ]; then
-	$(umask 077; openssl rand -base64 2048 > $STORAGE_ROOT/backup/secret_key.txt)
+	openssl rand -base64 2048 > $STORAGE_ROOT/backup/secret_key.txt
 fi
 
 # Link the management server daemon into a well known location.
@@ -39,16 +30,5 @@ $(pwd)/management/backup.py
 EOF
 chmod +x /etc/cron.daily/mailinabox-backup
 
-# Perform daily status checks. Compare each day to the previous
-# for changes and mail the changes to the administrator.
-cat > /etc/cron.daily/mailinabox-statuschecks << EOF;
-#!/bin/bash
-# Mail-in-a-Box --- Do not edit / will be overwritten on update.
-# Run status checks.
-$(pwd)/management/status_checks.py --show-changes --smtp
-EOF
-chmod +x /etc/cron.daily/mailinabox-statuschecks
-
-
 # Start it.
 restart_service mailinabox

setup/migrate.py

@@ -8,7 +8,7 @@
 import sys, os, os.path, glob, re, shutil
 
 sys.path.insert(0, 'management')
-from utils import load_environment, save_environment, shell
+from utils import load_environment, save_environment, safe_domain_name
 
 def migration_1(env):
 	# Re-arrange where we store SSL certificates. There was a typo also.
@@ -45,72 +45,6 @@ def migration_2(env):
 	for fn in glob.glob(os.path.join(env["STORAGE_ROOT"], 'mail/mailboxes/*/*/.dovecot.svbin')):
 		os.unlink(fn)
 
-def migration_3(env):
-	# Move the migration ID from /etc/mailinabox.conf to $STORAGE_ROOT/mailinabox.version
-	# so that the ID stays with the data files that it describes the format of. The writing
-	# of the file will be handled by the main function.
-	pass
-
-def migration_4(env):
-	# Add a new column to the mail users table where we can store administrative privileges.
-	db = os.path.join(env["STORAGE_ROOT"], 'mail/users.sqlite')
-	shell("check_call", ["sqlite3", db, "ALTER TABLE users ADD privileges TEXT NOT NULL DEFAULT ''"])
-
-def migration_5(env):
-	# The secret key for encrypting backups was world readable. Fix here.
-	os.chmod(os.path.join(env["STORAGE_ROOT"], 'backup/secret_key.txt'), 0o600)
-
-def migration_6(env):
-	# We now will generate multiple DNSSEC keys for different algorithms, since TLDs may
-	# not support them all. .email only supports RSA/SHA-256. Rename the keys.conf file
-	# to be algorithm-specific.
-	basepath = os.path.join(env["STORAGE_ROOT"], 'dns/dnssec')
-	shutil.move(os.path.join(basepath, 'keys.conf'), os.path.join(basepath, 'RSASHA1-NSEC3-SHA1.conf'))
-
-def migration_7(env):
-	# I previously wanted domain names to be stored in Unicode in the database. Now I want them
-	# to be in IDNA. Affects aliases only.
-	import sqlite3
-	conn = sqlite3.connect(os.path.join(env["STORAGE_ROOT"], "mail/users.sqlite"))
-
-	# Get existing alias source addresses.
-	c = conn.cursor()
-	c.execute('SELECT source FROM aliases')
-	aliases = [ row[0] for row in c.fetchall() ]
-
-	# Update to IDNA-encoded domains.
-	for email in aliases:
-		try:
-			localpart, domainpart = email.split("@")
-			domainpart = domainpart.encode("idna").decode("ascii")
-			newemail = localpart + "@" + domainpart
-			if newemail != email:
-				c = conn.cursor()
-				c.execute("UPDATE aliases SET source=? WHERE source=?", (newemail, email))
-				if c.rowcount != 1: raise ValueError("Alias not found.")
-				print("Updated alias", email, "to", newemail)
-		except Exception as e:
-			print("Error updating IDNA alias", email, e)
-
-	# Save.
-	conn.commit()
-
-def migration_8(env):
-	# Delete DKIM keys. We had generated 1024-bit DKIM keys.
-	# By deleting the key file we'll automatically generate
-	# a new key, which will be 2048 bits.
-	os.unlink(os.path.join(env['STORAGE_ROOT'], 'mail/dkim/mail.private'))
-
-def migration_9(env):
-	# Add a column to the aliases table to store permitted_senders,
-	# which is a list of user account email addresses that are
-	# permitted to send mail using this alias instead of their own
-	# address. This was motivated by the addition of #427 ("Reject
-	# outgoing mail if FROM does not match Login") - which introduced
-	# the notion of outbound permitted-senders.
-	db = os.path.join(env["STORAGE_ROOT"], 'mail/users.sqlite')
-	shell("check_call", ["sqlite3", db, "ALTER TABLE aliases ADD permitted_senders TEXT"])
-
 def get_current_migration():
 	ver = 0
 	while True:
@@ -127,23 +61,7 @@ def run_migrations():
 
 	env = load_environment()
 
-	migration_id_file = os.path.join(env['STORAGE_ROOT'], 'mailinabox.version')
+	ourver = int(env.get("MIGRATIONID", "0"))
-	migration_id = None
-	if os.path.exists(migration_id_file):
-		with open(migration_id_file) as f:
-			migration_id = f.read().strip();
-
-	if migration_id is None:
-		# Load the legacy location of the migration ID. We'll drop support
-		# for this eventually.
-		migration_id = env.get("MIGRATIONID")
-
-	if migration_id is None:
-		print()
-		print("%s file doesn't exists. Skipping migration..." % (migration_id_file,))
-		return
-
-	ourver = int(migration_id)
 
 	while True:
 		next_ver = (ourver + 1)
@@ -153,7 +71,6 @@ def run_migrations():
 			# No more migrations to run.
 			break
 
-		print()
 		print("Running migration to Mail-in-a-Box #%d..." % next_ver)
 
 		try:
@@ -171,13 +88,8 @@ def run_migrations():
 
 		# Write out our current version now. Do this sooner rather than later
 		# in case of any problems.
-		with open(migration_id_file, "w") as f:
+		env["MIGRATIONID"] = ourver
-			f.write(str(ourver) + "\n")
+		save_environment(env)
-
-		# Delete the legacy location of this field.
-		if "MIGRATIONID" in env:
-			del env["MIGRATIONID"]
-			save_environment(env)
 
 		# iterate and try next version...
 

setup/munin.sh

@@ -1,61 +0,0 @@
-#!/bin/bash
-# Munin: resource monitoring tool
-#################################################
-
-source setup/functions.sh # load our functions
-source /etc/mailinabox.conf # load global vars
-
-# install Munin
-echo "Installing Munin (system monitoring)..."
-apt_install munin munin-node
-
-# edit config
-cat > /etc/munin/munin.conf <<EOF;
-dbdir /var/lib/munin
-htmldir /var/cache/munin/www
-logdir /var/log/munin
-rundir /var/run/munin
-tmpldir /etc/munin/templates
-
-includedir /etc/munin/munin-conf.d
-
-# a simple host tree
-[$PRIMARY_HOSTNAME]
-address 127.0.0.1
-
-# send alerts to the following address
-contacts admin
-contact.admin.command mail -s "Munin notification ${var:host}" administrator@$PRIMARY_HOSTNAME
-contact.admin.always_send warning critical
-EOF
-
-# ensure munin-node knows the name of this machine
-tools/editconf.py /etc/munin/munin-node.conf -s \
-	host_name=$PRIMARY_HOSTNAME
-
-# Update the activated plugins through munin's autoconfiguration.
-munin-node-configure --shell --remove-also 2>/dev/null | sh
-
-# Deactivate monitoring of NTP peers. Not sure why anyone would want to monitor a NTP peer. The addresses seem to change
-# (which is taken care of my munin-node-configure, but only when we re-run it.)
-find /etc/munin/plugins/ -lname /usr/share/munin/plugins/ntp_ -print0 | xargs -0 /bin/rm -f
-
-# Deactivate monitoring of network interfaces that are not up. Otherwise we can get a lot of empty charts.
-for f in $(find /etc/munin/plugins/ \( -lname /usr/share/munin/plugins/if_ -o -lname /usr/share/munin/plugins/if_err_ -o -lname /usr/share/munin/plugins/bonding_err_ \)); do
-	IF=$(echo $f | sed s/.*_//);
-	if ! ifquery $IF >/dev/null 2>/dev/null; then
-		rm $f;
-	fi;
-done
-
-# Create a 'state' directory. Not sure why we need to do this manually.
-mkdir -p /var/lib/munin-node/plugin-state/
-
-# Restart services.
-restart_service munin
-restart_service munin-node
-
-# generate initial statistics so the directory isn't empty
-# (We get "Pango-WARNING **: error opening config file '/root/.config/pango/pangorc': Permission denied"
-# if we don't explicitly set the HOME directory when sudo'ing.)
-sudo -H -u munin munin-cron

setup/network-checks.sh

@@ -1,57 +0,0 @@
-# Install the 'host', 'sed', and and 'nc' tools. This script is run before
-# the rest of the system setup so we may not yet have things installed.
-apt_get_quiet install bind9-host sed netcat-openbsd
-
-# Stop if the PRIMARY_HOSTNAME is listed in the Spamhaus Domain Block List.
-# The user might have chosen a name that was previously in use by a spammer
-# and will not be able to reliably send mail. Do this after any automatic
-# choices made above.
-if host $PRIMARY_HOSTNAME.dbl.spamhaus.org > /dev/null; then
-	echo
-	echo "The hostname you chose '$PRIMARY_HOSTNAME' is listed in the"
-	echo "Spamhaus Domain Block List. See http://www.spamhaus.org/dbl/"
-	echo "and http://www.spamhaus.org/query/domain/$PRIMARY_HOSTNAME."
-	echo
-	echo "You will not be able to send mail using this domain name, so"
-	echo "setup cannot continue."
-	echo
-	exit 1
-fi
-
-# Stop if the IPv4 address is listed in the ZEN Spamhouse Block List.
-# The user might have ended up on an IP address that was previously in use
-# by a spammer, or the user may be deploying on a residential network. We
-# will not be able to reliably send mail in these cases.
-REVERSED_IPV4=$(echo $PUBLIC_IP | sed "s/\([0-9]*\).\([0-9]*\).\([0-9]*\).\([0-9]*\)/\4.\3.\2.\1/")
-if host $REVERSED_IPV4.zen.spamhaus.org > /dev/null; then
-	echo
-	echo "The IP address $PUBLIC_IP is listed in the Spamhaus Block List."
-	echo "See http://www.spamhaus.org/query/ip/$PUBLIC_IP."
-	echo
-	echo "You will not be able to send mail using this machine, so setup"
-	echo "cannot continue."
-	echo
-	echo "Associate a different IP address with this machine if possible."
-	echo "Many residential network IP addresses are listed, so Mail-in-a-Box"
-	echo "typically cannot be used on a residential Internet connection."
-	echo
-	exit 1
-fi
-
-# Stop if we cannot make an outbound connection on port 25. Many residential
-# networks block outbound port 25 to prevent their network from sending spam.
-# See if we can reach one of Google's MTAs with a 5-second timeout.
-if ! nc -z -w5 aspmx.l.google.com 25; then
-	echo
-	echo "Outbound mail (port 25) seems to be blocked by your network."
-	echo
-	echo "You will not be able to send mail using this machine, so setup"
-	echo "cannot continue."
-	echo
-	echo "Many residential networks block port 25 to prevent hijacked"
-	echo "machines from being able to send spam. I just tried to connect"
-	echo "to Google's mail server on port 25 but the connection did not"
-	echo "succeed."
-	echo
-	exit 1
-fi

setup/owncloud.sh

@@ -1,228 +0,0 @@
-#!/bin/bash
-# Owncloud
-##########################
-
-source setup/functions.sh # load our functions
-source /etc/mailinabox.conf # load global vars
-
-# ### Installing ownCloud
-
-echo "Installing ownCloud (contacts/calendar)..."
-
-apt_install \
-	dbconfig-common \
-	php5-cli php5-sqlite php5-gd php5-imap php5-curl php-pear php-apc curl libapr1 libtool libcurl4-openssl-dev php-xml-parser \
-	php5 php5-dev php5-gd php5-fpm memcached php5-memcached unzip
-
-apt-get purge -qq -y owncloud*
-
-# Install ownCloud from source of this version:
-owncloud_ver=8.1.1
-owncloud_hash=34077e78575a3e689825a00964ee37fbf83fbdda
-
-# Migrate <= v0.10 setups that stored the ownCloud config.php in /usr/local rather than
-# in STORAGE_ROOT. Move the file to STORAGE_ROOT.
-if [ ! -f $STORAGE_ROOT/owncloud/config.php ] \
-	&& [ -f /usr/local/lib/owncloud/config/config.php ]; then
-
-	# Move config.php and symlink back into previous location.
-	echo "Migrating owncloud/config.php to new location."
-	mv /usr/local/lib/owncloud/config/config.php $STORAGE_ROOT/owncloud/config.php \
-		&& \
-	ln -sf $STORAGE_ROOT/owncloud/config.php /usr/local/lib/owncloud/config/config.php
-fi
-
-# Check if ownCloud dir exist, and check if version matches owncloud_ver (if either doesn't - install/upgrade)
-if [ ! -d /usr/local/lib/owncloud/ ] \
-	|| ! grep -q $owncloud_ver /usr/local/lib/owncloud/version.php; then
-
-	# Download and verify
-	wget_verify https://download.owncloud.org/community/owncloud-$owncloud_ver.zip $owncloud_hash /tmp/owncloud.zip
-
-	# Clear out the existing ownCloud.
-	if [ -d /usr/local/lib/owncloud/ ]; then
-		echo "upgrading ownCloud to $owncloud_ver (backing up existing ownCloud directory to /tmp/owncloud-backup-$$)..."
-		mv /usr/local/lib/owncloud /tmp/owncloud-backup-$$
-	fi
-
-	# Extract ownCloud
-	unzip -u -o -q /tmp/owncloud.zip -d /usr/local/lib #either extracts new or replaces current files
-	rm -f /tmp/owncloud.zip
-
-	# The two apps we actually want are not in ownCloud core. Clone them from
-	# their github repositories.
-	mkdir -p /usr/local/lib/owncloud/apps
-	git_clone https://github.com/owncloud/contacts 4ff855e7c2075309041bead09fbb9eb7df678244 '' /usr/local/lib/owncloud/apps/contacts
-	git_clone https://github.com/owncloud/calendar ec53139b144c0f842c33813305612e8006c42ea5 '' /usr/local/lib/owncloud/apps/calendar
-
-	# Fix weird permissions.
-	chmod 750 /usr/local/lib/owncloud/{apps,config}
-
-	# Create a symlink to the config.php in STORAGE_ROOT (for upgrades we're restoring the symlink we previously
-	# put in, and in new installs we're creating a symlink and will create the actual config later).
-	ln -sf $STORAGE_ROOT/owncloud/config.php /usr/local/lib/owncloud/config/config.php
-
-	# Make sure permissions are correct or the upgrade step won't run.
-	# $STORAGE_ROOT/owncloud may not yet exist, so use -f to suppress
-	# that error.
-	chown -f -R www-data.www-data $STORAGE_ROOT/owncloud /usr/local/lib/owncloud
-
-	# If this isn't a new installation, immediately run the upgrade script.
-	# Then check for success (0=ok and 3=no upgrade needed, both are success).
-	if [ -f $STORAGE_ROOT/owncloud/owncloud.db ]; then
-		# ownCloud 8.1.1 broke upgrades. It may fail on the first attempt, but
-		# that can be OK.
-		sudo -u www-data php /usr/local/lib/owncloud/occ upgrade
-		if [ \( $? -ne 0 \) -a \( $? -ne 3 \) ]; then
-			echo "Trying ownCloud upgrade again to work around ownCloud upgrade bug..."
-			sudo -u www-data php /usr/local/lib/owncloud/occ upgrade
-			if [ \( $? -ne 0 \) -a \( $? -ne 3 \) ]; then exit 1; fi
-			sudo -u www-data php /usr/local/lib/owncloud/occ maintenance:mode --off
-			echo "...which seemed to work."
-		fi
-	fi
-fi
-
-# ### Configuring ownCloud
-
-# Setup ownCloud if the ownCloud database does not yet exist. Running setup when
-# the database does exist wipes the database and user data.
-if [ ! -f $STORAGE_ROOT/owncloud/owncloud.db ]; then
-	# Create user data directory
-	mkdir -p $STORAGE_ROOT/owncloud
-
-	# Create an initial configuration file.
-	TIMEZONE=$(cat /etc/timezone)
-	instanceid=oc$(echo $PRIMARY_HOSTNAME | sha1sum | fold -w 10 | head -n 1)
-	cat > $STORAGE_ROOT/owncloud/config.php <<EOF;
-<?php
-\$CONFIG = array (
-  'datadirectory' => '$STORAGE_ROOT/owncloud',
-
-  'instanceid' => '$instanceid',
-
-  'forcessl' => true, # if unset/false, ownCloud sends a HSTS=0 header, which conflicts with nginx config
-
-  'overwritewebroot' => '/cloud',
-  'overwrite.cli.url' => '/cloud',
-  'user_backends' => array(
-    array(
-      'class'=>'OC_User_IMAP',
-      'arguments'=>array('{localhost:993/imap/ssl/novalidate-cert}')
-    )
-  ),
-  'memcache.local' => '\\OC\\Memcache\\Memcached',
-  "memcached_servers" => array (
-    array('localhost', 11211),
-  ),
-  'mail_smtpmode' => 'sendmail',
-  'mail_smtpsecure' => '',
-  'mail_smtpauthtype' => 'LOGIN',
-  'mail_smtpauth' => false,
-  'mail_smtphost' => '',
-  'mail_smtpport' => '',
-  'mail_smtpname' => '',
-  'mail_smtppassword' => '',
-  'mail_from_address' => 'owncloud',
-  'mail_domain' => '$PRIMARY_HOSTNAME',
-  'logtimezone' => '$TIMEZONE',
-);
-?>
-EOF
-
-	# Create an auto-configuration file to fill in database settings
-	# when the install script is run. Make an administrator account
-	# here or else the install can't finish.
-	adminpassword=$(dd if=/dev/random bs=1 count=40 2>/dev/null | sha1sum | fold -w 30 | head -n 1)
-	cat > /usr/local/lib/owncloud/config/autoconfig.php <<EOF;
-<?php
-\$AUTOCONFIG = array (
-  # storage/database
-  'directory' => '$STORAGE_ROOT/owncloud',
-  'dbtype' => 'sqlite3',
-
-  # create an administrator account with a random password so that
-  # the user does not have to enter anything on first load of ownCloud
-  'adminlogin'    => 'root',
-  'adminpass'     => '$adminpassword',
-);
-?>
-EOF
-
-	# Set permissions
-	chown -R www-data.www-data $STORAGE_ROOT/owncloud /usr/local/lib/owncloud
-
-	# Execute ownCloud's setup step, which creates the ownCloud sqlite database.
-	# It also wipes it if it exists. And it updates config.php with database
-	# settings and deletes the autoconfig.php file.
-	(cd /usr/local/lib/owncloud; sudo -u www-data php /usr/local/lib/owncloud/index.php;)
-fi
-
-# Update config.php.
-# * trusted_domains is reset to localhost by autoconfig starting with ownCloud 8.1.1,
-#   so set it here. It also can change if the box's PRIMARY_HOSTNAME changes, so
-#   this will make sure it has the right value.
-# * Some settings weren't included in previous versions of Mail-in-a-Box.
-# Use PHP to read the settings file, modify it, and write out the new settings array.
-CONFIG_TEMP=$(/bin/mktemp)
-php <<EOF > $CONFIG_TEMP && mv $CONFIG_TEMP $STORAGE_ROOT/owncloud/config.php;
-<?php
-include("$STORAGE_ROOT/owncloud/config.php");
-
-\$CONFIG['trusted_domains'] = array('$PRIMARY_HOSTNAME');
-
-\$CONFIG['memcache.local'] = '\\OC\\Memcache\\Memcached';
-\$CONFIG['overwrite.cli.url'] = '/cloud';
-
-echo "<?php\n\\\$CONFIG = ";
-var_export(\$CONFIG);
-echo ";";
-?>
-EOF
-chown www-data.www-data $STORAGE_ROOT/owncloud/config.php
-
-# Enable/disable apps. Note that this must be done after the ownCloud setup.
-# The firstrunwizard gave Josh all sorts of problems, so disabling that.
-# user_external is what allows ownCloud to use IMAP for login. The contacts
-# and calendar apps are the extensions we really care about here.
-hide_output sudo -u www-data php /usr/local/lib/owncloud/console.php app:disable firstrunwizard
-hide_output sudo -u www-data php /usr/local/lib/owncloud/console.php app:enable user_external
-hide_output sudo -u www-data php /usr/local/lib/owncloud/console.php app:enable contacts
-hide_output sudo -u www-data php /usr/local/lib/owncloud/console.php app:enable calendar
-
-# When upgrading, run the upgrade script again now that apps are enabled. It seems like
-# the first upgrade at the top won't work because apps may be disabled during upgrade?
-# Check for success (0=ok, 3=no upgrade needed).
-sudo -u www-data php /usr/local/lib/owncloud/occ upgrade
-if [ \( $? -ne 0 \) -a \( $? -ne 3 \) ]; then exit 1; fi
-
-# Set PHP FPM values to support large file uploads
-# (semicolon is the comment character in this file, hashes produce deprecation warnings)
-tools/editconf.py /etc/php5/fpm/php.ini -c ';' \
-	upload_max_filesize=16G \
-	post_max_size=16G \
-	output_buffering=16384 \
-	memory_limit=512M \
-	max_execution_time=600 \
-	short_open_tag=On
-
-# Set up a cron job for owncloud.
-cat > /etc/cron.hourly/mailinabox-owncloud << EOF;
-#!/bin/bash
-# Mail-in-a-Box
-sudo -u www-data php -f /usr/local/lib/owncloud/cron.php
-EOF
-chmod +x /etc/cron.hourly/mailinabox-owncloud
-
-# There's nothing much of interest that a user could do as an admin for ownCloud,
-# and there's a lot they could mess up, so we don't make any users admins of ownCloud.
-# But if we wanted to, we would do this:
-# ```
-# for user in $(tools/mail.py user admins); do
-#	 sqlite3 $STORAGE_ROOT/owncloud/owncloud.db "INSERT OR IGNORE INTO oc_group_user VALUES ('admin', '$user')"
-# done
-# ```
-
-# Enable PHP modules and restart PHP.
-php5enmod imap
-restart_service php5-fpm

setup/preflight.sh

@@ -1,35 +0,0 @@
-# Are we running as root?
-if [[ $EUID -ne 0 ]]; then
-	echo "This script must be run as root. Please re-run like this:"
-	echo
-	echo "sudo $0"
-	echo
-	exit
-fi
-
-# Check that we are running on Ubuntu 14.04 LTS (or 14.04.xx).
-if [ "`lsb_release -d | sed 's/.*:\s*//' | sed 's/14\.04\.[0-9]/14.04/' `" != "Ubuntu 14.04 LTS" ]; then
-	echo "Mail-in-a-Box only supports being installed on Ubuntu 14.04, sorry. You are running:"
-	echo
-	lsb_release -d | sed 's/.*:\s*//'
-	echo
-	echo "We can't write scripts that run on every possible setup, sorry."
-	exit
-fi
-
-# Check that we have enough memory.
-#
-# /proc/meminfo reports free memory in kibibytes. Our baseline will be 768 MB,
-# which is 750000 kibibytes.
-#
-# Skip the check if we appear to be running inside of Vagrant, because that's really just for testing.
-TOTAL_PHYSICAL_MEM=$(head -n 1 /proc/meminfo | awk '{print $2}')
-if [ $TOTAL_PHYSICAL_MEM -lt 750000 ]; then
-if [ ! -d /vagrant ]; then
-	TOTAL_PHYSICAL_MEM=$(expr \( \( $TOTAL_PHYSICAL_MEM \* 1024 \) / 1000 \) / 1000)
-	echo "Your Mail-in-a-Box needs more memory (RAM) to function properly."
-	echo "Please provision a machine with at least 768 MB, 1 GB recommended."
-	echo "This machine has $TOTAL_PHYSICAL_MEM MB memory."
-	exit
-fi
-fi

setup/questions.sh

@@ -1,243 +0,0 @@
-if [ -z "$NONINTERACTIVE" ]; then
-	# Install 'dialog' so we can ask the user questions. The original motivation for
-	# this was being able to ask the user for input even if stdin has been redirected,
-	# e.g. if we piped a bootstrapping install script to bash to get started. In that
-	# case, the nifty '[ -t 0 ]' test won't work. But with Vagrant we must suppress so we
-	# use a shell flag instead. Really supress any output from installing dialog.
-	#
-	# Also install depencies needed to validate the email address.
-	if [ ! -f /usr/bin/dialog ] || [ ! -f /usr/bin/python3 ] || [ ! -f /usr/bin/pip3 ]; then
-		echo Installing packages needed for setup...
-		apt-get -q -q update
-		apt_get_quiet install dialog python3 python3-pip  || exit 1
-	fi
-
-	# email_validator is repeated in setup/management.sh
-	hide_output pip3 install email_validator==1.0.0 || exit 1
-
-	message_box "Mail-in-a-Box Installation" \
-		"Hello and thanks for deploying a Mail-in-a-Box!
-		\n\nI'm going to ask you a few questions.
-		\n\nTo change your answers later, just run 'sudo mailinabox' from the command line."
-fi
-
-# The box needs a name.
-if [ -z "$PRIMARY_HOSTNAME" ]; then
-	if [ -z "$DEFAULT_PRIMARY_HOSTNAME" ]; then
-		# We recommend to use box.example.com as this hosts name. The
-		# domain the user possibly wants to use is example.com then.
-		# We strip the string "box." from the hostname to get the mail
-		# domain. If the hostname differs, nothing happens here.
-		DEFAULT_DOMAIN_GUESS=$(echo $(get_default_hostname) | sed -e 's/^box\.//')
-
-		# This is the first run. Ask the user for his email address so we can
-		# provide the best default for the box's hostname.
-		input_box "Your Email Address" \
-"What email address are you setting this box up to manage?
-\n\nThe part after the @-sign must be a domain name or subdomain
-that you control. You can add other email addresses to this
-box later (including email addresses on other domain names
-or subdomains you control).
-\n\nWe've guessed an email address. Backspace it and type in what
-you really want.
-\n\nEmail Address:" \
-			"me@$DEFAULT_DOMAIN_GUESS" \
-			EMAIL_ADDR
-
-		if [ -z "$EMAIL_ADDR" ]; then
-			# user hit ESC/cancel
-			exit
-		fi
-		while ! management/mailconfig.py validate-email "$EMAIL_ADDR"
-		do
-			input_box "Your Email Address" \
-				"That's not a valid email address.\n\nWhat email address are you setting this box up to manage?" \
-				$EMAIL_ADDR \
-				EMAIL_ADDR
-			if [ -z "$EMAIL_ADDR" ]; then
-				# user hit ESC/cancel
-				exit
-			fi
-		done
-
-		# Take the part after the @-sign as the user's domain name, and add
-		# 'box.' to the beginning to create a default hostname for this machine.
-		DEFAULT_PRIMARY_HOSTNAME=box.$(echo $EMAIL_ADDR | sed 's/.*@//')
-	fi
-
-	input_box "Hostname" \
-"This box needs a name, called a 'hostname'. The name will form a part of the box's web address.
-\n\nWe recommend that the name be a subdomain of the domain in your email
-address, so we're suggesting $DEFAULT_PRIMARY_HOSTNAME.
-\n\nYou can change it, but we recommend you don't.
-\n\nHostname:" \
-		$DEFAULT_PRIMARY_HOSTNAME \
-		PRIMARY_HOSTNAME
-
-	if [ -z "$PRIMARY_HOSTNAME" ]; then
-		# user hit ESC/cancel
-		exit
-	fi
-fi
-
-# If the machine is behind a NAT, inside a VM, etc., it may not know
-# its IP address on the public network / the Internet. Ask the Internet
-# and possibly confirm with user.
-if [ -z "$PUBLIC_IP" ]; then
-	# Ask the Internet.
-	GUESSED_IP=$(get_publicip_from_web_service 4)
-
-	# On the first run, if we got an answer from the Internet then don't
-	# ask the user.
-	if [[ -z "$DEFAULT_PUBLIC_IP" && ! -z "$GUESSED_IP" ]]; then
-		PUBLIC_IP=$GUESSED_IP
-
-	# Otherwise on the first run at least provide a default.
-	elif [[ -z "$DEFAULT_PUBLIC_IP" ]]; then
-		DEFAULT_PUBLIC_IP=$(get_default_privateip 4)
-
-	# On later runs, if the previous value matches the guessed value then
-	# don't ask the user either.
-	elif [ "$DEFAULT_PUBLIC_IP" == "$GUESSED_IP" ]; then
-		PUBLIC_IP=$GUESSED_IP
-	fi
-
-	if [ -z "$PUBLIC_IP" ]; then
-		input_box "Public IP Address" \
-			"Enter the public IP address of this machine, as given to you by your ISP.
-			\n\nPublic IP address:" \
-			$DEFAULT_PUBLIC_IP \
-			PUBLIC_IP
-
-		if [ -z "$PUBLIC_IP" ]; then
-			# user hit ESC/cancel
-			exit
-		fi
-	fi
-fi
-
-# Same for IPv6. But it's optional. Also, if it looks like the system
-# doesn't have an IPv6, don't ask for one.
-if [ -z "$PUBLIC_IPV6" ]; then
-	# Ask the Internet.
-	GUESSED_IP=$(get_publicip_from_web_service 6)
-	MATCHED=0
-	if [[ -z "$DEFAULT_PUBLIC_IPV6" && ! -z "$GUESSED_IP" ]]; then
-		PUBLIC_IPV6=$GUESSED_IP
-	elif [[ "$DEFAULT_PUBLIC_IPV6" == "$GUESSED_IP" ]]; then
-		# No IPv6 entered and machine seems to have none, or what
-		# the user entered matches what the Internet tells us.
-		PUBLIC_IPV6=$GUESSED_IP
-		MATCHED=1
-	elif [[ -z "$DEFAULT_PUBLIC_IPV6" ]]; then
-		DEFAULT_PUBLIC_IP=$(get_default_privateip 6)
-	fi
-
-	if [[ -z "$PUBLIC_IPV6" && $MATCHED == 0 ]]; then
-		input_box "IPv6 Address (Optional)" \
-			"Enter the public IPv6 address of this machine, as given to you by your ISP.
-			\n\nLeave blank if the machine does not have an IPv6 address.
-			\n\nPublic IPv6 address:" \
-			$DEFAULT_PUBLIC_IPV6 \
-			PUBLIC_IPV6
-
-		if [ ! $PUBLIC_IPV6_EXITCODE ]; then
-			# user hit ESC/cancel
-			exit
-		fi
-	fi
-fi
-
-# Get the IP addresses of the local network interface(s) that are connected
-# to the Internet. We need these when we want to have services bind only to
-# the public network interfaces (not loopback, not tunnel interfaces).
-if [ -z "$PRIVATE_IP" ]; then
-	PRIVATE_IP=$(get_default_privateip 4)
-fi
-if [ -z "$PRIVATE_IPV6" ]; then
-	PRIVATE_IPV6=$(get_default_privateip 6)
-fi
-if [[ -z "$PRIVATE_IP" && -z "$PRIVATE_IPV6" ]]; then
-	echo
-	echo "I could not determine the IP or IPv6 address of the network inteface"
-	echo "for connecting to the Internet. Setup must stop."
-	echo
-	hostname -I
-	route
-	echo
-	exit
-fi
-
-# We need a country code to generate a certificate signing request. However
-# if a CSR already exists then we won't be generating a new one and there's
-# no reason to ask for the country code now. $STORAGE_ROOT has not yet been
-# set so we'll check if $DEFAULT_STORAGE_ROOT and $DEFAULT_CSR_COUNTRY are
-# set (the values from the current mailinabox.conf) and if the CSR exists
-# in the expected location.
-if [ ! -z "$DEFAULT_STORAGE_ROOT" ] && [ ! -z "$DEFAULT_CSR_COUNTRY" ] && [ -f $DEFAULT_STORAGE_ROOT/ssl/ssl_cert_sign_req.csr ]; then
-	CSR_COUNTRY=$DEFAULT_CSR_COUNTRY
-fi
-
-if [ -z "$CSR_COUNTRY" ]; then
-	# Get a list of country codes. Separate codes from country names with a ^.
-	# The input_menu function modifies shell word expansion to ignore spaces
-	# (since country names can have spaces) and use ^ instead.
-	country_code_list=$(grep -v "^#" setup/csr_country_codes.tsv | sed "s/\(..\)\t\([^\t]*\).*/\1^\2/")
-
-	input_menu "Country Code" \
-		"Choose the country where you live or where your organization is based.
-		\n\n(This is used to create an SSL certificate.)
-		\n\nCountry Code:" \
-		"$country_code_list" \
-		CSR_COUNTRY
-
-	if [ -z "$CSR_COUNTRY" ]; then
-		# user hit ESC/cancel
-		exit
-	fi
-fi
-
-# Automatic configuration, e.g. as used in our Vagrant configuration.
-if [ "$PUBLIC_IP" = "auto" ]; then
-	# Use a public API to get our public IP address, or fall back to local network configuration.
-	PUBLIC_IP=$(get_publicip_from_web_service 4 || get_default_privateip 4)
-fi
-if [ "$PUBLIC_IPV6" = "auto" ]; then
-	# Use a public API to get our public IPv6 address, or fall back to local network configuration.
-	PUBLIC_IPV6=$(get_publicip_from_web_service 6 || get_default_privateip 6)
-fi
-if [ "$PRIMARY_HOSTNAME" = "auto" ]; then
-	# Use reverse DNS to get this machine's hostname. Install bind9-host early.
-	hide_output apt-get -y install bind9-host
-	PRIMARY_HOSTNAME=$(get_default_hostname)
-elif [ "$PRIMARY_HOSTNAME" = "auto-easy" ]; then
-	# Generate a probably-unique subdomain under our justtesting.email domain.
-	PRIMARY_HOSTNAME=`echo $PUBLIC_IP | sha1sum | cut -c1-5`.justtesting.email
-fi
-
-# Set STORAGE_USER and STORAGE_ROOT to default values (user-data and /home/user-data), unless
-# we've already got those values from a previous run.
-if [ -z "$STORAGE_USER" ]; then
-	STORAGE_USER=$([[ -z "$DEFAULT_STORAGE_USER" ]] && echo "user-data" || echo "$DEFAULT_STORAGE_USER")
-fi
-if [ -z "$STORAGE_ROOT" ]; then
-	STORAGE_ROOT=$([[ -z "$DEFAULT_STORAGE_ROOT" ]] && echo "/home/$STORAGE_USER" || echo "$DEFAULT_STORAGE_ROOT")
-fi
-
-# Show the configuration, since the user may have not entered it manually.
-echo
-echo "Primary Hostname: $PRIMARY_HOSTNAME"
-echo "Public IP Address: $PUBLIC_IP"
-if [ ! -z "$PUBLIC_IPV6" ]; then
-	echo "Public IPv6 Address: $PUBLIC_IPV6"
-fi
-if [ "$PRIVATE_IP" != "$PUBLIC_IP" ]; then
-	echo "Private IP Address: $PRIVATE_IP"
-fi
-if [ "$PRIVATE_IPV6" != "$PUBLIC_IPV6" ]; then
-	echo "Private IPv6 Address: $PRIVATE_IPV6"
-fi
-if [ -f /usr/bin/git ] && [ -d .git ]; then
-	echo "Mail-in-a-Box Version: " $(git describe)
-fi
-echo

setup/spamassassin.sh

@@ -1,136 +1,58 @@
-#!/bin/bash
 # Spam filtering with spamassassin via spampd
-# -------------------------------------------
+#############################################
-#
+
 # spampd sits between postfix and dovecot. It takes mail from postfix
 # over the LMTP protocol, runs spamassassin on it, and then passes the
 # message over LMTP to dovecot for local delivery.
-#
-# In order to move spam automatically into the Spam folder we use the dovecot sieve
-# plugin.
 
-source /etc/mailinabox.conf # get global vars
+# In order to move spam automatically into the Spam folder we use the dovecot sieve
+# plugin. The tools/mail.py tool creates the necessary sieve script for each mail
+# user when the mail user is created.
+
 source setup/functions.sh # load our functions
 
-# Install packages and basic configuration
-# ----------------------------------------
-
 # Install packages.
-# libmail-dkim-perl is needed to make the spamassassin DKIM module work.
+apt_install spampd razor pyzor dovecot-antispam
-# For more information see Debian Bug #689414:
-# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=689414
-echo "Installing SpamAssassin..."
-apt_install spampd razor pyzor dovecot-antispam libmail-dkim-perl
 
 # Allow spamassassin to download new rules.
 tools/editconf.py /etc/default/spamassassin \
 	CRON=1
 
-# Configure pyzor, which is a client to a live database of hashes of
+# Configure pyzor.
-# spam emails. Set the pyzor configuration directory to something sane.
+hide_output pyzor discover
-# The default is ~/.pyzor. We used to use that, so we'll kill that old
-# directory. Then write the public pyzor server to its servers file.
-# That will prevent an automatic download on first use, and also means
-# we can skip 'pyzor discover', both of which are currently broken by
-# something happening on Sourceforge (#496).
-rm -rf ~/.pyzor
-tools/editconf.py /etc/spamassassin/local.cf -s \
-	pyzor_options="--homedir /etc/spamassassin/pyzor"
-mkdir -p /etc/spamassassin/pyzor
-echo "public.pyzor.org:24441" > /etc/spamassassin/pyzor/servers
-# check with: pyzor --homedir /etc/mail/spamassassin/pyzor ping
 
-# Configure spampd:
+# Pass messages on to docevot on port 10026.
-# * Pass messages on to docevot on port 10026. This is actually the default setting but we don't
+# This is actually the default setting but we don't want to lose track of it.
-#   want to lose track of it. (We've configured Dovecot to listen on this port elsewhere.)
+# We've already configured Dovecot to listen on this port.
-# * Increase the maximum message size of scanned messages from the default of 64KB to 500KB, which
+tools/editconf.py /etc/default/spampd DESTPORT=10026
-#   is Spamassassin (spamc)'s own default. Specified in KBytes.
-# * Disable localmode so Pyzor, DKIM and DNS checks can be used.
-tools/editconf.py /etc/default/spampd \
-	DESTPORT=10026 \
-	ADDOPTS="\"--maxsize=500\"" \
-	LOCALONLY=0
 
-# Spamassassin normally wraps spam as an attachment inside a fresh
+# Enable the Dovecot antispam plugin to detect when a message moves between folders so we can
-# email with a report about the message. This also protects the user
+# pass it to sa-learn for training. (Be careful if we use multiple plugins later.)
-# from accidentally openening a message with embedded malware.
+sudo sed -i "s/#mail_plugins = .*/mail_plugins = \$mail_plugins antispam/" /etc/dovecot/conf.d/20-imap.conf
-#
-# It's nice to see what rules caused the message to be marked as spam,
-# but it's also annoying to get to the original message when it is an
-# attachment, modern mail clients are safer now and don't load remote
-# content or execute scripts, and it is probably confusing to most users.
-#
-# Tell Spamassassin not to modify the original message except for adding
-# the X-Spam-Status mail header and related headers.
-tools/editconf.py /etc/spamassassin/local.cf -s \
-	report_safe=0
 
-# Bayesean learning
+# When mail is moved in or out of the Dovecot Spam folder, re-train using this script
-# -----------------
+# that sends the mail to spamassassin.
-#
+# from http://wiki2.dovecot.org/Plugins/Antispam
-# Spamassassin can learn from mail marked as spam or ham, but it needs to be
+cat > /usr/bin/sa-learn-pipe.sh << EOF;
-# configured. We'll store the learning data in our storage area.
+cat<&0 >> /tmp/sendmail-msg-\$\$.txt
-#
+/usr/bin/sa-learn \$* /tmp/sendmail-msg-\$\$.txt > /dev/null
-# These files must be:
+rm -f /tmp/sendmail-msg-\$\$.txt
-#
+exit 0
-# * Writable by sa-learn-pipe script below, which run as the 'mail' user, for manual tagging of mail as spam/ham.
+EOF
-# * Readable by the spampd process ('spampd' user) during mail filtering.
+chmod a+x /usr/bin/sa-learn-pipe.sh
-# * Writable by the debian-spamd user, which runs /etc/cron.daily/spamassassin.
-#
-# We'll have these files owned by spampd and grant access to the other two processes.
-
-tools/editconf.py /etc/spamassassin/local.cf -s \
-	bayes_path=$STORAGE_ROOT/mail/spamassassin/bayes
-
-mkdir -p $STORAGE_ROOT/mail/spamassassin
-chown -R spampd:spampd $STORAGE_ROOT/mail/spamassassin
-
-# To mark mail as spam or ham, just drag it in or out of the Spam folder. We'll
-# use the Dovecot antispam plugin to detect the message move operation and execute
-# a shell script that invokes learning.
-
-# Enable the Dovecot antispam plugin.
-# (Be careful if we use multiple plugins later.) #NODOC
-sed -i "s/#mail_plugins = .*/mail_plugins = \$mail_plugins antispam/" /etc/dovecot/conf.d/20-imap.conf
-sed -i "s/#mail_plugins = .*/mail_plugins = \$mail_plugins antispam/" /etc/dovecot/conf.d/20-pop3.conf
 
 # Configure the antispam plugin to call sa-learn-pipe.sh.
 cat > /etc/dovecot/conf.d/99-local-spampd.conf << EOF;
 plugin {
     antispam_backend = pipe
     antispam_spam_pattern_ignorecase = SPAM
-    antispam_trash_pattern_ignorecase = trash;Deleted *
     antispam_allow_append_to_spam = yes
-    antispam_pipe_program_spam_args = /usr/local/bin/sa-learn-pipe.sh;--spam
+    antispam_pipe_program_spam_args = /usr/bin/sa-learn-pipe.sh;--spam
-    antispam_pipe_program_notspam_args = /usr/local/bin/sa-learn-pipe.sh;--ham
+    antispam_pipe_program_notspam_args = /usr/bin/sa-learn-pipe.sh;--ham
     antispam_pipe_program = /bin/bash
 }
 EOF
 
-# Have Dovecot run its mail process with a supplementary group (the spampd group)
-# so that it can access the learning files.
-
-tools/editconf.py /etc/dovecot/conf.d/10-mail.conf \
-	mail_access_groups=spampd
-
-# Here's the script that the antispam plugin executes. It spools the message into
-# a temporary file and then runs sa-learn on it.
-# from http://wiki2.dovecot.org/Plugins/Antispam
-rm -f /usr/bin/sa-learn-pipe.sh # legacy location #NODOC
-cat > /usr/local/bin/sa-learn-pipe.sh << EOF;
-cat<&0 >> /tmp/sendmail-msg-\$\$.txt
-/usr/bin/sa-learn \$* /tmp/sendmail-msg-\$\$.txt > /dev/null
-rm -f /tmp/sendmail-msg-\$\$.txt
-exit 0
-EOF
-chmod a+x /usr/local/bin/sa-learn-pipe.sh
-
-# Create empty bayes training data (if it doesn't exist). Once the files exist,
-# ensure they are group-writable so that the Dovecot process has access.
-sudo -u spampd /usr/bin/sa-learn --sync 2>/dev/null
-chmod -R 660 $STORAGE_ROOT/mail/spamassassin
-chmod 770 $STORAGE_ROOT/mail/spamassassin
-
 # Initial training?
 # sa-learn --ham storage/mail/mailboxes/*/*/cur/
 # sa-learn --spam storage/mail/mailboxes/*/*/.Spam/cur/

setup/ssl.sh

@@ -1,8 +1,7 @@
 #!/bin/bash
 #
 # SSL Certificate
-# ---------------
+#
-
 # Create a self-signed SSL certificate if one has not yet been created.
 #
 # The certificate is for PRIMARY_HOSTNAME specifically and is used for:
@@ -19,35 +18,30 @@
 source setup/functions.sh # load our functions
 source /etc/mailinabox.conf # load global vars
 
-echo "Creating initial SSL certificate and perfect forward secrecy Diffie-Hellman parameters..."
 apt_install openssl
 
 mkdir -p $STORAGE_ROOT/ssl
-# Generate a new private key.
+if [ ! -f $STORAGE_ROOT/ssl/ssl_certificate.pem ]; then
-# Set the umask so the key file is not world-readable.
+	# Generate a new private key if one doesn't already exist.
-if [ ! -f $STORAGE_ROOT/ssl/ssl_private_key.pem ]; then
+	# Set the umask so the key file is not world-readable.
 	(umask 077; hide_output \
 		openssl genrsa -out $STORAGE_ROOT/ssl/ssl_private_key.pem 2048)
 fi
-
-# Generate a certificate signing request.
 if [ ! -f $STORAGE_ROOT/ssl/ssl_cert_sign_req.csr ]; then
+	# Generate a certificate signing request if one doesn't already exist.
 	hide_output \
 	openssl req -new -key $STORAGE_ROOT/ssl/ssl_private_key.pem -out $STORAGE_ROOT/ssl/ssl_cert_sign_req.csr \
-	  -sha256 -subj "/C=$CSR_COUNTRY/ST=/L=/O=/CN=$PRIMARY_HOSTNAME"
+	  -subj "/C=$CSR_COUNTRY/ST=/L=/O=/CN=$PRIMARY_HOSTNAME"
 fi
-
-# Generate a SSL certificate by self-signing.
 if [ ! -f $STORAGE_ROOT/ssl/ssl_certificate.pem ]; then
+	# Generate a SSL certificate by self-signing if a SSL certificate doesn't yet exist.
 	hide_output \
 	openssl x509 -req -days 365 \
 	  -in $STORAGE_ROOT/ssl/ssl_cert_sign_req.csr -signkey $STORAGE_ROOT/ssl/ssl_private_key.pem -out $STORAGE_ROOT/ssl/ssl_certificate.pem
 fi
 
-# For nginx and postfix, pre-generate some Diffie-Hellman cipher bits which is
+echo
-# used when a Diffie-Hellman cipher is selected during TLS negotiation. Diffie-Hellman
+echo "Your SSL certificate's fingerpint is:"
-# provides Perfect Forward Secrecy. openssl's default is 1024 bits, but we'll
+openssl x509 -in $STORAGE_ROOT/ssl/ssl_certificate.pem -noout -fingerprint \
-# create 2048.
+	| sed "s/SHA1 Fingerprint=//"
-if [ ! -f $STORAGE_ROOT/ssl/dh2048.pem ]; then
+echo
-	openssl dhparam -out $STORAGE_ROOT/ssl/dh2048.pem 2048
-fi

setup/start.sh

@@ -4,78 +4,188 @@
 
 source setup/functions.sh # load our functions
 
-# Check system setup: Are we running as root on Ubuntu 14.04 on a
+# Check system setup.
-# machine with enough memory? If not, this shows an error and exits.
-source setup/preflight.sh
 
-# Ensure Python reads/writes files in UTF-8. If the machine
+# Are we running as root?
-# triggers some other locale in Python, like ASCII encoding,
+if [[ $EUID -ne 0 ]]; then
-# Python may not be able to read/write files. Here and in
+	echo "This script must be run as root. Please re-run like this:"
-# the management daemon startup script.
+	echo
-
+	echo "sudo setup/start.sh"
-if [ -z `locale -a | grep en_US.utf8` ]; then
+	echo
-    # Generate locale if not exists
+	exit
-    hide_output locale-gen en_US.UTF-8
 fi
 
-export LANGUAGE=en_US.UTF-8
+# Check that we are running on Ubuntu 14.04 LTS (or 14.04.xx).
-export LC_ALL=en_US.UTF-8
+if [ "`lsb_release -d | sed 's/.*:\s*//' | sed 's/14\.04\.[0-9]/14.04/' `" != "Ubuntu 14.04 LTS" ]; then
-export LANG=en_US.UTF-8
+	echo "Mail-in-a-Box only supports being installed on Ubuntu 14.04, sorry. You are running:"
-export LC_TYPE=en_US.UTF-8
+	echo
+	lsb_release -d | sed 's/.*:\s*//'
+	echo
+	echo "We can't write scripts that run on every possible setup, sorry."
+	exit
+fi
+
+# Check that we have enough memory. Skip the check if we appear to be
+# running inside of Vagrant, because that's really just for testing.
+TOTAL_PHYSICAL_MEM=$(free -m | grep ^Mem: | sed "s/^Mem: *\([0-9]*\).*/\1/")
+if [ $TOTAL_PHYSICAL_MEM -lt 768 ]; then
+if [ ! -d /vagrant ]; then
+	echo "Your Mail-in-a-Box needs more than $TOTAL_PHYSICAL_MEM MB RAM."
+	echo "Please provision a machine with at least 768 MB, 1 GB recommended."
+	exit
+fi
+fi
+
+if [ -t 0 ]; then
+	# In an interactive shell...
+	echo
+	echo "Hello and thanks for deploying a Mail-in-a-Box!"
+	echo "-----------------------------------------------"
+	echo
+	echo "I'm going to ask you a few questions. To change your answers later,"
+	echo "later, just re-run this script."
+fi
 
 # Recall the last settings used if we're running this a second time.
 if [ -f /etc/mailinabox.conf ]; then
 	# Run any system migrations before proceeding. Since this is a second run,
 	# we assume we have Python already installed.
-	setup/migrate.py --migrate || exit 1
+	echo
+	setup/migrate.py --migrate
 
-	# Load the old .conf file to get existing configuration options loaded
+	# Okay now load the old .conf file to get existing configuration options.
-	# into variables with a DEFAULT_ prefix.
 	cat /etc/mailinabox.conf | sed s/^/DEFAULT_/ > /tmp/mailinabox.prev.conf
 	source /tmp/mailinabox.prev.conf
-	rm -f /tmp/mailinabox.prev.conf
+	MIGRATIONID=$DEFAULT_MIGRATIONID
+else
+	# What migration are we at for new installs?
+	MIGRATIONID=$(setup/migrate.py --current)
 fi
 
-# Put a start script in a global location. We tell the user to run 'mailinabox'
+# The box needs a name.
-# in the first dialog prompt, so we should do this before that starts.
+if [ -z "$PRIMARY_HOSTNAME" ]; then
-cat > /usr/local/bin/mailinabox << EOF;
+	if [ -z "$DEFAULT_PRIMARY_HOSTNAME" ]; then
-#!/bin/bash
+		# This is the first run. Ask the user for his email address so we can
-cd `pwd`
+		# provide the best default for the box's hostname.
-source setup/start.sh
+		echo
-EOF
+		echo "What email address are you setting this box up to manage?"
-chmod +x /usr/local/bin/mailinabox
+		echo ""
+		echo "The part after the @-sign must be a domain name or subdomain"
+		echo "that you control. You can add other email addresses to this"
+		echo "box later (including email addresses on other domain names"
+		echo "or subdomains you control)."
+		echo
+		echo "We've guessed an email address. Backspace it and type in what"
+		echo "you really want."
+		echo
+		read -e -i "me@`get_default_hostname`" -p "Email Address: " EMAIL_ADDR
 
-# Ask the user for the PRIMARY_HOSTNAME, PUBLIC_IP, PUBLIC_IPV6, and CSR_COUNTRY
+		while ! management/mailconfig.py validate-email "$EMAIL_ADDR"
-# if values have not already been set in environment variables. When running
+		do
-# non-interactively, be sure to set values for all! Also sets STORAGE_USER and
+		   echo "That's not a valid email address."
-# STORAGE_ROOT.
+		   echo
-source setup/questions.sh
+		read -e -i "$EMAIL_ADDR" -p "Email Address: " EMAIL_ADDR
+		done
 
-# Run some network checks to make sure setup on this machine makes sense.
+		# Take the part after the @-sign as the user's domain name, and add
-# Skip on existing installs since we don't want this to block the ability to
+		# 'box.' to the beginning to create a default hostname for this machine.
-# upgrade, and these checks are also in the control panel status checks.
+		DEFAULT_PRIMARY_HOSTNAME=box.$(echo $EMAIL_ADDR | sed 's/.*@//')
-if [ -z "$DEFAULT_PRIMARY_HOSTNAME" ]; then
+	fi
-if [ -z "$SKIP_NETWORK_CHECKS" ]; then
+
-	source setup/network-checks.sh
+	echo
-fi
+	echo "This box needs a name, called a 'hostname'. The name will form a part"
+	echo "of the box's web address."
+	echo
+	echo "We recommend that the name be a subdomain of the domain in your email"
+	echo "address, so we're suggesting $DEFAULT_PRIMARY_HOSTNAME."
+	echo
+	echo "You can change it, but we recommend you don't."
+	echo
+
+	read -e -i "$DEFAULT_PRIMARY_HOSTNAME" -p "Hostname: " PRIMARY_HOSTNAME
 fi
 
-# Create the STORAGE_USER and STORAGE_ROOT directory if they don't already exist.
+# If the machine is behind a NAT, inside a VM, etc., it may not know
-# If the STORAGE_ROOT is missing the mailinabox.version file that lists a
+# its IP address on the public network / the Internet. We need to
-# migration (schema) number for the files stored there, assume this is a fresh
+# confirm our best guess with the user.
-# installation to that directory and write the file to contain the current
+if [ -z "$PUBLIC_IP" ]; then
-# migration number for this version of Mail-in-a-Box.
+	if [ -z "$DEFAULT_PUBLIC_IP" ]; then
-if ! id -u $STORAGE_USER >/dev/null 2>&1; then
+		# set a default on first run
-	useradd -m $STORAGE_USER
+		DEFAULT_PUBLIC_IP=`get_default_publicip`
+	fi
+
+	echo
+	echo "Enter the public IP address of this machine, as given to you by your"
+	echo "ISP. We've guessed a value, but just backspace it if it's wrong."
+	echo
+
+	read -e -i "$DEFAULT_PUBLIC_IP" -p "Public IP: " PUBLIC_IP
 fi
-if [ ! -d $STORAGE_ROOT ]; then
+
+# Same for IPv6.
+if [ -z "$PUBLIC_IPV6" ]; then
+	if [ -z "$DEFAULT_PUBLIC_IPV6" ]; then
+		# set a default on first run
+		DEFAULT_PUBLIC_IPV6=`get_default_publicipv6`
+	fi
+
+	echo
+	echo "(Optional) Enter the IPv6 address of this machine. Leave blank"
+	echo "           if the machine does not have an IPv6 address."
+
+	read -e -i "$DEFAULT_PUBLIC_IPV6" -p "Public IPv6: " PUBLIC_IPV6
+fi
+
+# We need a country code to generate a certificate signing request. However
+# if a CSR already exists then we won't be generating a new one and there's
+# no reason to ask for the country code now. $STORAGE_ROOT has not yet been
+# set so we'll check if $DEFAULT_STORAGE_ROOT and $DEFAULT_CSR_COUNTRY are
+# set (the values from the current mailinabox.conf) and if the CSR exists
+# in the expected location.
+if [ ! -z "$DEFAULT_STORAGE_ROOT" ] && [ ! -z "$DEFAULT_CSR_COUNTRY" ] && [ -f $DEFAULT_STORAGE_ROOT/ssl/ssl_cert_sign_req.csr ]; then
+	CSR_COUNTRY=$DEFAULT_CSR_COUNTRY
+fi
+if [ -z "$CSR_COUNTRY" ]; then
+	echo
+	echo "Enter the two-letter, uppercase country code for where you"
+	echo "live or where your organization is based. (This is used to"
+	echo "create an SSL certificate.)"
+	echo
+
+	#if [ -z "$DEFAULT_CSR_COUNTRY" ]; then
+	#	# set a default on first run
+	#	DEFAULT_CSR_COUNTRY=...?
+	#fi
+
+	read -e -i "$DEFAULT_CSR_COUNTRY" -p "Country Code: " CSR_COUNTRY
+fi
+
+# Automatic configuration, e.g. as used in our Vagrant configuration.
+if [ "$PUBLIC_IP" = "auto" ]; then
+	# Use a public API to get our public IP address.
+	PUBLIC_IP=`get_default_publicip`
+	echo "IP Address: $PUBLIC_IP"
+fi
+if [ "$PUBLIC_IPV6" = "auto" ]; then
+	# Use a public API to get our public IP address.
+	PUBLIC_IPV6=`get_default_publicipv6`
+	echo "IPv6 Address: $PUBLIC_IPV6"
+fi
+if [ "$PRIMARY_HOSTNAME" = "auto-easy" ]; then
+	# Generate a probably-unique subdomain under our justtesting.email domain.
+	PRIMARY_HOSTNAME=m`get_default_publicip | sha1sum | cut -c1-5`.justtesting.email
+	echo "Primary Hostname: $PRIMARY_HOSTNAME"
+fi
+
+
+# Create the user named "user-data" and store all persistent user
+# data (mailboxes, etc.) in that user's home directory.
+if [ -z "$STORAGE_ROOT" ]; then
+	STORAGE_USER=user-data
+	if [ ! -d /home/$STORAGE_USER ]; then useradd -m $STORAGE_USER; fi
+	STORAGE_ROOT=/home/$STORAGE_USER
 	mkdir -p $STORAGE_ROOT
 fi
-if [ ! -f $STORAGE_ROOT/mailinabox.version ]; then
-	echo $(setup/migrate.py --current) > $STORAGE_ROOT/mailinabox.version
-	chown $STORAGE_USER.$STORAGE_USER $STORAGE_ROOT/mailinabox.version
-fi
-
 
 # Save the global options in /etc/mailinabox.conf so that standalone
 # tools know where to look for data.
@@ -85,64 +195,61 @@ STORAGE_ROOT=$STORAGE_ROOT
 PRIMARY_HOSTNAME=$PRIMARY_HOSTNAME
 PUBLIC_IP=$PUBLIC_IP
 PUBLIC_IPV6=$PUBLIC_IPV6
-PRIVATE_IP=$PRIVATE_IP
-PRIVATE_IPV6=$PRIVATE_IPV6
 CSR_COUNTRY=$CSR_COUNTRY
+MIGRATIONID=$MIGRATIONID
 EOF
 
 # Start service configuration.
-source setup/system.sh
+. setup/system.sh
-source setup/ssl.sh
+. setup/ssl.sh
-source setup/dns.sh
+. setup/dns.sh
-source setup/mail-postfix.sh
+. setup/mail-postfix.sh
-source setup/mail-dovecot.sh
+. setup/mail-dovecot.sh
-source setup/mail-users.sh
+. setup/mail-users.sh
-source setup/dkim.sh
+. setup/dkim.sh
-source setup/spamassassin.sh
+. setup/spamassassin.sh
-source setup/web.sh
+. setup/web.sh
-source setup/webmail.sh
+. setup/webmail.sh
-source setup/owncloud.sh
+. setup/zpush.sh
-source setup/zpush.sh
+. setup/management.sh
-source setup/management.sh
-source setup/munin.sh
 
-# Ping the management daemon to write the DNS and nginx configuration files.
+# Write the DNS and nginx configuration files.
-until nc -z -w 4 localhost 10222
+sleep 5 # wait for the daemon to start
-do
+curl -s -d POSTDATA --user $(</var/lib/mailinabox/api.key): http://127.0.0.1:10222/dns/update
-	echo Waiting for the Mail-in-a-Box management daemon to start...
+curl -s -d POSTDATA --user $(</var/lib/mailinabox/api.key): http://127.0.0.1:10222/web/update
-	sleep 2
-done
-tools/dns_update
-tools/web_update
 
 # If there aren't any mail users yet, create one.
-source setup/firstuser.sh
+if [ -z "`tools/mail.py user`" ]; then
+	# The outut of "tools/mail.py user" is a list of mail users. If there
+	# aren't any yet, it'll be empty.
 
-# Done.
+	# If we didn't ask for an email address at the start, do so now.
-echo
+	if [ -z "$EMAIL_ADDR" ]; then
-echo "-----------------------------------------------"
+		# In an interactive shell, ask the user for an email address.
-echo
+		if [ -t 0 ]; then
-echo Your Mail-in-a-Box is running.
+			echo
-echo
+			echo "Let's create your first mail user."
-echo Please log in to the control panel for further instructions at:
+			read -e -i "user@$PRIMARY_HOSTNAME" -p "Email Address: " EMAIL_ADDR
-echo
+
-if management/status_checks.py --check-primary-hostname; then
+		# But in a non-interactive shell, just make something up. This
-	# Show the nice URL if it appears to be resolving and has a valid certificate.
+		# is normally for testing.
-	echo https://$PRIMARY_HOSTNAME/admin
+		else
-	echo
+			# Use me@PRIMARY_HOSTNAME
-	echo "If you have a DNS problem put the box's IP address in the URL"
+			EMAIL_ADDR=me@$PRIMARY_HOSTNAME
-	echo "(https://$PUBLIC_IP/admin) but then check the SSL fingerprint:"
+			EMAIL_PW=1234
-	openssl x509 -in $STORAGE_ROOT/ssl/ssl_certificate.pem -noout -fingerprint \
+			echo
-        	| sed "s/SHA1 Fingerprint=//"
+			echo "Creating a new mail account for $EMAIL_ADDR with password $EMAIL_PW."
-else
+			echo
-	echo https://$PUBLIC_IP/admin
+		fi
-	echo
+	else
-	echo You will be alerted that the website has an invalid certificate. Check that
+		echo
-	echo the certificate fingerprint matches:
+		echo "Okay. I'm about to set up $EMAIL_ADDR for you."
-	echo
+	fi
-	openssl x509 -in $STORAGE_ROOT/ssl/ssl_certificate.pem -noout -fingerprint \
+
-        	| sed "s/SHA1 Fingerprint=//"
+	# Create the user's mail account. This will ask for a password if none was given above.
-	echo
+	tools/mail.py user add $EMAIL_ADDR $EMAIL_PW
-	echo Then you can confirm the security exception and continue.
+
-	echo
+	# Create an alias to which we'll direct all automatically-created administrative aliases.
+	tools/mail.py alias add administrator@$PRIMARY_HOSTNAME $EMAIL_ADDR
 fi
+

setup/system.sh

@@ -1,123 +1,62 @@
 source setup/functions.sh # load our functions
 
-# Basic System Configuration
+# Base system configuration.
-# -------------------------
-
-# ### Add Mail-in-a-Box's PPA.
-
-# We've built several .deb packages on our own that we want to include.
-# One is a replacement for Ubuntu's stock postgrey package that makes
-# some enhancements. The other is dovecot-lucene, a Lucene-based full
-# text search plugin for (and by) dovecot, which is not available in
-# Ubuntu currently.
-#
-# Add that to the system's list of repositories using add-apt-repository.
-# But add-apt-repository may not be installed. If it's not available,
-# then install it. But we have to run apt-get update before we try to
-# install anything so the package index is up to date. After adding the
-# PPA, we have to run apt-get update *again* to load the PPA's index,
-# so this must precede the apt-get update line below.
-
-if [ ! -f /usr/bin/add-apt-repository ]; then
-	echo "Installing add-apt-repository..."
-	hide_output apt-get update
-	apt_install software-properties-common
-fi
-
-hide_output add-apt-repository -y ppa:mail-in-a-box/ppa
-
-# ### Update Packages
-
-# Update system packages to make sure we have the latest upstream versions of things from Ubuntu.
 
 echo Updating system packages...
 hide_output apt-get update
-apt_get_quiet upgrade
+hide_output apt-get -y upgrade
-
-# ### Install System Packages
 
 # Install basic utilities.
 #
-# * haveged: Provides extra entropy to /dev/random so it doesn't stall
+#	haveged: Provides extra entropy to /dev/random so it doesn't stall
 #	         when generating random numbers for private keys (e.g. during
 #	         ldns-keygen).
-# * unattended-upgrades: Apt tool to install security updates automatically.
-# * cron: Runs background processes periodically.
-# * ntp: keeps the system time correct
-# * fail2ban: scans log files for repeated failed login attempts and blocks the remote IP at the firewall
-# * netcat-openbsd: `nc` command line networking tool
-# * git: we install some things directly from github
-# * sudo: allows privileged users to execute commands as root without being root
-# * coreutils: includes `nproc` tool to report number of processors, mktemp
-# * bc: allows us to do math to compute sane defaults
 
-echo Installing system packages...
+apt_install python3 python3-pip wget curl bind9-host haveged
-apt_install python3 python3-dev python3-pip \
-	netcat-openbsd wget curl git sudo coreutils bc \
-	haveged unattended-upgrades cron ntp fail2ban
 
-# Allow apt to install system updates automatically every day.
+# Turn on basic services:
-
-cat > /etc/apt/apt.conf.d/02periodic <<EOF;
-APT::Periodic::MaxAge "7";
-APT::Periodic::Update-Package-Lists "1";
-APT::Periodic::Unattended-Upgrade "1";
-APT::Periodic::Verbose "1";
-EOF
-
-# ### Firewall
-
-# Various virtualized environments like Docker and some VPSs don't provide #NODOC
-# a kernel that supports iptables. To avoid error-like output in these cases, #NODOC
-# we skip this if the user sets DISABLE_FIREWALL=1. #NODOC
-if [ -z "$DISABLE_FIREWALL" ]; then
-	# Install `ufw` which provides a simple firewall configuration.
-	apt_install ufw
-
-	# Allow incoming connections to SSH.
-	ufw_allow ssh;
-
-	# ssh might be running on an alternate port. Use sshd -T to dump sshd's #NODOC
-	# settings, find the port it is supposedly running on, and open that port #NODOC
-	# too. #NODOC
-	SSH_PORT=$(sshd -T 2>/dev/null | grep "^port " | sed "s/port //") #NODOC
-	if [ ! -z "$SSH_PORT" ]; then
-	if [ "$SSH_PORT" != "22" ]; then
-
-	echo Opening alternate SSH port $SSH_PORT. #NODOC
-	ufw_allow $SSH_PORT #NODOC
-
-	fi
-	fi
-
-	ufw --force enable;
-fi #NODOC
-
-# ### Local DNS Service
-
-# Install a local DNS server, rather than using the DNS server provided by the
-# ISP's network configuration.
 #
-# We do this to ensure that DNS queries
+#   ntp: keeps the system time correct
+#
+#   fail2ban: scans log files for repeated failed login attempts and blocks the remote IP at the firewall
+#
+# These services don't need further configuration and are started immediately after installation.
+
+apt_install ntp fail2ban
+
+if [ -z "$DISABLE_FIREWALL" ]; then
+	# Turn on the firewall. First allow incoming SSH, then turn on the firewall.
+	# Other ports will be opened at the point where we set up those services.
+	#
+	# Various virtualized environments like Docker and some VPSs don't provide
+	# a kernel that supports iptables. To avoid error-like output in these cases,
+	# let us disable the firewall.
+	apt_install ufw
+	ufw_allow ssh;
+	ufw --force enable;
+fi
+
+# Resolve DNS using bind9 locally, rather than whatever DNS server is supplied
+# by the machine's network configuration. We do this to ensure that DNS queries
 # that *we* make (i.e. looking up other external domains) perform DNSSEC checks.
 # We could use Google's Public DNS, but we don't want to create a dependency on
-# Google per our goals of decentralization. `bind9`, as packaged for Ubuntu, has
+# Google per our goals of decentralization. bind9, as packaged for Ubuntu, has
 # DNSSEC enabled by default via "dnssec-validation auto".
 #
-# So we'll be running `bind9` bound to 127.0.0.1 for locally-issued DNS queries
+# So we'll be running bind9 bound to 127.0.0.1 for locally-issued DNS queries
-# and `nsd` bound to the public ethernet interface for remote DNS queries asking
+# and nsd bound to the public ethernet interface for remote DNS queries asking
-# about our domain names. `nsd` is configured later.
+# about our domain names. nsd is configured in dns.sh.
 #
 # About the settings:
 #
-# * RESOLVCONF=yes will have `bind9` take over /etc/resolv.conf to tell
+# * RESOLVCONF=yes will have bind9 take over /etc/resolv.conf to tell
 #   local services that DNS queries are handled on localhost.
-# * Adding -4 to OPTIONS will have `bind9` not listen on IPv6 addresses
+# * Adding -4 to OPTIONS will have bind9 not listen on IPv6 addresses
 #   so that we're sure there's no conflict with nsd, our public domain
 #   name server, on IPV6.
-# * The listen-on directive in named.conf.options restricts `bind9` to
+# * The listen-on directive in named.conf.options restricts bind9 to
 #   binding to the loopback interface instead of all interfaces.
-apt_install bind9 resolvconf
+apt_install bind9
 tools/editconf.py /etc/default/bind9 \
 	RESOLVCONF=yes \
 	"OPTIONS=\"-u bind -4\""
@@ -125,20 +64,5 @@ if ! grep -q "listen-on " /etc/bind/named.conf.options; then
 	# Add a listen-on directive if it doesn't exist inside the options block.
 	sed -i "s/^}/\n\tlisten-on { 127.0.0.1; };\n}/" /etc/bind/named.conf.options
 fi
-if [ -f /etc/resolvconf/resolv.conf.d/original ]; then
-	echo "Archiving old resolv.conf (was /etc/resolvconf/resolv.conf.d/original, now /etc/resolvconf/resolv.conf.original)." #NODOC
-	mv /etc/resolvconf/resolv.conf.d/original /etc/resolvconf/resolv.conf.original #NODOC
-fi
-
-# Restart the DNS services.
 
 restart_service bind9
-restart_service resolvconf
-
-# ### Fail2Ban Service
-
-# Configure the Fail2Ban installation to prevent dumb bruce-force attacks against dovecot, postfix and ssh
-cp conf/fail2ban/jail.local /etc/fail2ban/jail.local
-cp conf/fail2ban/dovecotimap.conf /etc/fail2ban/filter.d/dovecotimap.conf
-
-restart_service fail2ban

setup/web.sh

@@ -5,105 +5,51 @@
 source setup/functions.sh # load our functions
 source /etc/mailinabox.conf # load global vars
 
-# Some Ubuntu images start off with Apache. Remove it since we
+apt_install nginx php5-cgi
-# will use nginx. Use autoremove to remove any Apache depenencies.
-if [ -f /usr/sbin/apache2 ]; then
-	echo Removing apache...
-	hide_output apt-get -y purge apache2 apache2-*
-	hide_output apt-get -y --purge autoremove
-fi
-
-# Install nginx and a PHP FastCGI daemon.
-#
-# Turn off nginx's default website.
-
-echo "Installing Nginx (web server)..."
-apt_install nginx php5-fpm
 
 rm -f /etc/nginx/sites-enabled/default
 
-# Copy in a nginx configuration file for common and best-practices
+# copy in a nginx configuration file for common and best-practices
-# SSL settings from @konklone. Replace STORAGE_ROOT so it can find
+# SSL settings from @konklone
-# the DH params.
+cp conf/nginx-ssl.conf /etc/nginx/nginx-ssl.conf
-rm -f /etc/nginx/nginx-ssl.conf # we used to put it here
-sed "s#STORAGE_ROOT#$STORAGE_ROOT#" \
-	conf/nginx-ssl.conf > /etc/nginx/conf.d/ssl.conf
 
 # Fix some nginx defaults.
-# The server_names_hash_bucket_size seems to prevent long domain names!
+# The server_names_hash_bucket_size seems to prevent long domain names?
-# The default, according to nginx's docs, depends on "the size of the
-# processor’s cache line." It could be as low as 32. We fixed it at
-# 64 in 2014 to accommodate a long domain name (20 characters?). But
-# even at 64, a 58-character domain name won't work (#93), so now
-# we're going up to 128.
 tools/editconf.py /etc/nginx/nginx.conf -s \
-	server_names_hash_bucket_size="128;"
+	server_names_hash_bucket_size="64;"
-
-# Tell PHP not to expose its version number in the X-Powered-By header.
-tools/editconf.py /etc/php5/fpm/php.ini -c ';' \
-	expose_php=Off
-
-# Set PHPs default charset to UTF-8, since we use it. See #367.
-tools/editconf.py /etc/php5/fpm/php.ini -c ';' \
-        default_charset="UTF-8"
-
-# Bump up PHP's max_children to support more concurrent connections
-tools/editconf.py /etc/php5/fpm/pool.d/www.conf -c ';' \
-	pm.max_children=8
 
 # Other nginx settings will be configured by the management service
 # since it depends on what domains we're serving, which we don't know
 # until mail accounts have been created.
 
-# Create the iOS/OS X Mobile Configuration file which is exposed via the
-# nginx configuration at /mailinabox-mobileconfig.
-mkdir -p /var/lib/mailinabox
-chmod a+rx /var/lib/mailinabox
-cat conf/ios-profile.xml \
-	| sed "s/PRIMARY_HOSTNAME/$PRIMARY_HOSTNAME/" \
-	| sed "s/UUID1/$(cat /proc/sys/kernel/random/uuid)/" \
-	| sed "s/UUID2/$(cat /proc/sys/kernel/random/uuid)/" \
-	| sed "s/UUID3/$(cat /proc/sys/kernel/random/uuid)/" \
-	| sed "s/UUID4/$(cat /proc/sys/kernel/random/uuid)/" \
-	 > /var/lib/mailinabox/mobileconfig.xml
-chmod a+r /var/lib/mailinabox/mobileconfig.xml
-
-# Create the Mozilla Auto-configuration file which is exposed via the
-# nginx configuration at /.well-known/autoconfig/mail/config-v1.1.xml.
-# The format of the file is documented at:
-# https://wiki.mozilla.org/Thunderbird:Autoconfiguration:ConfigFileFormat
-# and https://developer.mozilla.org/en-US/docs/Mozilla/Thunderbird/Autoconfiguration/FileFormat/HowTo.
-cat conf/mozilla-autoconfig.xml \
-	| sed "s/PRIMARY_HOSTNAME/$PRIMARY_HOSTNAME/" \
-	 > /var/lib/mailinabox/mozilla-autoconfig.xml
-chmod a+r /var/lib/mailinabox/mozilla-autoconfig.xml
-
 # make a default homepage
-if [ -d $STORAGE_ROOT/www/static ]; then mv $STORAGE_ROOT/www/static $STORAGE_ROOT/www/default; fi # migration #NODOC
+if [ -d $STORAGE_ROOT/www/static ]; then mv $STORAGE_ROOT/www/static $STORAGE_ROOT/www/default; fi # migration
 mkdir -p $STORAGE_ROOT/www/default
 if [ ! -f $STORAGE_ROOT/www/default/index.html ]; then
 	cp conf/www_default.html $STORAGE_ROOT/www/default/index.html
 fi
 chown -R $STORAGE_USER $STORAGE_ROOT/www
 
-# We previously installed a custom init script to start the PHP FastCGI daemon. #NODOC
+# Create an init script to start the PHP FastCGI daemon and keep it
-# Remove it now that we're using php5-fpm. #NODOC
+# running after a reboot. Allows us to serve Roundcube for webmail.
-if [ -L /etc/init.d/php-fastcgi ]; then
+rm -f /etc/init.d/php-fastcgi
-	echo "Removing /etc/init.d/php-fastcgi, php5-cgi..." #NODOC
+ln -s $(pwd)/conf/phpfcgi-initscript /etc/init.d/php-fastcgi
-	rm -f /etc/init.d/php-fastcgi #NODOC
+hide_output update-rc.d php-fastcgi defaults
-	hide_output update-rc.d php-fastcgi remove #NODOC
-	apt-get -y purge php5-cgi #NODOC
-fi
 
-# Remove obsoleted scripts. #NODOC
+# Put our webfinger and Exchange autodiscover.xml server scripts
-# exchange-autodiscover is now handled by Z-Push. #NODOC
+# into a well-known location.
-for f in webfinger exchange-autodiscover; do #NODOC
+for f in webfinger exchange-autodiscover; do
-	rm -f /usr/local/bin/mailinabox-$f.php #NODOC
+	cp tools/$f.php /usr/local/bin/mailinabox-$f.php
-done #NODOC
+	chown www-data.www-data /usr/local/bin/mailinabox-$f.php
+done
+
+# Make some space for users to customize their webfinger responses.
+mkdir -p $STORAGE_ROOT/webfinger/acct;
+chown -R $STORAGE_USER $STORAGE_ROOT/webfinger
 
 # Start services.
 restart_service nginx
-restart_service php5-fpm
+restart_service php-fastcgi
 
 # Open ports.
 ufw_allow http

setup/webmail.sh

@@ -1,87 +1,49 @@
-#!/bin/bash
+# Webmail: Using roundcube
-# Webmail with Roundcube
+##########################
-# ----------------------
 
 source setup/functions.sh # load our functions
 source /etc/mailinabox.conf # load global vars
 
-# ### Installing Roundcube
+# Ubuntu's roundcube-core has dependencies on Apache & MySQL, which we don't want, so we can't
-
+# install roundcube directly via apt-get install.
-# We install Roundcube from sources, rather than from Ubuntu, because:
 #
-# 1. Ubuntu's `roundcube-core` package has dependencies on Apache & MySQL, which we don't want.
+# Additionally, the Roundcube shipped with Ubuntu is consistently out of date.
 #
-# 2. The Roundcube shipped with Ubuntu is consistently out of date.
+# And it's packaged incorrectly --- it seems to be missing a directory of files.
-#
-# 3. It's packaged incorrectly --- it seems to be missing a directory of files.
 #
 # So we'll use apt-get to manually install the dependencies of roundcube that we know we need,
 # and then we'll manually install roundcube from source.
 
-# These dependencies are from `apt-cache showpkg roundcube-core`.
+# These dependencies are from 'apt-cache showpkg roundcube-core'.
-echo "Installing Roundcube (webmail)..."
 apt_install \
 	dbconfig-common \
-	php5 php5-sqlite php5-mcrypt php5-intl php5-json php5-common php-auth php-net-smtp php-net-socket php-net-sieve php-mail-mime php-mail-mimedecode php-crypt-gpg php5-gd php5-pspell \
+	php5 php5-sqlite php5-mcrypt php5-intl php5-json php5-common php-auth php-net-smtp php-net-socket php-net-sieve php-mail-mime php-crypt-gpg php5-gd php5-pspell \
 	tinymce libjs-jquery libjs-jquery-mousewheel libmagic1
 
-# We used to install Roundcube from Ubuntu, without triggering the dependencies #NODOC
+# We used to install Roundcube from Ubuntu, without triggering the dependencies
-# on Apache and MySQL, by downloading the debs and installing them manually. #NODOC
+# on Apache and MySQL, by downloading the debs and installing them manually.
-# Now that we're beyond that, get rid of those debs before installing from source. #NODOC
+# Now that we're beyond that, get rid of those debs before installing from source.
-apt-get purge -qq -y roundcube* #NODOC
+apt-get purge -qq -y roundcube*
 
-# Install Roundcube from source if it is not already present or if it is out of date.
+# Install Roundcube from source if it is not already present.
-# Combine the Roundcube version number with the commit hash of vacation_sieve to track
+# TODO: Check version?
-# whether we have the latest version.
+if [ ! -d /usr/local/lib/roundcubemail ]; then
-VERSION=1.1.2
+	rm -f /tmp/roundcube.tgz
-HASH=df88deae691da3ecf3e9f0aee674c1f3042ea1eb
+	wget -qO /tmp/roundcube.tgz http://downloads.sourceforge.net/project/roundcubemail/roundcubemail/1.0.1/roundcubemail-1.0.1.tar.gz
-VACATION_SIEVE_VERSION=91ea6f52216390073d1f5b70b5f6bea0bfaee7e5
+	tar -C /usr/local/lib -zxf /tmp/roundcube.tgz
-PERSISTENT_LOGIN_VERSION=117fbd8f93b56b2bf72ad055193464803ef3bc36
+	mv /usr/local/lib/roundcubemail-1.0.1/ /usr/local/lib/roundcubemail
-HTML5_NOTIFIER_VERSION=046eb388dd63b1ec77a3ee485757fc25ae9e684d
-UPDATE_KEY=$VERSION:$VACATION_SIEVE_VERSION:$PERSISTENT_LOGIN_VERSION:$HTML5_NOTIFIER_VERSION
-needs_update=0 #NODOC
-if [ ! -f /usr/local/lib/roundcubemail/version ]; then
-	# not installed yet #NODOC
-	needs_update=1 #NODOC
-elif [[ "$UPDATE_KEY" != `cat /usr/local/lib/roundcubemail/version` ]]; then
-	# checks if the version is what we want
-	needs_update=1 #NODOC
-fi
-if [ $needs_update == 1 ]; then
-	# install roundcube
-	wget_verify \
-		https://mailinabox.email/mirror/roundcubemail-$VERSION.tar.gz \
-		$HASH \
-		/tmp/roundcube.tgz
-	tar -C /usr/local/lib -zxf /tmp/roundcube.tgz
-	rm -rf /usr/local/lib/roundcubemail
-	mv /usr/local/lib/roundcubemail-$VERSION/ /usr/local/lib/roundcubemail
 	rm -f /tmp/roundcube.tgz
-
-	# install roundcube autoreply/vacation plugin
-	git_clone https://github.com/arodier/Roundcube-Plugins.git $VACATION_SIEVE_VERSION plugins/vacation_sieve /usr/local/lib/roundcubemail/plugins/vacation_sieve
-
-	# install roundcube persistent_login plugin
-	git_clone https://github.com/mfreiholz/Roundcube-Persistent-Login-Plugin.git $PERSISTENT_LOGIN_VERSION '' /usr/local/lib/roundcubemail/plugins/persistent_login
-
-	# install roundcube html5_notifier plugin
-	git_clone https://github.com/kitist/html5_notifier.git $HTML5_NOTIFIER_VERSION '' /usr/local/lib/roundcubemail/plugins/html5_notifier
-
-	# record the version we've installed
-	echo $UPDATE_KEY > /usr/local/lib/roundcubemail/version
 fi
 
-# ### Configuring Roundcube
-
 # Generate a safe 24-character secret key of safe characters.
-SECRET_KEY=$(dd if=/dev/random bs=1 count=18 2>/dev/null | base64 | fold -w 24 | head -n 1)
+SECRET_KEY=$(dd if=/dev/random bs=20 count=1 2>/dev/null | base64 | fold -w 24 | head -n 1)
 
 # Create a configuration file.
 #
 # For security, temp and log files are not stored in the default locations
 # which are inside the roundcube sources directory. We put them instead
 # in normal places.
-cat > /usr/local/lib/roundcubemail/config/config.inc.php <<EOF;
+cat - > /usr/local/lib/roundcubemail/config/config.inc.php <<EOF;
 <?php
 /*
  * Do not edit. Written by Mail-in-a-Box. Regenerated on updates.
@@ -100,7 +62,7 @@ cat > /usr/local/lib/roundcubemail/config/config.inc.php <<EOF;
 \$config['support_url'] = 'https://mailinabox.email/';
 \$config['product_name'] = 'Mail-in-a-Box/Roundcube Webmail';
 \$config['des_key'] = '$SECRET_KEY';
-\$config['plugins'] = array('html5_notifier', 'archive', 'zipdownload', 'password', 'managesieve', 'jqueryui', 'vacation_sieve', 'persistent_login');
+\$config['plugins'] = array('archive', 'zipdownload', 'password', 'managesieve');
 \$config['skin'] = 'classic';
 \$config['login_autocomplete'] = 2;
 \$config['password_charset'] = 'UTF-8';
@@ -108,26 +70,6 @@ cat > /usr/local/lib/roundcubemail/config/config.inc.php <<EOF;
 ?>
 EOF
 
-# Configure vaction_sieve.
-cat > /usr/local/lib/roundcubemail/plugins/vacation_sieve/config.inc.php <<EOF;
-<?php
-/* Do not edit. Written by Mail-in-a-Box. Regenerated on updates. */
-\$rcmail_config['vacation_sieve'] = array(
-    'date_format' => 'd/m/Y',
-    'working_hours' => array(8,18),
-    'msg_format' => 'text',
-    'logon_transform' => array('#([a-z])[a-z]+(\.|\s)([a-z])#i', '\$1\$3'),
-    'transfer' => array(
-        'mode' =>  'managesieve',
-        'ms_activate_script' => true,
-        'host'   => 'localhost',
-        'port'   => '4190',
-        'usetls' => false,
-        'path' => 'vacation',
-    )
-);
-EOF
-
 # Create writable directories.
 mkdir -p /var/log/roundcubemail /tmp/roundcubemail $STORAGE_ROOT/mail/roundcube
 chown -R www-data.www-data /var/log/roundcubemail /tmp/roundcubemail $STORAGE_ROOT/mail/roundcube
@@ -158,4 +100,4 @@ chmod 664 $STORAGE_ROOT/mail/users.sqlite
 
 # Enable PHP modules.
 php5enmod mcrypt
-restart_service php5-fpm
+restart_service php-fastcgi

setup/zpush.sh

@@ -1,9 +1,7 @@
 #!/bin/bash
 #
-# Z-Push: The Microsoft Exchange protocol server
+# Z-Push: The Microsoft Exchange protocol server.
-# ----------------------------------------------
+# Mostly for use on iOS which doesn't support IMAP.
-#
-# Mostly for use on iOS which doesn't support IMAP IDLE.
 #
 # Although Ubuntu ships Z-Push (as d-push) it has a dependency on Apache
 # so we won't install it that way.
@@ -15,56 +13,31 @@ source /etc/mailinabox.conf # load global vars
 
 # Prereqs.
 
-echo "Installing Z-Push (Exchange/ActiveSync server)..."
 apt_install \
-	php-soap php5-imap libawl-php php5-xsl
+	php-soap php5-imap
 
 php5enmod imap
 
 # Copy Z-Push into place.
-TARGETHASH=80cbe53de4ab8dd598d1f2af6f0a23fa396c529a
+
-needs_update=0 #NODOC
+if [ ! -d /usr/local/lib/z-push ]; then
-if [ ! -f /usr/local/lib/z-push/version ]; then
+	ZPUSH=z-push-2.1.3-1892
-	needs_update=1 #NODOC
+	wget -qO /tmp/zpush.tgz http://download.z-push.org/final/2.1/$ZPUSH.tar.gz
-elif [[ $TARGETHASH != `cat /usr/local/lib/z-push/version` ]]; then
+	tar -C /tmp -zxf /tmp/zpush.tgz
-	# checks if the version 
+	mv /tmp/$ZPUSH /usr/local/lib/z-push
-	needs_update=1 #NODOC
-fi
-if [ $needs_update == 1 ]; then
-	git_clone https://github.com/fmbiete/Z-Push-contrib $TARGETHASH '' /usr/local/lib/z-push
-	rm -f /usr/sbin/z-push-{admin,top}
 	ln -s /usr/local/lib/z-push/z-push-admin.php /usr/sbin/z-push-admin
 	ln -s /usr/local/lib/z-push/z-push-top.php /usr/sbin/z-push-top
-	echo $TARGETHASH > /usr/local/lib/z-push/version
+	rm /tmp/zpush.tgz;
 fi
 
-# Configure default config.
+# Configure. Tell is to connect to email via IMAP using SSL. Since we connect on
-sed -i "s^define('TIMEZONE', .*^define('TIMEZONE', '$(cat /etc/timezone)');^" /usr/local/lib/z-push/config.php
+# localhost, the certificate won't match (it may be self-signed and invalid anyway)
-sed -i "s/define('BACKEND_PROVIDER', .*/define('BACKEND_PROVIDER', 'BackendCombined');/" /usr/local/lib/z-push/config.php
+# so don't check the cert.
-sed -i "s/define('USE_FULLEMAIL_FOR_LOGIN', .*/define('USE_FULLEMAIL_FOR_LOGIN', true);/" /usr/local/lib/z-push/config.php
+sed -i "s/define('BACKEND_PROVIDER', .*/define('BACKEND_PROVIDER', 'BackendIMAP');/" /usr/local/lib/z-push/config.php
-sed -i "s/define('LOG_MEMORY_PROFILER', .*/define('LOG_MEMORY_PROFILER', false);/" /usr/local/lib/z-push/config.php
+#sed -i "s/define('IMAP_SERVER', .*/define('IMAP_SERVER', '$PRIMARY_HOSTNAME');/" /usr/local/lib/z-push/backend/imap/config.php
-sed -i "s/define('BUG68532FIXED', .*/define('BUG68532FIXED', false);/" /usr/local/lib/z-push/config.php
+sed -i "s/define('IMAP_PORT', .*/define('IMAP_PORT', 993);/" /usr/local/lib/z-push/backend/imap/config.php
+sed -i "s/define('IMAP_OPTIONS', .*/define('IMAP_OPTIONS', '\/ssl\/norsh\/novalidate-cert');/" /usr/local/lib/z-push/backend/imap/config.php
 
-# Configure BACKEND
-rm -f /usr/local/lib/z-push/backend/combined/config.php
-cp conf/zpush/backend_combined.php /usr/local/lib/z-push/backend/combined/config.php
-
-# Configure IMAP
-rm -f /usr/local/lib/z-push/backend/imap/config.php
-cp conf/zpush/backend_imap.php /usr/local/lib/z-push/backend/imap/config.php
-
-# Configure CardDav
-rm -f /usr/local/lib/z-push/backend/carddav/config.php
-cp conf/zpush/backend_carddav.php /usr/local/lib/z-push/backend/carddav/config.php
-
-# Configure CalDav
-rm -f /usr/local/lib/z-push/backend/caldav/config.php
-cp conf/zpush/backend_caldav.php /usr/local/lib/z-push/backend/caldav/config.php
-
-# Configure Autodiscover
-rm -f /usr/local/lib/z-push/autodiscover/config.php
-cp conf/zpush/autodiscover_config.php /usr/local/lib/z-push/autodiscover/config.php
-sed -i "s/PRIMARY_HOSTNAME/$PRIMARY_HOSTNAME/" /usr/local/lib/z-push/autodiscover/config.php
 
 # Some directories it will use.
 
@@ -77,4 +50,4 @@ chown www-data:www-data /var/lib/z-push
 
 # Restart service.
 
-restart_service php5-fpm
+restart_service php-fastcgi

tests/tls.py

@@ -1,164 +0,0 @@
-#!/usr/bin/python3
-
-# Runs SSLyze on the TLS endpoints of a box and outputs
-# the results so we can inspect the settings and compare
-# against a known good version in tls_results.txt.
-#
-# Make sure you have SSLyze available:
-# wget https://github.com/nabla-c0d3/sslyze/releases/download/release-0.11/sslyze-0_11-linux64.zip
-# unzip sslyze-0_11-linux64.zip
-#
-# Then run:
-#
-# python3 tls.py yourservername
-#
-# If you are on a residential network that blocks outbound
-# port 25 connections, then you can proxy the connections
-# through some other host you can ssh into (maybe the box
-# itself?):
-#
-# python3 --proxy user@ssh_host yourservername
-#
-# (This will launch "ssh -N -L10023:yourservername:testport user@ssh_host"
-# to create a tunnel.)
-
-import sys, subprocess, re, time, json, csv, io, urllib.request
-
-######################################################################
-
-# PARSE COMMAND LINE
-
-proxy = None
-args = list(sys.argv[1:])
-while len(args) > 0:
-	if args[0] == "--proxy":
-		args.pop(0)
-		proxy = args.pop(0)
-	break
-
-if len(args) == 0:
-	print("Usage: python3 tls.py [--proxy ssh_host] hostname")
-	sys.exit(0)
-
-host = args[0]
-
-######################################################################
-
-SSLYZE = "sslyze-0_11-linux64/sslyze/sslyze.py"
-
-common_opts = ["--sslv2", "--sslv3", "--tlsv1", "--tlsv1_1", "--tlsv1_2", "--reneg", "--resum",
-	"--hide_rejected_ciphers", "--compression", "--heartbleed"]
-
-# Recommendations from Mozilla as of May 20, 2015 at
-# https://wiki.mozilla.org/Security/Server_Side_TLS.
-#
-# The 'modern' ciphers support Firefox 27, Chrome 22, IE 11,
-# Opera 14, Safari 7, Android 4.4, Java 8. Assumes TLSv1.1,
-# TLSv1.2 only, though we may also be allowing TLSv3.
-#
-# The 'intermediate' ciphers support Firefox 1, Chrome 1, IE 7,
-# Opera 5, Safari 1, Windows XP IE8, Android 2.3, Java 7.
-# Assumes TLSv1, TLSv1.1, TLSv1.2.
-#
-# The 'old' ciphers bring compatibility back to Win XP IE 6.
-MOZILLA_CIPHERS_MODERN = "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!3DES:!MD5:!PSK"
-MOZILLA_CIPHERS_INTERMEDIATE = "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA"
-MOZILLA_CIPHERS_OLD = "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:ECDHE-RSA-DES-CBC3-SHA:ECDHE-ECDSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:DES-CBC3-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA"
-
-######################################################################
-
-def sslyze(opts, port, ok_ciphers):
-	# Print header.
-	header = ("PORT %d" % port)
-	print(header)
-	print("-" * (len(header)))
-
-	# What ciphers should we expect?
-	ok_ciphers = subprocess.check_output(["openssl", "ciphers", ok_ciphers]).decode("utf8").strip().split(":")
-
-	# Form the SSLyze connection string.
-	connection_string = host + ":" + str(port)
-
-	# Proxy via SSH.
-	proxy_proc = None
-	if proxy:
-		connection_string = "localhost:10023"
-		proxy_proc = subprocess.Popen(["ssh", "-N", "-L10023:%s:%d" % (host, port), proxy])
-		time.sleep(3)
-
-	try:
-		# Execute SSLyze.
-		out = subprocess.check_output([SSLYZE] + common_opts + opts + [connection_string])
-		out = out.decode("utf8")
-
-		# Trim output to make better for storing in git.
-		if "SCAN RESULTS FOR" not in out:
-			# Failed. Just output the error.
-			out = re.sub("[\w\W]*CHECKING HOST\(S\) AVAILABILITY\n\s*-+\n", "", out) # chop off header that shows the host we queried
-		out = re.sub("[\w\W]*SCAN RESULTS FOR.*\n\s*-+\n", "", out) # chop off header that shows the host we queried
-		out = re.sub("SCAN COMPLETED IN .*", "", out)
-		out = out.rstrip(" \n-") + "\n"
-
-		# Print.
-		print(out)
-
-		# Pull out the accepted ciphers list for each SSL/TLS protocol
-		# version outputted.
-		accepted_ciphers = set()
-		for ciphers in re.findall(" Accepted:([\w\W]*?)\n *\n", out):
-			accepted_ciphers |= set(re.findall("\n\s*(\S*)", ciphers))
-
-		# Compare to what Mozilla recommends, for a given modernness-level.
-		print("  Should Not Offer: " + (", ".join(sorted(accepted_ciphers-set(ok_ciphers))) or "(none -- good)"))
-		print("  Could Also Offer: " + (", ".join(sorted(set(ok_ciphers)-accepted_ciphers)) or "(none -- good)"))
-
-		# What clients does that mean we support on this protocol?
-		supported_clients = { }
-		for cipher in accepted_ciphers:
-			if cipher in cipher_clients:
-				for client in cipher_clients[cipher]:
-					supported_clients[client] = supported_clients.get(client, 0) + 1
-		print("  Supported Clients: " + (", ".join(sorted(supported_clients.keys(), key = lambda client : -supported_clients[client]))))
-
-		# Blank line.
-		print()
-
-	finally:
-		if proxy_proc:
-			proxy_proc.terminate()
-			try:
-				proxy_proc.wait(5)
-			except TimeoutExpired:
-				proxy_proc.kill()
-
-# Get a list of OpenSSL cipher names.
-cipher_names = { }
-for cipher in csv.DictReader(io.StringIO(urllib.request.urlopen("https://raw.githubusercontent.com/mail-in-a-box/user-agent-tls-capabilities/master/cipher_names.csv").read().decode("utf8"))):
-	# not sure why there are some multi-line values, use first line:
-	cipher["OpenSSL"] = cipher["OpenSSL"].split("\n")[0]
-	cipher_names[cipher["IANA"]] = cipher["OpenSSL"]
-
-# Get a list of what clients support what ciphers, using OpenSSL cipher names.
-client_compatibility = json.loads(urllib.request.urlopen("https://raw.githubusercontent.com/mail-in-a-box/user-agent-tls-capabilities/master/clients.json").read().decode("utf8"))
-cipher_clients = { }
-for client in client_compatibility:
-	if len(set(client['protocols']) & set(["TLS 1.0", "TLS 1.1", "TLS 1.2"])) == 0: continue # does not support TLS
-	for cipher in client['ciphers']:
-		cipher_clients.setdefault(cipher_names.get(cipher), set()).add("/".join(x for x in [client['client']['name'], client['client']['version'], client['client']['platform']] if x))
-
-# Run SSLyze on various ports.
-
-# SMTP
-sslyze(["--starttls=smtp"], 25, MOZILLA_CIPHERS_OLD)
-
-# SMTP Submission
-sslyze(["--starttls=smtp"], 587, MOZILLA_CIPHERS_MODERN)
-
-# HTTPS
-sslyze(["--http_get", "--chrome_sha1", "--hsts"], 443, MOZILLA_CIPHERS_INTERMEDIATE)
-
-# IMAP
-sslyze([], 993, MOZILLA_CIPHERS_MODERN)
-
-# POP3
-sslyze([], 995, MOZILLA_CIPHERS_MODERN)

tests/tls_results.txt

@@ -1,431 +0,0 @@
-PORT 25
--------
-
-  * Deflate Compression:
-      OK - Compression disabled          
-
-  * Session Renegotiation:
-      Client-initiated Renegotiations:   VULNERABLE - Server honors client-initiated renegotiations
-      Secure Renegotiation:              OK - Supported
-
-  * OpenSSL Heartbleed:
-      OK - Not vulnerable to Heartbleed  
-
-  * Session Resumption:
-      With Session IDs:                  OK - Supported (5 successful, 0 failed, 0 errors, 5 total attempts).
-      With TLS Session Tickets:          NOT SUPPORTED - TLS ticket not assigned.
-
-  * SSLV2 Cipher Suites:
-      Server rejected all cipher suites.
-
-  * TLSV1_2 Cipher Suites:
-      Preferred:                       
-                 ECDHE-RSA-AES256-GCM-SHA384   ECDH-256 bits  256 bits      250 2.0.0 Ok                       
-      Accepted:                        
-                 ECDHE-RSA-AES256-SHA384       ECDH-256 bits  256 bits      250 2.0.0 Ok                       
-                 ECDHE-RSA-AES256-SHA          ECDH-256 bits  256 bits      250 2.0.0 Ok                       
-                 ECDHE-RSA-AES256-GCM-SHA384   ECDH-256 bits  256 bits      250 2.0.0 Ok                       
-                 DHE-RSA-CAMELLIA256-SHA       DH-2048 bits   256 bits      250 2.0.0 Ok                       
-                 DHE-RSA-AES256-SHA256         DH-2048 bits   256 bits      250 2.0.0 Ok                       
-                 DHE-RSA-AES256-SHA            DH-2048 bits   256 bits      250 2.0.0 Ok                       
-                 DHE-RSA-AES256-GCM-SHA384     DH-2048 bits   256 bits      250 2.0.0 Ok                       
-                 CAMELLIA256-SHA               -              256 bits      250 2.0.0 Ok                       
-                 AES256-SHA256                 -              256 bits      250 2.0.0 Ok                       
-                 AES256-SHA                    -              256 bits      250 2.0.0 Ok                       
-                 AES256-GCM-SHA384             -              256 bits      250 2.0.0 Ok                       
-                 ECDHE-RSA-RC4-SHA             ECDH-256 bits  128 bits      250 2.0.0 Ok                       
-                 ECDHE-RSA-AES128-SHA256       ECDH-256 bits  128 bits      250 2.0.0 Ok                       
-                 ECDHE-RSA-AES128-SHA          ECDH-256 bits  128 bits      250 2.0.0 Ok                       
-                 ECDHE-RSA-AES128-GCM-SHA256   ECDH-256 bits  128 bits      250 2.0.0 Ok                       
-                 DHE-RSA-SEED-SHA              DH-2048 bits   128 bits      250 2.0.0 Ok                       
-                 DHE-RSA-CAMELLIA128-SHA       DH-2048 bits   128 bits      250 2.0.0 Ok                       
-                 DHE-RSA-AES128-SHA256         DH-2048 bits   128 bits      250 2.0.0 Ok                       
-                 DHE-RSA-AES128-SHA            DH-2048 bits   128 bits      250 2.0.0 Ok                       
-                 DHE-RSA-AES128-GCM-SHA256     DH-2048 bits   128 bits      250 2.0.0 Ok                       
-                 SEED-SHA                      -              128 bits      250 2.0.0 Ok                       
-                 RC4-SHA                       -              128 bits      250 2.0.0 Ok                       
-                 RC4-MD5                       -              128 bits      250 2.0.0 Ok                       
-                 CAMELLIA128-SHA               -              128 bits      250 2.0.0 Ok                       
-                 AES128-SHA256                 -              128 bits      250 2.0.0 Ok                       
-                 AES128-SHA                    -              128 bits      250 2.0.0 Ok                       
-                 AES128-GCM-SHA256             -              128 bits      250 2.0.0 Ok                       
-                 ECDHE-RSA-DES-CBC3-SHA        ECDH-256 bits  112 bits      250 2.0.0 Ok                       
-                 EDH-RSA-DES-CBC3-SHA          DH-2048 bits   112 bits      250 2.0.0 Ok                       
-                 DES-CBC3-SHA                  -              112 bits      250 2.0.0 Ok                       
-
-  * TLSV1_1 Cipher Suites:
-      Preferred:                       
-                 ECDHE-RSA-AES256-SHA          ECDH-256 bits  256 bits      250 2.0.0 Ok                       
-      Accepted:                        
-                 ECDHE-RSA-AES256-SHA          ECDH-256 bits  256 bits      250 2.0.0 Ok                       
-                 DHE-RSA-CAMELLIA256-SHA       DH-2048 bits   256 bits      250 2.0.0 Ok                       
-                 DHE-RSA-AES256-SHA            DH-2048 bits   256 bits      250 2.0.0 Ok                       
-                 CAMELLIA256-SHA               -              256 bits      250 2.0.0 Ok                       
-                 AES256-SHA                    -              256 bits      250 2.0.0 Ok                       
-                 ECDHE-RSA-RC4-SHA             ECDH-256 bits  128 bits      250 2.0.0 Ok                       
-                 ECDHE-RSA-AES128-SHA          ECDH-256 bits  128 bits      250 2.0.0 Ok                       
-                 DHE-RSA-SEED-SHA              DH-2048 bits   128 bits      250 2.0.0 Ok                       
-                 DHE-RSA-CAMELLIA128-SHA       DH-2048 bits   128 bits      250 2.0.0 Ok                       
-                 DHE-RSA-AES128-SHA            DH-2048 bits   128 bits      250 2.0.0 Ok                       
-                 SEED-SHA                      -              128 bits      250 2.0.0 Ok                       
-                 RC4-SHA                       -              128 bits      250 2.0.0 Ok                       
-                 RC4-MD5                       -              128 bits      250 2.0.0 Ok                       
-                 CAMELLIA128-SHA               -              128 bits      250 2.0.0 Ok                       
-                 AES128-SHA                    -              128 bits      250 2.0.0 Ok                       
-                 ECDHE-RSA-DES-CBC3-SHA        ECDH-256 bits  112 bits      250 2.0.0 Ok                       
-                 EDH-RSA-DES-CBC3-SHA          DH-2048 bits   112 bits      250 2.0.0 Ok                       
-                 DES-CBC3-SHA                  -              112 bits      250 2.0.0 Ok                       
-
-  * SSLV3 Cipher Suites:
-      Preferred:                       
-                 ECDHE-RSA-AES256-SHA          ECDH-256 bits  256 bits      250 2.0.0 Ok                       
-      Accepted:                        
-                 ECDHE-RSA-AES256-SHA          ECDH-256 bits  256 bits      250 2.0.0 Ok                       
-                 DHE-RSA-CAMELLIA256-SHA       DH-2048 bits   256 bits      250 2.0.0 Ok                       
-                 DHE-RSA-AES256-SHA            DH-2048 bits   256 bits      250 2.0.0 Ok                       
-                 CAMELLIA256-SHA               -              256 bits      250 2.0.0 Ok                       
-                 AES256-SHA                    -              256 bits      250 2.0.0 Ok                       
-                 ECDHE-RSA-RC4-SHA             ECDH-256 bits  128 bits      250 2.0.0 Ok                       
-                 ECDHE-RSA-AES128-SHA          ECDH-256 bits  128 bits      250 2.0.0 Ok                       
-                 DHE-RSA-SEED-SHA              DH-2048 bits   128 bits      250 2.0.0 Ok                       
-                 DHE-RSA-CAMELLIA128-SHA       DH-2048 bits   128 bits      250 2.0.0 Ok                       
-                 DHE-RSA-AES128-SHA            DH-2048 bits   128 bits      250 2.0.0 Ok                       
-                 SEED-SHA                      -              128 bits      250 2.0.0 Ok                       
-                 RC4-SHA                       -              128 bits      250 2.0.0 Ok                       
-                 RC4-MD5                       -              128 bits      250 2.0.0 Ok                       
-                 CAMELLIA128-SHA               -              128 bits      250 2.0.0 Ok                       
-                 AES128-SHA                    -              128 bits      250 2.0.0 Ok                       
-                 ECDHE-RSA-DES-CBC3-SHA        ECDH-256 bits  112 bits      250 2.0.0 Ok                       
-                 EDH-RSA-DES-CBC3-SHA          DH-2048 bits   112 bits      250 2.0.0 Ok                       
-                 DES-CBC3-SHA                  -              112 bits      250 2.0.0 Ok                       
-
-  * TLSV1 Cipher Suites:
-      Preferred:                       
-                 ECDHE-RSA-AES256-SHA          ECDH-256 bits  256 bits      250 2.0.0 Ok                       
-      Accepted:                        
-                 ECDHE-RSA-AES256-SHA          ECDH-256 bits  256 bits      250 2.0.0 Ok                       
-                 DHE-RSA-CAMELLIA256-SHA       DH-2048 bits   256 bits      250 2.0.0 Ok                       
-                 DHE-RSA-AES256-SHA            DH-2048 bits   256 bits      250 2.0.0 Ok                       
-                 CAMELLIA256-SHA               -              256 bits      250 2.0.0 Ok                       
-                 AES256-SHA                    -              256 bits      250 2.0.0 Ok                       
-                 ECDHE-RSA-RC4-SHA             ECDH-256 bits  128 bits      250 2.0.0 Ok                       
-                 ECDHE-RSA-AES128-SHA          ECDH-256 bits  128 bits      250 2.0.0 Ok                       
-                 DHE-RSA-SEED-SHA              DH-2048 bits   128 bits      250 2.0.0 Ok                       
-                 DHE-RSA-CAMELLIA128-SHA       DH-2048 bits   128 bits      250 2.0.0 Ok                       
-                 DHE-RSA-AES128-SHA            DH-2048 bits   128 bits      250 2.0.0 Ok                       
-                 SEED-SHA                      -              128 bits      250 2.0.0 Ok                       
-                 RC4-SHA                       -              128 bits      250 2.0.0 Ok                       
-                 RC4-MD5                       -              128 bits      250 2.0.0 Ok                       
-                 CAMELLIA128-SHA               -              128 bits      250 2.0.0 Ok                       
-                 AES128-SHA                    -              128 bits      250 2.0.0 Ok                       
-                 ECDHE-RSA-DES-CBC3-SHA        ECDH-256 bits  112 bits      250 2.0.0 Ok                       
-                 EDH-RSA-DES-CBC3-SHA          DH-2048 bits   112 bits      250 2.0.0 Ok                       
-                 DES-CBC3-SHA                  -              112 bits      250 2.0.0 Ok
-
-  Should Not Offer: DHE-RSA-SEED-SHA, ECDHE-RSA-RC4-SHA, EDH-RSA-DES-CBC3-SHA, RC4-MD5, RC4-SHA, SEED-SHA
-  Could Also Offer: DHE-DSS-AES128-GCM-SHA256, DHE-DSS-AES128-SHA, DHE-DSS-AES128-SHA256, DHE-DSS-AES256-GCM-SHA384, DHE-DSS-AES256-SHA, DHE-DSS-AES256-SHA256, DHE-DSS-CAMELLIA128-SHA, DHE-DSS-CAMELLIA256-SHA, ECDHE-ECDSA-AES128-GCM-SHA256, ECDHE-ECDSA-AES128-SHA, ECDHE-ECDSA-AES128-SHA256, ECDHE-ECDSA-AES256-GCM-SHA384, ECDHE-ECDSA-AES256-SHA, ECDHE-ECDSA-AES256-SHA384, ECDHE-ECDSA-DES-CBC3-SHA, SRP-3DES-EDE-CBC-SHA, SRP-AES-128-CBC-SHA, SRP-AES-256-CBC-SHA, SRP-DSS-3DES-EDE-CBC-SHA, SRP-DSS-AES-128-CBC-SHA, SRP-DSS-AES-256-CBC-SHA, SRP-RSA-3DES-EDE-CBC-SHA, SRP-RSA-AES-128-CBC-SHA, SRP-RSA-AES-256-CBC-SHA
-  Supported Clients: OpenSSL/1.0.2, Yahoo Slurp/Jan 2015, BingPreview/Jan 2015, OpenSSL/1.0.1l, YandexBot/Jan 2015, Android/4.4.2, Safari/8/iOS 8.1.2, Safari/7/OS X 10.9, Safari/8/OS X 10.10, Safari/7/iOS 7.1, Safari/6/iOS 6.0.1, Baidu/Jan 2015, Firefox/31.3.0 ESR/Win 7, Android/5.0.0, IE/11/Win 7, Java/8u31, Googlebot/Feb 2015, Chrome/42/OS X, IE Mobile/11/Win Phone 8.1, IE/11/Win 8.1, Android/4.0.4, Android/4.1.1, Safari/6.0.4/OS X 10.8.4, Android/4.3, Android/4.2.2, Safari/5.1.9/OS X 10.6.8, Java/7u25, OpenSSL/0.9.8y, Firefox/37/OS X, IE/7/Vista, IE/8-10/Win 7, IE Mobile/10/Win Phone 8.0, Java/6u45, Android/2.3.7, IE/8/XP
-
-PORT 587
---------
-
-  * Deflate Compression:
-      OK - Compression disabled          
-
-  * Session Renegotiation:
-      Client-initiated Renegotiations:   VULNERABLE - Server honors client-initiated renegotiations
-      Secure Renegotiation:              OK - Supported
-
-  * OpenSSL Heartbleed:
-      OK - Not vulnerable to Heartbleed  
-
-  * Session Resumption:
-      With Session IDs:                  OK - Supported (5 successful, 0 failed, 0 errors, 5 total attempts).
-      With TLS Session Tickets:          NOT SUPPORTED - TLS ticket not assigned.
-
-  * SSLV2 Cipher Suites:
-      Server rejected all cipher suites.
-
-  * TLSV1_2 Cipher Suites:
-      Preferred:                       
-                 ECDHE-RSA-AES256-GCM-SHA384   ECDH-256 bits  256 bits      250 2.0.0 Ok                       
-      Accepted:                        
-                 ECDHE-RSA-AES256-SHA384       ECDH-256 bits  256 bits      250 2.0.0 Ok                       
-                 ECDHE-RSA-AES256-SHA          ECDH-256 bits  256 bits      250 2.0.0 Ok                       
-                 ECDHE-RSA-AES256-GCM-SHA384   ECDH-256 bits  256 bits      250 2.0.0 Ok                       
-                 DHE-RSA-CAMELLIA256-SHA       DH-2048 bits   256 bits      250 2.0.0 Ok                       
-                 DHE-RSA-AES256-SHA256         DH-2048 bits   256 bits      250 2.0.0 Ok                       
-                 DHE-RSA-AES256-SHA            DH-2048 bits   256 bits      250 2.0.0 Ok                       
-                 DHE-RSA-AES256-GCM-SHA384     DH-2048 bits   256 bits      250 2.0.0 Ok                       
-                 CAMELLIA256-SHA               -              256 bits      250 2.0.0 Ok                       
-                 AES256-SHA256                 -              256 bits      250 2.0.0 Ok                       
-                 AES256-SHA                    -              256 bits      250 2.0.0 Ok                       
-                 AES256-GCM-SHA384             -              256 bits      250 2.0.0 Ok                       
-                 ECDHE-RSA-AES128-SHA256       ECDH-256 bits  128 bits      250 2.0.0 Ok                       
-                 ECDHE-RSA-AES128-SHA          ECDH-256 bits  128 bits      250 2.0.0 Ok                       
-                 ECDHE-RSA-AES128-GCM-SHA256   ECDH-256 bits  128 bits      250 2.0.0 Ok                       
-                 DHE-RSA-SEED-SHA              DH-2048 bits   128 bits      250 2.0.0 Ok                       
-                 DHE-RSA-CAMELLIA128-SHA       DH-2048 bits   128 bits      250 2.0.0 Ok                       
-                 DHE-RSA-AES128-SHA256         DH-2048 bits   128 bits      250 2.0.0 Ok                       
-                 DHE-RSA-AES128-SHA            DH-2048 bits   128 bits      250 2.0.0 Ok                       
-                 DHE-RSA-AES128-GCM-SHA256     DH-2048 bits   128 bits      250 2.0.0 Ok                       
-                 SEED-SHA                      -              128 bits      250 2.0.0 Ok                       
-                 CAMELLIA128-SHA               -              128 bits      250 2.0.0 Ok                       
-                 AES128-SHA256                 -              128 bits      250 2.0.0 Ok                       
-                 AES128-SHA                    -              128 bits      250 2.0.0 Ok                       
-                 AES128-GCM-SHA256             -              128 bits      250 2.0.0 Ok                       
-
-  * TLSV1_1 Cipher Suites:
-      Preferred:                       
-                 ECDHE-RSA-AES256-SHA          ECDH-256 bits  256 bits      250 2.0.0 Ok                       
-      Accepted:                        
-                 ECDHE-RSA-AES256-SHA          ECDH-256 bits  256 bits      250 2.0.0 Ok                       
-                 DHE-RSA-CAMELLIA256-SHA       DH-2048 bits   256 bits      250 2.0.0 Ok                       
-                 DHE-RSA-AES256-SHA            DH-2048 bits   256 bits      250 2.0.0 Ok                       
-                 CAMELLIA256-SHA               -              256 bits      250 2.0.0 Ok                       
-                 AES256-SHA                    -              256 bits      250 2.0.0 Ok                       
-                 ECDHE-RSA-AES128-SHA          ECDH-256 bits  128 bits      250 2.0.0 Ok                       
-                 DHE-RSA-SEED-SHA              DH-2048 bits   128 bits      250 2.0.0 Ok                       
-                 DHE-RSA-CAMELLIA128-SHA       DH-2048 bits   128 bits      250 2.0.0 Ok                       
-                 DHE-RSA-AES128-SHA            DH-2048 bits   128 bits      250 2.0.0 Ok                       
-                 SEED-SHA                      -              128 bits      250 2.0.0 Ok                       
-                 CAMELLIA128-SHA               -              128 bits      250 2.0.0 Ok                       
-                 AES128-SHA                    -              128 bits      250 2.0.0 Ok                       
-
-  * SSLV3 Cipher Suites:
-      Server rejected all cipher suites.
-
-  * TLSV1 Cipher Suites:
-      Preferred:                       
-                 ECDHE-RSA-AES256-SHA          ECDH-256 bits  256 bits      250 2.0.0 Ok                       
-      Accepted:                        
-                 ECDHE-RSA-AES256-SHA          ECDH-256 bits  256 bits      250 2.0.0 Ok                       
-                 DHE-RSA-CAMELLIA256-SHA       DH-2048 bits   256 bits      250 2.0.0 Ok                       
-                 DHE-RSA-AES256-SHA            DH-2048 bits   256 bits      250 2.0.0 Ok                       
-                 CAMELLIA256-SHA               -              256 bits      250 2.0.0 Ok                       
-                 AES256-SHA                    -              256 bits      250 2.0.0 Ok                       
-                 ECDHE-RSA-AES128-SHA          ECDH-256 bits  128 bits      250 2.0.0 Ok                       
-                 DHE-RSA-SEED-SHA              DH-2048 bits   128 bits      250 2.0.0 Ok                       
-                 DHE-RSA-CAMELLIA128-SHA       DH-2048 bits   128 bits      250 2.0.0 Ok                       
-                 DHE-RSA-AES128-SHA            DH-2048 bits   128 bits      250 2.0.0 Ok                       
-                 SEED-SHA                      -              128 bits      250 2.0.0 Ok                       
-                 CAMELLIA128-SHA               -              128 bits      250 2.0.0 Ok                       
-                 AES128-SHA                    -              128 bits      250 2.0.0 Ok
-
-  Should Not Offer: AES128-GCM-SHA256, AES128-SHA, AES128-SHA256, AES256-GCM-SHA384, AES256-SHA, AES256-SHA256, CAMELLIA128-SHA, CAMELLIA256-SHA, DHE-RSA-CAMELLIA128-SHA, DHE-RSA-CAMELLIA256-SHA, DHE-RSA-SEED-SHA, SEED-SHA
-  Could Also Offer: DHE-DSS-AES128-GCM-SHA256, DHE-DSS-AES128-SHA256, DHE-DSS-AES256-GCM-SHA384, DHE-DSS-AES256-SHA, ECDHE-ECDSA-AES128-GCM-SHA256, ECDHE-ECDSA-AES128-SHA, ECDHE-ECDSA-AES128-SHA256, ECDHE-ECDSA-AES256-GCM-SHA384, ECDHE-ECDSA-AES256-SHA, ECDHE-ECDSA-AES256-SHA384
-  Supported Clients: OpenSSL/1.0.2, Yahoo Slurp/Jan 2015, BingPreview/Jan 2015, OpenSSL/1.0.1l, YandexBot/Jan 2015, Android/4.4.2, Safari/8/iOS 8.1.2, Safari/7/OS X 10.9, Safari/8/OS X 10.10, Safari/7/iOS 7.1, IE Mobile/11/Win Phone 8.1, IE/11/Win 8.1, IE/11/Win 7, Safari/6/iOS 6.0.1, Firefox/31.3.0 ESR/Win 7, Baidu/Jan 2015, Android/5.0.0, Chrome/42/OS X, Java/8u31, Googlebot/Feb 2015, Firefox/37/OS X, Android/4.0.4, Android/4.1.1, Safari/6.0.4/OS X 10.8.4, Android/4.3, Android/4.2.2, Safari/5.1.9/OS X 10.6.8, OpenSSL/0.9.8y, IE/7/Vista, IE/8-10/Win 7, IE Mobile/10/Win Phone 8.0, Java/7u25, Java/6u45, Android/2.3.7
-
-PORT 443
---------
-
-  * Deflate Compression:
-      OK - Compression disabled          
-
-  * Session Renegotiation:
-      Client-initiated Renegotiations:   OK - Rejected
-      Secure Renegotiation:              OK - Supported
-
-  * HTTP Strict Transport Security:
-      OK - HSTS header received:         max-age=31536000
-
-  * Session Resumption:
-      With Session IDs:                  OK - Supported (5 successful, 0 failed, 0 errors, 5 total attempts).
-      With TLS Session Tickets:          OK - Supported
-
-  * OpenSSL Heartbleed:
-      OK - Not vulnerable to Heartbleed  
-
-  * SSLV2 Cipher Suites:
-      Server rejected all cipher suites.
-
-  * Google Chrome SHA-1 Deprecation Status:
-      OK - Leaf certificate expires before 2016.
-
-  * TLSV1_2 Cipher Suites:
-      Preferred:                       
-                 ECDHE-RSA-AES128-GCM-SHA256   ECDH-256 bits  128 bits      HTTP 200 OK                        
-      Accepted:                        
-                 ECDHE-RSA-AES256-SHA384       ECDH-256 bits  256 bits      HTTP 200 OK                        
-                 ECDHE-RSA-AES256-SHA          ECDH-256 bits  256 bits      HTTP 200 OK                        
-                 ECDHE-RSA-AES256-GCM-SHA384   ECDH-256 bits  256 bits      HTTP 200 OK                        
-                 DHE-RSA-AES256-SHA256         DH-2048 bits   256 bits      HTTP 200 OK                        
-                 DHE-RSA-AES256-SHA            DH-2048 bits   256 bits      HTTP 200 OK                        
-                 DHE-RSA-AES256-GCM-SHA384     DH-2048 bits   256 bits      HTTP 200 OK                        
-                 ECDHE-RSA-AES128-SHA256       ECDH-256 bits  128 bits      HTTP 200 OK                        
-                 ECDHE-RSA-AES128-SHA          ECDH-256 bits  128 bits      HTTP 200 OK                        
-                 ECDHE-RSA-AES128-GCM-SHA256   ECDH-256 bits  128 bits      HTTP 200 OK                        
-                 DHE-RSA-AES128-SHA256         DH-2048 bits   128 bits      HTTP 200 OK                        
-                 DHE-RSA-AES128-SHA            DH-2048 bits   128 bits      HTTP 200 OK                        
-                 DHE-RSA-AES128-GCM-SHA256     DH-2048 bits   128 bits      HTTP 200 OK                        
-                 DES-CBC3-SHA                  -              112 bits      HTTP 200 OK                        
-
-  * TLSV1_1 Cipher Suites:
-      Preferred:                       
-                 ECDHE-RSA-AES128-SHA          ECDH-256 bits  128 bits      HTTP 200 OK                        
-      Accepted:                        
-                 ECDHE-RSA-AES256-SHA          ECDH-256 bits  256 bits      HTTP 200 OK                        
-                 DHE-RSA-AES256-SHA            DH-2048 bits   256 bits      HTTP 200 OK                        
-                 ECDHE-RSA-AES128-SHA          ECDH-256 bits  128 bits      HTTP 200 OK                        
-                 DHE-RSA-AES128-SHA            DH-2048 bits   128 bits      HTTP 200 OK                        
-                 DES-CBC3-SHA                  -              112 bits      HTTP 200 OK                        
-
-  * SSLV3 Cipher Suites:
-      Server rejected all cipher suites.
-
-  * TLSV1 Cipher Suites:
-      Preferred:                       
-                 ECDHE-RSA-AES128-SHA          ECDH-256 bits  128 bits      HTTP 200 OK                        
-      Accepted:                        
-                 ECDHE-RSA-AES256-SHA          ECDH-256 bits  256 bits      HTTP 200 OK                        
-                 DHE-RSA-AES256-SHA            DH-2048 bits   256 bits      HTTP 200 OK                        
-                 ECDHE-RSA-AES128-SHA          ECDH-256 bits  128 bits      HTTP 200 OK                        
-                 DHE-RSA-AES128-SHA            DH-2048 bits   128 bits      HTTP 200 OK                        
-                 DES-CBC3-SHA                  -              112 bits      HTTP 200 OK
-
-  Should Not Offer: (none -- good)
-  Could Also Offer: AES128-GCM-SHA256, AES128-SHA, AES128-SHA256, AES256-GCM-SHA384, AES256-SHA, AES256-SHA256, CAMELLIA128-SHA, CAMELLIA256-SHA, DHE-DSS-AES128-GCM-SHA256, DHE-DSS-AES128-SHA, DHE-DSS-AES128-SHA256, DHE-DSS-AES256-GCM-SHA384, DHE-DSS-AES256-SHA, DHE-DSS-AES256-SHA256, DHE-DSS-CAMELLIA128-SHA, DHE-DSS-CAMELLIA256-SHA, DHE-RSA-CAMELLIA128-SHA, DHE-RSA-CAMELLIA256-SHA, ECDHE-ECDSA-AES128-GCM-SHA256, ECDHE-ECDSA-AES128-SHA, ECDHE-ECDSA-AES128-SHA256, ECDHE-ECDSA-AES256-GCM-SHA384, ECDHE-ECDSA-AES256-SHA, ECDHE-ECDSA-AES256-SHA384, SRP-AES-128-CBC-SHA, SRP-AES-256-CBC-SHA, SRP-DSS-AES-128-CBC-SHA, SRP-DSS-AES-256-CBC-SHA, SRP-RSA-AES-128-CBC-SHA, SRP-RSA-AES-256-CBC-SHA
-  Supported Clients: YandexBot/Jan 2015, OpenSSL/1.0.2, Yahoo Slurp/Jan 2015, BingPreview/Jan 2015, OpenSSL/1.0.1l, Android/4.4.2, Safari/8/iOS 8.1.2, Safari/8/OS X 10.10, Safari/7/OS X 10.9, Safari/7/iOS 7.1, Safari/6/iOS 6.0.1, Android/5.0.0, Chrome/42/OS X, IE/11/Win 8.1, IE/11/Win 7, Java/8u31, IE Mobile/11/Win Phone 8.1, Googlebot/Feb 2015, Firefox/37/OS X, Firefox/31.3.0 ESR/Win 7, Android/4.2.2, Android/4.0.4, Baidu/Jan 2015, Safari/5.1.9/OS X 10.6.8, Android/4.1.1, Safari/6.0.4/OS X 10.8.4, Android/4.3, OpenSSL/0.9.8y, IE/7/Vista, IE/8-10/Win 7, IE Mobile/10/Win Phone 8.0, Java/7u25, Java/6u45, Android/2.3.7, IE/8/XP
-
-PORT 993
---------
-
-  * Deflate Compression:
-      OK - Compression disabled          
-
-Unhandled exception when processing --reneg: 
-_nassl.OpenSSLError - error:140940F5:SSL routines:ssl3_read_bytes:unexpected record
-
-  * OpenSSL Heartbleed:
-      OK - Not vulnerable to Heartbleed  
-
-  * SSLV2 Cipher Suites:
-      Server rejected all cipher suites.
-
-  * Session Resumption:
-      With Session IDs:                  NOT SUPPORTED (0 successful, 5 failed, 0 errors, 5 total attempts).
-      With TLS Session Tickets:          NOT SUPPORTED - TLS ticket assigned but not accepted.
-
-  * TLSV1_2 Cipher Suites:
-      Preferred:                       
-                 ECDHE-RSA-AES256-SHA          ECDH-384 bits  256 bits                                         
-      Accepted:                        
-                 ECDHE-RSA-AES256-SHA          ECDH-384 bits  256 bits                                         
-                 DHE-RSA-CAMELLIA256-SHA       DH-1024 bits   256 bits                                         
-                 DHE-RSA-AES256-SHA            DH-1024 bits   256 bits                                         
-                 CAMELLIA256-SHA               -              256 bits                                         
-                 AES256-SHA                    -              256 bits                                         
-                 ECDHE-RSA-AES128-SHA          ECDH-384 bits  128 bits                                         
-                 DHE-RSA-CAMELLIA128-SHA       DH-1024 bits   128 bits                                         
-                 DHE-RSA-AES128-SHA            DH-1024 bits   128 bits                                         
-                 CAMELLIA128-SHA               -              128 bits                                         
-                 AES128-SHA                    -              128 bits                                         
-
-  * TLSV1_1 Cipher Suites:
-      Preferred:                       
-                 ECDHE-RSA-AES256-SHA          ECDH-384 bits  256 bits                                         
-      Accepted:                        
-                 ECDHE-RSA-AES256-SHA          ECDH-384 bits  256 bits                                         
-                 DHE-RSA-CAMELLIA256-SHA       DH-1024 bits   256 bits                                         
-                 DHE-RSA-AES256-SHA            DH-1024 bits   256 bits                                         
-                 CAMELLIA256-SHA               -              256 bits                                         
-                 AES256-SHA                    -              256 bits                                         
-                 ECDHE-RSA-AES128-SHA          ECDH-384 bits  128 bits                                         
-                 DHE-RSA-CAMELLIA128-SHA       DH-1024 bits   128 bits                                         
-                 DHE-RSA-AES128-SHA            DH-1024 bits   128 bits                                         
-                 CAMELLIA128-SHA               -              128 bits                                         
-                 AES128-SHA                    -              128 bits                                         
-
-  * SSLV3 Cipher Suites:
-      Server rejected all cipher suites.
-
-  * TLSV1 Cipher Suites:
-      Preferred:                       
-                 ECDHE-RSA-AES256-SHA          ECDH-384 bits  256 bits                                         
-      Accepted:                        
-                 ECDHE-RSA-AES256-SHA          ECDH-384 bits  256 bits                                         
-                 DHE-RSA-CAMELLIA256-SHA       DH-1024 bits   256 bits                                         
-                 DHE-RSA-AES256-SHA            DH-1024 bits   256 bits                                         
-                 CAMELLIA256-SHA               -              256 bits                                         
-                 AES256-SHA                    -              256 bits                                         
-                 ECDHE-RSA-AES128-SHA          ECDH-384 bits  128 bits                                         
-                 DHE-RSA-CAMELLIA128-SHA       DH-1024 bits   128 bits                                         
-                 DHE-RSA-AES128-SHA            DH-1024 bits   128 bits                                         
-                 CAMELLIA128-SHA               -              128 bits                                         
-                 AES128-SHA                    -              128 bits
-
-  Should Not Offer: AES128-SHA, AES256-SHA, CAMELLIA128-SHA, CAMELLIA256-SHA, DHE-RSA-CAMELLIA128-SHA, DHE-RSA-CAMELLIA256-SHA
-  Could Also Offer: DHE-DSS-AES128-GCM-SHA256, DHE-DSS-AES128-SHA256, DHE-DSS-AES256-GCM-SHA384, DHE-DSS-AES256-SHA, DHE-RSA-AES128-GCM-SHA256, DHE-RSA-AES128-SHA256, DHE-RSA-AES256-GCM-SHA384, DHE-RSA-AES256-SHA256, ECDHE-ECDSA-AES128-GCM-SHA256, ECDHE-ECDSA-AES128-SHA, ECDHE-ECDSA-AES128-SHA256, ECDHE-ECDSA-AES256-GCM-SHA384, ECDHE-ECDSA-AES256-SHA, ECDHE-ECDSA-AES256-SHA384, ECDHE-RSA-AES128-GCM-SHA256, ECDHE-RSA-AES128-SHA256, ECDHE-RSA-AES256-GCM-SHA384, ECDHE-RSA-AES256-SHA384
-  Supported Clients: OpenSSL/1.0.2, Baidu/Jan 2015, Yahoo Slurp/Jan 2015, BingPreview/Jan 2015, OpenSSL/1.0.1l, Firefox/31.3.0 ESR/Win 7, Googlebot/Feb 2015, Android/4.2.2, Android/5.0.0, Android/4.0.4, Safari/8/iOS 8.1.2, Safari/7/OS X 10.9, YandexBot/Jan 2015, Safari/8/OS X 10.10, Safari/7/iOS 7.1, Chrome/42/OS X, Safari/5.1.9/OS X 10.6.8, Android/4.1.1, Firefox/37/OS X, Safari/6.0.4/OS X 10.8.4, Android/4.3, Safari/6/iOS 6.0.1, Android/4.4.2, OpenSSL/0.9.8y, IE Mobile/11/Win Phone 8.1, IE/7/Vista, IE/11/Win 8.1, IE/11/Win 7, IE/8-10/Win 7, IE Mobile/10/Win Phone 8.0, Java/8u31, Java/7u25, Java/6u45, Android/2.3.7
-
-PORT 995
---------
-
-  * Deflate Compression:
-      OK - Compression disabled          
-
-Unhandled exception when processing --reneg: 
-_nassl.OpenSSLError - error:140940F5:SSL routines:ssl3_read_bytes:unexpected record
-
-  * OpenSSL Heartbleed:
-      OK - Not vulnerable to Heartbleed  
-
-  * SSLV2 Cipher Suites:
-      Server rejected all cipher suites.
-
-  * Session Resumption:
-      With Session IDs:                  NOT SUPPORTED (0 successful, 5 failed, 0 errors, 5 total attempts).
-      With TLS Session Tickets:          NOT SUPPORTED - TLS ticket assigned but not accepted.
-
-  * TLSV1_2 Cipher Suites:
-      Preferred:                       
-                 ECDHE-RSA-AES256-SHA          ECDH-384 bits  256 bits                                         
-      Accepted:                        
-                 ECDHE-RSA-AES256-SHA          ECDH-384 bits  256 bits                                         
-                 DHE-RSA-CAMELLIA256-SHA       DH-1024 bits   256 bits                                         
-                 DHE-RSA-AES256-SHA            DH-1024 bits   256 bits                                         
-                 CAMELLIA256-SHA               -              256 bits                                         
-                 AES256-SHA                    -              256 bits                                         
-                 ECDHE-RSA-AES128-SHA          ECDH-384 bits  128 bits                                         
-                 DHE-RSA-CAMELLIA128-SHA       DH-1024 bits   128 bits                                         
-                 DHE-RSA-AES128-SHA            DH-1024 bits   128 bits                                         
-                 CAMELLIA128-SHA               -              128 bits                                         
-                 AES128-SHA                    -              128 bits                                         
-
-  * TLSV1_1 Cipher Suites:
-      Preferred:                       
-                 ECDHE-RSA-AES256-SHA          ECDH-384 bits  256 bits                                         
-      Accepted:                        
-                 ECDHE-RSA-AES256-SHA          ECDH-384 bits  256 bits                                         
-                 DHE-RSA-CAMELLIA256-SHA       DH-1024 bits   256 bits                                         
-                 DHE-RSA-AES256-SHA            DH-1024 bits   256 bits                                         
-                 CAMELLIA256-SHA               -              256 bits                                         
-                 AES256-SHA                    -              256 bits                                         
-                 ECDHE-RSA-AES128-SHA          ECDH-384 bits  128 bits                                         
-                 DHE-RSA-CAMELLIA128-SHA       DH-1024 bits   128 bits                                         
-                 DHE-RSA-AES128-SHA            DH-1024 bits   128 bits                                         
-                 CAMELLIA128-SHA               -              128 bits                                         
-                 AES128-SHA                    -              128 bits                                         
-
-  * SSLV3 Cipher Suites:
-      Server rejected all cipher suites.
-
-  * TLSV1 Cipher Suites:
-      Preferred:                       
-                 ECDHE-RSA-AES256-SHA          ECDH-384 bits  256 bits                                         
-      Accepted:                        
-                 ECDHE-RSA-AES256-SHA          ECDH-384 bits  256 bits                                         
-                 DHE-RSA-CAMELLIA256-SHA       DH-1024 bits   256 bits                                         
-                 DHE-RSA-AES256-SHA            DH-1024 bits   256 bits                                         
-                 CAMELLIA256-SHA               -              256 bits                                         
-                 AES256-SHA                    -              256 bits                                         
-                 ECDHE-RSA-AES128-SHA          ECDH-384 bits  128 bits                                         
-                 DHE-RSA-CAMELLIA128-SHA       DH-1024 bits   128 bits                                         
-                 DHE-RSA-AES128-SHA            DH-1024 bits   128 bits                                         
-                 CAMELLIA128-SHA               -              128 bits                                         
-                 AES128-SHA                    -              128 bits
-
-  Should Not Offer: AES128-SHA, AES256-SHA, CAMELLIA128-SHA, CAMELLIA256-SHA, DHE-RSA-CAMELLIA128-SHA, DHE-RSA-CAMELLIA256-SHA
-  Could Also Offer: DHE-DSS-AES128-GCM-SHA256, DHE-DSS-AES128-SHA256, DHE-DSS-AES256-GCM-SHA384, DHE-DSS-AES256-SHA, DHE-RSA-AES128-GCM-SHA256, DHE-RSA-AES128-SHA256, DHE-RSA-AES256-GCM-SHA384, DHE-RSA-AES256-SHA256, ECDHE-ECDSA-AES128-GCM-SHA256, ECDHE-ECDSA-AES128-SHA, ECDHE-ECDSA-AES128-SHA256, ECDHE-ECDSA-AES256-GCM-SHA384, ECDHE-ECDSA-AES256-SHA, ECDHE-ECDSA-AES256-SHA384, ECDHE-RSA-AES128-GCM-SHA256, ECDHE-RSA-AES128-SHA256, ECDHE-RSA-AES256-GCM-SHA384, ECDHE-RSA-AES256-SHA384
-  Supported Clients: OpenSSL/1.0.2, Baidu/Jan 2015, Yahoo Slurp/Jan 2015, BingPreview/Jan 2015, OpenSSL/1.0.1l, Firefox/31.3.0 ESR/Win 7, Googlebot/Feb 2015, Android/4.2.2, Android/5.0.0, Android/4.0.4, Safari/8/iOS 8.1.2, Safari/7/OS X 10.9, YandexBot/Jan 2015, Safari/8/OS X 10.10, Safari/7/iOS 7.1, Chrome/42/OS X, Safari/5.1.9/OS X 10.6.8, Android/4.1.1, Firefox/37/OS X, Safari/6.0.4/OS X 10.8.4, Android/4.3, Safari/6/iOS 6.0.1, Android/4.4.2, OpenSSL/0.9.8y, IE Mobile/11/Win Phone 8.1, IE/7/Vista, IE/11/Win 8.1, IE/11/Win 7, IE/8-10/Win 7, IE Mobile/10/Win Phone 8.0, Java/8u31, Java/7u25, Java/6u45, Android/2.3.7
-

tools/dns_update

@@ -1,6 +1,2 @@
 #!/bin/bash
-POSTDATA=dummy
+curl -s -d POSTDATA --user $(</var/lib/mailinabox/api.key): http://127.0.0.1:10222/dns/update
-if [ "$1" == "--force" ]; then
-	POSTDATA=force=1
-fi
-curl -s -d $POSTDATA --user $(</var/lib/mailinabox/api.key): http://127.0.0.1:10222/dns/update

tools/editconf.py

@@ -14,8 +14,6 @@
 #
 # NAME VALUE
 #
-# If the -c option is given, then the supplied character becomes the comment character
-#
 # If the -w option is given, then setting lines continue onto following
 # lines while the lines start with whitespace, e.g.:
 #
@@ -26,7 +24,7 @@ import sys, re
 
 # sanity check
 if len(sys.argv) < 3:
-	print("usage: python3 editconf.py /etc/file.conf [-s] [-w] [-c <CHARACTER>] [-t] NAME=VAL [NAME=VAL ...]")
+	print("usage: python3 editconf.py /etc/file.conf [-s] [-w] [-t] NAME=VAL [NAME=VAL ...]")
 	sys.exit(1)
 
 # parse command line arguments
@@ -35,7 +33,6 @@ settings = sys.argv[2:]
 
 delimiter = "="
 delimiter_re = r"\s*=\s*"
-comment_char = "#"
 folded_lines = False
 testing = False
 while settings[0][0] == "-" and settings[0] != "--":
@@ -45,25 +42,13 @@ while settings[0][0] == "-" and settings[0] != "--":
 		delimiter = " "
 		delimiter_re = r"\s+"
 	elif opt == "-w":
-		# Line folding is possible in this file.
 		folded_lines = True
-	elif opt == "-c":
-		# Specifies a different comment character.
-		comment_char = settings.pop(0)
 	elif opt == "-t":
 		testing = True
 	else:
 		print("Invalid option.")
 		sys.exit(1)
 
-# sanity check command line
-for setting in settings:
-	try:
-		name, value = setting.split("=", 1)
-	except:
-		import subprocess
-		print("Invalid command line: ", subprocess.list2cmdline(sys.argv))
-
 # create the new config file in memory
 
 found = set()
@@ -75,7 +60,7 @@ while len(input_lines) > 0:
 
 	# If this configuration file uses folded lines, append any folded lines
 	# into our input buffer.
-	if folded_lines and line[0] not in (comment_char, " ", ""):
+	if folded_lines and line[0] not in ("#", " ", ""):
 		while len(input_lines) > 0 and input_lines[0][0] in " \t":
 			line += input_lines.pop(0)
 
@@ -83,11 +68,7 @@ while len(input_lines) > 0:
 	for i in range(len(settings)):
 		# Check that this line contain this setting from the command-line arguments.
 		name, val = settings[i].split("=", 1)
-		m = re.match(
+		m = re.match("(\s*)(#\s*)?" + re.escape(name) + delimiter_re + "(.*?)\s*$", line, re.S)
-			   "(\s*)"
-			 + "(" + re.escape(comment_char) + "\s*)?"
-			 + re.escape(name) + delimiter_re + "(.*?)\s*$",
-			 line, re.S)
 		if not m: continue
 		indent, is_comment, existing_val = m.groups()
 
@@ -102,7 +83,7 @@ while len(input_lines) > 0:
 		
 		# comment-out the existing line (also comment any folded lines)
 		if is_comment is None:
-			buf += comment_char + line.rstrip().replace("\n", "\n" + comment_char) + "\n"
+			buf += "#" + line.rstrip().replace("\n", "\n#") + "\n"
 		else:
 			# the line is already commented, pass it through
 			buf += line

tools/encryption-milter.py

@@ -0,0 +1,191 @@
+#!/usr/bin/env python3
+
+import sys
+import io
+import re
+import urllib.request, urllib.error
+import tempfile
+import shutil
+
+import libmilter
+import gnupg
+import dns.resolver
+from hashlib import sha224
+
+# Start logging to syslog.
+from syslog import syslog, openlog, LOG_MAIL
+openlog('encryption-milter', facility=LOG_MAIL)
+
+# Replace process title so it looks nicer in top.
+try:
+	import setproctitle
+	setproctitle.setproctitle("encryption-milter")
+except:
+	pass
+
+# Globals for DNS resolving. See:
+# http://tools.ietf.org/html/draft-ietf-dane-openpgpkey-00
+# http://tools.ietf.org/html/draft-ietf-dane-openpgpkey-usage-00
+# https://github.com/letoams/openpgpkey-milter/
+# I have not tested that this works at all.
+resolver = dns.resolver.get_default_resolver()
+#resolver.nameservers = [server]
+openpgp_rtype = 65280  # draft value - changes when RFC
+
+class EncryptionError(Exception):
+	pass
+
+class EncryptionMilter(libmilter.ForkMixin, libmilter.MilterProtocol):
+	def __init__(self, opts=0, protos=0):
+		libmilter.MilterProtocol.__init__(self, opts, protos)
+		libmilter.ForkMixin.__init__(self)
+
+		self.R = []  # list of recipient keys
+		self.fp = io.BytesIO() # storage for incoming body
+
+	def log(self, msg):
+		print(msg)
+		syslog('encryption-milter: ' + msg)
+
+	def rcpt(self, rcpt_to, cmdDict):
+		# Turn recipients into keys. If we don't have a key available,
+		# then reject the message.
+		try:
+			self.R.extend(self.get_pgp_keys(rcpt_to))
+			return libmilter.CONTINUE
+		except EncryptionError as e:
+			self.log(str(e))
+			self.setReply(b'554', b'5.7.1', str(e).encode("utf8"))
+			return libmilter.REJECT
+
+	@libmilter.noReply
+	def header(self, header, value, cmdDict):
+		self.fp.write(header)
+		self.fp.write(b': ')
+		self.fp.write(value)
+		self.fp.write(b'\n')
+		return libmilter.CONTINUE
+
+	@libmilter.noReply
+	def eoh(self, cmdDict):
+		self.fp.write(b'\n')
+		return libmilter.CONTINUE
+
+	@libmilter.noReply
+	def body(self, chunk, cmdDict):
+		self.fp.write(chunk)
+		return libmilter.CONTINUE
+
+	def eob(self, cmdDict):
+		msg = self.fp.getvalue()
+
+		gpgdir = tempfile.mkdtemp()
+		gpg = gnupg.GPG(gnupghome=gpgdir)
+		gpg.decode_errors = "ignore"
+		try:
+			# Add keys.
+			for key in self.R:
+				gpg.import_keys(key)
+
+			# Target message encryption to all imported keys.
+			fingerprints = ','.join(ikey['fingerprint'] for ikey in gpg.list_keys())
+
+			# Encrypt message.
+			enc_msg = gpg.encrypt(msg, fingerprints, always_trust=True)
+			if enc_msg.data == '':
+				# gpg binary and pythong wrapper is bad at giving us an error message
+				raise Exception('Encryption failed for an unknown reason. GPG failed.')
+
+			# Rewrite the message.
+
+			self.addHeader(b'X-OpenPGPKey', b'Encrypted to key(s): ' + fingerprints.encode("ascii"))
+			self.chgHeader(b'Subject', b'[pgp encrypted message]')
+			self.replBody(enc_msg.data)
+
+			return libmilter.CONTINUE
+
+		except ValueError: #Exception as e:
+			# Exceptions are thrown on things that would be temporary failures.
+			# But by now it's too late to tell the user there was a problem?
+			self.log(str(e))
+			self.setReply(b'554', b'5.7.1', str(e).encode("utf8"))
+			return libmilter.REJECT
+
+		finally:
+			shutil.rmtree(gpgdir)
+
+	def get_pgp_keys(self, email_addr):
+		keys = self.import_keys_from_keybase(email_addr)
+		if keys: return keys
+
+		keys = self.import_keys_from_dns(email_addr)
+		if keys: return keys
+
+		raise EncryptionError(email_addr.decode("utf8", "replace") + " does not have a known encryption key.")
+
+	def import_keys_from_keybase(self, email_addr):
+		# Extract the keybase username from the email address.
+		m = re.search(rb"\+keybase=(.*)@", email_addr)
+		if not m: return None
+		keybase_username = m.group(1)
+
+		# Query keybase.
+		try:
+			req = urllib.request.urlopen("https://keybase.io/%s/key.asc" % keybase_username.decode("ascii", "error"), timeout=20, cadefault=True)
+			openpgpkey = req.read()
+		except Exception as e:
+			if isinstance(e, urllib.error.HTTPError) and e.code == 404:
+				e = "User not found."
+			raise EncryptionError("Error getting public key for %s at Keybase.io: %s" % (keybase_username.decode("utf8", "replace"), str(e)))
+
+		# Return the key.
+		self.log("got keybase.io key for %s" % keybase_username.decode("utf8", "replace"))
+		return [openpgpkey]
+
+	def import_keys_from_dns(self, email_addr):
+		(username, domainname) = email_addr.split(b'@')
+		qname = '%s._openpgpkey.%s' % (sha224(username).hexdigest(), domainname)
+
+		try:
+			response = dns.resolver.query(qname, openpgp_rtype)
+		except dns.resolver.NoNameservers:
+			# could not connect to nameserver
+			raise EncryptionError("Could not connect to nameserver.")
+		except (dns.resolver.NXDOMAIN, dns.resolver.NoAnswer):
+			# host did not have an answer for this query; not sure what the
+			# difference is between the two exceptions
+			return None
+
+		if len(result) == 0:
+			# empty answer? probably not possible...
+			return None
+
+		# Return all keys found in DNS.
+		return [str(value) for value in result]
+
+
+def runMilter():
+	# Adapted from the python-libmilter example at
+	# https://github.com/crustymonkey/python-libmilter/blob/master/examples/testmilter.py
+
+	import signal, traceback
+
+	# Create the milter. Use the ForkFactor to handle each mail in a separate process.
+	f = libmilter.ForkFactory('inet:127.0.0.1:8892', EncryptionMilter,
+		libmilter.SMFIF_ADDHDRS | libmilter.SMFIF_CHGHDRS | libmilter.SMFIF_CHGBODY)
+
+	# Add a signal handler to cleanly exit.
+	def sigHandler(num, frame):
+		f.close()
+		sys.exit(0)
+	signal.signal(signal.SIGINT, sigHandler)
+
+	# Start the milter.
+	try:
+		f.run()
+	except Exception as e:
+		f.close()
+		raise
+
+if __name__ == '__main__':
+	runMilter()

tools/exchange-autodiscover.php

@@ -0,0 +1,92 @@
+<?php
+	// Parse our configuration file to get the PRIMARY_HOSTNAME.
+	$PRIMARY_HOSTNAME = NULL;
+	foreach (file("/etc/mailinabox.conf") as $line) {
+		$line = explode("=", rtrim($line), 2);
+		if ($line[0] == "PRIMARY_HOSTNAME") {
+			$PRIMARY_HOSTNAME = $line[1];
+		}
+	}
+	if ($PRIMARY_HOSTNAME == NULL) exit("no PRIMARY_HOSTNAME");
+
+	// We might get two kinds of requests.
+	$post_body = file_get_contents('php://input');
+	preg_match('/<AcceptableResponseSchema>(.*?)<\/AcceptableResponseSchema>/', $post_body, $match);
+	$AcceptableResponseSchema = $match[1];
+
+	if ($AcceptableResponseSchema == "http://schemas.microsoft.com/exchange/autodiscover/mobilesync/responseschema/2006") {
+		// There is no way to convey the user's login name with this?
+		?>
+<?xml version="1.0" encoding="utf-8"?>
+<Autodiscover
+xmlns:autodiscover="http://schemas.microsoft.com/exchange/autodiscover/mobilesync/responseschema/2006">
+    <autodiscover:Response>
+        <autodiscover:Action>
+            <autodiscover:Settings>
+                <autodiscover:Server>
+                    <autodiscover:Type>MobileSync</autodiscover:Type>
+                    <autodiscover:Url>https://<?php echo $PRIMARY_HOSTNAME ?></autodiscover:Url>
+                    <autodiscover:Name>https://<?php echo $PRIMARY_HOSTNAME ?></autodiscover:Name>
+                </autodiscover:Server>
+            </autodiscover:Settings>
+        </autodiscover:Action>
+    </autodiscover:Response>
+</Autodiscover>
+<?php
+	} else {
+
+	// I don't know when this is actually used. I implemented this before seeing that
+	// it is not what my phone wanted.
+
+	// Parse the email address out of the POST request, which
+	// we pass back as the login name.
+	preg_match('/<EMailAddress>(.*?)<\/EMailAddress>/', $post_body, $match);
+	$LOGIN = $match[1];
+
+	header("Content-type: text/xml");
+?>
+<?xml version="1.0" encoding="utf-8" ?>
+<Autodiscover xmlns="http://schemas.microsoft.com/exchange/autodiscover/responseschema/2006">
+	<Response xmlns="http://schemas.microsoft.com/exchange/autodiscover/outlook/responseschema/2006a">
+		<ServiceHome>https://<?php echo $PRIMARY_HOSTNAME ?></ServiceHome>
+		<Account>
+			<AccountType>email</AccountType>
+			<Action>settings</Action>
+
+			<Protocol>
+				<Type>IMAP</Type>
+				<Server><?php echo $PRIMARY_HOSTNAME ?></Server>
+				<Port>993</Port>
+				<SSL>on</SSL>
+				<LoginName><?php echo $LOGIN ?></LoginName>
+			</Protocol>
+
+			<Protocol>
+				<Type>SMTP</Type>
+				<Server><?php echo $PRIMARY_HOSTNAME ?></Server>
+				<Port>587</Port>
+				<SSL>on</SSL>
+				<LoginName><?php echo $LOGIN ?></LoginName>
+			</Protocol>
+
+			<Protocol>
+				<Type>DAV</Type>
+				<Server>https://<?php echo $PRIMARY_HOSTNAME ?></Server>
+				<SSL>on</SSL>
+				<DomainRequired>on</DomainRequired>
+				<LoginName><?php echo $LOGIN ?></LoginName>
+			</Protocol>
+
+			<Protocol>
+				<Type>WEB</Type>
+				<Server>https://<?php echo $PRIMARY_HOSTNAME ?>/mail</Server>
+				<SSL>on</SSL>
+			</Protocol>
+		</Account>
+	</Response>
+</Autodiscover>
+
+	<?php
+	}
+	?>
+

tools/mail.py

@@ -1,10 +1,9 @@
 #!/usr/bin/python3
 
-import sys, getpass, urllib.request, urllib.error, json, re
+import sys, getpass, urllib.request, urllib.error
 
-def mgmt(cmd, data=None, is_json=False):
+def mgmt(cmd, data=None):
-	# The base URL for the management daemon. (Listens on IPv4 only.)
+	mgmt_uri = 'http://localhost:10222'
-	mgmt_uri = 'http://127.0.0.1:10222'
 
 	setup_key_auth(mgmt_uri)
 
@@ -12,36 +11,18 @@ def mgmt(cmd, data=None, is_json=False):
 	try:
 		response = urllib.request.urlopen(req)
 	except urllib.error.HTTPError as e:
-		if e.code == 401:
+		print(e.read().decode('utf8'))
-			try:
-				print(e.read().decode("utf8"))
-			except:
-				pass
-			print("The management daemon refused access. The API key file may be out of sync. Try 'service mailinabox restart'.", file=sys.stderr)
-		elif hasattr(e, 'read'):
-			print(e.read().decode('utf8'), file=sys.stderr)
-		else:
-			print(e, file=sys.stderr)
 		sys.exit(1)
-	resp = response.read().decode('utf8')
+	return response.read().decode('utf8')
-	if is_json: resp = json.loads(resp)
-	return resp
 
 def read_password():
-    while True:
+	first  = getpass.getpass('password: ')
-        first = getpass.getpass('password: ')
+	second = getpass.getpass(' (again): ')
-        if len(first) < 4:
+	while first != second:
-            print("Passwords must be at least four characters.")
+		print('Passwords not the same. Try again.')
-            continue
+		first  = getpass.getpass('password: ')
-        if re.search(r'[\s]', first):
+		second = getpass.getpass(' (again): ')
-            print("Passwords cannot contain spaces.")
+	return first
-            continue
-        second = getpass.getpass(' (again): ')
-        if first != second:
-            print("Passwords not the same. Try again.")
-            continue
-        break
-    return first
 
 def setup_key_auth(mgmt_uri):
 	key = open('/var/lib/mailinabox/api.key').read().strip()
@@ -61,27 +42,15 @@ if len(sys.argv) < 2:
 	print("  tools/mail.py user add user@domain.com [password]")
 	print("  tools/mail.py user password user@domain.com [password]")
 	print("  tools/mail.py user remove user@domain.com")
-	print("  tools/mail.py user make-admin user@domain.com")
-	print("  tools/mail.py user remove-admin user@domain.com")
-	print("  tools/mail.py user admins (lists admins)")
 	print("  tools/mail.py alias  (lists aliases)")
 	print("  tools/mail.py alias add incoming.name@domain.com sent.to@other.domain.com")
-	print("  tools/mail.py alias add incoming.name@domain.com 'sent.to@other.domain.com, multiple.people@other.domain.com'")
 	print("  tools/mail.py alias remove incoming.name@domain.com")
 	print()
 	print("Removing a mail user does not delete their mail folders on disk. It only prevents IMAP/SMTP login.")
 	print()
 
 elif sys.argv[1] == "user" and len(sys.argv) == 2:
-	# Dump a list of users, one per line. Mark admins with an asterisk.
+	print(mgmt("/mail/users"))
-	users = mgmt("/mail/users?format=json", is_json=True)
-	for domain in users:
-		for user in domain["users"]:
-			if user['status'] == 'inactive': continue
-			print(user['email'], end='')
-			if "admin" in user['privileges']:
-				print("*", end='')
-			print()
 
 elif sys.argv[1] == "user" and sys.argv[2] in ("add", "password"):
 	if len(sys.argv) < 5:
@@ -101,31 +70,15 @@ elif sys.argv[1] == "user" and sys.argv[2] in ("add", "password"):
 elif sys.argv[1] == "user" and sys.argv[2] == "remove" and len(sys.argv) == 4:
 	print(mgmt("/mail/users/remove", { "email": sys.argv[3] }))
 
-elif sys.argv[1] == "user" and sys.argv[2] in ("make-admin", "remove-admin") and len(sys.argv) == 4:
-	if sys.argv[2] == "make-admin":
-		action = "add"
-	else:
-		action = "remove"
-	print(mgmt("/mail/users/privileges/" + action, { "email": sys.argv[3], "privilege": "admin" }))
-
-elif sys.argv[1] == "user" and sys.argv[2] == "admins":
-	# Dump a list of admin users.
-	users = mgmt("/mail/users?format=json", is_json=True)
-	for domain in users:
-		for user in domain["users"]:
-			if "admin" in user['privileges']:
-				print(user['email'])
-
 elif sys.argv[1] == "alias" and len(sys.argv) == 2:
 	print(mgmt("/mail/aliases"))
 
 elif sys.argv[1] == "alias" and sys.argv[2] == "add" and len(sys.argv) == 5:
-	print(mgmt("/mail/aliases/add", { "address": sys.argv[3], "forwards_to": sys.argv[4] }))
+	print(mgmt("/mail/aliases/add", { "source": sys.argv[3], "destination": sys.argv[4] }))
 
 elif sys.argv[1] == "alias" and sys.argv[2] == "remove" and len(sys.argv) == 4:
-	print(mgmt("/mail/aliases/remove", { "address": sys.argv[3] }))
+	print(mgmt("/mail/aliases/remove", { "source": sys.argv[3] }))
 
 else:
 	print("Invalid command-line arguments.")
-	sys.exit(1)
 

tools/owncloud-unlockadmin.sh

@@ -1,23 +0,0 @@
-#!/bin/bash
-#
-# This script will give you administrative access to the ownCloud
-# instance running here.
-#
-# Run this at your own risk. This is for testing & experimentation
-# purpopses only. After this point you are on your own.
-
-source /etc/mailinabox.conf # load global vars
-
-ADMIN=$(./mail.py user admins | head -n 1)
-test -z "$1" || ADMIN=$1 
-
-echo I am going to unlock admin features for $ADMIN.
-echo You can provide another user to unlock as the first argument of this script.
-echo 
-echo WARNING: you could break mail-in-a-box when fiddling around with owncloud\'s admin interface
-echo If in doubt, press CTRL-C to cancel.
-echo 
-echo Press enter to continue.
-read
-
-sqlite3 $STORAGE_ROOT/owncloud/owncloud.db "INSERT OR IGNORE INTO oc_group_user VALUES ('admin', '$ADMIN')" && echo Done.

tools/parse-nginx-log-bootstrap-accesses.py

@@ -1,57 +0,0 @@
-#!/usr/bin/python3
-#
-# This is a tool Josh uses on his box serving mailinabox.email to parse the nginx
-# access log to see how many people are installing Mail-in-a-Box each day, by
-# looking at accesses to the bootstrap.sh script.
-
-import re, glob, gzip, os.path, json
-import dateutil.parser
-
-outfn = "/home/user-data/www/mailinabox.email/install-stats.json"
-
-# Make a unique list of (date, ip address) pairs so we don't double-count
-# accesses that are for the same install.
-accesses = set()
-
-# Scan the current and rotated access logs.
-for fn in glob.glob("/var/log/nginx/access.log*"):
-	# Gunzip if necessary.
-	if fn.endswith(".gz"):
-		f = gzip.open(fn)
-	else:
-		f = open(fn, "rb")
-
-	# Loop through the lines in the access log.
-	with f:
-		for line in f:
-			# Find lines that are GETs on /bootstrap.sh by either curl or wget.
-			# (Note that we purposely skip ...?ping=1 requests which is the admin panel querying us for updates.)
-			m = re.match(rb"(?P<ip>\S+) - - \[(?P<date>.*?)\] \"GET /bootstrap.sh HTTP/.*\" 200 \d+ .* \"(?:curl|wget)", line, re.I)
-			if m:
-				date, time = m.group("date").decode("ascii").split(":", 1)
-				date = dateutil.parser.parse(date).date().isoformat()
-				ip = m.group("ip").decode("ascii")
-				accesses.add( (date, ip) )
-
-# Aggregate by date.
-by_date = { }
-for date, ip in accesses:
-	by_date[date] = by_date.get(date, 0) + 1
-
-# Since logs are rotated, store the statistics permanently in a JSON file.
-# Load in the stats from an existing file.
-if os.path.exists(outfn):
-	existing_data = json.load(open(outfn))
-	for date, count in existing_data:
-		if date not in by_date:
-			by_date[date] = count
-
-# Turn into a list rather than a dict structure to make it ordered.
-by_date = sorted(by_date.items())
-
-# Pop the last one because today's stats are incomplete.
-by_date.pop(-1)
-
-# Write out.
-with open(outfn, "w") as f:
-	json.dump(by_date, f, sort_keys=True, indent=True)

tools/readable_bash.py

@@ -1,481 +0,0 @@
-#!/usr/bin/python3
-#
-# Generate documentation for how this machine works by
-# parsing our bash scripts!
-
-import cgi, re
-import markdown
-from modgrammar import *
-
-def generate_documentation():
-	print("""<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-        <meta name="viewport" content="width=device-width">
-
-        <title>Build Your Own Mail Server From Scratch</title>
-
-        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
-        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap-theme.min.css">
-
-        <style>
-		    @import url(https://fonts.googleapis.com/css?family=Iceland);
-		    @import url(https://fonts.googleapis.com/css?family=Raleway:400,700);
-			@import url(https://fonts.googleapis.com/css?family=Ubuntu:300,500);
-		   	body {
-		    		font-family: Raleway, sans-serif;
-		    		font-size: 16px;
-					color: #555;
-	    	}
-	    	h2, h3 {
-	    		margin-top: .25em;
-	    		margin-bottom: .75em;
-	    	}
-	    	p {
-	    		margin-bottom: 1em;
-	    	}
-		    	.intro p {
-		    		margin: 1.5em 0;
-		    	}
-		    li {
-		    	margin-bottom: .33em;
-		    }
-
-			.sourcefile {
-	    		padding-top: 1.5em;
-	    		padding-bottom: 1em;
-	    		font-size: 90%;
-	    		text-align: right;
-			}
-				.sourcefile a {
-					color: red;
-				}
-
-	    	.instructions .row.contd {
-	    		border-top: 1px solid #E0E0E0;
-	    	}
-
-	    	.prose {
-	    		padding-top: 1em;    	
-	    		padding-bottom: 1em;
-	    	}
-	    	.terminal {
-	    		background-color: #EEE;
-	    		padding-top: 1em;
-	    		padding-bottom: 1em;
-	    	}
-
-	    	ul {
-	    		padding-left: 1.25em;
-	    	}
-
-	    	pre {
-	    		color: black;
-	    		border: 0;
-	    		background: none;
-	    		font-size: 100%;
-	    	}
-
-	    	div.write-to {
-	    		margin: 0 0 1em .5em;
-	    	}
-	    	div.write-to p {
-	    		padding: .5em;
-	    		margin: 0;
-	    	}
-	    	div.write-to .filename {
-	    		padding: .25em .5em;
-	    		background-color: #666;
-	    		color: white;
-	    		font-family: monospace;
-	    		font-weight: bold;
-	    	}
-	    	div.write-to .filename span {
-	    		font-family: sans-serif;
-	    		font-weight: normal;
-	    	}
-	    	div.write-to pre {
-	    		margin: 0;
-	    		padding: .5em;
-	    		border: 1px solid #999;
-	    		border-radius: 0;
-	    		font-size: 90%;
-	    	}
-
-	    	pre.shell > div:before {
-	    		content: "$ ";
-	    		color: #666;
-	    	}
-        </style>
-    </head>
-    <body>
-    <div class="container">
-      <div class="row intro">
-        <div class="col-xs-12">
-        <h1>Build Your Own Mail Server From Scratch</h1>
-        <p>Here&rsquo;s how you can build your own mail server from scratch.</p>
-        <p>This document is generated automatically from <a href="https://mailinabox.email">Mail-in-a-Box</a>&rsquo;s setup script <a href="https://github.com/mail-in-a-box/mailinabox">source code</a>.</p>
-        <hr>
-      </div>
-    </div>
-    <div class="container instructions">
- """)
-
-	parser = Source.parser()
-	for line in open("setup/start.sh"):
-		try:
-			fn = parser.parse_string(line).filename()
-		except:
-			continue
-		if fn in ("setup/start.sh", "setup/preflight.sh", "setup/questions.sh", "setup/firstuser.sh", "setup/management.sh"):
-			continue
-
-		import sys
-		print(fn, file=sys.stderr)
-
-		print(BashScript.parse(fn))
-
-	print("""
-        <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.1/jquery.min.js"></script>
-        <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
-        <script>
-        $(function() {
-			$('.terminal').each(function() {
-			  $(this).outerHeight( $(this).parent().innerHeight() );
-			});
-        })
-		</script>
-    </body>
-</html>
-""")
-
-class HashBang(Grammar):
-	grammar = (L('#!'), REST_OF_LINE, EOL)
-	def value(self):
-		return ""
-
-def strip_indent(s):
-	s = s.replace("\t", "    ")
-	lines = s.split("\n")
-	try:
-		min_indent = min(len(re.match(r"\s*", line).group(0)) for line in lines if len(line) > 0)
-	except ValueError:
-		# No non-empty lines.
-		min_indent = 0
-	lines = [line[min_indent:] for line in lines]
-	return "\n".join(lines)
-
-class Comment(Grammar):
-	grammar = ONE_OR_MORE(ZERO_OR_MORE(SPACE), L('#'), REST_OF_LINE, EOL)
-	def value(self):
-		if self.string.replace("#", "").strip() == "":
-			return "\n"
-		lines = [x[2].string for x in self[0]]
-		content = "\n".join(lines)
-		content = strip_indent(content)
-		return markdown.markdown(content, output_format="html4") + "\n\n"
-
-FILENAME = WORD('a-z0-9-/.')
-
-class Source(Grammar):
-	grammar = ((L('.') | L('source')), L(' '), FILENAME, Comment | EOL)
-	def filename(self):
-		return self[2].string.strip()
-	def value(self):
-		return BashScript.parse(self.filename())
-
-class CatEOF(Grammar):
-	grammar = (ZERO_OR_MORE(SPACE), L('cat '), L('>') | L('>>'), L(' '), ANY_EXCEPT(WHITESPACE), L(" <<"), OPTIONAL(SPACE), L("EOF"), EOL, REPEAT(ANY, greedy=False), EOL, L("EOF"), EOL)
-	def value(self):
-		content = self[9].string
-		content = re.sub(r"\\([$])", r"\1", content) # un-escape bash-escaped characters
-		return "<div class='write-to'><div class='filename'>%s <span>(%s)</span></div><pre>%s</pre></div>\n" \
-			% (self[4].string,
-			   "overwrite" if ">>" not in self[2].string else "append to",
-			   cgi.escape(content))
-
-class HideOutput(Grammar):
-	grammar = (L("hide_output "), REF("BashElement"))
-	def value(self):
-		return self[1].value()
-
-class EchoLine(Grammar):
-	grammar = (OPTIONAL(SPACE), L("echo "), REST_OF_LINE, EOL)
-	def value(self):
-		if "|" in self.string  or ">" in self.string:
-			return "<pre class='shell'><div>" + recode_bash(self.string.strip()) + "</div></pre>\n"
-		return ""
-
-class EditConf(Grammar):
-	grammar = (
-		L('tools/editconf.py '),
-		FILENAME,
-		SPACE,
-		OPTIONAL((LIST_OF(
-			L("-w") | L("-s") | L("-c ;"),
-			sep=SPACE,
-		), SPACE)),
-		REST_OF_LINE,
-		OPTIONAL(SPACE),
-		EOL
-		)
-	def value(self):
-		conffile = self[1]
-		options = []
-		eq = "="
-		if self[3] and "-s" in self[3].string: eq = " "
-		for opt in re.split("\s+", self[4].string):
-			k, v = opt.split("=", 1)
-			v = re.sub(r"\n+", "", fixup_tokens(v)) # not sure why newlines are getting doubled
-			options.append("%s%s%s" % (k, eq, v))
-		return "<div class='write-to'><div class='filename'>" + self[1].string + " <span>(change settings)</span></div><pre>" + "\n".join(cgi.escape(s) for s in options) + "</pre></div>\n"
-
-class CaptureOutput(Grammar):
-	grammar = OPTIONAL(SPACE), WORD("A-Za-z_"), L('=$('), REST_OF_LINE, L(")"), OPTIONAL(L(';')), EOL
-	def value(self):
-		cmd = self[3].string
-		cmd = cmd.replace("; ", "\n")
-		return "<div class='write-to'><div class='filename'>$" + self[1].string + "=</div><pre>" + cgi.escape(cmd) + "</pre></div>\n"
-
-class SedReplace(Grammar):
-	grammar = OPTIONAL(SPACE), L('sed -i "s/'), OPTIONAL(L('^')), ONE_OR_MORE(WORD("-A-Za-z0-9 #=\\{};.*$_!()")), L('/'), ONE_OR_MORE(WORD("-A-Za-z0-9 #=\\{};.*$_!()")), L('/"'), SPACE, FILENAME, EOL
-	def value(self):
-		return "<div class='write-to'><div class='filename'>edit<br>" + self[8].string + "</div><p>replace</p><pre>" + cgi.escape(self[3].string.replace(".*", ". . .")) + "</pre><p>with</p><pre>" + cgi.escape(self[5].string.replace("\\n", "\n").replace("\\t", "\t")) + "</pre></div>\n"
-
-class EchoPipe(Grammar):
-	grammar = OPTIONAL(SPACE), L("echo "), REST_OF_LINE, L(' | '), REST_OF_LINE, EOL
-	def value(self):
-		text = " ".join("\"%s\"" % s for s in self[2].string.split(" "))
-		return "<pre class='shell'><div>echo " + recode_bash(text) + " \<br> | " + recode_bash(self[4].string) + "</div></pre>\n"
-
-def shell_line(bash):
-	return "<pre class='shell'><div>" + recode_bash(bash.strip()) + "</div></pre>\n"
-
-class AptGet(Grammar):
-	grammar = (ZERO_OR_MORE(SPACE), L("apt_install "), REST_OF_LINE, EOL)
-	def value(self):
-		return shell_line("apt-get install -y " + re.sub(r"\s+", " ", self[2].string))
-class UfwAllow(Grammar):
-	grammar = (ZERO_OR_MORE(SPACE), L("ufw_allow "), REST_OF_LINE, EOL)
-	def value(self):
-		return shell_line("ufw allow " + self[2].string)
-class RestartService(Grammar):
-	grammar = (ZERO_OR_MORE(SPACE), L("restart_service "), REST_OF_LINE, EOL)
-	def value(self):
-		return shell_line("service " + self[2].string + " restart")
-
-class OtherLine(Grammar):
-	grammar = (REST_OF_LINE, EOL)
-	def value(self):
-		if self.string.strip() == "": return ""
-		if "source setup/functions.sh" in self.string: return ""
-		if "source /etc/mailinabox.conf" in self.string: return ""
-		return "<pre class='shell'><div>" + recode_bash(self.string.strip()) + "</div></pre>\n"
-
-class BashElement(Grammar):
-	grammar = Comment | CatEOF | EchoPipe | EchoLine | HideOutput | EditConf | SedReplace | AptGet | UfwAllow | RestartService | OtherLine
-	def value(self):
-		return self[0].value()
-
-# Make some special characters to private use Unicode code points.
-bash_special_characters1 = {
-	"\n": "\uE000",
-	" ": "\uE001",
-}
-bash_special_characters2 = {
-	"$": "\uE010",
-}
-bash_escapes = {
-	"n": "\uE020",
-	"t": "\uE021",
-}
-
-def quasitokenize(bashscript):
-	# Make a parse of bash easier by making the tokenization easy.
-	newscript = ""
-	quote_mode = None
-	escape_next = False
-	line_comment = False
-	subshell = 0
-	for c in bashscript:
-		if line_comment:
-			# We're in a comment until the end of the line.
-			newscript += c
-			if c == '\n':
-				line_comment = False
-		elif escape_next:
-			# Previous character was a \. Normally the next character
-			# comes through literally, but escaped newlines are line
-			# continuations and some escapes are for special characters
-			# which we'll recode and then turn back into escapes later.
-			if c == "\n":
-				c = " "
-			elif c in bash_escapes:
-				c = bash_escapes[c]
-			newscript += c
-			escape_next = False
-		elif c == "\\":
-			# Escaping next character.
-			escape_next = True
-		elif quote_mode is None and c in ('"', "'"):
-			# Starting a quoted word.
-			quote_mode = c
-		elif c == quote_mode:
-			# Ending a quoted word.
-			quote_mode = None
-		elif quote_mode is not None and quote_mode != "EOF" and c in bash_special_characters1:
-			# Replace special tokens within quoted words so that they
-			# don't interfere with tokenization later.
-			newscript += bash_special_characters1[c]
-		elif quote_mode is None and c == '#':
-			# Start of a line comment.
-			newscript += c
-			line_comment = True
-		elif quote_mode is None and c == ';' and subshell == 0:
-			# End of a statement.
-			newscript += "\n"
-		elif quote_mode is None and c == '(':
-			# Start of a subshell.
-			newscript += c
-			subshell += 1
-		elif quote_mode is None and c == ')':
-			# End of a subshell.
-			newscript += c
-			subshell -= 1
-		elif quote_mode is None and c == '\t':
-			# Make these just spaces.
-			if newscript[-1] != " ":
-				newscript += " "
-		elif quote_mode is None and c == ' ':
-			# Collapse consecutive spaces.
-			if newscript[-1] != " ":
-				newscript += " "
-		elif c in bash_special_characters2:
-			newscript += bash_special_characters2[c]
-		else:
-			# All other characters.
-			newscript += c
-
-		# "<< EOF" escaping.
-		if quote_mode is None and re.search("<<\s*EOF\n$", newscript):
-			quote_mode = "EOF"
-		elif quote_mode == "EOF" and re.search("\nEOF\n$", newscript):
-			quote_mode = None
-
-	return newscript
-
-def recode_bash(s):
-	def requote(tok):
-		tok = tok.replace("\\", "\\\\")
-		for c in bash_special_characters2:
-			tok = tok.replace(c, "\\" + c)
-		tok = fixup_tokens(tok)
-		if " " in tok or '"' in tok:
-			tok = tok.replace("\"", "\\\"")
-			tok = '"' + tok +'"'
-		else:
-			tok = tok.replace("'", "\\'")
-		return tok
-	return cgi.escape(" ".join(requote(tok) for tok in s.split(" ")))
-
-def fixup_tokens(s):
-	for c, enc in bash_special_characters1.items():
-		s = s.replace(enc, c)
-	for c, enc in bash_special_characters2.items():
-		s = s.replace(enc, c)
-	for esc, c in bash_escapes.items():
-		s = s.replace(c, "\\" + esc)
-	return s
-
-class BashScript(Grammar):
-	grammar = (OPTIONAL(HashBang), REPEAT(BashElement))
-	def value(self):
-		return [line.value() for line in self[1]]
-
-	@staticmethod
-	def parse(fn):
-		if fn in ("setup/functions.sh", "/etc/mailinabox.conf"): return ""
-		string = open(fn).read()
-
-		# tokenize
-		string = re.sub(".* #NODOC\n", "", string)
-		string = re.sub("\n\s*if .*then.*|\n\s*fi|\n\s*else|\n\s*elif .*", "", string)
-		string = quasitokenize(string)
-		string = re.sub("hide_output ", "", string)
-
-		parser = BashScript.parser()
-		result = parser.parse_string(string)
-
-		v = "<div class='row'><div class='col-xs-12 sourcefile'>view the bash source for the following section at <a href=\"%s\">%s</a></div></div>\n" \
-			 % ("https://github.com/mail-in-a-box/mailinabox/tree/master/" + fn, fn)
-
-		mode = 0
-		for item in result.value():
-			if item.strip() == "":
-				pass
-			elif item.startswith("<p") and not item.startswith("<pre"):
-				clz = ""
-				if mode == 2:
-					v += "</div>\n" # col
-					v += "</div>\n" # row
-					mode = 0
-					clz = "contd"
-				if mode == 0:
-					v += "<div class='row %s'>\n" % clz
-					v += "<div class='col-md-6 prose'>\n"
-				v += item
-				mode = 1
-			elif item.startswith("<h"):
-				if mode != 0:
-					v += "</div>\n" # col
-					v += "</div>\n" # row
-				v += "<div class='row'>\n"
-				v += "<div class='col-md-6 header'>\n"
-				v += item
-				v += "</div>\n" # col
-				v += "<div class='col-md-6 terminal'> </div>\n"
-				v += "</div>\n" # row
-				mode = 0
-			else:
-				if mode == 0:
-					v += "<div class='row'>\n"
-					v += "<div class='col-md-offset-6 col-md-6 terminal'>\n"
-				elif mode == 1:
-					v += "</div>\n"
-					v += "<div class='col-md-6 terminal'>\n"
-				mode = 2
-				v += item
-
-		v += "</div>\n" # col
-		v += "</div>\n" # row
-
-		v = fixup_tokens(v)
-
-		v = v.replace("</pre>\n<pre class='shell'>", "")
-		v = re.sub("<pre>([\w\W]*?)</pre>", lambda m : "<pre>" + strip_indent(m.group(1)) + "</pre>", v)
-
-		v = re.sub(r"(\$?)PRIMARY_HOSTNAME", r"<b>box.yourdomain.com</b>", v)
-		v = re.sub(r"\$STORAGE_ROOT", r"<b>$STORE</b>", v)
-		v = re.sub(r"\$CSR_COUNTRY", r"<b>US</b>", v)
-		v = v.replace("`pwd`",  "<code><b>/path/to/mailinabox</b></code>")
-
-		return v
-
-def wrap_lines(text, cols=60):
-	ret = ""
-	words = re.split("(\s+)", text)
-	linelen = 0
-	for w in words:
-		if linelen + len(w) > cols-1:
-			ret += " \\\n"
-			ret += "   "
-			linelen = 0
-		if linelen == 0 and w.strip() == "": continue
-		ret += w
-		linelen += len(w)
-	return ret
-
-if __name__ == '__main__':
-	generate_documentation()

tools/update-subresource-integrity.py

@@ -1,24 +0,0 @@
-#!/usr/bin/python3
-# Updates subresource integrity attributes in management/templates/index.html
-# to prevent CDN-hosted resources from being used as an attack vector. Run this
-# after updating the Bootstrap and jQuery <link> and <script> to compute the
-# appropriate hash and insert it into the template.
-
-import re, urllib.request, hashlib, base64
-
-fn = "management/templates/index.html"
-
-with open(fn, 'r') as f:
-	content = f.read()
-
-def make_integrity(url):
-	resource = urllib.request.urlopen(url).read()
-	return "sha256-" + base64.b64encode(hashlib.sha256(resource).digest()).decode('ascii')
-
-content = re.sub(
-	r'<(link rel="stylesheet" href|script src)="(.*?)" integrity="(.*?)"',
-	lambda m : '<' + m.group(1) + '="' + m.group(2) + '" integrity="' + make_integrity(m.group(2)) + '"',
-	content)
-
-with open(fn, 'w') as f:
-	f.write(content)

tools/webfinger.php

@@ -0,0 +1,42 @@
+<?php
+	$resource = $_GET['resource'];
+
+	// Parse our configuration file to get the STORAGE_ROOT.
+	$STORAGE_ROOT = NULL;
+	foreach (file("/etc/mailinabox.conf") as $line) {
+		$line = explode("=", rtrim($line), 2);
+		if ($line[0] == "STORAGE_ROOT") {
+			$STORAGE_ROOT = $line[1];
+		}
+	}
+	if ($STORAGE_ROOT == NULL) exit("no STORAGE_ROOT");
+
+	// Turn the resource into a file path. First URL-encode the resource
+	// so that it is filepath-safe.
+	$fn = urlencode($resource);
+
+	// Replace the first colon (it's URL-encoded) with a slash since we'll
+	// break off the files into scheme subdirectories.
+	$fn = preg_replace("/%3A/", "/", $fn, 1);
+
+	// Since this is often for email addresses, un-escape @-signs so they
+	// are not odd-looking. It's filename-safe anyway.
+	$fn = preg_replace("/%40/", "@", $fn);
+
+	// Combine with root path.
+	$fn = $STORAGE_ROOT . "/webfinger/" . $fn . ".json";
+
+	// See if the file exists.
+	if (!file_exists($fn)) {
+		header("HTTP/1.0 404 Not Found");
+		exit;
+	}
+
+	header("Content-type: application/json");
+	echo file_get_contents($fn);
+
+	//json_encode(array(
+	//	subject => $resource,
+	//), JSON_PRETTY_PRINT);
+?>
+