more dockerization work

[From @joshdata: This is part of @toilal's work in #377 and 1eb77c332b. The changes are:

* Separates out the runit configuration from starting Mail-in-a-Box setup so that Mail-in-a-Box setup does not block the starting of runit services and we can assume that runit is running during setup (i.e. we can restart services).
* Adds a SKIP_INSTALL flag so that the container can be restarted without re-running the whole Mail-in-a-Box setup.
* Made containers/docker/run more flexible.
* I'm also adding some "|| exit 0"s to the run script to stop if there are any docker errors.
* I'm also adding the prereqs installs from questions.sh into Dockerfile so we don't have to reinstall each time.

]

.editorconfig

@@ -1,30 +0,0 @@
-# EditorConfig helps developers define and maintain consistent
-# coding styles between different editors and IDEs
-# editorconfig.org
-
-root = true
-
-[*]
-indent_style = space
-indent_size = 4
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[Makefile]
-indent_style = tabs
-indent_size = 4
-
-[Vagrantfile]
-indent_size = 2
-
-[*.rb]
-indent_size = 2
-
-[*.py]
-indent_style = tabs
-
-[*.js]
-indent_size = 2
-

.gitignore

@@ -4,4 +4,3 @@ management/__pycache__/
 tools/__pycache__/
 externals/
 .env
-.vagrant

CHANGELOG.md

@@ -1,559 +1,18 @@
 CHANGELOG
 =========
 
-v0.28 (July 30, 2018)
----------------------
-
-System:
-
-* We now use EFF's `certbot` to provision TLS certificates (from Let's Encrypt) instead of our home-grown ACME library.
-
-Contacts/Calendar:
-
-* Fix for Mac OS X autoconfig of the calendar.
-
-Setup:
-
-* Installing Z-Push broke because of what looks like a change or problem in their git server HTTPS certificate. That's fixed.
-
-v0.27 (June 14, 2018)
----------------------
-
-Mail:
-
-* A report of box activity, including sent/received mail totals and logins by user, is now emailed to the box's administrator user each week.
-* Update Roundcube to version 1.3.6 and Z-Push to version 2.3.9.
-
-Control Panel:
-
-* We now use EFF's `certbot` tool to provision HTTPS certificates instead of our home-grown free_tls_certificates package.
-* The undocumented feature for proxying web requests to another server now sets X-Forwarded-For.
-
-v0.26c (February 13, 2018)
---------------------------
-
-Setup:
-
-* Upgrades from v0.21c (February 1, 2017) or earlier were broken because the intermediate versions of ownCloud used in setup were no longer available from ownCloud.
-* Some download errors had no output --- there is more output on error now.
-
-Control Panel:
-
-* The background service for the control panel was not restarting on updates, leaving the old version running. This was broken in v0.26 and is now fixed.
-* Installing your own TLS/SSL certificate had been broken since v0.24 because the new version of openssl became stricter about CSR generation parameters.
-* Fixed password length help text.
-
-Contacts/Calendar:
-
-* Upgraded Nextcloud from 12.0.3 to 12.0.5.
-
-v0.26b (January 25, 2018)
--------------------------
-
-* Fix new installations which broke at the step of asking for the user's desired email address, which was broken by v0.26's changes related to the control panel.
-* Fix the provisioning of TLS certificates by pinning a Python package we rely on (acme) to an earlier version because our code isn't yet compatible with its current version.
-* Reduce munin's log_level from debug to warning to prevent massive log files.
-
-v0.26 (January 18, 2018)
-------------------------
-
-Security:
-
-* HTTPS, IMAP, and POP's TLS settings have been updated to Mozilla's intermediate cipher list recommendation. Some extremely old devices that use less secure TLS ciphers may no longer be able to connect to IMAP/POP.
-* Updated web HSTS header to use longer six month duration.
-
-Mail:
-
-* Adding attachments in Roundcube broke after the last update for some users after rebooting because a temporary directory was deleted on reboot. The temporary directory is now moved from /tmp to /var so that it is persistent.
-* `X-Spam-Score` header is added to incoming mail.
-
-Control panel:
-
-* RSASHA256 is now used for DNSSEC for .lv domains.
-* Some documentation/links improvements.
-
-Installer:
-
-* We now run `apt-get autoremove` at the start of setup to clear out old packages, especially old kernels that take up a lot of space. On the first run, this step may take a long time.
-* We now fetch Z-Push from its tagged git repository, fixing an installation problem.
-* Some old PHP5 packages are removed from setup, fixing an installation bug where Apache would get installed.
-* Python 3 packages for the control panel are now installed using a virtualenv to prevent installation errors due to conflicts in the cryptography/openssl packages between OS-installed packages and pip-installed packages.
-
-v0.25 (November 15, 2017)
--------------------------
-
-This update is a security update addressing [CVE-2017-16651, a vulnerability in Roundcube webmail that allows logged-in users to access files on the local filesystem](https://roundcube.net/news/2017/11/08/security-updates-1.3.3-1.2.7-and-1.1.10).
-
-Mail:
-
-* Update to Roundcube 1.3.3.
-
-Control Panel:
-
-* Allow custom DNS records to be set for DNS wildcard subdomains (i.e. `*`).
-
-v0.24 (October 3, 2017)
------------------------
-
-System:
-
-* Install PHP7 via a PPA. Switch to the on-demand process manager.
-
-Mail:
-
-* Updated to [Roundcube 1.3.1](https://roundcube.net/news/2017/06/26/roundcube-webmail-1.3.0-released), but unfortunately dropping the Vacation plugin because it has not been supported by its author and is not compatible with Roundcube 1.3, and updated the persistent login plugin.
-* Updated to [Z-Push 2.3.8](http://download.z-push.org/final/2.3/z-push-2.3.8.txt).
-* Dovecot now uses stronger 2048 bit DH params for better forward secrecy.
-
-Nextcloud:
-
-* Nextcloud updated to 12.0.3, using PHP7.
-
-Control Panel:
-
-* Nameserver (NS) records can now be set on custom domains.
-* Fix an erroneous status check error due to IPv6 address formatting.
-* Aliases for administrative addresses can now be set to send mail to +tag administrative addresses.
-
-v0.23a (May 31, 2017)
----------------------
-
-Corrects a problem in the new way third-party assets are downloaded during setup for the control panel, since v0.23.
-
-v0.23 (May 30, 2017)
---------------------
-
-Mail:
-
-* The default theme for Roundcube was changed to the nicer Larry theme.
-* Exchange/ActiveSync support has been replaced with z-push 2.3.6 from z-push.org (rather than z-push-contrib).
-
-ownCloud (now Nextcloud):
-
-* ownCloud is replaced with Nextcloud 10.0.5.
-* Fixed an error in Owncloud/Nextcloud setup not updating domain when changing hostname.
-
-Control Panel/Management:
-
-* Fix an error in the control panel showing rsync backup status.
-* Fix an error in the control panel related to IPv6 addresses.
-* TLS certificates for internationalized domain names can now be provisioned from Let's Encrypt automatically.
-* Third-party assets used in the control panel (jQuery/Bootstrap) are now downloaded during setup and served from the box rather than from a CDN.
-
-DNS:
-
-* Add support for custom CAA records.
-
-v0.22 (April 2, 2017)
----------------------
-
-Mail:
-
-* The CardDAV plugin has been added to Roundcube so that your ownCloud contacts are available in webmail.
-* Upgraded to Roundcube 1.2.4 and updated the persistent login plugin.
-* Allow larger messages to be checked by SpamAssassin.
-* Dovecot's vsz memory limit has been increased proportional to system memory.
-* Newly set user passwords must be at least eight characters.
-
-ownCloud:
-
-* Upgraded to ownCloud 9.1.4.
-
-Control Panel/Management:
-
-* The status checks page crashed when the mailinabox.email website was down - that's fixed.
-* Made nightly re-provisioning of TLS certificates less noisy.
-* Fixed bugs in rsync backup method and in the list of recent backups.
-* Fixed incorrect status checks errors about IPv6 addresses.
-* Fixed incorrect status checks errors for secondary nameservers if round-robin custom A records are set.
-* The management mail_log.py tool has been rewritten.
-
-DNS:
-
-* Added support for DSA, ED25519, and custom SSHFP records.
-
-System:
-
-* The SSH fail2ban jail was not activated.
-
-Installation:
-
-* At the end of installation, the SHA256 -- rather than SHA1 -- hash of the system's TLS certificate is shown.
-
-v0.21c (February 1, 2017)
--------------------------
-
-Installations and upgrades started failing about 10 days ago with the error "ImportError: No module named 'packaging'" after an upstream package (Python's setuptools) was updated by its maintainers. The updated package conflicted with Ubuntu 14.04's version of another package (Python's pip). This update upgrades both packages to remove the conflict.
-
-If you already encountered the error during installation or upgrade of Mail-in-a-Box, this update may not correct the problem on your existing system. See https://discourse.mailinabox.email/t/v0-21c-release-fixes-python-package-installation-issue/1881 for help if the problem persists after upgrading to this version of Mail-in-a-Box.
-
-v0.21b (December 4, 2016)
--------------------------
-
-This update corrects a first-time installation issue introduced in v0.21 caused by the new Exchange/ActiveSync feature.
-
-v0.21 (November 30, 2016)
--------------------------
-
-This version updates ownCloud, which may include security fixes, and makes some other smaller improvements.
-
-Mail:
-
-* Header privacy filters were improperly running on the contents of forwarded email --- that's fixed.
-* We have another go at fixing a long-standing issue with training the spam filter (because of a file permissions issue).
-* Exchange/ActiveSync will now use your display name set in Roundcube in the From: line of outgoing email.
-
-ownCloud:
-
-* Updated ownCloud to version 9.1.1.
-
-Control panel:
-
-* Backups can now be made using rsync-over-ssh!
-* Status checks failed if the system doesn't support iptables or doesn't have ufw installed.
-* Added support for SSHFP records when sshd listens on non-standard ports.
-* Recommendations for TLS certificate providers were removed now that everyone mostly uses Let's Encrypt.
-
-System:
-
-* Ubuntu's "Upgrade to 16.04" notice is suppressed since you should not do that.
-* Lowered memory requirements to 512MB, display a warning if system memory is below 768MB.
-
-v0.20 (September 23, 2016)
---------------------------
-
-ownCloud:
-
-* Updated to ownCloud to 8.2.7.
-
-Control Panel:
-
-* Fixed a crash that occurs when there are IPv6 DNS records due to a bug in dnspython 1.14.0.
-* Improved the wonky low disk space check.
-
-v0.19b (August 20, 2016)
-------------------------
-
-This update corrects a security issue introduced in v0.18.
-
-* A remote code execution vulnerability is corrected in how the munin system monitoring graphs are generated for the control panel. The vulnerability involves an administrative user visiting a carefully crafted URL.
-
-v0.19a (August 18, 2016)
-------------------------
-
-This update corrects a security issue in v0.19.
-
-* fail2ban won't start if Roundcube had not yet been used - new installations probably do not have fail2ban running.
-
-v0.19 (August 13, 2016)
------------------------
-
-Mail:
-
-* Roundcube is updated to version 1.2.1.
-* SSLv3 and RC4 are now no longer supported in incoming and outgoing mail (SMTP port 25).
-
-Control panel:
-
-* The users and aliases APIs are now documented on their control panel pages.
-* The HSTS header was missing.
-* New status checks were added for the ufw firewall.
-
-DNS:
-
-* Add SRV records for CardDAV/CalDAV to facilitate autoconfiguration (e.g. in DavDroid, whose latest version didn't seem to work to configure with entering just a hostname).
-
-System:
-
-* fail2ban jails added for SMTP submission, Roundcube, ownCloud, the control panel, and munin.
-* Mail-in-a-Box can now be installed on the i686 architecture.
-
-v0.18c (June 2, 2016)
----------------------
-
-* Domain aliases (and misconfigured aliases/catch-alls with non-existent local targets) would accept mail and deliver it to new mailbox folders on disk even if the target address didn't correspond with an existing mail user, instead of rejecting the mail. This issue was introduced in v0.18.
-* The Munin Monitoring link in the control panel now opens a new window.
-* Added an undocumented before-backup script.
-
-v0.18b (May 16, 2016)
----------------------
-
-* Fixed a Roundcube user accounts issue introduced in v0.18.
-
-v0.18 (May 15, 2016)
---------------------
-
-ownCloud:
-
-* Updated to ownCloud to 8.2.3
-
-Mail:
-
-* Roundcube is updated to version 1.1.5 and the Roundcube login screen now says "[hostname] Webmail" instead of "Mail-in-a-Box/Roundcube webmail".
-* Fixed a long-standing issue with training the spam filter not working (because of a file permissions issue).
-
-Control panel:
-
-* Munin system monitoring graphs are now zoomable.
-* When a reboot is required (due to Ubuntu security updates automatically installed), a Reboot Box button now appears on the System Status Checks page of the control panel.
-* It is now possible to add SRV and secondary MX records in the Custom DNS page.
-* Other minor fixes.
-
-System:
-
-* The fail2ban recidive jail, which blocks long-duration brute force attacks, now no longer sends the administrator emails (which were not helpful).
-
-Setup:
-
-* The system hostname is now set during setup.
-* A swap file is now created if system memory is less than 2GB, 5GB of free disk space is available, and if no swap file yet exists.
-* We now install Roundcube from the official GitHub repository instead of our own mirror, which we had previously created to solve problems with SourceForge.
-* DKIM was incorrectly set up on machines where "localhost" was defined as something other than "127.0.0.1".
-
-v0.17c (April 1, 2016)
-----------------------
-
-This update addresses some minor security concerns and some installation issues.
-
-ownCoud:
-
-* Block web access to the configuration parameters (config.php). There is no immediate impact (see [#776](https://github.com/mail-in-a-box/mailinabox/pull/776)), although advanced users may want to take note.
-
-Mail:
-
-* Roundcube html5_notifier plugin updated from version 0.6 to 0.6.2 to fix Roundcube getting stuck for some people.
-
-Control panel:
-
-* Prevent click-jacking of the management interface by adding HTTP headers.
-* Failed login no longer reveals whether an account exists on the system.
-
-Setup:
-
-* Setup dialogs did not appear correctly when connecting to SSH using Putty on Windows.
-* We now install Roundcube from our own mirror because Sourceforge's downloads experience frequent intermittant unavailability.
-
-v0.17b (March 1, 2016)
-----------------------
-
-ownCloud moved their source code to a new location, breaking our installation script.
-
-v0.17 (February 25, 2016)
--------------------------
-
-Mail:
-
-* Roundcube updated to version 1.1.4.
-* When there's a problem delivering an outgoing message, a new 'warning' bounce will come after 3 hours and the box will stop trying after 2 days (instead of 5).
-* On multi-homed machines, Postfix now binds to the right network interface when sending outbound mail so that SPF checks on the receiving end will pass.
-* Mail sent from addresses on subdomains of other domains hosted by this box would not be DKIM-signed and so would fail DMARC checks by recipients, since version v0.15.
-
-Control panel:
-
-* TLS certificate provisioning would crash if DNS propagation was in progress and a challenge failed; might have shown the wrong error when provisioning fails.
-* Backup times were displayed with the wrong time zone.
-* Thresholds for displaying messages when the system is running low on memory have been reduced from 30% to 20% for a warning and from 15% to 10% for an error.
-* Other minor fixes.
-
-System:
-
-* Backups to some AWS S3 regions broke in version 0.15 because we reverted the version of boto. That's now fixed.
-* On low-usage systems, don't hold backups for quite so long by taking a full backup more often.
-* Nightly status checks might fail on systems not configured with a default Unicode locale.
-* If domains need a TLS certificate and the user hasn't installed one yet using Let's Encrypt, the administrator would get a nightly email with weird interactive text asking them to agree to Let's Encrypt's ToS. Now just say that the provisioning can't be done automatically.
-* Reduce the number of background processes used by the management daemon to lower memory consumption.
-
-Setup:
-
-* The first screen now warns users not to install on a machine used for other things.
-
-v0.16 (January 30, 2016)
-------------------------
-
-This update primarily adds automatic SSL (now "TLS") certificate provisioning from Let's Encrypt (https://letsencrypt.org/).
-
-Control Panel:
-
-* The SSL certificates (now referred to as "TLS ccertificates") page now supports provisioning free certificates from Let's Encrypt.
-* Report free memory usage.
-* Fix a crash when the git directory is not checked out to a tag.
-* When IPv6 is enabled, check that all domains (besides the system hostname) resolve over IPv6.
-* When a domain doesn't resolve to the box, don't bother checking if the TLS certificate is valid.
-* Remove rounded border on the menu bar.
-
-Other:
-
-* The Sieve port is now open so tools like the Thunderbird Sieve extension can be used to edit mail filters.
-* .be domains now offer DNSSEC options supported by the TLD
-* The daily backup will now email the administrator if there is a problem.
-* Expiring TLS certificates are now automatically renewed via Let's Encrypt.
-* File ownership for installed Roundcube files is fixed.
-* Typos fixed.
-
-v0.15a (January 9, 2016)
-------------------------
-
-Mail:
-
-* Sending mail through Exchange/ActiveSync (Z-Push) had been broken since v0.14 in some setups. This is now fixed.
-
-v0.15 (January 1, 2016)
------------------------
-
-Mail:
-
-* Updated Roundcube to version 1.1.3.
-* Auto-create aliases for abuse@, as required by RFC2142.
-* The DANE TLSA record is changed to use the certificate subject public key rather than the whole certificate, which means the record remains valid after certificate changes (so long as the private key remains the same, which it does for us).
-
-Control panel:
-
-* When IPv6 is enabled, check that system services are accessible over IPv6 too, that the box's hostname resolves over IPv6, and that reverse DNS is setup correctly for IPv6.
-* Explanatory text for setting up secondary nameserver is added/fixed.
-* DNS checks now have a timeout in case a DNS server is not responding, so the checks don't stall indefinitely.
-* Better messages if external DNS is used and, weirdly, custom secondary nameservers are set.
-* Add POP to the mail client settings documentation.
-* The box's IP address is added to the fail2ban whitelist so that the status checks don't trigger the machine banning itself, which results in the status checks showing services down even though they are running.
-* For SSL certificates, rather than asking you what country you are in during setup, ask at the time a CSR is generated. The default system self-signed certificate now omits a country in the subject (it was never needed). The CSR_COUNTRY Mail-in-a-Box setting is dropped entirely.
-
-System:
-
-* Nightly backups and system status checks are now moved to 3am in the system's timezone.
-* fail2ban's recidive jail is now active, which guards against persistent brute force login attacks over long periods of time.
-* Setup (first run only) now asks for your timezone to set the system time.
-* The Exchange/ActiveSync server is now taken offline during nightly backups (along with SMTP and IMAP).
-* The machine's random number generator (/dev/urandom) is now seeded with Ubuntu Pollinate and a blocking read on /dev/random.
-* DNSSEC key generation during install now uses /dev/urandom (instead of /dev/random), which is faster.
-* The $STORAGE_ROOT/ssl directory is flattened by a migration script and the system SSL certificate path is now a symlink to the actual certificate.
-* If ownCloud sends out email, it will use the box's administrative address now (admin@yourboxname).
-* Z-Push (Exchange/ActiveSync) logs now exclude warnings and are now rotated to save disk space.
-* Fix pip command that might have not installed all necessary Python packages.
-* The control panel and backup would not work on Google Compute Engine because GCE installs a conflicting boto package.
-* Added a new command `management/backup.py --restore` to restore files from a backup to a target directory (command line arguments are passed to `duplicity restore`).
-
-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.
+In Development
+--------------
 
 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.
@@ -561,13 +20,10 @@ DNS:
 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.
+* ownCloud updated to version 8.0.4.
 
 
 v0.10 (June 1, 2015)
@@ -800,7 +256,7 @@ v0.02 (September 21, 2014)
 * 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
+* 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.
@@ -809,4 +265,4 @@ v0.02 (September 21, 2014)
 v0.01 (August 19, 2014)
 -----------------------
 
-First versioned release after a year of unversioned development.
+First release.

CODE_OF_CONDUCT.md

@@ -1,48 +0,0 @@
-# Mail-in-a-Box Code of Conduct
-
-Mail-in-a-Box is an open source community project about working, as a group, to empower ourselves and others to have control over our own digital communications. Just as we hope to increase technological diversity on the Internet through decentralization, we also believe that diverse viewpoints and voices among our community members foster innovation and creative solutions to the challenges we face.
-
-We are committed to providing a safe, welcoming, and harrassment-free space for collaboration, for everyone, without regard to age, disability, economic situation, ethnicity, gender identity and expression, language fluency, level of knowledge or experience, nationality, personal appearance, race, religion, sexual identity and orientation, or any other attribute. Community comes first. This policy supersedes all other project goals.
-
-The maintainers of Mail-in-a-Box share the dual responsibility of leading by example and enforcing these policies as necessary to maintain an open and welcoming environment. All community members should be excellent to each other.
-
-## Scope
-
-This Code of Conduct applies to all places where Mail-in-a-Box community activity is ocurring, including on GitHub, in discussion forums, on Slack, on social media, and in real life. The Code of Conduct applies not only on websites/at events run by the Mail-in-a-Box community (e.g. our GitHub organization, our Slack team) but also at any other location where the Mail-in-a-Box community is present (e.g. in issues of other GitHub organizations where Mail-in-a-Box community members are discussing problems related to Mail-in-a-Box, or real-life professional conferences), or whenever a Mail-in-a-Box community member is representing Mail-in-a-Box to the public at large or acting on behalf of Mail-in-a-Box.
-
-This code does not apply to activity on a server running Mail-in-a-Box software, unless your server is hosting a service for the Mail-in-a-Box community at large.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Showing empathy towards other community members
-* Making room for new and quieter voices
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or advances
-* Trolling, insulting/derogatory/unwelcome comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
-* Aggressive and micro-aggressive behavior, such as unconstructive criticism, providing corrections that do not improve the conversation (sometimes referred to as "well actually"s), repeatedly interrupting or talking over someone else, feigning surprise at someone's lack of knowledge or awareness about a topic, or subtle prejudice (for example, comments like "That's so easy my grandmother could do it.", which is prejudicial toward grandmothers).
-* Other conduct which could reasonably be considered inappropriate in a professional setting
-* Retaliating against anyone who reports a violation of this code.
-
-We will not tolerate harassment. Harassment is any unwelcome or hostile behavior towards another person for any reason. This includes, but is not limited to, offensive verbal comments related to personal characteristics or choices, sexual images or comments, deliberate intimidation, bullying, stalking, following, harassing photography or recording, sustained disruption of discussion or events, nonconsensual publication of private comments, inappropriate physical contact, or unwelcome sexual attention. Conduct need not be intentional to be harassment.
-
-## Enforcement
-
-We will remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not consistent with this Code of Conduct. We may ban, temporarily or permanently, any contributor for violating this code, when appropriate.
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project lead, [Joshua Tauberer](https://razor.occams.info/). All reports will be treated confidentially, impartially, consistently, and swiftly.
-
-Because the need for confidentiality for all parties involved in an enforcement action outweighs the goals of openness, limited information will be shared with the Mail-in-a-Box community regarding enforcement actions that have taken place.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant, version 1.4](http://contributor-covenant.org/version/1/4) and the code of conduct of [Code for DC](http://codefordc.org/resources/codeofconduct.html).
-

CONTRIBUTING.md

@@ -1,50 +1,3 @@
-# Contributing
-
-Mail-in-a-Box is an open source project. Your contributions and pull requests are welcome.
-
-## Development
-
-To start developing Mail-in-a-Box, [clone the repository](https://github.com/mail-in-a-box/mailinabox) and familiarize yourself with the code.
-
-    $ git clone https://github.com/mail-in-a-box/mailinabox
-
-### Vagrant and VirtualBox
-
-We recommend you use [Vagrant](https://www.vagrantup.com/intro/getting-started/install.html) and [VirtualBox](https://www.virtualbox.org/wiki/Downloads) for development. Please install them first.
-
-With Vagrant set up, the following should boot up Mail-in-a-Box inside a virtual machine:
-
-    $ vagrant up --provision
-
-_If you're seeing an error message about your *IP address being listed in the Spamhaus Block List*, simply uncomment the `export SKIP_NETWORK_CHECKS=1` line in `Vagrantfile`. It's normal, you're probably using a dynamic IP address assigned by your Internet provider–they're almost all listed._
-
-### Modifying your `hosts` file
-
-After a while, Mail-in-a-Box will be available at `192.168.50.4` (unless you changed that in your `Vagrantfile`). To be able to use the web-based bits, we recommend to add a hostname to your `hosts` file:
-
-    $ echo "192.168.50.4 mailinabox.lan" | sudo tee -a /etc/hosts
-
-You should now be able to navigate to https://mailinabox.lan/admin using your browser. There should be an initial admin user with the name `me@mailinabox.lan` and the password `12345678`.
-
-### Making changes
-
-Your working copy of Mail-in-a-Box will be mounted inside your VM at `/vagrant`. Any change you make locally will appear inside your VM automatically.
-
-Running `vagrant up --provision` again will repeat the installation with your modifications.
-
-Alternatively, you can also ssh into the VM using:
-
-    $ vagrant ssh
-
-Once inside the VM, you can re-run individual parts of the setup like in this example:
-
-    vm$ cd /vagrant
-    vm$ sudo setup/owncloud.sh # replace with script you'd like to re-run
-
-### Tests
-
-Mail-in-a-Box needs more tests. If you're still looking for a way to help out, writing and contributing tests would be a great start!
-
 ## Public domain
 
 This project is in the public domain. Copyright and related rights in the work worldwide are waived through the [CC0 1.0 Universal public domain dedication][CC0]. See the LICENSE file in this directory.
@@ -52,7 +5,3 @@ This project is in the public domain. Copyright and related rights in the work w
 All contributions to this project must be released under the same CC0 wavier. By submitting a pull request or patch, you are agreeing to comply with this waiver of copyright interest.
 
 [CC0]: http://creativecommons.org/publicdomain/zero/1.0/
-
-## Code of Conduct
-
-This project has a [Code of Conduct](CODE_OF_CONDUCT.md). Please review it when joining our community.

Dockerfile

@@ -0,0 +1,57 @@
+# Mail-in-a-Box Dockerfile
+###########################
+#
+# This file lets Mail-in-a-Box run inside of Docker (https://docker.io),
+# a virtualization/containerization manager.
+#
+# Run:
+#   $ containers/docker/run.sh
+# to build the image, launch a storage container, and launch a Mail-in-a-Box
+# container.
+#
+###########################################
+
+# We need a better starting image than docker's ubuntu image because that
+# base image doesn't provide enough to run most Ubuntu services. See
+# http://phusion.github.io/baseimage-docker/ for an explanation.
+
+FROM phusion/baseimage:0.9.16
+
+# Dockerfile metadata.
+MAINTAINER Joshua Tauberer (http://razor.occams.info)
+EXPOSE 25 53/udp 53/tcp 80 443 587 993 4190
+VOLUME /home/user-data
+
+# Use baseimage's init system. A correct init process is required for
+# process #1 in order to have a functioning Linux system.
+CMD ["/sbin/my_init"]
+
+# Create the user-data user, so the start script doesn't have to.
+RUN useradd -m user-data
+
+# Docker has a beautiful way to cache images after each step. The next few
+# steps of installing system packages are very intensive, so we take care
+# of them early and let docker cache the image after that, before doing
+# any Mail-in-a-Box specific system configuration. That makes rebuilds
+# of the image extremely fast.
+
+# Update system packages.
+RUN apt-get update
+RUN DEBIAN_FRONTEND=noninteractive apt-get upgrade -y
+
+# Install packages needed by Mail-in-a-Box.
+ADD containers/docker/apt_package_list.txt /tmp/mailinabox_apt_package_list.txt
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y $(cat /tmp/mailinabox_apt_package_list.txt)
+
+# from questions.sh -- needs merging into the above line
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y dialog python3 python3-pip
+RUN pip3 install "email_validator==0.1.0-rc4"
+
+# Now add Mail-in-a-Box to the system.
+ADD . /usr/local/mailinabox
+
+# Configure runit services.
+RUN /usr/local/mailinabox/containers/docker/tools/configure_services.sh
+
+# Add my_init scripts
+ADD containers/docker/my_init.d/* /etc/my_init.d/

README.md

@@ -9,89 +9,67 @@ Mail-in-a-Box helps individuals take back control of their email by defining a o
 
 * * *
 
-Our goals are to:
+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](https://sharknet.us/2014/02/01/automated-configuration-management-challenges-with-idempotency/) configuration.
+* 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.
 
-Additionally, this project has a [Code of Conduct](CODE_OF_CONDUCT.md), which supersedes the goals above. Please review it when joining our community.
+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.
 
-It is a one-click email appliance. There are no user-configurable setup options. It "just works".
+It is a one-click email appliance (see the [setup guide](https://mailinabox.email/guide.html)). There are no user-configurable setup options. It "just works".
 
 The components installed are:
 
-* SMTP ([postfix](http://www.postfix.org/)), IMAP ([dovecot](http://dovecot.org/)), CardDAV/CalDAV ([Nextcloud](https://nextcloud.com/)), Exchange ActiveSync ([z-push](http://z-push.org/))
+* 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))
 * 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](https://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/))
+* 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
+* 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:
 
 * A control panel and API for adding/removing mail users, aliases, custom DNS records, etc. and detailed system monitoring.
-* 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.
+* Our own builds of postgrey and dovecot-lucene 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).
 
-Installation
+The Security
 ------------
 
-See the [setup guide](https://mailinabox.email/guide.html) for detailed, user-friendly instructions.
+See the [security guide](security.md) for more information about the box's security configuration (TLS, password storage, etc).
 
-For experts, start with a completely fresh (really, I mean it) Ubuntu 14.04 LTS 64-bit machine. On the machine...
-
-Clone this repository:
-
-	$ 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:
+I sign the release tags on git. To verify that a tag is signed by me, you can perform the following steps:
 
+	# Download my PGP key.
 	$ 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.28
+	# Clone this repository.
+	$ git clone https://github.com/mail-in-a-box/mailinabox
+	$ cd mailinabox
+
+	# Verify the tag.
+	$ git verify-tag v0.10
 	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 matches 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.28
-
-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.
-
-Contributing and Development
-----------------------------
-
-Mail-in-a-Box is an open source project. Your contributions and pull requests are welcome. See [CONTRIBUTING](CONTRIBUTING.md) to get started. 
-
+The key ID and fingerprint above should match my [Keybase.io key](https://keybase.io/joshdata) and the fingerprint I publish on [my homepage](https://razor.occams.info/).
 
 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/sovereign/sovereign) by Alex Payne, and conversations with <a href="https://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>.
+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).
 
@@ -101,5 +79,4 @@ 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, [May](https://news.ycombinator.com/item?id=9624267) 2015, and [November](https://news.ycombinator.com/item?id=13050500) 2016.
-* FastCompany mentioned Mail-in-a-Box a [roundup of privacy projects](http://www.fastcompany.com/3047645/your-own-private-cloud) on June 26, 2015.
+* 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.

Vagrantfile

@@ -5,30 +5,24 @@ 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"
 
-  if Vagrant.has_plugin?("vagrant-cachier")
-    # Configure cached packages to be shared between instances of the same base box.
-    # More info on http://fgrehm.viewdocs.io/vagrant-cachier/usage
-    config.cache.scope = :box
-  end
-
   # Network config: Since it's a mail server, the machine must be connected
   # to the public web. However, we currently don't want to expose SSH since
   # the machine's box will let anyone log into it. So instead we'll put the
   # machine on a private network.
-  config.vm.hostname = "mailinabox.lan"
+  config.vm.hostname = "mailinabox"
   config.vm.network "private_network", ip: "192.168.50.4"
 
   config.vm.provision :shell, :inline => <<-SH
-  # Set environment variables so that the setup script does
-  # not ask any questions during provisioning. We'll let the
-  # machine figure out its own public IP.
-  #
-  # Please note: NONINTERACTIVE=1 mode means that you'll automatically agree
-  # to Let's Encrypt's ACME Subscriber Agreement.
+	# Set environment variables so that the setup script does
+	# not ask any questions during provisioning. We'll let the
+	# 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
+    export PRIMARY_HOSTNAME=auto-easy
+    export CSR_COUNTRY=US
     #export SKIP_NETWORK_CHECKS=1
 
     # Start the setup script.

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/filter.d/miab-management-daemon.conf

@@ -1,12 +0,0 @@
-# Fail2Ban filter Mail-in-a-Box management daemon
-
-[INCLUDES]
-
-before = common.conf
-
-[Definition]
-
-_daemon = mailinabox
-
-failregex = Mail-in-a-Box Management Daemon: Failed login attempt from ip <HOST> - timestamp .*
-ignoreregex =

conf/fail2ban/filter.d/miab-munin.conf

@@ -1,7 +0,0 @@
-[INCLUDES]
-
-before = common.conf
-
-[Definition]
-failregex=<HOST> - .*GET /admin/munin/.* HTTP/1.1\" 401.*
-ignoreregex =

conf/fail2ban/filter.d/miab-owncloud.conf

@@ -1,7 +0,0 @@
-[INCLUDES]
-
-before = common.conf
-
-[Definition]
-failregex=Login failed: .*Remote IP: '<HOST>[\)']
-ignoreregex =

conf/fail2ban/filter.d/miab-postfix-submission.conf

@@ -1,7 +0,0 @@
-[INCLUDES]
-
-before = common.conf
-
-[Definition]
-failregex=postfix/submission/smtpd.*warning.*\[<HOST>\]: .* authentication (failed|aborted)
-ignoreregex =

conf/fail2ban/filter.d/miab-roundcube.conf

@@ -1,9 +0,0 @@
-[INCLUDES]
-
-before = common.conf
-
-[Definition]
-
-failregex = IMAP Error: Login failed for .*? from <HOST>\. AUTHENTICATE.*
-
-ignoreregex = 

conf/fail2ban/jail.local

@@ -0,0 +1,34 @@
+# Fail2Ban configuration file.
+# For Mail-in-a-Box
+[DEFAULT]
+
+# bantime in seconds
+bantime  = 60
+
+# This should ban dumb brute-force attacks, not oblivious users.
+findtime = 30
+maxretry = 20
+
+#
+# JAILS
+#
+
+[ssh]
+
+enabled  = true
+logpath  = /var/log/auth.log
+maxretry = 20
+
+[ssh-ddos]
+
+enabled  = true
+maxretry = 20
+
+[sasl]
+
+enabled  = true
+
+[dovecot]
+
+enabled = true
+filter  = dovecotimap

conf/fail2ban/jails.conf

@@ -1,81 +0,0 @@
-# Fail2Ban configuration file for Mail-in-a-Box. Do not edit.
-# This file is re-generated on updates.
-
-[DEFAULT]
-# Whitelist our own IP addresses. 127.0.0.1/8 is the default. But our status checks
-# ping services over the public interface so we should whitelist that address of
-# ours too. The string is substituted during installation.
-ignoreip = 127.0.0.1/8 PUBLIC_IP
-
-[dovecot]
-enabled = true
-filter  = dovecotimap
-logpath = /var/log/mail.log
-findtime = 30
-maxretry = 20
-
-[miab-management]
-enabled = true
-filter = miab-management-daemon
-port = http,https
-logpath = /var/log/syslog
-maxretry = 20
-findtime = 30
-
-[miab-munin]
-enabled  = true
-port     = http,https
-filter   = miab-munin
-logpath  = /var/log/nginx/access.log
-maxretry = 20
-findtime = 30
-
-[miab-owncloud]
-enabled  = true
-port     = http,https
-filter   = miab-owncloud
-logpath  = STORAGE_ROOT/owncloud/nextcloud.log
-maxretry = 20
-findtime = 120
-
-[miab-postfix587]
-enabled  = true
-port     = 587
-filter   = miab-postfix-submission
-logpath  = /var/log/mail.log
-maxretry = 20
-findtime = 30
-
-[miab-roundcube]
-enabled  = true
-port     = http,https
-filter   = miab-roundcube
-logpath  = /var/log/roundcubemail/errors
-maxretry = 20
-findtime = 30
-
-[recidive]
-enabled  = true
-maxretry = 10
-action   = iptables-allports[name=recidive]
-# In the recidive section of jail.conf the action contains:
-#
-# action   = iptables-allports[name=recidive]
-#            sendmail-whois-lines[name=recidive, logpath=/var/log/fail2ban.log]
-#
-# The last line on the action will sent an email to the configured address. This mail will
-# notify the administrator that someone has been repeatedly triggering one of the other jails.
-# By default we don't configure this address and no action is required from the admin anyway.
-# So the notification is ommited. This will prevent message appearing in the mail.log that mail
-# can't be delivered to fail2ban@$HOSTNAME.
-
-[sasl]
-enabled  = true
-
-[ssh]
-enabled = true
-maxretry = 7
-bantime = 3600
-
-[ssh-ddos]
-enabled  = true

conf/ios-profile.xml

@@ -18,6 +18,8 @@
       <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>

conf/management-initscript

@@ -14,7 +14,7 @@
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="Mail-in-a-Box Management Daemon"
 NAME=mailinabox
-DAEMON=/usr/local/lib/mailinabox/start
+DAEMON=/usr/local/bin/mailinabox-daemon
 PIDFILE=/var/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
 
@@ -27,9 +27,9 @@ 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. Set also
+# 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) and management/daily_tasks.sh.
+# already present).
 export LANGUAGE=en_US.UTF-8
 export LC_ALL=en_US.UTF-8
 export LANG=en_US.UTF-8

conf/nginx-alldomains.conf

@@ -55,7 +55,7 @@
 		# file upload limit to match the corresponding Postfix limit.
 		client_max_body_size 128M;
 	}
-	location ~* ^/autodiscover/autodiscover.xml$ {
+	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";
@@ -70,7 +70,7 @@
 	# 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 Nextcloud (which serves user-uploaded files that might
+	# 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;

conf/nginx-primaryonly.conf

@@ -1,31 +1,22 @@
 	# 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'.
-	location /admin/assets {
-		alias /usr/local/lib/mailinabox/vendor/assets;
-	}
 	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;
-		add_header X-Frame-Options "DENY";
-		add_header X-Content-Type-Options nosniff;
-		add_header Content-Security-Policy "frame-ancestors 'none';";
 	}
 
-	# Nextcloud configuration.
+	# 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 ~ ^/cloud/(build|tests|config|lib|3rdparty|templates|data|README)/ {
-	 		deny all;
-	 	}
-	 	location ~ ^/cloud/(?:\.|autotest|occ|issue|indie|db_|console) {
-	 		deny all;
+		location ~ ^/(data|config|\.ht|db_structure\.xml|README) {
+			deny all;
 	 	}
 	}
 	location ~ ^(/cloud)((?:/ocs)?/[^/]+\.php)(/.*)?$ {
@@ -43,11 +34,13 @@
 		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. Nextcloud sends the full file
+		# 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.
@@ -57,7 +50,7 @@
 	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;
+		proxy_pass https://$HOSTNAME/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;

conf/nginx-ssl.conf

@@ -1,5 +1,5 @@
-# from https://gist.github.com/konklone/6532544 and https://mozilla.github.io/server-side-tls/ssl-config-generator/
-###################################################################################################################
+# from: https://gist.github.com/konklone/6532544
+###################################################################################
 
 # Basically the nginx configuration I use at konklone.com. 
 # I check it using https://www.ssllabs.com/ssltest/analyze.html?d=konklone.com
@@ -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
-# preload version.
-#add_header Strict-Transport-Security max-age=31536000;
+add_header Strict-Transport-Security max-age=31536000;
 
 # Prefer certain ciphersuites, to enforce Forward Secrecy and avoid known vulnerabilities.
 # 
@@ -27,18 +25,18 @@
 # 
 # Reference client: https://www.ssllabs.com/ssltest/analyze.html
 ssl_prefer_server_ciphers on;
-ssl_ciphers 'ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS';
+ssl_ciphers 'kEECDH+ECDSA+AES128 kEECDH+ECDSA+AES256 kEECDH+AES128 kEECDH+AES256 kEDH+AES128 kEDH+AES256 DES-CBC3-SHA +SHA !aNULL !eNULL !LOW !MD5 !EXP !DSS !PSK !SRP !kECDH !CAMELLIA !RC4 !SEED';
 
 # Cut out (the old, broken) SSLv3 entirely. 
 # This **excludes IE6 users** and (apparently) Yandexbot.
 # Just comment out if you need to support IE6, bless your soul.
 ssl_protocols TLSv1.2 TLSv1.1 TLSv1;
 
-# Turn on session resumption, using a cache shared across nginx processes,
+# Turn on session resumption, using a 10 min cache shared across nginx processes,
 # as recommended by http://nginx.org/en/docs/http/configuring_https_servers.html
-ssl_session_cache shared:SSL:50m;
-ssl_session_timeout 1d;
-#keepalive_timeout   70; # in Ubuntu 14.04/nginx 1.4.6 the default is 65, so plenty good
+ssl_session_cache   shared:SSL:10m;
+ssl_session_timeout 10m;
+keepalive_timeout   70;
 
 # Buffer size of 1400 bytes fits in one MTU.
 # nginx 1.5.9+ ONLY
@@ -71,6 +69,6 @@ ssl_dhparam STORAGE_ROOT/ssl/dh2048.pem;
 # 8.8.8.8 and 8.8.4.4 below are Google's public IPv4 DNS servers. 
 # nginx will use them to talk to the CA.
 ssl_stapling on;
-ssl_stapling_verify on;
+ssl_stapling_verify off;
 resolver 127.0.0.1 valid=86400;
 resolver_timeout 10;

conf/nginx-top.conf

@@ -7,6 +7,6 @@
 ##       your own --- please do not ask for help from us.
 
 upstream php-fpm {
-	server unix:/var/run/php/php7.0-fpm.sock;
+	server unix:/var/run/php5-fpm.sock;
 }
 

conf/nginx.conf

@@ -1,8 +1,6 @@
 ## $HOSTNAME
 
-# Redirect all HTTP to HTTPS *except* the ACME challenges (Let's Encrypt TLS certificate
-# domain validation challenges) path, which must be served over HTTP per the ACME spec
-# (due to some Apache vulnerability).
+# Redirect all HTTP to HTTPS.
 server {
 	listen 80;
 	listen [::]:80;
@@ -14,19 +12,10 @@ server {
 	# error pages and in the "Server" HTTP-Header.
 	server_tokens off;
 
-	location / {
-		# 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;
-	}
-
-	location /.well-known/acme-challenge/ {
-		# This path must be served over HTTP for ACME domain validation.
-		# We map this to a special path where our TLS cert provisioning
-		# tool knows to store challenge response files.
-		alias $STORAGE_ROOT/ssl/lets_encrypt/webroot/.well-known/acme-challenge/;
-	}
+	# 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.
@@ -42,6 +31,7 @@ server {
 
 	ssl_certificate $SSL_CERTIFICATE;
 	ssl_certificate_key $SSL_KEY;
+	include /etc/nginx/nginx-ssl.conf;
 
 	# ADDITIONAL DIRECTIVES HERE
 }

conf/postfix_outgoing_mail_header_filters

@@ -1,7 +1,7 @@
 # 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

conf/zpush/autodiscover_config.php

@@ -5,12 +5,11 @@
 * Descr     :   Autodiscover configuration file
 ************************************************/
 
-define('TIMEZONE', '');
-
 // Defines the base path on the server
 define('BASE_PATH', dirname($_SERVER['SCRIPT_FILENAME']). '/');
 
-define('ZPUSH_HOST', 'PRIMARY_HOSTNAME');
+// The Z-Push server location for the autodiscover response
+define('SERVERURL', 'https://PRIMARY_HOSTNAME/Microsoft-Server-ActiveSync');
 
 define('USE_FULLEMAIL_FOR_LOGIN', true);
 
@@ -19,7 +18,6 @@ define('LOGFILE', LOGFILEDIR . 'autodiscover.log');
 define('LOGERRORFILE', LOGFILEDIR . 'autodiscover-error.log');
 define('LOGLEVEL', LOGLEVEL_INFO);
 define('LOGUSERLEVEL', LOGLEVEL);
-$specialLogUsers = array();
 
 // the backend data provider
 define('BACKEND_PROVIDER', 'BackendCombined');

conf/zpush/backend_caldav.php

@@ -5,12 +5,10 @@
 * Descr     :   CalDAV backend configuration file
 ************************************************/
 
-define('CALDAV_PROTOCOL', 'https');
-define('CALDAV_SERVER', '127.0.0.1');
+define('CALDAV_SERVER', 'https://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);
+define('CALDAV_PERSONAL', '');
+define('CALDAV_SUPPORTS_SYNC', true);
 
 ?>

conf/zpush/backend_carddav.php

@@ -7,7 +7,7 @@
 
 
 define('CARDDAV_PROTOCOL', 'https'); /* http or https */
-define('CARDDAV_SERVER', '127.0.0.1');
+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 */
@@ -17,7 +17,7 @@ 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, Nextcloud and SOGo don't
+// 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);

conf/zpush/backend_imap.php

@@ -5,37 +5,19 @@
 * Descr     :   IMAP backend configuration file
 ************************************************/
 
-define('IMAP_SERVER', '127.0.0.1');
+define('IMAP_SERVER', 'localhost');
 define('IMAP_PORT', 993);
 define('IMAP_OPTIONS', '/ssl/norsh/novalidate-cert');
-define('IMAP_DEFAULTFROM', 'sql');
+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');
-
-define('IMAP_INLINE_FORWARD', true);
-define('IMAP_EXCLUDED_FOLDERS', '');
-
-define('IMAP_FROM_SQL_DSN', 'sqlite:STORAGE_ROOT/mail/roundcube/roundcube.sqlite');
+// 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 name, email FROM identities i INNER JOIN users u ON i.user_id = u.user_id WHERE u.username = '#username' AND i.standard = 1 AND i.del = 0 AND i.name <> ''");
-define('IMAP_FROM_SQL_FIELDS', serialize(array('name', 'email')));
-define('IMAP_FROM_SQL_FROM', '#name <#email>');
-define('IMAP_FROM_SQL_FULLNAME', '#name');
-
-// not used
+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');
@@ -44,14 +26,17 @@ 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>');
-define('IMAP_FROM_LDAP_FULLNAME', '#givenname #sn');
 
+
+// copy outgoing mail to this folder. If not set z-push will try the default folders
+define('IMAP_SENTFOLDER', '');
+define('IMAP_INLINE_FORWARD', true);
+define('IMAP_EXCLUDED_FOLDERS', '');
 define('IMAP_SMTP_METHOD', 'sendmail');
 
 global $imap_smtp_params;
-$imap_smtp_params = array('host' => 'ssl://127.0.0.1', 'port' => 587, 'auth' => true, 'username' => 'imap_username', 'password' => 'imap_password');
+$imap_smtp_params = array('host' => 'ssl://localhost', 'port' => 587, 'auth' => true, 'username' => 'imap_username', 'password' => 'imap_password');
 
 define('MAIL_MIMEPART_CRLF', "\r\n");
-define('IMAP_MEETING_USE_CALDAV', true);
 
 ?>

containers/docker/apt_package_list.txt

@@ -0,0 +1,86 @@
+bc
+bind9
+ca-certificates
+coreutils
+cron
+curl
+dbconfig-common
+dovecot-antispam
+dovecot-core
+dovecot-imapd
+dovecot-lmtpd
+dovecot-lucene
+dovecot-managesieved
+dovecot-pop3d
+dovecot-sieve
+dovecot-sqlite
+duplicity
+fail2ban
+git
+haveged
+ldnsutils
+libapr1
+libawl-php
+libcurl4-openssl-dev
+libjs-jquery
+libjs-jquery-mousewheel
+libmagic1
+libtool
+libyaml-dev
+links
+memcached
+munin
+munin-node
+nginx
+nsd
+ntp
+opendkim
+opendkim-tools
+opendmarc
+openssh-client
+openssl
+php-apc
+php-auth
+php-crypt-gpg
+php-mail-mime
+php-net-sieve
+php-net-smtp
+php-net-socket
+php-pear
+php-soap
+php-xml-parser
+php5
+php5-cli
+php5-common
+php5-curl
+php5-dev
+php5-fpm
+php5-gd
+php5-imap
+php5-intl
+php5-json
+php5-mcrypt
+php5-memcache
+php5-pspell
+php5-sqlite
+php5-xsl
+postfix
+postfix-pcre
+postgrey
+python3
+python3-dateutil
+python3-dev
+python3-dnspython
+python3-flask
+python3-pip
+pyzor
+razor
+resolvconf
+spampd
+sqlite3
+sudo
+tinymce
+ufw
+unattended-upgrades
+unzip
+wget

containers/docker/my_init.d/10-mailinabox.sh

@@ -0,0 +1,58 @@
+#!/bin/bash
+
+# This script is used within containers to turn it into a Mail-in-a-Box.
+# It is referenced by the Dockerfile. You should not run it directly.
+########################################################################
+
+# Local configuration details were not known at the time the Docker
+# image was created, so all setup is defered until the container
+# is started. That's when this script runs.
+
+# If we're not in an interactive shell, set defaults.
+if [ ! -t 0 ]; then
+	echo '*** Non interactive shell detected...'
+	export PUBLIC_IP=auto
+	export PUBLIC_IPV6=auto
+	export PRIMARY_HOSTNAME=auto
+	export CSR_COUNTRY=US
+	export NONINTERACTIVE=1
+fi
+
+if ([ -z "$FORCE_INSTALL" ] && [ -f /var/lib/mailinabox/api.key ]); then
+	# Mailinabox is already installed and we don't want to reinstall
+	export SKIP_INSTALL=1
+fi
+
+# If we are skipping install, reload from /etc/mailinabox.conf if exists
+if ([ -f /var/lib/mailinabox/api.key ] && [ ! -z "$SKIP_INSTALL" ]); then
+	echo '*** Loading variables from "/etc/mailinabox.conf"...'
+
+	source /etc/mailinabox.conf
+	unset PRIVATE_IP
+	unset PRIVATE_IPV6
+	export SKIP_NETWORK_CHECKS=1
+	export NONINTERACTIVE=1
+fi
+
+export DISABLE_FIREWALL=1
+cd /usr/local/mailinabox
+
+if [ -z "$SKIP_INSTALL" ]; then
+	echo "*** Starting mailinabox installation..."
+	# Run in background to avoid blocking runit initialization while installing.
+	source setup/start.sh &
+else
+	echo "*** Configuring mailinabox..."
+	# Run in foreground for services to be started after configuration is re-written.
+	source setup/questions.sh
+	cat > /etc/mailinabox.conf << EOF;
+STORAGE_USER=$STORAGE_USER
+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
+EOF
+fi

containers/docker/run

@@ -0,0 +1,114 @@
+#!/bin/bash
+# Use this script to launch Mail-in-a-Box within a docker container.
+# ==================================================================
+#
+# Run this script from the base directory of the Mail-in-a-Box
+# repository (i.e. run as './containers/docker/run').
+#
+# Set these optional environment variables as needed:
+# * HOST_HTTP_PORT: Host http: port to bind (default: 80).
+# * HOST_HTTPS_PORT: Host https: port to bind (default: 443).
+# * SKIP_BUILD: Skip the build of docker image (default: unset).
+# * NODNS: Skip mapping of DNS ports (53 tcp/upd). They are not always available on host, as another DNS server can be running (default: unset).
+# * CONTAINER_NAME: Name of the main container (default: mailinabox).
+# * CONTAINER_DATA_NAME: Name of the data container (default: mailinabox-data).
+# * NONINTERACTIVE: Use this when mailinabox is already installed on the volume container. Else, it's not recommanded (default: unset).
+#
+# A base image is created first. The base image installs Ubuntu
+# packages and pulls in the Mail-in-a-Box source code. This is
+# defined in Dockerfile at the root of this repository.
+#
+# A mailinabox-data container is created next. This container
+# contains nothing but a shared volume for storing user data.
+# It is segregated from the rest of the live system to make backups
+# easier.
+#
+# The mailinabox container is started last. It is the
+# real thing: it runs the mailinabox image. This container will
+# initialize itself and will initialize the mailinabox-data
+# volume if the volume is new.
+
+# Build or rebuild the image.
+# Rebuilds are very fast.
+
+HOST_HTTP_PORT=${HOST_HTTP_PORT:-80}
+HOST_HTTPS_PORT=${HOST_HTTPS_PORT:-443}
+CONTAINER_NAME=${CONTAINER_NAME:-mailinabox}
+CONTAINER_DATA_NAME=${CONTAINER_DATA_NAME:-${CONTAINER_NAME}-data}
+
+if [ -z "$SKIP_BUILD" ]; then
+	tput setaf 2
+	echo "Building/updating base image (mailinabox)..."
+	tput setaf 7
+
+	docker build -q -t mailinabox . || exit 1
+fi;
+
+if ! docker inspect ${CONTAINER_DATA_NAME} > /dev/null; then
+	tput setaf 2
+	echo
+	echo "Creating a new container for your data (${CONTAINER_DATA_NAME})..."
+	tput setaf 7
+
+	docker create \
+		--name ${CONTAINER_DATA_NAME} \
+		-v /home/user-data \
+		phusion/baseimage:0.9.16 || exit 1
+else
+	tput setaf 2
+	echo
+	echo "Using existing container ${CONTAINER_DATA_NAME} for your data."
+	tput setaf 7
+fi
+
+# End a running container.
+if docker inspect ${CONTAINER_NAME} > /dev/null; then
+	tput setaf 2
+	echo
+	echo "Destroying ${CONTAINER_NAME} container..."
+	tput setaf 7
+
+	docker rm -f ${CONTAINER_NAME}
+fi
+
+# Start container.
+tput setaf 2
+echo
+echo "Starting new container (${CONTAINER_NAME})..."
+tput setaf 7
+
+# Run the services container
+# detached if NONINTERACTIVE is set,
+# interactively if NONINTERACTIVE is not set,
+# Notes:
+# * Passing through SKIP_NETWORK_CHECKS makes it easier to do testing
+#   on a residential network.
+# * --privileged flag cause an issue with bind9/named failing to start in this case
+#   see docker/docker#7318
+docker run \
+	-v /dev/urandom:/dev/random \
+	-p 25:25 \
+	$([ -z "$NODNS" ] && echo "-p 53:53/udp -p 53:53/tcp") \
+	-p $HOST_HTTP_PORT:80 \
+	-p $HOST_HTTPS_PORT:443 \
+	-p 587:587 \
+	-p 993:993 \
+	-p 4190:4190 \
+	--name ${CONTAINER_NAME} \
+	--volumes-from ${CONTAINER_DATA_NAME} \
+	--restart always \
+	$([ ! -z "$NONINTERACTIVE" ] && echo "-d") \
+	-it \
+	-e "IS_DOCKER=1" \
+	-e "SKIP_NETWORK_CHECKS=$SKIP_NETWORK_CHECKS" \
+	mailinabox \
+	|| exit 1
+
+if [ -z "$NONINTERACTIVE" ]; then
+	tput setaf 2
+	echo
+	echo "Restarting container ${CONTAINER_NAME}..."
+	tput setaf 7
+
+	docker restart ${CONTAINER_NAME} || exit 1
+fi

containers/docker/runit/dovecot.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+/usr/sbin/dovecot -F -c /etc/dovecot/dovecot.conf &> /var/log/dovecot.log

containers/docker/tools/configure_services.sh

@@ -0,0 +1,103 @@
+#!/bin/bash
+
+# The phusion/baseimage base image we use for a working Ubuntu
+# replaces the normal Upstart system service management with
+# a ligher-weight service management system called runit that
+# requires a different configuration. We need to create service
+# run files that do not daemonize.
+
+# This removes /etc/init.d service if service exists in runit.
+# It also creates a symlink from /usr/bin/sv to /etc/init.d/$service
+# to support SysV syntax: service $service <command> or /etc/init.d/$service <command>
+SERVICES=/etc/service/*
+for f in $SERVICES
+do
+	service=$(basename "$f")
+	if [ -d /etc/service/$service ]; then
+		if [ -f /etc/init.d/$service ]; then
+			mv /etc/init.d/$service /etc/init.d/$service.lsb
+			chmod -x /etc/init.d/$service.lsb
+		fi
+		ln -s /usr/bin/sv /etc/init.d/$service
+	fi
+done
+
+# Create runit services from sysv services. For most of the services,
+# there is a common pattern we can use: execute the init.d script that
+# the Ubuntu package installs, and then poll for the termination of
+# the daemon.
+function make_runit_service {
+	INITD_NAME=$1
+	WAIT_ON_PROCESS_NAME=$2
+	mkdir -p /etc/service/$INITD_NAME
+	cat > /etc/service/$INITD_NAME/run <<EOF;
+#!/bin/bash
+source /usr/local/mailinabox/setup/functions.sh
+hide_output /etc/init.d/$INITD_NAME restart
+while [ \`ps a -C $WAIT_ON_PROCESS_NAME -o pid= | wc -l\` -gt 0 ]; do
+       sleep 30
+done
+echo $WAIT_ON_PROCESS_NAME died.
+sleep 20
+EOF
+	chmod +x /etc/service/$INITD_NAME/run
+}
+make_runit_service bind9 named
+make_runit_service resolvconf resolvconf
+make_runit_service fail2ban fail2ban
+make_runit_service mailinabox mailinabox-daemon
+make_runit_service memcached memcached
+make_runit_service nginx nginx
+make_runit_service nsd nsd
+make_runit_service opendkim opendkim
+make_runit_service opendmarc opendmarc
+make_runit_service php5-fpm php5-fpm
+make_runit_service postfix postfix
+make_runit_service postgrey postgrey
+make_runit_service spampd spampd
+
+# Dovecot doesn't provide an init.d script, but it does provide
+# a way to launch without daemonization. We wrote a script for
+# that specifically.
+for service in dovecot; do
+	mkdir -p /etc/service/$service
+	cp /usr/local/mailinabox/containers/docker/runit/$service.sh /etc/service/$service/run
+	chmod +x /etc/service/$service/run
+done
+
+# This adds a log/run file on each runit service directory.
+# This file make services stdout/stderr output to svlogd log
+# directory located in /var/log/runit/$service.
+SERVICES=/etc/service/*
+for f in $SERVICES
+do
+	service=$(basename "$f")
+	if [ -d /etc/service/$service ]; then
+		mkdir -p /etc/service/$service/log
+		cat > /etc/service/$service/log/run <<EOF;
+#!/bin/bash
+mkdir -p /var/log/runit
+chmod o-wrx /var/log/runit
+mkdir -p /var/log/runit/$service
+chmod o-wrx /var/log/runit/$service
+exec svlogd -tt /var/log/runit/$service/
+EOF
+		chmod +x /etc/service/$service/log/run
+	fi
+done
+
+# Disable services for now. Until Mail-in-a-Box is installed the
+# services won't be configured right and there would be errors if
+# they got run prematurely.
+SERVICES=/etc/service/*
+for f in $SERVICES
+do
+	service=$(basename "$f")
+	if [ "$service" = "syslog-ng" ]; then continue; fi;
+	if [ "$service" = "syslog-forwarder" ]; then continue; fi;
+	if [ "$service" = "ssh" ]; then continue; fi;
+	if [ "$service" = "cron" ]; then continue; fi;
+	if ([ -d /etc/service/$service ] && [ ! -f /etc/service/$service/down ]); then
+		touch /etc/service/$service/down
+	fi
+done

management/backup.py

@@ -1,46 +1,32 @@
-#!/usr/local/lib/mailinabox/env/bin/python
+#!/usr/bin/python3
 
 # This script performs a backup of all user data:
-# 1) System services are stopped.
-# 2) STORAGE_ROOT/backup/before-backup is executed if it exists.
-# 3) An incremental encrypted backup is made using duplicity.
-# 4) The stopped services are restarted.
-# 5) STORAGE_ROOT/backup/after-backup is executed if it exists.
+# 1) System services are stopped while a copy of user data is made.
+# 2) An incremental encrypted backup is made using duplicity into the
+#    directory STORAGE_ROOT/backup/encrypted. The password used for
+#    encryption is stored in backup/secret_key.txt.
+# 3) The stopped services are restarted.
+# 5) STORAGE_ROOT/backup/after-backup is executd if it exists.
 
-import os, os.path, shutil, glob, re, datetime, sys
+import os, os.path, shutil, glob, re, datetime
 import dateutil.parser, dateutil.relativedelta, dateutil.tz
-import rtyaml
-from exclusiveprocess import Lock
 
-from utils import load_environment, shell, wait_for_service, fix_boto
+from utils import exclusive_process, load_environment, shell, wait_for_service
 
-rsync_ssh_options = [
-	"--ssh-options='-i /root/.ssh/id_rsa_miab'",
-	"--rsync-options=-e \"/usr/bin/ssh -oStrictHostKeyChecking=no -oBatchMode=yes -p 22 -i /root/.ssh/id_rsa_miab\"",
-]
+# Destroy backups when the most recent increment in the chain
+# that depends on it is this many days old.
+keep_backups_for_days = 3
 
 def backup_status(env):
-	# Root folder
-	backup_root = os.path.join(env["STORAGE_ROOT"], 'backup')
-
 	# What is the current status of backups?
-	# Query duplicity to get a list of all backups.
-	# Use the number of volumes to estimate the size.
-	config = get_backup_config(env)
+	# Loop through all of the files in STORAGE_ROOT/backup/encrypted to
+	# get a list of all of the backups taken and sum up file sizes to
+	# see how large the storage is.
+
 	now = datetime.datetime.now(dateutil.tz.tzlocal())
-
-	# Are backups dissbled?
-	if config["target"] == "off":
-		return { }
-
-	backups = { }
-	backup_cache_dir = os.path.join(backup_root, 'cache')
-
 	def reldate(date, ref, clip):
 		if ref < date: return clip
 		rd = dateutil.relativedelta.relativedelta(ref, date)
-		if rd.years > 1: return "%d years, %d months" % (rd.years, rd.months)
-		if rd.years == 1: return "%d year, %d months" % (rd.years, rd.months)
 		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
@@ -48,109 +34,78 @@ def backup_status(env):
 		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.
-	def parse_line(line):
-		keys = line.strip().split()
-		date = dateutil.parser.parse(keys[1]).astimezone(dateutil.tz.tzlocal())
-		return {
-			"date": keys[1],
-			"date_str": date.strftime("%x %X") + " " + now.tzname(),
-			"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"],
-		] + rsync_ssh_options,
-		get_env(env),
-		trap=True)
-	if code != 0:
-		# Command failed. This is likely due to an improperly configured remote
-		# destination for the backups or the last backup job terminated unexpectedly.
-		raise Exception("Something is wrong with the backup: " + collection_status)
-	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):
+	backups = { }
+	backup_root = os.path.join(env["STORAGE_ROOT"], 'backup')
+	backup_dir = os.path.join(backup_root, 'encrypted')
+	os.makedirs(backup_dir, exist_ok=True) # os.listdir fails if directory does not exist
+	for fn in os.listdir(backup_dir):
 		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
+		if not m: raise ValueError(fn)
+
 		key = m.group("date")
-		backups[key]["size"] += size
+		if key not in backups:
+			date = dateutil.parser.parse(m.group("date"))
+			backups[key] = {
+				"date": m.group("date"),
+				"date_str": date.strftime("%x %X"),
+				"date_delta": reldate(date, now, "the future?"),
+				"full": m.group("incbase") is None,
+				"previous": m.group("incbase"),
+				"size": 0,
+			}
+
+		backups[key]["size"] += os.path.getsize(os.path.join(backup_dir, fn))
 
 	# 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, the size of the
-	# most recent full backup, and the date of the most recent
-	# backup and the most recent full backup.
+	# Get the average size of incremental backups and the size of the
+	# most recent full backup.
 	incremental_count = 0
 	incremental_size = 0
-	first_date = None
 	first_full_size = None
-	first_full_date = None
 	for bak in backups:
-		if first_date is None:
-			first_date = dateutil.parser.parse(bak["date"])
 		if bak["full"]:
 			first_full_size = bak["size"]
-			first_full_date = dateutil.parser.parse(bak["date"])
 			break
 		incremental_count += 1
 		incremental_size += bak["size"]
 
-	# When will the most recent backup be deleted? It won't be deleted if the next
-	# backup is incremental, because the increments rely on all past increments.
-	# So first guess how many more incremental backups will occur until the next
-	# full backup. That full backup frees up this one to be deleted. But, the backup
-	# must also be at least min_age_in_days old too.
+	# 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 incremental_size > 0 and first_full_size is not None:
-		# How many days until the next incremental backup? First, the part of
-		# the algorithm based on increment sizes:
-		est_days_to_next_full = (.5 * first_full_size - incremental_size) / (incremental_size/incremental_count)
-		est_time_of_next_full = first_date + datetime.timedelta(days=est_days_to_next_full)
+	if incremental_count > 0 and first_full_size is not None:
+		deleted_in = "approx. %d days" % round(keep_backups_for_days + (.5 * first_full_size - incremental_size) / (incremental_size/incremental_count) + .5)
 
-		# ...And then the part of the algorithm based on full backup age:
-		est_time_of_next_full = min(est_time_of_next_full, first_full_date + datetime.timedelta(days=config["min_age_in_days"]*10+1))
-
-		# It still can't be deleted until it's old enough.
-		est_deleted_on = max(est_time_of_next_full, first_date + datetime.timedelta(days=config["min_age_in_days"]))
-
-		deleted_in = "approx. %d days" % round((est_deleted_on-now).total_seconds()/60/60/24 + .5)
-
-	# When will a backup be deleted? Set the deleted_in field of each backup.
+	# When will a backup be deleted?
 	saw_full = False
+	days_ago = now - datetime.timedelta(days=keep_backups_for_days)
 	for bak in backups:
 		if deleted_in:
-			# The most recent increment in a chain and all of the previous backups
-			# it relies on are deleted at the same time.
+			# 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*.
+			# 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:
-			# We're now on backups prior to the most recent full backup. These are
-			# free to be deleted as soon as they are min_age_in_days old.
-			deleted_in = reldate(now, dateutil.parser.parse(bak["date"]) + datetime.timedelta(days=config["min_age_in_days"]), "on next daily backup")
+			# 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 {
+		"directory": backup_dir,
+		"encpwfile": os.path.join(backup_root, 'secret_key.txt'),
+		"tz": now.tzname(),
 		"backups": backups,
 	}
 
-def should_force_full(config, env):
+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.
@@ -162,64 +117,22 @@ def should_force_full(config, env):
 			inc_size += bak["size"]
 		else:
 			# ...until we reach the most recent full backup.
-			# Return if we should to a full backup, which is based
-			# on the size of the increments relative to the full
-			# backup, as well as the age of the full backup.
-			if inc_size > .5*bak["size"]:
-				return True
-			if dateutil.parser.parse(bak["date"]) + datetime.timedelta(days=config["min_age_in_days"]*10+1) < datetime.datetime.now(dateutil.tz.tzlocal()):
-				return True
-			return False
+			# 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()
 
-	# Create an global exclusive lock so that the backup script
-	# cannot be run more than one.
-	Lock(die=True).forever()
+	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 disabled?
-	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
@@ -250,35 +163,22 @@ def perform_backup(full_backup):
 	# will fail. Otherwise do a full backup when the size of
 	# the increments since the most recent full backup are
 	# large.
-	try:
-		full_backup = full_backup or should_force_full(config, env)
-	except Exception as e:
-		# This was the first call to duplicity, and there might
-		# be an error already.
-		print(e)
-		sys.exit(1)
+	full_backup = full_backup or should_force_full(env)
 
 	# Stop services.
-	def service_command(service, command, quit=None):
-		# Execute silently, but if there is an error then display the output & exit.
-		code, ret = shell('check_output', ["/usr/sbin/service", service, command], capture_stderr=True, trap=True)
-		if code != 0:
-			print(ret)
-			if quit:
-				sys.exit(code)
+	shell('check_call', ["/usr/sbin/service", "dovecot", "stop"])
+	shell('check_call', ["/usr/sbin/service", "postfix", "stop"])
 
-	service_command("php7.0-fpm", "stop", quit=True)
-	service_command("postfix", "stop", quit=True)
-	service_command("dovecot", "stop", quit=True)
-
-	# Execute a pre-backup script that copies files outside the homedir.
-	# Run as the STORAGE_USER user, not as root. Pass our settings in
-	# environment variables so the script has access to STORAGE_ROOT.
-	pre_script = os.path.join(backup_root, 'before-backup')
-	if os.path.exists(pre_script):
-		shell('check_call',
-			['su', env['STORAGE_USER'], '-c', pre_script, config["target"]],
-			env=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.
+	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!")
+	env_with_passphrase = { "PASSPHRASE" : passphrase }
 
 	# Run a backup of STORAGE_ROOT (but excluding the backups themselves!).
 	# --allow-source-mismatch is needed in case the box's hostname is changed
@@ -287,21 +187,19 @@ def perform_backup(full_backup):
 		shell('check_call', [
 			"/usr/bin/duplicity",
 			"full" if full_backup else "incr",
-			"--verbosity", "warning", "--no-print-statistics",
 			"--archive-dir", backup_cache_dir,
 			"--exclude", backup_root,
 			"--volsize", "250",
 			"--gpg-options", "--cipher-algo=AES256",
 			env["STORAGE_ROOT"],
-			config["target"],
-			"--allow-source-mismatch"
-			] + rsync_ssh_options,
-			get_env(env))
+			"file://" + backup_dir,
+                        "--allow-source-mismatch"
+			],
+			env_with_passphrase)
 	finally:
 		# Start services again.
-		service_command("dovecot", "start", quit=False)
-		service_command("postfix", "start", quit=False)
-		service_command("php7.0-fpm", "start", quit=False)
+		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):
@@ -312,13 +210,12 @@ def perform_backup(full_backup):
 	shell('check_call', [
 		"/usr/bin/duplicity",
 		"remove-older-than",
-		"%dD" % config["min_age_in_days"],
-		"--verbosity", "error",
+		"%dD" % keep_backups_for_days,
 		"--archive-dir", backup_cache_dir,
 		"--force",
-		config["target"]
-		] + rsync_ssh_options,
-		get_env(env))
+		"file://" + backup_dir
+		],
+		env_with_passphrase)
 
 	# From duplicity's manual:
 	# "This should only be necessary after a duplicity session fails or is
@@ -328,17 +225,15 @@ def perform_backup(full_backup):
 	shell('check_call', [
 		"/usr/bin/duplicity",
 		"cleanup",
-		"--verbosity", "error",
 		"--archive-dir", backup_cache_dir,
 		"--force",
-		config["target"]
-		] + rsync_ssh_options,
-		get_env(env))
+		"file://" + backup_dir
+		],
+		env_with_passphrase)
 
 	# 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])
+	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
@@ -346,7 +241,7 @@ def perform_backup(full_backup):
 	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"]],
+			['su', env['STORAGE_USER'], '-c', post_script],
 			env=env)
 
 	# Our nightly cron job executes system status checks immediately after this
@@ -359,9 +254,9 @@ def perform_backup(full_backup):
 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')
-
+	backup_dir = os.path.join(backup_root, 'encrypted')
+	env_with_passphrase = { "PASSPHRASE" : open(os.path.join(backup_root, 'secret_key.txt')).read() }
 	shell('check_call', [
 		"/usr/bin/duplicity",
 		"--verbosity", "info",
@@ -369,184 +264,9 @@ def run_duplicity_verification():
 		"--compare-data",
 		"--archive-dir", backup_cache_dir,
 		"--exclude", backup_root,
-		config["target"],
+		"file://" + backup_dir,
 		env["STORAGE_ROOT"],
-	] + rsync_ssh_options, get_env(env))
-
-def run_duplicity_restore(args):
-	env = load_environment()
-	config = get_backup_config(env)
-	backup_cache_dir = os.path.join(env["STORAGE_ROOT"], 'backup', 'cache')
-	shell('check_call', [
-		"/usr/bin/duplicity",
-		"restore",
-		"--archive-dir", backup_cache_dir,
-		config["target"],
-		] + rsync_ssh_options + args,
-	get_env(env))
-
-def list_target_files(config):
-	import urllib.parse
-	try:
-		target = urllib.parse.urlparse(config["target"])
-	except ValueError:
-		return "invalid target"
-
-	if target.scheme == "file":
-		return [(fn, os.path.getsize(os.path.join(target.path, fn))) for fn in os.listdir(target.path)]
-
-	elif target.scheme == "rsync":
-		rsync_fn_size_re = re.compile(r'.*    ([^ ]*) [^ ]* [^ ]* (.*)')
-		rsync_target = '{host}:{path}'
-
-		target_path = target.path
-		if not target_path.endswith('/'):
-			target_path = target_path + '/'
-		if target_path.startswith('/'):
-			target_path = target_path[1:]
-
-		rsync_command = [ 'rsync',
-					'-e',
-					'/usr/bin/ssh -i /root/.ssh/id_rsa_miab -oStrictHostKeyChecking=no -oBatchMode=yes',
-					'--list-only',
-					'-r',
-					rsync_target.format(
-						host=target.netloc,
-						path=target_path)
-				]
-
-		code, listing = shell('check_output', rsync_command, trap=True, capture_stderr=True)
-		if code == 0:
-			ret = []
-			for l in listing.split('\n'):
-				match = rsync_fn_size_re.match(l)
-				if match:
-					ret.append( (match.groups()[1], int(match.groups()[0].replace(',',''))) )
-			return ret
-		else:
-			if 'Permission denied (publickey).' in listing:
-				reason = "Invalid user or check you correctly copied the SSH key."
-			elif 'No such file or directory' in listing:
-				reason = "Provided path {} is invalid.".format(target_path)
-			elif 'Network is unreachable' in listing:
-				reason = "The IP address {} is unreachable.".format(target.hostname)
-			elif 'Could not resolve hostname':
-				reason = "The hostname {} cannot be resolved.".format(target.hostname)
-			else:
-				reason = "Unknown error." \
-						"Please check running 'python management/backup.py --verify'" \
-						"from mailinabox sources to debug the issue."
-			raise ValueError("Connection to rsync host failed: {}".format(reason))
-
-	elif target.scheme == "s3":
-		# match to a Region
-		fix_boto() # must call prior to importing boto
-		import boto.s3
-		from boto.exception import BotoServerError
-		for region in boto.s3.regions():
-			if region.endpoint == target.hostname:
-				break
-		else:
-			raise ValueError("Invalid S3 region/host.")
-
-		bucket = target.path[1:].split('/')[0]
-		path = '/'.join(target.path[1:].split('/')[1:]) + '/'
-
-		# If no prefix is specified, set the path to '', otherwise boto won't list the files
-		if path == '/':
-			path = ''
-
-		if bucket == "":
-			raise ValueError("Enter an S3 bucket name.")
-
-		# connect to the region & bucket
-		try:
-			conn = region.connect(aws_access_key_id=config["target_user"], aws_secret_access_key=config["target_pass"])
-			bucket = conn.get_bucket(bucket)
-		except BotoServerError as e:
-			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"]
-	ssh_pub_key = os.path.join('/root', '.ssh', 'id_rsa_miab.pub')
-	if os.path.exists(ssh_pub_key):
-		config["ssh_pub_key"] = open(ssh_pub_key, 'r').read()
-
-	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))
+	], env_with_passphrase)
 
 if __name__ == "__main__":
 	import sys
@@ -554,23 +274,6 @@ if __name__ == "__main__":
 		# 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()
-
-	elif sys.argv[-1] == "--list":
-		# Run duplicity's verification command to check a) the backup files
-		# are readable, and b) report if they are up to date.
-		for fn, size in list_target_files(get_backup_config(load_environment())):
-			print("{}\t{}".format(fn, size))
-
-	elif sys.argv[-1] == "--status":
-		# Show backup status.
-		ret = backup_status(load_environment())
-		print(rtyaml.dump(ret["backups"]))
-
-	elif len(sys.argv) >= 2 and sys.argv[1] == "--restore":
-		# Run duplicity restore. Rest of command line passed as arguments
-		# to duplicity. The restore path should be specified.
-		run_duplicity_restore(sys.argv[2:])
-
 	else:
 		# Perform a backup. Add --full to force a full backup rather than
 		# possibly performing an incremental backup.

management/daemon.py

@@ -1,15 +1,22 @@
-import os, os.path, re, json, time
-import subprocess
+#!/usr/bin/python3
+
+import os, os.path, re, json
 
 from functools import wraps
 
-from flask import Flask, request, render_template, abort, Response, send_from_directory, make_response
+from flask import Flask, request, render_template, abort, Response, send_from_directory
 
-import auth, utils, multiprocessing.pool
+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_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()
@@ -21,14 +28,6 @@ try:
 except OSError:
 	pass
 
-# for generating CSRs we need a list of country codes
-csr_country_codes = []
-with open(os.path.join(os.path.dirname(me), "csr_country_codes.tsv")) as f:
-	for line in f:
-		if line.strip() == "" or line.startswith("#"): continue
-		code, name = line.strip().split("\t")[0:2]
-		csr_country_codes.append((code, name))
-
 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.
@@ -42,14 +41,11 @@ def authorized_personnel_only(viewfunc):
 		except ValueError as e:
 			# Authentication failed.
 			privs = []
-			error = "Incorrect username or password"
-
-			# Write a line in the log recording the failed login
-			log_failed_login(request)
+			error = str(e)
 
 		# Authorized to access an API view?
 		if "admin" in privs:
-			# Call view func.
+			# Call view func.	
 			return viewfunc(*args, **kwargs)
 		elif not error:
 			error = "You are not an administrator."
@@ -94,23 +90,13 @@ def json_response(data):
 def index():
 	# Render the control panel. This route does not require user authentication
 	# so it must be safe!
-
 	no_users_exist = (len(get_mail_users(env)) == 0)
 	no_admins_exist = (len(get_admins(env)) == 0)
-
-	utils.fix_boto() # must call prior to importing boto
-	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,
-		csr_country_codes=csr_country_codes,
 	)
 
 @app.route('/me')
@@ -119,12 +105,9 @@ def me():
 	try:
 		email, privs = auth_service.authenticate(request, env)
 	except ValueError as e:
-		# Log the failed login
-		log_failed_login(request)
-
 		return json_response({
 			"status": "invalid",
-			"reason": "Incorrect username or password",
+			"reason": str(e),
 			})
 
 	resp = {
@@ -196,15 +179,14 @@ def mail_aliases():
 	if request.args.get("format", "") == "json":
 		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))
+		return "".join(x+"\t"+y+"\n" for x, y in get_mail_aliases(env))
 
 @app.route('/mail/aliases/add', methods=['POST'])
 @authorized_personnel_only
 def mail_aliases_add():
 	return add_mail_alias(
-		request.form.get('address', ''),
-		request.form.get('forwards_to', ''),
-		request.form.get('permitted_senders', ''),
+		request.form.get('source', ''),
+		request.form.get('destination', ''),
 		env,
 		update_if_exists=(request.form.get('update_if_exists', '') == '1')
 		)
@@ -212,7 +194,7 @@ def mail_aliases_add():
 @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
@@ -240,14 +222,14 @@ def dns_update():
 @authorized_personnel_only
 def dns_get_secondary_nameserver():
 	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) })
+	return json_response({ "hostname": get_secondary_dns(get_custom_dns_config(env)) })
 
 @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 set_secondary_dns(request.form.get('hostname'), env)
 	except ValueError as e:
 		return (str(e), 400)
 
@@ -301,7 +283,7 @@ def dns_set_record(qname, rtype="A"):
 				# 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.
@@ -326,64 +308,22 @@ def dns_get_dump():
 
 # SSL
 
-@app.route('/ssl/status')
-@authorized_personnel_only
-def ssl_get_status():
-	from ssl_certificates import get_certificates_to_provision
-	from web_update import get_web_domains_info, get_web_domains
-
-	# What domains can we provision certificates for? What unexpected problems do we have?
-	provision, cant_provision = get_certificates_to_provision(env, show_valid_certs=False)
-	
-	# What's the current status of TLS certificates on all of the domain?
-	domains_status = get_web_domains_info(env)
-	domains_status = [
-		{
-			"domain": d["domain"],
-			"status": d["ssl_certificate"][0],
-			"text": d["ssl_certificate"][1] + ((" " + cant_provision[d["domain"]] if d["domain"] in cant_provision else ""))
-		} for d in domains_status ]
-
-	# Warn the user about domain names not hosted here because of other settings.
-	for domain in set(get_web_domains(env, exclude_dns_elsewhere=False)) - set(get_web_domains(env)):
-		domains_status.append({
-			"domain": domain,
-			"status": "not-applicable",
-			"text": "The domain's website is hosted elsewhere.",
-		})
-
-	return json_response({
-		"can_provision": utils.sort_domains(provision, env),
-		"status": domains_status,
-	})
-
 @app.route('/ssl/csr/<domain>', methods=['POST'])
 @authorized_personnel_only
 def ssl_get_csr(domain):
-	from ssl_certificates 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, request.form.get('countrycode', ''), env)
+	from web_update import get_domain_ssl_files, create_csr
+	ssl_key, ssl_certificate, ssl_via = get_domain_ssl_files(domain, env)
+	return create_csr(domain, ssl_key, env)
 
 @app.route('/ssl/install', methods=['POST'])
 @authorized_personnel_only
 def ssl_install_cert():
-	from web_update import get_web_domains
-	from ssl_certificates import 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')
-	if domain not in get_web_domains(env):
-		return "Invalid domain name."
 	return install_cert(domain, ssl_cert, ssl_chain, env)
 
-@app.route('/ssl/provision', methods=['POST'])
-@authorized_personnel_only
-def ssl_provision_certs():
-	from ssl_certificates import provision_certificates
-	requests = provision_certificates(env, limit_domains=None)
-	return json_response({ "requests": requests })
-
-
 # WEB
 
 @app.route('/web/domains')
@@ -400,24 +340,6 @@ def web_update():
 
 # 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():
@@ -436,10 +358,7 @@ def system_status():
 		def print_line(self, message, monospace=False):
 			self.items[-1]["extra"].append({ "text": message, "monospace": monospace })
 	output = WebOutput()
-	# Create a temporary pool of processes for the status checks
-	pool = multiprocessing.pool.Pool(processes=5)
 	run_checks(False, env, output, pool)
-	pool.terminate()
 	return json_response(output.items)
 
 @app.route('/system/updates')
@@ -459,66 +378,11 @@ def do_updates():
 		"DEBIAN_FRONTEND": "noninteractive"
 	})
 
-
-@app.route('/system/reboot', methods=["GET"])
-@authorized_personnel_only
-def needs_reboot():
-	from status_checks import is_reboot_needed_due_to_package_installation
-	if is_reboot_needed_due_to_package_installation():
-		return json_response(True)
-	else:
-		return json_response(False)
-
-@app.route('/system/reboot', methods=["POST"])
-@authorized_personnel_only
-def do_reboot():
-	# To keep the attack surface low, we don't allow a remote reboot if one isn't necessary.
-	from status_checks import is_reboot_needed_due_to_package_installation
-	if is_reboot_needed_due_to_package_installation():
-		return utils.shell("check_output", ["/sbin/shutdown", "-r", "now"], capture_stderr=True)
-	else:
-		return "No reboot is required, so it is not allowed."
-
-
 @app.route('/system/backup/status')
 @authorized_personnel_only
 def backup_status():
 	from backup import backup_status
-	try:
-		return json_response(backup_status(env))
-	except Exception as e:
-		return json_response({ "error": str(e) })
-
-@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"
+	return json_response(backup_status(env))
 
 # MUNIN
 
@@ -531,77 +395,6 @@ def munin(filename=""):
 	if filename == "": filename = "index.html"
 	return send_from_directory("/var/cache/munin/www", filename)
 
-@app.route('/munin/cgi-graph/<path:filename>')
-@authorized_personnel_only
-def munin_cgi(filename):
-	""" Relay munin cgi dynazoom requests
-	/usr/lib/munin/cgi/munin-cgi-graph is a perl cgi script in the munin package
-	that is responsible for generating binary png images _and_ associated HTTP
-	headers based on parameters in the requesting URL. All output is written
-	to stdout which munin_cgi splits into response headers and binary response
-	data.
-	munin-cgi-graph reads environment variables to determine
-	what it should do. It expects a path to be in the env-var PATH_INFO, and a
-	querystring to be in the env-var QUERY_STRING.
-	munin-cgi-graph has several failure modes. Some write HTTP Status headers and
-	others return nonzero exit codes.
-	Situating munin_cgi between the user-agent and munin-cgi-graph enables keeping
-	the cgi script behind mailinabox's auth mechanisms and avoids additional
-	support infrastructure like spawn-fcgi.
-	"""
-
-	COMMAND = 'su - munin --preserve-environment --shell=/bin/bash -c /usr/lib/munin/cgi/munin-cgi-graph'
-	# su changes user, we use the munin user here
-	# --preserve-environment retains the environment, which is where Popen's `env` data is
-	# --shell=/bin/bash ensures the shell used is bash
-	# -c "/usr/lib/munin/cgi/munin-cgi-graph" passes the command to run as munin
-	# "%s" is a placeholder for where the request's querystring will be added
-
-	if filename == "":
-		return ("a path must be specified", 404)
-
-	query_str = request.query_string.decode("utf-8", 'ignore')
-
-	env = {'PATH_INFO': '/%s/' % filename, 'REQUEST_METHOD': 'GET', 'QUERY_STRING': query_str}
-	code, binout = utils.shell('check_output',
-							   COMMAND.split(" ", 5),
-							   # Using a maxsplit of 5 keeps the last arguments together
-							   env=env,
-							   return_bytes=True,
-							   trap=True)
-
-	if code != 0:
-		# nonzero returncode indicates error
-		app.logger.error("munin_cgi: munin-cgi-graph returned nonzero exit code, %s", process.returncode)
-		return ("error processing graph image", 500)
-
-	# /usr/lib/munin/cgi/munin-cgi-graph returns both headers and binary png when successful.
-	# A double-Windows-style-newline always indicates the end of HTTP headers.
-	headers, image_bytes = binout.split(b'\r\n\r\n', 1)
-	response = make_response(image_bytes)
-	for line in headers.splitlines():
-		name, value = line.decode("utf8").split(':', 1)
-		response.headers[name] = value
-	if 'Status' in response.headers and '404' in response.headers['Status']:
-		app.logger.warning("munin_cgi: munin-cgi-graph returned 404 status code. PATH_INFO=%s", env['PATH_INFO'])
-	return response
-
-def log_failed_login(request):
-	# We need to figure out the ip to list in the message, all our calls are routed
-	# through nginx who will put the original ip in X-Forwarded-For.
-	# During setup we call the management interface directly to determine the user
-	# status. So we can't always use X-Forwarded-For because during setup that header
-	# will not be present.
-	if request.headers.getlist("X-Forwarded-For"):
-		ip = request.headers.getlist("X-Forwarded-For")[0]
-	else:
-		ip = request.remote_addr
-
-	# We need to add a timestamp to the log message, otherwise /dev/log will eat the "duplicate"
-	# message.
-	app.logger.warning( "Mail-in-a-Box Management Daemon: Failed login attempt from ip %s - timestamp %s" % (ip, time.time()))
-
-
 # APP
 
 if __name__ == '__main__':
@@ -621,3 +414,4 @@ if __name__ == '__main__':
 
 	# Start the application server. Listens on 127.0.0.1 (IPv4 only).
 	app.run(port=10222)
+

management/daily_tasks.sh

@@ -1,25 +0,0 @@
-#!/bin/bash
-# This script is run daily (at 3am each night).
-
-# Set character encoding flags to ensure that any non-ASCII
-# characters don't cause problems. See setup/start.sh and
-# the management daemon startup script.
-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
-
-# On Mondays, i.e. once a week, send the administrator a report of total emails
-# sent and received so the admin might notice server abuse.
-if [ `date "+%u"` -eq 1 ]; then
-    management/mail_log.py -t week | management/email_administrator.py "Mail-in-a-Box Usage Report"
-fi
-
-# Take a backup.
-management/backup.py | management/email_administrator.py "Backup Status"
-
-# Provision any new certificates for new domains or domains with expiring certificates.
-management/ssl_certificates.py -q | management/email_administrator.py "Error Provisioning TLS Certificate"
-
-# Run status checks and email the administrator if anything changed.
-management/status_checks.py --show-changes | management/email_administrator.py "Status Checks Change Notice"

management/dns_update.py

@@ -1,4 +1,4 @@
-#!/usr/local/lib/mailinabox/env/bin/python
+#!/usr/bin/python3
 
 # Creates DNS zone files for all of the domains of all of the mail users
 # and mail aliases and restarts nsd.
@@ -12,12 +12,6 @@ import dns.resolver
 from mailconfig import get_mail_domains
 from utils import shell, load_env_vars_from_file, safe_domain_name, sort_domains
 
-# From https://stackoverflow.com/questions/3026957/how-to-validate-a-domain-name-using-regex-php/16491074#16491074
-# This regular expression matches domain names according to RFCs, it also accepts fqdn with an leading dot,
-# underscores, as well as asteriks which are allowed in domain names but not hostnames (i.e. allowed in
-# DNS but not in URLs), which are common in certain record types like for DKIM.
-DOMAIN_RE = "^(?!\-)(?:[*][.])?(?:[a-zA-Z\d\-_]{0,62}[a-zA-Z\d_]\.){1,126}(?!\d+)[a-zA-Z\d_]{1,63}(\.?)$"
-
 def get_dns_domains(env):
 	# Add all domain names in use by email users and mail aliases and ensure
 	# PRIMARY_HOSTNAME is in the list.
@@ -57,13 +51,21 @@ def get_dns_zones(env):
 	return zonefiles
 
 def do_dns_update(env, force=False):
+	# 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))
+	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)
-	zonefiles = []
 	updated_domains = []
-	for (domain, zonefile, records) in build_zones(env):
-		# The final set of files will be signed.
-		zonefiles.append((domain, zonefile + ".signed"))
+	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)
 
 		# See if the zone has changed, and if so update the serial number
 		# and write the zone file.
@@ -71,6 +73,14 @@ def do_dns_update(env, force=False):
 			# Zone was not updated. There were no changes.
 			continue
 
+		# If this is a .justtesting.email domain, then post the update.
+		try:
+			justtestingdotemail(domain, records)
+		except:
+			# Hmm. Might be a network issue. If we stop now, will we end
+			# up in an inconsistent state? Let's just continue.
+			pass
+
 		# Mark that we just updated this domain.
 		updated_domains.append(domain)
 
@@ -85,8 +95,14 @@ def do_dns_update(env, force=False):
 		# and return True so we get a chance to re-sign it.
 		sign_zone(domain, zonefile, env)
 
+	# Now that all zones are signed (some might not have changed and so didn't
+	# just get signed now, but were before) update the zone filename so nsd.conf
+	# uses the signed file.
+	for i in range(len(zonefiles)):
+		zonefiles[i][1] += ".signed"
+
 	# Write the main nsd.conf file.
-	if write_nsd_conf(zonefiles, list(get_custom_dns_config(env)), env):
+	if write_nsd_conf(zonefiles, additional_records, env):
 		# 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:
@@ -96,18 +112,14 @@ def do_dns_update(env, force=False):
 	if len(updated_domains) > 0:
 		shell('check_call', ["/usr/sbin/service", "nsd", "restart"])
 
-	# Write the OpenDKIM configuration tables for all of the domains.
-	if write_opendkim_tables(get_mail_domains(env), env):
+	# Write the OpenDKIM configuration tables.
+	if write_opendkim_tables(domains, 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.
-	# (ignore errors with trap=True)
-	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
 		return ""
@@ -116,22 +128,6 @@ def do_dns_update(env, force=False):
 
 ########################################################################
 
-def build_zones(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))
-	from web_update import get_web_domains
-	www_redirect_domains = set(get_web_domains(env)) - set(get_web_domains(env, include_www_redirects=False))
-
-	# Build DNS records for each zone.
-	for domain, zonefile in zonefiles:
-		# Build the records to put in the zone.
-		records = build_zone(domain, domains, additional_records, www_redirect_domains, env)
-		yield (domain, zonefile, records)
-
 def build_zone(domain, all_domains, additional_records, www_redirect_domains, env, is_zone=True):
 	records = []
 
@@ -148,11 +144,8 @@ def build_zone(domain, all_domains, additional_records, www_redirect_domains, en
 		records.append((None,  "NS",  "ns1.%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))
+		secondary_ns = get_secondary_dns(additional_records) or ("ns2." + env["PRIMARY_HOSTNAME"])
+		records.append((None,  "NS", secondary_ns+'.', False))
 
 
 	# In PRIMARY_HOSTNAME...
@@ -174,13 +167,13 @@ 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))
+
 	# 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)]
@@ -247,10 +240,6 @@ def build_zone(domain, all_domains, additional_records, www_redirect_domains, en
 	# Don't pin the list of records that has_rec checks against anymore.
 	has_rec_base = records
 
-	# The MX record says where email for the domain should be delivered: Here!
-	if not has_rec(None, "MX", prefix="10 "):
-		records.append((None,  "MX",  "10 %s." % env["PRIMARY_HOSTNAME"], "Required. Specifies the hostname (and priority) 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.
 	# Skip if the user has set a custom SPF record.
@@ -261,8 +250,8 @@ def build_zone(domain, all_domains, additional_records, www_redirect_domains, en
 	# 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:
-		m = re.match(r'(\S+)\s+IN\s+TXT\s+\( ((?:"[^"]+"\s+)+)\)', orf.read(), re.S)
-		val = "".join(re.findall(r'"([^"]+)"', m.group(2)))
+		m = re.match(r'(\S+)\s+IN\s+TXT\s+\( "([^"]+)"\s+"([^"]+)"\s*\)', orf.read(), re.S)
+		val = m.group(2) + m.group(3)
 		if not has_rec(m.group(1), "TXT", prefix="v=DKIM1; "):
 			records.append((m.group(1), "TXT", val, "Recommended. Provides a way for recipients to verify that this machine sent @%s mail." % domain))
 
@@ -280,13 +269,6 @@ def build_zone(domain, all_domains, additional_records, www_redirect_domains, en
 		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)))
 
-	# Add CardDAV/CalDAV SRV records on the non-primary hostname that points to the primary hostname.
-	# The SRV record format is priority (0, whatever), weight (0, whatever), port, service provider hostname (w/ trailing dot).
-	if domain != env["PRIMARY_HOSTNAME"]:
-		for dav in ("card", "cal"):
-			qname = "_" + dav + "davs._tcp"
-			if not has_rec(qname, "SRV"):
-				records.append((qname, "SRV", "0 0 443 " + env["PRIMARY_HOSTNAME"] + ".", "Recommended. Specifies the hostname of the server that handles CardDAV/CalDAV services for email addresses on this 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 ""))
@@ -297,40 +279,26 @@ def build_zone(domain, all_domains, additional_records, www_redirect_domains, en
 
 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 criteria.
+	# must use TLS and the certificate must match a particular certificate.
 	#
 	# Thanks to http://blog.huque.com/2012/10/dnssec-and-certificates.html
-	# and https://community.letsencrypt.org/t/please-avoid-3-0-1-and-3-0-2-dane-tlsa-records-with-le-certificates/7022
-	# for explaining all of this! Also see https://tools.ietf.org/html/rfc6698#section-2.1
-	# and https://github.com/mail-in-a-box/mailinabox/issues/268#issuecomment-167160243.
-	#
-	# There are several criteria. We used to use "3 0 1" criteria, which
-	# meant to pin a leaf (3) certificate (0) with SHA256 hash (1). But
-	# certificates change, and especially as we move to short-lived certs
-	# they change often. The TLSA record handily supports the criteria of
-	# a leaf certificate (3)'s subject public key (1) with SHA256 hash (1).
-	# The subject public key is the public key portion of the private key
-	# that generated the CSR that generated the certificate. Since we
-	# generate a private key once the first time Mail-in-a-Box is set up
-	# and reuse it for all subsequent certificates, the TLSA record will
-	# remain valid indefinitely.
+	# for explaining all of this!
 
-	from ssl_certificates import load_cert_chain, load_pem
-	from cryptography.hazmat.primitives.serialization import Encoding, PublicFormat
-
-	fn = os.path.join(env["STORAGE_ROOT"], "ssl", "ssl_certificate.pem")
-	cert = load_pem(load_cert_chain(fn)[0])
-
-	subject_public_key = cert.public_key().public_bytes(Encoding.DER, PublicFormat.SubjectPublicKeyInfo)
-	# We could have also loaded ssl_private_key.pem and called priv_key.public_key().public_bytes(...)
-
-	pk_hash = hashlib.sha256(subject_public_key).hexdigest()
+	# Get the hex SHA256 of the DER-encoded server certificate:
+	certder = shell("check_output", [
+		"/usr/bin/openssl",
+		"x509",
+		"-in", os.path.join(env["STORAGE_ROOT"], "ssl", "ssl_certificate.pem"),
+		"-outform", "DER"
+		],
+		return_bytes=True)
+	certhash = hashlib.sha256(certder).hexdigest()
 
 	# Specify the TLSA parameters:
-	# 3: Match the (leaf) certificate. (No CA, no trust path needed.)
-	# 1: Match its subject public key.
-	# 1: Use SHA256.
-	return "3 1 1 " + pk_hash
+	# 3: This is the certificate that the client should trust. No CA is needed.
+	# 0: The whole certificate is matched.
+	# 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
@@ -348,25 +316,13 @@ def build_sshfp_records():
 		"ssh-rsa": 1,
 		"ssh-dss": 2,
 		"ecdsa-sha2-nistp256": 3,
-		"ssh-ed25519": 4,
 	}
 
 	# 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).
-
-	# scan the sshd_config and find the ssh ports (port 22 may be closed)
-	with open('/etc/ssh/sshd_config', 'r') as f:
-		ports = []
-		t = f.readlines()
-		for line in t:
-			s = line.split()
-			if len(s) == 2 and s[0] == 'Port':
-				ports = ports + [s[1]]
-	# the keys are the same at each port, so we only need to get
-	# them at the first port found (may not be port 22)
-	keys = shell("check_output", ["ssh-keyscan", "-t", "rsa,dsa,ecdsa,ed25519", "-p", ports[0], "localhost"])
+	keys = shell("check_output", ["ssh-keyscan", "localhost"])
 	for key in sorted(keys.split("\n")):
 		if key.strip() == "" or key[0] == "#": continue
 		try:
@@ -417,16 +373,9 @@ $TTL 1800           ; default time to live
 			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
+			value = value.replace('\\', '\\\\') # escape backslashes
+			value = value.replace('"', '\\"') # escape quotes
+			value = '"' + value + '"' # wrap in quotes
 		zone += value + "\n"
 
 	# DNSSEC requires re-signing a zone periodically. That requires
@@ -506,10 +455,17 @@ zone:
 	zonefile: %s
 """ % (domain, zonefile)
 
-		# If custom secondary nameservers have been set, allow zone transfers
-		# 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)
+		# If a custom secondary nameserver has been set, allow zone transfers
+		# and notifies to that nameserver.
+		if get_secondary_dns(additional_records):
+			# Get the IP address of the nameserver by resolving it.
+			hostname = get_secondary_dns(additional_records)
+			resolver = dns.resolver.get_default_resolver()
+			response = dns.resolver.query(hostname+'.', "A")
+			ipaddr = str(response[0])
+			nsdconf += """\tnotify: %s NOKEY
+	provide-xfr: %s NOKEY
+""" % (ipaddr, ipaddr)
 
 	# Check if the file is changing. If it isn't changing,
 	# return False to flag that no change was made.
@@ -528,13 +484,11 @@ zone:
 
 def dnssec_choose_algo(domain, env):
 	if '.' in domain and domain.rsplit('.')[-1] in \
-		("email", "guide", "fund", "be", "lv"):
+		("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.
-		# Gandi tells me that .be does not support RSASHA1-NSEC3-SHA1
-        # Nic.lv does not support RSASHA1-NSEC3-SHA1 for .lv tld's
 		return "RSASHA256"
 
 	# For any domain we were able to sign before, don't change the algorithm
@@ -769,25 +723,12 @@ def set_custom_dns_record(qname, rtype, value, action, env):
 	# validate rtype
 	rtype = rtype.upper()
 	if value is not None and qname != "_secondary_nameserver":
-		if not re.search(DOMAIN_RE, qname):
-			raise ValueError("Invalid name.")
-
 		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", "NS"):
-			if rtype == "NS" and qname == zone:
-				raise ValueError("NS records can only be set for subdomains.")
-
-			# ensure value has a trailing dot
-			if not value.endswith("."):
-				value = value + "."
-
-			if not re.search(DOMAIN_RE, value):
-				raise ValueError("Invalid value.")
-		elif rtype in ("CNAME", "TXT", "SRV", "MX", "SSHFP", "CAA"):
+		elif rtype in ("CNAME", "TXT", "SRV", "MX"):
 			# anything goes
 			pass
 		else:
@@ -837,82 +778,91 @@ def set_custom_dns_record(qname, rtype, value, action, env):
 	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()
-	resolver.timeout = 10
-
-	values = []
+def get_secondary_dns(custom_dns):
 	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
+		if qname == "_secondary_nameserver":
+			return value
+	return None
 
-			# 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)
+def set_secondary_dns(hostname, env):
 
-			# 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()
-		resolver.timeout = 5
-		for item in hostnames:
-			if not item.startswith("xfr:"):
-				# Resolve hostname.
-				try:
-					response = 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:
+	if hostname in (None, ""):
 		# Clear.
 		set_custom_dns_record("_secondary_nameserver", "A", None, "set", env)
+	else:
+		# Validate.
+		hostname = hostname.strip().lower()
+		resolver = dns.resolver.get_default_resolver()
+		try:
+			response = dns.resolver.query(hostname, "A")
+		except (dns.resolver.NoNameservers, dns.resolver.NXDOMAIN, dns.resolver.NoAnswer):
+			raise ValueError("Could not resolve the IP address of %s." % hostname)
+
+		# Set.
+		set_custom_dns_record("_secondary_nameserver", "A", hostname, "set", env)
 
 	# Apply.
 	return do_dns_update(env)
 
 
-def get_custom_dns_records(custom_dns, qname, rtype):
-	for qname1, rtype1, value in custom_dns:
-		if qname1 == qname and rtype1 == rtype:
-			yield value
-	return None
+########################################################################
+
+def justtestingdotemail(domain, records):
+	# If the domain is a subdomain of justtesting.email, which we own,
+	# automatically populate the zone where it is set up on dns4e.com.
+	# Ideally if dns4e.com supported NS records we would just have it
+	# delegate DNS to us, but instead we will populate the whole zone.
+
+	import subprocess, json, urllib.parse
+
+	if not domain.endswith(".justtesting.email"):
+		return
+
+	for subdomain, querytype, value, explanation in records:
+		if querytype in ("NS",): continue
+		if subdomain in ("www", "ns1", "ns2"): continue # don't do unnecessary things
+
+		if subdomain == None:
+			subdomain = domain
+		else:
+			subdomain = subdomain + "." + domain
+
+		if querytype == "TXT":
+			# nsd requires parentheses around txt records with multiple parts,
+			# but DNS4E requires there be no parentheses; also it goes into
+			# nsd with a newline and a tab, which we replace with a space here
+			value = re.sub("^\s*\(\s*([\w\W]*)\)", r"\1", value)
+			value = re.sub("\s+", " ", value)
+		else:
+			continue
+
+		print("Updating DNS for %s/%s..." % (subdomain, querytype))
+		resp = json.loads(subprocess.check_output([
+			"curl",
+			"-s",
+			"https://api.dns4e.com/v7/%s/%s" % (urllib.parse.quote(subdomain), querytype.lower()),
+			"--user", "2ddbd8e88ed1495fa0ec:A97TDJV26CVUJS6hqAs0CKnhj4HvjTM7MwAAg8xb",
+			"--data", "record=%s" % urllib.parse.quote(value),
+			]).decode("utf8"))
+		print("\t...", resp.get("message", "?"))
 
 ########################################################################
 
 def build_recommended_dns(env):
 	ret = []
-	for (domain, zonefile, records) in build_zones(env):
+	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)
+
 		# remove records that we don't dislay
 		records = [r for r in records if r[3] is not False]
 

management/email_administrator.py

@@ -1,60 +0,0 @@
-#!/usr/local/lib/mailinabox/env/bin/python
-
-# Reads in STDIN. If the stream is not empty, mail it to the system administrator.
-
-import sys
-
-import html
-import smtplib
-
-from email.mime.multipart import MIMEMultipart
-from email.mime.text import MIMEText
-
-# In Python 3.6:
-#from email.message import Message
-
-from utils import load_environment
-
-# Load system environment info.
-env = load_environment()
-
-# Process command line args.
-subject = sys.argv[1]
-
-# Administrator's email address.
-admin_addr = "administrator@" + env['PRIMARY_HOSTNAME']
-
-# Read in STDIN.
-content = sys.stdin.read().strip()
-
-# If there's nothing coming in, just exit.
-if content == "":
-	sys.exit(0)
-
-# create MIME message
-msg = MIMEMultipart('alternative')
-
-# In Python 3.6:
-#msg = Message()
-
-msg['From'] = "\"%s\" <%s>" % (env['PRIMARY_HOSTNAME'], admin_addr)
-msg['To'] = admin_addr
-msg['Subject'] = "[%s] %s" % (env['PRIMARY_HOSTNAME'], subject)
-
-content_html = "<html><body><pre>{}</pre></body></html>".format(html.escape(content))
-
-msg.attach(MIMEText(content, 'plain'))
-msg.attach(MIMEText(content_html, 'html'))
-
-# In Python 3.6:
-#msg.set_content(content)
-#msg.add_alternative(content_html, "html")
-
-# send
-smtpclient = smtplib.SMTP('127.0.0.1', 25)
-smtpclient.ehlo()
-smtpclient.sendmail(
-        admin_addr, # MAIL FROM
-        admin_addr, # RCPT TO
-        msg.as_string())
-smtpclient.quit()

management/mail_log.py

@@ -1,895 +1,121 @@
-#!/usr/local/lib/mailinabox/env/bin/python
-import argparse
-import datetime
-import gzip
-import os.path
-import re
-import shutil
-import tempfile
-import textwrap
-from collections import defaultdict, OrderedDict
+#!/usr/bin/python3
 
+import re, os.path
 import dateutil.parser
-import time
-
-from dateutil.relativedelta import relativedelta
 
+import mailconfig
 import utils
 
+def scan_mail_log(logger, env):
+	collector = {
+		"other-services": set(),
+		"imap-logins": { },
+		"postgrey": { },
+		"rejected-mail": { },
+	}
 
-LOG_FILES = (
-    '/var/log/mail.log',
-    '/var/log/mail.log.1',
-    '/var/log/mail.log.2.gz',
-    '/var/log/mail.log.3.gz',
-    '/var/log/mail.log.4.gz',
-    '/var/log/mail.log.5.gz',
-    '/var/log/mail.log.6.gz',
-)
+	collector["real_mail_addresses"] = set(mailconfig.get_mail_users(env)) | set(alias[0] for alias in mailconfig.get_mail_aliases(env))
 
-TIME_DELTAS = OrderedDict([
-    ('all', datetime.timedelta(weeks=52)),
-    ('month', datetime.timedelta(weeks=4)),
-    ('2weeks', datetime.timedelta(days=14)),
-    ('week', datetime.timedelta(days=7)),
-    ('2days', datetime.timedelta(days=2)),
-    ('day', datetime.timedelta(days=1)),
-    ('12hours', datetime.timedelta(hours=12)),
-    ('6hours', datetime.timedelta(hours=6)),
-    ('hour', datetime.timedelta(hours=1)),
-    ('30min', datetime.timedelta(minutes=30)),
-    ('10min', datetime.timedelta(minutes=10)),
-    ('5min', datetime.timedelta(minutes=5)),
-    ('min', datetime.timedelta(minutes=1)),
-    ('today', datetime.datetime.now() - datetime.datetime.now().replace(hour=0, minute=0, second=0))
-])
+	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)
 
-# Start date > end date!
-START_DATE = datetime.datetime.now()
-END_DATE = None
+	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)
 
-VERBOSE = False
+	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"))
 
-# List of strings to filter users with
-FILTERS = None
-
-# What to show (with defaults)
-SCAN_OUT = True  # Outgoing email
-SCAN_IN = True  # Incoming email
-SCAN_DOVECOT_LOGIN = True  # Dovecot Logins
-SCAN_GREY = False  # Greylisted email
-SCAN_BLOCKED = False  # Rejected email
-
-
-def scan_files(collector):
-    """ Scan files until they run out or the earliest date is reached """
-
-    stop_scan = False
-
-    for fn in LOG_FILES:
-
-        tmp_file = None
-
-        if not os.path.exists(fn):
-            continue
-        elif fn[-3:] == '.gz':
-            tmp_file = tempfile.NamedTemporaryFile()
-            shutil.copyfileobj(gzip.open(fn), tmp_file)
-
-        if VERBOSE:
-            print("Processing file", fn, "...")
-        fn = tmp_file.name if tmp_file else fn
-
-        for line in reverse_readline(fn):
-            if scan_mail_log_line(line.strip(), collector) is False:
-                if stop_scan:
-                    return
-                stop_scan = True
-            else:
-                stop_scan = False
-
-
-
-def scan_mail_log(env):
-    """ Scan the system's mail log files and collect interesting data
-
-    This function scans the 2 most recent mail log files in /var/log/.
-
-    Args:
-        env (dict): Dictionary containing MiaB settings
-
-    """
-
-    collector = {
-        "scan_count": 0,  # Number of lines scanned
-        "parse_count": 0,  # Number of lines parsed (i.e. that had their contents examined)
-        "scan_time": time.time(),  # The time in seconds the scan took
-        "sent_mail": OrderedDict(),  # Data about email sent by users
-        "received_mail": OrderedDict(),  # Data about email received by users
-        "logins": OrderedDict(),  # Data about login activity
-        "postgrey": {},  # Data about greylisting of email addresses
-        "rejected": OrderedDict(),  # Emails that were blocked
-        "known_addresses": None,  # Addresses handled by the Miab installation
-        "other-services": set(),
-    }
-
-    try:
-        import mailconfig
-        collector["known_addresses"] = (set(mailconfig.get_mail_users(env)) |
-                                        set(alias[0] for alias in mailconfig.get_mail_aliases(env)))
-    except ImportError:
-        pass
-
-    print("Scanning logs from {:%Y-%m-%d %H:%M:%S} to {:%Y-%m-%d %H:%M:%S}".format(
-        END_DATE, START_DATE)
-    )
-
-    # Scan the lines in the log files until the date goes out of range
-    scan_files(collector)
-
-    if not collector["scan_count"]:
-        print("No log lines scanned...")
-        return
-
-    collector["scan_time"] = time.time() - collector["scan_time"]
-
-    print("{scan_count} Log lines scanned, {parse_count} lines parsed in {scan_time:.2f} "
-          "seconds\n".format(**collector))
-
-    # Print Sent Mail report
-
-    if collector["sent_mail"]:
-        msg = "Sent email"
-        print_header(msg)
-
-        data = OrderedDict(sorted(collector["sent_mail"].items(), key=email_sort))
-
-        print_user_table(
-            data.keys(),
-            data=[
-                ("sent", [u["sent_count"] for u in data.values()]),
-                ("hosts", [len(u["hosts"]) for u in data.values()]),
-            ],
-            sub_data=[
-                ("sending hosts", [u["hosts"] for u in data.values()]),
-            ],
-            activity=[
-                ("sent", [u["activity-by-hour"] for u in data.values()]),
-            ],
-            earliest=[u["earliest"] for u in data.values()],
-            latest=[u["latest"] for u in data.values()],
-        )
-
-        accum = defaultdict(int)
-        data = collector["sent_mail"].values()
-
-        for h in range(24):
-            accum[h] = sum(d["activity-by-hour"][h] for d in data)
-
-        print_time_table(
-            ["sent"],
-            [accum]
-        )
-
-    # Print Received Mail report
-
-    if collector["received_mail"]:
-        msg = "Received email"
-        print_header(msg)
-
-        data = OrderedDict(sorted(collector["received_mail"].items(), key=email_sort))
-
-        print_user_table(
-            data.keys(),
-            data=[
-                ("received", [u["received_count"] for u in data.values()]),
-            ],
-            activity=[
-                ("sent", [u["activity-by-hour"] for u in data.values()]),
-            ],
-            earliest=[u["earliest"] for u in data.values()],
-            latest=[u["latest"] for u in data.values()],
-        )
-
-        accum = defaultdict(int)
-        for h in range(24):
-            accum[h] = sum(d["activity-by-hour"][h] for d in data.values())
-
-        print_time_table(
-            ["received"],
-            [accum]
-        )
-
-    # Print login report
-
-    if collector["logins"]:
-        msg = "User logins per hour"
-        print_header(msg)
-
-        data = OrderedDict(sorted(collector["logins"].items(), key=email_sort))
-
-        # Get a list of all of the protocols seen in the logs in reverse count order.
-        all_protocols = defaultdict(int)
-        for u in data.values():
-            for protocol_name, count in u["totals_by_protocol"].items():
-                all_protocols[protocol_name] += count
-        all_protocols = [k for k, v in sorted(all_protocols.items(), key=lambda kv : -kv[1])]
-
-        print_user_table(
-            data.keys(),
-            data=[
-                (protocol_name, [
-                    round(u["totals_by_protocol"][protocol_name] / (u["latest"]-u["earliest"]).total_seconds() * 60*60, 1)
-                    if (u["latest"]-u["earliest"]).total_seconds() > 0
-                    else 0 # prevent division by zero
-                  for u in data.values()])
-                for protocol_name in all_protocols
-            ],
-            sub_data=[
-                ("Protocol and Source", [[
-                    "{} {}: {} times".format(protocol_name, host, count)
-                    for (protocol_name, host), count
-                    in sorted(u["totals_by_protocol_and_host"].items(), key=lambda kv:-kv[1])
-                  ] for u in data.values()])
-            ],
-            activity=[
-                (protocol_name, [u["activity-by-hour"][protocol_name] for u in data.values()])
-                for protocol_name in all_protocols
-            ],
-            earliest=[u["earliest"] for u in data.values()],
-            latest=[u["latest"] for u in data.values()],
-            numstr=lambda n : str(round(n, 1)),
-        )
-
-        accum = { protocol_name: defaultdict(int) for protocol_name in all_protocols }
-        for h in range(24):
-            for protocol_name in all_protocols:
-              accum[protocol_name][h] = sum(d["activity-by-hour"][protocol_name][h] for d in data.values())
-
-        print_time_table(
-            all_protocols,
-            [accum[protocol_name] for protocol_name in all_protocols]
-        )
-
-    if collector["postgrey"]:
-        msg = "Greylisted Email {:%Y-%m-%d %H:%M:%S} and {:%Y-%m-%d %H:%M:%S}"
-        print_header(msg.format(END_DATE, START_DATE))
-
-        print(textwrap.fill(
-            "The following mail was greylisted, meaning the emails were temporarily rejected. "
-            "Legitimate senders will try again within ten minutes.",
-            width=80, initial_indent=" ", subsequent_indent=" "
-        ), end='\n\n')
-
-        data = OrderedDict(sorted(collector["postgrey"].items(), key=email_sort))
-        users = []
-        received = []
-        senders = []
-        sender_clients = []
-        delivered_dates = []
-
-        for recipient in data:
-            sorted_recipients = sorted(data[recipient].items(), key=lambda kv: kv[1][0] or kv[1][1])
-            for (client_address, sender), (first_date, delivered_date) in sorted_recipients:
-                if first_date:
-                    users.append(recipient)
-                    received.append(first_date)
-                    senders.append(sender)
-                    delivered_dates.append(delivered_date)
-                    sender_clients.append(client_address)
-
-        print_user_table(
-            users,
-            data=[
-                ("received", received),
-                ("sender", senders),
-                ("delivered", [str(d) or "no retry yet" for d in delivered_dates]),
-                ("sending host", sender_clients)
-            ],
-            delimit=True,
-        )
-
-    if collector["rejected"]:
-        msg = "Blocked Email {:%Y-%m-%d %H:%M:%S} and {:%Y-%m-%d %H:%M:%S}"
-        print_header(msg.format(END_DATE, START_DATE))
-
-        data = OrderedDict(sorted(collector["rejected"].items(), key=email_sort))
-
-        rejects = []
-
-        if VERBOSE:
-            for user_data in data.values():
-                user_rejects = []
-                for date, sender, message in user_data["blocked"]:
-                    if len(sender) > 64:
-                        sender = sender[:32] + "…" + sender[-32:]
-                    user_rejects.append("%s - %s " % (date, sender))
-                    user_rejects.append("  %s" % message)
-                rejects.append(user_rejects)
-
-        print_user_table(
-            data.keys(),
-            data=[
-                ("blocked", [len(u["blocked"]) for u in data.values()]),
-            ],
-            sub_data=[
-                ("blocked emails", rejects),
-            ],
-            earliest=[u["earliest"] for u in data.values()],
-            latest=[u["latest"] for u in data.values()],
-        )
-
-    if collector["other-services"] and VERBOSE and False:
-        print_header("Other services")
-        print("The following unkown services were found in the log file.")
-        print(" ", *sorted(list(collector["other-services"])), sep='\n│ ')
+	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)
 
+	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):
-    """ Scan a log line and extract interesting data """
+	m = re.match(r"(\S+ \d+ \d+:\d+:\d+) (\S+) (\S+?)(\[\d+\])?: (.*)", line)
+	if not m: return
 
-    m = re.match(r"(\w+[\s]+\d+ \d+:\d+:\d+) ([\w]+ )?([\w\-/]+)[^:]*: (.*)", line)
+	date, system, service, pid, log = m.groups()
+	date = dateutil.parser.parse(date)
+	
+	if service == "dovecot":
+		scan_dovecot_line(date, log, collector)
 
-    if not m:
-        return True
+	elif service == "postgrey":
+		scan_postgrey_line(date, log, collector)
 
-    date, system, service, log = m.groups()
-    collector["scan_count"] += 1
+	elif service == "postfix/smtpd":
+		scan_postfix_smtpd_line(date, log, collector)
 
-    # print()
-    # print("date:", date)
-    # print("host:", system)
-    # print("service:", service)
-    # print("log:", log)
+	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
 
-    # Replaced the dateutil parser for a less clever way of parser that is roughly 4 times faster.
-    # date = dateutil.parser.parse(date)
-    date = datetime.datetime.strptime(date, '%b %d %H:%M:%S')
-    date = date.replace(START_DATE.year)
-
-    # Check if the found date is within the time span we are scanning
-    if date > START_DATE:
-        # Don't process, but continue
-        return True
-    elif date < END_DATE:
-        # Don't process, and halt
-        return False
-
-    if service == "postfix/submission/smtpd":
-        if SCAN_OUT:
-            scan_postfix_submission_line(date, log, collector)
-    elif service == "postfix/lmtp":
-        if SCAN_IN:
-            scan_postfix_lmtp_line(date, log, collector)
-    elif service.endswith("-login"):
-        if SCAN_DOVECOT_LOGIN:
-            scan_dovecot_login_line(date, log, collector, service[:4])
-    elif service == "postgrey":
-        if SCAN_GREY:
-            scan_postgrey_line(date, log, collector)
-    elif service == "postfix/smtpd":
-        if SCAN_BLOCKED:
-            scan_postfix_smtpd_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", "anvil"):
-        # nothing to look at
-        return True
-    else:
-        collector["other-services"].add(service)
-        return True
-
-    collector["parse_count"] += 1
-    return True
+	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
 
 def scan_postgrey_line(date, log, collector):
-    """ Scan a postgrey log line and extract interesting data """
-
-    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, user = m.groups()
-
-        if user_match(user):
-
-            # Might be useful to group services that use a lot of mail different servers on sub
-            # domains like <sub>1.domein.com
-
-            # if '.' in client_name:
-            #     addr = client_name.split('.')
-            #     if len(addr) > 2:
-            #         client_name = '.'.join(addr[1:])
-
-            key = (client_address if client_name == 'unknown' else client_name, sender)
-
-            rep = collector["postgrey"].setdefault(user, {})
-
-            if action == "greylist" and reason == "new":
-                rep[key] = (date, rep[key][1] if key in rep else None)
-            elif action == "pass":
-                rep[key] = (rep[key][0] if key in rep else None, date)
-
+	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):
-    """ Scan a postfix smtpd log line and extract interesting data """
-
-    # Check if the incoming mail was rejected
-
-    m = re.match("NOQUEUE: reject: RCPT from .*?: (.*?); from=<(.*?)> to=<(.*?)>", log)
-
-    if m:
-        message, sender, user = m.groups()
-
-        # skip this, if reported in the greylisting report
-        if "Recipient address rejected: Greylisted" in message:
-            return
-
-        # only log mail to known recipients
-        if user_match(user):
-            if collector["known_addresses"] is None or user in collector["known_addresses"]:
-                data = collector["rejected"].get(
-                    user,
-                    {
-                        "blocked": [],
-                        "earliest": None,
-                        "latest": None,
-                    }
-                )
-                # simplify this one
-                m = re.search(
-                    r"Client host \[(.*?)\] blocked using zen.spamhaus.org; (.*)", message
-                )
-                if m:
-                    message = "ip blocked: " + m.group(2)
-                else:
-                    # simplify this one too
-                    m = re.search(
-                        r"Sender address \[.*@(.*)\] blocked using dbl.spamhaus.org; (.*)", message
-                    )
-                    if m:
-                        message = "domain blocked: " + m.group(2)
-
-                if data["latest"] is None:
-                    data["latest"] = date
-                data["earliest"] = date
-                data["blocked"].append((date, sender, message))
-
-                collector["rejected"][user] = data
-
-
-def scan_dovecot_login_line(date, log, collector, protocol_name):
-    """ Scan a dovecot login log line and extract interesting data """
-
-    m = re.match("Info: Login: user=<(.*?)>, method=PLAIN, rip=(.*?),", log)
-
-    if m:
-        # TODO: CHECK DIT
-        user, host = m.groups()
-
-        if user_match(user):
-            add_login(user, date, protocol_name, host, collector)
-
-
-def add_login(user, date, protocol_name, host, collector):
-            # Get the user data, or create it if the user is new
-            data = collector["logins"].get(
-                user,
-                {
-                    "earliest": None,
-                    "latest": None,
-                    "totals_by_protocol": defaultdict(int),
-                    "totals_by_protocol_and_host": defaultdict(int),
-                    "activity-by-hour": defaultdict(lambda : defaultdict(int)),
-                }
-            )
-
-            if data["latest"] is None:
-                data["latest"] = date
-            data["earliest"] = date
-
-            data["totals_by_protocol"][protocol_name] += 1
-            data["totals_by_protocol_and_host"][(protocol_name, host)] += 1
-
-            if host not in ("127.0.0.1", "::1") or True:
-                data["activity-by-hour"][protocol_name][date.hour] += 1
-
-            collector["logins"][user] = data
-
-
-def scan_postfix_lmtp_line(date, log, collector):
-    """ Scan a postfix lmtp log line and extract interesting data
-
-    It is assumed that every log of postfix/lmtp indicates an email that was successfully
-    received by Postfix.
-
-    """
-
-    m = re.match("([A-Z0-9]+): to=<(\S+)>, .* Saved", log)
-
-    if m:
-        _, user = m.groups()
-
-        if user_match(user):
-            # Get the user data, or create it if the user is new
-            data = collector["received_mail"].get(
-                user,
-                {
-                    "received_count": 0,
-                    "earliest": None,
-                    "latest": None,
-                    "activity-by-hour": defaultdict(int),
-                }
-            )
-
-            data["received_count"] += 1
-            data["activity-by-hour"][date.hour] += 1
-
-            if data["latest"] is None:
-                data["latest"] = date
-            data["earliest"] = date
-
-            collector["received_mail"][user] = data
-
-
-def scan_postfix_submission_line(date, log, collector):
-    """ Scan a postfix submission log line and extract interesting data
-
-    Lines containing a sasl_method with the values PLAIN or LOGIN are assumed to indicate a sent
-    email.
-
-    """
-
-    # Match both the 'plain' and 'login' sasl methods, since both authentication methods are
-    # allowed by Dovecot
-    m = re.match("([A-Z0-9]+): client=(\S+), sasl_method=(PLAIN|LOGIN), sasl_username=(\S+)", log)
-
-    if m:
-        _, client, method, user = m.groups()
-
-        if user_match(user):
-            # Get the user data, or create it if the user is new
-            data = collector["sent_mail"].get(
-                user,
-                {
-                    "sent_count": 0,
-                    "hosts": set(),
-                    "earliest": None,
-                    "latest": None,
-                    "activity-by-hour": defaultdict(int),
-                }
-            )
-
-            data["sent_count"] += 1
-            data["hosts"].add(client)
-            data["activity-by-hour"][date.hour] += 1
-
-            if data["latest"] is None:
-                data["latest"] = date
-            data["earliest"] = date
-
-            collector["sent_mail"][user] = data
-
-            # Also log this as a login.
-            add_login(user, date, "smtp", client, collector)
-
-# Utility functions
-
-def reverse_readline(filename, buf_size=8192):
-    """ A generator that returns the lines of a file in reverse order
-
-    http://stackoverflow.com/a/23646049/801870
-
-    """
-
-    with open(filename) as fh:
-        segment = None
-        offset = 0
-        fh.seek(0, os.SEEK_END)
-        file_size = remaining_size = fh.tell()
-        while remaining_size > 0:
-            offset = min(file_size, offset + buf_size)
-            fh.seek(file_size - offset)
-            buff = fh.read(min(remaining_size, buf_size))
-            remaining_size -= buf_size
-            lines = buff.split('\n')
-            # the first line of the buffer is probably not a complete line so
-            # we'll save it and append it to the last line of the next buffer
-            # we read
-            if segment is not None:
-                # if the previous chunk starts right from the beginning of line
-                # do not concat the segment to the last line of new chunk
-                # instead, yield the segment first
-                if buff[-1] is not '\n':
-                    lines[-1] += segment
-                else:
-                    yield segment
-            segment = lines[0]
-            for index in range(len(lines) - 1, 0, -1):
-                if len(lines[index]):
-                    yield lines[index]
-        # Don't yield None if the file was empty
-        if segment is not None:
-            yield segment
-
-
-def user_match(user):
-    """ Check if the given user matches any of the filters """
-    return FILTERS is None or any(u in user for u in FILTERS)
-
-
-def email_sort(email):
-    """ Split the given email address into a reverse order tuple, for sorting i.e (domain, name) """
-    return tuple(reversed(email[0].split('@')))
-
-
-def valid_date(string):
-    """ Validate the given date string fetched from the --startdate argument """
-    try:
-        date = dateutil.parser.parse(string)
-    except ValueError:
-        raise argparse.ArgumentTypeError("Unrecognized date and/or time '%s'" % string)
-    return date
-
-
-# Print functions
-
-def print_time_table(labels, data, do_print=True):
-    labels.insert(0, "hour")
-    data.insert(0, [str(h) for h in range(24)])
-
-    temp = "│ {:<%d} " % max(len(l) for l in labels)
-    lines = []
-
-    for label in labels:
-        lines.append(temp.format(label))
-
-    for h in range(24):
-        max_len = max(len(str(d[h])) for d in data)
-        base = "{:>%d} " % max(2, max_len)
-
-        for i, d in enumerate(data):
-            lines[i] += base.format(d[h])
-
-    lines.insert(0, "┬ totals by time of day:")
-    lines.append("└" + (len(lines[-1]) - 2) * "─")
-
-    if do_print:
-        print("\n".join(lines))
-    else:
-        return lines
-
-
-def print_user_table(users, data=None, sub_data=None, activity=None, latest=None, earliest=None,
-                     delimit=False, numstr=str):
-    str_temp = "{:<32} "
-    lines = []
-    data = data or []
-
-    col_widths = len(data) * [0]
-    col_left = len(data) * [False]
-    vert_pos = 0
-
-    do_accum = all(isinstance(n, (int, float)) for _, d in data for n in d)
-    data_accum = len(data) * ([0] if do_accum else [" "])
-
-    last_user = None
-
-    for row, user in enumerate(users):
-
-        if delimit:
-            if last_user and last_user != user:
-                lines.append(len(lines[-1]) * "…")
-            last_user = user
-
-        line = "{:<32} ".format(user[:31] + "…" if len(user) > 32 else user)
-
-        for col, (l, d) in enumerate(data):
-            if isinstance(d[row], str):
-                col_str = str_temp.format(d[row][:31] + "…" if len(d[row]) > 32 else d[row])
-                col_left[col] = True
-            elif isinstance(d[row], datetime.datetime):
-                col_str = "{:<20}".format(str(d[row]))
-                col_left[col] = True
-            else:
-                temp = "{:>%s}" % max(5, len(l) + 1, len(str(d[row])) + 1)
-                col_str = temp.format(str(d[row]))
-            col_widths[col] = max(col_widths[col], len(col_str))
-            line += col_str
-
-            if do_accum:
-                data_accum[col] += d[row]
-
-        try:
-            if None not in [latest, earliest]:
-                vert_pos = len(line)
-                e = earliest[row]
-                l = latest[row]
-                timespan = relativedelta(l, e)
-                if timespan.months:
-                    temp = " │ {:0.1f} months"
-                    line += temp.format(timespan.months + timespan.days / 30.0)
-                elif timespan.days:
-                    temp = " │ {:0.1f} days"
-                    line += temp.format(timespan.days + timespan.hours / 24.0)
-                elif (e.hour, e.minute) == (l.hour, l.minute):
-                    temp = " │ {:%H:%M}"
-                    line += temp.format(e)
-                else:
-                    temp = " │ {:%H:%M} - {:%H:%M}"
-                    line += temp.format(e, l)
-
-        except KeyError:
-            pass
-
-        lines.append(line.rstrip())
-
-        try:
-            if VERBOSE:
-                if sub_data is not None:
-                    for l, d in sub_data:
-                        if d[row]:
-                            lines.append("┬")
-                            lines.append("│ %s" % l)
-                            lines.append("├─%s─" % (len(l) * "─"))
-                            lines.append("│")
-                            max_len = 0
-                            for v in list(d[row]):
-                                lines.append("│ %s" % v)
-                                max_len = max(max_len, len(v))
-                            lines.append("└" + (max_len + 1) * "─")
-
-                if activity is not None:
-                    lines.extend(print_time_table(
-                        [label for label, _ in activity],
-                        [data[row] for _, data in activity],
-                        do_print=False
-                    ))
-
-        except KeyError:
-            pass
-
-    header = str_temp.format("")
-
-    for col, (l, _) in enumerate(data):
-        if col_left[col]:
-            header += l.ljust(max(5, len(l) + 1, col_widths[col]))
-        else:
-            header += l.rjust(max(5, len(l) + 1, col_widths[col]))
-
-    if None not in (latest, earliest):
-        header += " │ timespan   "
-
-    lines.insert(0, header.rstrip())
-
-    table_width = max(len(l) for l in lines)
-    t_line = table_width * "─"
-    b_line = table_width * "─"
-
-    if vert_pos:
-        t_line = t_line[:vert_pos + 1] + "┼" + t_line[vert_pos + 2:]
-        b_line = b_line[:vert_pos + 1] + ("┬" if VERBOSE else "┼") + b_line[vert_pos + 2:]
-
-    lines.insert(1, t_line)
-    lines.append(b_line)
-
-    # Print totals
-
-    data_accum = [numstr(a) for a in data_accum]
-    footer = str_temp.format("Totals:" if do_accum else " ")
-    for row, (l, _) in enumerate(data):
-        temp = "{:>%d}" % max(5, len(l) + 1)
-        footer += temp.format(data_accum[row])
-
-    try:
-        if None not in [latest, earliest]:
-            max_l = max(latest)
-            min_e = min(earliest)
-            timespan = relativedelta(max_l, min_e)
-            if timespan.days:
-                temp = " │ {:0.2f} days"
-                footer += temp.format(timespan.days + timespan.hours / 24.0)
-            elif (min_e.hour, min_e.minute) == (max_l.hour, max_l.minute):
-                temp = " │ {:%H:%M}"
-                footer += temp.format(min_e)
-            else:
-                temp = " │ {:%H:%M} - {:%H:%M}"
-                footer += temp.format(min_e, max_l)
-
-    except KeyError:
-        pass
-
-    lines.append(footer)
-
-    print("\n".join(lines))
-
-
-def print_header(msg):
-    print('\n' + msg)
-    print("═" * len(msg), '\n')
+	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) )
 
 
 if __name__ == "__main__":
-    try:
-        env_vars = utils.load_environment()
-    except FileNotFoundError:
-        env_vars = {}
-
-    parser = argparse.ArgumentParser(
-        description="Scan the mail log files for interesting data. By default, this script "
-                    "shows today's incoming and outgoing mail statistics. This script was ("
-                    "re)written for the Mail-in-a-box email server."
-                    "https://github.com/mail-in-a-box/mailinabox",
-        add_help=False
-    )
-
-    # Switches to determine what to parse and what to ignore
-
-    parser.add_argument("-r", "--received", help="Scan for received emails.",
-                        action="store_true")
-    parser.add_argument("-s", "--sent", help="Scan for sent emails.",
-                        action="store_true")
-    parser.add_argument("-l", "--logins", help="Scan for user logins to IMAP/POP3.",
-                        action="store_true")
-    parser.add_argument("-g", "--grey", help="Scan for greylisted emails.",
-                        action="store_true")
-    parser.add_argument("-b", "--blocked", help="Scan for blocked emails.",
-                        action="store_true")
-
-    parser.add_argument("-t", "--timespan", choices=TIME_DELTAS.keys(), default='today',
-                        metavar='<time span>',
-                        help="Time span to scan, going back from the start date. Possible values: "
-                             "{}. Defaults to 'today'.".format(", ".join(list(TIME_DELTAS.keys()))))
-    parser.add_argument("-d", "--startdate",  action="store", dest="startdate",
-                        type=valid_date, metavar='<start date>',
-                        help="Date and time to start scanning the log file from. If no date is "
-                             "provided, scanning will start from the current date and time.")
-    parser.add_argument("-u", "--users", action="store", dest="users",
-                        metavar='<email1,email2,email...>',
-                        help="Comma separated list of (partial) email addresses to filter the "
-                             "output with.")
-
-    parser.add_argument('-h', '--help', action='help', help="Print this message and exit.")
-    parser.add_argument("-v", "--verbose", help="Output extra data where available.",
-                        action="store_true")
-
-    args = parser.parse_args()
-
-    if args.startdate is not None:
-        START_DATE = args.startdate
-        if args.timespan == 'today':
-            args.timespan = 'day'
-        print("Setting start date to {}".format(START_DATE))
-
-    END_DATE = START_DATE - TIME_DELTAS[args.timespan]
-
-    VERBOSE = args.verbose
-
-    if args.received or args.sent or args.logins or args.grey or args.blocked:
-        SCAN_IN = args.received
-        if not SCAN_IN:
-            print("Ignoring received emails")
-
-        SCAN_OUT = args.sent
-        if not SCAN_OUT:
-            print("Ignoring sent emails")
-
-        SCAN_DOVECOT_LOGIN = args.logins
-        if not SCAN_DOVECOT_LOGIN:
-            print("Ignoring logins")
-
-        SCAN_GREY = args.grey
-        if SCAN_GREY:
-            print("Showing greylisted emails")
-
-        SCAN_BLOCKED = args.blocked
-        if SCAN_BLOCKED:
-            print("Showing blocked emails")
-
-    if args.users is not None:
-        FILTERS = args.users.strip().split(',')
-
-    scan_mail_log(env_vars)
+	from status_checks import ConsoleOutput
+	env = utils.load_environment()
+	scan_mail_log(ConsoleOutput(), env)

management/mailconfig.py

@@ -1,18 +1,8 @@
-#!/usr/local/lib/mailinabox/env/bin/python
-
-# NOTE:
-# This script is run both using the system-wide Python 3
-# interpreter (/usr/bin/python3) as well as through the
-# virtualenv (/usr/local/lib/mailinabox/env). So only
-# import packages at the top level of this script that
-# are installed in *both* contexts. We use the system-wide
-# Python 3 in setup/questions.sh to validate the email
-# address entered by the user.
+#!/usr/bin/python3
 
 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.
@@ -62,13 +52,11 @@ def sanitize_idn_email_address(email):
 	# to the underlying protocols.
 	try:
 		localpart, domainpart = email.split("@")
-		domainpart = idna.encode(domainpart).decode('ascii')
+		domainpart = domainpart.encode("idna").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
+	except:
+		# Domain part is not IDNA-valid, so leave unchanged. If there
+		# are non-ASCII characters it will be filtered out by
 		# validate_email.
 		return email
 
@@ -77,16 +65,15 @@ def prettify_idn_email_address(email):
 	# 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"))
+		domainpart = domainpart.encode("ascii").decode('idna')
 		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.
+	except:
+		# Failed to decode IDNA. Should never happen.
 		return email
 
 def is_dcv_address(email):
 	email = email.lower()
-	for localpart in ("admin", "administrator", "postmaster", "hostmaster", "webmaster", "abuse"):
+	for localpart in ("admin", "administrator", "postmaster", "hostmaster", "webmaster"):
 		if email.startswith(localpart+"@") or email.startswith(localpart+"+"):
 			return True
 	return False
@@ -146,20 +133,19 @@ def get_mail_users_ex(env, with_archived=False, with_slow_info=False):
 	if with_archived:
 		root = os.path.join(env['STORAGE_ROOT'], 'mail/mailboxes')
 		for domain in os.listdir(root):
-			if os.path.isdir(os.path.join(root, domain)):
-				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)
+			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 = { }
@@ -191,13 +177,13 @@ def get_admins(env):
 	return users
 
 def get_mail_aliases(env):
-	# Returns a sorted list of tuples of (address, forward-tos, permitted-senders).
+	# Returns a sorted list of tuples of (alias, forward-to string).
 	c = open_database(env)
-	c.execute('SELECT source, destination, permitted_senders FROM aliases')
-	aliases = { row[0]: row for row in c.fetchall() } # make dict
+	c.execute('SELECT source, destination FROM aliases')
+	aliases = { row[0]: row[1] for row in c.fetchall() } # make dict
 
 	# 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) ]
+	aliases = [ (source, aliases[source]) for source in utils.sort_email_addresses(aliases.keys(), env) ]
 	return aliases
 
 def get_mail_aliases_ex(env):
@@ -209,10 +195,9 @@ def get_mail_aliases_ex(env):
 	#     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,
+	#         source: "name@domain.tld", # IDNA-encoded
+	#         source_display: "name@domain.tld", # full Unicode
+	#         destination: ["target1@domain.com", "target2@domain.com", ...],
 	#         required: True|False
 	#       },
 	#       ...
@@ -223,10 +208,10 @@ def get_mail_aliases_ex(env):
 
 	required_aliases = get_required_aliases(env)
 	domains = {}
-	for address, forwards_to, permitted_senders in get_mail_aliases(env):
+	for source, destination in get_mail_aliases(env):
 		# get alias info
-		domain = get_domain(address)
-		required = (address in required_aliases)
+		domain = get_domain(source)
+		required = (source in required_aliases)
 
 		# add to list
 		if not domain in domains:
@@ -235,40 +220,33 @@ def get_mail_aliases_ex(env):
 				"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,
+			"source": source,
+			"source_display": prettify_idn_email_address(source),
+			"destination": [prettify_idn_email_address(d.strip()) for d in destination.split(",")],
 			"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.
+	# Sort aliases within each domain first by required-ness then lexicographically by source address.
 	for domain in domains:
-		domain["aliases"].sort(key = lambda alias : (alias["required"], alias["address"]))
+		domain["aliases"].sort(key = lambda alias : (alias["required"], alias["source"]))
 	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
+	if as_unicode: ret = ret.encode('ascii').decode('idna')
 	return ret
 
 def get_mail_domains(env, filter_aliases=lambda alias : True):
 	# Returns the domain names (IDNA-encoded) of all of the email addresses
 	# configured on the system.
 	return set(
-		   [get_domain(login, as_unicode=False) for login in get_mail_users(env)]
-		 + [get_domain(address, as_unicode=False) for address, *_ in get_mail_aliases(env) if filter_aliases(address) ]
+		   [get_domain(addr, as_unicode=False) for addr in get_mail_users(env)]
+		 + [get_domain(source, as_unicode=False) for source, target in get_mail_aliases(env) if filter_aliases((source, target)) ]
 		 )
 
 def add_mail_user(email, pw, privs, env):
@@ -313,6 +291,25 @@ def add_mail_user(email, pw, privs, env):
 	# write databasebefore next step
 	conn.commit()
 
+	# Create & subscribe the user's INBOX, Trash, Spam, and Drafts folders.
+	# * Our sieve rule for spam expects that the Spam folder exists.
+	# * 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, so create it
+	#   to avoid unnecessary polling.
+
+	# 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)
+
+	for folder in ("INBOX", "Trash", "Spam", "Drafts"):
+		if folder not in existing_mboxes:
+			utils.shell('check_call', ["doveadm", "mailbox", "create", "-u", email, "-s", folder])
+
 	# Update things in case any new domains are added.
 	return kick(env, "mail user added")
 
@@ -405,93 +402,67 @@ def add_remove_mail_user_privilege(email, priv, action, env):
 
 	return "OK"
 
-def add_mail_alias(address, forwards_to, permitted_senders, env, update_if_exists=False, do_kick=True):
+def add_mail_alias(source, destination, env, update_if_exists=False, do_kick=True):
 	# convert Unicode domain to IDNA
-	address = sanitize_idn_email_address(address)
+	source = sanitize_idn_email_address(source)
 
 	# Our database is case sensitive (oops), which affects mail delivery
 	# (Postfix always queries in lowercase?), so force lowercase.
-	address = address.lower()
+	source = source.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()
+	# validate source
+	source = source.strip()
+	if source == "":
+		return ("No incoming email address provided.", 400)
+	if not validate_email(source, mode='alias'):
+		return ("Invalid incoming email address (%s)." % source, 400)
 
 	# extra checks for email addresses used in domain control validation
-	is_dcv_source = is_dcv_address(address)
+	is_dcv_source = is_dcv_address(source)
+
+	# validate destination
+	dests = []
+	destination = destination.strip()
 
 	# 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)
+	d1 = sanitize_idn_email_address(destination)
+	if validate_email(d1, mode='alias') and not is_dcv_source:
+		dests.append(d1)
 
 	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"):
+		# case, the recipients must be complete email addresses.
+		for line in destination.split("\n"):
 			for email in line.split(","):
 				email = email.strip()
 				if email == "": continue
 				email = sanitize_idn_email_address(email) # Unicode => IDNA
-				# Strip any +tag from email alias and check privileges
-				privileged_email = re.sub(r"(?=\+)[^@]*(?=@)",'',email)
 				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(privileged_email, env, empty_on_error=True):
+					return ("Invalid destination 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)
+				dests.append(email)
+	if len(destination) == 0:
+		return ("No destination email address(es) provided.", 400)
+	destination = ",".join(dests)
 
 	# 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)." % address, 400)
+			return ("Alias already exists (%s)." % source, 400)
 		else:
-			c.execute("UPDATE aliases SET destination = ?, permitted_senders = ? WHERE source = ?", (forwards_to, permitted_senders, address))
+			c.execute("UPDATE aliases SET destination = ? WHERE source = ?", (destination, source))
 			return_status = "alias updated"
 
 	conn.commit()
@@ -500,15 +471,15 @@ def add_mail_alias(address, forwards_to, permitted_senders, env, update_if_exist
 		# Update things in case any new domains are added.
 		return kick(env, return_status)
 
-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)
+	source = sanitize_idn_email_address(source)
 
 	# 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:
@@ -532,21 +503,17 @@ def get_required_aliases(env):
 	# email on that domain are the required aliases or a catch-all/domain-forwarder.
 	real_mail_domains = get_mail_domains(env,
 		filter_aliases = lambda alias :
-			not alias.startswith("postmaster@")
-			and not alias.startswith("admin@")
-			and not alias.startswith("abuse@")
-			and not alias.startswith("@")
+			not alias[0].startswith("postmaster@") and not alias[0].startswith("admin@")
+			and not alias[0].startswith("@")
 			)
 
-	# Create postmaster@, admin@ and abuse@ for all domains we serve
-	# mail on. postmaster@ is assumed to exist by our Postfix configuration.
-	# admin@isn't anything, but it might save the user some trouble e.g. when
+	# Create postmaster@ and admin@ for all domains we serve mail on.
+	# postmaster@ is assumed to exist by our Postfix configuration. admin@
+	# isn't anything, but it might save the user some trouble e.g. when
 	# buying an SSL certificate.
-	# abuse@ is part of RFC2142: https://www.ietf.org/rfc/rfc2142.txt
 	for domain in real_mail_domains:
 		aliases.add("postmaster@" + domain)
 		aliases.add("admin@" + domain)
-		aliases.add("abuse@" + domain)
 
 	return aliases
 
@@ -561,38 +528,36 @@ def kick(env, mail_result=None):
 	# 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
+	existing_aliases = get_mail_aliases(env)
 	required_aliases = get_required_aliases(env)
 
-	def ensure_admin_alias_exists(address):
+	def ensure_admin_alias_exists(source):
 		# If a user account exists with that address, we're good.
-		if address in existing_users:
+		if source in existing_users:
 			return
 
-		# If the alias already exists, we're good.
-		if address in existing_aliases:
-			return
+		# Does this alias exists?
+		for s, t in existing_aliases:
+			if s == source:
+				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))
+		add_mail_alias(source, administrator, env, do_kick=False)
+		results.append("added alias %s (=> %s)\n" % (source, administrator))
 
-	for address in required_aliases:
-		ensure_admin_alias_exists(address)
+	for alias in required_aliases:
+		ensure_admin_alias_exists(alias)
 
 	# Remove auto-generated postmaster/admin on domains we no
 	# longer have any other email addresses for.
-	for address, forwards_to, *_ in existing_alias_records:
-		user, domain = address.split("@")
-		if user in ("postmaster", "admin", "abuse") \
-			and address not in required_aliases \
-			and forwards_to == get_system_administrator(env):
-			remove_mail_alias(address, env, do_kick=False)
-			results.append("removed alias %s (was to %s; domain no longer used for email)\n" % (address, forwards_to))
+	for source, target in existing_aliases:
+		user, domain = source.split("@")
+		if user in ("postmaster", "admin") \
+			and source not in required_aliases \
+			and target == get_system_administrator(env):
+			remove_mail_alias(source, env, do_kick=False)
+			results.append("removed alias %s (was to %s; domain no longer used for email)\n" % (source, target))
 
 	# Update DNS and nginx in case any domains are added/removed.
 
@@ -610,8 +575,8 @@ def validate_password(pw):
 		raise ValueError("No password provided.")
 	if re.search(r"[\s]", pw):
 		raise ValueError("Passwords cannot contain spaces.")
-	if len(pw) < 8:
-		raise ValueError("Passwords must be at least eight characters.")
+	if len(pw) < 4:
+		raise ValueError("Passwords must be at least four characters.")
 
 
 if __name__ == "__main__":

management/ssl_certificates.py

@@ -1,660 +0,0 @@
-#!/usr/local/lib/mailinabox/env/bin/python
-# Utilities for installing and selecting SSL certificates.
-
-import os, os.path, re, shutil, subprocess, tempfile
-
-from utils import shell, safe_domain_name, sort_domains
-import idna
-
-# SELECTING SSL CERTIFICATES FOR USE IN WEB
-
-def get_ssl_certificates(env):
-	# Scan all of the installed SSL certificates and map every domain
-	# that the certificates are good for to the best certificate for
-	# the domain.
-
-	from cryptography.hazmat.primitives.asymmetric.rsa import RSAPrivateKey
-	from cryptography.x509 import Certificate
-
-	# The certificates are all stored here:
-	ssl_root = os.path.join(env["STORAGE_ROOT"], 'ssl')
-
-	# List all of the files in the SSL directory and one level deep.
-	def get_file_list():
-		if not os.path.exists(ssl_root):
-			return
-		for fn in os.listdir(ssl_root):
-			if fn == 'ssl_certificate.pem':
-				# This is always a symbolic link
-				# to the certificate to use for
-				# PRIMARY_HOSTNAME. Don't let it
-				# be eligible for use because we
-				# could end up creating a symlink
-				# to itself --- we want to find
-				# the cert that it should be a
-				# symlink to.
-				continue
-			fn = os.path.join(ssl_root, fn)
-			if os.path.isfile(fn):
-				yield fn
-			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.
-	private_keys = { }
-	certificates = [ ]
-
-	# Scan each of the files to find private keys and certificates.
-	# We must load all of the private keys first before processing
-	# certificates so that we can check that we have a private key
-	# available before using a certificate.
-	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 = { }
-	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:
-			# The primary hostname can only use a certificate mapped
-			# to the system private key.
-			if domain == env['PRIMARY_HOSTNAME']:
-				if cert._private_key._filename != os.path.join(env['STORAGE_ROOT'], 'ssl', 'ssl_private_key.pem'):
-					continue
-
-			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():
-		#for c in cert_list: print(domain, c.not_valid_before, c.not_valid_after, "("+str(now)+")", c.issuer, c.subject, c._filename)
-		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,
-
-			###########################################################
-			# The above lines ensure that valid certificates are chosen
-			# over invalid certificates. The lines below choose between
-			# multiple valid certificates available for this domain.
-			###########################################################
-
-			# 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,
-
-			###########################################################
-			# We always choose the certificate that is good for the
-			# longest period of time. This is important for how we
-			# provision certificates for Let's Encrypt. To ensure that
-			# we don't re-provision every night, we have to ensure that
-			# if we choose to provison a certificate that it will
-			# *actually* be used so the provisioning logic knows it
-			# doesn't still need to provision a certificate for the
-			# domain.
-			###########################################################
-
-			# 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,
-			"certificate_object": cert,
-			}
-
-	return ret
-
-def get_domain_ssl_files(domain, ssl_certificates, env, allow_missing_cert=False, use_main_cert=True):
-	if use_main_cert or not allow_missing_cert:
-		# Get the system certificate info.
-		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'))
-		system_certificate = {
-			"private-key": ssl_private_key,
-			"certificate": ssl_certificate,
-			"primary-domain": env['PRIMARY_HOSTNAME'],
-			"certificate_object": load_pem(load_cert_chain(ssl_certificate)[0]),
-		}
-
-	if use_main_cert:
-		if domain == env['PRIMARY_HOSTNAME']:
-			# The primary domain must use the server certificate because
-			# it is hard-coded in some service configuration files.
-			return system_certificate
-
-	wildcard_domain = re.sub("^[^\.]+", "*", domain)
-	if domain in ssl_certificates:
-		return ssl_certificates[domain]
-	elif wildcard_domain in ssl_certificates:
-		return ssl_certificates[wildcard_domain]
-	elif not allow_missing_cert:
-		# No valid certificate is available for this domain! Return default files.
-		return system_certificate
-	else:
-		# No valid certificate is available for this domain.
-		return None
-
-
-# PROVISIONING CERTIFICATES FROM LETSENCRYPT
-
-def get_certificates_to_provision(env, limit_domains=None, show_valid_certs=True):
-	# Get a set of domain names that we can provision certificates for
-	# using certbot. We start with domains that the box is serving web
-	# for and subtract:
-	# * domains not in limit_domains if limit_domains is not empty
-	# * domains with custom "A" records, i.e. they are hosted elsewhere
-	# * domains with actual "A" records that point elsewhere
-	# * domains that already have certificates that will be valid for a while
-
-	from web_update import get_web_domains
-	from status_checks import query_dns, normalize_ip
-
-	existing_certs = get_ssl_certificates(env)
-
-	plausible_web_domains = get_web_domains(env, exclude_dns_elsewhere=False)
-	actual_web_domains = get_web_domains(env)
-
-	domains_to_provision = set()
-	domains_cant_provision = { }
-
-	for domain in plausible_web_domains:
-		# Skip domains that the user doesn't want to provision now.
-		if limit_domains and domain not in limit_domains:
-			continue
-
-		# Check that there isn't an explicit A/AAAA record.
-		if domain not in actual_web_domains:
-			domains_cant_provision[domain] = "The domain has a custom DNS A/AAAA record that points the domain elsewhere, so there is no point to installing a TLS certificate here and we could not automatically provision one anyway because provisioning requires access to the website (which isn't here)."
-
-		# Check that the DNS resolves to here.
-		else:
-
-			# Does the domain resolve to this machine in public DNS? If not,
-			# we can't do domain control validation. For IPv6 is configured,
-			# make sure both IPv4 and IPv6 are correct because we don't know
-			# how Let's Encrypt will connect.
-			bad_dns = []
-			for rtype, value in [("A", env["PUBLIC_IP"]), ("AAAA", env.get("PUBLIC_IPV6"))]:
-				if not value: continue # IPv6 is not configured
-				response = query_dns(domain, rtype)
-				if response != normalize_ip(value):
-					bad_dns.append("%s (%s)" % (response, rtype))
-	
-			if bad_dns:
-				domains_cant_provision[domain] = "The domain name does not resolve to this machine: " \
-					+ (", ".join(bad_dns)) \
-					+ "."
-			
-			else:
-				# DNS is all good.
-
-				# Check for a good existing cert.
-				existing_cert = get_domain_ssl_files(domain, existing_certs, env, use_main_cert=False, allow_missing_cert=True)
-				if existing_cert:
-					existing_cert_check = check_certificate(domain, existing_cert['certificate'], existing_cert['private-key'],
-						warn_if_expiring_soon=14)
-					if existing_cert_check[0] == "OK":
-						if show_valid_certs:
-							domains_cant_provision[domain] = "The domain has a valid certificate already. ({} Certificate: {}, private key {})".format(
-								existing_cert_check[1],
-								existing_cert['certificate'],
-								existing_cert['private-key'])
-						continue
-
-				domains_to_provision.add(domain)
-
-	return (domains_to_provision, domains_cant_provision)
-
-def provision_certificates(env, limit_domains):
-	# What domains should we provision certificates for? And what
-	# errors prevent provisioning for other domains.
-	domains, domains_cant_provision = get_certificates_to_provision(env, limit_domains=limit_domains)
-
-	# Build a list of what happened on each domain or domain-set.
-	ret = []
-	for domain, error in domains_cant_provision.items():
-		ret.append({
-			"domains": [domain],
-			"log": [error],
-			"result": "skipped",
-		})
-
-
-	# Break into groups of up to 100 certificates at a time, which is Let's Encrypt's
-	# limit for a single certificate. We'll sort to put related domains together.
-	max_domains_per_group = 100
-	domains = sort_domains(domains, env)
-	certs = []
-	while len(domains) > 0:
-		certs.append( domains[:max_domains_per_group] )
-		domains = domains[max_domains_per_group:]
-
-	# Prepare to provision.
-
-	# Where should we put our Let's Encrypt account info and state cache.
-	account_path = os.path.join(env['STORAGE_ROOT'], 'ssl/lets_encrypt')
-	if not os.path.exists(account_path):
-		os.mkdir(account_path)
-
-	# Provision certificates.
-	for domain_list in certs:
-		ret.append({
-			"domains": domain_list,
-			"log": [],
-		})
-		try:
-			# Create a CSR file for our master private key so that certbot
-			# uses our private key.
-			key_file = os.path.join(env['STORAGE_ROOT'], 'ssl', 'ssl_private_key.pem')
-			with tempfile.NamedTemporaryFile() as csr_file:
-				# We could use openssl, but certbot requires
-				# that the CN domain and SAN domains match
-				# the domain list passed to certbot, and adding
-				# SAN domains openssl req is ridiculously complicated.
-				# subprocess.check_output([
-				# 	"openssl", "req", "-new",
-				# 	"-key", key_file,
-				# 	"-out", csr_file.name,
-				# 	"-subj", "/CN=" + domain_list[0],
-				# 	"-sha256" ])
-				from cryptography import x509
-				from cryptography.hazmat.backends import default_backend
-				from cryptography.hazmat.primitives.serialization import Encoding
-				from cryptography.hazmat.primitives import hashes
-				from cryptography.x509.oid import NameOID
-				builder = x509.CertificateSigningRequestBuilder()
-				builder = builder.subject_name(x509.Name([ x509.NameAttribute(NameOID.COMMON_NAME, domain_list[0]) ]))
-				builder = builder.add_extension(x509.BasicConstraints(ca=False, path_length=None), critical=True)
-				builder = builder.add_extension(x509.SubjectAlternativeName(
-					[x509.DNSName(d) for d in domain_list]
-				), critical=False)
-				request = builder.sign(load_pem(load_cert_chain(key_file)[0]), hashes.SHA256(), default_backend())
-				with open(csr_file.name, "wb") as f:
-					f.write(request.public_bytes(Encoding.PEM))
-
-				# Provision, writing to a temporary file.
-				webroot = os.path.join(account_path, 'webroot')
-				os.makedirs(webroot, exist_ok=True)
-				with tempfile.TemporaryDirectory() as d:
-					cert_file = os.path.join(d, 'cert_and_chain.pem')
-					print("Provisioning TLS certificates for " + ", ".join(domain_list) + ".")
-					certbotret = subprocess.check_output([
-						"certbot",
-						"certonly",
-						#"-v", # just enough to see ACME errors
-						"--non-interactive", # will fail if user hasn't registered during Mail-in-a-Box setup
-
-						"-d", ",".join(domain_list), # first will be main domain
-
-						"--csr", csr_file.name, # use our private key; unfortunately this doesn't work with auto-renew so we need to save cert manually
-						"--cert-path", os.path.join(d, 'cert'), # we only use the full chain
-						"--chain-path", os.path.join(d, 'chain'), # we only use the full chain
-						"--fullchain-path", cert_file,
-
-						"--webroot", "--webroot-path", webroot,
-
-						"--config-dir", account_path,
-						#"--staging",
-					], stderr=subprocess.STDOUT).decode("utf8")
-					install_cert_copy_file(cert_file, env)
-
-			ret[-1]["log"].append(certbotret)
-			ret[-1]["result"] = "installed"
-		except subprocess.CalledProcessError as e:
-			ret[-1]["log"].append(e.output.decode("utf8"))
-			ret[-1]["result"] = "error"
-		except Exception as e:
-			ret[-1]["log"].append(str(e))
-			ret[-1]["result"] = "error"
-
-	# Run post-install steps.
-	ret.extend(post_install_func(env))
-
-	# Return what happened with each certificate request.
-	return ret
-
-def provision_certificates_cmdline():
-	import sys
-	from exclusiveprocess import Lock
-
-	from utils import load_environment
-
-	Lock(die=True).forever()
-	env = load_environment()
-
-	quiet = False
-	domains = []
-
-	for arg in sys.argv[1:]:
-		if arg == "-q":
-			quiet = True
-		else:
-			domains.append(arg)
-
-	# Go.
-	status = provision_certificates(env, limit_domains=domains)
-
-	# Show what happened.
-	for request in status:
-		if isinstance(request, str):
-			print(request)
-		else:
-			if quiet and request['result'] == 'skipped':
-				continue
-			print(request['result'] + ":", ", ".join(request['domains']) + ":")
-			for line in request["log"]:
-				print(line)
-			print()
-
-
-# INSTALLING A NEW CERTIFICATE FROM THE CONTROL PANEL
-
-def create_csr(domain, ssl_key, country_code, env):
-	return shell("check_output", [
-				"openssl", "req", "-new",
-				"-key", ssl_key,
-				"-sha256",
-				"-subj", "/C=%s/CN=%s" % (country_code, domain)])
-
-def install_cert(domain, ssl_cert, ssl_chain, env, raw=False):
-	# Write the combined cert+chain to a temporary path and validate that it is OK.
-	# The certificate always goes above the chain.
-	import tempfile
-	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.
-	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
-
-	# Copy certifiate into ssl directory.
-	install_cert_copy_file(fn, env)
-
-	# Run post-install steps.
-	ret = post_install_func(env)
-	if raw: return ret
-	return "\n".join(ret)
-
-
-def install_cert_copy_file(fn, env):
-	# Where to put it?
-	# Make a unique path for the certificate.
-	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.pem" % (
-		safe_domain_name(cn), # common name, which should be filename safe because it is IDNA-encoded, but in case of a malformed cert make sure it's ok to use as a filename
-		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))
-
-	# Install the certificate.
-	os.makedirs(os.path.dirname(ssl_certificate), exist_ok=True)
-	shutil.move(fn, ssl_certificate)
-
-
-def post_install_func(env):
-	ret = []
-
-	# Get the certificate to use for PRIMARY_HOSTNAME.
-	ssl_certificates = get_ssl_certificates(env)
-	cert = get_domain_ssl_files(env['PRIMARY_HOSTNAME'], ssl_certificates, env, use_main_cert=False)
-	if not cert:
-		# Ruh-row, we don't have any certificate usable
-		# for the primary hostname.
-		ret.append("there is no valid certificate for " + env['PRIMARY_HOSTNAME'])
-
-	# Symlink the best cert for PRIMARY_HOSTNAME to the system
-	# certificate path, which is hard-coded for various purposes, and then
-	# restart postfix and dovecot.
-	system_ssl_certificate = os.path.join(os.path.join(env["STORAGE_ROOT"], 'ssl', 'ssl_certificate.pem'))
-	if cert and os.readlink(system_ssl_certificate) != cert['certificate']:
-		# Update symlink.
-		ret.append("updating primary certificate")
-		ssl_certificate = cert['certificate']
-		os.unlink(system_ssl_certificate)
-		os.symlink(ssl_certificate, system_ssl_certificate)
-
-		# Restart postfix and dovecot so they pick up the new file.
-		shell('check_call', ["/usr/sbin/service", "postfix", "restart"])
-		shell('check_call', ["/usr/sbin/service", "dovecot", "restart"])
-		ret.append("mail services restarted")
-
-		# The DANE TLSA record will remain valid so long as the private key
-		# hasn't changed. We don't ever change the private key automatically.
-		# If the user does it, they must manually update DNS.
-
-	# Update the web configuration so nginx picks up the new certificate file.
-	from web_update import do_web_update
-	ret.append( do_web_update(env) )
-
-	return ret
-
-# VALIDATION OF CERTIFICATES
-
-def check_certificate(domain, ssl_certificate, ssl_private_key, warn_if_expiring_soon=10, rounded_time=False, just_check_domain=False):
-	# Check that the ssl_certificate & ssl_private_key files are good
-	# for the provided domain.
-
-	from cryptography.hazmat.primitives.asymmetric.rsa import RSAPrivateKey
-	from cryptography.x509 import Certificate
-
-	# The ssl_certificate file may contain a chain of certificates. We'll
-	# need to split that up before we can pass anything to openssl or
-	# parse them in Python. Parse it with the cryptography library.
-	try:
-		ssl_cert_chain = load_cert_chain(ssl_certificate)
-		cert = load_pem(ssl_cert_chain[0])
-		if not isinstance(cert, Certificate): raise ValueError("This is not a certificate file.")
-	except ValueError as e:
-		return ("There is a problem with the certificate file: %s" % str(e), None)
-
-	# First check that the domain name is one of the names allowed by
-	# the certificate.
-	if domain is not None:
-		certificate_names, cert_primary_name = get_certificate_domains(cert)
-
-		# Check that the domain appears among the acceptable names, or a wildcard
-		# form of the domain name (which is a stricter check than the specs but
-		# should work in normal cases).
-		wildcard_domain = re.sub("^[^\.]+", "*", domain)
-		if domain not in certificate_names and wildcard_domain not in certificate_names:
-			return ("The certificate is for the wrong domain name. It is for %s."
-				% ", ".join(sorted(certificate_names)), None)
-
-	# Second, check that the certificate matches the private key.
-	if ssl_private_key is not None:
-		try:
-			priv_key = load_pem(open(ssl_private_key, 'rb').read())
-		except ValueError as e:
-			return ("The private key file %s is not a private key file: %s" % (ssl_private_key, str(e)), None)
-
-		if not isinstance(priv_key, RSAPrivateKey):
-			return ("The private key file %s is not a private key file." % ssl_private_key, None)
-
-		if priv_key.public_key().public_numbers() != cert.public_key().public_numbers():
-			return ("The certificate does not correspond to the private key at %s." % ssl_private_key, None)
-
-		# We could also use the openssl command line tool to get the modulus
-		# listed in each file. The output of each command below looks like "Modulus=XXXXX".
-		# $ openssl rsa -inform PEM -noout -modulus -in ssl_private_key
-		# $ openssl x509 -in ssl_certificate -noout -modulus
-
-	# Third, check if the certificate is self-signed. Return a special flag string.
-	if cert.issuer == cert.subject:
-		return ("SELF-SIGNED", None)
-
-	# When selecting which certificate to use for non-primary domains, we check if the primary
-	# certificate or a www-parent-domain certificate is good for the domain. There's no need
-	# to run extra checks beyond this point.
-	if just_check_domain:
-		return ("OK", None)
-
-	# Check that the certificate hasn't expired. The datetimes returned by the
-	# certificate are 'naive' and in UTC. We need to get the current time in UTC.
-	import datetime
-	now = datetime.datetime.utcnow()
-	if not(cert.not_valid_before <= now <= cert.not_valid_after):
-		return ("The certificate has expired or is not yet valid. It is valid from %s to %s." % (cert.not_valid_before, cert.not_valid_after), None)
-
-	# 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.
-
-	# The certificate chain has to be passed separately and is given via STDIN.
-	# 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 len(ssl_cert_chain) == 1 else ["-untrusted", "/proc/self/fd/0"])
-		+ [ssl_certificate],
-		input=b"\n\n".join(ssl_cert_chain[1:]),
-		trap=True)
-
-	if "self signed" in verifyoutput:
-		# Certificate is self-signed. Probably we detected this above.
-		return ("SELF-SIGNED", None)
-
-	elif retcode != 0:
-		if "unable to get local issuer certificate" in verifyoutput:
-			return ("The certificate is missing an intermediate chain or the intermediate chain is incorrect or incomplete. (%s)" % verifyoutput, None)
-
-		# There is some unknown problem. Return the `openssl verify` raw output.
-		return ("There is a problem with the certificate.", verifyoutput.strip())
-
-	else:
-		# `openssl verify` returned a zero exit status so the cert is currently
-		# good.
-
-		# But is it expiring soon?
-		cert_expiration_date = cert.not_valid_after
-		ndays = (cert_expiration_date-now).days
-		if not rounded_time or ndays <= 10:
-			# Yikes better renew soon!
-			expiry_info = "The certificate expires in %d days on %s." % (ndays, cert_expiration_date.strftime("%x"))
-		else:
-			# We'll renew it with Lets Encrypt.
-			expiry_info = "The certificate expires on %s." % cert_expiration_date.strftime("%x")
-
-		if warn_if_expiring_soon and ndays <= warn_if_expiring_soon:
-			# Warn on day 10 to give 4 days for us to automatically renew the
-			# certificate, which occurs on day 14.
-			return ("The certificate is expiring soon: " + expiry_info, None)
-
-		# Return the special OK code.
-		return ("OK", expiry_info)
-
-def load_cert_chain(pemfile):
-	# A certificate .pem file may contain a chain of certificates.
-	# Load the file and split them apart.
-	re_pem = rb"(-+BEGIN (?:.+)-+[\r\n]+(?:[A-Za-z0-9+/=]{1,64}[\r\n]+)+-+END (?:.+)-+[\r\n]+)"
-	with open(pemfile, "rb") as f:
-		pem = f.read() + b"\n" # ensure trailing newline
-		pemblocks = re.findall(re_pem, pem)
-		if len(pemblocks) == 0:
-			raise ValueError("File does not contain valid PEM data.")
-		return pemblocks
-
-def load_pem(pem):
-	# Parse a "---BEGIN .... END---" PEM string and return a Python object for it
-	# using classes from the cryptography package.
-	from cryptography.x509 import load_pem_x509_certificate
-	from cryptography.hazmat.primitives import serialization
-	from cryptography.hazmat.backends import default_backend
-	pem_type = re.match(b"-+BEGIN (.*?)-+[\r\n]", pem)
-	if pem_type is None:
-		raise ValueError("File is not a valid PEM-formatted file.")
-	pem_type = pem_type.group(1)
-	if pem_type in (b"RSA PRIVATE KEY", b"PRIVATE KEY"):
-		return serialization.load_pem_private_key(pem, password=None, backend=default_backend())
-	if pem_type == b"CERTIFICATE":
-		return load_pem_x509_certificate(pem, default_backend())
-	raise ValueError("Unsupported PEM object type: " + pem_type.decode("ascii", "replace"))
-
-def get_certificate_domains(cert):
-	from cryptography.x509 import DNSName, ExtensionNotFound, OID_COMMON_NAME, OID_SUBJECT_ALTERNATIVE_NAME
-	import idna
-
-	names = set()
-	cn = None
-
-	# The domain may be found in the Subject Common Name (CN). This comes back as an IDNA (ASCII)
-	# string, which is the format we store domains in - so good.
-	try:
-		cn = cert.subject.get_attributes_for_oid(OID_COMMON_NAME)[0].value
-		names.add(cn)
-	except IndexError:
-		# No common name? Certificate is probably generated incorrectly.
-		# But we'll let it error-out when it doesn't find the domain.
-		pass
-
-	# ... or be one of the Subject Alternative Names. The cryptography library handily IDNA-decodes
-	# the names for us. We must encode back to ASCII, but wildcard certificates can't pass through
-	# IDNA encoding/decoding so we must special-case. See https://github.com/pyca/cryptography/pull/2071.
-	def idna_decode_dns_name(dns_name):
-		if dns_name.startswith("*."):
-			return "*." + idna.encode(dns_name[2:]).decode('ascii')
-		else:
-			return idna.encode(dns_name).decode('ascii')
-
-	try:
-		sans = cert.extensions.get_extension_for_oid(OID_SUBJECT_ALTERNATIVE_NAME).value.get_values_for_type(DNSName)
-		for san in sans:
-			names.add(idna_decode_dns_name(san))
-	except ExtensionNotFound:
-		pass
-
-	return names, cn
-
-if __name__  == "__main__":
-	# Provision certificates.
-	provision_certificates_cmdline()

management/status_checks.py

@@ -1,45 +1,21 @@
-#!/usr/local/lib/mailinabox/env/bin/python
+#!/usr/bin/python3
 #
 # Checks that the upstream DNS has been set correctly and that
-# TLS certificates have been signed, etc., and if not tells the user
+# SSL certificates have been signed, etc., and if not tells the user
 # what to do next.
 
+__ALL__ = ['check_certificate']
+
 import sys, os, os.path, re, subprocess, datetime, multiprocessing.pool
 
 import dns.reversename, dns.resolver
 import dateutil.parser, dateutil.tz
-import idna
-import psutil
 
-from dns_update import get_dns_zones, build_tlsa_record, get_custom_dns_config, get_secondary_dns, get_custom_dns_records
-from web_update import get_web_domains, get_domains_with_a_records
-from ssl_certificates import get_ssl_certificates, get_domain_ssl_files, check_certificate
+from dns_update import get_dns_zones, build_tlsa_record, get_custom_dns_config, get_secondary_dns
+from web_update import get_web_domains, get_default_www_redirects, get_domain_ssl_files
 from mailconfig import get_mail_domains, get_mail_aliases
 
-from utils import shell, sort_domains, load_env_vars_from_file, load_settings
-
-def get_services():
-	return [
-		{ "name": "Local DNS (bind9)", "port": 53, "public": False, },
-		#{ "name": "NSD Control", "port": 8952, "public": False, },
-		{ "name": "Local DNS Control (bind9/rndc)", "port": 953, "public": False, },
-		{ "name": "Dovecot LMTP LDA", "port": 10026, "public": False, },
-		{ "name": "Postgrey", "port": 10023, "public": False, },
-		{ "name": "Spamassassin", "port": 10025, "public": False, },
-		{ "name": "OpenDKIM", "port": 8891, "public": False, },
-		{ "name": "OpenDMARC", "port": 8893, "public": False, },
-		{ "name": "Memcached", "port": 11211, "public": False, },
-		{ "name": "Mail-in-a-Box Management Daemon", "port": 10222, "public": False, },
-		{ "name": "SSH Login (ssh)", "port": get_ssh_port(), "public": True, },
-		{ "name": "Public DNS (nsd4)", "port": 53, "public": True, },
-		{ "name": "Incoming Mail (SMTP/postfix)", "port": 25, "public": True, },
-		{ "name": "Outgoing Mail (SMTP 587/postfix)", "port": 587, "public": True, },
-		#{ "name": "Postfix/master", "port": 10587, "public": True, },
-		{ "name": "IMAPS (dovecot)", "port": 993, "public": True, },
-		{ "name": "Mail Filters (Sieve/dovecot)", "port": 4190, "public": True, },
-		{ "name": "HTTP Web (nginx)", "port": 80, "public": True, },
-		{ "name": "HTTPS Web (nginx)", "port": 443, "public": True, },
-	]
+from utils import shell, sort_domains, load_env_vars_from_file
 
 def run_checks(rounded_values, env, output, pool):
 	# run systems checks
@@ -56,7 +32,7 @@ def run_checks(rounded_values, env, output, pool):
 	# (ignore errors; if bind9/rndc isn't running we'd already report
 	# that in run_services checks.)
 	shell('check_call', ["/usr/sbin/rndc", "flush"], trap=True)
-
+	
 	run_system_checks(rounded_values, env, output)
 
 	# perform other checks asynchronously
@@ -84,9 +60,33 @@ def get_ssh_port():
 
 def run_services_checks(env, output, pool):
 	# Check that system services are running.
+
+	services = [
+		{ "name": "Local DNS (bind9)", "port": 53, "public": False, },
+		#{ "name": "NSD Control", "port": 8952, "public": False, },
+		{ "name": "Local DNS Control (bind9/rndc)", "port": 953, "public": False, },
+		{ "name": "Dovecot LMTP LDA", "port": 10026, "public": False, },
+		{ "name": "Postgrey", "port": 10023, "public": False, },
+		{ "name": "Spamassassin", "port": 10025, "public": False, },
+		{ "name": "OpenDKIM", "port": 8891, "public": False, },
+		{ "name": "OpenDMARC", "port": 8893, "public": False, },
+		{ "name": "Memcached", "port": 11211, "public": False, },
+		{ "name": "Sieve (dovecot)", "port": 4190, "public": False, },
+		{ "name": "Mail-in-a-Box Management Daemon", "port": 10222, "public": False, },
+
+		{ "name": "SSH Login (ssh)", "port": get_ssh_port(), "public": True, },
+		{ "name": "Public DNS (nsd4)", "port": 53, "public": True, },
+		{ "name": "Incoming Mail (SMTP/postfix)", "port": 25, "public": True, },
+		{ "name": "Outgoing Mail (SMTP 587/postfix)", "port": 587, "public": True, },
+		#{ "name": "Postfix/master", "port": 10587, "public": True, },
+		{ "name": "IMAPS (dovecot)", "port": 993, "public": True, },
+		{ "name": "HTTP Web (nginx)", "port": 80, "public": True, },
+		{ "name": "HTTPS Web (nginx)", "port": 443, "public": True, },
+	]
+
 	all_running = True
 	fatal = False
-	ret = pool.starmap(check_service, ((i, service, env) for i, service in enumerate(get_services())), chunksize=1)
+	ret = pool.starmap(check_service, ((i, service, env) for i, service in enumerate(services)), chunksize=1)
 	for i, running, fatal2, output2 in sorted(ret):
 		if output2 is None: continue # skip check (e.g. no port was set, e.g. no sshd)
 		all_running = all_running and running
@@ -103,101 +103,53 @@ def check_service(i, service, env):
 		# Skip check (no port, e.g. no sshd).
 		return (i, None, None, None)
 
+	import socket
 	output = BufferedOutput()
 	running = False
 	fatal = False
-
-	# Helper function to make a connection to the service, since we try
-	# up to three ways (localhost, IPv4 address, IPv6 address).
-	def try_connect(ip):
-		# Connect to the given IP address on the service's port with a one-second timeout.
-		import socket
-		s = socket.socket(socket.AF_INET if ":" not in ip else socket.AF_INET6, socket.SOCK_STREAM)
-		s.settimeout(1)
+	s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+	s.settimeout(1)
+	try:
 		try:
-			s.connect((ip, service["port"]))
-			return True
-		except OSError as e:
-			# timed out or some other odd error
-			return False
-		finally:
-			s.close()
-
-	if service["public"]:
-		# Service should be publicly accessible.
-		if try_connect(env["PUBLIC_IP"]):
-			# IPv4 ok.
-			if not env.get("PUBLIC_IPV6") or service.get("ipv6") is False or try_connect(env["PUBLIC_IPV6"]):
-				# No IPv6, or service isn't meant to run on IPv6, or IPv6 is good.
-				running = True
-
-			# IPv4 ok but IPv6 failed. Try the PRIVATE_IPV6 address to see if the service is bound to the interface.
-			elif service["port"] != 53 and try_connect(env["PRIVATE_IPV6"]):
-				output.print_error("%s is running (and available over IPv4 and the local IPv6 address), but it is not publicly accessible at %s:%d." % (service['name'], env['PUBLIC_IP'], service['port']))
+			s.connect((
+				"127.0.0.1" if not service["public"] else env['PUBLIC_IP'],
+				service["port"]))
+			running = True
+		except OSError as e1:
+			if service["public"] and service["port"] != 53:
+				# For public services (except DNS), try the private IP as a fallback.
+				s1 = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+				s1.settimeout(1)
+				try:
+					s1.connect(("127.0.0.1", service["port"]))
+					output.print_error("%s is running but is not publicly accessible at %s:%d (%s)." % (service['name'], env['PUBLIC_IP'], service['port'], str(e1)))
+				except:
+					raise e1
+				finally:
+					s1.close()
 			else:
-				output.print_error("%s is running and available over IPv4 but is not accessible over IPv6 at %s port %d." % (service['name'], env['PUBLIC_IPV6'], service['port']))
+				raise
 
-		# IPv4 failed. Try the private IP to see if the service is running but not accessible (except DNS because a different service runs on the private IP).
-		elif service["port"] != 53 and try_connect("127.0.0.1"):
-			output.print_error("%s is running but is not publicly accessible at %s:%d." % (service['name'], env['PUBLIC_IP'], service['port']))
-		else:
-			output.print_error("%s is not running (port %d)." % (service['name'], service['port']))
+	except OSError as e:
+		output.print_error("%s is not running (%s; port %d)." % (service['name'], str(e), service['port']))
 
 		# Why is nginx not running?
-		if not running and service["port"] in (80, 443):
+		if service["port"] in (80, 443):
 			output.print_line(shell('check_output', ['nginx', '-t'], capture_stderr=True, trap=True)[1].strip())
 
-	else:
-		# Service should be running locally.
-		if try_connect("127.0.0.1"):
-			running = True
-		else:
-			output.print_error("%s is not running (port %d)." % (service['name'], service['port']))
-
-	# Flag if local DNS is not running.
-	if not running and service["port"] == 53 and service["public"] == False:
-		fatal = True
+		# Flag if local DNS is not running.
+		if service["port"] == 53 and service["public"] == False:
+			fatal = True
+	finally:
+		s.close()
 
 	return (i, running, fatal, output)
 
 def run_system_checks(rounded_values, env, output):
 	check_ssh_password(env, output)
 	check_software_updates(env, output)
-	check_miab_version(env, output)
 	check_system_aliases(env, output)
 	check_free_disk_space(rounded_values, env, output)
-	check_free_memory(rounded_values, env, output)
-
-def check_ufw(env, output):
-	if not os.path.isfile('/usr/sbin/ufw'):
-		output.print_warning("""The ufw program was not installed. If your system is able to run iptables, rerun the setup.""")
-		return
-
-	code, ufw = shell('check_output', ['ufw', 'status'], trap=True)
-
-	if code != 0:
-		# The command failed, it's safe to say the firewall is disabled
-		output.print_warning("""The firewall is not working on this machine. An error was received
-					while trying to check the firewall. To investigate run 'sudo ufw status'.""")
-		return
-
-	ufw = ufw.splitlines()
-	if ufw[0] == "Status: active":
-		not_allowed_ports = 0
-		for service in get_services():
-			if service["public"] and not is_port_allowed(ufw, service["port"]):
-				not_allowed_ports += 1
-				output.print_error("Port %s (%s) should be allowed in the firewall, please re-run the setup." % (service["port"], service["name"]))
-
-		if not_allowed_ports == 0:
-			output.print_ok("Firewall is active.")
-	else:
-		output.print_warning("""The firewall is disabled on this machine. This might be because the system
-			is protected by an external firewall. We can't protect the system against bruteforce attacks
-			without the local firewall active. Connect to the system via ssh and try to run: ufw enable.""")
-
-def is_port_allowed(ufw, port):
-	return any(re.match(str(port) +"[/ \t].*", item) for item in ufw)
 
 def check_ssh_password(env, output):
 	# Check that SSH login with password is disabled. The openssh-server
@@ -215,13 +167,10 @@ def check_ssh_password(env, output):
 	else:
 		output.print_ok("SSH disallows password-based login.")
 
-def is_reboot_needed_due_to_package_installation():
-	return os.path.exists("/var/run/reboot-required")
-
 def check_software_updates(env, output):
 	# Check for any software package updates.
 	pkgs = list_apt_updates(apt_update=False)
-	if is_reboot_needed_due_to_package_installation():
+	if os.path.exists("/var/run/reboot-required"):
 		output.print_error("System updates have been installed and a reboot of the machine is required.")
 	elif len(pkgs) == 0:
 		output.print_ok("System software is up to date.")
@@ -240,38 +189,22 @@ def check_free_disk_space(rounded_values, env, output):
 	st = os.statvfs(env['STORAGE_ROOT'])
 	bytes_total = st.f_blocks * st.f_frsize
 	bytes_free = st.f_bavail * st.f_frsize
-	disk_msg = "The disk has %.2f GB space remaining." % (bytes_free/1024.0/1024.0/1024.0)
+	if not rounded_values:
+		disk_msg = "The disk has %s GB space remaining." % str(round(bytes_free/1024.0/1024.0/1024.0*10.0)/10)
+	else:
+		disk_msg = "The disk has less than %s%% space left." % str(round(bytes_free/bytes_total/10 + .5)*10)
 	if bytes_free > .3 * bytes_total:
-		if rounded_values: disk_msg = "The disk has more than 30% free space."
 		output.print_ok(disk_msg)
 	elif bytes_free > .15 * bytes_total:
-		if rounded_values: disk_msg = "The disk has less than 30% free space."
 		output.print_warning(disk_msg)
 	else:
-		if rounded_values: disk_msg = "The disk has less than 15% free space."
 		output.print_error(disk_msg)
 
-def check_free_memory(rounded_values, env, output):
-	# Check free memory.
-	percent_free = 100 - psutil.virtual_memory().percent
-	memory_msg = "System memory is %s%% free." % str(round(percent_free))
-	if percent_free >= 20:
-		if rounded_values: memory_msg = "System free memory is at least 20%."
-		output.print_ok(memory_msg)
-	elif percent_free >= 10:
-		if rounded_values: memory_msg = "System free memory is below 20%."
-		output.print_warning(memory_msg)
-	else:
-		if rounded_values: memory_msg = "System free memory is below 10%."
-		output.print_error(memory_msg)
-
 def run_network_checks(env, output):
 	# Also see setup/network-checks.sh.
 
 	output.add_heading("Network")
 
-	check_ufw(env, output)
-
 	# 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.
@@ -306,54 +239,42 @@ def run_domain_checks(rounded_time, env, output, pool):
 	dns_domains = set(dns_zonefiles)
 
 	# Get the list of domains we serve HTTPS for.
-	web_domains = set(get_web_domains(env))
+	web_domains = set(get_web_domains(env) + get_default_www_redirects(env))
 
 	domains_to_check = mail_domains | dns_domains | web_domains
 
-	# Get the list of domains that we don't serve web for because of a custom CNAME/A record.
-	domains_with_a_records = get_domains_with_a_records(env)
-
 	# Serial version:
 	#for domain in sort_domains(domains_to_check, env):
 	#	run_domain_checks_on_domain(domain, rounded_time, env, dns_domains, dns_zonefiles, mail_domains, web_domains)
 
 	# Parallelize the checks across a worker pool.
-	args = ((domain, rounded_time, env, dns_domains, dns_zonefiles, mail_domains, web_domains, domains_with_a_records)
+	args = ((domain, rounded_time, env, dns_domains, dns_zonefiles, mail_domains, web_domains)
 		for domain in domains_to_check)
 	ret = pool.starmap(run_domain_checks_on_domain, args, chunksize=1)
 	ret = dict(ret) # (domain, output) => { domain: output }
 	for domain in sort_domains(ret, env):
 		ret[domain].playback(output)
 
-def run_domain_checks_on_domain(domain, rounded_time, env, dns_domains, dns_zonefiles, mail_domains, web_domains, domains_with_a_records):
+def run_domain_checks_on_domain(domain, rounded_time, env, dns_domains, dns_zonefiles, mail_domains, web_domains):
 	output = BufferedOutput()
 
-	# we'd move this up, but this returns non-pickleable values
-	ssl_certificates = get_ssl_certificates(env)
-
-	# The domain is IDNA-encoded in the database, but for display use Unicode.
-	try:
-		domain_display = idna.decode(domain.encode('ascii'))
-		output.add_heading(domain_display)
-	except (ValueError, UnicodeError, idna.IDNAError) as e:
-		# Looks like we have some invalid data in our database.
-		output.add_heading(domain)
-		output.print_error("Domain name is invalid: " + str(e))
+	# The domain is IDNA-encoded, but for display use Unicode.
+	output.add_heading(domain.encode('ascii').decode('idna'))
 
 	if domain == env["PRIMARY_HOSTNAME"]:
 		check_primary_hostname_dns(domain, env, output, dns_domains, dns_zonefiles)
-
+		
 	if domain in dns_domains:
 		check_dns_zone(domain, env, output, dns_zonefiles)
-
+		
 	if domain in mail_domains:
 		check_mail_domain(domain, env, output)
 
 	if domain in web_domains:
-		check_web_domain(domain, rounded_time, ssl_certificates, env, output)
+		check_web_domain(domain, rounded_time, env, output)
 
 	if domain in dns_domains:
-		check_dns_zone_suggestions(domain, env, output, dns_zonefiles, domains_with_a_records)
+		check_dns_zone_suggestions(domain, env, output, dns_zonefiles)
 
 	return (domain, output)
 
@@ -368,7 +289,6 @@ def check_primary_hostname_dns(domain, env, output, dns_domains, dns_zonefiles):
 
 	ip = query_dns(domain, "A")
 	ns_ips = query_dns("ns1." + domain, "A") + '/' + query_dns("ns2." + domain, "A")
-	my_ips = env['PUBLIC_IP'] + ((" / "+env['PUBLIC_IPV6']) if env.get("PUBLIC_IPV6") else "")
 
 	# 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 as glue records.
@@ -391,29 +311,24 @@ def check_primary_hostname_dns(domain, env, output, dns_domains, dns_zonefiles):
 			public DNS to update after a change."""
 			% (env['PRIMARY_HOSTNAME'], env['PRIMARY_HOSTNAME'], env['PUBLIC_IP'], ns_ips))
 
-	# Check that PRIMARY_HOSTNAME resolves to PUBLIC_IP[V6] in public DNS.
-	ipv6 = query_dns(domain, "AAAA") if env.get("PUBLIC_IPV6") else None
-	if ip == env['PUBLIC_IP'] and not (ipv6 and env['PUBLIC_IPV6'] and ipv6 != normalize_ip(env['PUBLIC_IPV6'])):
-		output.print_ok("Domain resolves to box's IP address. [%s ↦ %s]" % (env['PRIMARY_HOSTNAME'], my_ips))
+	# Check that PRIMARY_HOSTNAME resolves to PUBLIC_IP in public DNS.
+	if ip == env['PUBLIC_IP']:
+		output.print_ok("Domain resolves to box's IP address. [%s ↦ %s]" % (env['PRIMARY_HOSTNAME'], env['PUBLIC_IP']))
 	else:
 		output.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 above."""
-			% (my_ips, ip + ((" / " + ipv6) if ipv6 is not None else "")))
+			issues listed here."""
+			% (env['PUBLIC_IP'], ip))
 
-
-	# Check reverse DNS matches the PRIMARY_HOSTNAME. Note that it might not be
+	# 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.
-	existing_rdns_v4 = query_dns(dns.reversename.from_address(env['PUBLIC_IP']), "PTR")
-	existing_rdns_v6 = query_dns(dns.reversename.from_address(env['PUBLIC_IPV6']), "PTR") if env.get("PUBLIC_IPV6") else None
-	if existing_rdns_v4 == domain and existing_rdns_v6 in (None, domain):
-		output.print_ok("Reverse DNS is set correctly at ISP. [%s ↦ %s]" % (my_ips, env['PRIMARY_HOSTNAME']))
-	elif existing_rdns_v4 == existing_rdns_v6 or existing_rdns_v6 is None:
-		output.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.""" % (existing_rdns_v4, domain) )
+	ipaddr_rev = dns.reversename.from_address(env['PUBLIC_IP'])
+	existing_rdns = query_dns(ipaddr_rev, "PTR")
+	if existing_rdns == domain:
+		output.print_ok("Reverse DNS is set correctly at ISP. [%s ↦ %s]" % (env['PUBLIC_IP'], env['PRIMARY_HOSTNAME']))
 	else:
-		output.print_error("""Your box's reverse DNS is currently %s (IPv4) and %s (IPv6), but it should be %s. Your ISP or cloud provider will have instructions
-			on setting up reverse DNS for your box.""" % (existing_rdns_v4, existing_rdns_v6, domain) )
+		output.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 the TLSA record.
 	tlsa_qname = "_25._tcp." + domain
@@ -435,14 +350,11 @@ def check_primary_hostname_dns(domain, env, output, dns_domains, dns_zonefiles):
 	check_alias_exists("Hostmaster contact address", "hostmaster@" + domain, env, output)
 
 def check_alias_exists(alias_name, alias, env, output):
-	mail_aliases = dict([(address, receivers) for address, receivers, *_ in get_mail_aliases(env)])
-	if alias in mail_aliases:
-		if mail_aliases[alias]:
-			output.print_ok("%s exists as a mail alias. [%s ↦ %s]" % (alias_name, alias, mail_aliases[alias]))
-		else:
-			output.print_error("""You must set the destination of the mail alias for %s to direct email to you or another administrator.""" % alias)
+	mail_alises = dict(get_mail_aliases(env))
+	if alias in mail_alises:
+		output.print_ok("%s exists as a mail alias. [%s ↦ %s]" % (alias_name, alias, mail_alises[alias]))
 	else:
-		output.print_error("""You must add a mail alias for %s which directs email to you or another administrator.""" % alias)
+		output.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, output, dns_zonefiles):
 	# If a DS record is set at the registrar, check DNSSEC first because it will affect the NS query.
@@ -452,63 +364,30 @@ def check_dns_zone(domain, env, output, 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. The secondary DNS
-	# server may be customized.
-	# (I'm not sure whether this necessarily tests the TLD's configuration,
-	# as it should, or if one successful NS line at the TLD will result in
-	# this query being answered by the box, which would mean the test is only
-	# half working.)
-
-	custom_dns_records = list(get_custom_dns_config(env)) # generator => list so we can reuse it
-	correct_ip = "; ".join(sorted(get_custom_dns_records(custom_dns_records, domain, "A"))) or env['PUBLIC_IP']
-	custom_secondary_ns = get_secondary_dns(custom_dns_records, mode="NS")
-	secondary_ns = custom_secondary_ns or ["ns2." + env['PRIMARY_HOSTNAME']]
-
-	existing_ns = query_dns(domain, "NS")
-	correct_ns = "; ".join(sorted(["ns1." + env['PRIMARY_HOSTNAME']] + secondary_ns))
+	# server may be customized. Unfortunately this may not check the domain's
+	# whois information -- we may be getting the NS records from us rather than
+	# the TLD, and so we're not actually checking the TLD. For that we'd need
+	# to do a DNS trace.
 	ip = query_dns(domain, "A")
-
-	probably_external_dns = False
-
+	secondary_ns = get_secondary_dns(get_custom_dns_config(env)) or "ns2." + env['PRIMARY_HOSTNAME']
+	existing_ns = query_dns(domain, "NS")
+	correct_ns = "; ".join(sorted([
+		"ns1." + env['PRIMARY_HOSTNAME'],
+		secondary_ns,
+		]))
 	if existing_ns.lower() == correct_ns.lower():
 		output.print_ok("Nameservers are set correctly at registrar. [%s]" % correct_ns)
-	elif ip == correct_ip:
+	elif ip == env['PUBLIC_IP']:
 		# The domain resolves correctly, so maybe the user is using External DNS.
 		output.print_warning("""The nameservers set on this domain at your domain name registrar should be %s. They are currently %s.
 			If you are using External DNS, this may be OK."""
 				% (correct_ns, existing_ns) )
-		probably_external_dns = True
 	else:
 		output.print_error("""The nameservers set on this domain are incorrect. They are currently %s. Use your domain name registrar's
 			control panel to set the nameservers to %s."""
 				% (existing_ns, correct_ns) )
 
-	# Check that each custom secondary nameserver resolves the IP address.
-
-	if custom_secondary_ns and not probably_external_dns:
-		for ns in custom_secondary_ns:
-			# We must first resolve the nameserver to an IP address so we can query it.
-			ns_ip = query_dns(ns, "A")
-			if not ns_ip:
-				output.print_error("Secondary nameserver %s is not valid (it doesn't resolve to an IP address)." % ns)
-				continue
-
-			# Now query it to see what it says about this domain.
-			ip = query_dns(domain, "A", at=ns_ip, nxdomain=None)
-			if ip == correct_ip:
-				output.print_ok("Secondary nameserver %s resolved the domain correctly." % ns)
-			elif ip is None:
-				output.print_error("Secondary nameserver %s is not configured to resolve this domain." % ns)
-			else:
-				output.print_error("Secondary nameserver %s is not configured correctly. (It resolved this domain as %s. It should be %s.)" % (ns, ip, correct_ip))
-
-def check_dns_zone_suggestions(domain, env, output, dns_zonefiles, domains_with_a_records):
-	# Warn if a custom DNS record is preventing this or the automatic www redirect from
-	# being served.
-	if domain in domains_with_a_records:
-		output.print_warning("""Web has been disabled for this domain because you have set a custom DNS record.""")
-	if "www." + domain in domains_with_a_records:
-		output.print_warning("""A redirect from 'www.%s' has been disabled for this domain because you have set a custom DNS record on the www subdomain.""" % domain)
-
+def check_dns_zone_suggestions(domain, env, output, dns_zonefiles):
 	# Since DNSSEC is optional, if a DS record is NOT set at the registrar suggest it.
 	# (If it was set, we did the check earlier.)
 	if query_dns(domain, "DS", nxdomain=None) is None:
@@ -519,9 +398,7 @@ def check_dnssec(domain, env, output, dns_zonefiles, is_checking_primary=False):
 	# See if the domain has a DS record set at the registrar. The DS record may have
 	# several forms. We have to be prepared to check for any valid record. We've
 	# pre-generated all of the valid digests --- read them in.
-	ds_file = '/etc/nsd/zones/' + dns_zonefiles[domain] + '.ds'
-	if not os.path.exists(ds_file): return # Domain is in our database but DNS has not yet been updated.
-	ds_correct = open(ds_file).read().strip().split("\n")
+	ds_correct = open('/etc/nsd/zones/' + dns_zonefiles[domain] + '.ds').read().strip().split("\n")
 	digests = { }
 	for rr_ds in ds_correct:
 		ds_keytag, ds_alg, ds_digalg, ds_digest = rr_ds.split("\t")[4].split(" ")
@@ -617,7 +494,7 @@ def check_mail_domain(domain, env, output):
 
 	# Check that the postmaster@ email address exists. Not required if the domain has a
 	# catch-all address or domain alias.
-	if "@" + domain not in [address for address, *_ in get_mail_aliases(env)]:
+	if "@" + domain not in dict(get_mail_aliases(env)):
 		check_alias_exists("Postmaster contact address", "postmaster@" + domain, env, output)
 
 	# Stop if the domain is listed in the Spamhaus Domain Block List.
@@ -631,33 +508,25 @@ def check_mail_domain(domain, env, output):
 			which may prevent recipients from receiving your mail.
 			See http://www.spamhaus.org/dbl/ and http://www.spamhaus.org/query/domain/%s.""" % (dbl, domain))
 
-def check_web_domain(domain, rounded_time, ssl_certificates, env, output):
+def check_web_domain(domain, rounded_time, env, output):
 	# 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']:
-		ok_values = []
-		for (rtype, expected) in (("A", env['PUBLIC_IP']), ("AAAA", env.get('PUBLIC_IPV6'))):
-			if not expected: continue # IPv6 is not configured
-			value = query_dns(domain, rtype)
-			if value == normalize_ip(expected):
-				ok_values.append(value)
-			else:
-				output.print_error("""This domain should resolve to your box's IP address (%s %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.""" % (rtype, expected, value))
-				return
+		ip = query_dns(domain, "A")
+		if ip == env['PUBLIC_IP']:
+			output.print_ok("Domain resolves to this box's IP address. [%s ↦ %s]" % (domain, env['PUBLIC_IP']))
+		else:
+			output.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))
 
-		# If both A and AAAA are correct...
-		output.print_ok("Domain resolves to this box's IP address. [%s ↦ %s]" % (domain, '; '.join(ok_values)))
-
-
-	# We need a TLS certificate for PRIMARY_HOSTNAME because that's where the
+	# 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, rounded_time, ssl_certificates, env, output)
+	check_ssl_cert(domain, rounded_time, env, output)
 
-def query_dns(qname, rtype, nxdomain='[Not Set]', at=None):
+def query_dns(qname, rtype, nxdomain='[Not Set]'):
 	# Make the qname absolute by appending a period. Without this, dns.resolver.query
 	# will fall back a failed lookup to a second query with this machine's hostname
 	# appended. This has been causing some false-positive Spamhaus reports. The
@@ -666,20 +535,9 @@ def query_dns(qname, rtype, nxdomain='[Not Set]', at=None):
 	if isinstance(qname, str):
 		qname += "."
 
-	# Use the default nameservers (as defined by the system, which is our locally
-	# running bind server), or if the 'at' argument is specified, use that host
-	# as the nameserver.
-	resolver = dns.resolver.get_default_resolver()
-	if at:
-		resolver = dns.resolver.Resolver()
-		resolver.nameservers = [at]
-
-	# Set a timeout so that a non-responsive server doesn't hold us back.
-	resolver.timeout = 5
-
 	# Do the query.
 	try:
-		response = resolver.query(qname, rtype)
+		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.
@@ -687,58 +545,194 @@ def query_dns(qname, rtype, nxdomain='[Not Set]', at=None):
 	except dns.exception.Timeout:
 		return "[timeout]"
 
-	# Normalize IP addresses. IP address --- especially IPv6 addresses --- can
-	# be expressed in equivalent string forms. Canonicalize the form before
-	# returning them. The caller should normalize any IP addresses the result
-	# of this method is compared with.
-	if rtype in ("A", "AAAA"):
-		response = [normalize_ip(str(r)) for r in response]
-
 	# 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. The order of the answers doesn't matter, so sort so we
 	# can compare to a well known order.
 	return "; ".join(sorted(str(r).rstrip('.') for r in response))
 
-def check_ssl_cert(domain, rounded_time, ssl_certificates, env, output):
-	# Check that TLS certificate is signed.
+def check_ssl_cert(domain, rounded_time, env, output):
+	# Check that SSL certificate is signed.
 
 	# Skip the check if the A record is not pointed here.
 	if query_dns(domain, "A", None) not in (env['PUBLIC_IP'], None): return
 
-	# Where is the certificate file stored?
-	tls_cert = get_domain_ssl_files(domain, ssl_certificates, env, allow_missing_cert=True)
-	if tls_cert is None:
-		output.print_warning("""No TLS (SSL) certificate is installed for this domain. Visitors to a website on
-			this domain will get a security warning. If you are not serving a website on this domain, you do
-			not need to take any action. Use the TLS Certificates page in the control panel to install a
-			TLS certificate.""")
+	# Where is the SSL stored?
+	ssl_key, ssl_certificate, ssl_via = get_domain_ssl_files(domain, env)
+
+	if not os.path.exists(ssl_certificate):
+		output.print_error("The SSL certificate file for this domain is missing.")
 		return
 
 	# Check that the certificate is good.
 
-	cert_status, cert_status_details = check_certificate(domain, tls_cert["certificate"], tls_cert["private-key"], rounded_time=rounded_time)
+	cert_status, cert_status_details = check_certificate(domain, ssl_certificate, ssl_key, rounded_time=rounded_time)
 
 	if cert_status == "OK":
 		# The certificate is ok. The details has expiry info.
-		output.print_ok("TLS (SSL) certificate is signed & valid. " + cert_status_details)
+		output.print_ok("SSL certificate is signed & valid. %s %s" % (ssl_via if ssl_via else "", cert_status_details))
 
 	elif cert_status == "SELF-SIGNED":
 		# Offer instructions for purchasing a signed certificate.
+
+		fingerprint = shell('check_output', [
+			"openssl",
+			"x509",
+			"-in", ssl_certificate,
+			"-noout",
+			"-fingerprint"
+			])
+		fingerprint = re.sub(".*Fingerprint=", "", fingerprint).strip()
+
 		if domain == env['PRIMARY_HOSTNAME']:
-			output.print_error("""The TLS (SSL) certificate for this domain is currently self-signed. You will get a security
+			output.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).""")
+			static site hosting). Use the SSL Certificates page in this control panel to install a signed SSL certificate.
+			You may choose to leave the self-signed certificate in place and confirm the security exception, but check that
+			the certificate fingerprint matches the following:""")
+			output.print_line("")
+			output.print_line("   " + fingerprint, monospace=True)
 		else:
-			output.print_error("""The TLS (SSL) certificate for this domain is self-signed.""")
+			output.print_warning("""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. Use the SSL Certificates page in this control panel to
+			install a signed SSL certificate.""")
 
 	else:
-		output.print_error("The TLS (SSL) certificate has a problem: " + cert_status)
+		output.print_error("The SSL certificate has a problem: " + cert_status)
 		if cert_status_details:
 			output.print_line("")
 			output.print_line(cert_status_details)
 			output.print_line("")
 
+def check_certificate(domain, ssl_certificate, ssl_private_key, warn_if_expiring_soon=True, rounded_time=False):
+	# 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. A wildcard might also appear as the CN
+	# or in the SAN list, so check for that tool.
+	retcode, cert_dump = shell('check_output', [
+		"openssl", "x509",
+		"-in", ssl_certificate,
+		"-noout", "-text", "-nameopt", "rfc2253",
+		], trap=True)
+
+	# If the certificate is catastrophically bad, catch that now and report it.
+	# More information was probably written to stderr (which we aren't capturing),
+	# but it is probably not helpful to the user anyway.
+	if retcode != 0:
+		return ("The SSL certificate appears to be corrupted or not a PEM-formatted SSL certificate file. (%s)" % ssl_certificate, None)
+
+	cert_dump = cert_dump.split("\n")
+	certificate_names = set()
+	cert_expiration_date = None
+	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))
+
+		# Grab the expiration date for testing later.
+		m = re.match("            Not After : (.*)", line)
+		if m:
+			cert_expiration_date = dateutil.parser.parse(m.group(1))
+
+	wildcard_domain = re.sub("^[^\.]+", "*", domain)
+	if domain is not None and domain not in certificate_names and wildcard_domain not in certificate_names:
+		return ("The certificate is for the wrong domain name. It is for %s."
+			% ", ".join(sorted(certificate_names)), None)
+
+	# 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), None)
+
+	# 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.", None)
+	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", None)
+
+	elif retcode != 0:
+		if "unable to get local issuer certificate" in verifyoutput:
+			return ("The certificate is missing an intermediate chain or the intermediate chain is incorrect or incomplete. (%s)" % verifyoutput, None)
+
+		# There is some unknown problem. Return the `openssl verify` raw output.
+		return ("There is a problem with the SSL certificate.", verifyoutput.strip())
+
+	else:
+		# `openssl verify` returned a zero exit status so the cert is currently
+		# good.
+
+		# But is it expiring soon?
+		now = datetime.datetime.now(dateutil.tz.tzlocal())
+		ndays = (cert_expiration_date-now).days
+		if not rounded_time or ndays < 7:
+			expiry_info = "The certificate expires in %d days on %s." % (ndays, cert_expiration_date.strftime("%x"))
+		elif ndays <= 14:
+			expiry_info = "The certificate expires in less than two weeks, on %s." % cert_expiration_date.strftime("%x")
+		elif ndays <= 31:
+			expiry_info = "The certificate expires in less than a month, on %s." % cert_expiration_date.strftime("%x")
+		else:
+			expiry_info = "The certificate expires on %s." % cert_expiration_date.strftime("%x")
+
+		if ndays <= 31 and warn_if_expiring_soon:
+			return ("The certificate is expiring soon: " + expiry_info, None)
+
+		# Return the special OK code.
+		return ("OK", expiry_info)
+
 _apt_updates = None
 def list_apt_updates(apt_update=True):
 	# See if we have this information cached recently.
@@ -773,51 +767,15 @@ def list_apt_updates(apt_update=True):
 
 	return pkgs
 
-def what_version_is_this(env):
-	# This function runs `git describe --abbrev=0` on the Mail-in-a-Box installation directory.
-	# Git may not be installed and Mail-in-a-Box may not have been cloned from github,
-	# so this function may raise all sorts of exceptions.
-	miab_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-	tag = shell("check_output", ["/usr/bin/git", "describe", "--abbrev=0"], env={"GIT_DIR": os.path.join(miab_dir, '.git')}).strip()
-	return tag
-
-def get_latest_miab_version():
-	# This pings https://mailinabox.email/setup.sh and extracts the tag named in
-	# the script to determine the current product version.
-    from urllib.request import urlopen, HTTPError, URLError
-    from socket import timeout
-
-    try:
-        return re.search(b'TAG=(.*)', urlopen("https://mailinabox.email/setup.sh?ping=1", timeout=5).read()).group(1).decode("utf8")
-    except (HTTPError, URLError, timeout):
-        return None
-
-def check_miab_version(env, output):
-	config = load_settings(env)
-
-	if config.get("privacy", True):
-		output.print_warning("Mail-in-a-Box version check disabled by privacy setting.")
-	else:
-		try:
-			this_ver = what_version_is_this(env)
-		except:
-			this_ver = "Unknown"
-
-		latest_ver = get_latest_miab_version()
-
-		if this_ver == latest_ver:
-			output.print_ok("Mail-in-a-Box is up to date. You are running version %s." % this_ver)
-		elif latest_ver is None:
-			output.print_error("Latest Mail-in-a-Box version could not be determined. You are running version %s." % this_ver)
-		else:
-			output.print_error("A new version of Mail-in-a-Box is available. You are running version %s. The latest version is %s. For upgrade instructions, see https://mailinabox.email. "
-				% (this_ver, latest_ver))
-
-def run_and_output_changes(env, pool):
+def run_and_output_changes(env, pool, send_via_email):
 	import json
 	from difflib import SequenceMatcher
 
-	out = ConsoleOutput()
+	if not send_via_email:
+		out = ConsoleOutput()
+	else:
+		import io
+		out = FileOutput(io.StringIO(""), 70)
 
 	# Run status checks.
 	cur = BufferedOutput()
@@ -875,22 +833,34 @@ def run_and_output_changes(env, pool):
 			if category not in cur_status:
 				out.add_heading(category)
 				out.print_warning("This section was removed.")
-
+	
+	if send_via_email:
+		# If there were changes, send off an email.
+		buf = out.buf.getvalue()
+		if len(buf) > 0:
+			# create MIME message
+			from email.message import Message
+			msg = Message()
+			msg['From'] = "\"%s\" <administrator@%s>" % (env['PRIMARY_HOSTNAME'], env['PRIMARY_HOSTNAME'])
+			msg['To'] = "administrator@%s" % env['PRIMARY_HOSTNAME']
+			msg['Subject'] = "[%s] Status Checks Change Notice" % env['PRIMARY_HOSTNAME']
+			msg.set_payload(buf, "UTF-8")
+	
+			# send to administrator@
+			import smtplib
+			mailserver = smtplib.SMTP('localhost', 25)
+			mailserver.ehlo()
+			mailserver.sendmail(
+				"administrator@%s" % env['PRIMARY_HOSTNAME'], # MAIL FROM
+				"administrator@%s" % env['PRIMARY_HOSTNAME'], # RCPT TO
+				msg.as_string())
+			mailserver.quit()
+		
 	# Store the current status checks output for next time.
 	os.makedirs(os.path.dirname(cache_fn), exist_ok=True)
 	with open(cache_fn, "w") as f:
 		json.dump(cur.buf, f, indent=True)
 
-def normalize_ip(ip):
-	# Use ipaddress module to normalize the IPv6 notation and
-	# ensure we are matching IPv6 addresses written in different
-	# representations according to rfc5952.
-	import ipaddress
-	try:
-		return str(ipaddress.ip_address(ip))
-	except:
-		return ip
-
 class FileOutput:
 	def __init__(self, buf, width):
 		self.buf = buf
@@ -916,7 +886,7 @@ class FileOutput:
 		words = re.split("(\s+)", message)
 		linelen = 0
 		for w in words:
-			if self.width and (linelen + len(w) > self.width-1-len(first_line)):
+			if linelen + len(w) > self.width-1-len(first_line):
 				print(file=self.buf)
 				print("   ", end="", file=self.buf)
 				linelen = 0
@@ -932,22 +902,10 @@ class FileOutput:
 class ConsoleOutput(FileOutput):
 	def __init__(self):
 		self.buf = sys.stdout
-
-		# Do nice line-wrapping according to the size of the terminal.
-		# The 'stty' program queries standard input for terminal information.
-		if sys.stdin.isatty():
-			try:
-				self.width = int(shell('check_output', ['stty', 'size']).split()[1])
-			except:
-				self.width = 76
-
-		else:
-			# However if standard input is not a terminal, we would get
-			# "stty: standard input: Inappropriate ioctl for device". So
-			# we test with sys.stdin.isatty first, and if it is not a
-			# terminal don't do any line wrapping. When this script is
-			# run from cron, or if stdin has been redirected, this happens.
-			self.width = None
+		try:
+			self.width = int(shell('check_output', ['stty', 'size']).split()[1])
+		except:
+			self.width = 76
 
 class BufferedOutput:
 	# Record all of the instance method calls so we can play them back later.
@@ -975,21 +933,17 @@ if __name__ == "__main__":
 		run_checks(False, env, ConsoleOutput(), pool)
 
 	elif sys.argv[1] == "--show-changes":
-		run_and_output_changes(env, pool)
+		run_and_output_changes(env, pool, sys.argv[-1] == "--smtp")
 
 	elif sys.argv[1] == "--check-primary-hostname":
 		# See if the primary hostname appears resolvable and has a signed certificate.
 		domain = env['PRIMARY_HOSTNAME']
 		if query_dns(domain, "A") != env['PUBLIC_IP']:
 			sys.exit(1)
-		ssl_certificates = get_ssl_certificates(env)
-		tls_cert = get_domain_ssl_files(domain, ssl_certificates, env)
-		if not os.path.exists(tls_cert["certificate"]):
+		ssl_key, ssl_certificate, ssl_via = get_domain_ssl_files(domain, env)
+		if not os.path.exists(ssl_certificate):
 			sys.exit(1)
-		cert_status, cert_status_details = check_certificate(domain, tls_cert["certificate"], tls_cert["private-key"], warn_if_expiring_soon=False)
+		cert_status, cert_status_details = check_certificate(domain, ssl_certificate, ssl_key, warn_if_expiring_soon=False)
 		if cert_status != "OK":
 			sys.exit(1)
 		sys.exit(0)
-
-	elif sys.argv[1] == "--version":
-		print(what_version_is_this(env))

management/templates/aliases.html

@@ -7,61 +7,33 @@
 
 <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>Aliases are email forwarders. An alias can forward email to a <a href="javascript: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;">
+<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 active" 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>
+        <span class="catchall hidden">A catch-all alias captures all otherwise unmatched email to a domain. Enter just a part of an email address starting with the @-sign.</span>
+        <span class="domainalias hidden">A domain alias forwards all otherwise unmatched mail 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>
+    <label for="addaliasEmail" 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>
+      <input type="email" class="form-control" id="addaliasEmail">
+      <div style="margin-top: 3px; padding-left: 3px; font-size: 90%" class="text-muted">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>
+    <label for="addaliasTargets" class="col-sm-1 control-label">Forward 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>
+      <textarea class="form-control" rows="3" id="addaliasTargets"></textarea>
     </div>
   </div>
   <div class="form-group">
@@ -79,14 +51,13 @@
       <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@, admin@ and abuse@ email addresses are required on some domains.</small></p>
+<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>
@@ -99,48 +70,12 @@
           <span class="glyphicon glyphicon-trash"></span>
         </a>
     </td>
-    <td class='address'> </td>
-    <td class='forwardsTo'> </td>
-    <td class='senders'> </td>
+    <td class='email'> </td>
+    <td class='target'> </td>
   </tr>
   </table>
 </div>
 
-<h3>Mail aliases API (advanced)</h3>
-
-<p>Use your box&rsquo;s mail aliases API to add and remove mail aliases from the command-line or custom services you build.</p>
-
-<p>Usage:</p>
-
-<pre>curl -X <b>VERB</b> [-d "<b>parameters</b>"] --user {email}:{password} https://{{hostname}}/admin/mail/aliases[<b>action</b>]</pre>
-
-<p>Brackets denote an optional argument. Please note that the POST body <code>parameters</code> must be URL-encoded.</p>
-
-<p>The email and password given to the <code>--user</code> option must be an administrative user on this system.</p>
-
-<h4 style="margin-bottom: 0">Verbs</h4>
-
-<table class="table" style="margin-top: .5em">
-<thead><th>Verb</th> <th>Action</th><th></th></thead>
-<tr><td>GET</td><td><i>(none)</i></td> <td>Returns a list of existing mail aliases. Adding <code>?format=json</code> to the URL will give JSON-encoded results.</td></tr>
-<tr><td>POST</td><td>/add</td> <td>Adds a new mail alias. Required POST-body parameters are <code>address</code> and <code>forwards_to</code>.</td></tr>
-<tr><td>POST</td><td>/remove</td> <td>Removes a mail alias. Required POST-body parameter is <code>address</code>.</td></tr>
-</table>
-
-<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># Gives a JSON-encoded list of all mail aliases
-curl -X GET https://{{hostname}}/admin/mail/aliases?format=json
-
-# Adds a new alias
-curl -X POST -d "address=new_alias@mydomail.com" -d "forwards_to=my_email@mydomain.com" https://{{hostname}}/admin/mail/aliases/add
-
-# Removes an alias
-curl -X POST -d "address=new_alias@mydomail.com" https://{{hostname}}/admin/mail/aliases/remove
-</pre>
-
 
 <script>
 function show_aliases() {
@@ -163,12 +98,10 @@ function show_aliases() {
           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]))
+          n.attr('data-email', alias.source_display); // this is decoded from IDNA, but will get re-coded to IDNA on the backend
+          n.find('td.email').text(alias.source_display)
+          for (var j = 0; j < alias.destination.length; j++)
+            n.find('td.target').append($("<div></div>").text(alias.destination[j]))
           $('#alias_table tbody').append(n);
         }
       }
@@ -178,25 +111,25 @@ function show_aliases() {
     $('#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');
+        $('#addaliasEmail').attr('type', 'email');
+        $('#addaliasEmail').attr('placeholder', 'incoming email address (e.g. you@yourdomain.com)');
+	$('#addaliasTargets').attr('placeholder', 'forward to these email addresses (one 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');
+        $('#addaliasEmail').attr('type', 'text');
+        $('#addaliasEmail').attr('placeholder', 'incoming catch-all address (e.g. @yourdomain.com)');
+	$('#addaliasTargets').attr('placeholder', 'forward to these email addresses (one per line or separated by commas)');
         $('#alias_mode_info').slideDown();
-        $('#addalias-form .catchall').removeClass('hidden');
+        $('#alias_mode_info span').addClass('hidden');
+        $('#alias_mode_info span.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)');
+        $('#addaliasEmail').attr('type', 'text');
+        $('#addaliasEmail').attr('placeholder', 'incoming domain (@yourdomain.com)');
+        $('#addaliasTargets').attr('placeholder', 'forward to domain (@yourdomain.com)');
         $('#alias_mode_info').slideDown();
-        $('#addalias-form .domainalias').removeClass('hidden');
+        $('#alias_mode_info span').addClass('hidden');
+        $('#alias_mode_info span.domainalias').removeClass('hidden');
       }
     })
     $('#alias_type_buttons button[data-mode="regular"]').click(); // init
@@ -206,21 +139,15 @@ function show_aliases() {
 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;
-  }
+  var email = $("#addaliasEmail").val();
+  var targets = $("#addaliasTargets").val();
   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
+      source: email,
+      destination: targets
     },
     function(r) {
       // Responses are multiple lines of pre-formatted text.
@@ -235,55 +162,48 @@ function do_add_alias() {
 }
 
 function aliases_reset_form() {
-  $("#addaliasAddress").prop('disabled', false);
-  $("#addaliasAddress").val('')
-  $("#addaliasForwardsTo").val('')
-  $("#addaliasSenders").val('')
+  $("#addaliasEmail").prop('disabled', false);
+  $("#addaliasEmail").val('')
+  $("#addaliasTargets").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) == '@')
+  var email = $(elem).parents('tr').attr('data-email');
+  var targetdivs = $(elem).parents('tr').find('.target div');
+  var targets = "";
+  for (var i = 0; i < targetdivs.length; i++)
+    targets += $(targetdivs[i]).text() + "\n";
+
+  is_alias_add_update = true;
+  $('#alias-cancel').removeClass('hidden');
+  $("#addaliasEmail").prop('disabled', true);
+  $("#addaliasEmail").val(email);
+  $("#addaliasTargets").val(targets);
+  $('#add-alias-button').text('Update');
+  if (email.charAt(0) == '@' && targets.charAt(0) == '@')
     $('#alias_type_buttons button[data-mode="domainalias"]').click();
-  else if (address.charAt(0) == '@')
+  else if (email.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');
+  var email = $(elem).parents('tr').attr('data-email');
   show_modal_confirm(
     "Remove Alias",
-    "Remove " + row_address + "?",
+    "Remove " + email + "?",
     "Remove",
     function() {
       api(
         "/mail/aliases/remove",
         "POST",
         {
-          address: row_address
+          source: email
         },
         function(r) {
           // Responses are multiple lines of pre-formatted text.

management/templates/custom-dns.html

@@ -10,7 +10,7 @@
 
 <p>It is possible to set custom DNS records on domains hosted here.</p>
 
-<h3>Set custom DNS records</h3>
+<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>
 
@@ -31,15 +31,11 @@
     <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).  The 'local' alias sets the record to this box's public IPv4 address.">A (IPv4 address)</option>
-        <option value="AAAA" data-hint="Enter an IPv6 address.  The 'local' alias sets the record to this box's public IPv6 address.">AAAA (IPv6 address)</option>
-        <option value="CAA" data-hint="Enter a CA that can issue certificates for this domain in the form of FLAG TAG VALUE. (0 issuewild &quot;letsencrypt.org&quot;)">CAA (Certificate Authority Authorization)</option>
+        <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 PRIORITY DOMAIN., including trailing period (e.g. 20 mx.example.com.).">MX (mail exchanger)</option>
-        <option value="SRV" data-hint="Enter record in the form of PRIORITY WEIGHT PORT TARGET., including trailing period (e.g. 10 10 5060 sip.example.com.).">SRV (service record)</option>
-        <option value="SSHFP" data-hint="Enter record in the form of ALGORITHM TYPE FINGERPRINT.">SSHFP (SSH fingerprint record)</option>
-        <option value="NS" data-hint="Enter a hostname to which this subdomain should be delegated to">NS (DNS subdomain delegation)</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>
@@ -69,10 +65,9 @@
   </tbody>
 </table>
 
-<h3>Using a secondary nameserver</h3>
+<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 secondary nameserver, you must find a secondary nameserver service provider. Your domain name registrar or virtual cloud provider may provide this service for you. Once you set up the secondary nameserver service, enter the hostname (not the IP address) of <em>their</em> secondary nameserver in the box below.</p>
+<p>If your TLD requires you to have two separate nameservers, you can either set up a secondary (aka &ldquo;slave&rdquo;) nameserver or, alternatively, set up <a href="#" onclick="return show_panel('external_dns')">external DNS</a> and ignore the DNS server on this box. If you choose to use a seconday/slave nameserver, you must find a seconday/slave nameserver service provider. Your domain name registrar or virtual cloud provider may provide this service for you. Once you set up the seconday/slave nameserver service, enter the hostname of <em>their</em> secondary nameserver:</p>
 
 <form class="form-horizontal" role="form" onsubmit="do_set_secondary_dns(); return false;">
   <div class="form-group">
@@ -86,15 +81,9 @@
       <button type="submit" class="btn btn-primary">Update</button>
     </div>
   </div>
-  <div class="form-group">
+  <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>.
-      </p>
-      <p id="secondarydns-clear-instructions" style="display: none" class="small">
-        Clear the input field above and click Update to use this machine itself as secondary DNS, which is the default/normal setup.
-      </p>
+      <p class="small">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>
@@ -127,7 +116,7 @@
 <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>, <code>SRV</code>, <code>SSHFP</code>, <code>CAA</code> or <code>NS</code>.</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>
 
@@ -163,8 +152,8 @@ function show_custom_dns() {
     "GET",
     { },
     function(data) {
-      $('#secondarydnsHostname').val(data.hostnames.join(' '));
-      $('#secondarydns-clear-instructions').toggle(data.hostnames.length > 0);
+      $('#secondarydnsHostname').val(data.hostname ? data.hostname : '');
+      $('#secondarydns-clear-instructions').toggle(data.hostname != null);
     });
 
   api(
@@ -221,7 +210,7 @@ function do_set_secondary_dns() {
     "/dns/secondary-nameserver",
     "POST",
     {
-      hostnames: $('#secondarydnsHostname').val()
+      hostname: $('#secondarydnsHostname').val()
     },
     function(data) {
       if (data == "") return; // nothing updated

management/templates/external-dns.html

@@ -34,15 +34,6 @@
 
 <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>

management/templates/index.html

@@ -9,10 +9,17 @@
 
         <meta name="robots" content="noindex, nofollow">
 
-        <link rel="stylesheet" href="/admin/assets/bootstrap/css/bootstrap.min.css">
+        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.0/css/bootstrap.min.css">
         <style>
-	    body {
+            @import url(https://fonts.googleapis.com/css?family=Raleway:400,700);
+            @import url(https://fonts.googleapis.com/css?family=Ubuntu:300);
+
+	    html {
 		overflow-y: scroll;
+	    }
+
+            body {
+                padding-top: 50px;
                 padding-bottom: 20px;
             }
 
@@ -21,7 +28,7 @@
             }
 
             h1, h2, h3, h4 {
-              font-family: sans-serif;
+              font-family: Raleway, sans-serif;
               font-weight: bold;
             }
 
@@ -63,14 +70,15 @@
 	       margin-bottom: 1em;
 	    }
         </style>
-        <link rel="stylesheet" href="/admin/assets/bootstrap/css/bootstrap-theme.min.css">
+        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.0/css/bootstrap-theme.min.css">
+        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
     </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 navbar-static-top" role="navigation">
+    <div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
       <div class="container">
         <div class="navbar-header">
           <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
@@ -87,13 +95,13 @@
               <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="#tls" onclick="return show_panel(this);">TLS (SSL) Certificates</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" target="_blank">Munin Monitoring</a></li>
+                <li><a href="/admin/munin">Munin Monitoring</a></li>
               </ul>
             </li>
             <li class="dropdown">
@@ -108,7 +116,7 @@
             <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>
+            <li><a href="#" onclick="do_logout(); return false;" style="color: white">Log out?</a></li>
           </ul>
         </div><!--/.navbar-collapse -->
       </div>
@@ -155,7 +163,7 @@
       {% include "web.html" %}
       </div>
 
-      <div id="panel_tls" class="admin_panel">
+      <div id="panel_ssl" class="admin_panel">
       {% include "ssl.html" %}
       </div>
 
@@ -191,8 +199,8 @@
           </div>
         </div>
 
-        <script src="/admin/assets/jquery.min.js"></script>
-        <script src="/admin/assets/bootstrap/js/bootstrap.min.js"></script>
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
+        <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.0/js/bootstrap.min.js"></script>
 
         <script>
 var global_modal_state = null;
@@ -202,8 +210,8 @@ $(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();
-  })
+    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
@@ -218,7 +226,7 @@ $(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) {
@@ -263,7 +271,7 @@ function show_modal_confirm(title, question, verb, yes_callback, cancel_callback
 }
 
 var ajax_num_executing_requests = 0;
-function ajax_with_indicator(options) {
+function ajax(options) {
   setTimeout("if (ajax_num_executing_requests > 0) $('#ajax_loading_indicator').fadeIn()", 100);
   function hide_loading_indicator() {
     ajax_num_executing_requests--;
@@ -281,7 +289,7 @@ function ajax_with_indicator(options) {
   };
   options.error = function(jqxhr) {
     hide_loading_indicator();
-    if (!old_error)
+    if (!old_error) 
       show_modal_error("Error", "Something went wrong, sorry.")
     else
       old_error(jqxhr.responseText, jqxhr);
@@ -325,7 +333,7 @@ function api(url, method, data, callback, callback_error) {
       show_modal_error("Error", "Something went wrong, sorry.")
   }
 
-  ajax_with_indicator({
+  ajax({
     url: "/admin" + url,
     method: method,
     cache: false,

management/templates/login.html

@@ -57,15 +57,11 @@ sudo tools/mail.py user make-admin me@{{hostname}}</pre>
 <script>
 function do_login() {
   if ($('#loginEmail').val() == "") {
-    show_modal_error("Login Failed", "Enter your email address.", function() {
-	$('#loginEmail').focus();
-    });
+    show_modal_error("Login Failed", "Enter your email address.")
     return false;
   }
   if ($('#loginPassword').val() == "") {
-    show_modal_error("Login Failed", "Enter your email password.", function() {
-        $('#loginPassword').focus();
-    });
+    show_modal_error("Login Failed", "Enter your email password.")
     return false;
   }
 
@@ -117,7 +113,7 @@ function do_login() {
       // 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 || switch_back_to_panel == "login" ? 'system_status' : switch_back_to_panel) }, 300);
+      setTimeout(function() { show_panel(!switch_back_to_panel ? 'system_status' : switch_back_to_panel) }, 300);
     }
   })
 }
@@ -130,14 +126,4 @@ function do_logout() {
     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

@@ -29,7 +29,7 @@
 					<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 or TLS</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>
@@ -38,11 +38,9 @@
 
 					<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>
 
-					<p>As an alternative to IMAP you can also use the POP protocol: choose POP as the protocol, port 995, and SSL or TLS security in your mail client. The SMTP settings and usernames and passwords remain the same. However, we recommend you use IMAP instead.</p>
-
 				<h4>Exchange/ActiveSync settings</h4>
 
-					<p>On iOS devices, devices on this <a href="https://wiki.z-hub.io/display/ZP/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>
+					<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>

management/templates/ssl.html

@@ -1,31 +1,12 @@
 <style>
 </style>
 
-<h2>TLS (SSL) Certificates</h2>
+<h2>SSL Certificates</h2>
 
-<p>A TLS (formerly called SSL) certificate is a cryptographic file that proves to anyone connecting to a web address that the connection is secure between you and the owner of that address.</p>
+<h3>Certificate Status</h3>
 
-<p>You need a TLS certificate for this box&rsquo;s hostname ({{hostname}}) and every other domain name and subdomain that this box is hosting a website for (see the list below).</p>
 
-<div id="ssl_provision">
-<h3>Provision certificates</h3>
-
-<div id="ssl_provision_p" style="display: none; margin-top: 1.5em">
-  <button onclick='return provision_tls_cert();' class='btn btn-primary' style="float: left; margin: 0 1.5em 1em 0;">Provision</button>
-  <p>A TLS certificate can be automatically provisioned from <a href="https://letsencrypt.org/" target="_blank">Let&rsquo;s Encrypt</a>, a free TLS certificate provider, for:<br>
-  <span class="text-primary"></span></p>
-</div>
-
-<div class="clearfix"> </div>
-
-<div id="ssl_provision_result"></div>
-</div>
-
-<h3>Certificate status</h3>
-
-<p style="margin-top: 1.5em">Certificates expire after a period of time. All certificates will be automatically renewed through <a href="https://letsencrypt.org/" target="_blank">Let&rsquo;s Encrypt</a> 14 days prior to expiration.</p>
-
-<table id="ssl_domains" class="table" style="margin-bottom: 2em; width: auto; display: none">
+<table id="ssl_domains" class="table" style="margin-bottom: 2em; width: auto;">
   <thead>
     <tr>
       <th>Domain</th>
@@ -37,39 +18,29 @@
   </tbody>
 </table>
 
+<p>Advanced:<br>Install a multi-domain or wildcard certificate for the <code>{{hostname}}</code> domain to have it automatically applied to any domains it is valid for.</p>
 
-<h3 id="ssl_install_header">Install certificate</h3>
+<h3 id="ssl_install_header">Install SSL Certificate</h3>
 
-<p>If you don't want to use our automatic Let's Encrypt integration, you can give any other certificate provider a try. You can generate the needed CSR below.</p>
+<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> or <a href="https://www.startssl.com/">StartSSL&rsquo;s free express lane</a>.</p>
 
-<p>Which domain are you getting a certificate for?</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>
 
-<p>(A multi-domain or wildcard certificate will be automatically applied to any domains it is valid for besides the one you choose above.)</p>
-
-<p>What country are you in? This is required by some TLS certificate providers. You may leave this blank if you know your TLS certificate provider doesn't require it.</p>
-
-<p><select id="sslcc" onchange="show_csr()" class="form-control" style="width: auto">
-	<option value="">(Select)</option>
-	{% for code, name in csr_country_codes %}
-		<option value="{{code}}">{{name}}</option>
-	{% endfor %}
-</select></p>
-
 <div id="csr_info" style="display: none">
-  <p>You will need to provide the certificate provider this Certificate Signing Request (CSR):</p>
+  <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 certificate provider will then provide you with a TLS/SSL certificate. They may also provide you with an intermediate chain. Paste each separately into the boxes below:</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">TLS/SSL certificate:</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">TLS/SSL intermediate chain (if provided):</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>
@@ -78,41 +49,26 @@
 </div>
 
 <script>
-function show_tls(keep_provisioning_shown) {
+function show_ssl() {
  api(
-    "/ssl/status",
+    "/web/domains",
     "GET",
     {
     },
-    function(res) {
-      // provisioning status
-
-      if (!keep_provisioning_shown)
-        $('#ssl_provision').toggle(res.can_provision.length > 0)
-
-      $('#ssl_provision_p').toggle(res.can_provision.length > 0);
-      if (res.can_provision.length > 0)
-          $('#ssl_provision_p span').text(res.can_provision.join(", "));
-
-      // certificate status
-      var domains = res.status;
+    function(domains) {
       var tb = $('#ssl_domains tbody');
       tb.text('');
       $('#ssldomain').html('<option value="">(select)</option>');
-      $('#ssl_domains').show();
+
       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);
-        if (domains[i].status == "not-applicable") {
-          domains[i].status = "muted"; // text-muted css class
-          row.find('.actions a').remove(); // no actions applicable
-        }
-        row.addClass("text-" + domains[i].status);
-        row.find('.status').text(domains[i].text);
-        if (domains[i].status == "success") {
+        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');
@@ -126,24 +82,18 @@ function show_tls(keep_provisioning_shown) {
 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() {
- // Can't show a CSR until both inputs are entered.
- if ($('#ssldomain').val() == "") return;
- if ($('#sslcc').val() == "") return;
-
- // Scroll to it and fetch.
- $('#csr_info').slideDown();
- $('#ssl_csr').text('Loading...');
  api(
     "/ssl/csr/" + $('#ssldomain').val(),
     "POST",
     {
-        countrycode: $('#sslcc').val()
     },
     function(data) {
       $('#ssl_csr').text(data);
@@ -162,75 +112,10 @@ function install_cert() {
     function(status) {
       if (/^OK($|\n)/.test(status)) {
         console.log(status)
-        show_modal_error("TLS Certificate Installation", "Certificate has been installed. Check that you have no connection problems to the domain.", function() { show_ssl(); $('#csr_info').slideUp(); });
+        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("TLS Certificate Installation", status);
+        show_modal_error("SSL Certificate Installation", status);
       }
     });
 }
-
-function provision_tls_cert() {
-  // Automatically provision any certs.
-  $('#ssl_provision_p .btn').attr('disabled', '1'); // prevent double-clicks
-  api(
-    "/ssl/provision",
-    "POST",
-    { },
-    function(status) {
-      // Clear last attempt.
-      $('#ssl_provision_result').text("");
-      may_reenable_provision_button = true;
-
-      // Nothing was done. There might also be problem domains, but we've already displayed those.
-      if (status.requests.length == 0) {
-        show_modal_error("TLS Certificate Provisioning", "There were no domain names to provision certificates for.");
-        // don't return - haven't re-enabled the provision button
-      }
-
-      // Each provisioning API call returns zero or more "requests" which represent
-      // a request to Let's Encrypt for a single certificate. Normally there is just
-      // one request (for a single multi-domain certificate).
-      for (var i = 0; i < status.requests.length; i++) {
-        var r = status.requests[i];
-
-        if (r.result == "skipped") {
-          // not interested --- this domain wasn't in the table
-          // to begin with
-          continue;
-        }
-
-        // create an HTML block to display the results of this request
-        var n = $("<div><h4/><p/></div>");
-        $('#ssl_provision_result').append(n);
-
-        // plain log line
-        if (typeof r === "string") {
-          n.find("p").text(r);
-          continue;
-        }
-
-        // show a header only to disambiguate request blocks
-        if (status.requests.length > 0)
-          n.find("h4").text(r.domains.join(", "));
-
-        if (r.result == "error") {
-          n.find("p").addClass("text-danger").text(r.message);
-
-        } else if (r.result == "installed") {
-          n.find("p").addClass("text-success").text("The TLS certificate was provisioned and installed.");
-          setTimeout("show_tls(true)", 1); // update main table of certificate statuses, call with arg keep_provisioning_shown true so that we don't clear what we just outputted
-
-        }
-
-        // display the detailed log info in case of problems
-        var trace = $("<div class='small text-muted' style='margin-top: 1.5em'>Log:</div>");
-        n.append(trace);
-        for (var j = 0; j < r.log.length; j++)
-          trace.append($("<div/>").text(r.log[j]));
-      }
-
-      if (may_reenable_provision_button)
-        $('#ssl_provision_p .btn').removeAttr("disabled");
-    });
-}
 </script>

management/templates/sync-guide.html

@@ -30,7 +30,7 @@
 
 			<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/packages/at.bitfire.davdroid/">here</a>)</td></tr>
+			<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>

management/templates/system-backup.html

@@ -5,123 +5,17 @@
 
 <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>Copying Backup Files</h3>
 
-<h3>Configuration</h3>
+<p>The box makes an incremental backup each night. The backup is stored on the machine itself. You are responsible for copying the backup files off of the machine.</p>
 
-<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="rsync">rsync</option>
-        <option value="s3">Amazon S3</option>
-      </select>
-    </div>
-  </div>
-  <!-- LOCAL BACKUP -->
-  <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 class="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>
-  <!-- RSYNC BACKUP -->
-  <div class="form-group backup-target-rsync">
-    <div class="col-sm-10 col-sm-offset-2">
+<p>Many cloud providers make this easy by allowing you to take snapshots of the machine's disk.</p>
 
-      <p>Backups synced to a remote machine using rsync over SSH, with local
-      copies in <tt class="backup-location"></tt>. 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>
+<p>You can also use SFTP (FTP over SSH) to copy files from <tt id="backup-location"></tt>. These files are encrypted, so they are safe to store anywhere. Copy the encryption password from <tt id="backup-encpassword-file"></tt> also but keep it in a safe location.</p>
 
-    </div>
-  </div>
-  <div class="form-group backup-target-rsync">
-    <label for="backup-target-rsync-host" class="col-sm-2 control-label">Hostname</label>
-    <div class="col-sm-8">
-      <input type="text" placeholder="hostname.local" class="form-control" rows="1" id="backup-target-rsync-host">
-    </div>
-  </div>
-  <div class="form-group backup-target-rsync">
-    <label for="backup-target-rsync-path" class="col-sm-2 control-label">Path</label>
-    <div class="col-sm-8">
-        <input type="text" placeholder="/backups/{{hostname}}" class="form-control" rows="1" id="backup-target-rsync-path">
-    </div>
-  </div>
-  <div class="form-group backup-target-rsync">
-    <label for="backup-target-rsync-user" class="col-sm-2 control-label">Username</label>
-    <div class="col-sm-8">
-      <input type="text" class="form-control" rows="1" id="backup-target-rsync-user">
-    </div>
-  </div>
-  <div class="form-group backup-target-rsync">
-    <label for="ssh-pub-key" class="col-sm-2 control-label">Public SSH Key</label>
-    <div class="col-sm-8">
-      <input type="text" class="form-control" rows="1" id="ssh-pub-key" readonly>
-      <div class="small" style="margin-top: 2px">
-        Copy the Public SSH Key above, and paste it within the <tt>~/.ssh/authorized_keys</tt>
-        of target user on the backup server specified above. That way you'll enable secure and
-        passwordless authentication from your mail-in-a-box server and your backup server.
-      </div>
-    </div>
-  </div>
-  <!-- S3 BACKUP -->
-  <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-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>
-  <!-- Common -->
-  <div class="form-group backup-target-local backup-target-rsync backup-target-s3">
-    <label for="min-age" class="col-sm-2 control-label">Days:</label>
-    <div class="col-sm-8">
-      <input type="number" class="form-control" rows="1" id="min-age">
-      <div class="small" style="margin-top: 2px">This is the <i>minimum</i> number of days backup data is kept for. The box makes an incremental backup, so backup data is often kept much longer. An incremental backup file that is less than this number of days old requires that all previous increments back to the most recent full backup, plus that full backup, remain available.</div>
-    </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>Current Backups</h3>
 
-<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>
+<p>The backup directory currently contains the backups listed below. The total size on disk of the backups is currently <span id="backup-total-size"></span>.</p>
 
 <table id="backup-status" class="table" style="width: auto">
   <thead>
@@ -133,14 +27,8 @@
   <tbody>
   </tbody>
 </table>
+
 <script>
-
-function toggle_form() {
-  var target_type = $("#backup-target-type").val();
-  $(".backup-target-local, .backup-target-rsync, .backup-target-s3").hide();
-  $(".backup-target-" + target_type).show();
-}
-
 function nice_size(bytes) {
   var powers = ['bytes', 'KB', 'MB', 'GB', 'TB'];
   while (true) {
@@ -158,27 +46,19 @@ function nice_size(bytes) {
 }
 
 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) {
-      if (r.error) {
-          show_modal_error("Backup Error", $("<pre/>").text(r.error));
-          return;
-      }
+      $('#backup-location').text(r.directory);
+      $('#backup-encpassword-file').text(r.encpwfile);
 
       $('#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) {
+      if (r.backups.length == 0) {
         var tr = $('<tr><td colspan="3">No backups have been made yet.</td></tr>');
         $('#backup-status tbody').append(tr);
       }
@@ -187,7 +67,7 @@ function show_system_backup() {
         var b = r.backups[i];
         var tr = $('<tr/>');
         if (b.full) tr.addClass("full-backup");
-        tr.append( $('<td/>').text(b.date_str) );
+        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)) );
@@ -203,78 +83,4 @@ function show_system_backup() {
       $('#backup-total-size').text(nice_size(total_disk_size));
     })
 }
-
-function show_custom_backup() {
-    $(".backup-target-local, .backup-target-rsync, .backup-target-s3").hide();
-    api(
-      "/system/backup/config",
-      "GET",
-      { },
-      function(r) {
-        $("#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);
-        $("#ssh-pub-key").val(r.ssh_pub_key);
-
-        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, 8) == "rsync://") {
-          $("#backup-target-type").val("rsync");
-          var path = r.target.substring(8).split('//');
-          var host_parts = path.shift().split('@');
-          $("#backup-target-rsync-user").val(host_parts[0]);
-          $("#backup-target-rsync-host").val(host_parts[1]);
-          $("#backup-target-rsync-path").val('/'+path[0]);
-        } 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('/'));
-        }
-        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();
-  else if (target_type == "rsync") {
-    target = "rsync://" + $("#backup-target-rsync-user").val() + "@" + $("#backup-target-rsync-host").val()
-                                                                + "/" + $("#backup-target-rsync-path").val();
-    target_user = '';
-  }
-
-
-  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

@@ -36,22 +36,6 @@
 }
 </style>
 
-<div class="row">
-	<div class="col-md-push-9 col-md-3">
-
-<div id="system-reboot-required" style="display: none; margin-bottom: 1em;">
-	<button type="button" class="btn btn-danger" onclick="confirm_reboot(); return false;">Reboot Box</button>
-	<div>No reboot is necessary.</div>
-</div>
-
-<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>
-
-	</div> <!-- /col -->
-	<div class="col-md-pull-3 col-md-8">
-
 <table id="system-checks" class="table" style="max-width: 60em">
   <thead>
   </thead>
@@ -59,34 +43,9 @@
   </tbody>
 </table>
 
-	</div> <!-- /col -->
-</div> <!-- /row -->
-
 <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/reboot",
-    "GET",
-    { },
-    function(r) {
-      $('#system-reboot-required').show(); // show when r becomes available
-      $('#system-reboot-required').find('button').toggle(r);
-      $('#system-reboot-required').find('div').toggle(!r);
-    });
-
   api(
     "/system/status",
     "POST",
@@ -123,38 +82,5 @@ function show_system_status() {
         }
       }
     })
-
-}
-
-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
-}
-
-function confirm_reboot() {
-  show_modal_confirm(
-    "Reboot",
-    $("<p>This will reboot your Mail-in-a-Box <code>{{hostname}}</code>.</p> <p>Until the machine is fully restarted, your users will not be able to send and receive email, and you will not be able to connect to this control panel or with SSH. The reboot cannot be cancelled.</p>"),
-    "Reboot Now",
-    function() {
-      api(
-        "/system/reboot",
-        "POST",
-        { },
-        function(r) {
-          var msg = "<p>Please reload this page after a minute or so.</p>";
-          if (r) msg = "<p>The reboot command said:</p> <pre>" + $("<pre/>").text(r).html() + "</pre>"; // successful reboots don't produce any output; the output must be HTML-escaped
-          show_modal_error("Reboot", msg);
-        });
-    });
 }
 </script>

management/templates/users.html

@@ -31,10 +31,10 @@
   <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 eight 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>Passwords must be at least four characters and may not contain spaces.</li>
+  <li>Use <a href="javascript: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>
+  <li>User accounts cannot contain any international (non-ASCII) characters, but <a href="javascript:show_panel('aliases')">aliases</a> can.</li>
 </ul>
 
 <h3>Existing mail users</h3>
@@ -84,48 +84,6 @@
   </table>
 </div>
 
-<h3>Mail user API (advanced)</h3>
-
-<p>Use your box&rsquo;s mail user API to add/change/remove users from the command-line or custom services you build.</p>
-
-<p>Usage:</p>
-
-<pre>curl -X <b>VERB</b> [-d "<b>parameters</b>"] --user {email}:{password} https://{{hostname}}/admin/mail/users[<b>action</b>]</pre>
-
-<p>Brackets denote an optional argument. Please note that the POST body <code>parameters</code> must be URL-encoded.</p>
-
-<p>The email and password given to the <code>--user</code> option must be an administrative user on this system.</p>
-
-<h4 style="margin-bottom: 0">Verbs</h4>
-
-<table class="table" style="margin-top: .5em">
-<thead><th>Verb</th> <th>Action</th><th></th></thead>
-<tr><td>GET</td><td><i>(none)</i></td> <td>Returns a list of existing mail users. Adding <code>?format=json</code> to the URL will give JSON-encoded results.</td></tr>
-<tr><td>POST</td><td>/add</td> <td>Adds a new mail user. Required POST-body parameters are <code>email</code> and <code>password</code>.</td></tr>
-<tr><td>POST</td><td>/remove</td> <td>Removes a mail user. Required POST-by parameter is <code>email</code>.</td></tr>
-<tr><td>POST</td><td>/privileges/add</td> <td>Used to make a mail user an admin. Required POST-body parameters are <code>email</code> and <code>privilege=admin</code>.</td></tr>
-<tr><td>POST</td><td>/privileges/remove</td> <td>Used to remove the admin privilege from a mail user. Required POST-body parameter is <code>email</code>.</td></tr>
-</table>
-
-<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 administrative email address and password.</p>
-
-<pre># Gives a JSON-encoded list of all mail users
-curl -X GET https://{{hostname}}/admin/mail/users?format=json
-
-# Adds a new email user
-curl -X POST -d "email=new_user@mydomail.com" -d "password=s3curE_pa5Sw0rD" https://{{hostname}}/admin/mail/users/add
-
-# Removes a email user
-curl -X POST -d "email=new_user@mydomail.com" https://{{hostname}}/admin/mail/users/remove
-
-# Adds admin privilege to an email user
-curl -X POST -d "email=new_user@mydomail.com" -d "privilege=admin" https://{{hostname}}/admin/mail/users/privileges/add
-
-# Removes admin privilege from an email user
-curl -X POST -d "email=new_user@mydomail.com" https://{{hostname}}/admin/mail/users/privileges/remove
-</pre>
 
 <script>
 function show_users() {
@@ -212,8 +170,8 @@ function users_set_password(elem) {
     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(
-    "Set Password",
-    $("<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 eight characters and may not contain spaces.</small>" + yourpw + "</p>"),
+    "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(
@@ -292,13 +250,4 @@ function mod_priv(elem, add_remove) {
         });
     });
 }
-
-function generate_random_password() {
-  var pw = "";
-  var charset = "ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz23456789"; // confusable characters skipped
-  for (var i = 0; i < 12; 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

@@ -82,7 +82,7 @@ function show_change_web_root(elem) {
   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.</p>'),
+    $('<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(); });
 }

management/utils.py

@@ -1,10 +1,6 @@
 import os.path
 
-# DO NOT import non-standard modules. This module is imported by
-# migrate.py which runs on fresh machines before anything is installed
-# besides Python.
-
-# THE ENVIRONMENT FILE AT /etc/mailinabox.conf
+CONF_DIR = os.path.join(os.path.dirname(__file__), "../conf")
 
 def load_environment():
     # Load settings from /etc/mailinabox.conf.
@@ -22,78 +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.
-
-    # 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("."))),
-      ))
+    # Put domain names in a nice sorted order. For web_update, PRIMARY_HOSTNAME
+    # must appear first so it becomes the nginx default server.
     
-    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)
+
+    # Within each group, sort parent domains before subdomains and after that sort lexicographically.
+    def sort_group(group):
+        # Find the top-most domains.
+        top_domains = sorted(d for d in group if len([s for s in group if d.endswith("." + s)]) == 0)
+        ret = []
+        for d in top_domains:
+            ret.append(d)
+            ret.extend( sort_group([s for s in group if s.endswith("." + d)]) )
+        return ret
+        
+    groups = [sort_group(g) for g in groups]
+
+    return groups[0] + groups[1] + groups[2]
 
 def sort_email_addresses(email_addresses, env):
     email_addresses = set(email_addresses)
@@ -106,6 +62,76 @@ def sort_email_addresses(email_addresses, env):
     ret.extend(sorted(email_addresses)) # whatever is left
     return ret
 
+def exclusive_process(name):
+    # Ensure that a process named `name` does not execute multiple
+    # times concurrently.
+    import os, sys, atexit
+    pidfile = '/var/run/mailinabox-%s.pid' % name
+    mypid = os.getpid()
+
+    # Attempt to get a lock on ourself so that the concurrency check
+    # itself is not executed in parallel.
+    with open(__file__, 'r+') as flock:
+        # Try to get a lock. This blocks until a lock is acquired. The
+        # lock is held until the flock file is closed at the end of the
+        # with block.
+        os.lockf(flock.fileno(), os.F_LOCK, 0)
+
+        # While we have a lock, look at the pid file. First attempt
+        # to write our pid to a pidfile if no file already exists there.
+        try:
+            with open(pidfile, 'x') as f:
+                # Successfully opened a new file. Since the file is new
+                # there is no concurrent process. Write our pid.
+                f.write(str(mypid))
+                atexit.register(clear_my_pid, pidfile)
+                return
+        except FileExistsError:
+            # The pid file already exixts, but it may contain a stale
+            # pid of a terminated process.
+            with open(pidfile, 'r+') as f:
+                # Read the pid in the file.
+                existing_pid = None
+                try:
+                    existing_pid = int(f.read().strip())
+                except ValueError:
+                    pass # No valid integer in the file.
+
+                # Check if the pid in it is valid.
+                if existing_pid:
+                    if is_pid_valid(existing_pid):
+                        print("Another %s is already running (pid %d)." % (name, existing_pid), file=sys.stderr)
+                        sys.exit(1)
+
+                # Write our pid.
+                f.seek(0)
+                f.write(str(mypid))
+                f.truncate()
+                atexit.register(clear_my_pid, pidfile)
+ 
+
+def clear_my_pid(pidfile):
+    import os
+    os.unlink(pidfile)
+
+
+def is_pid_valid(pid):
+    """Checks whether a pid is a valid process ID of a currently running process."""
+    # adapted from http://stackoverflow.com/questions/568271/how-to-check-if-there-exists-a-process-with-a-given-pid
+    import os, errno
+    if pid <= 0: raise ValueError('Invalid PID.')
+    try:
+        os.kill(pid, 0)
+    except OSError as err:
+        if err.errno == errno.ESRCH: # No such process
+            return False
+        elif err.errno == errno.EPERM: # Not permitted to send signal
+            return True
+        else: # EINVAL
+            raise
+    else:
+        return True
+
 def shell(method, cmd_args, env={}, capture_stderr=False, return_bytes=False, trap=False, input=None):
     # A safe way to execute processes.
     # Some processes like apt-get require being given a sane PATH.
@@ -174,18 +200,3 @@ def wait_for_service(port, public, env, timeout):
 			if time.perf_counter() > start+timeout:
 				return False
 		time.sleep(min(timeout/4, 1))
-
-def fix_boto():
-	# Google Compute Engine instances install some Python-2-only boto plugins that
-	# conflict with boto running under Python 3. Disable boto's default configuration
-	# file prior to importing boto so that GCE's plugin is not loaded:
-	import os
-	os.environ["BOTO_CONFIG"] = "/etc/boto3.cfg"
-
-
-if __name__ == "__main__":
-	from web_update import get_web_domains
-	env = load_environment()
-	domains = get_web_domains(env)
-	for domain in domains:
-		print(domain)

management/web_update.py

@@ -2,38 +2,27 @@
 # domains for which a mail account has been set up.
 ########################################################################
 
-import os.path, re, rtyaml
+import os, os.path, shutil, re, tempfile, rtyaml
 
 from mailconfig import get_mail_domains
-from dns_update import get_custom_dns_config, get_dns_zones
-from ssl_certificates import get_ssl_certificates, get_domain_ssl_files, check_certificate
+from dns_update import get_custom_dns_config, do_dns_update, get_dns_zones
 from utils import shell, safe_domain_name, sort_domains
 
-def get_web_domains(env, include_www_redirects=True, exclude_dns_elsewhere=True):
-	# What domains should we serve HTTP(S) for?
+def get_web_domains(env):
+	# What domains should we serve websites for?
 	domains = set()
 
-	# Serve web for all mail domains so that we might at least
-	# provide auto-discover of email settings, and also a static website
-	# if the user wants to make one.
-	domains |= get_mail_domains(env)
-
-	if include_www_redirects:
-		# Add 'www.' subdomains that we want to provide default redirects
-		# to the main domain for. We'll add 'www.' to any DNS zones, i.e.
-		# the topmost of each domain we serve.
-		domains |= set('www.' + zone for zone, zonefile in get_dns_zones(env))
-	 
-	if exclude_dns_elsewhere:
-		# ...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_domains_with_a_records(env)
-
-	# Ensure the PRIMARY_HOSTNAME is in the list so we can serve webmail
-	# as well as Z-Push for Exchange ActiveSync. This can't be removed
-	# by a custom A/AAAA record and is never a 'www.' redirect.
+	# At the least it's the PRIMARY_HOSTNAME so we can serve webmail
+	# as well as Z-Push for Exchange ActiveSync.
 	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
+	# if the user wants to make one. These will require an SSL cert.
+	# ...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))
+
 	# Sort the list so the nginx conf gets written in a stable order.
 	domains = sort_domains(domains, env)
 
@@ -43,7 +32,7 @@ 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'])):
+		if rtype == "CNAME" or (rtype in ("A", "AAAA") and value != "local"):
 			domains.add(domain)
 	return domains
 
@@ -61,10 +50,16 @@ def get_web_domains_with_root_overrides(env):
 					root_overrides[domain] = (type, value)
 	return root_overrides
 
-def do_web_update(env):
-	# Pre-load what SSL certificates we will use for each domain.
-	ssl_certificates = get_ssl_certificates(env)
 
+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):
 	# Build an nginx configuration file.
 	nginx_conf = open(os.path.join(os.path.dirname(__file__), "../conf/nginx-top.conf")).read()
 
@@ -75,24 +70,20 @@ def do_web_update(env):
 	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)
+	nginx_conf += make_domain_config(env['PRIMARY_HOSTNAME'], [template0, template1, template2], env)
 
 	# Add configuration all other web domains.
 	has_root_proxy_or_redirect = get_web_domains_with_root_overrides(env)
-	web_domains_not_redirect = get_web_domains(env, include_www_redirects=False)
 	for domain in get_web_domains(env):
-		if domain == env['PRIMARY_HOSTNAME']:
-			# PRIMARY_HOSTNAME is handled above.
-			continue
-		if domain in web_domains_not_redirect:
-			# This is a regular domain.
-			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)
+		if domain == env['PRIMARY_HOSTNAME']: continue # handled above
+		if domain not in has_root_proxy_or_redirect:
+			nginx_conf += make_domain_config(domain, [template0, template1], env)
 		else:
-			# Add default 'www.' redirect.
-			nginx_conf += make_domain_config(domain, [template0, template3], ssl_certificates, env)
+			nginx_conf += make_domain_config(domain, [template0], env)
+
+	# Add default www redirects.
+	for domain in get_default_www_redirects(env):
+		nginx_conf += make_domain_config(domain, [template0, template3], env)
 
 	# Did the file change? If not, don't bother writing & restarting nginx.
 	nginx_conf_fn = "/etc/nginx/conf.d/local.conf"
@@ -113,14 +104,18 @@ def do_web_update(env):
 
 	return "web updated\n"
 
-def make_domain_config(domain, templates, ssl_certificates, env):
+def make_domain_config(domain, templates, env):
 	# GET SOME VARIABLES
 
 	# 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?
-	tls_cert = get_domain_ssl_files(domain, ssl_certificates, env)
+	ssl_key, ssl_certificate, ssl_via = get_domain_ssl_files(domain, env)
+
+	# 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, env)
 
 	# ADDITIONAL DIRECTIVES.
 
@@ -137,34 +132,19 @@ def make_domain_config(domain, templates, ssl_certificates, env):
 		finally:
 			f.close()
 		return sha1.hexdigest()
-	nginx_conf_extra += "# ssl files sha1: %s / %s\n" % (hashfile(tls_cert["private-key"]), hashfile(tls_cert["certificate"]))
+	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]
-
-			# any proxy or redirect here?
 			for path, url in yaml.get("proxies", {}).items():
-				nginx_conf_extra += "\tlocation %s {" % path
-				nginx_conf_extra += "\n\t\tproxy_pass %s;" % url
-				nginx_conf_extra += "\n\t\tproxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;"
-				nginx_conf_extra += "\n\t}\n"
+				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=15768000;\n"
-	elif hsts == "preload":
-		nginx_conf_extra += "add_header Strict-Transport-Security \"max-age=15768000; 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):
@@ -181,8 +161,8 @@ def make_domain_config(domain, templates, ssl_certificates, env):
 	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", tls_cert["private-key"])
-	nginx_conf = nginx_conf.replace("$SSL_CERTIFICATE", tls_cert["certificate"])
+	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
@@ -194,21 +174,144 @@ def get_web_root(domain, env, test_exists=True):
 		if os.path.exists(root) or not test_exists: break
 	return root
 
+def get_domain_ssl_files(domain, env, allow_shared_cert=True):
+	# What SSL private key will we use? Allow the user to override this, but
+	# in many cases using the same private key for all domains would be fine.
+	# 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
+
+	# What SSL certificate will we use?
+	ssl_certificate_primary = os.path.join(env["STORAGE_ROOT"], 'ssl/ssl_certificate.pem')
+	ssl_via = None
+	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))
+
+		# But we can be smart and reuse the main SSL certificate if is has
+		# 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 and allow_shared_cert:
+			from status_checks import check_certificate
+			if check_certificate(domain, ssl_certificate_primary, None)[0] == "OK":
+				ssl_certificate = ssl_certificate_primary
+				ssl_via = "Using multi/wildcard certificate of %s." % env['PRIMARY_HOSTNAME']
+
+			# For a 'www.' domain, see if we can reuse the cert of the parent.
+			elif domain.startswith('www.'):
+				ssl_certificate_parent = os.path.join(env["STORAGE_ROOT"], 'ssl/%s/ssl_certificate.pem' % safe_domain_name(domain[4:]))
+				if os.path.exists(ssl_certificate_parent) and check_certificate(domain, ssl_certificate_parent, None)[0] == "OK":
+					ssl_certificate = ssl_certificate_parent
+					ssl_via = "Using multi/wildcard certificate of %s." % domain[4:]
+
+	return ssl_key, ssl_certificate, ssl_via
+
+def ensure_ssl_certificate_exists(domain, ssl_key, ssl_certificate, env):
+	# For domains besides PRIMARY_HOSTNAME, generate a self-signed certificate if
+	# a certificate doesn't already exist. See setup/mail.sh for documentation.
+
+	if domain == env['PRIMARY_HOSTNAME']:
+		return
+
+	# 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 os.path.exists(ssl_certificate):
+		return
+
+	os.makedirs(os.path.dirname(ssl_certificate), exist_ok=True)
+
+	# Generate a new self-signed certificate using the same private key that we already have.
+
+	# Start with a CSR written to a temporary file.
+	with tempfile.NamedTemporaryFile(mode="w") as csr_fp:
+		csr_fp.write(create_csr(domain, ssl_key, env))
+		csr_fp.flush() # since we won't close until after running 'openssl x509', since close triggers delete.
+
+		# And then make the certificate.
+		shell("check_call", [
+			"openssl", "x509", "-req",
+			"-days", "365",
+			"-in", csr_fp.name,
+			"-signkey", ssl_key,
+			"-out", ssl_certificate])
+
+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):
+		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_key, ssl_certificate, ssl_via = get_domain_ssl_files(domain, env, allow_shared_cert=False)
+	cert_status, cert_status_details = check_certificate(domain, fn, ssl_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
+
+	# Copy the certificate to its expected location.
+	os.makedirs(os.path.dirname(ssl_certificate), exist_ok=True)
+	shutil.move(fn, ssl_certificate)
+
+	ret = ["OK"]
+
+	# When updating the cert for PRIMARY_HOSTNAME, also update DNS because it is
+	# used in the DANE TLSA record and restart postfix and dovecot which use
+	# that certificate.
+	if domain == env['PRIMARY_HOSTNAME']:
+		ret.append( do_dns_update(env) )
+
+		shell('check_call', ["/usr/sbin/service", "postfix", "restart"])
+		shell('check_call', ["/usr/sbin/service", "dovecot", "restart"])
+		ret.append("mail services restarted")
+
+	# Kick nginx so it sees the cert.
+	ret.append( do_web_update(env) )
+	return "\n".join(ret)
+
 def get_web_domains_info(env):
-	www_redirects = set(get_web_domains(env)) - set(get_web_domains(env, include_www_redirects=False))
-	has_root_proxy_or_redirect = set(get_web_domains_with_root_overrides(env))
-	ssl_certificates = get_ssl_certificates(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):
-		try:
-			tls_cert = get_domain_ssl_files(domain, ssl_certificates, env, allow_missing_cert=True)
-		except OSError: # PRIMARY_HOSTNAME cert is missing
-			tls_cert = None
-		if tls_cert is None: return ("danger", "No certificate installed.")
-		cert_status, cert_status_details = check_certificate(domain, tls_cert["certificate"], tls_cert["private-key"])
+		from status_checks import check_certificate
+		ssl_key, ssl_certificate, ssl_via = get_domain_ssl_files(domain, env)
+		if not os.path.exists(ssl_certificate):
+			return ("danger", "No Certificate Installed")
+		cert_status, cert_status_details = check_certificate(domain, ssl_certificate, ssl_key)
 		if cert_status == "OK":
-			return ("success", "Signed & valid. " + cert_status_details)
+			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:
@@ -220,7 +323,15 @@ def get_web_domains_info(env):
 			"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 (www_redirects | has_root_proxy_or_redirect),
+			"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)
 	]

ppa/Makefile

@@ -14,7 +14,7 @@ build_postgrey: clean
 	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/old/postgrey-1.35.tar.gz
+	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

security.md

@@ -17,11 +17,8 @@ The primary goal of Mail-in-a-Box is to make deploying a good mail server easy,
 
 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 are always sent through SSH/TLS, never in the clear.
+* Outbound mail is sent with the highest level of TLS possible (more on that below).
 
 User Credentials
 ----------------
@@ -38,16 +35,23 @@ These services are protected by [TLS](https://en.wikipedia.org/wiki/Transport_La
 
 The services all follow these rules:
 
-* TLS 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))
+* 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).
-* HTTPS, IMAP, and POP track the [Mozilla Intermediate Ciphers Recommendation](https://wiki.mozilla.org/Security/Server_Side_TLS), balancing security with supporting a wide range of mail clients. Diffie-Hellman ciphers use a 2048-bit key for forward secrecy. For more details, see the [output of SSLyze for these ports](tests/tls_results.txt).
-* SMTP (port 25) uses the Postfix medium grade ciphers and SMTP Submission (port 587) uses the Postfix high grade ciphers ([more info](http://www.postfix.org/postconf.5.html#smtpd_tls_mandatory_ciphers)).
+* 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))
@@ -62,16 +66,6 @@ The [setup guide video](https://mailinabox.email/) explains how to verify the ho
 
 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))
 
-### Brute-force attack mitigation
-
-`fail2ban` provides some protection from brute-force login attacks (repeated logins that guess account passwords) by blocking offending IP addresses at the network level.
-
-The following services are protected: SSH, IMAP (dovecot), SMTP submission (postfix), webmail (roundcube), Nextcloud/CalDAV/CardDAV (over HTTP), and the Mail-in-a-Box control panel & munin (over HTTP).
-
-Some other services running on the box may be missing fail2ban filters.
-
-`fail2ban` only blocks IPv4 addresses, however. If the box has a public IPv6 address, it is not protected from these attacks.
-
 Outbound Mail
 -------------
 
@@ -83,7 +77,7 @@ The first step in resolving the destination server for an email address is perfo
 
 ### 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 (TLSv1 and later, no RC4) will be used to the extent the recipient server supports them. ([source](setup/mail-postfix.sh))
+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
 
@@ -91,20 +85,14 @@ If the recipient's domain name supports DNSSEC and has published a [DANE TLSA](h
 
 ### 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.)
+Domain policy records allow recipient MTAs to detect when the _domain_ part of 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))
 
 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 TLSv1 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 perfect forward secrecy, however. ([source](setup/mail-postfix.sh))
+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
 

setup/bootstrap.sh

@@ -2,12 +2,12 @@
 #########################################################
 # This script is intended to be run like this:
 #
-#   curl https://mailinabox.email/setup.sh | sudo bash
+#   curl https://.../bootstrap.sh | sudo bash
 #
 #########################################################
 
 if [ -z "$TAG" ]; then
-	TAG=v0.28
+	TAG=v0.10
 fi
 
 # Are we running as root?

setup/csr_country_codes.tsv

@@ -1,28 +1,27 @@
 # 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 21 countries by number of Internet users are grouped first, see
+# 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.
-CN	China	
-IN	India	
-US	United States	
-JP	Japan	
 BR	Brazil	
-RU	Russian Federation	Russia
-DE	Germany	
-NG	Nigeria	
-GB	United Kingdom	
-FR	France	
-MX	Mexico	
-EG	Egypt	
-KR	South Korea
-VN	Vietnam
-ID	Indonesia	
-PH	Philippines	
-TR	Turkey	
-IT	Italy	
-PK	Pakistan	
-ES	Spain	
 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	
@@ -184,6 +183,7 @@ PA	Panama
 PE	Peru	
 PF	French Polynesia	
 PG	Papua New Guinea	
+PK	Pakistan	
 PL	Poland	
 PM	Saint Pierre and Miquelon	
 PN	Pitcairn	Pitcairn Islands

setup/dkim.sh

@@ -10,7 +10,6 @@ source setup/functions.sh # load our functions
 source /etc/mailinabox.conf # load global vars
 
 # Install DKIM...
-echo Installing OpenDKIM/OpenDMARC...
 apt_install opendkim opendkim-tools opendmarc
 
 # Make sure configuration directories exist.
@@ -31,23 +30,18 @@ ExternalIgnoreList      refile:/etc/opendkim/TrustedHosts
 InternalHosts           refile:/etc/opendkim/TrustedHosts
 KeyTable                refile:/etc/opendkim/KeyTable
 SigningTable            refile:/etc/opendkim/SigningTable
-Socket                  inet:8891@127.0.0.1
+Socket                  inet:8891@localhost
 RequireSafeKeys         false
 EOF
 fi
 
-# Create a new DKIM key. This creates mail.private and mail.txt
-# in $STORAGE_ROOT/mail/dkim. The former is the private key and
-# the latter is the suggested DNS TXT entry which we'll include
-# in our DNS setup. Note that the files are named after the
-# '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.
+# Create a new DKIM key. This creates
+# mail.private and mail.txt in $STORAGE_ROOT/mail/dkim. The former
+# is the actual private key and the latter is the suggested DNS TXT
+# entry which we'll want to include in our DNS setup.
 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.

setup/dns.sh

@@ -15,7 +15,7 @@ source /etc/mailinabox.conf # load global vars
 # * nsd: The non-recursive nameserver that publishes our DNS records.
 # * ldnsutils: Helper utilities for signing DNSSEC zones.
 # * openssh-client: Provides ssh-keyscan which we use to create SSHFP records.
-echo "Installing nsd (DNS server)..."
+
 apt_install nsd ldnsutils openssh-client
 
 # Prepare nsd's configuration.
@@ -23,7 +23,7 @@ apt_install nsd ldnsutils openssh-client
 mkdir -p /var/run/nsd
 
 cat > /etc/nsd/nsd.conf << EOF;
-# Do not edit. Overwritten by Mail-in-a-Box setup.
+# No not edit. Overwritten by Mail-in-a-Box setup.
 server:
   hide-version: yes
 
@@ -78,7 +78,7 @@ 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..."
+		echo "Generating DNSSEC signing keys. This may take a few minutes..."
 		FIRST=0 #NODOC
 	fi
 
@@ -88,17 +88,13 @@ if [ ! -f "$STORAGE_ROOT/dns/dnssec/$algo.conf" ]; then
 	#
 	# `ldns-keygen` outputs the new key's filename to stdout, which
 	# we're capturing into the `KSK` variable.
-	#
-	# ldns-keygen uses /dev/random for generating random numbers by default.
-	# This is slow and unecessary if we ensure /dev/urandom is seeded properly,
-	# so we use /dev/urandom. See system.sh for an explanation. See #596, #115.
-	KSK=$(umask 077; cd $STORAGE_ROOT/dns/dnssec; ldns-keygen -r /dev/urandom -a $algo -b 2048 -k _domain_);
+	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.
-	ZSK=$(umask 077; cd $STORAGE_ROOT/dns/dnssec; ldns-keygen -r /dev/urandom -a $algo -b 1024 _domain_);
+	ZSK=$(umask 077; cd $STORAGE_ROOT/dns/dnssec; ldns-keygen -a $algo -b 1024 _domain_);
 
 	# These generate two sets of files like:
 	#
@@ -131,6 +127,8 @@ EOF
 chmod +x /etc/cron.daily/mailinabox-dnssec
 
 # Permit DNS queries on TCP/UDP in the firewall.
-
 ufw_allow domain
 
+# Start nsd. None of the zones are configured until the management daemon is
+# run later, though.
+restart_service nsd

setup/firstuser.sh

@@ -35,7 +35,7 @@ if [ -z "`tools/mail.py user`" ]; then
 		else
 			# Use me@PRIMARY_HOSTNAME
 			EMAIL_ADDR=me@$PRIMARY_HOSTNAME
-			EMAIL_PW=12345678
+			EMAIL_PW=1234
 			echo
 			echo "Creating a new administrative mail account for $EMAIL_ADDR with password $EMAIL_PW."
 			echo
@@ -53,5 +53,5 @@ if [ -z "`tools/mail.py user`" ]; then
 	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
+	tools/mail.py alias add administrator@$PRIMARY_HOSTNAME $EMAIL_ADDR
+fi

setup/functions.sh

@@ -39,34 +39,59 @@ function apt_get_quiet {
 }
 
 function apt_install {
-	# Install a bunch of packages. We used to report which packages were already
-	# installed and which needed installing, before just running an 'apt-get
-	# install' for all of the packages.  Calling `dpkg` on each package is slow,
-	# 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 apt_add_repository_to_unattended_upgrades {
-	if [ -f /etc/apt/apt.conf.d/50unattended-upgrades ]; then
-		if ! grep -q "$1" /etc/apt/apt.conf.d/50unattended-upgrades; then
-			sed -i "/Allowed-Origins/a \
-	    \"$1\";" /etc/apt/apt.conf.d/50unattended-upgrades
-		fi
+	if [ ! -z "$IS_DOCKER" ]; then
+		# Speed things up because packages are already installed by the image.
+		PACKAGES=""
 	fi
+			
+	# Report any packages already installed.
+	TO_INSTALL=""
+	ALREADY_INSTALLED=""
+	for pkg in $PACKAGES; do
+		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
+
+	# 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
+	# a difference.
+	apt_get_quiet install $PACKAGES
 }
 
 function get_default_hostname {
 	# Guess the machine's hostname. It should be a fully qualified
 	# domain name suitable for DNS. None of these calls may provide
 	# the right value, but it's the best guess we can make.
-	set -- $(hostname --fqdn      2>/dev/null ||
-                 hostname --all-fqdns 2>/dev/null ||
-                 hostname             2>/dev/null)
+	set -- $(
+		get_hostname_from_reversedns ||
+		hostname --fqdn      2>/dev/null ||
+		hostname --all-fqdns 2>/dev/null ||
+		hostname             2>/dev/null)
 	printf '%s\n' "$1" # return this value
 }
 
+function get_hostname_from_reversedns {
+	# Do a reverse DNS lookup on our public IPv4 address. The output of
+	# `host` is complex -- use sed to get the FDQN.
+	host $(get_publicip_from_web_service 4) | sed "s/.*pointer \(.*\)\./\1/"
+}
+
 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
@@ -142,7 +167,17 @@ function ufw_allow {
 }
 
 function restart_service {
-	hide_output service $1 restart
+	if [ -z "$IS_DOCKER" ]; then
+		# Restart the service.
+		hide_output service $1 restart
+
+	else
+		# In Docker, make sure the service is not disabled by a down file.
+		if [ -f /etc/service/$1/down ]; then
+			rm /etc/service/$1/down
+		fi
+		sv restart $1
+	fi
 }
 
 ## Dialog Functions ##
@@ -179,7 +214,7 @@ function wget_verify {
 	DEST=$3
 	CHECKSUM="$HASH  $DEST"
 	rm -f $DEST
-	hide_output wget -O $DEST $URL
+	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."

setup/mail-dovecot.sh

@@ -23,7 +23,6 @@ source /etc/mailinabox.conf # load global vars
 # 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-sieve dovecot-managesieved dovecot-lucene
@@ -37,17 +36,8 @@ apt_install \
 # 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).
-# The `default_vsz_limit` is the maximum amount of virtual memory that
-# can be allocated. It should be set *reasonably high* to avoid allocation
-# issues with larger mailboxes. We're setting it to 1/3 of the total
-# available memory (physical mem + swap) to be sure.
-# See here for discussion:
-# - https://www.dovecot.org/list/dovecot/2012-August/137569.html
-# - https://www.dovecot.org/list/dovecot/2011-December/132455.html
 tools/editconf.py /etc/dovecot/conf.d/10-master.conf \
-	default_process_limit=$(echo "`nproc` * 250" | bc) \
-	default_vsz_limit=$(echo "`free -tm  | tail -1 | awk '{print $2}'` / 3" | bc)M \
-	log_path=/var/log/mail.log
+	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.
@@ -65,9 +55,6 @@ tools/editconf.py /etc/dovecot/conf.d/10-mail.conf \
 	mail_privileged_group=mail \
 	first_valid_uid=0
 
-# Create, subscribe, and mark as special folders: INBOX, Drafts, Sent, Trash, Spam and Archive.
-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.
@@ -79,15 +66,12 @@ tools/editconf.py /etc/dovecot/conf.d/10-auth.conf \
 
 # 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/.
-# Enable strong ssl dh parameters
 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=ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS" \
-	"ssl_prefer_server_ciphers = yes" \
-	"ssl_dh_parameters_length = 2048"
+	"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
 # login credentials outside of an encrypted connection. Only the over-TLS versions
@@ -100,19 +84,18 @@ sed -i "s/#port = 110/port = 0/" /etc/dovecot/conf.d/10-master.conf
 # 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](https://github.com/mail-in-a-box/mailinabox/issues/129)
-# and [How bad is IMAP IDLE](http://razor.occams.info/blog/2014/08/09/how-bad-is-imap-idle/).
+# 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.
+# 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,
+# 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"
@@ -167,12 +150,6 @@ sed -i "s/#mail_plugins = .*/mail_plugins = \$mail_plugins sieve/" /etc/dovecot/
 #
 # * `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
@@ -182,8 +159,6 @@ sed -i "s/#mail_plugins = .*/mail_plugins = \$mail_plugins sieve/" /etc/dovecot/
 cat > /etc/dovecot/conf.d/99-local-sieve.conf << EOF;
 plugin {
   sieve_before = /etc/dovecot/sieve-spam.sieve
-  sieve_before2 = $STORAGE_ROOT/mail/sieve/global_before
-  sieve_after = $STORAGE_ROOT/mail/sieve/global_after
   sieve = $STORAGE_ROOT/mail/sieve/%d/%n.sieve
   sieve_dir = $STORAGE_ROOT/mail/sieve/%d/%n
 }
@@ -207,16 +182,11 @@ 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.
 ufw_allow imaps
 ufw_allow pop3s
 
-# Allow the Sieve port in the firewall.
-ufw_allow sieve
-
 # Restart services.
 restart_service dovecot

setup/mail-postfix.sh

@@ -49,7 +49,6 @@ source /etc/mailinabox.conf # load global vars
 # > 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)..."
 apt_install postfix postfix-pcre postgrey ca-certificates
 
 # ### Basic Settings
@@ -57,26 +56,15 @@ apt_install postfix postfix-pcre postgrey ca-certificates
 # Set some basic settings...
 #
 # * Have postfix listen on all network interfaces.
-# * Make outgoing connections on a particular interface (if multihomed) so that SPF passes on the receiving side.
 # * 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 \
-	smtp_bind_address=$PRIVATE_IP \
-	smtp_bind_address6=$PRIVATE_IPV6 \
 	myhostname=$PRIMARY_HOSTNAME\
 	smtpd_banner="\$myhostname ESMTP Hi, I'm a Mail-in-a-Box (Ubuntu/Postfix; see https://mailinabox.email/)" \
 	mydestination=localhost
 
-# Tweak some queue settings:
-# * Inform users when their e-mail delivery is delayed more than 3 hours (default is not to warn).
-# * Stop trying to send an undeliverable e-mail after 2 days (instead of 5), and for bounce messages just try for 1 day.
-tools/editconf.py /etc/postfix/main.cf \
-	delay_warning_time=3h \
-	maximal_queue_lifetime=2d \
-	bounce_queue_lifetime=1d
-
 # ### Outgoing Mail
 
 # Enable the 'submission' port 587 smtpd server and tweak its settings.
@@ -91,8 +79,7 @@ tools/editconf.py /etc/postfix/main.cf \
 # * Give it a different name in syslog to distinguish it from the port 25 smtpd server.
 # * Add a new cleanup service specific to the submission service ('authclean')
 #   that filters out privacy-sensitive headers on mail being sent out by
-#   authenticated users.  By default Postfix also applies this to attached
-#   emails but we turn this off by setting nested_header_checks empty.
+#   authenticated users.
 tools/editconf.py /etc/postfix/master.cf -s -w \
 	"submission=inet n       -       -       -       -       smtpd
 	  -o syslog_name=postfix/submission
@@ -101,18 +88,11 @@ tools/editconf.py /etc/postfix/master.cf -s -w \
 	  -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" \
 	"authclean=unix  n       -       -       -       0       cleanup
-	  -o header_checks=pcre:/etc/postfix/outgoing_mail_header_filters
-	  -o nested_header_checks="
+	  -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 
-# 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.
@@ -124,9 +104,8 @@ tools/editconf.py /etc/postfix/main.cf \
 	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_protocols=\!SSLv2,\!SSLv3 \
 	smtpd_tls_ciphers=medium \
-	smtpd_tls_exclude_ciphers=aNULL,RC4 \
+	smtpd_tls_exclude_ciphers=aNULL \
 	smtpd_tls_received_header=yes
 
 # Prevent non-authenticated users from sending mail that requires being
@@ -161,10 +140,6 @@ tools/editconf.py /etc/postfix/main.cf \
 # 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_protocols=\!SSLv2,\!SSLv3 \
-	smtp_tls_mandatory_protocols=\!SSLv2,\!SSLv3 \
-	smtp_tls_ciphers=medium \
-	smtp_tls_exclude_ciphers=aNULL,RC4 \
 	smtp_tls_security_level=dane \
 	smtp_dns_support_level=dnssec \
 	smtp_tls_CAfile=/etc/ssl/certs/ca-certificates.crt \
@@ -185,7 +160,6 @@ tools/editconf.py /etc/postfix/main.cf virtual_transport=lmtp:[127.0.0.1]:10025
 #
 # * `reject_non_fqdn_sender`: Reject not-nice-looking return paths.
 # * `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.
 # * `permit_sasl_authenticated`: Authenticated users (i.e. on port 587) can skip further checks.
 # * `permit_mynetworks`: Mail that originates locally can skip further checks.
@@ -199,7 +173,7 @@ tools/editconf.py /etc/postfix/main.cf virtual_transport=lmtp:[127.0.0.1]:10025
 # whitelisted) then postfix does a DEFER_IF_REJECT, which results in all "unknown user" sorts of messages turning into #NODOC
 # "450 4.7.1 Client host rejected: Service unavailable". This is a retry code, so the mail doesn't properly bounce. #NODOC
 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"
 
 # Postfix connects to Postgrey on the 127.0.0.1 interface specifically. Ensure that

setup/mail-users.sh

@@ -5,7 +5,7 @@
 #
 # 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
@@ -21,7 +21,7 @@ db_path=$STORAGE_ROOT/mail/users.sqlite
 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 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
@@ -38,19 +38,17 @@ passdb {
   args = /etc/dovecot/dovecot-sql.conf.ext
 }
 userdb {
-  driver = sql
-  args = /etc/dovecot/dovecot-sql.conf.ext
+  driver = static
+  args = uid=mail gid=mail home=$STORAGE_ROOT/mail/mailboxes/%d/%n
 }
 EOF
 
-# Configure the SQL to query for a user's metadata and password.
+# Configure the SQL to query for a user's password.
 cat > /etc/dovecot/dovecot-sql.conf.ext << EOF;
 driver = sqlite
 connect = $db_path
 default_pass_scheme = SHA512-CRYPT
 password_query = SELECT email as user, password FROM users WHERE email='%u';
-user_query = SELECT email AS user, "mail" as uid, "mail" as gid, "$STORAGE_ROOT/mail/mailboxes/%d/%n" as home FROM users WHERE email='%u';
-iterate_query = SELECT email AS user FROM users;
 EOF
 chmod 0600 /etc/dovecot/dovecot-sql.conf.ext # per Dovecot instructions
 
@@ -71,27 +69,6 @@ tools/editconf.py /etc/postfix/main.cf \
 	smtpd_sasl_path=private/auth \
 	smtpd_sasl_auth_enable=yes
 
-# ### Sender 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,
@@ -102,45 +79,29 @@ 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.
-#
+# Aliases have precedence over users, but that's counter-intuitive for
+# catch-all aliases ("@domain.com") which should *not* catch mail users.
+# To fix this, not only query the aliases table but also the users
+# table, i.e. turn users into aliases from themselves to themselves.
 # 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.
+# another select that prioritizes the alias definition.
 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 (SELECT destination, 0 as priority FROM aliases WHERE source='%s' UNION SELECT email as destination, 1 as priority FROM users WHERE email='%s') ORDER BY priority LIMIT 1;
 EOF
 
 # Restart Services

setup/management.sh

@@ -2,57 +2,9 @@
 
 source setup/functions.sh
 
-echo "Installing Mail-in-a-Box system management daemon..."
-
-# DEPENDENCIES
-
-# We used to install management daemon-related Python packages
-# directly to /usr/local/lib. We moved to a virtualenv because
-# these packages might conflict with apt-installed packages.
-# We may have a lingering version of acme that conflcits with
-# certbot, which we're about to install below, so remove it
-# first. Once acme is installed by an apt package, this might
-# break the package version and `apt-get install --reinstall python3-acme`
-# might be needed in that case.
-while [ -d /usr/local/lib/python3.4/dist-packages/acme ]; do
-	pip3 uninstall -y acme;
-done
-
-# duplicity is used to make backups of user data. It uses boto
-# (via Python 2) to do backups to AWS S3. boto from the Ubuntu
-# package manager is too out-of-date -- it doesn't support the newer
-# S3 api used in some regions, which breaks backups to those regions.
-# See #627, #653.
-#
-# python-virtualenv is used to isolate the Python 3 packages we
-# install via pip from the system-installed packages.
-#
-# certbot installs EFF's certbot which we use to
-# provision free TLS certificates.
-apt_install duplicity python-pip python-virtualenv certbot
-hide_output pip2 install --upgrade boto
-
-# Create a virtualenv for the installation of Python 3 packages
-# used by the management daemon.
-inst_dir=/usr/local/lib/mailinabox
-mkdir -p $inst_dir
-venv=$inst_dir/env
-if [ ! -d $venv ]; then
-	virtualenv -ppython3 $venv
-fi
-
-# Upgrade pip because the Ubuntu-packaged version is out of date.
-hide_output $venv/bin/pip install --upgrade pip
-
-# Install other Python 3 packages used by the management daemon.
-# The first line is the packages that Josh maintains himself!
-# NOTE: email_validator is repeated in setup/questions.sh, so please keep the versions synced.
-hide_output $venv/bin/pip install --upgrade \
-	rtyaml "email_validator>=1.0.0" "exclusiveprocess" \
-	flask dnspython python-dateutil \
-	"idna>=2.0.0" "cryptography==2.2.2" boto psutil
-
-# CONFIGURATION
+apt_install python3-flask links duplicity libyaml-dev python3-dnspython python3-dateutil
+hide_output pip3 install rtyaml "email_validator==0.1.0-rc5"
+	# email_validator is repeated in setup/questions.sh
 
 # Create a backup directory and a random key for encrypting backups.
 mkdir -p $STORAGE_ROOT/backup
@@ -60,56 +12,35 @@ if [ ! -f $STORAGE_ROOT/backup/secret_key.txt ]; then
 	$(umask 077; openssl rand -base64 2048 > $STORAGE_ROOT/backup/secret_key.txt)
 fi
 
-
-# Download jQuery and Bootstrap local files
-
-# Make sure we have the directory to save to.
-assets_dir=$inst_dir/vendor/assets
-rm -rf $assets_dir
-mkdir -p $assets_dir
-
-# jQuery CDN URL
-jquery_version=2.1.4
-jquery_url=https://code.jquery.com
-
-# Get jQuery
-wget_verify $jquery_url/jquery-$jquery_version.min.js 43dc554608df885a59ddeece1598c6ace434d747 $assets_dir/jquery.min.js
-
-# Bootstrap CDN URL
-bootstrap_version=3.3.7
-bootstrap_url=https://github.com/twbs/bootstrap/releases/download/v$bootstrap_version/bootstrap-$bootstrap_version-dist.zip
-
-# Get Bootstrap
-wget_verify $bootstrap_url e6b1000b94e835ffd37f4c6dcbdad43f4b48a02a /tmp/bootstrap.zip
-unzip -q /tmp/bootstrap.zip -d $assets_dir
-mv $assets_dir/bootstrap-$bootstrap_version-dist $assets_dir/bootstrap
-rm -f /tmp/bootstrap.zip
+# Link the management server daemon into a well known location.
+rm -f /usr/local/bin/mailinabox-daemon
+ln -s `pwd`/management/daemon.py /usr/local/bin/mailinabox-daemon
 
 # Create an init script to start the management daemon and keep it
 # running after a reboot.
-rm -f /usr/local/bin/mailinabox-daemon # old path
-cat > $inst_dir/start <<EOF;
-#!/bin/bash
-source $venv/bin/activate
-exec python `pwd`/management/daemon.py
-EOF
-chmod +x $inst_dir/start
 rm -f /etc/init.d/mailinabox
 ln -s $(pwd)/conf/management-initscript /etc/init.d/mailinabox
 hide_output update-rc.d mailinabox defaults
 
-# Remove old files we no longer use.
-rm -f /etc/cron.daily/mailinabox-backup
-rm -f /etc/cron.daily/mailinabox-statuschecks
-
-# Perform nightly tasks at 3am in system time: take a backup, run
-# status checks and email the administrator any changes.
-
-cat > /etc/cron.d/mailinabox-nightly << EOF;
+# Perform a daily backup.
+cat > /etc/cron.daily/mailinabox-backup << EOF;
+#!/bin/bash
 # Mail-in-a-Box --- Do not edit / will be overwritten on update.
-# Run nightly tasks: backup, status checks.
-0 3 * * *	root	(cd `pwd` && management/daily_tasks.sh)
+# Perform a backup.
+$(pwd)/management/backup.py
 EOF
+chmod +x /etc/cron.daily/mailinabox-backup
 
-# Start the management server.
+# 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

@@ -95,58 +95,6 @@ def migration_7(env):
 	# 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 migration_10(env):
-	# Clean up the SSL certificates directory.
-
-	# Move the primary certificate to a new name and then
-	# symlink it to the system certificate path.
-	import datetime
-	system_certificate = os.path.join(env["STORAGE_ROOT"], 'ssl/ssl_certificate.pem')
-	if not os.path.islink(system_certificate): # not already a symlink
-		new_path = os.path.join(env["STORAGE_ROOT"], 'ssl', env['PRIMARY_HOSTNAME'] + "-" + datetime.datetime.now().date().isoformat().replace("-", "") + ".pem")
-		print("Renamed", system_certificate, "to", new_path, "and created a symlink for the original location.")
-		shutil.move(system_certificate, new_path)
-		os.symlink(new_path, system_certificate)
-
-	# Flatten the directory structure. For any directory
-	# that contains a single file named ssl_certificate.pem,
-	# move the file out and name it the same as the directory,
-	# and remove the directory.
-	for sslcert in glob.glob(os.path.join( env["STORAGE_ROOT"], 'ssl/*/ssl_certificate.pem' )):
-		d = os.path.dirname(sslcert)
-		if len(os.listdir(d)) == 1:
-			# This certificate is the only file in that directory.
-			newname = os.path.join(env["STORAGE_ROOT"], 'ssl', os.path.basename(d) + '.pem')
-			if not os.path.exists(newname):
-				shutil.move(sslcert, newname)
-				os.rmdir(d)
-
-def migration_11(env):
-	# Archive the old Let's Encrypt account directory managed by free_tls_certificates
-	# because we'll use that path now for the directory managed by certbot.
-	try:
-		old_path = os.path.join(env["STORAGE_ROOT"], 'ssl', 'lets_encrypt')
-		new_path = os.path.join(env["STORAGE_ROOT"], 'ssl', 'lets_encrypt-old')
-		shutil.move(old_path, new_path)
-	except:
-		# meh
-		pass
 
 def get_current_migration():
 	ver = 0

setup/munin.sh

@@ -6,9 +6,7 @@ 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 libcgi-fast-perl
-# libcgi-fast-perl is needed by /usr/lib/munin/cgi/munin-cgi-graph
+apt_install munin munin-node
 
 # edit config
 cat > /etc/munin/munin.conf <<EOF;
@@ -20,9 +18,6 @@ tmpldir /etc/munin/templates
 
 includedir /etc/munin/munin-conf.d
 
-# path dynazoom uses for requests
-cgiurl_graph /admin/munin/cgi-graph
-
 # a simple host tree
 [$PRIMARY_HOSTNAME]
 address 127.0.0.1
@@ -33,39 +28,5 @@ contact.admin.command mail -s "Munin notification ${var:host}" administrator@$PR
 contact.admin.always_send warning critical
 EOF
 
-# The Debian installer touches these files and chowns them to www-data:adm for use with spawn-fcgi
-chown munin. /var/log/munin/munin-cgi-html.log
-chown munin. /var/log/munin/munin-cgi-graph.log
-
-# ensure munin-node knows the name of this machine
-# and reduce logging level to warning
-tools/editconf.py /etc/munin/munin-node.conf -s \
-	host_name=$PRIMARY_HOSTNAME \
-	log_level=1
-
-# 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
+sudo -u munin munin-cron

setup/owncloud.sh

@@ -1,25 +1,22 @@
 #!/bin/bash
-# Nextcloud
+# Owncloud
 ##########################
 
 source setup/functions.sh # load our functions
 source /etc/mailinabox.conf # load global vars
 
-# ### Installing Nextcloud
+# ### Installing ownCloud
 
-echo "Installing Nextcloud (contacts/calendar)..."
-
-# Keep the php5 dependancies for the owncloud upgrades
 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
+	php5 php5-dev php5-gd php5-fpm memcached php5-memcache unzip
 
 apt-get purge -qq -y owncloud*
 
-apt_install php7.0 php7.0-fpm \
-	php7.0-cli php7.0-sqlite php7.0-gd php7.0-imap php7.0-curl php-pear php-apc curl \
-        php7.0-dev php7.0-gd memcached php7.0-memcached php7.0-xml php7.0-mbstring php7.0-zip php7.0-apcu
+# Install ownCloud from source of this version:
+owncloud_ver=8.0.4
+owncloud_hash=625b1c561ea51426047a3e79eda51ca05e9f978a
 
 # Migrate <= v0.10 setups that stored the ownCloud config.php in /usr/local rather than
 # in STORAGE_ROOT. Move the file to STORAGE_ROOT.
@@ -33,232 +30,55 @@ if [ ! -f $STORAGE_ROOT/owncloud/config.php ] \
 	ln -sf $STORAGE_ROOT/owncloud/config.php /usr/local/lib/owncloud/config/config.php
 fi
 
-InstallNextcloud() {
-
-	version=$1
-	hash=$2
-
-	echo
-	echo "Upgrading to Nextcloud version $version"
-	echo
-
-	# Remove the current owncloud/Nextcloud
-	rm -rf /usr/local/lib/owncloud
-
-	# Download and verify
-	wget_verify https://download.nextcloud.com/server/releases/nextcloud-$version.zip $hash /tmp/nextcloud.zip
-
-	# Extract ownCloud/Nextcloud
-	unzip -q /tmp/nextcloud.zip -d /usr/local/lib
-	mv /usr/local/lib/nextcloud /usr/local/lib/owncloud
-	rm -f /tmp/nextcloud.zip
-
-	# The two apps we actually want are not in Nextcloud core. Download the releases from
-	# their github repositories.
-	mkdir -p /usr/local/lib/owncloud/apps
-
-	wget_verify https://github.com/nextcloud/contacts/releases/download/v1.5.3/contacts.tar.gz 78c4d49e73f335084feecd4853bd8234cf32615e /tmp/contacts.tgz
-	tar xf /tmp/contacts.tgz -C /usr/local/lib/owncloud/apps/
-	rm /tmp/contacts.tgz
-
-	wget_verify https://github.com/nextcloud/calendar/releases/download/v1.5.3/calendar.tar.gz b370352d1f280805cc7128f78af4615f623827f8 /tmp/calendar.tgz
-	tar xf /tmp/calendar.tgz -C /usr/local/lib/owncloud/apps/
-	rm /tmp/calendar.tgz
-
-	# 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 [ -e $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
-}
-
-# We only install ownCloud intermediate versions to be able to seemlesly upgrade to Nextcloud
-InstallOwncloud() {
-
-	version=$1
-	hash=$2
-
-	echo
-	echo "Upgrading to OwnCloud version $version"
-	echo
-
-	# Remove the current owncloud/Nextcloud
-	rm -rf /usr/local/lib/owncloud
-
-	# Download and verify
-	wget_verify https://download.owncloud.org/community/owncloud-$version.tar.bz2 $hash /tmp/owncloud.tar.bz2
-
-
-	# Extract ownCloud
-	tar xjf /tmp/owncloud.tar.bz2 -C /usr/local/lib
-	rm -f /tmp/owncloud.tar.bz2
-
-	# The two apps we actually want are not in Nextcloud core. Download the releases from
-	# their github repositories.
-	mkdir -p /usr/local/lib/owncloud/apps
-
-	wget_verify https://github.com/owncloud/contacts/releases/download/v1.4.0.0/contacts.tar.gz c1c22d29699456a45db447281682e8bc3f10e3e7 /tmp/contacts.tgz
-	tar xf /tmp/contacts.tgz -C /usr/local/lib/owncloud/apps/
-	rm /tmp/contacts.tgz
-
-	wget_verify https://github.com/nextcloud/calendar/releases/download/v1.4.0/calendar.tar.gz c84f3170efca2a99ea6254de34b0af3cb0b3a821 /tmp/calendar.tgz
-	tar xf /tmp/calendar.tgz -C /usr/local/lib/owncloud/apps/
-	rm /tmp/calendar.tgz
-
-	# 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 [ -e $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 php5 /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 php5 /usr/local/lib/owncloud/occ upgrade
-			if [ \( $? -ne 0 \) -a \( $? -ne 3 \) ]; then exit 1; fi
-			sudo -u www-data php5 /usr/local/lib/owncloud/occ maintenance:mode --off
-			echo "...which seemed to work."
-		fi
-	fi
-}
-
-owncloud_ver=12.0.5
-owncloud_hash=d25afbac977a4e331f5e38df50aed0844498ca86
-
-# Check if Nextcloud dir exist, and check if version matches owncloud_ver (if either doesn't - install/upgrade)
+# 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
+	|| ! grep -q $owncloud_ver /usr/local/lib/owncloud/version.php; then
 
-	# Stop php-fpm if running. If theyre not running (which happens on a previously failed install), dont bail.
-	service php7.0-fpm stop &> /dev/null || /bin/true
-	service php5-fpm stop &> /dev/null || /bin/true
-
-	# Backup the existing ownCloud/Nextcloud.
-	# Create a backup directory to store the current installation and database to
-	BACKUP_DIRECTORY=$STORAGE_ROOT/owncloud-backup/`date +"%Y-%m-%d-%T"`
-	mkdir -p "$BACKUP_DIRECTORY"
-	if [ -d /usr/local/lib/owncloud/ ]; then
-		echo "upgrading ownCloud/Nextcloud to $owncloud_flavor $owncloud_ver (backing up existing installation, configuration and database to directory to $BACKUP_DIRECTORY..."
-		cp -r /usr/local/lib/owncloud "$BACKUP_DIRECTORY/owncloud-install"
-	fi
-	if [ -e /home/user-data/owncloud/owncloud.db ]; then
-		cp /home/user-data/owncloud/owncloud.db $BACKUP_DIRECTORY
-        fi
-        if [ -e /home/user-data/owncloud/config.php ]; then
-                cp /home/user-data/owncloud/config.php $BACKUP_DIRECTORY
-        fi
-
-	# We only need to check if we do upgrades when owncloud/Nextcloud was previously installed
-	if [ -e /usr/local/lib/owncloud/version.php ]; then
-		if grep -q "OC_VersionString = '8\.1\.[0-9]" /usr/local/lib/owncloud/version.php; then
-			echo "We are running 8.1.x, upgrading to 8.2.11 first"
-			InstallOwncloud 8.2.11 e4794938fc2f15a095018ba9d6ee18b53f6f299c
-		fi
-
-		# If we are upgrading from 8.2.x we should go to 9.0 first. Owncloud doesn't support skipping minor versions
-		if grep -q "OC_VersionString = '8\.2\.[0-9]" /usr/local/lib/owncloud/version.php; then
-			echo "We are running version 8.2.x, upgrading to 9.0.11 first"
-
-			# We need to disable memcached. The upgrade and install fails
-			# with memcached
-			CONFIG_TEMP=$(/bin/mktemp)
-			php <<EOF > $CONFIG_TEMP && mv $CONFIG_TEMP $STORAGE_ROOT/owncloud/config.php;
-			<?php
-				include("$STORAGE_ROOT/owncloud/config.php");
-
-				\$CONFIG['memcache.local'] = '\OC\Memcache\APCu';
-
-				echo "<?php\n\\\$CONFIG = ";
-				var_export(\$CONFIG);
-				echo ";";
-			?>
-EOF
-			chown www-data.www-data $STORAGE_ROOT/owncloud/config.php
-
-			# We can now install owncloud 9.0.11
-			InstallOwncloud 9.0.11 fc8bad8a62179089bc58c406b28997fb0329337b
-
-			# The owncloud 9 migration doesn't migrate calendars and contacts
-			# The option to migrate these are removed in 9.1
-			# So the migrations should be done when we have 9.0 installed
-			sudo -u www-data php5 /usr/local/lib/owncloud/occ dav:migrate-addressbooks
-			# The following migration has to be done for each owncloud user
-			for directory in $STORAGE_ROOT/owncloud/*@*/ ; do
-				username=$(basename "${directory}")
-				sudo -u www-data php5 /usr/local/lib/owncloud/occ dav:migrate-calendar $username
-			done
-			sudo -u www-data php5 /usr/local/lib/owncloud/occ dav:sync-birthday-calendar
-		fi
-
-		# If we are upgrading from 9.0.x we should go to 9.1 first.
-		if grep -q "OC_VersionString = '9\.0\.[0-9]" /usr/local/lib/owncloud/version.php; then
-			echo "We are running ownCloud 9.0.x, upgrading to ownCloud 9.1.7 first"
-			InstallOwncloud 9.1.7 1307d997d0b23dc42742d315b3e2f11423a9c808
-		fi
-
-		# Newer ownCloud 9.1.x versions cannot be upgraded to Nextcloud 10 and have to be
-		# upgraded to Nextcloud 11 straight away, see:
-		# https://github.com/nextcloud/server/issues/2203
-		# However, for some reason, upgrading to the latest Nextcloud 11.0.7 doesn't
-		# work either. Therefore, we're upgrading to Nextcloud 11.0.0 in the interim.
-		# This should not be a problem since we're upgrading to the latest Nextcloud 12
-		# in the next step.
-		if grep -q "OC_VersionString = '9\.1\.[0-9]" /usr/local/lib/owncloud/version.php; then
-			echo "We are running ownCloud 9.1.x, upgrading to Nextcloud 11.0.0 first"
-			InstallNextcloud 11.0.0 e8c9ebe72a4a76c047080de94743c5c11735e72e
-		fi
-
-		# If we are upgrading from 10.0.x we should go to Nextcloud 11.0 first.
-		if grep -q "OC_VersionString = '10\.0\.[0-9]" /usr/local/lib/owncloud/version.php; then
-			echo "We are running Nextcloud 10.0.x, upgrading to Nextcloud 11.0.7 first"
-			InstallNextcloud 11.0.7 f936ddcb2ae3dbb66ee4926eb8b2ebbddc3facbe
-		fi
+	# Clear out the existing ownCloud.
+	if [ ! -d /usr/local/lib/owncloud/ ]; then
+		echo installing ownCloud...
+	else
+		echo "upgrading ownCloud to $owncloud_ver (backing up existing ownCloud directory to /tmp/owncloud-backup-$$)..."
+		mv /usr/local/lib/owncloud /tmp/owncloud-backup-$$
 	fi
 
-	InstallNextcloud $owncloud_ver $owncloud_hash
+	# Download and extract ownCloud.
+	wget_verify https://download.owncloud.org/community/owncloud-$owncloud_ver.zip $owncloud_hash /tmp/owncloud.zip
+	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 v$owncloud_ver '' /usr/local/lib/owncloud/apps/contacts
+	git_clone https://github.com/owncloud/calendar v$owncloud_ver '' /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
+
+	# Run the upgrade script (if ownCloud is already up-to-date it wont matter).
+	hide_output sudo -u www-data php /usr/local/lib/owncloud/occ upgrade
 fi
 
-# ### Configuring Nextcloud
+# ### Configuring ownCloud
 
-# Setup Nextcloud if the Nextcloud database does not yet exist. Running setup when
+# 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.
+	# Create a 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
@@ -267,17 +87,22 @@ if [ ! -f $STORAGE_ROOT/owncloud/owncloud.db ]; then
 
   'instanceid' => '$instanceid',
 
-  'forcessl' => true, # if unset/false, Nextcloud sends a HSTS=0 header, which conflicts with nginx config
+  'trusted_domains' =>
+    array (
+      0 => '$PRIMARY_HOSTNAME',
+    ),
+  '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('{127.0.0.1:993/imap/ssl/novalidate-cert}')
+      'arguments'=>array('{localhost:993/imap/ssl/novalidate-cert}')
     )
   ),
-  'memcache.local' => '\OC\Memcache\APCu',
+  "memcached_servers" => array (
+    array('localhost', 11211),
+  ),
   'mail_smtpmode' => 'sendmail',
   'mail_smtpsecure' => '',
   'mail_smtpauthtype' => 'LOGIN',
@@ -287,6 +112,8 @@ if [ ! -f $STORAGE_ROOT/owncloud/owncloud.db ]; then
   'mail_smtpname' => '',
   'mail_smtppassword' => '',
   'mail_from_address' => 'owncloud',
+  'mail_domain' => '$PRIMARY_HOSTNAME',
+  'logtimezone' => '$TIMEZONE',
 );
 ?>
 EOF
@@ -294,7 +121,7 @@ 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/urandom bs=1 count=40 2>/dev/null | sha1sum | fold -w 30 | head -n 1)
+	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 (
@@ -303,7 +130,7 @@ EOF
   'dbtype' => 'sqlite3',
 
   # create an administrator account with a random password so that
-  # the user does not have to enter anything on first load of Nextcloud
+  # the user does not have to enter anything on first load of ownCloud
   'adminlogin'    => 'root',
   'adminpass'     => '$adminpassword',
 );
@@ -313,65 +140,24 @@ EOF
 	# Set permissions
 	chown -R www-data.www-data $STORAGE_ROOT/owncloud /usr/local/lib/owncloud
 
-	# Execute Nextcloud's setup step, which creates the Nextcloud sqlite database.
+	# 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.
-# * We need to set the timezone to the system timezone to allow fail2ban to ban
-#   users within the proper timeframe
-# * We need to set the logdateformat to something that will work correctly with fail2ban
-# * mail_domain' needs to be set every time we run the setup. Making sure we are setting 
-#   the correct domain name if the domain is being change from the previous setup.
-# Use PHP to read the settings file, modify it, and write out the new settings array.
-TIMEZONE=$(cat /etc/timezone)
-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\APCu';
-\$CONFIG['overwrite.cli.url'] = '/cloud';
-\$CONFIG['mail_from_address'] = 'administrator'; # just the local part, matches our master administrator address
-
-\$CONFIG['logtimezone'] = '$TIMEZONE';
-\$CONFIG['logdateformat'] = 'Y-m-d H:i:s';
-
-\$CONFIG['mail_domain'] = '$PRIMARY_HOSTNAME';
-
-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 Nextcloud setup.
+# 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 Nextcloud to use IMAP for login. The contacts
+# 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/php/7.0/fpm/php.ini -c ';' \
+tools/editconf.py /etc/php5/fpm/php.ini -c ';' \
 	upload_max_filesize=16G \
 	post_max_size=16G \
 	output_buffering=16384 \
@@ -379,27 +165,7 @@ tools/editconf.py /etc/php/7.0/fpm/php.ini -c ';' \
 	max_execution_time=600 \
 	short_open_tag=On
 
-# Set Nextcloud recommended opcache settings
-tools/editconf.py /etc/php/7.0/cli/conf.d/10-opcache.ini -c ';' \
-	opcache.enable=1 \
-	opcache.enable_cli=1 \
-	opcache.interned_strings_buffer=8 \
-	opcache.max_accelerated_files=10000 \
-	opcache.memory_consumption=128 \
-	opcache.save_comments=1 \
-	opcache.revalidate_freq=1
-
-# Configure the path environment for php-fpm
-tools/editconf.py /etc/php/7.0/fpm/pool.d/www.conf -c ';' \
-        env[PATH]=/usr/local/bin:/usr/bin:/bin
-
-# If apc is explicitly disabled we need to enable it
-if grep -q apc.enabled=0 /etc/php/7.0/mods-available/apcu.ini; then
-	tools/editconf.py /etc/php/7.0/mods-available/apcu.ini -c ';' \
-		apc.enabled=1
-fi
-
-# Set up a cron job for Nextcloud.
+# Set up a cron job for owncloud.
 cat > /etc/cron.hourly/mailinabox-owncloud << EOF;
 #!/bin/bash
 # Mail-in-a-Box
@@ -407,8 +173,8 @@ 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 Nextcloud,
-# and there's a lot they could mess up, so we don't make any users admins of Nextcloud.
+# 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
@@ -417,4 +183,6 @@ chmod +x /etc/cron.hourly/mailinabox-owncloud
 # ```
 
 # Enable PHP modules and restart PHP.
-restart_service php7.0-fpm
+php5enmod imap
+restart_service memcached
+restart_service php5-fpm

setup/preflight.sh

@@ -4,7 +4,7 @@ if [[ $EUID -ne 0 ]]; then
 	echo
 	echo "sudo $0"
 	echo
-	exit
+	exit 1
 fi
 
 # Check that we are running on Ubuntu 14.04 LTS (or 14.04.xx).
@@ -14,55 +14,22 @@ if [ "`lsb_release -d | sed 's/.*:\s*//' | sed 's/14\.04\.[0-9]/14.04/' `" != "U
 	lsb_release -d | sed 's/.*:\s*//'
 	echo
 	echo "We can't write scripts that run on every possible setup, sorry."
-	exit
+	exit 1
 fi
 
 # Check that we have enough memory.
 #
-# /proc/meminfo reports free memory in kibibytes. Our baseline will be 512 MB,
-# which is 500000 kibibytes.
-#
-# We will display a warning if the memory is below 768 MB which is 750000 kibibytes
+# /proc/meminfo reports free memory in kibibytes. Our baseline will be 768 KB,
+# 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 500000 ]; then
+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 512 MB, 1 GB recommended."
+	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
-if [ $TOTAL_PHYSICAL_MEM -lt 750000 ]; then
-	echo "WARNING: Your Mail-in-a-Box has less than 768 MB of memory."
-	echo "         It might run unreliably when under heavy load."
-fi
-
-# Check that tempfs is mounted with exec
-MOUNTED_TMP_AS_NO_EXEC=$(grep "/tmp.*noexec" /proc/mounts)
-if [ -n "$MOUNTED_TMP_AS_NO_EXEC" ]; then
-	echo "Mail-in-a-Box has to have exec rights on /tmp, please mount /tmp with exec"
-	exit
-fi
-
-# Check that no .wgetrc exists
-if [ -e ~/.wgetrc ]; then
-	echo "Mail-in-a-Box expects no overrides to wget defaults, ~/.wgetrc exists"
-	exit
-fi
-
-# Check that we are running on x86_64 or i686, any other architecture is unsupported and
-# will fail later in the setup when we try to install the custom build lucene packages.
-#
-# Set ARM=1 to ignore this check if you have built the packages yourself. If you do this
-# you are on your own!
-ARCHITECTURE=$(uname -m)
-if [ "$ARCHITECTURE" != "x86_64" ] && [ "$ARCHITECTURE" != "i686" ]; then
-if [ -z "$ARM" ]; then
-	echo "Mail-in-a-Box only supports x86_64 or i686 and will not work on any other architecture, like ARM."
-	echo "Your architecture is $ARCHITECTURE"
-	exit
+	exit 1
 fi
 fi

setup/questions.sh

@@ -3,25 +3,24 @@ if [ -z "$NONINTERACTIVE" ]; then
 	# 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 suppress any output from installing dialog.
+	# use a shell flag instead. Really supress any output from installing dialog.
 	#
-	# Also install dependencies needed to validate the email address.
+	# 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
 
-	# Installing email_validator is repeated in setup/management.sh, but in setup/management.sh
-	# we install it inside a virtualenv. In this script, we don't have the virtualenv yet
-	# so we install the python package globally.
-	hide_output pip3 install "email_validator>=1.0.0" || exit 1
+	if [ -z "$IS_DOCKER" ]; then
+	# email_validator is repeated in setup/management.sh
+	hide_output pip3 install "email_validator==0.1.0-rc5" || exit 1
+	fi
 
 	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.
-		\n\nNOTE: You should only install this on a brand new Ubuntu installation 100% dedicated to Mail-in-a-Box. Mail-in-a-Box will, for example, remove apache2."
+		\n\nTo change your answers later, just run 'sudo mailinabox' from the command line."
 fi
 
 # The box needs a name.
@@ -51,7 +50,7 @@ you really want.
 			# user hit ESC/cancel
 			exit
 		fi
-		while ! python3 management/mailconfig.py validate-email "$EMAIL_ADDR"
+		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?" \
@@ -171,6 +170,35 @@ if [[ -z "$PRIVATE_IP" && -z "$PRIVATE_IPV6" ]]; then
 	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.
@@ -181,7 +209,12 @@ if [ "$PUBLIC_IPV6" = "auto" ]; then
 	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

setup/spamassassin.sh

@@ -16,40 +16,23 @@ source setup/functions.sh # load our functions
 # ----------------------------------------
 
 # Install packages.
-# libmail-dkim-perl is needed to make the spamassassin DKIM module work.
-# 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
+apt_install spampd razor pyzor dovecot-antispam
 
 # 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
-# spam emails. Set the pyzor configuration directory to something sane.
-# 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 pyzor.
+hide_output pyzor discover
 
 # Configure spampd:
 # * Pass messages on to docevot on port 10026. This is actually the default setting but we don't
 #   want to lose track of it. (We've configured Dovecot to listen on this port elsewhere.)
 # * Increase the maximum message size of scanned messages from the default of 64KB to 500KB, which
 #   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=2000\"" \
-	LOCALONLY=0
+	ADDOPTS="\"--maxsize=500\""
 
 # Spamassassin normally wraps spam as an attachment inside a fresh
 # email with a report about the message. This also protects the user
@@ -61,11 +44,9 @@ tools/editconf.py /etc/default/spampd \
 # 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 & X-Spam-Score mail headers and related headers.
+# the X-Spam-Status mail header and related headers.
 tools/editconf.py /etc/spamassassin/local.cf -s \
-	report_safe=0 \
-	add_header="all Report _REPORT_" \
-    add_header="all Score _SCORE_"
+	report_safe=0
 
 # Bayesean learning
 # -----------------
@@ -80,13 +61,9 @@ tools/editconf.py /etc/spamassassin/local.cf -s \
 # * 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.
-#
-# Spamassassin will change the access rights back to the defaults, so we must also configure
-# the filemode in the config file.
 
 tools/editconf.py /etc/spamassassin/local.cf -s \
-	bayes_path=$STORAGE_ROOT/mail/spamassassin/bayes \
-	bayes_file_mode=0666
+	bayes_path=$STORAGE_ROOT/mail/spamassassin/bayes
 
 mkdir -p $STORAGE_ROOT/mail/spamassassin
 chown -R spampd:spampd $STORAGE_ROOT/mail/spamassassin
@@ -105,7 +82,6 @@ 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_notspam_args = /usr/local/bin/sa-learn-pipe.sh;--ham

setup/ssl.sh

@@ -1,98 +1,52 @@
 #!/bin/bash
 #
-# RSA private key, SSL certificate, Diffie-Hellman bits files
-# -------------------------------------------
+# SSL Certificate
+# ---------------
 
-# Create an RSA private key, a self-signed SSL certificate, and some
-# Diffie-Hellman cipher bits, if they have not yet been created.
+# Create a self-signed SSL certificate if one has not yet been created.
 #
-# The RSA private key and certificate are used for:
+# The certificate is for PRIMARY_HOSTNAME specifically and is used for:
 #
-#  * DNSSEC DANE TLSA records
 #  * IMAP
-#  * SMTP (opportunistic TLS for port 25 and submission on port 587)
-#  * HTTPS
+#  * SMTP submission (port 587) and opportunistic TLS (when on the receiving end)
+#  * the DNSSEC DANE TLSA record for SMTP
+#  * HTTPS (for PRIMARY_HOSTNAME only)
 #
-# The certificate is created with its CN set to the PRIMARY_HOSTNAME. It is
-# also used for other domains served over HTTPS until the user installs a
-# better certificate for those domains.
-#
-# The Diffie-Hellman cipher bits are used for SMTP and HTTPS, when a
-# Diffie-Hellman cipher is selected during TLS negotiation. Diffie-Hellman
-# provides Perfect Forward Secrecy. 
+# When other domains besides PRIMARY_HOSTNAME are served over HTTPS,
+# we generate a domain-specific self-signed certificate in the management
+# daemon (web_update.py) as needed.
 
 source setup/functions.sh # load our functions
 source /etc/mailinabox.conf # load global vars
 
-# Show a status line if we are going to take any action in this file.
-if  [ ! -f /usr/bin/openssl ] \
- || [ ! -f $STORAGE_ROOT/ssl/ssl_private_key.pem ] \
- || [ ! -f $STORAGE_ROOT/ssl/ssl_certificate.pem ] \
- || [ ! -f $STORAGE_ROOT/ssl/dh2048.pem ]; then
-	echo "Creating initial SSL certificate and perfect forward secrecy Diffie-Hellman parameters..."
-fi
-
-# Install openssl.
-
 apt_install openssl
 
-# Create a directory to store TLS-related things like "SSL" certificates.
-
 mkdir -p $STORAGE_ROOT/ssl
-
 # Generate a new private key.
-#
-# The key is only as good as the entropy available to openssl so that it
-# can generate a random key. "OpenSSL’s built-in RSA key generator ....
-# is seeded on first use with (on Linux) 32 bytes read from /dev/urandom,
-# the process ID, user ID, and the current time in seconds. [During key
-# generation OpenSSL] mixes into the entropy pool the current time in seconds,
-# the process ID, and the possibly uninitialized contents of a ... buffer
-# ... dozens to hundreds of times."
-#
-# A perfect storm of issues can cause the generated key to be not very random:
-#
-#   * improperly seeded /dev/urandom, but see system.sh for how we mitigate this
-#   * the user ID of this process is always the same (we're root), so that seed is useless
-#   * zero'd memory (plausible on embedded systems, cloud VMs?)
-#   * a predictable process ID (likely on an embedded/virtualized system)
-#   * a system clock reset to a fixed time on boot
-#
-# Since we properly seed /dev/urandom in system.sh we should be fine, but I leave
-# in the rest of the notes in case that ever changes.
+# Set the umask so the key file is not world-readable.
 if [ ! -f $STORAGE_ROOT/ssl/ssl_private_key.pem ]; then
-	# Set the umask so the key file is never world-readable.
 	(umask 077; hide_output \
 		openssl genrsa -out $STORAGE_ROOT/ssl/ssl_private_key.pem 2048)
 fi
 
-# Generate a self-signed SSL certificate because things like nginx, dovecot,
-# etc. won't even start without some certificate in place, and we need nginx
-# so we can offer the user a control panel to install a better certificate.
-if [ ! -f $STORAGE_ROOT/ssl/ssl_certificate.pem ]; then
-	# Generate a certificate signing request.
-	CSR=/tmp/ssl_cert_sign_req-$$.csr
+# Generate a certificate signing request.
+if [ ! -f $STORAGE_ROOT/ssl/ssl_cert_sign_req.csr ]; then
 	hide_output \
-	openssl req -new -key $STORAGE_ROOT/ssl/ssl_private_key.pem -out $CSR \
-	  -sha256 -subj "/CN=$PRIMARY_HOSTNAME"
-
-	# Generate the self-signed certificate.
-	CERT=$STORAGE_ROOT/ssl/$PRIMARY_HOSTNAME-selfsigned-$(date --rfc-3339=date | sed s/-//g).pem
-	hide_output \
-	openssl x509 -req -days 365 \
-	  -in $CSR -signkey $STORAGE_ROOT/ssl/ssl_private_key.pem -out $CERT
-
-	# Delete the certificate signing request because it has no other purpose.
-	rm -f $CSR
-
-	# Symlink the certificate into the system certificate path, so system services
-	# can find it.
-	ln -s $CERT $STORAGE_ROOT/ssl/ssl_certificate.pem
+	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"
 fi
 
-# Generate some Diffie-Hellman cipher bits.
-# openssl's default bit length for this is 1024 bits, but we'll create
-# 2048 bits of bits per the latest recommendations.
+# Generate a SSL certificate by self-signing.
+if [ ! -f $STORAGE_ROOT/ssl/ssl_certificate.pem ]; then
+	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
+# used when a Diffie-Hellman cipher is selected during TLS negotiation. Diffie-Hellman
+# provides Perfect Forward Secrecy. openssl's default is 1024 bits, but we'll
+# create 2048.
 if [ ! -f $STORAGE_ROOT/ssl/dh2048.pem ]; then
 	openssl dhparam -out $STORAGE_ROOT/ssl/dh2048.pem 2048
 fi

setup/start.sh

@@ -5,14 +5,13 @@
 source setup/functions.sh # load our functions
 
 # Check system setup: Are we running as root on Ubuntu 14.04 on a
-# machine with enough memory? Is /tmp mounted with exec.
-# If not, this shows an error and exits.
+# 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
 # triggers some other locale in Python, like ASCII encoding,
-# Python may not be able to read/write files. This is also
-# in the management daemon startup script and the cron script.
+# Python may not be able to read/write files. Here and in
+# the management daemon startup script.
 
 if [ -z `locale -a | grep en_US.utf8` ]; then
     # Generate locale if not exists
@@ -24,9 +23,6 @@ export LC_ALL=en_US.UTF-8
 export LANG=en_US.UTF-8
 export LC_TYPE=en_US.UTF-8
 
-# Fix so line drawing characters are shown correctly in Putty on Windows. See #744.
-export NCURSES_NO_UTF8_ACS=1
-
 # 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,
@@ -38,8 +34,6 @@ if [ -f /etc/mailinabox.conf ]; then
 	cat /etc/mailinabox.conf | sed s/^/DEFAULT_/ > /tmp/mailinabox.prev.conf
 	source /tmp/mailinabox.prev.conf
 	rm -f /tmp/mailinabox.prev.conf
-else
-	FIRST_TIME_SETUP=1
 fi
 
 # Put a start script in a global location. We tell the user to run 'mailinabox'
@@ -51,20 +45,16 @@ source setup/start.sh
 EOF
 chmod +x /usr/local/bin/mailinabox
 
-# Ask the user for the PRIMARY_HOSTNAME, PUBLIC_IP, and PUBLIC_IPV6,
+# Ask the user for the PRIMARY_HOSTNAME, PUBLIC_IP, PUBLIC_IPV6, and CSR_COUNTRY
 # if values have not already been set in environment variables. When running
 # non-interactively, be sure to set values for all! Also sets STORAGE_USER and
 # STORAGE_ROOT.
 source setup/questions.sh
 
 # Run some network checks to make sure setup on this machine makes sense.
-# Skip on existing installs since we don't want this to block the ability to
-# upgrade, and these checks are also in the control panel status checks.
-if [ -z "$DEFAULT_PRIMARY_HOSTNAME" ]; then
 if [ -z "$SKIP_NETWORK_CHECKS" ]; then
 	source setup/network-checks.sh
 fi
-fi
 
 # Create the STORAGE_USER and STORAGE_ROOT directory if they don't already exist.
 # If the STORAGE_ROOT is missing the mailinabox.version file that lists a
@@ -79,7 +69,7 @@ if [ ! -d $STORAGE_ROOT ]; then
 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
+	chown $STORAGE_USER:$STORAGE_USER $STORAGE_ROOT/mailinabox.version
 fi
 
 
@@ -93,6 +83,7 @@ PUBLIC_IP=$PUBLIC_IP
 PUBLIC_IPV6=$PUBLIC_IPV6
 PRIVATE_IP=$PRIVATE_IP
 PRIVATE_IPV6=$PRIVATE_IPV6
+CSR_COUNTRY=$CSR_COUNTRY
 EOF
 
 # Start service configuration.
@@ -111,38 +102,18 @@ source setup/zpush.sh
 source setup/management.sh
 source setup/munin.sh
 
-# Wait for the management daemon to start...
-until nc -z -w 4 127.0.0.1 10222
+# Ping the management daemon to write the DNS and nginx configuration files.
+until nc -z -w 4 localhost 10222
 do
 	echo Waiting for the Mail-in-a-Box management daemon to start...
 	sleep 2
 done
-
-# ...and then have it write the DNS and nginx configuration files and start those
-# services.
 tools/dns_update
 tools/web_update
 
-# Give fail2ban another restart. The log files may not all have been present when
-# fail2ban was first configured, but they should exist now.
-restart_service fail2ban
-
 # If there aren't any mail users yet, create one.
 source setup/firstuser.sh
 
-# Register with Let's Encrypt, including agreeing to the Terms of Service. This
-# is an interactive command.
-if [ ! -d $STORAGE_ROOT/ssl/lets_encrypt/accounts/acme-v01.api.letsencrypt.org/ ]; then
-echo
-echo "-----------------------------------------------"
-echo "Mail-in-a-Box uses Let's Encrypt to provision free certificates"
-echo "to enable HTTPS connections to your box. You'll now be asked to agree"
-echo "to Let's Encrypt's terms of service."
-echo
-certbot register $([ "$NONINTERACTIVE" == 1 ] && echo "--agree-tos") \
-    --register-unsafely-without-email --config-dir $STORAGE_ROOT/ssl/lets_encrypt
-fi
-
 # Done.
 echo
 echo "-----------------------------------------------"
@@ -155,19 +126,17 @@ if management/status_checks.py --check-primary-hostname; then
 	# Show the nice URL if it appears to be resolving and has a valid certificate.
 	echo https://$PRIMARY_HOSTNAME/admin
 	echo
-	echo "If you have a DNS problem put the box's IP address in the URL"
-	echo "(https://$PUBLIC_IP/admin) but then check the TLS fingerprint:"
-	openssl x509 -in $STORAGE_ROOT/ssl/ssl_certificate.pem -noout -fingerprint -sha256\
-        	| sed "s/SHA256 Fingerprint=//"
+	echo If you have a DNS problem use the box\'s IP address and check the SSL fingerprint:
+	echo https://$PUBLIC_IP/admin
 else
 	echo https://$PUBLIC_IP/admin
 	echo
 	echo You will be alerted that the website has an invalid certificate. Check that
 	echo the certificate fingerprint matches:
 	echo
-	openssl x509 -in $STORAGE_ROOT/ssl/ssl_certificate.pem -noout -fingerprint -sha256\
-        	| sed "s/SHA256 Fingerprint=//"
-	echo
-	echo Then you can confirm the security exception and continue.
-	echo
 fi
+openssl x509 -in $STORAGE_ROOT/ssl/ssl_certificate.pem -noout -fingerprint \
+        | sed "s/SHA1 Fingerprint=//"
+echo
+echo Then you can confirm the security exception and continue.
+echo

setup/system.sh

@@ -1,110 +1,30 @@
-source /etc/mailinabox.conf
 source setup/functions.sh # load our functions
 
 # Basic System Configuration
 # -------------------------
 
-# ### Set hostname of the box
+# ### Add Mail-in-a-Box's PPA.
 
-# If the hostname is not correctly resolvable sudo can't be used. This will result in
-# errors during the install
-#
-# First set the hostname in the configuration file, then activate the setting
-
-echo $PRIMARY_HOSTNAME > /etc/hostname
-hostname $PRIMARY_HOSTNAME
-
-# ### Add swap space to the system
-
-# If the physical memory of the system is below 2GB it is wise to create a
-# swap file. This will make the system more resiliant to memory spikes and
-# prevent for instance spam filtering from crashing
-
-# We will create a 1G file, this should be a good balance between disk usage
-# and buffers for the system. We will only allocate this file if there is more
-# than 5GB of disk space available
-
-# The following checks are performed:
-# - Check if swap is currently mountend by looking at /proc/swaps
-# - Check if the user intents to activate swap on next boot by checking fstab entries.
-# - Check if a swapfile already exists
-# - Check if the root file system is not btrfs, might be an incompatible version with
-#   swapfiles. User should hanle it them selves.
-# - Check the memory requirements
-# - Check available diskspace
-
-# See https://www.digitalocean.com/community/tutorials/how-to-add-swap-on-ubuntu-14-04
-# for reference
-
-SWAP_MOUNTED=$(cat /proc/swaps | tail -n+2)
-SWAP_IN_FSTAB=$(grep "swap" /etc/fstab)
-ROOT_IS_BTRFS=$(grep "\/ .*btrfs" /proc/mounts)
-TOTAL_PHYSICAL_MEM=$(head -n 1 /proc/meminfo | awk '{print $2}')
-AVAILABLE_DISK_SPACE=$(df / --output=avail | tail -n 1)
-if
-	[ -z "$SWAP_MOUNTED" ] &&
-	[ -z "$SWAP_IN_FSTAB" ] &&
-	[ ! -e /swapfile ] &&
-	[ -z "$ROOT_IS_BTRFS" ] &&
-	[ $TOTAL_PHYSICAL_MEM -lt 1900000 ] &&
-	[ $AVAILABLE_DISK_SPACE -gt 5242880 ]
-then
-	echo "Adding a swap file to the system..."
-
-	# Allocate and activate the swap file. Allocate in 1KB chuncks
-	# doing it in one go, could fail on low memory systems
-	dd if=/dev/zero of=/swapfile bs=1024 count=$[1024*1024] status=none
-	if [ -e /swapfile ]; then
-		chmod 600 /swapfile
-		hide_output mkswap /swapfile
-		swapon /swapfile
-	fi
-
-	# Check if swap is mounted then activate on boot
-	if swapon -s | grep -q "\/swapfile"; then
-		echo "/swapfile   none    swap    sw    0   0" >> /etc/fstab
-	else
-		echo "ERROR: Swap allocation failed"
-	fi
-fi
-
-# ### Add PPAs.
-
-# We install some non-standard Ubuntu packages maintained by us and other
-# third-party providers. First ensure add-apt-repository is installed.
-
-if [ ! -f /usr/bin/add-apt-repository ]; then
-	echo "Installing add-apt-repository..."
-	hide_output apt-get update
-	apt_install software-properties-common
-fi
-
-# [Main-in-a-Box's own PPA](https://launchpad.net/~mail-in-a-box/+archive/ubuntu/ppa)
-# holds several .deb packages that we built on our own.
+# 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:
 
 hide_output add-apt-repository -y ppa:mail-in-a-box/ppa
-hide_output add-apt-repository -y ppa:certbot/certbot
+
+# The apt-get update in the next step will pull in the PPA's index.
 
 # ### Update Packages
 
-# Update system packages to make sure we have the latest upstream versions
-# of things from Ubuntu, as well as the directory of packages provide by the
-# PPAs so we can install those packages later.
+# 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
 
-# Old kernels pile up over time and take up a lot of disk space, and because of Mail-in-a-Box
-# changes there may be other packages that are no longer needed. Clear out anything apt knows
-# is safe to delete.
-
-apt_get_quiet autoremove
-
 # ### Install System Packages
 
 # Install basic utilities.
@@ -119,139 +39,20 @@ apt_get_quiet autoremove
 # * 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
+# * coreutils: includes `nproc` tool to report number of processors
 # * bc: allows us to do math to compute sane defaults
 
-echo Installing system packages...
 apt_install python3 python3-dev python3-pip \
 	netcat-openbsd wget curl git sudo coreutils bc \
-	haveged pollinate unzip \
-	unattended-upgrades cron ntp fail2ban
+	haveged unattended-upgrades cron ntp fail2ban
 
-# ### Add PHP7 PPA
-
-# Nextcloud requires PHP7, we will install the ppa from ubuntu php maintainer Ondřej Surý
-# The PPA is located here https://launchpad.net/%7Eondrej/+archive/ubuntu/php
-# Unattended upgrades are activated for the repository If it appears it's already
-# installed, don't do it again so we can avoid an unnecessary call to apt-get update.
-if [ ! -f /etc/apt/sources.list.d/ondrej-php-trusty.list ]; then
-hide_output add-apt-repository -y ppa:ondrej/php
-apt_add_repository_to_unattended_upgrades LP-PPA-ondrej-php:trusty
-hide_output apt-get update
-fi
-
-# ### Suppress Upgrade Prompts
-# Since Mail-in-a-Box might jump straight to 18.04 LTS, there's no need
-# to be reminded about 16.04 on every login.
-if [ -f /etc/update-manager/release-upgrades ]; then
-	tools/editconf.py /etc/update-manager/release-upgrades Prompt=never
-	rm -f /var/lib/ubuntu-release-upgrader/release-upgrade-available
-fi
-
-# ### Set the system timezone
-#
-# Some systems are missing /etc/timezone, which we cat into the configs for
-# Z-Push and ownCloud, so we need to set it to something. Daily cron tasks
-# like the system backup are run at a time tied to the system timezone, so
-# letting the user choose will help us identify the right time to do those
-# things (i.e. late at night in whatever timezone the user actually lives
-# in).
-#
-# However, changing the timezone once it is set seems to confuse fail2ban
-# and requires restarting fail2ban (done below in the fail2ban
-# section) and syslog (see #328). There might be other issues, and it's
-# not likely the user will want to change this, so we only ask on first
-# setup.
-if [ -z "$NONINTERACTIVE" ]; then
-	if [ ! -f /etc/timezone ] || [ ! -z $FIRST_TIME_SETUP ]; then
-		# If the file is missing or this is the user's first time running
-		# Mail-in-a-Box setup, run the interactive timezone configuration
-		# tool.
-		dpkg-reconfigure tzdata
-		restart_service rsyslog
-	fi
-else
-	# This is a non-interactive setup so we can't ask the user.
-	# If /etc/timezone is missing, set it to UTC.
-	if [ ! -f /etc/timezone ]; then
-		echo "Setting timezone to UTC."
-		echo "Etc/UTC" > /etc/timezone
-		restart_service rsyslog
-	fi
-fi
-
-# ### Seed /dev/urandom
-#
-# /dev/urandom is used by various components for generating random bytes for
-# encryption keys and passwords:
-#
-# * TLS private key (see `ssl.sh`, which calls `openssl genrsa`)
-# * DNSSEC signing keys (see `dns.sh`)
-# * our management server's API key (via Python's os.urandom method)
-# * Roundcube's SECRET_KEY (`webmail.sh`)
-# * ownCloud's administrator account password (`owncloud.sh`)
-#
-# Why /dev/urandom? It's the same as /dev/random, except that it doesn't wait
-# for a constant new stream of entropy. In practice, we only need a little
-# entropy at the start to get going. After that, we can safely pull a random
-# stream from /dev/urandom and not worry about how much entropy has been
-# added to the stream. (http://www.2uo.de/myths-about-urandom/) So we need
-# to worry about /dev/urandom being seeded properly (which is also an issue
-# for /dev/random), but after that /dev/urandom is superior to /dev/random
-# because it's faster and doesn't block indefinitely to wait for hardware
-# entropy. Note that `openssl genrsa` even uses `/dev/urandom`, and if it's
-# good enough for generating an RSA private key, it's good enough for anything
-# else we may need.
-#
-# Now about that seeding issue....
-#
-# /dev/urandom is seeded from "the uninitialized contents of the pool buffers when
-# the kernel starts, the startup clock time in nanosecond resolution,...and
-# entropy saved across boots to a local file" as well as the order of
-# execution of concurrent accesses to /dev/urandom. (Heninger et al 2012,
-# https://factorable.net/weakkeys12.conference.pdf) But when memory is zeroed,
-# the system clock is reset on boot, /etc/init.d/urandom has not yet run, or
-# the machine is single CPU or has no concurrent accesses to /dev/urandom prior
-# to this point, /dev/urandom may not be seeded well. After this, /dev/urandom
-# draws from the same entropy sources as /dev/random, but it doesn't block or
-# issue any warnings if no entropy is actually available. (http://www.2uo.de/myths-about-urandom/)
-# Entropy might not be readily available because this machine has no user input
-# devices (common on servers!) and either no hard disk or not enough IO has
-# ocurred yet --- although haveged tries to mitigate this. So there's a good chance
-# that accessing /dev/urandom will not be drawing from any hardware entropy and under
-# a perfect-storm circumstance where the other seeds are meaningless, /dev/urandom
-# may not be seeded at all.
-#
-# The first thing we'll do is block until we can seed /dev/urandom with enough
-# hardware entropy to get going, by drawing from /dev/random. haveged makes this
-# less likely to stall for very long.
-
-echo Initializing system random number generator...
-dd if=/dev/random of=/dev/urandom bs=1 count=32 2> /dev/null
-
-# This is supposedly sufficient. But because we're not sure if hardware entropy
-# is really any good on virtualized systems, we'll also seed from Ubuntu's
-# pollinate servers:
-
-pollinate  -q -r
-
-# Between these two, we really ought to be all set.
-
-# We need an ssh key to store backups via rsync, if it doesn't exist create one
-if [ ! -f /root/.ssh/id_rsa_miab ]; then
-	echo 'Creating SSH key for backup…'
-	ssh-keygen -t rsa -b 2048 -a 100 -f /root/.ssh/id_rsa_miab -N '' -q
-fi
-
-# ### Package maintenance
-#
 # Allow apt to install system updates automatically every day.
 
 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 "0";
+APT::Periodic::Verbose "1";
 EOF
 
 # ### Firewall
@@ -326,17 +127,8 @@ restart_service resolvconf
 
 # ### Fail2Ban Service
 
-# Configure the Fail2Ban installation to prevent dumb bruce-force attacks against dovecot, postfix, ssh, etc.
-rm -f /etc/fail2ban/jail.local # we used to use this file but don't anymore
-cat conf/fail2ban/jails.conf \
-	| sed "s/PUBLIC_IP/$PUBLIC_IP/g" \
-	| sed "s#STORAGE_ROOT#$STORAGE_ROOT#" \
-	> /etc/fail2ban/jail.d/mailinabox.conf
-cp -f conf/fail2ban/filter.d/* /etc/fail2ban/filter.d/
+# 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
 
-# On first installation, the log files that the jails look at don't all exist.
-# e.g., The roundcube error log isn't normally created until someone logs into
-# Roundcube for the first time. This causes fail2ban to fail to start. Later
-# scripts will ensure the files exist and then fail2ban is given another
-# restart at the very end of setup.
 restart_service fail2ban

setup/web.sh

@@ -17,46 +17,27 @@ fi
 #
 # Turn off nginx's default website.
 
-echo "Installing Nginx (web server)..."
-
-apt_install nginx php7.0-cli php7.0-fpm
-
-# Set PHP7 as the default
-update-alternatives --set php /usr/bin/php7.0
+apt_install nginx php5-fpm
 
 rm -f /etc/nginx/sites-enabled/default
 
 # Copy in a nginx configuration file for common and best-practices
 # SSL settings from @konklone. Replace STORAGE_ROOT so it can find
 # the DH params.
-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
+	conf/nginx-ssl.conf > /etc/nginx/nginx-ssl.conf
 
 # Fix some nginx defaults.
-# 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.
+# The server_names_hash_bucket_size seems to prevent long domain names?
 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/php/7.0/fpm/php.ini -c ';' \
+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/php/7.0/fpm/php.ini -c ';' \
-        default_charset="UTF-8"
-
-# Switch from the dynamic process manager to the ondemand manager see #1216
-tools/editconf.py /etc/php/7.0/fpm/pool.d/www.conf -c ';' \
-	pm=ondemand
-
 # Bump up PHP's max_children to support more concurrent connections
-tools/editconf.py /etc/php/7.0/fpm/pool.d/www.conf -c ';' \
+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
@@ -111,7 +92,7 @@ done #NODOC
 
 # Start services.
 restart_service nginx
-restart_service php7.0-fpm
+restart_service php5-fpm
 
 # Open ports.
 ufw_allow http

setup/webmail.sh

@@ -19,13 +19,10 @@ source /etc/mailinabox.conf # load global vars
 # and then we'll manually install roundcube from source.
 
 # These dependencies are from `apt-cache showpkg roundcube-core`.
-echo "Installing Roundcube (webmail)..."
 apt_install \
 	dbconfig-common \
-	php7.0-cli php7.0-sqlite php7.0-mcrypt php7.0-intl php7.0-json php7.0-common php7.0-curl \
-	php7.0-gd php7.0-pspell tinymce libjs-jquery libjs-jquery-mousewheel libmagic1 php7.0-mbstring
-
-apt_get_quiet remove php-mail-mimedecode # no longer needed since Roundcube 1.1.3
+	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
 # on Apache and MySQL, by downloading the debs and installing them manually. #NODOC
@@ -33,22 +30,13 @@ apt_get_quiet remove php-mail-mimedecode # no longer needed since Roundcube 1.1.
 apt-get purge -qq -y roundcube* #NODOC
 
 # Install Roundcube from source if it is not already present or if it is out of date.
-# Combine the Roundcube version number with the commit hash of plugins to track
-# whether we have the latest version of everything.
-VERSION=1.3.6
-HASH=ece5cfc9c7af0cbe90c0065ef33e85ed42991830
-PERSISTENT_LOGIN_VERSION=dc5ca3d3f4415cc41edb2fde533c8a8628a94c76
-HTML5_NOTIFIER_VERSION=4b370e3cd60dabd2f428a26f45b677ad1b7118d5
-CARDDAV_VERSION=2.0.4
-CARDDAV_HASH=d93f3cfb3038a519e71c7c3212c1d16f5da609a4
-
-UPDATE_KEY=$VERSION:$PERSISTENT_LOGIN_VERSION:$HTML5_NOTIFIER_VERSION:$CARDDAV_VERSION
-
-# paths that are often reused.
-RCM_DIR=/usr/local/lib/roundcubemail
-RCM_PLUGIN_DIR=${RCM_DIR}/plugins
-RCM_CONFIG=${RCM_DIR}/config/config.inc.php
-
+# Combine the Roundcube version number with the commit hash of vacation_sieve to track
+# whether we have the latest version.
+VERSION=1.1.2
+HASH=df88deae691da3ecf3e9f0aee674c1f3042ea1eb
+VACATION_SIEVE_VERSION=91ea6f52216390073d1f5b70b5f6bea0bfaee7e5
+PERSISTENT_LOGIN_VERSION=117fbd8f93b56b2bf72ad055193464803ef3bc36
+UPDATE_KEY=$VERSION:$VACATION_SIEVE_VERSION:$PERSISTENT_LOGIN_VERSION
 needs_update=0 #NODOC
 if [ ! -f /usr/local/lib/roundcubemail/version ]; then
 	# not installed yet #NODOC
@@ -59,119 +47,95 @@ elif [[ "$UPDATE_KEY" != `cat /usr/local/lib/roundcubemail/version` ]]; then
 fi
 if [ $needs_update == 1 ]; then
 	# install roundcube
+	echo installing Roundcube webmail $VERSION...
 	wget_verify \
-		https://github.com/roundcube/roundcubemail/releases/download/$VERSION/roundcubemail-$VERSION-complete.tar.gz \
+		http://downloads.sourceforge.net/project/roundcubemail/roundcubemail/$VERSION/roundcubemail-$VERSION.tar.gz \
 		$HASH \
 		/tmp/roundcube.tgz
-	tar -C /usr/local/lib --no-same-owner -zxf /tmp/roundcube.tgz
+	tar -C /usr/local/lib -zxf /tmp/roundcube.tgz
 	rm -rf /usr/local/lib/roundcubemail
-	mv /usr/local/lib/roundcubemail-$VERSION/ $RCM_DIR
+	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 '' ${RCM_PLUGIN_DIR}/persistent_login
-
-	# install roundcube html5_notifier plugin
-	git_clone https://github.com/kitist/html5_notifier.git $HTML5_NOTIFIER_VERSION '' ${RCM_PLUGIN_DIR}/html5_notifier
-
-	# download and verify the full release of the carddav plugin
-	wget_verify \
-		https://github.com/blind-coder/rcmcarddav/releases/download/v${CARDDAV_VERSION}/carddav-${CARDDAV_VERSION}.zip \
-		$CARDDAV_HASH \
-		/tmp/carddav.zip
-
-	# unzip and cleanup
-	unzip -q /tmp/carddav.zip -d ${RCM_PLUGIN_DIR}
-	rm -f /tmp/carddav.zip
+	git_clone https://github.com/mfreiholz/Roundcube-Persistent-Login-Plugin.git $PERSISTENT_LOGIN_VERSION '' /usr/local/lib/roundcubemail/plugins/persistent_login
 
 	# record the version we've installed
-	echo $UPDATE_KEY > ${RCM_DIR}/version
+	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/urandom bs=1 count=18 2>/dev/null | base64 | fold -w 24 | head -n 1)
+SECRET_KEY=$(dd if=/dev/random bs=1 count=18 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 > $RCM_CONFIG <<EOF;
+cat > /usr/local/lib/roundcubemail/config/config.inc.php <<EOF;
 <?php
 /*
  * Do not edit. Written by Mail-in-a-Box. Regenerated on updates.
  */
 \$config = array();
 \$config['log_dir'] = '/var/log/roundcubemail/';
-\$config['temp_dir'] = '/var/tmp/roundcubemail/';
+\$config['temp_dir'] = '/tmp/roundcubemail/';
 \$config['db_dsnw'] = 'sqlite:///$STORAGE_ROOT/mail/roundcube/roundcube.sqlite?mode=0640';
 \$config['default_host'] = 'ssl://localhost';
 \$config['default_port'] = 993;
-\$config['imap_conn_options'] = array(
-  'ssl'         => array(
-     'verify_peer'  => false,
-     'verify_peer_name'  => false,
-   ),
- );
 \$config['imap_timeout'] = 15;
-\$config['smtp_server'] = 'tls://127.0.0.1';
+\$config['smtp_server'] = 'tls://localhost';
 \$config['smtp_port'] = 587;
 \$config['smtp_user'] = '%u';
 \$config['smtp_pass'] = '%p';
-\$config['smtp_conn_options'] = array(
-  'ssl'         => array(
-     'verify_peer'  => false,
-     'verify_peer_name'  => false,
-   ),
- );
 \$config['support_url'] = 'https://mailinabox.email/';
-\$config['product_name'] = '$PRIMARY_HOSTNAME Webmail';
+\$config['product_name'] = 'Mail-in-a-Box/Roundcube Webmail';
 \$config['des_key'] = '$SECRET_KEY';
-\$config['plugins'] = array('html5_notifier', 'archive', 'zipdownload', 'password', 'managesieve', 'jqueryui', 'persistent_login', 'carddav');
-\$config['skin'] = 'larry';
+\$config['plugins'] = array('archive', 'zipdownload', 'password', 'managesieve', 'jqueryui', 'vacation_sieve', 'persistent_login');
+\$config['skin'] = 'classic';
 \$config['login_autocomplete'] = 2;
 \$config['password_charset'] = 'UTF-8';
 \$config['junk_mbox'] = 'Spam';
 ?>
 EOF
 
-# Configure CardDav
-cat > ${RCM_PLUGIN_DIR}/carddav/config.inc.php <<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. */
-\$prefs['_GLOBAL']['hide_preferences'] = true;
-\$prefs['_GLOBAL']['suppress_version_warning'] = true;
-\$prefs['ownCloud'] = array(
-	 'name'         =>  'ownCloud',
-	 'username'     =>  '%u', // login username
-	 'password'     =>  '%p', // login password
-	 'url'          =>  'https://${PRIMARY_HOSTNAME}/cloud/remote.php/carddav/addressbooks/%u/contacts',
-	 'active'       =>  true,
-	 'readonly'     =>  false,
-	 'refresh_time' => '02:00:00',
-	 'fixed'        =>  array('username','password'),
-	 'preemptive_auth' => '1',
-	 'hide'        =>  false,
+\$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 /var/tmp/roundcubemail $STORAGE_ROOT/mail/roundcube
-chown -R www-data.www-data /var/log/roundcubemail /var/tmp/roundcubemail $STORAGE_ROOT/mail/roundcube
-
-# Ensure the log file monitored by fail2ban exists, or else fail2ban can't start.
-sudo -u www-data touch /var/log/roundcubemail/errors
+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
 
 # Password changing plugin settings
-# The config comes empty by default, so we need the settings
+# The config comes empty by default, so we need the settings 
 # we're not planning to change in config.inc.dist...
-cp ${RCM_PLUGIN_DIR}/password/config.inc.php.dist \
-	${RCM_PLUGIN_DIR}/password/config.inc.php
+cp /usr/local/lib/roundcubemail/plugins/password/config.inc.php.dist \
+	/usr/local/lib/roundcubemail/plugins/password/config.inc.php
 
-tools/editconf.py ${RCM_PLUGIN_DIR}/password/config.inc.php \
-	"\$config['password_minimum_length']=8;" \
+tools/editconf.py /usr/local/lib/roundcubemail/plugins/password/config.inc.php \
+	"\$config['password_minimum_length']=6;" \
 	"\$config['password_db_dsn']='sqlite:///$STORAGE_ROOT/mail/users.sqlite';" \
 	"\$config['password_query']='UPDATE users SET password=%D WHERE email=%u';" \
 	"\$config['password_dovecotpw']='/usr/bin/doveadm pw';" \
@@ -183,21 +147,11 @@ usermod -a -G dovecot www-data
 
 # set permissions so that PHP can use users.sqlite
 # could use dovecot instead of www-data, but not sure it matters
-chown root.www-data $STORAGE_ROOT/mail
+chown root:www-data $STORAGE_ROOT/mail
 chmod 775 $STORAGE_ROOT/mail
-chown root.www-data $STORAGE_ROOT/mail/users.sqlite
-chmod 664 $STORAGE_ROOT/mail/users.sqlite
-
-# Fix Carddav permissions:
-chown -f -R root.www-data ${RCM_PLUGIN_DIR}/carddav
-# root.www-data need all permissions, others only read
-chmod -R 774 ${RCM_PLUGIN_DIR}/carddav
-
-# Run Roundcube database migration script (database is created if it does not exist)
-${RCM_DIR}/bin/updatedb.sh --dir ${RCM_DIR}/SQL --package roundcube
-chown www-data:www-data $STORAGE_ROOT/mail/roundcube/roundcube.sqlite
-chmod 664 $STORAGE_ROOT/mail/roundcube/roundcube.sqlite
+chown root:www-data $STORAGE_ROOT/mail/users.sqlite
+chmod 664 $STORAGE_ROOT/mail/users.sqlite 
 
 # Enable PHP modules.
-phpenmod -v php7.0 mcrypt imap
-restart_service php7.0-fpm
+php5enmod mcrypt
+restart_service php5-fpm

setup/zpush.sh

@@ -15,43 +15,33 @@ source /etc/mailinabox.conf # load global vars
 
 # Prereqs.
 
-echo "Installing Z-Push (Exchange/ActiveSync server)..."
 apt_install \
-	php7.0-soap php7.0-imap libawl-php php7.0-xsl
+	php-soap php5-imap libawl-php php5-xsl
 
-phpenmod -v php7.0 imap
+php5enmod imap
 
 # Copy Z-Push into place.
-VERSION=2.3.9
-TARGETHASH=60087b97e4b1c73db096e252cf893c75df556907
+TARGETHASH=d0cd5a47c53afac5c3b287006dc8a48a1c4ffcd5
 needs_update=0 #NODOC
 if [ ! -f /usr/local/lib/z-push/version ]; then
 	needs_update=1 #NODOC
-elif [[ $VERSION != `cat /usr/local/lib/z-push/version` ]]; then
-	# checks if the version
+elif [[ $TARGETHASH != `cat /usr/local/lib/z-push/version` ]]; then
+	# checks if the version 
 	needs_update=1 #NODOC
 fi
 if [ $needs_update == 1 ]; then
-	wget_verify http://download.z-push.org/final/2.3/z-push-$VERSION.tar.gz $TARGETHASH /tmp/z-push.tar.gz
-
-	rm -rf /usr/local/lib/z-push
-	tar -xzf /tmp/z-push.tar.gz -C /usr/local/lib/
-	rm /tmp/z-push.tar.gz
-	mv /usr/local/lib/z-push-$VERSION /usr/local/lib/z-push
-
+	echo installing z-push \(fmbiete fork\)...
+	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 $VERSION > /usr/local/lib/z-push/version
+	echo $TARGETHASH > /usr/local/lib/z-push/version
 fi
 
 # Configure default config.
 sed -i "s^define('TIMEZONE', .*^define('TIMEZONE', '$(cat /etc/timezone)');^" /usr/local/lib/z-push/config.php
 sed -i "s/define('BACKEND_PROVIDER', .*/define('BACKEND_PROVIDER', 'BackendCombined');/" /usr/local/lib/z-push/config.php
 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('LOG_MEMORY_PROFILER', .*/define('LOG_MEMORY_PROFILER', false);/" /usr/local/lib/z-push/config.php
-sed -i "s/define('BUG68532FIXED', .*/define('BUG68532FIXED', false);/" /usr/local/lib/z-push/config.php
-sed -i "s/define('LOGLEVEL', .*/define('LOGLEVEL', LOGLEVEL_ERROR);/" /usr/local/lib/z-push/config.php
 
 # Configure BACKEND
 rm -f /usr/local/lib/z-push/backend/combined/config.php
@@ -60,7 +50,6 @@ cp conf/zpush/backend_combined.php /usr/local/lib/z-push/backend/combined/config
 # 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
-sed -i "s%STORAGE_ROOT%$STORAGE_ROOT%" /usr/local/lib/z-push/backend/imap/config.php
 
 # Configure CardDav
 rm -f /usr/local/lib/z-push/backend/carddav/config.php
@@ -74,7 +63,6 @@ cp conf/zpush/backend_caldav.php /usr/local/lib/z-push/backend/caldav/config.php
 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
-sed -i "s^define('TIMEZONE', .*^define('TIMEZONE', '$(cat /etc/timezone)');^" /usr/local/lib/z-push/autodiscover/config.php
 
 # Some directories it will use.
 
@@ -85,23 +73,6 @@ chmod 750 /var/lib/z-push
 chown www-data:www-data /var/log/z-push
 chown www-data:www-data /var/lib/z-push
 
-# Add log rotation
-
-cat > /etc/logrotate.d/z-push <<EOF;
-/var/log/z-push/*.log {
-	weekly
-	missingok
-	rotate 52
-	compress
-	delaycompress
-	notifempty
-}
-EOF
-
 # Restart service.
 
-restart_service php7.0-fpm
-
-# Fix states after upgrade
-
-hide_output z-push-admin -a fixstates
+restart_service php5-fpm

tests/fail2ban.py

@@ -1,221 +0,0 @@
-# Test that a box's fail2ban setting are working
-# correctly by attempting a bunch of failed logins.
-#
-# Specify a SSH login command (which we use to reset
-# fail2ban after each test) and the hostname to
-# try to log in to.
-######################################################################
-
-import sys, os, time, functools
-
-# parse command line
-
-if len(sys.argv) != 4:
-	print("Usage: tests/fail2ban.py \"ssh user@hostname\" hostname owncloud_user")
-	sys.exit(1)
-
-ssh_command, hostname, owncloud_user = sys.argv[1:4]
-
-# define some test types
-
-import socket
-socket.setdefaulttimeout(10)
-
-class IsBlocked(Exception):
-	"""Tests raise this exception when it appears that a fail2ban
-	jail is in effect, i.e. on a connection refused error."""
-	pass
-
-def smtp_test():
-	import smtplib
-
-	try:
-		server = smtplib.SMTP(hostname, 587)
-	except ConnectionRefusedError:
-		# looks like fail2ban worked
-		raise IsBlocked()
-	server.starttls()
-	server.ehlo_or_helo_if_needed()
-
-	try:
-		server.login("fakeuser", "fakepassword")
-		raise Exception("authentication didn't fail")
-	except smtplib.SMTPAuthenticationError:
-		# athentication should fail
-		pass
-
-	try:
-		server.quit()
-	except:
-		# ignore errors here
-		pass
-
-def imap_test():
-	import imaplib
-
-	try:
-		M = imaplib.IMAP4_SSL(hostname)
-	except ConnectionRefusedError:
-		# looks like fail2ban worked
-		raise IsBlocked()
-
-	try:
-		M.login("fakeuser", "fakepassword")
-		raise Exception("authentication didn't fail")
-	except imaplib.IMAP4.error:
-		# authentication should fail
-		pass
-	finally:
-		M.logout() # shuts down connection, has nothing to do with login()
-
-
-def pop_test():
-	import poplib
-	try:
-		M = poplib.POP3_SSL(hostname)
-	except ConnectionRefusedError:
-		# looks like fail2ban worked
-		raise IsBlocked()
-	try:
-		M.user('fakeuser')
-		try:
-			M.pass_('fakepassword')
-		except poplib.error_proto as e:
-			# Authentication should fail.
-			M = None # don't .quit()
-			return
-		M.list()
-		raise Exception("authentication didn't fail")
-	finally:
-		if M:
-			M.quit()
-
-def http_test(url, expected_status, postdata=None, qsargs=None, auth=None):
-	import urllib.parse
-	import requests
-	from requests.auth import HTTPBasicAuth
-
-	# form request
-	url = urllib.parse.urljoin("https://" + hostname, url)
-	if qsargs: url += "?" + urllib.parse.urlencode(qsargs)
-	urlopen = requests.get if not postdata else requests.post
-
-	try:
-		# issue request
-		r = urlopen(
-			url,
-			auth=HTTPBasicAuth(*auth) if auth else None,
-			data=postdata,
-			headers={'User-Agent': 'Mail-in-a-Box fail2ban tester'},
-			timeout=8,
-			verify=False) # don't bother with HTTPS validation, it may not be configured yet
-	except requests.exceptions.ConnectTimeout as e:
-		raise IsBlocked()
-	except requests.exceptions.ConnectionError as e:
-		if "Connection refused" in str(e):
-			raise IsBlocked()
-		raise # some other unexpected condition
-
-	# return response status code
-	if r.status_code != expected_status:
-		r.raise_for_status() # anything but 200
-		raise IOError("Got unexpected status code %s." % r.status_code)
-
-# define how to run a test
-
-def restart_fail2ban_service(final=False):
-	# Log in over SSH to restart fail2ban.
-	command = "sudo fail2ban-client reload"
-	if not final:
-		# Stop recidive jails during testing.
-		command += " && sudo fail2ban-client stop recidive"
-	os.system("%s \"%s\"" % (ssh_command, command))
-
-def testfunc_runner(i, testfunc, *args):
-	print(i+1, end=" ", flush=True)
-	testfunc(*args)
-
-def run_test(testfunc, args, count, within_seconds, parallel):
-	# Run testfunc count times in within_seconds seconds (and actually
-	# within a little less time so we're sure we're under the limit).
-	#
-	# Because some services are slow, like IMAP, we can't necessarily
-	# run testfunc sequentially and still get to count requests within
-	# the required time. So we split the requests across threads.
-
-	import requests.exceptions
-	from multiprocessing import Pool
-
-	restart_fail2ban_service()
-
-	# Log.
-	print(testfunc.__name__, " ".join(str(a) for a in args), "...")
-
-	# Record the start time so we can know how to evenly space our
-	# calls to testfunc.
-	start_time = time.time()
-
-	with Pool(parallel) as p:
-		# Distribute the requests across the pool.
-		asyncresults = []
-		for i in range(count):
-			ar = p.apply_async(testfunc_runner, [i, testfunc] + list(args))
-			asyncresults.append(ar)
-
-		# Wait for all runs to finish.
-		p.close()
-		p.join()
-
-		# Check for errors.
-		for ar in asyncresults:
-			try:
-				ar.get()
-			except IsBlocked:
-				print("Test machine prematurely blocked!")
-				return False
-
-	# Did we make enough requests within the limit?
-	if (time.time()-start_time) > within_seconds:
-		raise Exception("Test failed to make %s requests in %d seconds." % (count, within_seconds))
-
-	# Wait a moment for the block to be put into place.
-	time.sleep(4)
-
-	# The next call should fail.
-	print("*", end=" ", flush=True)
-	try:
-		testfunc(*args)
-	except IsBlocked:
-		# Success -- this one is supposed to be refused.
-		print("blocked [OK]")
-		return True # OK
-
-	print("not blocked!")
-	return False
-
-######################################################################
-
-if __name__ == "__main__":
-	# run tests
-
-	# SMTP bans at 10 even though we say 20 in the config because we get
-	# doubled-up warnings in the logs, we'll let that be for now
-	run_test(smtp_test, [], 10, 30, 8)
-
-	# IMAP
-	run_test(imap_test, [], 20, 30, 4)
-
-	# POP
-	run_test(pop_test, [], 20, 30, 4)
-
-	# Mail-in-a-Box control panel
-	run_test(http_test, ["/admin/me", 200], 20, 30, 1)
-
-	# Munin via the Mail-in-a-Box control panel
-	run_test(http_test, ["/admin/munin/", 401], 20, 30, 1)
-
-	# ownCloud
-	run_test(http_test, ["/cloud/remote.php/webdav", 401, None, None, [owncloud_user, "aa"]], 20, 120, 1)
-
-	# restart fail2ban so that this client machine is no longer blocked
-	restart_fail2ban_service(final=True)

tests/tls.py

@@ -61,9 +61,9 @@ common_opts = ["--sslv2", "--sslv3", "--tlsv1", "--tlsv1_1", "--tlsv1_2", "--ren
 # Assumes TLSv1, TLSv1.1, TLSv1.2.
 #
 # The 'old' ciphers bring compatibility back to Win XP IE 6.
-MOZILLA_CIPHERS_MODERN = "ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256"
-MOZILLA_CIPHERS_INTERMEDIATE = "ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS"
-MOZILLA_CIPHERS_OLD = "ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305: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:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:DES-CBC3-SHA:HIGH:SEED:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!RSAPSK:!aDH:!aECDH:!EDH-DSS-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA:!SRP"
+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"
 
 ######################################################################
 

tests/tls_results.txt

@@ -33,6 +33,7 @@ PORT 25
                  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                       
@@ -42,6 +43,8 @@ PORT 25
                  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                       
@@ -59,11 +62,37 @@ PORT 25
                  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                       
@@ -79,23 +108,23 @@ PORT 25
                  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                       
+                 DES-CBC3-SHA                  -              112 bits      250 2.0.0 Ok
 
-  * SSLV3 Cipher Suites:
-      Server rejected all cipher suites.
-
-  Should Not Offer: (none -- good)
-  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, DHE-DSS-SEED-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
-  Supported Clients: BingPreview/Jan 2015, OpenSSL/1.0.2, Yahoo Slurp/Jan 2015, OpenSSL/1.0.1l, YandexBot/Jan 2015, Android/4.4.2, Safari/7/iOS 7.1, Safari/8/iOS 8.1.2, Safari/6/iOS 6.0.1, Safari/7/OS X 10.9, Safari/8/OS X 10.10, Baidu/Jan 2015, Firefox/31.3.0 ESR/Win 7, IE/11/Win 7, IE/11/Win 8.1, IE Mobile/11/Win Phone 8.1, Java/8u31, Android/5.0.0, Googlebot/Feb 2015, Chrome/42/OS X, Android/4.1.1, Android/4.3, Android/4.0.4, Android/4.2.2, Safari/5.1.9/OS X 10.6.8, Safari/6.0.4/OS X 10.8.4, Firefox/37/OS X, OpenSSL/0.9.8y, Java/7u25, IE Mobile/10/Win Phone 8.0, IE/8-10/Win 7, IE/7/Vista, Android/2.3.7, Java/6u45, IE/8/XP
+  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
 --------
@@ -163,6 +192,9 @@ PORT 587
                  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                       
@@ -178,14 +210,11 @@ PORT 587
                  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                       
+                 AES128-SHA                    -              128 bits      250 2.0.0 Ok
 
-  * SSLV3 Cipher Suites:
-      Server rejected all cipher suites.
-
-  Should Not Offer: AES128-GCM-SHA256, AES128-SHA, AES128-SHA256, AES256-GCM-SHA384, AES256-SHA, AES256-SHA256, CAMELLIA128-SHA, CAMELLIA256-SHA, DHE-RSA-AES128-GCM-SHA256, DHE-RSA-AES128-SHA, DHE-RSA-AES128-SHA256, DHE-RSA-AES256-GCM-SHA384, DHE-RSA-AES256-SHA, DHE-RSA-AES256-SHA256, DHE-RSA-CAMELLIA128-SHA, DHE-RSA-CAMELLIA256-SHA, DHE-RSA-SEED-SHA, ECDHE-RSA-AES128-SHA, ECDHE-RSA-AES256-SHA, SEED-SHA
-  Could Also Offer: ECDHE-ECDSA-AES128-GCM-SHA256, ECDHE-ECDSA-AES128-SHA256, ECDHE-ECDSA-AES256-GCM-SHA384, ECDHE-ECDSA-AES256-SHA384
-  Supported Clients: BingPreview/Jan 2015, OpenSSL/1.0.2, Yahoo Slurp/Jan 2015, OpenSSL/1.0.1l, YandexBot/Jan 2015, Android/4.4.2, Safari/7/iOS 7.1, IE/11/Win 7, IE/11/Win 8.1, Safari/8/iOS 8.1.2, Safari/6/iOS 6.0.1, Safari/7/OS X 10.9, IE Mobile/11/Win Phone 8.1, Safari/8/OS X 10.10, Baidu/Jan 2015, Firefox/31.3.0 ESR/Win 7, Java/8u31, Android/5.0.0, Chrome/42/OS X, Googlebot/Feb 2015, Firefox/37/OS X, Android/4.1.1, Android/4.3, Android/4.0.4, Android/4.2.2, Safari/5.1.9/OS X 10.6.8, Safari/6.0.4/OS X 10.8.4, OpenSSL/0.9.8y, IE Mobile/10/Win Phone 8.0, IE/8-10/Win 7, IE/7/Vista, Java/7u25, Android/2.3.7, Java/6u45
+  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
 --------
@@ -197,22 +226,22 @@ PORT 443
       Client-initiated Renegotiations:   OK - Rejected
       Secure Renegotiation:              OK - Supported
 
-  * OpenSSL Heartbleed:
-      OK - Not vulnerable to Heartbleed  
-
   * HTTP Strict Transport Security:
-      OK - HSTS header received:         max-age=15768000
-
-Unhandled exception when processing --chrome_sha1: 
-exceptions.TypeError - Incorrect padding
+      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                        
@@ -223,20 +252,12 @@ exceptions.TypeError - Incorrect padding
                  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                        
-                 AES256-SHA256                 -              256 bits      HTTP 200 OK                        
-                 AES256-SHA                    -              256 bits      HTTP 200 OK                        
-                 AES256-GCM-SHA384             -              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                        
-                 AES128-SHA256                 -              128 bits      HTTP 200 OK                        
-                 AES128-SHA                    -              128 bits      HTTP 200 OK                        
-                 AES128-GCM-SHA256             -              128 bits      HTTP 200 OK                        
-                 ECDHE-RSA-DES-CBC3-SHA        ECDH-256 bits  112 bits      HTTP 200 OK                        
-                 EDH-RSA-DES-CBC3-SHA          DH-2048 bits   112 bits      HTTP 200 OK                        
                  DES-CBC3-SHA                  -              112 bits      HTTP 200 OK                        
 
   * TLSV1_1 Cipher Suites:
@@ -245,34 +266,26 @@ exceptions.TypeError - Incorrect padding
       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                        
-                 AES256-SHA                    -              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                        
-                 AES128-SHA                    -              128 bits      HTTP 200 OK                        
-                 ECDHE-RSA-DES-CBC3-SHA        ECDH-256 bits  112 bits      HTTP 200 OK                        
-                 EDH-RSA-DES-CBC3-SHA          DH-2048 bits   112 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                        
-                 AES256-SHA                    -              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                        
-                 AES128-SHA                    -              128 bits      HTTP 200 OK                        
-                 ECDHE-RSA-DES-CBC3-SHA        ECDH-256 bits  112 bits      HTTP 200 OK                        
-                 EDH-RSA-DES-CBC3-SHA          DH-2048 bits   112 bits      HTTP 200 OK                        
-                 DES-CBC3-SHA                  -              112 bits      HTTP 200 OK                        
-
-  * SSLV3 Cipher Suites:
-      Server rejected all cipher suites.
+                 DES-CBC3-SHA                  -              112 bits      HTTP 200 OK
 
   Should Not Offer: (none -- good)
-  Could Also Offer: 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
-  Supported Clients: BingPreview/Jan 2015, OpenSSL/1.0.2, YandexBot/Jan 2015, OpenSSL/1.0.1l, Yahoo Slurp/Jan 2015, Android/4.4.2, Safari/7/iOS 7.1, Safari/8/iOS 8.1.2, Safari/6/iOS 6.0.1, Safari/7/OS X 10.9, Safari/8/OS X 10.10, IE/11/Win 7, IE/11/Win 8.1, IE Mobile/11/Win Phone 8.1, Java/8u31, Android/5.0.0, Googlebot/Feb 2015, Firefox/31.3.0 ESR/Win 7, Chrome/42/OS X, Baidu/Jan 2015, Android/4.1.1, Android/4.3, Android/4.0.4, Android/4.2.2, Safari/5.1.9/OS X 10.6.8, Safari/6.0.4/OS X 10.8.4, Firefox/37/OS X, OpenSSL/0.9.8y, Java/7u25, IE Mobile/10/Win Phone 8.0, IE/8-10/Win 7, IE/7/Vista, Java/6u45, Android/2.3.7, IE/8/XP
+  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
 --------
@@ -295,64 +308,55 @@ _nassl.OpenSSLError - error:140940F5:SSL routines:ssl3_read_bytes:unexpected rec
 
   * TLSV1_2 Cipher Suites:
       Preferred:                       
-                 ECDHE-RSA-AES128-GCM-SHA256   ECDH-384 bits  128 bits                                         
-      Accepted:                        
-                 ECDHE-RSA-AES256-SHA384       ECDH-384 bits  256 bits                                         
                  ECDHE-RSA-AES256-SHA          ECDH-384 bits  256 bits                                         
-                 ECDHE-RSA-AES256-GCM-SHA384   ECDH-384 bits  256 bits                                         
-                 DHE-RSA-AES256-SHA256         DH-2048 bits   256 bits                                         
-                 DHE-RSA-AES256-SHA            DH-2048 bits   256 bits                                         
-                 DHE-RSA-AES256-GCM-SHA384     DH-2048 bits   256 bits                                         
-                 AES256-SHA256                 -              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                                         
-                 AES256-GCM-SHA384             -              256 bits                                         
-                 ECDHE-RSA-AES128-SHA256       ECDH-384 bits  128 bits                                         
                  ECDHE-RSA-AES128-SHA          ECDH-384 bits  128 bits                                         
-                 ECDHE-RSA-AES128-GCM-SHA256   ECDH-384 bits  128 bits                                         
-                 DHE-RSA-AES128-SHA256         DH-2048 bits   128 bits                                         
-                 DHE-RSA-AES128-SHA            DH-2048 bits   128 bits                                         
-                 DHE-RSA-AES128-GCM-SHA256     DH-2048 bits   128 bits                                         
-                 AES128-SHA256                 -              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                                         
-                 AES128-GCM-SHA256             -              128 bits                                         
-                 ECDHE-RSA-DES-CBC3-SHA        ECDH-384 bits  112 bits                                         
-                 EDH-RSA-DES-CBC3-SHA          DH-2048 bits   112 bits                                         
-                 DES-CBC3-SHA                  -              112 bits                                         
 
   * TLSV1_1 Cipher Suites:
       Preferred:                       
-                 ECDHE-RSA-AES128-SHA          ECDH-384 bits  128 bits                                         
+                 ECDHE-RSA-AES256-SHA          ECDH-384 bits  256 bits                                         
       Accepted:                        
                  ECDHE-RSA-AES256-SHA          ECDH-384 bits  256 bits                                         
-                 DHE-RSA-AES256-SHA            DH-2048 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-AES128-SHA            DH-2048 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                                         
-                 ECDHE-RSA-DES-CBC3-SHA        ECDH-384 bits  112 bits                                         
-                 EDH-RSA-DES-CBC3-SHA          DH-2048 bits   112 bits                                         
-                 DES-CBC3-SHA                  -              112 bits                                         
-
-  * TLSV1 Cipher Suites:
-      Preferred:                       
-                 ECDHE-RSA-AES128-SHA          ECDH-384 bits  128 bits                                         
-      Accepted:                        
-                 ECDHE-RSA-AES256-SHA          ECDH-384 bits  256 bits                                         
-                 DHE-RSA-AES256-SHA            DH-2048 bits   256 bits                                         
-                 AES256-SHA                    -              256 bits                                         
-                 ECDHE-RSA-AES128-SHA          ECDH-384 bits  128 bits                                         
-                 DHE-RSA-AES128-SHA            DH-2048 bits   128 bits                                         
-                 AES128-SHA                    -              128 bits                                         
-                 ECDHE-RSA-DES-CBC3-SHA        ECDH-384 bits  112 bits                                         
-                 EDH-RSA-DES-CBC3-SHA          DH-2048 bits   112 bits                                         
-                 DES-CBC3-SHA                  -              112 bits                                         
 
   * SSLV3 Cipher Suites:
       Server rejected all cipher suites.
 
-  Should Not Offer: AES128-GCM-SHA256, AES128-SHA, AES128-SHA256, AES256-GCM-SHA384, AES256-SHA, AES256-SHA256, DES-CBC3-SHA, DHE-RSA-AES128-GCM-SHA256, DHE-RSA-AES128-SHA, DHE-RSA-AES128-SHA256, DHE-RSA-AES256-GCM-SHA384, DHE-RSA-AES256-SHA, DHE-RSA-AES256-SHA256, ECDHE-RSA-AES128-SHA, ECDHE-RSA-AES256-SHA, ECDHE-RSA-DES-CBC3-SHA, EDH-RSA-DES-CBC3-SHA
-  Could Also Offer: ECDHE-ECDSA-AES128-GCM-SHA256, ECDHE-ECDSA-AES128-SHA256, ECDHE-ECDSA-AES256-GCM-SHA384, ECDHE-ECDSA-AES256-SHA384
-  Supported Clients: BingPreview/Jan 2015, OpenSSL/1.0.2, YandexBot/Jan 2015, OpenSSL/1.0.1l, Yahoo Slurp/Jan 2015, Android/4.4.2, Safari/7/iOS 7.1, Safari/8/iOS 8.1.2, Safari/6/iOS 6.0.1, Safari/7/OS X 10.9, Safari/8/OS X 10.10, IE/11/Win 7, IE/11/Win 8.1, IE Mobile/11/Win Phone 8.1, Java/8u31, Android/5.0.0, Googlebot/Feb 2015, Firefox/31.3.0 ESR/Win 7, Chrome/42/OS X, Baidu/Jan 2015, Android/4.1.1, Android/4.3, Android/4.0.4, Android/4.2.2, Safari/5.1.9/OS X 10.6.8, Safari/6.0.4/OS X 10.8.4, Firefox/37/OS X, OpenSSL/0.9.8y, Java/7u25, IE Mobile/10/Win Phone 8.0, IE/8-10/Win 7, IE/7/Vista, Java/6u45, Android/2.3.7, IE/8/XP
+  * 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
 --------
@@ -375,62 +379,53 @@ _nassl.OpenSSLError - error:140940F5:SSL routines:ssl3_read_bytes:unexpected rec
 
   * TLSV1_2 Cipher Suites:
       Preferred:                       
-                 ECDHE-RSA-AES128-GCM-SHA256   ECDH-384 bits  128 bits                                         
-      Accepted:                        
-                 ECDHE-RSA-AES256-SHA384       ECDH-384 bits  256 bits                                         
                  ECDHE-RSA-AES256-SHA          ECDH-384 bits  256 bits                                         
-                 ECDHE-RSA-AES256-GCM-SHA384   ECDH-384 bits  256 bits                                         
-                 DHE-RSA-AES256-SHA256         DH-2048 bits   256 bits                                         
-                 DHE-RSA-AES256-SHA            DH-2048 bits   256 bits                                         
-                 DHE-RSA-AES256-GCM-SHA384     DH-2048 bits   256 bits                                         
-                 AES256-SHA256                 -              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                                         
-                 AES256-GCM-SHA384             -              256 bits                                         
-                 ECDHE-RSA-AES128-SHA256       ECDH-384 bits  128 bits                                         
                  ECDHE-RSA-AES128-SHA          ECDH-384 bits  128 bits                                         
-                 ECDHE-RSA-AES128-GCM-SHA256   ECDH-384 bits  128 bits                                         
-                 DHE-RSA-AES128-SHA256         DH-2048 bits   128 bits                                         
-                 DHE-RSA-AES128-SHA            DH-2048 bits   128 bits                                         
-                 DHE-RSA-AES128-GCM-SHA256     DH-2048 bits   128 bits                                         
-                 AES128-SHA256                 -              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                                         
-                 AES128-GCM-SHA256             -              128 bits                                         
-                 ECDHE-RSA-DES-CBC3-SHA        ECDH-384 bits  112 bits                                         
-                 EDH-RSA-DES-CBC3-SHA          DH-2048 bits   112 bits                                         
-                 DES-CBC3-SHA                  -              112 bits                                         
 
   * TLSV1_1 Cipher Suites:
       Preferred:                       
-                 ECDHE-RSA-AES128-SHA          ECDH-384 bits  128 bits                                         
+                 ECDHE-RSA-AES256-SHA          ECDH-384 bits  256 bits                                         
       Accepted:                        
                  ECDHE-RSA-AES256-SHA          ECDH-384 bits  256 bits                                         
-                 DHE-RSA-AES256-SHA            DH-2048 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-AES128-SHA            DH-2048 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                                         
-                 ECDHE-RSA-DES-CBC3-SHA        ECDH-384 bits  112 bits                                         
-                 EDH-RSA-DES-CBC3-SHA          DH-2048 bits   112 bits                                         
-                 DES-CBC3-SHA                  -              112 bits                                         
-
-  * TLSV1 Cipher Suites:
-      Preferred:                       
-                 ECDHE-RSA-AES128-SHA          ECDH-384 bits  128 bits                                         
-      Accepted:                        
-                 ECDHE-RSA-AES256-SHA          ECDH-384 bits  256 bits                                         
-                 DHE-RSA-AES256-SHA            DH-2048 bits   256 bits                                         
-                 AES256-SHA                    -              256 bits                                         
-                 ECDHE-RSA-AES128-SHA          ECDH-384 bits  128 bits                                         
-                 DHE-RSA-AES128-SHA            DH-2048 bits   128 bits                                         
-                 AES128-SHA                    -              128 bits                                         
-                 ECDHE-RSA-DES-CBC3-SHA        ECDH-384 bits  112 bits                                         
-                 EDH-RSA-DES-CBC3-SHA          DH-2048 bits   112 bits                                         
-                 DES-CBC3-SHA                  -              112 bits                                         
 
   * SSLV3 Cipher Suites:
       Server rejected all cipher suites.
 
-  Should Not Offer: AES128-GCM-SHA256, AES128-SHA, AES128-SHA256, AES256-GCM-SHA384, AES256-SHA, AES256-SHA256, DES-CBC3-SHA, DHE-RSA-AES128-GCM-SHA256, DHE-RSA-AES128-SHA, DHE-RSA-AES128-SHA256, DHE-RSA-AES256-GCM-SHA384, DHE-RSA-AES256-SHA, DHE-RSA-AES256-SHA256, ECDHE-RSA-AES128-SHA, ECDHE-RSA-AES256-SHA, ECDHE-RSA-DES-CBC3-SHA, EDH-RSA-DES-CBC3-SHA
-  Could Also Offer: ECDHE-ECDSA-AES128-GCM-SHA256, ECDHE-ECDSA-AES128-SHA256, ECDHE-ECDSA-AES256-GCM-SHA384, ECDHE-ECDSA-AES256-SHA384
-  Supported Clients: BingPreview/Jan 2015, OpenSSL/1.0.2, YandexBot/Jan 2015, OpenSSL/1.0.1l, Yahoo Slurp/Jan 2015, Android/4.4.2, Safari/7/iOS 7.1, Safari/8/iOS 8.1.2, Safari/6/iOS 6.0.1, Safari/7/OS X 10.9, Safari/8/OS X 10.10, IE/11/Win 7, IE/11/Win 8.1, IE Mobile/11/Win Phone 8.1, Java/8u31, Android/5.0.0, Googlebot/Feb 2015, Firefox/31.3.0 ESR/Win 7, Chrome/42/OS X, Baidu/Jan 2015, Android/4.1.1, Android/4.3, Android/4.0.4, Android/4.2.2, Safari/5.1.9/OS X 10.6.8, Safari/6.0.4/OS X 10.8.4, Firefox/37/OS X, OpenSSL/0.9.8y, Java/7u25, IE Mobile/10/Win Phone 8.0, IE/8-10/Win 7, IE/7/Vista, Java/6u45, Android/2.3.7, IE/8/XP
+  * 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/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

tools/list_all_packages.py

@@ -0,0 +1,23 @@
+#!/usr/bin/python3
+
+import os.path, glob, re
+
+packages = set()
+
+def add(line):
+	global packages
+	if line.endswith("\\"): line = line[:-1]
+	packages |= set(p for p in line.split(" ") if p not in("", "apt_install"))
+
+for fn in glob.glob(os.path.join(os.path.dirname(__file__), "../setup/*.sh")):
+	with open(fn) as f:
+		in_apt_install = False
+		for line in f:
+			line = line.strip()
+			if line.startswith("apt_install "):
+				in_apt_install = True
+			if in_apt_install:
+				add(line)
+			in_apt_install = in_apt_install and line.endswith("\\")
+
+print("\n".join(sorted(packages)))

tools/mail.py

@@ -30,8 +30,8 @@ def mgmt(cmd, data=None, is_json=False):
 def read_password():
     while True:
         first = getpass.getpass('password: ')
-        if len(first) < 8:
-            print("Passwords must be at least eight characters.")
+        if len(first) < 4:
+            print("Passwords must be at least four characters.")
             continue
         if re.search(r'[\s]', first):
             print("Passwords cannot contain spaces.")
@@ -120,10 +120,10 @@ 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.")

tools/owncloud-restore.sh

@@ -1,51 +0,0 @@
-#!/bin/bash
-#
-# This script will restore the backup made during an installation
-source /etc/mailinabox.conf # load global vars
-
-if [ -z "$1" ]; then
-	echo "Usage: owncloud-restore.sh <backup directory>"
-	echo
-	echo "WARNING: This will restore the database to the point of the installation!"
-	echo "         This means that you will lose all changes made by users after that point"
-	echo
-	echo
-	echo "Backups are stored here: $STORAGE_ROOT/owncloud-backup/"
-	echo
-	echo "Available backups:"
-	echo
-	find $STORAGE_ROOT/owncloud-backup/* -maxdepth 0 -type d
-	echo
-	echo "Supply the directory that was created during the last installation as the only commandline argument"
-	exit
-fi
-
-if [ ! -f $1/config.php ]; then
-	echo "This isn't a valid backup location"
-	exit
-fi
-
-echo "Restoring backup from $1"
-service php5-fpm stop
-service php7.0-fpm stop
-
-# remove the current ownCloud/Nextcloud installation
-rm -rf /usr/local/lib/owncloud/
-# restore the current ownCloud/Nextcloud application
-cp -r  "$1/owncloud-install" /usr/local/lib/owncloud
-
-# restore access rights
-chmod 750 /usr/local/lib/owncloud/{apps,config}
-
-cp "$1/owncloud.db" $STORAGE_ROOT/owncloud/
-cp "$1/config.php" $STORAGE_ROOT/owncloud/
-
-ln -sf $STORAGE_ROOT/owncloud/config.php /usr/local/lib/owncloud/config/config.php
-chown -f -R www-data.www-data $STORAGE_ROOT/owncloud /usr/local/lib/owncloud
-chown www-data.www-data $STORAGE_ROOT/owncloud/config.php
-
-sudo -u www-data php /usr/local/lib/owncloud/occ maintenance:mode --off
-
-service php5-fpm start
-service php7.0-fpm start
-echo "Done"

tools/owncloud-unlockadmin.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# This script will give you administrative access to the Nextcloud
+# This script will give you administrative access to the ownCloud
 # instance running here.
 #
 # Run this at your own risk. This is for testing & experimentation
@@ -13,11 +13,11 @@ 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 Nextcloud\'s admin interface
+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
 
-sudo -u www-data php /usr/local/lib/owncloud/occ group:adduser admin $ADMIN && echo Done.
+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

@@ -2,8 +2,7 @@
 #
 # 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 (which is currently at the URL
-# .../setup.sh).
+# looking at accesses to the bootstrap.sh script.
 
 import re, glob, gzip, os.path, json
 import dateutil.parser
@@ -25,10 +24,8 @@ for fn in glob.glob("/var/log/nginx/access.log*"):
 	# Loop through the lines in the access log.
 	with f:
 		for line in f:
-			# Find lines that are GETs on the bootstrap script by either curl or wget.
-			# (Note that we purposely skip ...?ping=1 requests which is the admin panel querying us for updates.)
-			# (Also, the URL changed in January 2016, but we'll accept both.)
-			m = re.match(rb"(?P<ip>\S+) - - \[(?P<date>.*?)\] \"GET /(bootstrap.sh|setup.sh) HTTP/.*\" 200 \d+ .* \"(?:curl|wget)", line, re.I)
+			# Find lines that are GETs on /bootstrap.sh by either curl or wget.
+			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()

tools/readable_bash.py

@@ -458,6 +458,7 @@ class BashScript(Grammar):
 
 		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