docker-build should also run on tags (#230 )

Merge tag 'v3.0.0-rc3' into develop
Release is for CI/CD changes only.
2025-12-17 17:47:03 +00:00 · 2021-08-01 13:19:19 -07:00 · 2021-08-01 13:02:26 -07:00 · 2021-08-01 13:01:35 -07:00 · 2021-08-01 13:00:28 -07:00 · 2021-08-01 12:29:26 -07:00
31 changed files with 2835 additions and 2271 deletions
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -0,0 +1,36 @@
+name: Build and Test
+on:
+  pull_request:
+jobs:
+  go-build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        go: [ '1.16', '1.15' ]
+    name: Go ${{ matrix.go }} build
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Setup Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: ${{ matrix.go }}
+      - name: Build and test
+        run: |
+          go build ./...
+          go test -race -coverprofile=profile.cov ./...
+      - name: Send coverage
+        uses: shogo82148/actions-goveralls@v1
+        with:
+          path-to-profile: profile.cov
+          flag-name: Go-${{ matrix.go }}
+          parallel: true
+  coverage:
+    needs: go-build
+    name: Test Coverage
+    runs-on: ubuntu-latest
+    steps:
+      - uses: shogo82148/actions-goveralls@v1
+        with:
+          parallel-finished: true
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -2,14 +2,46 @@ name: Docker Image
 on:
  push:
    branches: [ "master", "develop" ]
+    tags: [ "v*" ]
  pull_request:
 jobs:
  build:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v2
-      - uses: docker/build-push-action@v1
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v3
        with:
-          repository: inbucket/inbucket
-          push: false
-          tag_with_ref: true
+          images: |
+            inbucket/inbucket
+            ghcr.io/${{ github.repository }}
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=sha
+            type=edge,branch=develop
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Login to DockerHub
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Login to GitHub Container Registry
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -0,0 +1,44 @@
+name: Build and Release
+on:
+  push:
+    branches: [ "master", "develop" ]
+    tags: [ "v*" ]
+  pull_request:
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Setup Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.16
+      - name: Setup Node.js
+        uses: actions/setup-node@v1
+        with:
+          node-version: '14.x'
+      - name: Setup Elm
+        uses: jorelali/setup-elm@v2
+        with:
+          elm-version: 0.19.1
+      - name: Build frontend
+        run: |
+          npm ci
+          npm run build
+        working-directory: ./ui
+      - name: Test build release
+        uses: goreleaser/goreleaser-action@v2
+        if: "!startsWith(github.ref, 'refs/tags/v')"
+        with:
+          version: latest
+          args: release --snapshot
+      - name: Build and publish release
+        uses: goreleaser/goreleaser-action@v2
+        if: "startsWith(github.ref, 'refs/tags/v')"
+        with:
+          version: latest
+          args: release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -74,11 +74,15 @@ nfpms:
    maintainer: github@hillyerd.com
    description: All-in-one disposable webmail service.
    license: MIT
-    files:
-      "ui/dist/**/*": "/usr/local/share/inbucket/ui"
-    config_files:
-      "etc/linux/inbucket.service": "/lib/systemd/system/inbucket.service"
-      "ui/greeting.html": "/etc/inbucket/greeting.html"
+    contents:
+      - src: "ui/dist/**/*"
+        dst: "/usr/local/share/inbucket/ui"
+      - src: "etc/linux/inbucket.service"
+        dst: "/lib/systemd/system/inbucket.service"
+        type: config|noreplace
+      - src: "ui/greeting.html"
+        dst: "/etc/inbucket/greeting.html"
+        type: config|noreplace

 snapshot:
  name_template: SNAPSHOT-{{ .Commit }}
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,46 +0,0 @@
-dist: bionic
-
-env:
-  global:
-    - GO111MODULE=on
-
-language: go
-
-install:
-  - "go get golang.org/x/lint/golint"
-  - "make deps"
-
-jobs:
-  include:
-    - go: "1.14.x"
-    - go: "1.15.x"
-    - language: elm
-      elm: "latest-0.19.1"
-      elm_format: "latest-0.19.1"
-      elm_test: "latest-0.19.1"
-      node_js: "10.16.0"
-      install:
-        - "cd ui"
-        - "npm ci"
-      script:
-        - "elm-format --validate ."
-        - "npm run build"
-    - stage: deploy
-      go: "1.15.x"
-      before_install:
-        - "nvm install 10.19.0"
-      install:
-        - "cd ui"
-        - "npm ci"
-        - "npm run build"
-        - "cd .."
-      script: "curl -sL https://git.io/goreleaser | bash"
-      addons:
-        apt:
-          packages:
-            - rpm
-
-stages:
-  - test
-  - name: deploy
-    if: tag IS present
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,39 @@ Change Log
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).

-## [v3.0.0-beta3]
+## [Unreleased]
+
+
+## v3.0.0-rc3 - 2021-08-01
+
+Unchanaged from 3.0.0-rc2.  This release is to update our build automation and
+tags for Docker Hub and ghcr.io.
+
+
+## [v3.0.0-rc2] - 2021-07-31
+
+### Added
+- Support for SMTP AUTH (#197, thanks makarchuk)
+- Dark mode support (#218, thanks nerones)
+
+### Fixed
+- Prevent potential click jacking (#190, thanks stuartskelton)
+- Error on 8 character long SMTP commands (#221)
+- Allow empty username and password during AUTH (#225)
+
+
+## [v3.0.0-rc1] - 2020-09-24
+
+### Added
+- Refresh button to reload mailbox contents
+- Improved keyboard (tab) focus highlights
+
+### Changed
+- The UI now includes the Open Sans webfont instead of relying on browser/OS
+  fonts
+
+
+## [v3.0.0-beta3] - 2020-09-04

 ### Added
 - Docker `HEALTHCHECK`
@@ -20,7 +52,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Allow empty SMTP `MAIL FROM:<>`


-## [v3.0.0-beta2]
+## [v3.0.0-beta2] - 2019-08-17

 ### Added
 - Ability to name mailboxes after domain of email recipient, set via
@@ -36,7 +68,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Support for late EHLO, #141


-## [v3.0.0-beta1]
+## [v3.0.0-beta1] - 2019-03-14

 ### Added
 - `posix-millis` field to REST message and header responses for easier date
@@ -49,12 +81,12 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Update to enmime v0.5.0


-## v2.1.0
+## v2.1.0 - 2018-12-15

 No change from beta1.


-## [v2.1.0-beta1]
+## [v2.1.0-beta1] - 2018-10-31

 ### Added
 - Use Go 1.11 modules for reproducible builds.
@@ -227,22 +259,24 @@ No change from beta1.
 - Add Link button to messages, allows for directing another person to a
  specific message.

-[Unreleased]:  https://github.com/inbucket/inbucket/compare/master...develop
+[Unreleased]:   https://github.com/inbucket/inbucket/compare/master...develop
+[v3.0.0-rc2]:   https://github.com/inbucket/inbucket/compare/v3.0.0-rc1...v3.0.0-rc2
+[v3.0.0-rc1]:   https://github.com/inbucket/inbucket/compare/v3.0.0-beta3...v3.0.0-rc1
 [v3.0.0-beta3]: https://github.com/inbucket/inbucket/compare/v3.0.0-beta2...v3.0.0-beta3
 [v3.0.0-beta2]: https://github.com/inbucket/inbucket/compare/v3.0.0-beta1...v3.0.0-beta2
 [v3.0.0-beta1]: https://github.com/inbucket/inbucket/compare/v2.1.0...v3.0.0-beta1
 [v2.1.0-beta1]: https://github.com/inbucket/inbucket/compare/v2.0.0...v2.1.0-beta1
-[v2.0.0]:      https://github.com/inbucket/inbucket/compare/v2.0.0-rc1...v2.0.0
-[v2.0.0-rc1]:  https://github.com/inbucket/inbucket/compare/v1.3.1...v2.0.0-rc1
-[v1.3.1]:      https://github.com/inbucket/inbucket/compare/v1.3.0...v1.3.1
-[v1.3.0]:      https://github.com/inbucket/inbucket/compare/v1.2.0...v1.3.0
-[v1.2.0]:      https://github.com/inbucket/inbucket/compare/1.2.0-rc2...1.2.0
-[v1.2.0-rc2]:  https://github.com/inbucket/inbucket/compare/1.2.0-rc1...1.2.0-rc2
-[v1.2.0-rc1]:  https://github.com/inbucket/inbucket/compare/1.1.0...1.2.0-rc1
-[v1.1.0]:      https://github.com/inbucket/inbucket/compare/1.1.0-rc2...1.1.0
-[v1.1.0-rc2]:  https://github.com/inbucket/inbucket/compare/1.1.0-rc1...1.1.0-rc2
-[v1.1.0-rc1]:  https://github.com/inbucket/inbucket/compare/1.0...1.1.0-rc1
-[v1.0]:        https://github.com/inbucket/inbucket/compare/1.0-rc1...1.0
+[v2.0.0]:       https://github.com/inbucket/inbucket/compare/v2.0.0-rc1...v2.0.0
+[v2.0.0-rc1]:   https://github.com/inbucket/inbucket/compare/v1.3.1...v2.0.0-rc1
+[v1.3.1]:       https://github.com/inbucket/inbucket/compare/v1.3.0...v1.3.1
+[v1.3.0]:       https://github.com/inbucket/inbucket/compare/v1.2.0...v1.3.0
+[v1.2.0]:       https://github.com/inbucket/inbucket/compare/1.2.0-rc2...1.2.0
+[v1.2.0-rc2]:   https://github.com/inbucket/inbucket/compare/1.2.0-rc1...1.2.0-rc2
+[v1.2.0-rc1]:   https://github.com/inbucket/inbucket/compare/1.1.0...1.2.0-rc1
+[v1.1.0]:       https://github.com/inbucket/inbucket/compare/1.1.0-rc2...1.1.0
+[v1.1.0-rc2]:   https://github.com/inbucket/inbucket/compare/1.1.0-rc1...1.1.0-rc2
+[v1.1.0-rc1]:   https://github.com/inbucket/inbucket/compare/1.0...1.1.0-rc1
+[v1.0]:         https://github.com/inbucket/inbucket/compare/1.0-rc1...1.0


 ## Release Checklist
--- a/4
+++ b/4
@@ -1,7 +1,7 @@
 # Docker build file for Inbucket: https://www.inbucket.org/

 # Install build-time dependencies
-FROM golang:1.15-alpine3.12 as builder
+FROM golang:1.16-alpine3.13 as builder
 RUN apk add --no-cache --virtual .build-deps g++ git make npm python3
 WORKDIR /build
 COPY . .
@@ -24,7 +24,7 @@ WORKDIR /build/ui
 RUN npm run build

 # Run in minimal image
-FROM alpine:3.12
+FROM alpine:3.13
 RUN apk --no-cache add tzdata
 WORKDIR /opt/inbucket
 RUN mkdir bin defaults ui
--- a/README.md
+++ b/README.md
@@ -1,11 +1,12 @@
 Inbucket
 =============================================================================
 [![Build Status](https://travis-ci.org/inbucket/inbucket.png?branch=master)][Build Status]
+[![Docker Image](https://github.com/inbucket/inbucket/workflows/Docker%20Image/badge.svg)][Docker Image]

 Inbucket is an email testing service; it will accept messages for any email
-address and make them available via web, REST and POP3.  Once compiled,
-Inbucket does not have any external dependencies (HTTP, SMTP, POP3 and storage
-are all built in).
+address and make them available via web, REST and POP3 interfaces.  Once
+compiled, Inbucket does not have any external dependencies - HTTP, SMTP, POP3
+and storage are all built in.

 A Go client for the REST API is available in
 `github.com/inbucket/inbucket/pkg/rest/client` - [Go API docs]
@@ -14,6 +15,7 @@ Read more at the [Inbucket Website]

 ![Screenshot](http://www.inbucket.org/images/inbucket-ss1.png "Viewing a message")

+
 ## Development Status

 Inbucket is currently production quality: it is being used for real work.
@@ -29,15 +31,6 @@ tracks our `master` branch (releases), `latest` tracks our unstable
 `development` branch.


-## Homebrew Tap
-
-(currently broken, being tracked in [issue
-#68](https://github.com/inbucket/inbucket/issues/68))
-
-Inbucket has an OS X [Homebrew] tap available as [jhillyerd/inbucket][Homebrew Tap],
-see the `README.md` there for installation instructions.
-
-
 ## Building from Source

 You will need functioning [Go] and [Node.js] installations for this to work.
@@ -45,17 +38,20 @@ You will need functioning [Go] and [Node.js] installations for this to work.
 ```sh
 git clone https://github.com/inbucket/inbucket.git
 cd inbucket/ui
-npm i
+npm ci
 npm run build
 cd ..
 go build ./cmd/inbucket
 ```

-_Note:_ You may also use the included Makefile to build and test the Go binaries.
+For more information on building and development flows, check out the
+[Development Quickstart] page of our wiki.
+
+### Configure and Launch

 Inbucket reads its configuration from environment variables, but comes with
-built in sane defaults.  It should work on most Unix and OS X machines as is.
-Launch the daemon:
+reasonable defaults built-in.  It should work on most Unix and OS X machines as
+is.  Launch the daemon:

 ```sh
 ./inbucket
@@ -65,27 +61,29 @@ By default the SMTP server will be listening on localhost port 2500 and
 the web interface will be available at [localhost:9000](http://localhost:9000/).

 See doc/[config.md] for more information on configuring Inbucket, but you will
-likely find the [Configurator] tool easier to use.
+likely find the [Configurator] tool the easiest way to generate a configuration.


 ## About

-Inbucket is written in [Go]
+Inbucket is written in [Go] and [Elm].

 Inbucket is open source software released under the MIT License.  The latest
 version can be found at https://github.com/inbucket/inbucket

-[Build Status]:     https://travis-ci.org/inbucket/inbucket
-[Change Log]:       https://github.com/inbucket/inbucket/blob/master/CHANGELOG.md
-[config.md]:        https://github.com/inbucket/inbucket/blob/master/doc/config.md
-[Configurator]:     https://www.inbucket.org/configurator/
-[CONTRIBUTING.md]:  https://github.com/inbucket/inbucket/blob/develop/CONTRIBUTING.md
-[Docker Image]:     https://www.inbucket.org/binaries/docker.html
-[From Source]:      https://www.inbucket.org/installation/from-source.html
-[Go]:               https://golang.org/
-[Go API docs]:      https://godoc.org/github.com/inbucket/inbucket/pkg/rest/client
-[Homebrew]:         http://brew.sh/
-[Homebrew Tap]:     https://github.com/inbucket/homebrew-inbucket
-[Inbucket Website]: https://www.inbucket.org/
-[Issues List]:      https://github.com/inbucket/inbucket/issues?state=open
-[Node.js]:          https://nodejs.org/en/
+[Build Status]:           https://travis-ci.org/inbucket/inbucket
+[Change Log]:             https://github.com/inbucket/inbucket/blob/master/CHANGELOG.md
+[config.md]:              https://github.com/inbucket/inbucket/blob/master/doc/config.md
+[Configurator]:           https://www.inbucket.org/configurator/
+[CONTRIBUTING.md]:        https://github.com/inbucket/inbucket/blob/develop/CONTRIBUTING.md
+[Development Quickstart]: https://github.com/inbucket/inbucket/wiki/Development-Quickstart
+[Docker Image]:           https://www.inbucket.org/binaries/docker.html
+[Elm]:                    https://elm-lang.org/
+[From Source]:            https://www.inbucket.org/installation/from-source.html
+[Go]:                     https://golang.org/
+[Go API docs]:            https://pkg.go.dev/github.com/inbucket/inbucket/pkg/rest/client
+[Homebrew]:               http://brew.sh/
+[Homebrew Tap]:           https://github.com/inbucket/homebrew-inbucket
+[Inbucket Website]:       https://www.inbucket.org/
+[Issues List]:            https://github.com/inbucket/inbucket/issues?state=open
+[Node.js]:                https://nodejs.org/en/
--- a/go.mod
+++ b/go.mod
@@ -2,24 +2,19 @@ module github.com/inbucket/inbucket

 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/gogs/chardet v0.0.0-20191104214054-4b6791f73a28 // indirect
 	github.com/google/subcommands v1.2.0
 	github.com/gorilla/css v1.0.0
 	github.com/gorilla/mux v1.8.0
 	github.com/gorilla/websocket v1.4.2
-	github.com/jaytaylor/html2text v0.0.0-20200412013138-3577fbdbcff7 // indirect
-	github.com/jhillyerd/enmime v0.8.1
+	github.com/jhillyerd/enmime v0.9.1
 	github.com/jhillyerd/goldiff v0.1.0
 	github.com/kelseyhightower/envconfig v1.4.0
-	github.com/mattn/go-runewidth v0.0.9 // indirect
-	github.com/microcosm-cc/bluemonday v1.0.4
-	github.com/olekukonko/tablewriter v0.0.4 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
-	github.com/rs/zerolog v1.19.0
-	github.com/stretchr/testify v1.6.1
-	golang.org/x/net v0.0.0-20200822124328-c89045814202
-	golang.org/x/text v0.3.3 // indirect
-	gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
+	github.com/mattn/go-runewidth v0.0.13 // indirect
+	github.com/microcosm-cc/bluemonday v1.0.15
+	github.com/rs/zerolog v1.23.0
+	github.com/stretchr/testify v1.7.0
+	golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
 )

 go 1.13
--- a/go.sum
+++ b/go.sum
@@ -1,17 +1,15 @@
+github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
 github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
 github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
 github.com/cention-sany/utf7 v0.0.0-20170124080048-26cad61bd60a h1:MISbI8sU/PSK/ztvmWKFcI7UGb5/HQT7B+i3a2myKgI=
 github.com/cention-sany/utf7 v0.0.0-20170124080048-26cad61bd60a/go.mod h1:2GxOXOlEPAMFPfp014mK1SWq8G8BN8o7/dfYqJrVGn8=
-github.com/chris-ramon/douceur v0.2.0 h1:IDMEdxlEUUBYBKE4z/mJnFyVXox+MjuEVDJNN27glkU=
-github.com/chris-ramon/douceur v0.2.0/go.mod h1:wDW5xjJdeoMm1mRt4sD4c/LbF/mWdEpRXQKjTR8nIBE=
-github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
+github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/go-test/deep v1.0.2 h1:onZX1rnHT3Wv6cqNgYyFOOlgVKJrksuCMCRvJStbMYw=
-github.com/go-test/deep v1.0.2/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
-github.com/gogs/chardet v0.0.0-20150115103509-2404f7772561 h1:aBzukfDxQlCTVS0NBUjI5YA3iVeaZ9Tb5PxNrrIP1xs=
-github.com/gogs/chardet v0.0.0-20150115103509-2404f7772561/go.mod h1:Pcatq5tYkCW2Q6yrR2VRHlbHpZ/R4/7qyL1TCF7vl14=
+github.com/go-test/deep v1.0.7 h1:/VSMRlnY/JSyqxQUzQLKVMAskpY/NZKFA5j2P+0pP2M=
+github.com/go-test/deep v1.0.7/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8=
+github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gogs/chardet v0.0.0-20191104214054-4b6791f73a28 h1:gBeyun7mySAKWg7Fb0GOcv0upX9bdaZScs8QcRo8mEY=
 github.com/gogs/chardet v0.0.0-20191104214054-4b6791f73a28/go.mod h1:Pcatq5tYkCW2Q6yrR2VRHlbHpZ/R4/7qyL1TCF7vl14=
 github.com/google/subcommands v1.2.0 h1:vWQspBTo2nEqTUFita5/KeEWlUL8kQObDFbub/EN9oE=
@@ -22,68 +20,70 @@ github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/jaytaylor/html2text v0.0.0-20190408195923-01ec452cbe43 h1:jTkyeF7NZ5oIr0ESmcrpiDgAfoidCBF4F5kJhjtaRwE=
-github.com/jaytaylor/html2text v0.0.0-20190408195923-01ec452cbe43/go.mod h1:CVKlgaMiht+LXvHG173ujK6JUhZXKb2u/BQtjPDIvyk=
 github.com/jaytaylor/html2text v0.0.0-20200412013138-3577fbdbcff7 h1:g0fAGBisHaEQ0TRq1iBvemFRf+8AEWEmBESSiWB3Vsc=
 github.com/jaytaylor/html2text v0.0.0-20200412013138-3577fbdbcff7/go.mod h1:CVKlgaMiht+LXvHG173ujK6JUhZXKb2u/BQtjPDIvyk=
-github.com/jhillyerd/enmime v0.8.1 h1:Kz4xj3sJJ4Ju8e+w/7v9H4Matv5ijPgv7UkhPf+C15I=
-github.com/jhillyerd/enmime v0.8.1/go.mod h1:MBHs3ugk03NGjMM6PuRynlKf+HA5eSillZ+TRCm73AE=
+github.com/jhillyerd/enmime v0.9.1 h1:HcC2WZA6dMCobs8WeyF/6FRSvdRCrr8O+UiLBae4eNE=
+github.com/jhillyerd/enmime v0.9.1/go.mod h1:S5ge4lnv/dDDBbAWwtoOFlj14NHiXdw/EqMB2lJz3b8=
 github.com/jhillyerd/goldiff v0.1.0 h1:7JzKPKVwAg1GzrbnsToYzq3Y5+S7dXM4hgEYiOzaf4A=
 github.com/jhillyerd/goldiff v0.1.0/go.mod h1:WeDal6DTqhbMhNkf5REzWCIvKl3JWs0Q9omZ/huIWAs=
 github.com/kelseyhightower/envconfig v1.4.0 h1:Im6hONhd3pLkfDFsbRgu68RDNkGF1r3dvMUtDTo2cv8=
 github.com/kelseyhightower/envconfig v1.4.0/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg=
-github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y=
-github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
-github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
-github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
 github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
-github.com/microcosm-cc/bluemonday v1.0.4 h1:p0L+CTpo/PLFdkoPcJemLXG+fpMD7pYOoDEq1axMbGg=
-github.com/microcosm-cc/bluemonday v1.0.4/go.mod h1:8iwZnFn2CDDNZ0r6UXhF4xawGvzaqzCRa1n3/lO3W2w=
-github.com/olekukonko/tablewriter v0.0.1 h1:b3iUnf1v+ppJiOfNX4yxxqfWKMQPZR5yoh8urCTFX88=
-github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
-github.com/olekukonko/tablewriter v0.0.4 h1:vHD/YYe1Wolo78koG299f7V/VAS08c6IpCLn+Ejf/w8=
-github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA=
-github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
+github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU=
+github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/microcosm-cc/bluemonday v1.0.15 h1:J4uN+qPng9rvkBZBoBb8YGR+ijuklIMpSOZZLjYpbeY=
+github.com/microcosm-cc/bluemonday v1.0.15/go.mod h1:ZLvAzeakRwrGnzQEvstVzVt3ZpqOF2+sdFr0Om+ce30=
+github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
+github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
+github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
+github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
-github.com/rs/zerolog v1.19.0 h1:hYz4ZVdUgjXTBUmrkrw55j1nHx68LfOKIQk5IYtyScg=
-github.com/rs/zerolog v1.19.0/go.mod h1:IzD0RJ65iWH0w97OQQebJEvTZYvsCUm9WVLWBQrJRjo=
-github.com/saintfish/chardet v0.0.0-20120816061221-3af4cd4741ca h1:NugYot0LIVPxTvN8n+Kvkn6TrbMyxQiuvKdEwFdR9vI=
-github.com/saintfish/chardet v0.0.0-20120816061221-3af4cd4741ca/go.mod h1:uugorj2VCxiV1x+LzaIdVa9b4S4qGAcH6cbhh4qVxOU=
+github.com/rs/zerolog v1.23.0 h1:UskrK+saS9P9Y789yNNulYKdARjPZuS35B8gJF2x60g=
+github.com/rs/zerolog v1.23.0/go.mod h1:6c7hFfxPOy7TacJc4Fcdi24/J0NKYGzjG8FWRI916Qo=
 github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf h1:pvbZ0lM0XWPBqUKqFU8cmavspvIl9nulOYwdy6IFRRo=
 github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf/go.mod h1:RJID2RhlZKId02nZ62WenDCkgHFerpIOmW0iT7GKmXM=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 h1:Ao/3l156eZf2AW5wK8a7/smtodRU+gha3+BeqJ69lRk=
-golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200822124328-c89045814202 h1:VvcQYSHwXgi7W+TpUR6A9g6Up98WAHf3f/ulnJ62IyA=
-golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20210501142056-aec3718b3fa0/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
+golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985 h1:4CSI6oo7cOjJKajidEljs9h+uP0rRZBPPPhcCbj5mw8=
+golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190828213141-aed303cbaa74/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=
-gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
--- a/pkg/server/smtp/handler.go
+++ b/pkg/server/smtp/handler.go
@@ -25,10 +25,27 @@ const (
 	// timeStampFormat to use in Received header.
 	timeStampFormat = "Mon, 02 Jan 2006 15:04:05 -0700 (MST)"

+	// Messages sent to user during LOGIN auth procedure. Can vary, but values are taken directly
+	// from spec https://tools.ietf.org/html/draft-murchison-sasl-login-00
+
+	// usernameChallenge sent when inviting user to provide username. Is base64 encoded string
+	// `User Name`
+	usernameChallenge = "VXNlciBOYW1lAA=="
+
+	// passwordChallenge sent when inviting user to provide password. Is base64 encoded string
+	// `Password`
+	passwordChallenge = "UGFzc3dvcmQA"
+)
+
+const (
 	// GREET State: Waiting for HELO
 	GREET State = iota
 	// READY State: Got HELO, waiting for MAIL
 	READY
+	// LOGIN State: Got AUTH LOGIN command, expecting Username
+	LOGIN
+	// PASSWORD State: Got Username, expecting password
+	PASSWORD
 	// MAIL State: Got MAIL, accepting RCPTs
 	MAIL
 	// DATA State: Got DATA, waiting for "."
@@ -76,6 +93,7 @@ var commands = map[string]bool{
 	"QUIT":     true,
 	"TURN":     true,
 	"STARTTLS": true,
+	"AUTH":     true,
 }

 // Session holds the state of an SMTP session
@@ -153,6 +171,16 @@ func (s *Server) startSession(id int, conn net.Conn) {
 		}
 		line, err := ssn.readLine()
 		if err == nil {
+			//Handle LOGIN/PASSWORD states here, because they don't expect a command
+			switch ssn.state {
+			case LOGIN:
+				ssn.loginHandler(line)
+				continue
+			case PASSWORD:
+				ssn.passwordHandler(line)
+				continue
+			}
+
 			if cmd, arg, ok := ssn.parseCmd(line); ok {
 				// Check against valid SMTP commands
 				if cmd == "" {
@@ -219,7 +247,7 @@ func (s *Server) startSession(id int, conn net.Conn) {
 				}
 				break
 			}
-			// not an EOF
+			// Not an EOF
 			ssn.logger.Warn().Msgf("Connection error: %v", err)
 			if netErr, ok := err.(net.Error); ok {
 				if netErr.Timeout() {
@@ -257,9 +285,10 @@ func (s *Session) greetHandler(cmd string, arg string) {
 			return
 		}
 		s.remoteDomain = domain
-		// features before SIZE per RFC
+		// Features before SIZE per RFC
 		s.send("250-" + readyBanner)
 		s.send("250-8BITMIME")
+		s.send("250-AUTH PLAIN LOGIN")
 		if s.Server.config.TLSEnabled && s.Server.tlsConfig != nil && s.tlsState == nil {
 			s.send("250-STARTTLS")
 		}
@@ -281,30 +310,71 @@ func parseHelloArgument(arg string) (string, error) {
 	return domain, nil
 }

+func (s *Session) loginHandler(line string) {
+	// Content and length of username is ignored.
+	s.send(fmt.Sprintf("334 %v", passwordChallenge))
+	s.enterState(PASSWORD)
+}
+
+func (s *Session) passwordHandler(line string) {
+	// Content and length of password is ignored.
+	s.send("235 Authentication successful")
+	s.enterState(READY)
+}
+
 // READY state -> waiting for MAIL
+// AUTH can change
 func (s *Session) readyHandler(cmd string, arg string) {
 	if cmd == "STARTTLS" {
 		if !s.Server.config.TLSEnabled {
-			// invalid command since unconfigured
+			// Invalid command since TLS unconfigured.
 			s.logger.Debug().Msgf("454 TLS unavailable on the server")
 			s.send("454 TLS unavailable on the server")
 			return
 		}
 		if s.tlsState != nil {
-			// tls state previously valid
+			// TLS state previously valid.
 			s.logger.Debug().Msg("454 A TLS session already agreed upon.")
 			s.send("454 A TLS session already agreed upon.")
 			return
 		}
 		s.logger.Debug().Msg("Initiating TLS context.")
+
+		// Start TLS connection handshake.
 		s.send("220 STARTTLS")
-		// start tls connection handshake
 		tlsConn := tls.Server(s.conn, s.Server.tlsConfig)
 		s.conn = tlsConn
 		s.text = textproto.NewConn(s.conn)
 		s.tlsState = new(tls.ConnectionState)
 		*s.tlsState = tlsConn.ConnectionState()
 		s.enterState(GREET)
+	} else if cmd == "AUTH" {
+		args := strings.SplitN(arg, " ", 3)
+		authMethod := args[0]
+		switch authMethod {
+		case "PLAIN":
+			{
+				if len(args) != 2 {
+					s.send("500 Bad auth arguments")
+					s.logger.Warn().Msgf("Bad auth attempt: %q", arg)
+					return
+				}
+				s.logger.Info().Msgf("Accepting credentials: %q", args[1])
+				s.send("235 2.7.0 Authentication successful")
+				return
+			}
+		case "LOGIN":
+			{
+				s.send(fmt.Sprintf("334 %v", usernameChallenge))
+				s.enterState(LOGIN)
+				return
+			}
+		default:
+			{
+				s.send(fmt.Sprintf("500 Unsupported AUTH method: %v", authMethod))
+				return
+			}
+		}
 	} else if cmd == "MAIL" {
 		// Capture group 1: from address.  2: optional params.
 		m := fromRegex.FindStringSubmatch(arg)
@@ -518,30 +588,28 @@ func (s *Session) readLine() (line string, err error) {

 func (s *Session) parseCmd(line string) (cmd string, arg string, ok bool) {
 	line = strings.TrimRight(line, "\r\n")
-	l := len(line)
+
+	// Find length of command or entire line.
+	hasArg := true
+	l := strings.IndexByte(line, ' ')
+	if l == -1 {
+		hasArg = false
+		l = len(line)
+	}
+
 	switch {
 	case l == 0:
 		return "", "", true
 	case l < 4:
 		s.logger.Warn().Msgf("Command too short: %q", line)
 		return "", "", false
-	case l == 4 || l == 8:
-		return strings.ToUpper(line), "", true
-	case l == 5:
-		// Too long to be only command, too short to have args
-		s.logger.Warn().Msgf("Mangled command: %q", line)
-		return "", "", false
 	}

-	// If we made it here, command is long enough to have args
-	if line[4] != ' ' {
-		// There wasn't a space after the command?
-		s.logger.Warn().Msgf("Mangled command: %q", line)
-		return "", "", false
+	if hasArg {
+		return strings.ToUpper(line[0:l]), strings.Trim(line[l+1:], " "), true
 	}

-	// I'm not sure if we should trim the args or not, but we will for now
-	return strings.ToUpper(line[0:4]), strings.Trim(line[5:], " "), true
+	return strings.ToUpper(line), "", true
 }

 // parseArgs takes the arguments proceeding a command and files them
--- a/pkg/server/smtp/handler_test.go
+++ b/pkg/server/smtp/handler_test.go
@@ -56,6 +56,9 @@ func TestGreetState(t *testing.T) {
 	if err := playSession(t, server, []scriptStep{{"helo 127.0.0.1", 250}}); err != nil {
 		t.Error(err)
 	}
+	if err := playSession(t, server, []scriptStep{{"HELO ABC", 250}}); err != nil {
+		t.Error(err)
+	}

 	// Valid EHLOs
 	if err := playSession(t, server, []scriptStep{{"EHLO mydomain", 250}}); err != nil {
@@ -70,6 +73,9 @@ func TestGreetState(t *testing.T) {
 	if err := playSession(t, server, []scriptStep{{"ehlo 127.0.0.1", 250}}); err != nil {
 		t.Error(err)
 	}
+	if err := playSession(t, server, []scriptStep{{"EHLO a", 250}}); err != nil {
+		t.Error(err)
+	}

 	if t.Failed() {
 		// Wait for handler to finish logging
@@ -108,6 +114,50 @@ func TestEmptyEnvelope(t *testing.T) {
 	}
 }

+// Test AUTH
+func TestAuth(t *testing.T) {
+	ds := test.NewStore()
+	server, logbuf, teardown := setupSMTPServer(ds)
+	defer teardown()
+
+	// PLAIN AUTH
+	script := []scriptStep{
+		{"EHLO localhost", 250},
+		{"AUTH PLAIN aW5idWNrZXQ6cGFzc3dvcmQK", 235},
+		{"RSET", 250},
+		{"AUTH GSSAPI aW5idWNrZXQ6cGFzc3dvcmQK", 500},
+		{"RSET", 250},
+		{"AUTH PLAIN", 500},
+		{"RSET", 250},
+		{"AUTH PLAIN aW5idWNrZXQ6cG Fzc3dvcmQK", 500},
+	}
+	if err := playSession(t, server, script); err != nil {
+		t.Error(err)
+	}
+
+	// LOGIN AUTH
+	script = []scriptStep{
+		{"EHLO localhost", 250},
+		{"AUTH LOGIN", 334}, // Test with user/pass present.
+		{"username", 334},
+		{"password", 235},
+		{"RSET", 250},
+		{"AUTH LOGIN", 334}, // Test with empty user/pass.
+		{"", 334},
+		{"", 235},
+	}
+	if err := playSession(t, server, script); err != nil {
+		t.Error(err)
+	}
+
+	if t.Failed() {
+		// Wait for handler to finish logging
+		time.Sleep(2 * time.Second)
+		// Dump buffered log data if there was a failure
+		_, _ = io.Copy(os.Stderr, logbuf)
+	}
+}
+
 // Test commands in READY state
 func TestReadyState(t *testing.T) {
 	ds := test.NewStore()
@@ -159,6 +209,15 @@ func TestReadyState(t *testing.T) {
 		t.Error(err)
 	}

+	// Test Start TLS parsing.
+	script = []scriptStep{
+		{"HELO localhost", 250},
+		{"STARTTLS", 454}, // TLS unconfigured.
+	}
+	if err := playSession(t, server, script); err != nil {
+		t.Error(err)
+	}
+
 	if t.Failed() {
 		// Wait for handler to finish logging
 		time.Sleep(2 * time.Second)
--- a/pkg/server/web/handlers.go
+++ b/pkg/server/web/handlers.go
@@ -94,6 +94,8 @@ func spaTemplateHandler(tmpl *template.Template, basePath string,
 		BasePath: basePath,
 	}
 	return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+		// ensure we do now allow click jacking
+		w.Header().Set("X-Frame-Options", "SameOrigin")
 		err := tmpl.Execute(w, tmplData)
 		if err != nil {
 			log.Error().Str("module", "web").Str("remote", req.RemoteAddr).Str("proto", req.Proto).
--- a/pkg/storage/mem/store_test.go
+++ b/pkg/storage/mem/store_test.go
@@ -65,7 +65,7 @@ func TestMaxSize(t *testing.T) {
 		go func(mailbox string) {
 			err := s.PurgeMessages(mailbox)
 			if err != nil {
-				t.Fatal(err)
+				panic(err) // Cannot call t.Fatal from non-test goroutine.
 			}
 			wg.Done()
 		}(mailbox)
--- a/shell.nix
+++ b/shell.nix
@@ -7,11 +7,12 @@ stdenv.mkDerivation rec {
    elmPackages.elm
    elmPackages.elm-analyse
    elmPackages.elm-format
+    elmPackages.elm-json
    elmPackages.elm-language-server
    elmPackages.elm-test
    go
    golint
-    nodejs-10_x
+    nodejs-14_x
    rpm
    swaks
  ];
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
--- a/ui/package.json
+++ b/ui/package.json
@@ -4,27 +4,30 @@
  "license": "MIT",
  "private": true,
  "scripts": {
+    "clean": "rm -rf dist elm-stuff",
    "build": "webpack --mode production",
    "watch": "webpack --mode development --watch",
-    "dev": "webpack-dev-server --mode development --host 0.0.0.0 --port 3000 --hot",
+    "dev": "webpack-dev-server --mode development --port 3000 --hot --watch",
    "errors": "webpack --mode development --display-error-details"
  },
-  "dependencies": {},
+  "dependencies": {
+    "opensans-npm-webfont": "^1.0.0"
+  },
  "devDependencies": {
-    "@babel/core": "^7.11.4",
-    "@babel/preset-env": "^7.11.0",
-    "@fortawesome/fontawesome-free": "^5.14.0",
-    "@webcomponents/webcomponentsjs": "^2.4.4",
-    "babel-loader": "^8.1.0",
-    "css-loader": "^4.2.2",
-    "elm-hot-webpack-loader": "^1.1.7",
+    "@babel/core": "^7.14.8",
+    "@babel/preset-env": "^7.14.8",
+    "@fortawesome/fontawesome-free": "^5.15.3",
+    "@webcomponents/webcomponentsjs": "^2.5.0",
+    "babel-loader": "^8.2.2",
+    "css-loader": "^4.3.0",
+    "elm-hot-webpack-loader": "^1.1.8",
    "elm-webpack-loader": "^7.0.1",
-    "file-loader": "^6.0.0",
-    "html-webpack-plugin": "^4.4.1",
-    "node-elm-compiler": "^5.0.5",
-    "style-loader": "^1.2.1",
-    "webpack": "^4.44.1",
+    "file-loader": "^6.2.0",
+    "html-webpack-plugin": "^4.5.2",
+    "node-elm-compiler": "^5.0.6",
+    "style-loader": "^1.3.0",
+    "webpack": "^4.46.0",
    "webpack-cli": "^3.3.12",
-    "webpack-dev-server": "^3.11.0"
+    "webpack-dev-server": "^3.11.2"
  }
 }
--- a/ui/src/Api.elm
+++ b/ui/src/Api.elm
@@ -1,5 +1,7 @@
 module Api exposing
-    ( deleteMessage
+    ( DataResult
+    , HttpResult
+    , deleteMessage
    , getGreeting
    , getHeaderList
    , getMessage
--- a/ui/src/Effect.elm
+++ b/ui/src/Effect.elm
@@ -0,0 +1,370 @@
+module Effect exposing
+    ( Effect
+    , addRecent
+    , append
+    , batch
+    , clearFlash
+    , deleteMessage
+    , disableRouting
+    , enableRouting
+    , focusModal
+    , focusModalResult
+    , getGreeting
+    , getHeaderList
+    , getMessage
+    , getServerConfig
+    , getServerMetrics
+    , map
+    , markMessageSeen
+    , navigateRoute
+    , none
+    , perform
+    , posixTime
+    , purgeMailbox
+    , schedule
+    , showFlash
+    , updateRoute
+    )
+
+import Api exposing (DataResult, HttpResult)
+import Browser.Navigation as Nav
+import Data.Message exposing (Message)
+import Data.MessageHeader exposing (MessageHeader)
+import Data.Metrics exposing (Metrics)
+import Data.ServerConfig exposing (ServerConfig)
+import Data.Session as Session exposing (Session)
+import Modal
+import Route exposing (Route)
+import Task
+import Time
+import Timer exposing (Timer)
+
+
+type Effect msg
+    = None
+    | ApiEffect (ApiEffect msg)
+    | Batch (List (Effect msg))
+    | ModalFocus (Modal.Msg -> msg)
+    | PosixTime (Time.Posix -> msg)
+    | RouteNavigate Bool Route
+    | RouteUpdate Route
+    | ScheduleTimer (Timer -> msg) Timer Float
+    | SessionEffect SessionEffect
+
+
+type ApiEffect msg
+    = DeleteMessage (HttpResult msg) String String
+    | GetGreeting (DataResult msg String)
+    | GetServerConfig (DataResult msg ServerConfig)
+    | GetServerMetrics (DataResult msg Metrics)
+    | GetHeaderList (DataResult msg (List MessageHeader)) String
+    | GetMessage (DataResult msg Message) String String
+    | MarkMessageSeen (HttpResult msg) String String
+    | PurgeMailbox (HttpResult msg) String
+
+
+type SessionEffect
+    = FlashClear
+    | FlashShow Session.Flash
+    | ModalFocusResult Modal.Msg
+    | RecentAdd String
+    | RoutingDisable
+    | RoutingEnable
+
+
+{-| Appends a new effect to a model/effect tuple.
+-}
+append : Effect msg -> ( a, Effect msg ) -> ( a, Effect msg )
+append e ( model, effect ) =
+    ( model, batch [ effect, e ] )
+
+
+{-| Packs a List of Effects into a single Effect
+-}
+batch : List (Effect msg) -> Effect msg
+batch effects =
+    Batch effects
+
+
+{-| Transform message types produced by an effect.
+-}
+map : (a -> b) -> Effect a -> Effect b
+map f effect =
+    case effect of
+        None ->
+            None
+
+        Batch effects ->
+            Batch <| List.map (map f) effects
+
+        ModalFocus toMsg ->
+            ModalFocus <| toMsg >> f
+
+        PosixTime toMsg ->
+            PosixTime <| toMsg >> f
+
+        ScheduleTimer toMsg timer millis ->
+            ScheduleTimer (toMsg >> f) timer millis
+
+        RouteNavigate pushHistory route ->
+            RouteNavigate pushHistory route
+
+        RouteUpdate route ->
+            RouteUpdate route
+
+        ApiEffect apiEffect ->
+            ApiEffect <| mapApi f apiEffect
+
+        SessionEffect sessionEffect ->
+            SessionEffect sessionEffect
+
+
+mapApi : (a -> b) -> ApiEffect a -> ApiEffect b
+mapApi f effect =
+    case effect of
+        DeleteMessage result mailbox id ->
+            DeleteMessage (result >> f) mailbox id
+
+        GetGreeting result ->
+            GetGreeting (result >> f)
+
+        GetServerConfig result ->
+            GetServerConfig (result >> f)
+
+        GetServerMetrics result ->
+            GetServerMetrics (result >> f)
+
+        GetHeaderList result mailbox ->
+            GetHeaderList (result >> f) mailbox
+
+        GetMessage result mailbox id ->
+            GetMessage (result >> f) mailbox id
+
+        MarkMessageSeen result mailbox id ->
+            MarkMessageSeen (result >> f) mailbox id
+
+        PurgeMailbox result mailbox ->
+            PurgeMailbox (result >> f) mailbox
+
+
+{-| Applies an effect by updating the session and/or producing a Cmd.
+-}
+perform : ( Session, Effect msg ) -> ( Session, Cmd msg )
+perform ( session, effect ) =
+    case effect of
+        None ->
+            ( session, Cmd.none )
+
+        Batch effects ->
+            List.foldl batchPerform ( session, [] ) effects
+                |> Tuple.mapSecond Cmd.batch
+
+        ModalFocus toMsg ->
+            ( session, Modal.resetFocusCmd toMsg )
+
+        PosixTime toMsg ->
+            ( session, Task.perform toMsg Time.now )
+
+        ScheduleTimer toMsg timer millis ->
+            ( session, Timer.schedule toMsg timer millis )
+
+        RouteNavigate pushHistory route ->
+            let
+                url =
+                    session.router.toPath route
+            in
+            ( Session.enableRouting session
+            , if pushHistory then
+                Nav.pushUrl session.key url
+
+              else
+                Nav.replaceUrl session.key url
+            )
+
+        RouteUpdate route ->
+            ( Session.disableRouting session
+            , session.router.toPath route
+                |> Nav.replaceUrl session.key
+            )
+
+        ApiEffect apiEffect ->
+            performApi ( session, apiEffect )
+
+        SessionEffect sessionEffect ->
+            performSession ( session, sessionEffect )
+
+
+performApi : ( Session, ApiEffect msg ) -> ( Session, Cmd msg )
+performApi ( session, effect ) =
+    case effect of
+        DeleteMessage toMsg mailbox id ->
+            ( session, Api.deleteMessage session toMsg mailbox id )
+
+        GetGreeting toMsg ->
+            ( session, Api.getGreeting session toMsg )
+
+        GetServerConfig toMsg ->
+            ( session, Api.getServerConfig session toMsg )
+
+        GetServerMetrics toMsg ->
+            ( session, Api.getServerMetrics session toMsg )
+
+        GetHeaderList toMsg mailbox ->
+            ( session, Api.getHeaderList session toMsg mailbox )
+
+        GetMessage toMsg mailbox id ->
+            ( session, Api.getMessage session toMsg mailbox id )
+
+        MarkMessageSeen toMsg mailbox id ->
+            ( session, Api.markMessageSeen session toMsg mailbox id )
+
+        PurgeMailbox toMsg mailbox ->
+            ( session, Api.purgeMailbox session toMsg mailbox )
+
+
+performSession : ( Session, SessionEffect ) -> ( Session, Cmd msg )
+performSession ( session, effect ) =
+    case effect of
+        RecentAdd mailbox ->
+            ( Session.addRecent mailbox session, Cmd.none )
+
+        FlashClear ->
+            ( Session.clearFlash session, Cmd.none )
+
+        FlashShow flash ->
+            ( Session.showFlash flash session, Cmd.none )
+
+        ModalFocusResult result ->
+            ( Modal.updateSession result session, Cmd.none )
+
+        RoutingDisable ->
+            ( Session.disableRouting session, Cmd.none )
+
+        RoutingEnable ->
+            ( Session.enableRouting session, Cmd.none )
+
+
+
+-- EFFECT CONSTRUCTORS
+
+
+none : Effect msg
+none =
+    None
+
+
+{-| Adds specified mailbox to the recently viewed list
+-}
+addRecent : String -> Effect msg
+addRecent mailbox =
+    SessionEffect (RecentAdd mailbox)
+
+
+disableRouting : Effect msg
+disableRouting =
+    SessionEffect RoutingDisable
+
+
+enableRouting : Effect msg
+enableRouting =
+    SessionEffect RoutingEnable
+
+
+clearFlash : Effect msg
+clearFlash =
+    SessionEffect FlashClear
+
+
+showFlash : Session.Flash -> Effect msg
+showFlash flash =
+    SessionEffect (FlashShow flash)
+
+
+{-| Locks focus to the `modal-dialog` dom ID.
+-}
+focusModal : (Modal.Msg -> msg) -> Effect msg
+focusModal toMsg =
+    ModalFocus toMsg
+
+
+focusModalResult : Modal.Msg -> Effect msg
+focusModalResult msg =
+    SessionEffect (ModalFocusResult msg)
+
+
+deleteMessage : HttpResult msg -> String -> String -> Effect msg
+deleteMessage toMsg mailboxName id =
+    ApiEffect (DeleteMessage toMsg mailboxName id)
+
+
+getGreeting : DataResult msg String -> Effect msg
+getGreeting toMsg =
+    ApiEffect (GetGreeting toMsg)
+
+
+getHeaderList : DataResult msg (List MessageHeader) -> String -> Effect msg
+getHeaderList toMsg mailboxName =
+    ApiEffect (GetHeaderList toMsg mailboxName)
+
+
+getServerConfig : DataResult msg ServerConfig -> Effect msg
+getServerConfig toMsg =
+    ApiEffect (GetServerConfig toMsg)
+
+
+getServerMetrics : DataResult msg Metrics -> Effect msg
+getServerMetrics toMsg =
+    ApiEffect (GetServerMetrics toMsg)
+
+
+getMessage : DataResult msg Message -> String -> String -> Effect msg
+getMessage toMsg mailboxName id =
+    ApiEffect (GetMessage toMsg mailboxName id)
+
+
+markMessageSeen : HttpResult msg -> String -> String -> Effect msg
+markMessageSeen toMsg mailboxName id =
+    ApiEffect (MarkMessageSeen toMsg mailboxName id)
+
+
+posixTime : (Time.Posix -> msg) -> Effect msg
+posixTime toMsg =
+    PosixTime toMsg
+
+
+purgeMailbox : HttpResult msg -> String -> Effect msg
+purgeMailbox toMsg mailboxName =
+    ApiEffect (PurgeMailbox toMsg mailboxName)
+
+
+{-| Schedules a Timer to fire after the specified delay.
+-}
+schedule : (Timer -> msg) -> Timer -> Float -> Effect msg
+schedule toMsg timer millis =
+    ScheduleTimer toMsg timer millis
+
+
+{-| Updates the browsers displayed URL to the specified route, and triggers the route to be
+handled by the frontend.
+-}
+navigateRoute : Bool -> Route -> Effect msg
+navigateRoute pushHistory route =
+    RouteNavigate pushHistory route
+
+
+{-| Updates the browsers displayed URL to the specified route. Does not trigger our own route
+handling.
+-}
+updateRoute : Route -> Effect msg
+updateRoute route =
+    RouteUpdate route
+
+
+
+-- UTILITY
+
+
+batchPerform : Effect msg -> ( Session, List (Cmd msg) ) -> ( Session, List (Cmd msg) )
+batchPerform effect ( session, cmds ) =
+    perform ( session, effect )
+        |> Tuple.mapSecond (\cmd -> cmd :: cmds)
--- a/ui/src/Layout.elm
+++ b/ui/src/Layout.elm
@@ -1,7 +1,7 @@
 module Layout exposing (Model, Msg, Page(..), frame, init, reset, update)

-import Browser.Navigation as Nav
 import Data.Session as Session exposing (Session)
+import Effect exposing (Effect)
 import Html
    exposing
        ( Attribute
@@ -39,7 +39,7 @@ import Html.Attributes
        )
 import Html.Events as Events
 import Modal
-import Route exposing (Route)
+import Route
 import Timer exposing (Timer)


@@ -96,46 +96,31 @@ type Msg
    | RecentMenuToggled


-update : Msg -> Model msg -> Session -> ( Model msg, Session, Cmd msg )
-update msg model session =
+update : Msg -> Model msg -> ( Model msg, Effect msg )
+update msg model =
    case msg of
        ClearFlash ->
-            ( model
-            , Session.clearFlash session
-            , Cmd.none
-            )
+            ( model, Effect.clearFlash )

        MainMenuToggled ->
-            ( { model | mainMenuVisible = not model.mainMenuVisible }
-            , session
-            , Cmd.none
-            )
+            ( { model | mainMenuVisible = not model.mainMenuVisible }, Effect.none )

        ModalFocused message ->
-            ( model
-            , Modal.updateSession message session
-            , Cmd.none
-            )
+            ( model, Effect.focusModalResult message )

        ModalUnfocused ->
-            ( model, session, Modal.resetFocusCmd (ModalFocused >> model.mapMsg) )
+            ( model, Effect.focusModal (ModalFocused >> model.mapMsg) )

        OnMailboxNameInput name ->
-            ( { model | mailboxName = name }
-            , session
-            , Cmd.none
-            )
+            ( { model | mailboxName = name }, Effect.none )

        OpenMailbox ->
            if model.mailboxName == "" then
-                ( model, session, Cmd.none )
+                ( model, Effect.none )

            else
                ( model
-                , session
-                , Route.Mailbox model.mailboxName
-                    |> session.router.toPath
-                    |> Nav.pushUrl session.key
+                , Effect.navigateRoute True (Route.Mailbox model.mailboxName)
                )

        RecentMenuMouseOver ->
@@ -143,20 +128,19 @@ update msg model session =
                | recentMenuVisible = True
                , recentMenuTimer = Timer.cancel model.recentMenuTimer
              }
-            , session
-            , Cmd.none
+            , Effect.none
            )

        RecentMenuMouseOut ->
            let
+                -- Keep the recent menu open for a moment even if the mouse leaves it.
                newTimer =
                    Timer.replace model.recentMenuTimer
            in
            ( { model
                | recentMenuTimer = newTimer
              }
-            , session
-            , Timer.schedule (RecentMenuTimeout >> model.mapMsg) newTimer 400
+            , Effect.schedule (RecentMenuTimeout >> model.mapMsg) newTimer 400
            )

        RecentMenuTimeout timer ->
@@ -165,18 +149,16 @@ update msg model session =
                    | recentMenuVisible = False
                    , recentMenuTimer = Timer.cancel timer
                  }
-                , session
-                , Cmd.none
+                , Effect.none
                )

            else
                -- Timer was no longer valid.
-                ( model, session, Cmd.none )
+                ( model, Effect.none )

        RecentMenuToggled ->
            ( { model | recentMenuVisible = not model.recentMenuVisible }
-            , session
-            , Cmd.none
+            , Effect.none
            )


--- a/ui/src/Main.elm
+++ b/ui/src/Main.elm
@@ -4,6 +4,7 @@ import Browser exposing (Document, UrlRequest)
 import Browser.Navigation as Nav
 import Data.AppConfig as AppConfig exposing (AppConfig)
 import Data.Session as Session exposing (Session)
+import Effect exposing (Effect)
 import Html exposing (Html)
 import Json.Decode as D exposing (Value)
 import Layout
@@ -58,6 +59,8 @@ init configValue location key =
                    Session.initError key location (D.errorToString error)

        ( subModel, _ ) =
+            -- Home.init effect is discarded because this subModel will be immediately replaced
+            -- when we change routes to the specified location.
            Home.init session

        initModel =
@@ -67,11 +70,9 @@ init configValue location key =

        route =
            session.router.fromUrl location
-
-        ( model, cmd ) =
-            changeRouteTo route initModel
    in
-    ( model, Cmd.batch [ cmd, Task.perform TimeZoneLoaded Time.here ] )
+    changeRouteTo route initModel
+        |> Tuple.mapSecond (\cmd -> Cmd.batch [ cmd, Task.perform TimeZoneLoaded Time.here ])


 type Msg
@@ -198,20 +199,18 @@ updateMain msg model session =

        LayoutMsg subMsg ->
            let
-                ( layout, newSession, cmd ) =
-                    Layout.update subMsg model.layout session
+                ( layout, effect ) =
+                    Layout.update subMsg model.layout
            in
-            ( updateSession { model | layout = layout } newSession
-            , cmd
-            )
+            ( { model | layout = layout }, effect ) |> performEffects

        _ ->
-            updatePage msg model
+            updatePage msg model |> performEffects


 {-| Delegate incoming messages to their respective sub-pages.
 -}
-updatePage : Msg -> Model -> ( Model, Cmd Msg )
+updatePage : Msg -> Model -> ( Model, Effect Msg )
 updatePage msg model =
    case ( msg, model.page ) of
        ( HomeMsg subMsg, Home subModel ) ->
@@ -232,61 +231,70 @@ updatePage msg model =

        ( _, _ ) ->
            -- Disregard messages destined for the wrong page.
-            ( model, Cmd.none )
+            ( model, Effect.none )


 changeRouteTo : Route -> Model -> ( Model, Cmd Msg )
 changeRouteTo route model =
    let
        session =
-            getSession model |> Session.clearFlash
+            Session.clearFlash (getSession model)

        newModel =
            { model | layout = Layout.reset model.layout }
    in
-    case route of
-        Route.Home ->
-            Home.init session
-                |> updateWith Home HomeMsg newModel
+    performEffects <|
+        case route of
+            Route.Home ->
+                Home.init session
+                    |> updateWith Home HomeMsg newModel

-        Route.Mailbox name ->
-            Mailbox.init session name Nothing
-                |> updateWith Mailbox MailboxMsg newModel
+            Route.Mailbox name ->
+                Mailbox.init session name Nothing
+                    |> updateWith Mailbox MailboxMsg newModel

-        Route.Message mailbox id ->
-            Mailbox.init session mailbox (Just id)
-                |> updateWith Mailbox MailboxMsg newModel
+            Route.Message mailbox id ->
+                Mailbox.init session mailbox (Just id)
+                    |> updateWith Mailbox MailboxMsg newModel

-        Route.Monitor ->
-            if session.config.monitorVisible then
-                Monitor.init session
-                    |> updateWith Monitor MonitorMsg newModel
+            Route.Monitor ->
+                if session.config.monitorVisible then
+                    Monitor.init session
+                        |> updateWith Monitor MonitorMsg newModel

-            else
+                else
+                    let
+                        flash =
+                            { title = "Disabled route requested"
+                            , table = [ ( "Error", "Monitor disabled by configuration." ) ]
+                            }
+                    in
+                    ( applyToModelSession (Session.showFlash flash) newModel
+                    , Effect.none
+                    )
+
+            Route.Status ->
+                Status.init session
+                    |> updateWith Status StatusMsg newModel
+
+            Route.Unknown path ->
+                -- Unknown routes display Home with an error flash.
                let
                    flash =
-                        { title = "Disabled route requested"
-                        , table = [ ( "Error", "Monitor disabled by configuration." ) ]
+                        { title = "Unknown route requested"
+                        , table = [ ( "Path", path ) ]
                        }
                in
-                ( applyToModelSession (Session.showFlash flash) newModel
-                , Cmd.none
-                )
+                Home.init (Session.showFlash flash session)
+                    |> updateWith Home HomeMsg newModel

-        Route.Status ->
-            Status.init session
-                |> updateWith Status StatusMsg newModel

-        Route.Unknown path ->
-            -- Unknown routes display Home with an error flash.
-            let
-                flash =
-                    { title = "Unknown route requested"
-                    , table = [ ( "Path", path ) ]
-                    }
-            in
-            Home.init (Session.showFlash flash session)
-                |> updateWith Home HomeMsg newModel
+{-| Perform effects by updating model and/or producing Cmds to be executed.
+-}
+performEffects : ( Model, Effect Msg ) -> ( Model, Cmd Msg )
+performEffects ( model, effect ) =
+    Effect.perform ( getSession model, effect )
+        |> Tuple.mapFirst (\newSession -> updateSession model newSession)


 getSession : Model -> Session
@@ -332,11 +340,11 @@ updateWith :
    (subModel -> PageModel)
    -> (subMsg -> Msg)
    -> Model
-    -> ( subModel, Cmd subMsg )
-    -> ( Model, Cmd Msg )
-updateWith toPage toMsg model ( subModel, subCmd ) =
+    -> ( subModel, Effect subMsg )
+    -> ( Model, Effect Msg )
+updateWith toPage toMsg model ( subModel, subEffect ) =
    ( { model | page = toPage subModel }
-    , Cmd.map toMsg subCmd
+    , Effect.map toMsg subEffect
    )


--- a/ui/src/Page/Home.elm
+++ b/ui/src/Page/Home.elm
@@ -1,7 +1,7 @@
 module Page.Home exposing (Model, Msg, init, update, view)

-import Api
-import Data.Session as Session exposing (Session)
+import Data.Session exposing (Session)
+import Effect exposing (Effect)
 import Html exposing (Html)
 import Html.Attributes exposing (class, property)
 import HttpUtil
@@ -18,9 +18,9 @@ type alias Model =
    }


-init : Session -> ( Model, Cmd Msg )
+init : Session -> ( Model, Effect Msg )
 init session =
-    ( Model session "", Api.getGreeting session GreetingLoaded )
+    ( Model session "", Effect.getGreeting GreetingLoaded )



@@ -31,16 +31,14 @@ type Msg
    = GreetingLoaded (Result HttpUtil.Error String)


-update : Msg -> Model -> ( Model, Cmd Msg )
+update : Msg -> Model -> ( Model, Effect Msg )
 update msg model =
    case msg of
        GreetingLoaded (Ok greeting) ->
-            ( { model | greeting = greeting }, Cmd.none )
+            ( { model | greeting = greeting }, Effect.none )

        GreetingLoaded (Err err) ->
-            ( { model | session = Session.showFlash (HttpUtil.errorFlash err) model.session }
-            , Cmd.none
-            )
+            ( model, Effect.showFlash (HttpUtil.errorFlash err) )



--- a/ui/src/Page/Mailbox.elm
+++ b/ui/src/Page/Mailbox.elm
@@ -1,12 +1,12 @@
-module Page.Mailbox exposing (Model, Msg, init, load, subscriptions, update, view)
+module Page.Mailbox exposing (Model, Msg, init, subscriptions, update, view)

 import Api
-import Browser.Navigation as Nav
 import Data.Message as Message exposing (Message)
 import Data.MessageHeader exposing (MessageHeader)
-import Data.Session as Session exposing (Session)
+import Data.Session exposing (Session)
 import DateFormat as DF
 import DateFormat.Relative as Relative
+import Effect exposing (Effect)
 import Html
    exposing
        ( Attribute
@@ -54,7 +54,6 @@ import Json.Decode as D
 import Json.Encode as E
 import Modal
 import Route
-import Task
 import Time exposing (Posix)
 import Timer exposing (Timer)

@@ -95,6 +94,7 @@ type alias Model =
    { session : Session
    , mailboxName : String
    , state : State
+    , socketConnected : Bool
    , bodyMode : Body
    , searchInput : String
    , promptPurge : Bool
@@ -103,27 +103,27 @@ type alias Model =
    }


-init : Session -> String -> Maybe MessageID -> ( Model, Cmd Msg )
+type alias ServeUrl =
+    List String -> String
+
+
+init : Session -> String -> Maybe MessageID -> ( Model, Effect Msg )
 init session mailboxName selection =
    ( { session = session
      , mailboxName = mailboxName
      , state = LoadingList selection
+      , socketConnected = False
      , bodyMode = SafeHtmlBody
      , searchInput = ""
      , promptPurge = False
      , markSeenTimer = Timer.empty
      , now = Time.millisToPosix 0
      }
-    , load session mailboxName
-    )
-
-
-load : Session -> String -> Cmd Msg
-load session mailboxName =
-    Cmd.batch
-        [ Task.perform Tick Time.now
-        , Api.getHeaderList session ListLoaded mailboxName
+    , Effect.batch
+        [ Effect.posixTime Tick
+        , Effect.getHeaderList ListLoaded mailboxName
        ]
+    )



@@ -142,6 +142,7 @@ subscriptions _ =
 type Msg
    = ListLoaded (Result HttpUtil.Error (List MessageHeader))
    | ClickMessage MessageID
+    | ClickRefresh
    | ListKeyPress String Int
    | CloseMessage
    | MessageLoaded (Result HttpUtil.Error Message)
@@ -159,38 +160,49 @@ type Msg
    | ModalFocused Modal.Msg


-update : Msg -> Model -> ( Model, Cmd Msg )
+update : Msg -> Model -> ( Model, Effect Msg )
 update msg model =
    case msg of
        ClickMessage id ->
-            ( updateSelected { model | session = Session.disableRouting model.session } id
-            , Cmd.batch
+            ( updateSelected model id
+            , Effect.batch
                [ -- Update browser location.
-                  Route.Message model.mailboxName id
-                    |> model.session.router.toPath
-                    |> Nav.replaceUrl model.session.key
-                , Api.getMessage model.session MessageLoaded model.mailboxName id
+                  Effect.updateRoute (Route.Message model.mailboxName id)
+                , Effect.getMessage MessageLoaded model.mailboxName id
                ]
            )

+        ClickRefresh ->
+            let
+                selection =
+                    case model.state of
+                        ShowingList _ (ShowingMessage message) ->
+                            Just message.id
+
+                        _ ->
+                            Nothing
+            in
+            -- Reset to loading state, preserving the current message selection.
+            ( { model | state = LoadingList selection }
+            , Effect.getHeaderList ListLoaded model.mailboxName
+            )
+
        CloseMessage ->
            case model.state of
                ShowingList list _ ->
-                    ( { model | state = ShowingList list NoMessage }, Cmd.none )
+                    ( { model | state = ShowingList list NoMessage }, Effect.none )

                _ ->
-                    ( model, Cmd.none )
+                    ( model, Effect.none )

        DeleteMessage message ->
            updateDeleteMessage model message

        DeletedMessage (Ok _) ->
-            ( model, Cmd.none )
+            ( model, Effect.none )

        DeletedMessage (Err err) ->
-            ( { model | session = Session.showFlash (HttpUtil.errorFlash err) model.session }
-            , Cmd.none
-            )
+            ( model, Effect.showFlash (HttpUtil.errorFlash err) )

        ListKeyPress id keyCode ->
            case keyCode of
@@ -198,79 +210,49 @@ update msg model =
                    updateOpenMessage model id

                _ ->
-                    ( model, Cmd.none )
+                    ( model, Effect.none )

        ListLoaded (Ok headers) ->
-            case model.state of
-                LoadingList selection ->
-                    let
-                        newModel =
-                            { model
-                                | state = ShowingList (MessageList headers Nothing "") NoMessage
-                            }
-                    in
-                    case selection of
-                        Just id ->
-                            updateOpenMessage newModel id
-
-                        Nothing ->
-                            ( { newModel
-                                | session = Session.addRecent model.mailboxName model.session
-                              }
-                            , Cmd.none
-                            )
-
-                _ ->
-                    ( model, Cmd.none )
+            updateListLoaded model headers

        ListLoaded (Err err) ->
-            ( { model | session = Session.showFlash (HttpUtil.errorFlash err) model.session }
-            , Cmd.none
-            )
+            ( model, Effect.showFlash (HttpUtil.errorFlash err) )

        MarkSeenLoaded (Ok _) ->
-            ( model, Cmd.none )
+            ( model, Effect.none )

        MarkSeenLoaded (Err err) ->
-            ( { model | session = Session.showFlash (HttpUtil.errorFlash err) model.session }
-            , Cmd.none
-            )
+            ( model, Effect.showFlash (HttpUtil.errorFlash err) )

        MessageLoaded (Ok message) ->
            updateMessageResult model message

        MessageLoaded (Err err) ->
-            ( { model | session = Session.showFlash (HttpUtil.errorFlash err) model.session }
-            , Cmd.none
-            )
+            ( model, Effect.showFlash (HttpUtil.errorFlash err) )

        MessageBody bodyMode ->
-            ( { model | bodyMode = bodyMode }, Cmd.none )
+            ( { model | bodyMode = bodyMode }, Effect.none )

        ModalFocused message ->
-            ( { model | session = Modal.updateSession message model.session }
-            , Cmd.none
-            )
+            ( model, Effect.focusModalResult message )

        OnSearchInput searchInput ->
            updateSearchInput model searchInput

        PurgeMailboxPrompt ->
-            ( { model | promptPurge = True }, Modal.resetFocusCmd ModalFocused )
+            ( { model | promptPurge = True }, Effect.focusModal ModalFocused )

        PurgeMailboxCanceled ->
-            ( { model | promptPurge = False }, Cmd.none )
+            ( { model | promptPurge = False }, Effect.none )

        PurgeMailboxConfirmed ->
            updateTriggerPurge model

        PurgedMailbox (Ok _) ->
-            ( model, Cmd.none )
+            ( model, Effect.none )

        PurgedMailbox (Err err) ->
-            ( { model | session = Session.showFlash (HttpUtil.errorFlash err) model.session }
-            , Cmd.none
-            )
+            ( model, Effect.showFlash (HttpUtil.errorFlash err) )

        MarkSeenTriggered timer ->
            if timer == model.markSeenTimer then
@@ -278,15 +260,42 @@ update msg model =
                updateMarkMessageSeen model

            else
-                ( model, Cmd.none )
+                ( model, Effect.none )

        Tick now ->
-            ( { model | now = now }, Cmd.none )
+            ( { model | now = now }, Effect.none )
+
+
+updateListLoaded : Model -> List MessageHeader -> ( Model, Effect Msg )
+updateListLoaded model headers =
+    case model.state of
+        LoadingList selection ->
+            let
+                newModel =
+                    { model
+                        | state = ShowingList (MessageList headers Nothing "") NoMessage
+                    }
+            in
+            Effect.append (Effect.addRecent newModel.mailboxName) <|
+                case selection of
+                    Just id ->
+                        -- Don't try to load selected message if not present in headers.
+                        if List.any (\header -> Just header.id == selection) headers then
+                            updateOpenMessage newModel id
+
+                        else
+                            ( newModel, Effect.updateRoute (Route.Mailbox model.mailboxName) )
+
+                    Nothing ->
+                        ( newModel, Effect.none )
+
+        _ ->
+            ( model, Effect.none )


 {-| Replace the currently displayed message.
 -}
-updateMessageResult : Model -> Message -> ( Model, Cmd Msg )
+updateMessageResult : Model -> Message -> ( Model, Effect Msg )
 updateMessageResult model message =
    let
        bodyMode =
@@ -298,7 +307,7 @@ updateMessageResult model message =
    in
    case model.state of
        LoadingList _ ->
-            ( model, Cmd.none )
+            ( model, Effect.none )

        ShowingList list _ ->
            let
@@ -314,38 +323,26 @@ updateMessageResult model message =
                , markSeenTimer = newTimer
              }
              -- Set 1500ms delay before reporting message as seen to backend.
-            , Timer.schedule MarkSeenTriggered newTimer 1500
+            , Effect.schedule MarkSeenTriggered newTimer 1500
            )


 {-| Updates model and triggers commands to purge this mailbox.
 -}
-updateTriggerPurge : Model -> ( Model, Cmd Msg )
+updateTriggerPurge : Model -> ( Model, Effect Msg )
 updateTriggerPurge model =
-    let
-        cmd =
-            Cmd.batch
-                [ Route.Mailbox model.mailboxName
-                    |> model.session.router.toPath
-                    |> Nav.replaceUrl model.session.key
-                , Api.purgeMailbox model.session PurgedMailbox model.mailboxName
-                ]
-    in
-    case model.state of
-        ShowingList _ _ ->
-            ( { model
-                | promptPurge = False
-                , session = Session.disableRouting model.session
-                , state = ShowingList (MessageList [] Nothing "") NoMessage
-              }
-            , cmd
-            )
-
-        _ ->
-            ( model, cmd )
+    ( { model
+        | promptPurge = False
+        , state = ShowingList (MessageList [] Nothing "") NoMessage
+      }
+    , Effect.batch
+        [ Effect.updateRoute (Route.Mailbox model.mailboxName)
+        , Effect.purgeMailbox PurgedMailbox model.mailboxName
+        ]
+    )


-updateSearchInput : Model -> String -> ( Model, Cmd Msg )
+updateSearchInput : Model -> String -> ( Model, Effect Msg )
 updateSearchInput model searchInput =
    let
        searchFilter =
@@ -357,14 +354,14 @@ updateSearchInput model searchInput =
    in
    case model.state of
        LoadingList _ ->
-            ( model, Cmd.none )
+            ( model, Effect.none )

        ShowingList list messageState ->
            ( { model
                | searchInput = searchInput
                , state = ShowingList { list | searchFilter = searchFilter } messageState
              }
-            , Cmd.none
+            , Effect.none
            )


@@ -396,7 +393,7 @@ updateSelected model id =
                    { model | state = ShowingList newList (Transitioning visible) }


-updateDeleteMessage : Model -> Message -> ( Model, Cmd Msg )
+updateDeleteMessage : Model -> Message -> ( Model, Effect Msg )
 updateDeleteMessage model message =
    let
        filter f messageList =
@@ -404,26 +401,20 @@ updateDeleteMessage model message =
    in
    case model.state of
        ShowingList list _ ->
-            ( { model
-                | session = Session.disableRouting model.session
-                , state =
-                    ShowingList (filter (\x -> x.id /= message.id) list) NoMessage
-              }
-            , Cmd.batch
-                [ Api.deleteMessage model.session DeletedMessage message.mailbox message.id
-                , Route.Mailbox model.mailboxName
-                    |> model.session.router.toPath
-                    |> Nav.replaceUrl model.session.key
+            ( { model | state = ShowingList (filter (\x -> x.id /= message.id) list) NoMessage }
+            , Effect.batch
+                [ Effect.deleteMessage DeletedMessage message.mailbox message.id
+                , Effect.updateRoute (Route.Mailbox model.mailboxName)
                ]
            )

        _ ->
-            ( model, Cmd.none )
+            ( model, Effect.none )


 {-| Updates both the active message, and the message list to mark the currently viewed message as seen.
 -}
-updateMarkMessageSeen : Model -> ( Model, Cmd Msg )
+updateMarkMessageSeen : Model -> ( Model, Effect Msg )
 updateMarkMessageSeen model =
    case model.state of
        ShowingList messages (ShowingMessage visibleMessage) ->
@@ -442,21 +433,17 @@ updateMarkMessageSeen model =
                | state =
                    ShowingList newMessages (ShowingMessage { visibleMessage | seen = True })
              }
-            , Api.markMessageSeen model.session MarkSeenLoaded visibleMessage.mailbox visibleMessage.id
+            , Effect.markMessageSeen MarkSeenLoaded visibleMessage.mailbox visibleMessage.id
            )

        _ ->
-            ( model, Cmd.none )
+            ( model, Effect.none )


-updateOpenMessage : Model -> String -> ( Model, Cmd Msg )
+updateOpenMessage : Model -> String -> ( Model, Effect Msg )
 updateOpenMessage model id =
-    let
-        newModel =
-            { model | session = Session.addRecent model.mailboxName model.session }
-    in
-    ( updateSelected newModel id
-    , Api.getMessage model.session MessageLoaded model.mailboxName id
+    ( updateSelected model id
+    , Effect.getMessage MessageLoaded model.mailboxName id
    )


@@ -467,6 +454,10 @@ updateOpenMessage model id =
 view : Model -> { title : String, modal : Maybe (Html Msg), content : List (Html Msg) }
 view model =
    let
+        serveUrl : ServeUrl
+        serveUrl =
+            Api.serveUrl model.session
+
        mode =
            case model.state of
                ShowingList _ (ShowingMessage _) ->
@@ -479,26 +470,7 @@ view model =
    , modal = viewModal model.promptPurge
    , content =
        [ div [ class ("mailbox " ++ mode) ]
-            [ aside [ class "message-list-controls" ]
-                [ input
-                    [ type_ "text"
-                    , placeholder "search"
-                    , Events.onInput OnSearchInput
-                    , value model.searchInput
-                    ]
-                    []
-                , button
-                    [ Events.onClick (OnSearchInput "")
-                    , disabled (model.searchInput == "")
-                    , alt "Clear Search"
-                    ]
-                    [ i [ class "fas fa-times" ] [] ]
-                , button
-                    [ Events.onClick PurgeMailboxPrompt
-                    , alt "Purge Mailbox"
-                    ]
-                    [ i [ class "fas fa-trash" ] [] ]
-                ]
+            [ viewMessageListControls model
            , viewMessageList model
            , main_
                [ class "message" ]
@@ -510,10 +482,10 @@ view model =
                            )

                    ShowingList _ (ShowingMessage message) ->
-                        viewMessage model.session model.session.zone message model.bodyMode
+                        viewMessage serveUrl model.session.zone message model.bodyMode

                    ShowingList _ (Transitioning message) ->
-                        viewMessage model.session model.session.zone message model.bodyMode
+                        viewMessage serveUrl model.session.zone message model.bodyMode

                    _ ->
                        text ""
@@ -539,6 +511,53 @@ viewModal promptPurge =
        Nothing


+viewMessageListControls : Model -> Html Msg
+viewMessageListControls model =
+    let
+        clearButton =
+            Just <|
+                button
+                    [ Events.onClick (OnSearchInput "")
+                    , disabled (model.searchInput == "")
+                    , alt "Clear Search"
+                    ]
+                    [ i [ class "fas fa-times" ] [] ]
+
+        purgeButton =
+            Just <|
+                button
+                    [ Events.onClick PurgeMailboxPrompt
+                    , alt "Purge Mailbox"
+                    ]
+                    [ i [ class "fas fa-trash" ] [] ]
+
+        refreshButton =
+            if model.socketConnected then
+                Nothing
+
+            else
+                Just <|
+                    button
+                        [ Events.onClick ClickRefresh
+                        , alt "Refresh Mailbox"
+                        ]
+                        [ i [ class "fas fa-sync" ] [] ]
+
+        searchInput =
+            Just <|
+                input
+                    [ type_ "text"
+                    , placeholder "search"
+                    , Events.onInput OnSearchInput
+                    , value model.searchInput
+                    ]
+                    []
+    in
+    [ searchInput, clearButton, refreshButton, purgeButton ]
+        |> List.filterMap identity
+        |> aside [ class "message-list-controls" ]
+
+
 viewMessageList : Model -> Html Msg
 viewMessageList model =
    aside [ class "message-list" ] <|
@@ -571,14 +590,14 @@ messageChip model selected message =
        ]


-viewMessage : Session -> Time.Zone -> Message -> Body -> Html Msg
-viewMessage session zone message bodyMode =
+viewMessage : ServeUrl -> Time.Zone -> Message -> Body -> Html Msg
+viewMessage serveUrl zone message bodyMode =
    let
        htmlUrl =
-            Api.serveUrl session [ "mailbox", message.mailbox, message.id, "html" ]
+            serveUrl [ "mailbox", message.mailbox, message.id, "html" ]

        sourceUrl =
-            Api.serveUrl session [ "mailbox", message.mailbox, message.id, "source" ]
+            serveUrl [ "mailbox", message.mailbox, message.id, "source" ]

        htmlButton =
            if message.html == "" then
@@ -609,7 +628,7 @@ viewMessage session zone message bodyMode =
            ]
        , messageErrors message
        , messageBody message bodyMode
-        , attachments session message
+        , attachments serveUrl message
        ]


@@ -672,20 +691,22 @@ messageBody message bodyMode =
        ]


-attachments : Session -> Message -> Html Msg
-attachments session message =
+attachments : ServeUrl -> Message -> Html Msg
+attachments serveUrl message =
    if List.isEmpty message.attachments then
-        div [] []
+        text ""

    else
-        table [ class "attachments well" ] (List.map (attachmentRow session message) message.attachments)
+        message.attachments
+            |> List.map (attachmentRow serveUrl message)
+            |> table [ class "attachments well" ]


-attachmentRow : Session -> Message -> Message.Attachment -> Html Msg
-attachmentRow session message attach =
+attachmentRow : ServeUrl -> Message -> Message.Attachment -> Html Msg
+attachmentRow serveUrl message attach =
    let
        url =
-            Api.serveUrl session
+            serveUrl
                [ "mailbox"
                , message.mailbox
                , message.id
--- a/ui/src/Page/Monitor.elm
+++ b/ui/src/Page/Monitor.elm
@@ -1,10 +1,10 @@
 module Page.Monitor exposing (Model, Msg, init, update, view)

 import Api
-import Browser.Navigation as Nav
 import Data.MessageHeader as MessageHeader exposing (MessageHeader)
-import Data.Session as Session exposing (Session)
+import Data.Session exposing (Session)
 import DateFormat as DF
+import Effect exposing (Effect)
 import Html
    exposing
        ( Attribute
@@ -41,9 +41,9 @@ type alias Model =
    }


-init : Session -> ( Model, Cmd Msg )
+init : Session -> ( Model, Effect Msg )
 init session =
-    ( Model session False [], Cmd.none )
+    ( Model session False [], Effect.none )



@@ -58,20 +58,20 @@ type Msg
    | MessageKeyPress MessageHeader Int


-update : Msg -> Model -> ( Model, Cmd Msg )
+update : Msg -> Model -> ( Model, Effect Msg )
 update msg model =
    case msg of
        Connected True ->
-            ( { model | connected = True, messages = [] }, Cmd.none )
+            ( { model | connected = True, messages = [] }, Effect.none )

        Connected False ->
-            ( { model | connected = False }, Cmd.none )
+            ( { model | connected = False }, Effect.none )

        MessageReceived value ->
            case D.decodeValue (MessageHeader.decoder |> D.at [ "detail" ]) value of
                Ok header ->
                    ( { model | messages = header :: List.take 500 model.messages }
-                    , Cmd.none
+                    , Effect.none
                    )

                Err err ->
@@ -81,12 +81,10 @@ update msg model =
                            , table = [ ( "Error", D.errorToString err ) ]
                            }
                    in
-                    ( { model | session = Session.showFlash flash model.session }
-                    , Cmd.none
-                    )
+                    ( model, Effect.showFlash flash )

        Clear ->
-            ( { model | messages = [] }, Cmd.none )
+            ( { model | messages = [] }, Effect.none )

        OpenMessage header ->
            openMessage header model
@@ -97,15 +95,13 @@ update msg model =
                    openMessage header model

                _ ->
-                    ( model, Cmd.none )
+                    ( model, Effect.none )


-openMessage : MessageHeader -> Model -> ( Model, Cmd Msg )
+openMessage : MessageHeader -> Model -> ( Model, Effect Msg )
 openMessage header model =
    ( model
-    , Route.Message header.mailbox header.id
-        |> model.session.router.toPath
-        |> Nav.replaceUrl model.session.key
+    , Effect.navigateRoute True (Route.Message header.mailbox header.id)
    )


--- a/ui/src/Page/Status.elm
+++ b/ui/src/Page/Status.elm
@@ -1,10 +1,10 @@
 module Page.Status exposing (Model, Msg, init, subscriptions, update, view)

-import Api
 import Data.Metrics exposing (Metrics)
 import Data.ServerConfig exposing (ServerConfig)
-import Data.Session as Session exposing (Session)
+import Data.Session exposing (Session)
 import DateFormat.Relative as Relative
+import Effect exposing (Effect)
 import Filesize
 import Html
    exposing
@@ -19,7 +19,6 @@ import Html.Attributes exposing (class)
 import HttpUtil
 import Sparkline as Spark
 import Svg.Attributes as SvgAttrib
-import Task
 import Time exposing (Posix)


@@ -60,7 +59,7 @@ type alias Metric =
    }


-init : Session -> ( Model, Cmd Msg )
+init : Session -> ( Model, Effect Msg )
 init session =
    ( { session = session
      , now = Time.millisToPosix 0
@@ -82,9 +81,9 @@ init session =
      , retainedCount = Metric "Stored Messages" 0 fmtInt graphZero initDataSet 60
      , retainedSize = Metric "Store Size" 0 Filesize.format graphZero initDataSet 60
      }
-    , Cmd.batch
-        [ Task.perform Tick Time.now
-        , Api.getServerConfig session ServerConfigLoaded
+    , Effect.batch
+        [ Effect.posixTime Tick
+        , Effect.getServerConfig ServerConfigLoaded
        ]
    )

@@ -114,27 +113,25 @@ type Msg
    | Tick Posix


-update : Msg -> Model -> ( Model, Cmd Msg )
+update : Msg -> Model -> ( Model, Effect Msg )
 update msg model =
    case msg of
        MetricsReceived (Ok metrics) ->
-            ( updateMetrics metrics model, Cmd.none )
+            ( updateMetrics metrics model, Effect.none )

        MetricsReceived (Err err) ->
-            ( { model | session = Session.showFlash (HttpUtil.errorFlash err) model.session }
-            , Cmd.none
-            )
+            ( model, Effect.showFlash (HttpUtil.errorFlash err) )

        ServerConfigLoaded (Ok config) ->
-            ( { model | config = Just config }, Cmd.none )
+            ( { model | config = Just config }, Effect.none )

        ServerConfigLoaded (Err err) ->
-            ( { model | session = Session.showFlash (HttpUtil.errorFlash err) model.session }
-            , Cmd.none
-            )
+            ( model, Effect.showFlash (HttpUtil.errorFlash err) )

        Tick time ->
-            ( { model | now = time }, Api.getServerMetrics model.session MetricsReceived )
+            ( { model | now = time }
+            , Effect.getServerMetrics MetricsReceived
+            )


 {-| Update all metrics in Model; increment xCounter.
@@ -416,7 +413,7 @@ viewMetric metric =
        , div [ class "value" ] [ text (metric.formatter metric.value) ]
        , div [ class "graph" ]
            [ metric.graph metric.history
-            , text ("(" ++ String.fromInt metric.minutes ++ "min)")
+            , text (" (" ++ String.fromInt metric.minutes ++ "min)")
            ]
        ]

--- a/ui/src/Timer.elm
+++ b/ui/src/Timer.elm
@@ -49,6 +49,8 @@ cancel previous =
            previous


+{-| Increments the timer identity, preventing integer overflow.
+-}
 next : Int -> Int
 next index =
    if index > 2 ^ 30 then
--- a/ui/src/index.js
+++ b/ui/src/index.js
@@ -3,6 +3,7 @@ import './mailbox.css'
 import './navbar.css'
 import '@fortawesome/fontawesome-free/css/all.css'
 import '@webcomponents/webcomponentsjs/webcomponents-bundle'
+import 'opensans-npm-webfont'
 import { Elm } from './Main.elm'
 import './monitorMessages'
 import './renderedHtml'
--- a/ui/src/mailbox.css
+++ b/ui/src/mailbox.css
@@ -76,7 +76,7 @@

  .message-list {
    display: block;
-    overflow-y: scroll;
+    overflow-y: auto;
  }

  .message-list-controls {
@@ -98,9 +98,14 @@
  border-width: 1px;
  border-style: none solid solid solid;
  cursor: pointer;
+  outline: none;
  padding: 5px 8px;
 }

+.message-list-entry:focus {
+  background-color: var(--focused-bg-color) !important;
+}
+
 .message-list-entry.selected {
  background-color: var(--selected-color);
 }
@@ -109,6 +114,10 @@
  border-style: solid;
 }

+.message-list-entry:focus .subject {
+  color: var(--focused-color);
+}
+
 .message-list-entry .subject {
  color: var(--high-color);
 }
@@ -117,6 +126,12 @@
  font-weight: bold;
 }

+.message-list-entry:focus .from,
+.message-list-entry:focus .date {
+  color: var(--focused-color);
+  opacity: 0.8;
+}
+
 .message-list-entry .from,
 .message-list-entry .date {
  color: var(--low-color);
--- a/ui/src/main.css
+++ b/ui/src/main.css
@@ -9,6 +9,70 @@
  --border-color: #ddd;
  --placeholder-color: #9f9f9f;
  --selected-color: #eee;
+  --focused-color: #fff;
+  --focused-bg-color: #337ab7;
+
+  --input-bg: white;
+  --input-bg-active: white;
+
+  --btn-default-bg-color: #337ab7;
+  --btn-default-bg-image: linear-gradient(to bottom, #337ab7 0, #265a88 100%);
+  --btn-default-color: #ffffff;
+  --btn-danger-bg-color: #d9534f;
+  --btn-danger-bg-image: linear-gradient(to bottom, #d9534f 0, #c12e2a 100%);
+  --btn-light-bg-color: #eee;
+  --btn-light-bg-image: linear-gradient(to bottom, #f0f0f0 0, #e0e0e0 100%);
+
+  --monitor-header-bg: #e8e8e8;
+
+  --well-bg-color: #f5f5f5;
+  --well-bg-image: linear-gradient(to bottom, #e8e8e8 0, #f5f5f5 100%);
+
+  --well-warn-bg-color: #fff8cf;
+  --well-warn-bg-image: linear-gradient(to bottom, #fff899 0, #fff8cf 100%);
+  --well-warn-color: inherit;
+
+  --well-error-bg-color: #f58080;
+  --well-error-bg-image: linear-gradient(to bottom, #e86060 0, #f58080 100%);
+  --well-error-color: inherit;
+
+  --well-border: #e8e8e8;
+}
+
+@media (prefers-color-scheme: dark) {
+  :root {
+    --bg-color: #202124;
+    --primary-color: #bdc1c6;
+    --high-color: #8ab4f8;
+    --border-color: #5f6368;
+    --selected-color: #303134;
+
+    --input-bg: var(--bg-color);
+    --input-bg-active: rgb(48, 49, 52);
+
+    --btn-default-bg-color: #303134;
+    --btn-default-bg-image: none;
+    --btn-default-color: #e8eaed;
+    /*--btn-danger-bg-color: #d9534f;*/
+    --btn-danger-bg-image: none;
+    /*--btn-light-bg-color: #eee;*/
+    --btn-light-bg-image: none;
+
+    --monitor-header-bg: var(--selected-color);
+
+    --well-bg-color: var(--low-color);
+    --well-bg-image: none;
+
+    --well-warn-bg-color: #c3c099;
+    --well-warn-bg-image: none;
+    --well-warn-color: var(--bg-color);
+
+    --well-error-bg-color: #e86060;
+    --well-error-bg-image: none;
+    --well-error-color: var(--bg-color);
+
+    --well-border: var(--border-color);
+  }
 }

 html, body, div, span, applet, object, iframe,
@@ -37,7 +101,7 @@ time, mark, audio, video {
 }

 a {
-    color: #337ab7;
+    color: var(--high-color);
    text-decoration: none;
 }

@@ -46,8 +110,9 @@ body {
 }

 body, button, input, table {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-family: "Open Sans", Helvetica, Arial, sans-serif;
  font-size: 14px;
+  font-weight: 400;
  line-height: 1.43;
  color: var(--primary-color);
 }
@@ -64,8 +129,8 @@ h1, h2, h3, h4, h5, h6, p {
 /** SHARED */

 a.button {
-  background-color: #337ab7;
-  background-image: linear-gradient(to bottom, #337ab7 0, #265a88 100%);
+  background-color: var(--btn-default-bg-color);
+  background-image: var(--btn-default-bg-image);
  border: none;
  border-radius: 4px;
  color: #fff;
@@ -73,17 +138,15 @@ a.button {
  font-size: 11px;
  font-style: normal;
  margin: 4px;
-  padding: 3px 8px;
+  padding: 3px 8px 4px;
  text-decoration: none;
  text-shadow: 0 -1px 0 rgba(0,0,0,0.2);
 }

 .well {
-  --light: #f5f5f5;
-  --dark: #e8e8e8;
-  background-color: var(--light);
-  background-image: linear-gradient(to bottom, var(--dark) 0, var(--light) 100%);
-  border: 1px solid var(--dark);
+  background-color: var(--well-bg-color);
+  background-image: var(--well-bg-image);
+  border: 1px solid var(--well-border);
  border-radius: 4px;
  box-shadow: 0 1px 2px rgba(0,0,0,.05);
  padding: 6px 10px;
@@ -95,8 +158,9 @@ a.button {
 }

 .well-error {
-  --light: #f58080;
-  --dark: #e86060;
+  background-color: var(--well-error-bg-color);
+  background-image: var(--well-error-bg-image);
+  color: var(--well-error-color);
 }

 .well-error a {
@@ -105,8 +169,22 @@ a.button {
 }

 .well-warn {
-  --light: #fff8cf;
-  --dark: #fff899;
+  background-color: var(--well-warn-bg-color);
+  background-image: var(--well-warn-bg-image);
+  color: var(--well-warn-color);
+}
+
+input {
+  border: 1px solid var(--border-color);
+  background-color: var(--input-bg);
+}
+
+@media (prefers-color-scheme: dark) {
+  input:focus-visible, input:hover {
+    outline: none;
+    border: 1px solid var(--input-bg-active);
+    background-color: var(--input-bg-active);
+  }
 }

 /** APP */
@@ -234,35 +312,39 @@ h3 {
 }

 .button-bar button {
-  background-color: #337ab7;
-  background-image: linear-gradient(to bottom, #337ab7 0, #265a88 100%);
+  background-color: var(--btn-default-bg-color);
+  background-image: var(--btn-default-bg-image);
  border: none;
  border-radius: 4px;
-  color: #fff;
+  color: var(--btn-default-color);
  display: inline-block;
  font-size: 12px;
  font-style: normal;
  font-weight: 400;
  height: 30px;
  margin: 0;
-  padding: 5px 10px;
+  padding: 5px 10px 6px;
  text-align: center;
  text-decoration: none;
  text-shadow: 0 -1px 0 rgba(0,0,0,0.2);
 }

+.button-bar button:hover {
+    border: 1px solid var(--border-color);
+}
+
 .button-bar *:not(:last-child) {
  margin-right: 4px;
 }

 .button-bar button.danger {
-  background-color: #d9534f;
-  background-image: linear-gradient(to bottom, #d9534f 0, #c12e2a 100%);
+  background-color: var(--btn-danger-bg-color);
+  background-image: var(--btn-danger-bg-image);
 }

 .button-bar button.light {
-  background-color: #eee;
-  background-image: linear-gradient(to bottom, #f0f0f0 0, #e0e0e0 100%);
+  background-color: var(--btn-light-bg-color);
+  background-image: var(--btn-light-bg-image);
  color: #000;
 }

@@ -282,7 +364,7 @@ h3 {
 }

 .metric-panel h2 {
-  background-image: linear-gradient(to bottom, #f5f5f5 0, #e8e8e8 100%);
+  background-color: var(--monitor-header-bg);
  font-size: 16px;
  font-weight: 500;
  padding: 10px;
@@ -351,3 +433,9 @@ h3 {
  background-color: var(--selected-color);
  cursor: pointer;
 }
+
+.monitor tr:focus {
+  color: var(--focused-color);
+  background-color: var(--focused-bg-color);
+  outline: none;
+}
--- a/ui/src/navbar.css
+++ b/ui/src/navbar.css
@@ -2,16 +2,34 @@

 :root {
  --navbar-color: #9d9d9d;
+  --navbar-color-active: var(--navbar-color);
  --navbar-bg: #222;
+  --navbar-bg-active: #080808;
+  --navbar-bg-border-active: none;
  --navbar-image: linear-gradient(to bottom, #3c3c3c 0, #222 100%);
  --navbar-height: 50px;
+  --navbar-border-bottom: none;
 }

+@media (prefers-color-scheme: dark) {
+  :root {
+    --navbar-color: #969ba1;
+    --navbar-color-active: #8ab4f8;
+    --navbar-bg: var(--bg-color);
+    --navbar-bg-active: none;
+    --navbar-bg-border-active: 3px solid var(--navbar-color-active);
+    --navbar-image: none;
+    --navbar-border-bottom: 1px solid var(--border-color);
+  }
+}
+
+
 .navbar {
  background-color: var(--navbar-bg);
  background-image: var(--navbar-image);
  text-shadow: 0 -1px 0 rgba(0,0,0,0.2);
  min-height: var(--navbar-height);
+  border-bottom: var(--navbar-border-bottom);
 }

 .main-nav {
@@ -25,6 +43,7 @@

 .navbar-brand {
  font-size: 18px;
+  font-weight: 600;
 }

 .navbar-toggle {
@@ -65,7 +84,9 @@
 }

 li.navbar-active > *:first-child {
-  background-color: #080808;
+  background-color: var(--navbar-bg-active);
+  color: var(--navbar-color-active);
+  border-bottom: var(--navbar-bg-border-active);
 }

 li.navbar-active a,
@@ -91,7 +112,6 @@ li.navbar-active span,
 }

 .navbar-mailbox input {
-  border: 1px solid var(--border-color);
  border-radius: 4px;
  padding: 5px 10px;
  width: 250px;
--- a/ui/webpack.config.js
+++ b/ui/webpack.config.js
@@ -35,12 +35,10 @@ module.exports = (env, argv) => {
          ],
        },
        {
-          include: [/\/src/, /\/node_modules\/@fortawesome\/fontawesome-free\/css/],
          test: /\.css$/,
          loader: ['style-loader', 'css-loader'],
        },
        {
-          include: [/\/node_modules\/@fortawesome\/fontawesome-free\/webfonts/],
          test: /\.(eot|svg|ttf|woff|woff2)$/,
          loader: 'file-loader',
          options: {
Author	SHA1	Message	Date
James Hillyerd	091e26c467	docker-build should also run on tags (#230 )	2021-08-01 13:19:19 -07:00
James Hillyerd	6593a36b48	Merge tag 'v3.0.0-rc3' into develop Release is for CI/CD changes only.	2021-08-01 13:02:26 -07:00
James Hillyerd	68ef2d9873	Merge branch 'release/3.0.0-rc3'	2021-08-01 13:01:35 -07:00
James Hillyerd	ab988caf6b	Add rc3 to change log	2021-08-01 13:00:28 -07:00
James Hillyerd	fa62220d98	Add ghcr.io to docker metadata images	2021-08-01 12:29:26 -07:00
James Hillyerd	1ecf424975	login to GitHub container registry	2021-08-01 12:14:28 -07:00
James Hillyerd	3342938dd4	Update to docker-push-action v2 w/ metadata, buildx (#228 ) Docker Hub no longer builds for us, so we need to switch to GHA	2021-08-01 11:57:46 -07:00
James Hillyerd	6be1655723	Update to docker-push-action v2 w/ metadata, buildx (#228 ) Docker Hub no longer builds for us, so we need to switch to GHA	2021-08-01 11:52:17 -07:00
James Hillyerd	1465e6fb49	Merge tag 'v3.0.0-rc2' into develop Added: - Support for SMTP AUTH (#197, thanks makarchuk) - Dark mode support (#218, thanks nerones) Fixed: - Prevent potential click jacking (#190, thanks stuartskelton) - Error on 8 character long SMTP commands (#221) - Allow empty username and password during AUTH (#225)	2021-07-31 16:41:35 -07:00
James Hillyerd	21991cbfc7	Merge branch 'release/3.0.0-rc2'	2021-07-31 16:40:17 -07:00
James Hillyerd	7138a97935	Update change log for 3.0.0-rc2	2021-07-31 16:32:01 -07:00
James Hillyerd	beee68fc5d	Update change log	2021-07-31 16:26:47 -07:00
James Hillyerd	9e2af71743	Upgrade node deps (#227 ) * bump node deps * npm audit fix	2021-07-31 16:09:30 -07:00
James Hillyerd	a2c4292fc1	update go deps (#226 )	2021-07-31 15:53:38 -07:00
James Hillyerd	2016142747	smtp: allow empty user & pass during AUTH LOGIN (#225 )	2021-07-31 10:38:48 -07:00
James Hillyerd	4f9f961cac	smtp: fix formatting (#224 )	2021-07-31 10:32:08 -07:00
Nelson Efrain A. Cruz	bf8536abb3	Adds dark mode support (#218 ) * Adds dark mode support Updates the css to support dark mode via media query. The dark theme its heavily inspired on the new dark mode for google.com.	2021-07-20 08:07:06 -07:00
James Hillyerd	985f2702f2	Fix command line length bug (#221 ) * handler: Don't fail on 8 character command lines Fixes #214 * handler: Test that STARTTLS is parsed correctly.	2021-07-11 12:00:28 -07:00
James Hillyerd	11f3879442	goreleaser: update nfpm config to use contents attrib (#220 ) fixes #219 Signed-off-by: James Hillyerd <james@hillyerd.com>	2021-07-11 10:05:00 -07:00
James Hillyerd	8562c55c98	nix: add elm-json for updating pkgs	2021-05-06 12:27:01 -07:00
James Hillyerd	e3066bb535	Update nodejs dependencies (#209 ) * node: Update top level deps * node: Audit fix	2021-05-06 11:22:50 -07:00
James Hillyerd	35ab31efbc	Update go deps (#208 )	2021-05-06 10:35:53 -07:00
James Hillyerd	81edf40996	store_test: Fix t.Fatal non-test goroutine lint error	2021-05-06 09:58:30 -07:00
James Hillyerd	c64e7a6a6c	Revert "Add support for AUTH, closes #62 " (#206 ) This reverts commit `261bbef426`. It was merged to directly master by mistake, and should have gone through the normal release process.	2021-05-03 20:56:10 -07:00
James Hillyerd	4bd64563f2	Bump nodejs to 14.x (#203 )	2021-05-01 16:50:43 -07:00
James Hillyerd	66dec49a49	Bump Go version to 1.16 (#202 ) * bump go version * Docker: bump go/alpine version	2021-05-01 14:16:59 -07:00
James Hillyerd	649e3743e0	Migrate off Travis CI (#201 ) Adds generic Go matrix build with coverage, removes Travis config.	2021-05-01 13:49:41 -07:00
Timur Makarchuk	c096f018d6	Add support for AUTH, closes #62 * Add PLAIN and LOGIN auth support	2021-04-10 13:58:18 -07:00
Timur Makarchuk	261bbef426	Add support for AUTH, closes #62 * Add PLAIN and LOGIN auth support	2021-04-10 13:45:09 -07:00
Stuart Skelton	3c5960aba0	Avoid potential click jacking (#190 )	2020-11-19 08:16:01 -08:00
James Hillyerd	7f430f2bde	Merge tag 'v3.0.0-rc1' into develop Added: - Refresh button to reload mailbox contents - Improved keyboard (tab) focus highlights Changed: - The UI now includes the Open Sans webfont instead of relying on browser/OS fonts	2020-09-24 20:59:30 -07:00
James Hillyerd	c480fcb341	Merge branch 'release/3.0.0-rc1'	2020-09-24 20:58:53 -07:00
James Hillyerd	e74f5e5116	Update changelog for 3.0.0-rc1	2020-09-24 20:54:07 -07:00
James Hillyerd	6ce045ddb7	Update changelog	2020-09-24 20:43:56 -07:00
James Hillyerd	9b03c311db	ui: Replace Mailbox Session use with ServeUrl (#185 ) Plus a couple UI padding tweaks	2020-09-24 15:59:12 -07:00
James Hillyerd	ebd25a60e1	ui: Remove to do comments, must keep session.router	2020-09-24 11:19:04 -07:00
James Hillyerd	7c87649579	ui: Convert Layout to use Effects	2020-09-23 23:00:29 -07:00
James Hillyerd	e56365b9a0	Update deps (#184 ) * backend: update Go dependencies * frontend: update npm dependencies	2020-09-23 21:39:27 -07:00
James Hillyerd	698b0406c8	Readme updates (#183 ) * Add docker build badge * Rephrase things * add dev guide link * Remove brew tap section until #68 is fixed	2020-09-23 20:43:51 -07:00
James Hillyerd	361bbec293	ui: Keyboard accessibility focus highlights (#180 ) * Focus indication for mailbox message list * Add focus for monitor message list	2020-09-22 14:11:06 -07:00
James Hillyerd	407ae87a3b	ui: Add refresh button to mailbox page (#179 ) `socketConnected` is not implemented, but will be used when we implement #92	2020-09-21 20:11:32 -07:00
James Hillyerd	4648d8e593	ui: Use OpenSans font (#178 )	2020-09-21 16:16:00 -07:00
James Hillyerd	5c5b0f819b	Effects refactor continued (#177 ) * Use Effects instead of replaceUrl in Mailbox * Add Effect.navigateRoute to handle monitor message clicks * Add a focusModal effect for mailbox purge * Remove temporary Cmd wrapper Effect	2020-09-13 17:08:11 -07:00
James Hillyerd	8adfd82232	ui: add `npm run clean` script	2020-09-13 10:39:16 -07:00
James Hillyerd	2162a4caaa	ui: Add an Effect system to handle global state and Elm Cmds (#176 ) All pages now leverage Effects for most of their Session and Cmd requests. More work required for routing and other lingering Cmd use.	2020-09-12 19:45:14 -07:00
James Hillyerd	cf4c5a29bb	ui: Force file watch on dev server file watch stopped working	2020-09-12 16:32:40 -07:00
James Hillyerd	6598b09114	ui: Start dev server with default host, not 0.0.0.0 0.0.0.0 does not work well with WSL2 on Windows 10	2020-09-06 16:38:33 -07:00
James Hillyerd	ce5bfddaa5	Migrate release process from travis to github (#175 ) * set fetch depth to 0 * Only snapshot when not tagged * Run deploy for v* tags * travis: remove deploy stage	2020-09-05 14:21:42 -07:00
James Hillyerd	2934d799ef	Add a GitHub workflow for building a snapshot release	2020-09-04 15:06:57 -07:00
James Hillyerd	8a07a24828	Merge tag 'v3.0.0-beta3' into develop	2020-09-04 12:45:45 -07:00