Other: Bridge James 1.8.5

- [x] write tests to check that IMAP and SMTP servers are closed when there
  is no internet
- [x] always create new go-smtp instance during listenAndServe(int)

.gitignore

@@ -26,8 +26,15 @@ internal/frontend/qml/ProtonUI/images
 internal/frontend/qml/ImportExportUI/images
 frontend/qml/*.qmlc
 
+# Credits files (generated).
+internal/**/credits.go
+
 # Build files
-bridge_darwin_*.tgz
+/launcher-*
+/bridge_*_*.tgz
+/ie_*_*.tgz
+/versioner
+/hasher
 cmd/Desktop-Bridge/deploy
 cmd/Import-Export/deploy
 internal/frontend/qt*/moc.cpp

.gitlab-ci.yml

@@ -106,7 +106,7 @@ build-linux-qa:
   only:
     - web
   script:
-    - BUILD_TAGS="build_qa pmapi_qa" make build
+    - BUILD_TAGS="build_qa" make build
   artifacts:
     name: "bridge-linux-qa-$CI_COMMIT_SHORT_SHA"
     paths:
@@ -121,6 +121,17 @@ build-ie-linux:
     paths:
       - ie_*.tgz
 
+build-ie-linux-qa:
+  extends: .build-base
+  only:
+    - web
+  script:
+    - BUILD_TAGS="build_qa" make build-ie
+  artifacts:
+    name: "ie-linux-qa-$CI_COMMIT_SHORT_SHA"
+    paths:
+      - ie_*.tgz
+
 .build-darwin-base:
   extends: .build-base
   before_script:
@@ -150,7 +161,7 @@ build-darwin-qa:
   only:
     - web
   script:
-    - BUILD_TAGS="build_qa pmapi_qa" make build
+    - BUILD_TAGS="build_qa" make build
   artifacts:
     name: "bridge-darwin-qa-$CI_COMMIT_SHORT_SHA"
     paths:
@@ -165,57 +176,14 @@ build-ie-darwin:
     paths:
       - ie_*.tgz
 
-.build-windows-base:
-  extends: .build-base
-  services:
-    - docker:dind
-  variables:
-    DOCKER_HOST: tcp://docker:2375
-
-build-windows:
-  extends: .build-windows-base
-  script:
-    # We need to install docker because qtdeploy builds for windows inside a docker container.
-    # Docker will connect to the dockerd daemon provided by the runner service docker:dind at tcp://docker:2375.
-    - curl -fsSL https://get.docker.com -o get-docker.sh && sh get-docker.sh
-    - apt-get update && apt-get -y install binutils-mingw-w64 tar gzip
-    - ln -s /usr/bin/x86_64-w64-mingw32-windres /usr/bin/windres
-    - go mod download
-    - TARGET_OS=windows make build
-  artifacts:
-    name: "bridge-windows-$CI_COMMIT_SHORT_SHA"
-    paths:
-      - bridge_*.tgz
-
-build-windows-qa:
-  extends: .build-windows-base
+build-ie-darwin-qa:
+  extends: .build-darwin-base
   only:
     - web
   script:
-    # We need to install docker because qtdeploy builds for windows inside a docker container.
-    # Docker will connect to the dockerd daemon provided by the runner service docker:dind at tcp://docker:2375.
-    - curl -fsSL https://get.docker.com -o get-docker.sh && sh get-docker.sh
-    - apt-get update && apt-get -y install binutils-mingw-w64 tar gzip
-    - ln -s /usr/bin/x86_64-w64-mingw32-windres /usr/bin/windres
-    - go mod download
-    - TARGET_OS=windows BUILD_TAGS="build_qa pmapi_qa" make build
+    - BUILD_TAGS="build_qa" make build-ie
   artifacts:
-    name: "bridge-windows-qa-$CI_COMMIT_SHORT_SHA"
-    paths:
-      - bridge_*.tgz
-
-build-ie-windows:
-  extends: .build-windows-base
-  script:
-    # We need to install docker because qtdeploy builds for windows inside a docker container.
-    # Docker will connect to the dockerd daemon provided by the runner service docker:dind at tcp://docker:2375.
-    - curl -fsSL https://get.docker.com -o get-docker.sh && sh get-docker.sh
-    - apt-get update && apt-get -y install binutils-mingw-w64 tar gzip
-    - ln -s /usr/bin/x86_64-w64-mingw32-windres /usr/bin/windres
-    - go mod download
-    - TARGET_OS=windows make build-ie
-  artifacts:
-    name: "ie-windows-$CI_COMMIT_SHORT_SHA"
+    name: "ie-darwin-qa-$CI_COMMIT_SHORT_SHA"
     paths:
       - ie_*.tgz
 

.golangci.yml

@@ -1,3 +1,4 @@
+---
 run:
   timeout: 10m
   build-tags:
@@ -8,9 +9,11 @@ run:
 issues:
   exclude-use-default: false
   exclude:
-     - Using the variable on range scope `tt` in function literal
-     - should have comment (\([^)]+\) )?or be unexported # For now we are missing a lot of comments.
-     - at least one file in a package should have a package comment # For now we are missing a lot of comments.
+    - Using the variable on range scope `tt` in function literal
+    # For now we are missing a lot of comments.
+    - should have comment (\([^)]+\) )?or be unexported
+    # For now we are missing a lot of comments.
+    - at least one file in a package should have a package comment
 
   exclude-rules:
     - path: _test\.go
@@ -30,7 +33,7 @@ linters-settings:
 linters:
   # setting disable-all will make only explicitly enabled linters run
   disable-all: true
-  
+
   enable:
     - deadcode          # Finds unused code [fast: true, auto-fix: false]
     - errcheck          # Errcheck is a program for checking for unchecked errors in go programs. These unchecked errors can be critical bugs in some cases [fast: true, auto-fix: false]
@@ -49,7 +52,6 @@ linters:
     - funlen            # Tool for detection of long functions [fast: true, auto-fix: false]
     - gochecknoglobals  # Checks that no globals are present in Go code [fast: true, auto-fix: false]
     - gochecknoinits    # Checks that no init functions are present in Go code [fast: true, auto-fix: false]
-    #- gocognit          # Computes and checks the cognitive complexity of functions [fast: true, auto-fix: false]
     - goconst           # Finds repeated strings that could be replaced by a constant [fast: true, auto-fix: false]
     - gocritic          # The most opinionated Go source code linter [fast: true, auto-fix: false]
     - gocyclo           # Computes and checks the cyclomatic complexity of functions [fast: true, auto-fix: false]
@@ -58,15 +60,52 @@ linters:
     - goimports         # Goimports does everything that gofmt does. Additionally it checks unused imports [fast: true, auto-fix: true]
     - golint            # Golint differs from gofmt. Gofmt reformats Go source code, whereas golint prints out style mistakes [fast: true, auto-fix: false]
     - gosec             # Inspects source code for security problems [fast: true, auto-fix: false]
-    - interfacer        # Linter that suggests narrower interface types [fast: true, auto-fix: false]
-    - maligned          # Tool to detect Go structs that would take less memory if their fields were sorted [fast: true, auto-fix: false]
     - misspell          # Finds commonly misspelled English words in comments [fast: true, auto-fix: true]
     - nakedret          # Finds naked returns in functions greater than a specified function length [fast: true, auto-fix: false]
     - prealloc          # Finds slice declarations that could potentially be preallocated [fast: true, auto-fix: false]
-    - scopelint         # Scopelint checks for unpinned variables in go programs [fast: true, auto-fix: false]
     - stylecheck        # Stylecheck is a replacement for golint [fast: true, auto-fix: false]
     - unconvert         # Remove unnecessary type conversions [fast: true, auto-fix: false]
     - unparam           # Reports unused function parameters [fast: true, auto-fix: false]
     - whitespace        # Tool for detection of leading and trailing whitespace [fast: true, auto-fix: true]
-    #- wsl               # Whitespace Linter - Forces you to use empty lines! [fast: true, auto-fix: false]
-    #- lll               # Reports long lines [fast: true, auto-fix: false]
+    - asciicheck        # Simple linter to check that your code does not contain non-ASCII identifiers [fast: true, auto-fix: false]
+    - durationcheck     # check for two durations multiplied together [fast: false, auto-fix: false]
+    - exhaustive        # check exhaustiveness of enum switch statements [fast: false, auto-fix: false]
+    - exportloopref     # checks for pointers to enclosing loop variables [fast: false, auto-fix: false]
+    - forcetypeassert   # finds forced type assertions [fast: true, auto-fix: false]
+    - godot             # Check if comments end in a period [fast: true, auto-fix: true]
+    - goheader          # Checks is file header matches to pattern [fast: true, auto-fix: false]
+    - gomodguard        # Allow and block list linter for direct Go module dependencies. This is different from depguard where there are different block types for example version constraints and module recommendations. [fast: true, auto-fix: false]
+    - goprintffuncname  # Checks that printf-like functions are named with `f` at the end [fast: true, auto-fix: false]
+    - importas          # Enforces consistent import aliases [fast: false, auto-fix: false]
+    - makezero          # Finds slice declarations with non-zero initial length [fast: false, auto-fix: false]
+    - nilerr            # Finds the code that returns nil even if it checks that the error is not nil. [fast: false, auto-fix: false]
+    - predeclared       # find code that shadows one of Go's predeclared identifiers [fast: true, auto-fix: false]
+    - revive            # Fast, configurable, extensible, flexible, and beautiful linter for Go. Drop-in replacement of golint. [fast: false, auto-fix: false]
+    - rowserrcheck      # checks whether Err of rows is checked successfully [fast: false, auto-fix: false]
+    - sqlclosecheck     # Checks that sql.Rows and sql.Stmt are closed. [fast: false, auto-fix: false]
+    - tparallel         # tparallel detects inappropriate usage of t.Parallel() method in your Go test codes [fast: false, auto-fix: false]
+    - wastedassign      # wastedassign finds wasted assignment statements. [fast: false, auto-fix: false]
+    # - wsl               # Whitespace Linter - Forces you to use empty lines! [fast: true, auto-fix: false]
+    # - lll               # Reports long lines [fast: true, auto-fix: false]
+    # Consider to include:
+    # - gocognit          # Computes and checks the cognitive complexity of functions [fast: true, auto-fix: false]
+    # - cyclop            # checks function and package cyclomatic complexity [fast: false, auto-fix: false]
+    # - errorlint         # go-errorlint is a source code linter for Go software that can be used to find code that will cause problems with the error wrapping scheme introduced in Go 1.13. [fast: false, auto-fix: false]
+    # - exhaustivestruct  # Checks if all struct's fields are initialized [fast: false, auto-fix: false]
+    # - forbidigo         # Forbids identifiers [fast: true, auto-fix: false]
+    # - gci               # Gci control golang package import order and make it always deterministic. [fast: true, auto-fix: true]
+    # - gocognit          # Computes and checks the cognitive complexity of functions [fast: true, auto-fix: false]
+    # - goerr113          # Golang linter to check the errors handling expressions [fast: false, auto-fix: false]
+    # - gofumpt           # Gofumpt checks whether code was gofumpt-ed. [fast: true, auto-fix: true]
+    # - gomnd             # An analyzer to detect magic numbers. [fast: true, auto-fix: false]
+    # - gomoddirectives   # Manage the use of 'replace', 'retract', and 'excludes' directives in go.mod. [fast: true, auto-fix: false]
+    # - ifshort           # Checks that your code uses short syntax for if-statements whenever possible [fast: true, auto-fix: false]
+    # - nestif            # Reports deeply nested if statements [fast: true, auto-fix: false]
+    # - nlreturn          # nlreturn checks for a new line before return and branch statements to increase code clarity [fast: true, auto-fix: false]
+    # - noctx             # noctx finds sending http request without context.Context [fast: false, auto-fix: false]
+    # - nolintlint        # Reports ill-formed or insufficient nolint directives [fast: true, auto-fix: false]
+    # - paralleltest      # paralleltest detects missing usage of t.Parallel() method in your Go test [fast: true, auto-fix: false]
+    # - testpackage       # linter that makes you use a separate _test package [fast: true, auto-fix: false]
+    # - thelper           # thelper detects golang test helpers without t.Helper() call and checks the consistency of test helpers [fast: false, auto-fix: false]
+    # - wrapcheck         # Checks that errors returned from external packages are wrapped [fast: false, auto-fix: false]
+

BUILDS.md

@@ -1,6 +1,7 @@
 # Building ProtonMail Bridge and Import-Export app
 
 ## Prerequisites
+* 64-bit OS (the go-rfc5322 module cannot currently be compiled for 32-bit OSes)
 * Go 1.13
 * Bash with basic build utils: make, gcc, sed, find, grep, ...
 * For Windows it is recommended to use MinGW 64bit shell from [MSYS2](https://www.msys2.org/)
@@ -63,6 +64,11 @@ make build-ie
     * for `windows`, the binary will have the file extension `.exe` (e.g `proton-bridge.exe`)
     * for `darwin`, the application will be created with name of the project directory (e.g `proton-bridge.app`)
 
+### Launchers
+Launchers are only included in official distributions and provide the public
+key used to verify signed app binaries, allowing the automatic update feature.
+See README for more information.
+
 ### Tags
 Note that repository contains both Bridge and Import-Export apps and they are
 not released together. Therefore, each app has own tag prefix. Bridge tags

Changelog.md

@@ -2,10 +2,298 @@
 
 Changelog [format](http://keepachangelog.com/en/1.0.0/)
 
+## [Bridge 1.8.5] James
+
+### Fixed
+* GODT-1189: Draft created on Outlook is synced on web.
+* GODT-1190: Fix some random crashes of Bridge on Windows.
+* GODT-1191: Fix data loss of some drafts messages when restarting outlook on Windows.
+
+## [Bridge 1.8.4] James
+
+### Added
+* GODT-1155: Update gopenpgp v2.1.9 and use go-srp.
+* GODT-1044: Lite parser for appended messages.
+* GODT-1183: Add test for getting contact emails by email
+* GODT-1184: Preserve signatures in externally signed messages.
+
+### Changed
+* GODT-949: Ignore some InvalidMediaParameter errors in lite parser.
+
+### Fixed
+* GODT-1161: Guarantee order of responses when creating new message.
+* GODT-1162: Fix wrong section 1 error when email has no MIME parts.
+
+
+## [Bridge 1.8.3] James
+
+### Fixed
+* GODT-1182: Use correct contact route.
+
+
+## [Bridge 1.8.2] James
+
+### Fixed
+* GODT-1175: Bug reporting.
+
+
+## [Bridge 1.8.1] James
+
+### Fixed
+* GODT-1165: Handle UID FETCH with sequence range of empty mailbox.
+
+
+## [Bridge 1.8.0] James
+
+### Added
+* GODT-1056 Check encrypted size of the message before upload.
+* GODT-1143 Turn off SMTP server while no connection.
+* GODT-1089 Explicitly open system preferences window on BigSur.
+* GODT-35: Connection manager with resty.
+
+### Fixed
+* GODT-1159 SMTP server not restarting after restored internet.
+* GODT-1146 Refactor handling of fetching BODY[HEADER] (and similar) regarding trailing newline.
+* GODT-1152 Correctly resolve wildcard sequence/UID set.
+* GODT-876 Set default from if empty for importing draft.
+* Other: Avoid API jail.
+
+
+## [Bridge 1.7.1] Iron
+
+### Fixed
+* GODT-1081 Properly return newlines when returning headers.
+* GODT-1150 Externally encrypted messages with missing private key would not be built with custom message.
+* GODT-1141 Attachment is named as attachment.bin in some cases.
+
+
+## [Bridge 1.7.0] Iron
+
+### Added
+* GODT-213 New message builder:
+* Preserve Content-Type for undecryptable message body.
+* Use application/octet-stream for encrypted parts.
+* Force no transfer encoding for embedded message/rfc822 parts.
+* Remove dead code GetRelatedHeader/GetRelatedBoundary.
+* Correctly expect text/plain in custom message text parts.
+* Force text/plain for custom message text part.
+* Complex external encrypted tests (multipart/alternative, message/rfc822 attachment).
+
+### Fixed
+* GODT-1136 DB Cache header from builder and test.
+* GODT-1113 Fix tray icon size on macOS Big Sur.
+* GODT-947 Force colors in logs.
+
+
+## [Bridge 1.6.9] HZM
+
+### Fixed
+* GODT-1121 'Keep the application up to date' switches off after restarting Bridge.
+
+
+## [Bridge 1.6.8] HZM
+
+### Fixed
+* GODT-1120 Use Info level in internal/app logs.
+
+
+## [IE 1.3.3] Farg
+
+### Fixed
+* GODT-1120 Use Info level in internal/app logs.
+
+
+## [Bridge 1.6.7] HZM
+
+### Added
+* GODT-1111 Add correct metadata to Windows executables.
+* GODT-1112 Add application to Windows Firewall exclusion list on install.
+* GODT-1077 Track how many times message is built to help understand re-syncs.
+
+### Changed
+* GODT-247 Revise all storage locations (cache, config, local etc).
+
+### Fixed
+* GODT-948 Parser does not handle embedding of Content-Type: message/rfc822.
+* GODT-1079 Correct 9001 error handling on login.
+
+### Security
+* GODT-1105 Dylib Hijacking security fix.
+
+
+## [IE 1.3.2] Farg
+
+### Added
+* GODT-1111 Add correct metadata to Windows executables.
+* GODT-1112 Add application to Windows Firewall exclusion list on install.
+
+### Changed
+* GODT-247 Revise all storage locations (cache, config, local etc).
+
+### Fixed
+* GODT-1079 Correct 9001 error handling on login.
+
+### Security
+* GODT-1105 Dylib Hijacking security fix.
+
+
+## [IE 1.3.1] Farg
+
+### Changed
+* GODT-1047 No silent updates for Import-Export app.
+* GODT-247 Cache and update files moved from user's cache to config.
+
+### Fixed
+* Other: include latest go.mod/go.sum changes.
+* GODT-803 Fix import to wrong target address.
+* GODT-948 Embedded messages.
+* GODT-1043 Fix showing long login error in GUI dialog.
+
+
+## [Bridge 1.6.6] HZM
+
+### Added
+* Other: QA build checks for update every 5 minutes.
+* Other: QA build adds debug message dump when sending.
+
+### Changed
+* GODT-1045 build without Qt by default.
+
+### Fixed
+* GODT-1029 Fix tray icon not updating under certain conditions.
+* GODT-1062 Fix lost notification bar when window is closed.
+* GODT-1058 Install version after chaning channel right away only in case of downgrade.
+* GODT-1073 Re-write autostart link on every start if turned on in preferences.
+* GODT-1055 Fix flaky empty trash test.
+
+
+## [Bridge 1.6.5] HZM
+
+### Changed
+* GODT-1059 Check if keychain is usable on linux before using it by default.
+
+
+## [Bridge 1.6.4] HZM
+
+### Added
+* Other: Autoupdates CLI commands.
+
+### Removed
+* Other: Remove credits.
+
+### Changed
+* GODT-980 Placeholder for user agent.
+* GODT-1036 Event loop Sentry reporting of failures and refresh.
+* GODT-957 Increase space to hide difference.
+* GODT-937 Add keychain switcher to frontend.
+* GODT-1008 Fix transparent dialog under certain conditions.
+* GODT-1034 More tolerant connection speed detection.
+* GODT-1018 Pre-push git hook to check lints.
+* Other: Make all command line flags as const strings.
+* GODT-1041 Log IMAP requests to debug Apple Mail re-sync issue.
+* Other: Pretty print prefs.json.
+
+### Fixed
+* Other: Fix nogui build.
+* GODT-317 Fix wrong total mailbox size in Apple Mail.
+* Other: Fixing changelog punctuation.
+* GODT-797 APPEND waits for EXPUNGE to prevent data loss when Outlook moves from Spam or Trash.
+
+
+## [Bridge 1.6.3] HZM
+
+### Added
+* GODT-337 Desktop files.
+
+### Changed
+* GODT-885 Do not explicitly unlabel folders during move to match behaviour of other clients.
+* GODT-616 Better user message about wrong mailbox password.
+* GODT-1021 Do not allow copy Inbox->Sent or Sent->Inbox.
+* GODT-976 Exclude updates from clearing cache and clear cache, including updates, while switching early access off.
+* GODT-1033 Retry starting IMAP server after connection was down.
+
+### Fixed
+* GODT-1011 Stable integration test deleting many messages using UID EXPUNGE.
+* GODT-1015 Use lenient version parser to properly parse version provided by Mac.
+* GODT-919 Notify about update right after the start.
+* GODT-919 GODT-1022 Logs and signals.
+
+
+## [IE 1.3.0] Farg
+
+### Changed
+* GODT-1019 Remove dependency on go-apple-mobileconfig.
+* GODT-928 Reject messages which are too large.
+* GODT-999 Sending: do not send empty objects to API.
+
+## [Bridge 1.6.2] HZM
+
+### Fixed
+* GODT-1010 Strip angle brackets from external ID.
+
+## [Bridge 1.6.1] HZM
+
+### Added
+* GODT-1007 Notify user when version is the latest.
+
+### Fixed
+* GODT-787 GODT-978 Fix IE and Bridge importing to Sent not showing up in Inbox (setting up flags properly).
+* GODT-1006 Use correct macOS keychain name.
+* GODT-1009 Set ContentID if present and not explicitly attachment.
+* GODT-1008 Transparent welcome message.
+
+
+## [Bridge 1.6.0] HZM
+
+### Added
+* GODT-705 Allow silent update in Bridge and Import-Export app.
+* GODT-958 Release notes per eaach update channel.
+* GODT-875 Added GUI dialog on force update.
+* GODT-820 Added GUI notification on impossibility of update installation (both silent and manual).
+* GODT-870 Added GUI notification on error during silent update.
+* GODT-805 Added GUI notification on update available.
+* GODT-804 Added GUI notification on silent update installed (promt to restart).
+* GODT-275 Added option to disable autoupdates in settings (default autoupdate is enabled).
+* GODT-874 Added manual triggers to Updater module.
+* GODT-851 Added support of UID EXPUNGE.
+
+### Removed
+* GODT-248 Remove dependency on go-appdir.
+* GODT-208 Remove deprecated use of BuildNameToCertificate.
+
+### Fixed
+* Check deprecated status code first to better determine API error.
+* GODT-831 Fix reporting bug from accounts with empty account name.
+* GODT-831 Cancel request of uploading attachment if reading/writing it fails.
+* GODT-991 Fix panic when stopping import progress during loading mailboxes info.
+* GODT-895 Fix panic when modifying addresses during changing address mode.
+* GODT-946 Fix flaky tests notifying changes.
+* GODT-979 Fix panic when trying to parse a multipart/alternative section that has no child sections.
+* GODT-900 Remove \Deleted flag after re-importing the message (do not delete messages by moving to local folder and back).
+
+### Changed
+* Rename channels `beta->early`, `live->stable`.
+* Bump gopenpgp dependency to v2.1.3 for improved memory usage.
+* GODT-97 Don't log errors caused by SELECT "".
+* GODT-806 GUI dialog on manual update. Added autoupdates checkbox. Simplifyed installation process GUI.
+* GODT-912 Scroll bar behaviour in settings tab.
+* GODT-149 Send heartbeat ASAP on each new calendar day.
+* GODT-792 Stop IMAP server while no internet connection.
+* GODT-792 Cache message size every time to reduce network traffic.
+* GODT-792 Cache body structure in order to reduce network traffic.
+* GODT-792 GODT-908 Cache body structure in order to reduce network traffic.
+* GODT-908 Do not unpause event loop if other mailbox is still fetching.
+
+
+## [Bridge 1.5.7] Golden Gate
+
+### Fixed
+CSB-331 Fix sending error due to mixed case in sender address.
+
 ## [Bridge 1.5.6] Golden Gate
 
 ### Added
-* GODT-797 EXPUNGE waits for APPEND to prevent data loss when Outlook moves from Spam to Inbox
+* GODT-797 EXPUNGE waits for APPEND to prevent data loss when Outlook moves from Spam to Inbox.
 
 
 ## [Bridge 1.5.5] Golden Gate
@@ -68,7 +356,6 @@ Changelog [format](http://keepachangelog.com/en/1.0.0/)
 * GODT-878 Tests for send packet creation logic.
 
 ### Changed
-* GODT-180 Updated Sentry client.
 * GODT-651 Build creates proper binary names.
 * GODT-878 Fix an issue where the random session key is inadvertently sent to
   the Proton server. The data payload is always encrypted within TLS, but this
@@ -109,6 +396,7 @@ Changelog [format](http://keepachangelog.com/en/1.0.0/)
 * GODT-763 Detect Gmail labels from All Mail mbox export (using X-Gmail-Label header).
 * GODT-834 Info about tags in BUILDS.md and link to Import-Export page in README.md.
 * GODT-777 Support Apple Mail MBOX export format.
+* GODT-731 Re-open Import-Export app from the second instance.
 
 ### Fixed
 * GODT-677 Windows IE: global import settings not fit in window.
@@ -165,6 +453,7 @@ Changelog [format](http://keepachangelog.com/en/1.0.0/)
 ### Fixed
 * GODT-770 Better handling of extraneous end-of-mail indicator.
 * GODT-776 Fix crash when IMAP client connects while account is logging in.
+* GODT-744 User agent not being sent to sentry.
 
 ### Changed
 * Bump crypto version to v0.0.0-20200818122824-ed5d25e28db8.
@@ -198,6 +487,7 @@ Changelog [format](http://keepachangelog.com/en/1.0.0/)
 * GODT-682 Persistent anonymous API cookies for Import-Export.
 * GODT-357 Use go-message to make a better message parser.
 * GODT-720 Time measurement of progress for Import-Export.
+* GODT-693 Launcher.
 
 ### Changed
 * GODT-511 User agent format changed.

Makefile

@@ -7,17 +7,19 @@ TARGET_CMD?=Desktop-Bridge
 TARGET_OS?=${GOOS}
 
 ## Build
-.PHONY: build build-ie build-nogui build-ie-nogui check-has-go
+.PHONY: build build-ie build-nogui build-ie-nogui build-launcher build-launcher-ie  versioner hasher
 
 # Keep version hardcoded so app build works also without Git repository.
-BRIDGE_APP_VERSION?=1.5.6-git
-IE_APP_VERSION?=1.2.3-git
+BRIDGE_APP_VERSION?=1.8.5+git
+IE_APP_VERSION?=1.3.3+git
 APP_VERSION:=${BRIDGE_APP_VERSION}
 SRC_ICO:=logo.ico
 SRC_ICNS:=Bridge.icns
 SRC_SVG:=logo.svg
 TGT_ICNS:=Bridge.icns
 EXE_NAME:=proton-bridge
+CONFIGNAME:=bridge
+WINDRES_DEFINE:=BUILD_BRIDGE
 ifeq "${TARGET_CMD}" "Import-Export"
     APP_VERSION:=${IE_APP_VERSION}
     SRC_ICO:=ie.ico
@@ -25,20 +27,28 @@ ifeq "${TARGET_CMD}" "Import-Export"
     SRC_SVG:=ie.svg
     TGT_ICNS:=ImportExport.icns
     EXE_NAME:=proton-ie
+    CONFIGNAME:=importExport
+	WINDRES_DEFINE:=BUILD_IE
 endif
 REVISION:=$(shell git rev-parse --short=10 HEAD)
 BUILD_TIME:=$(shell date +%FT%T%z)
 
-BUILD_TAGS?=pmapi_prod
 BUILD_FLAGS:=-tags='${BUILD_TAGS}'
-BUILD_FLAGS_NOGUI:=-tags='${BUILD_TAGS} nogui'
-GO_LDFLAGS:=$(addprefix -X github.com/ProtonMail/proton-bridge/pkg/constants.,Version=${APP_VERSION} Revision=${REVISION} BuildTime=${BUILD_TIME})
+BUILD_FLAGS_LAUNCHER:=${BUILD_FLAGS}
+BUILD_FLAGS_GUI:=-tags='${BUILD_TAGS} build_qt'
+GO_LDFLAGS:=$(addprefix -X github.com/ProtonMail/proton-bridge/internal/constants.,Version=${APP_VERSION} Revision=${REVISION} BuildTime=${BUILD_TIME})
 ifneq "${BUILD_LDFLAGS}" ""
-    GO_LDFLAGS+= ${BUILD_LDFLAGS}
+    GO_LDFLAGS+=${BUILD_LDFLAGS}
 endif
-GO_LDFLAGS:=-ldflags '${GO_LDFLAGS}'
-BUILD_FLAGS+= ${GO_LDFLAGS}
-BUILD_FLAGS_NOGUI+= ${GO_LDFLAGS}
+GO_LDFLAGS_LAUNCHER:=${GO_LDFLAGS}
+GO_LDFLAGS_LAUNCHER+=$(addprefix -X main.,ConfigName=${CONFIGNAME} ExeName=proton-${APP})
+ifeq "${TARGET_OS}" "windows"
+    GO_LDFLAGS_LAUNCHER+=-H=windowsgui
+endif
+
+BUILD_FLAGS+=-ldflags '${GO_LDFLAGS}'
+BUILD_FLAGS_GUI+=-ldflags '${GO_LDFLAGS}'
+BUILD_FLAGS_LAUNCHER+=-ldflags '${GO_LDFLAGS_LAUNCHER}'
 
 DEPLOY_DIR:=cmd/${TARGET_CMD}/deploy
 ICO_FILES:=
@@ -48,7 +58,7 @@ EXE_QT:=${DIRNAME}
 ifeq "${TARGET_OS}" "windows"
     EXE:=${EXE}.exe
     EXE_QT:=${EXE_QT}.exe
-    ICO_FILES:=${SRC_ICO} icon.rc icon_windows.syso
+    RESOURCE_FILE:=resource.syso
 endif
 ifeq "${TARGET_OS}" "darwin"
     DARWINAPP_CONTENTS:=${DEPLOY_DIR}/darwin/${EXE}.app/Contents
@@ -71,23 +81,43 @@ else
 endif
 
 build: ${TGZ_TARGET}
+
 build-ie:
 	TARGET_CMD=Import-Export $(MAKE) build
 
-build-nogui:
-	go build ${BUILD_FLAGS_NOGUI} -o ${EXE_NAME} cmd/${TARGET_CMD}/main.go
+build-nogui: gofiles
+	go build ${BUILD_FLAGS} -o ${EXE_NAME} cmd/${TARGET_CMD}/main.go
 
 build-ie-nogui:
 	TARGET_CMD=Import-Export $(MAKE) build-nogui
 
+ifeq "${GOOS}" "windows"
+  	PRERESOURCECMD:=cp ./resource.syso ./cmd/launcher/resource.syso
+	POSTRESOURCECMD:=rm -f ./cmd/launcher/resource.syso
+endif
+build-launcher: ${RESOURCE_FILE}
+	${PRERESOURCECMD}
+	go build ${BUILD_FLAGS_LAUNCHER} -o launcher-${EXE} ./cmd/launcher/
+	${POSTRESOURCECMD}
+
+build-launcher-ie:
+	TARGET_CMD=Import-Export $(MAKE) build-launcher
+
+versioner:
+	go build ${BUILD_FLAGS} -o versioner utils/versioner/main.go
+
+hasher:
+	go build -o hasher utils/hasher/main.go
+
 ${TGZ_TARGET}: ${DEPLOY_DIR}/${TARGET_OS}
 	rm -f $@
-	cd ${DEPLOY_DIR} && tar czf ../../../$@ ${TARGET_OS}
+	cd ${DEPLOY_DIR}/${TARGET_OS} && tar czf ../../../../$@ .
 
 ${DEPLOY_DIR}/linux: ${EXE_TARGET}
 	cp -pf ./internal/frontend/share/icons/${SRC_SVG} ${DEPLOY_DIR}/linux/logo.svg
 	cp -pf ./LICENSE ${DEPLOY_DIR}/linux/
 	cp -pf ./Changelog.md ${DEPLOY_DIR}/linux/
+	cp -pf ./dist/${EXE_NAME}.desktop ${DEPLOY_DIR}/linux/
 
 ${DEPLOY_DIR}/darwin: ${EXE_TARGET}
 	if [ "${DIRNAME}" != "${EXE_NAME}" ]; then \
@@ -112,21 +142,20 @@ ifneq "${GOOS}" "${TARGET_OS}"
   endif
 endif
 
-${EXE_TARGET}: check-has-go gofiles ${ICO_FILES} ${VENDOR_TARGET}
+${EXE_TARGET}: check-has-go gofiles ${RESOURCE_FILE} ${VENDOR_TARGET}
 	rm -rf deploy ${TARGET_OS} ${DEPLOY_DIR}
 	cp cmd/${TARGET_CMD}/main.go .
-	qtdeploy ${BUILD_FLAGS} ${QT_BUILD_TARGET}
+	qtdeploy ${BUILD_FLAGS_GUI} ${QT_BUILD_TARGET}
 	mv deploy cmd/${TARGET_CMD}
 	if [ "${EXE_QT_TARGET}" != "${EXE_TARGET}" ]; then mv ${EXE_QT_TARGET} ${EXE_TARGET}; fi
 	rm -rf ${TARGET_OS} main.go
 
-logo.ico ie.ico: ./internal/frontend/share/icons/${SRC_ICO}
-	cp $^ $@
-icon.rc: ./internal/frontend/share/icon.rc
-	cp $^ .
-icon_windows.syso: icon.rc logo.ico
-	windres --target=pe-x86-64 -o $@ $<
 
+WINDRES_YEAR:=$(shell date +%Y)
+APP_VERSION_COMMA:=$(shell echo "${APP_VERSION}" | sed -e 's/[^0-9,.]*//g' -e 's/\./,/g')
+resource.syso: ./internal/frontend/share/info.rc ./internal/frontend/share/icons/${SRC_ICO} .FORCE
+	rm -f ./*.syso
+	windres --target=pe-x86-64 -I ./internal/frontend/share/icons/ -D ${WINDRES_DEFINE} -D ICO_FILE=${SRC_ICO} -D EXE_NAME="${EXE_NAME}" -D FILE_VERSION="${APP_VERSION}" -D ORIGINAL_FILE_NAME="${EXE}" -D PRODUCT_VERSION="${APP_VERSION}" -D FILE_VERSION_COMMA=${APP_VERSION_COMMA} -D YEAR=${WINDRES_YEAR} -o $@ $<
 
 ## Rules for therecipe/qt
 .PHONY: prepare-vendor update-vendor update-qt-docs
@@ -136,6 +165,7 @@ THERECIPE_ENV:=github.com/therecipe/env_${TARGET_OS}_amd64_513
 # therecipe/env in order to download it only once
 vendor-cache/${THERECIPE_ENV}:
 	git clone https://${THERECIPE_ENV}.git vendor-cache/${THERECIPE_ENV}
+	if [ "${TARGET_OS}" == "darwin" ]; then cp -f "./utils/QTBUG-88600/libqcocoa.dylib" "./vendor-cache/${THERECIPE_ENV}/5.13.0/clang_64/plugins/platforms/"; fi;
 
 # The command used to make symlinks is different on windows.
 # So if the GOOS is windows and we aren't crossbuilding (in which case the host os would still be *nix)
@@ -158,8 +188,8 @@ update-qt-docs:
 	go get github.com/therecipe/qt/internal/binding/files/docs/$(QT_API)
 
 ## Dev dependencies
-.PHONY: install-devel-tools install-linter install-go-mod-outdated
-LINTVER:="v1.29.0"
+.PHONY: install-devel-tools install-linter install-go-mod-outdated install-git-hooks
+LINTVER:="v1.39.0"
 LINTSRC:="https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh"
 
 install-dev-dependencies: install-devel-tools install-linter install-go-mod-outdated
@@ -175,9 +205,12 @@ install-linter: check-has-go
 install-go-mod-outdated:
 	which go-mod-outdated || go get -u github.com/psampaz/go-mod-outdated
 
+install-git-hooks:
+	cp utils/githooks/* .git/hooks/
+	chmod +x .git/hooks/*
 
 ## Checks, mocks and docs
-.PHONY: check-has-go add-license change-copyright-year test bench coverage mocks lint-license lint-golang lint updates doc
+.PHONY: check-has-go add-license change-copyright-year test bench coverage mocks lint-license lint-golang lint updates doc release-notes
 check-has-go:
 	@which go || (echo "Install Go-lang!" && exit 1)
 
@@ -192,18 +225,24 @@ test: gofiles
 	go test -coverprofile=/tmp/coverage.out -run=${TESTRUN} \
 		./internal/api/... \
 		./internal/bridge/... \
+		./internal/config/... \
+		./internal/constants/... \
+		./internal/cookies/... \
+		./internal/crash/... \
 		./internal/events/... \
 		./internal/frontend/autoconfig/... \
 		./internal/frontend/cli/... \
 		./internal/imap/... \
-		./internal/metrics/... \
 		./internal/importexport/... \
-		./internal/preferences/... \
+		./internal/locations/... \
+		./internal/logging/... \
+		./internal/metrics/... \
 		./internal/smtp/... \
 		./internal/store/... \
 		./internal/transfer/... \
-		./internal/updates/... \
+		./internal/updater/... \
 		./internal/users/... \
+		./internal/versioner/... \
 		./pkg/...
 
 bench:
@@ -214,20 +253,25 @@ bench:
 coverage: test
 	go tool cover -html=/tmp/coverage.out -o=coverage.html
 
-mocks:
-	mockgen --package mocks github.com/ProtonMail/proton-bridge/internal/users Configer,PanicHandler,ClientManager,CredentialsStorer,StoreMaker > internal/users/mocks/mocks.go
-	mockgen --package mocks github.com/ProtonMail/proton-bridge/internal/transfer PanicHandler,ClientManager,IMAPClientProvider > internal/transfer/mocks/mocks.go
-	mockgen --package mocks github.com/ProtonMail/proton-bridge/internal/store PanicHandler,ClientManager,BridgeUser,ChangeNotifier > internal/store/mocks/mocks.go
-	mockgen --package mocks github.com/ProtonMail/proton-bridge/pkg/listener Listener > internal/store/mocks/utils_mocks.go
-	mockgen --package mocks github.com/ProtonMail/proton-bridge/pkg/pmapi Client > pkg/pmapi/mocks/mocks.go
+integration-test-bridge:
+	${MAKE} -C test test-bridge
 
-lint: lint-golang lint-license lint-changelog
+mocks:
+	mockgen --package mocks github.com/ProtonMail/proton-bridge/internal/users Locator,PanicHandler,CredentialsStorer,StoreMaker > internal/users/mocks/mocks.go
+	mockgen --package mocks github.com/ProtonMail/proton-bridge/pkg/listener Listener > internal/users/mocks/listener_mocks.go
+	mockgen --package mocks github.com/ProtonMail/proton-bridge/internal/transfer PanicHandler,IMAPClientProvider > internal/transfer/mocks/mocks.go
+	mockgen --package mocks github.com/ProtonMail/proton-bridge/internal/store PanicHandler,BridgeUser,ChangeNotifier > internal/store/mocks/mocks.go
+	mockgen --package mocks github.com/ProtonMail/proton-bridge/pkg/listener Listener > internal/store/mocks/utils_mocks.go
+	mockgen --package mocks github.com/ProtonMail/proton-bridge/pkg/pmapi Client,Manager > pkg/pmapi/mocks/mocks.go
+	mockgen --package mocks github.com/ProtonMail/proton-bridge/pkg/message Fetcher > pkg/message/mocks/mocks.go
+
+lint: gofiles lint-golang lint-license lint-changelog
 
 lint-license:
 	./utils/missing_license.sh check
 
 lint-changelog:
-	./utils/changelog_linter.sh
+	./utils/changelog_linter.sh Changelog.md
 
 lint-golang:
 	which golangci-lint || $(MAKE) install-linter
@@ -241,25 +285,29 @@ updates: install-go-mod-outdated
 doc:
 	godoc -http=:6060
 
+release-notes: release-notes/bridge_stable.html release-notes/bridge_early.html release-notes/ie_stable.html release-notes/ie_early.html
+
+release-notes/%.html: release-notes/%.md
+	./utils/release_notes.sh $^
+
 .PHONY: gofiles
 # Following files are for the whole app so it makes sense to have them in bridge package.
 # (Options like cmd or internal were considered and bridge package is the best place for them.)
-gofiles: ./internal/bridge/credits.go ./internal/bridge/release_notes.go ./internal/importexport/credits.go ./internal/importexport/release_notes.go
+gofiles: ./internal/bridge/credits.go ./internal/importexport/credits.go
 ./internal/bridge/credits.go: ./utils/credits.sh go.mod
 	cd ./utils/ && ./credits.sh bridge
-./internal/bridge/release_notes.go: ./utils/release-notes.sh ./release-notes/notes-bridge.txt ./release-notes/bugs-bridge.txt
-	cd ./utils/ && ./release-notes.sh bridge
 ./internal/importexport/credits.go: ./utils/credits.sh go.mod
 	cd ./utils/ && ./credits.sh importexport
-./internal/importexport/release_notes.go: ./utils/release-notes.sh ./release-notes/notes-importexport.txt ./release-notes/bugs-importexport.txt
-	cd ./utils/ && ./release-notes.sh importexport
 
 
 ## Run and debug
 .PHONY: run run-qt run-qt-cli run-nogui run-nogui-cli run-debug run-qml-preview run-ie-qml-preview run-ie run-ie-qt run-ie-qt-cli run-ie-nogui run-ie-nogui-cli clean-vendor clean-frontend-qt clean-frontend-qt-ie clean-frontend-qt-common clean
 
-VERBOSITY?=debug-client
-RUN_FLAGS:=-m -l=${VERBOSITY}
+LOG?=debug
+LOG_IMAP?=client # client/server/all, or empty to turn it off
+LOG_SMTP?=--log-smtp # empty to turn it off
+RUN_FLAGS?=-m -l=${LOG} --log-imap=${LOG_IMAP} ${LOG_SMTP}
+RUN_FLAGS_IE?=-m -l=${LOG}
 
 run: run-nogui-cli
 
@@ -269,12 +317,12 @@ run-qt-cli: ${EXE_TARGET}
 	PROTONMAIL_ENV=dev ./$< ${RUN_FLAGS} -c
 
 run-nogui: clean-vendor gofiles
-	PROTONMAIL_ENV=dev go run ${BUILD_FLAGS_NOGUI} cmd/${TARGET_CMD}/main.go ${RUN_FLAGS} | tee last.log
+	PROTONMAIL_ENV=dev go run ${BUILD_FLAGS} cmd/${TARGET_CMD}/main.go ${RUN_FLAGS} | tee last.log
 run-nogui-cli: clean-vendor gofiles
-	PROTONMAIL_ENV=dev go run ${BUILD_FLAGS_NOGUI} cmd/${TARGET_CMD}/main.go ${RUN_FLAGS} -c
+	PROTONMAIL_ENV=dev go run ${BUILD_FLAGS} cmd/${TARGET_CMD}/main.go ${RUN_FLAGS} -c
 
 run-debug:
-	PROTONMAIL_ENV=dev dlv debug --build-flags "${BUILD_FLAGS_NOGUI}" cmd/${TARGET_CMD}/main.go -- ${RUN_FLAGS}
+	PROTONMAIL_ENV=dev dlv debug --build-flags "${BUILD_FLAGS}" cmd/${TARGET_CMD}/main.go -- ${RUN_FLAGS}
 
 run-qml-preview:
 	$(MAKE) -C internal/frontend/qt -f Makefile.local qmlpreview
@@ -282,11 +330,11 @@ run-ie-qml-preview:
 	$(MAKE) -C internal/frontend/qt-ie -f Makefile.local qmlpreview
 
 run-ie:
-	TARGET_CMD=Import-Export $(MAKE) run
+	TARGET_CMD=Import-Export RUN_FLAGS="${RUN_FLAGS_IE}" $(MAKE) run
 run-ie-qt:
-	TARGET_CMD=Import-Export $(MAKE) run-qt
+	TARGET_CMD=Import-Export RUN_FLAGS="${RUN_FLAGS_IE}" $(MAKE) run-qt
 run-ie-nogui:
-	TARGET_CMD=Import-Export $(MAKE) run-nogui
+	TARGET_CMD=Import-Export RUN_FLAGS="${RUN_FLAGS_IE}" $(MAKE) run-nogui
 
 clean-frontend-qt:
 	$(MAKE) -C internal/frontend/qt -f Makefile.local clean
@@ -303,4 +351,13 @@ clean: clean-vendor
 	rm -rf cmd/Desktop-Bridge/deploy
 	rm -rf cmd/Import-Export/deploy
 	rm -f build last.log mem.pprof main.go
-	rm -rf logo.ico icon.rc icon_windows.syso internal/frontend/qt/icon_windows.syso
+	rm -f resource.syso
+	rm -f release-notes/bridge.html
+	rm -f release-notes/import-export.html
+
+.PHONY: generate
+generate:
+	go generate ./...
+	$(MAKE) add-license
+
+.FORCE:

README.md

@@ -37,6 +37,18 @@ check the results.
 
 More details [on the public website](https://protonmail.com/import-export).
 
+## Launchers
+Launchers are binaries used to run the ProtonMail Bridge or Import-Export apps.
+
+Official distributions of the ProtonMail Bridge and Import-Export apps contain
+both a launcher and the app itself. The launcher is installed in a protected
+area of the system (i.e. an area accessible only with admin privileges) and is
+used to run the app. The launcher ensures that nobody tampered with the app's
+files by verifying their signature using a hardcoded public key. App files are
+placed in regular userspace and are signed by Proton's private key. This
+feature enables the app to securely update itself automatically without asking
+the user for a password.
+
 ## Keychain
 You need to have a keychain in order to run the ProtonMail Bridge. On Mac or
 Windows, Bridge uses native credential managers. On Linux, use
@@ -72,9 +84,9 @@ The database stores metadata necessary for presenting messages and mailboxes to
 
 ### Preferences
 User preferences are stored in json at the following location:
-- Linux: `~/.cache/protonmail/bridge/<cacheVersion>/prefs.json` (unless `XDG_CACHE_HOME` is set, in which case that is used as your `~`)
-- macOS: `~/Library/Caches/protonmail/bridge/<cacheVersion>/prefs.json`
-- Windows: `%LOCALAPPDATA%\protonmail\bridge\<cacheVersion>\prefs.json`
+- Linux: `~/.config/protonmail/bridge/prefs.json`
+- macOS: `~/Library/ApplicationSupport/protonmail/bridge/prefs.json`
+- Windows: `%APPDATA%\protonmail\bridge\prefs.json`
 
 ### IMAP Cache
 The currently subscribed mailboxes are held in a json file:

cmd/Desktop-Bridge/main.go

@@ -35,261 +35,40 @@ package main
 */
 
 import (
-	"io/ioutil"
 	"os"
-	"runtime/pprof"
 
-	"github.com/ProtonMail/proton-bridge/internal/api"
-	"github.com/ProtonMail/proton-bridge/internal/bridge"
-	"github.com/ProtonMail/proton-bridge/internal/cmd"
-	"github.com/ProtonMail/proton-bridge/internal/cookies"
-	"github.com/ProtonMail/proton-bridge/internal/events"
-	"github.com/ProtonMail/proton-bridge/internal/frontend"
-	"github.com/ProtonMail/proton-bridge/internal/imap"
-	"github.com/ProtonMail/proton-bridge/internal/preferences"
-	"github.com/ProtonMail/proton-bridge/internal/smtp"
-	"github.com/ProtonMail/proton-bridge/internal/updates"
-	"github.com/ProtonMail/proton-bridge/internal/users/credentials"
-	"github.com/ProtonMail/proton-bridge/pkg/config"
-	"github.com/ProtonMail/proton-bridge/pkg/constants"
-	"github.com/ProtonMail/proton-bridge/pkg/listener"
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
-	"github.com/allan-simon/go-singleinstance"
+	"github.com/ProtonMail/proton-bridge/internal/app/base"
+	"github.com/ProtonMail/proton-bridge/internal/app/bridge"
 	"github.com/sirupsen/logrus"
-	"github.com/urfave/cli"
 )
 
 const (
-	// cacheVersion is used for cache files such as lock, events, preferences, user_info, db files.
-	// Different number will drop old files and create new ones.
-	cacheVersion = "c11"
-
-	appName = "bridge"
-)
-
-var (
-	log = logrus.WithField("pkg", "main") //nolint[gochecknoglobals]
+	appName       = "ProtonMail Bridge"
+	appUsage      = "ProtonMail IMAP and SMTP Bridge"
+	configName    = "bridge"
+	updateURLName = "bridge"
+	keychainName  = "bridge"
+	cacheVersion  = "c11"
 )
 
 func main() {
-	cmd.Main(
-		"ProtonMail Bridge",
-		"ProtonMail IMAP and SMTP Bridge",
-		[]cli.Flag{
-			cli.BoolFlag{
-				Name:  "no-window",
-				Usage: "Don't show window after start"},
-			cli.BoolFlag{
-				Name:  "noninteractive",
-				Usage: "Start Bridge entirely noninteractively"},
-		},
-		run,
+	base, err := base.New(
+		appName,
+		appUsage,
+		configName,
+		updateURLName,
+		keychainName,
+		cacheVersion,
 	)
-}
-
-// run initializes and starts everything in a precise order.
-//
-// IMPORTANT: ***Read the comments before CHANGING the order ***
-func run(context *cli.Context) (contextError error) { // nolint[funlen]
-	// We need to have config instance to setup a logs, panic handler, etc ...
-	cfg := config.New(appName, constants.Version, constants.Revision, cacheVersion)
-
-	// We want to know about any problem. Our PanicHandler calls sentry which is
-	// not dependent on anything else. If that fails, it tries to create crash
-	// report which will not be possible if no folder can be created. That's the
-	// only problem we will not be notified about in any way.
-	panicHandler := &cmd.PanicHandler{
-		AppName: "ProtonMail Bridge",
-		Config:  cfg,
-		Err:     &contextError,
-	}
-	defer panicHandler.HandlePanic()
-
-	// First we need config and create necessary folder; it's dependency for everything.
-	if err := cfg.CreateDirs(); err != nil {
-		log.Fatal("Cannot create necessary folders: ", err)
-	}
-
-	// Setup of logs should be as soon as possible to ensure we record every wanted report in the log.
-	logLevel := context.GlobalString("log-level")
-	debugClient, debugServer := config.SetupLog(cfg, logLevel)
-
-	// Doesn't make sense to continue when Bridge was invoked with wrong arguments.
-	// We should tell that to the user before we do anything else.
-	if context.Args().First() != "" {
-		_ = cli.ShowAppHelp(context)
-		return cli.NewExitError("Unknown argument", 4)
-	}
-
-	// It's safe to get version JSON file even when other instance is running.
-	// (thus we put it before check of presence of other Bridge instance).
-	updates := updates.NewBridge(cfg.GetUpdateDir())
-
-	if dir := context.GlobalString("version-json"); dir != "" {
-		cmd.GenerateVersionFiles(updates, dir)
-		return nil
-	}
-
-	// Should be called after logs are configured but before preferences are created.
-	migratePreferencesFromC10(cfg)
-
-	// ClearOldData before starting new bridge to do a proper setup.
-	//
-	// IMPORTANT: If you the change position of this you will need to wait
-	// until force-update to be applied on all currently used bridge
-	// versions
-	if err := cfg.ClearOldData(); err != nil {
-		log.Error("Cannot clear old data: ", err)
-	}
-
-	// GetTLSConfig is needed for IMAP, SMTL and local bridge API (to check second instance).
-	//
-	// This should be called after ClearOldData, in order to re-create the
-	// certificates if clean data will remove them (accidentally or on purpose).
-	tls, err := config.GetTLSConfig(cfg)
-	if err != nil {
-		log.WithError(err).Fatal("Cannot get TLS certificate")
-	}
-
-	pref := preferences.New(cfg)
-
-	// Now we can try to proceed with starting the bridge. First we need to ensure
-	// this is the only instance. If not, we will end and focus the existing one.
-	lock, err := singleinstance.CreateLockFile(cfg.GetLockPath())
-	if err != nil {
-		log.Warn("Bridge is already running")
-		if err := api.CheckOtherInstanceAndFocus(pref.GetInt(preferences.APIPortKey), tls); err != nil {
-			cmd.DisableRestart()
-			log.Error("Second instance: ", err)
-		}
-		return cli.NewExitError("Bridge is already running.", 3)
-	}
-	defer lock.Close() //nolint[errcheck]
-
-	// In case user wants to do CPU or memory profiles...
-	if doCPUProfile := context.GlobalBool("cpu-prof"); doCPUProfile {
-		cmd.StartCPUProfile()
-		defer pprof.StopCPUProfile()
-	}
-
-	if doMemoryProfile := context.GlobalBool("mem-prof"); doMemoryProfile {
-		defer cmd.MakeMemoryProfile()
-	}
-
-	// Now we initialize all Bridge parts.
-	log.Debug("Initializing bridge...")
-	eventListener := listener.New()
-	events.SetupEvents(eventListener)
-
-	credentialsStore, credentialsError := credentials.NewStore(appName)
-	if credentialsError != nil {
-		log.Error("Could not get credentials store: ", credentialsError)
-	}
-
-	cm := pmapi.NewClientManager(cfg.GetAPIConfig())
-
-	// Different build types have different roundtrippers (e.g. we want to enable
-	// TLS fingerprint checks in production builds). GetRoundTripper has a different
-	// implementation depending on whether build flag pmapi_prod is used or not.
-	cm.SetRoundTripper(cfg.GetRoundTripper(cm, eventListener))
-
-	// Cookies must be persisted across restarts.
-	jar, err := cookies.NewCookieJar(pref)
-	if err != nil {
-		logrus.WithError(err).Warn("Could not create cookie jar")
-	} else {
-		cm.SetCookieJar(jar)
-	}
-
-	bridgeInstance := bridge.New(cfg, pref, panicHandler, eventListener, cm, credentialsStore)
-	imapBackend := imap.NewIMAPBackend(panicHandler, eventListener, cfg, bridgeInstance)
-	smtpBackend := smtp.NewSMTPBackend(panicHandler, eventListener, pref, bridgeInstance)
-
-	go func() {
-		defer panicHandler.HandlePanic()
-		apiServer := api.NewAPIServer(pref, tls, cfg.GetTLSCertPath(), cfg.GetTLSKeyPath(), eventListener)
-		apiServer.ListenAndServe()
-	}()
-
-	go func() {
-		defer panicHandler.HandlePanic()
-		imapPort := pref.GetInt(preferences.IMAPPortKey)
-		imapServer := imap.NewIMAPServer(debugClient, debugServer, imapPort, tls, imapBackend, eventListener)
-		imapServer.ListenAndServe()
-	}()
-
-	go func() {
-		defer panicHandler.HandlePanic()
-		smtpPort := pref.GetInt(preferences.SMTPPortKey)
-		useSSL := pref.GetBool(preferences.SMTPSSLKey)
-		smtpServer := smtp.NewSMTPServer(debugClient || debugServer, smtpPort, useSSL, tls, smtpBackend, eventListener)
-		smtpServer.ListenAndServe()
-	}()
-
-	// Decide about frontend mode before initializing rest of bridge.
-	var frontendMode string
-
-	switch {
-	case context.GlobalBool("cli"):
-		frontendMode = "cli"
-	case context.GlobalBool("noninteractive"):
-		frontendMode = "noninteractive"
-	default:
-		frontendMode = "qt"
-	}
-
-	log.WithField("mode", frontendMode).Debug("Determined frontend mode to use")
-
-	// If we are starting bridge in noninteractive mode, simply block instead of starting a frontend.
-	if frontendMode == "noninteractive" {
-		<-(make(chan struct{}))
-		return nil
-	}
-
-	showWindowOnStart := !context.GlobalBool("no-window")
-	frontend := frontend.New(constants.Version, constants.BuildVersion, frontendMode, showWindowOnStart, panicHandler, cfg, pref, eventListener, updates, bridgeInstance, smtpBackend)
-
-	// Last part is to start everything.
-	log.Debug("Starting frontend...")
-	if err := frontend.Loop(credentialsError); err != nil {
-		log.Error("Frontend failed with error: ", err)
-		return cli.NewExitError("Frontend error", 2)
-	}
-
-	if frontend.IsAppRestarting() {
-		cmd.RestartApp()
-	}
-
-	return nil
-}
-
-// migratePreferencesFromC10 will copy preferences from c10 folder to c11.
-// It will happen only when c10/prefs.json exists and c11/prefs.json not.
-// No configuration changed between c10 and c11 versions.
-func migratePreferencesFromC10(cfg *config.Config) {
-	pref10Path := config.New(appName, constants.Version, constants.Revision, "c10").GetPreferencesPath()
-	if _, err := os.Stat(pref10Path); os.IsNotExist(err) {
-		log.WithField("path", pref10Path).Trace("Old preferences does not exist, migration skipped")
-		return
-	}
-
-	pref11Path := cfg.GetPreferencesPath()
-	if _, err := os.Stat(pref11Path); err == nil {
-		log.WithField("path", pref11Path).Trace("New preferences already exists, migration skipped")
-		return
-	}
-
-	data, err := ioutil.ReadFile(pref10Path) //nolint[gosec]
-	if err != nil {
-		log.WithError(err).Error("Problem to load old preferences")
-		return
-	}
-
-	err = ioutil.WriteFile(pref11Path, data, 0600)
-	if err != nil {
-		log.WithError(err).Error("Problem to migrate preferences")
-		return
-	}
-
-	log.Info("Preferences migrated")
+	if err != nil {
+		logrus.WithError(err).Fatal("Failed to create app base")
+	}
+	// Other instance already running.
+	if base == nil {
+		return
+	}
+
+	if err := bridge.New(base).Run(os.Args); err != nil {
+		logrus.WithError(err).Fatal("Bridge exited with error")
+	}
 }

cmd/Import-Export/main.go

@@ -18,160 +18,40 @@
 package main
 
 import (
-	"runtime/pprof"
+	"os"
 
-	"github.com/ProtonMail/proton-bridge/internal/cmd"
-	"github.com/ProtonMail/proton-bridge/internal/cookies"
-	"github.com/ProtonMail/proton-bridge/internal/events"
-	"github.com/ProtonMail/proton-bridge/internal/frontend"
-	"github.com/ProtonMail/proton-bridge/internal/importexport"
-	"github.com/ProtonMail/proton-bridge/internal/preferences"
-	"github.com/ProtonMail/proton-bridge/internal/updates"
-	"github.com/ProtonMail/proton-bridge/internal/users/credentials"
-	"github.com/ProtonMail/proton-bridge/pkg/config"
-	"github.com/ProtonMail/proton-bridge/pkg/constants"
-	"github.com/ProtonMail/proton-bridge/pkg/listener"
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
-	"github.com/allan-simon/go-singleinstance"
+	"github.com/ProtonMail/proton-bridge/internal/app/base"
+	"github.com/ProtonMail/proton-bridge/internal/app/ie"
 	"github.com/sirupsen/logrus"
-	"github.com/urfave/cli"
 )
 
 const (
-	// cacheVersion is used for cache files such as lock, or preferences.
-	// Different number will drop old files and create new ones.
-	cacheVersion = "c11"
-
-	appName     = "importExport"
-	appNameDash = "import-export-app"
-)
-
-var (
-	log = logrus.WithField("pkg", "main") //nolint[gochecknoglobals]
+	appName       = "ProtonMail Import-Export app"
+	appUsage      = "Import and export messages to/from your ProtonMail account"
+	configName    = "importExport"
+	updateURLName = "ie"
+	keychainName  = "import-export-app"
+	cacheVersion  = "c11"
 )
 
 func main() {
-	cmd.Main(
-		"ProtonMail Import-Export",
-		"ProtonMail Import-Export app",
-		nil,
-		run,
+	base, err := base.New(
+		appName,
+		appUsage,
+		configName,
+		updateURLName,
+		keychainName,
+		cacheVersion,
 	)
-}
-
-// run initializes and starts everything in a precise order.
-//
-// IMPORTANT: ***Read the comments before CHANGING the order ***
-func run(context *cli.Context) (contextError error) { // nolint[funlen]
-	// We need to have config instance to setup a logs, panic handler, etc ...
-	cfg := config.New(appName, constants.Version, constants.Revision, cacheVersion)
-
-	// We want to know about any problem. Our PanicHandler calls sentry which is
-	// not dependent on anything else. If that fails, it tries to create crash
-	// report which will not be possible if no folder can be created. That's the
-	// only problem we will not be notified about in any way.
-	panicHandler := &cmd.PanicHandler{
-		AppName: "ProtonMail Import-Export app",
-		Config:  cfg,
-		Err:     &contextError,
-	}
-	defer panicHandler.HandlePanic()
-
-	// First we need config and create necessary folder; it's dependency for everything.
-	if err := cfg.CreateDirs(); err != nil {
-		log.Fatal("Cannot create necessary folders: ", err)
-	}
-
-	// Setup of logs should be as soon as possible to ensure we record every wanted report in the log.
-	logLevel := context.GlobalString("log-level")
-	_, _ = config.SetupLog(cfg, logLevel)
-
-	// Doesn't make sense to continue when Import-Export was invoked with wrong arguments.
-	// We should tell that to the user before we do anything else.
-	if context.Args().First() != "" {
-		_ = cli.ShowAppHelp(context)
-		return cli.NewExitError("Unknown argument", 4)
-	}
-
-	// It's safe to get version JSON file even when other instance is running.
-	// (thus we put it before check of presence of other Import-Export instance).
-	updates := updates.NewImportExport(cfg.GetUpdateDir())
-
-	if dir := context.GlobalString("version-json"); dir != "" {
-		cmd.GenerateVersionFiles(updates, dir)
-		return nil
-	}
-
-	// Now we can try to proceed with starting the Import-Export. First we need to ensure
-	// this is the only instance. If not, we will end and focus the existing one.
-	lock, err := singleinstance.CreateLockFile(cfg.GetLockPath())
 	if err != nil {
-		log.Warn("Import-Export app is already running")
-		return cli.NewExitError("Import-Export app is already running.", 3)
+		logrus.WithError(err).Fatal("Failed to create app base")
 	}
-	defer lock.Close() //nolint[errcheck]
-
-	// In case user wants to do CPU or memory profiles...
-	if doCPUProfile := context.GlobalBool("cpu-prof"); doCPUProfile {
-		cmd.StartCPUProfile()
-		defer pprof.StopCPUProfile()
+	// Other instance already running.
+	if base == nil {
+		return
 	}
 
-	if doMemoryProfile := context.GlobalBool("mem-prof"); doMemoryProfile {
-		defer cmd.MakeMemoryProfile()
+	if err := ie.New(base).Run(os.Args); err != nil {
+		logrus.WithError(err).Fatal("IE exited with error")
 	}
-
-	// Now we initialize all Import-Export parts.
-	log.Debug("Initializing import-export...")
-	eventListener := listener.New()
-	events.SetupEvents(eventListener)
-
-	credentialsStore, credentialsError := credentials.NewStore(appNameDash)
-	if credentialsError != nil {
-		log.Error("Could not get credentials store: ", credentialsError)
-	}
-
-	cm := pmapi.NewClientManager(cfg.GetAPIConfig())
-
-	// Different build types have different roundtrippers (e.g. we want to enable
-	// TLS fingerprint checks in production builds). GetRoundTripper has a different
-	// implementation depending on whether build flag pmapi_prod is used or not.
-	cm.SetRoundTripper(cfg.GetRoundTripper(cm, eventListener))
-
-	pref := preferences.New(cfg)
-
-	// Cookies must be persisted across restarts.
-	jar, err := cookies.NewCookieJar(pref)
-	if err != nil {
-		logrus.WithError(err).Warn("Could not create cookie jar")
-	} else {
-		cm.SetCookieJar(jar)
-	}
-
-	importexportInstance := importexport.New(cfg, panicHandler, eventListener, cm, credentialsStore)
-
-	// Decide about frontend mode before initializing rest of import-export.
-	var frontendMode string
-	switch {
-	case context.GlobalBool("cli"):
-		frontendMode = "cli"
-	default:
-		frontendMode = "qt"
-	}
-	log.WithField("mode", frontendMode).Debug("Determined frontend mode to use")
-
-	frontend := frontend.NewImportExport(constants.Version, constants.BuildVersion, frontendMode, panicHandler, cfg, eventListener, updates, importexportInstance)
-
-	// Last part is to start everything.
-	log.Debug("Starting frontend...")
-	if err := frontend.Loop(credentialsError); err != nil {
-		log.Error("Frontend failed with error: ", err)
-		return cli.NewExitError("Frontend error", 2)
-	}
-
-	if frontend.IsAppRestarting() {
-		cmd.RestartApp()
-	}
-
-	return nil
 }

cmd/launcher/main.go

@@ -0,0 +1,194 @@
+// Copyright (c) 2021 Proton Technologies AG
+//
+// This file is part of ProtonMail Bridge.
+//
+// ProtonMail Bridge is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// ProtonMail Bridge is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
+
+package main
+
+import (
+	"fmt"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"runtime"
+
+	"github.com/ProtonMail/gopenpgp/v2/crypto"
+	"github.com/ProtonMail/proton-bridge/internal/config/useragent"
+	"github.com/ProtonMail/proton-bridge/internal/constants"
+	"github.com/ProtonMail/proton-bridge/internal/crash"
+	"github.com/ProtonMail/proton-bridge/internal/locations"
+	"github.com/ProtonMail/proton-bridge/internal/logging"
+	"github.com/ProtonMail/proton-bridge/internal/sentry"
+	"github.com/ProtonMail/proton-bridge/internal/updater"
+	"github.com/ProtonMail/proton-bridge/internal/versioner"
+	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
+)
+
+const appName = "ProtonMail Launcher"
+
+var (
+	ConfigName = "" // nolint[gochecknoglobals]
+	ExeName    = "" // nolint[gochecknoglobals]
+)
+
+func main() { // nolint[funlen]
+	reporter := sentry.NewReporter(appName, constants.Version, useragent.New())
+
+	crashHandler := crash.NewHandler(reporter.ReportException)
+	defer crashHandler.HandlePanic()
+
+	locationsProvider, err := locations.NewDefaultProvider(filepath.Join(constants.VendorName, ConfigName))
+	if err != nil {
+		logrus.WithError(err).Fatal("Failed to get locations provider")
+	}
+
+	locations := locations.New(locationsProvider, ConfigName)
+
+	logsPath, err := locations.ProvideLogsPath()
+	if err != nil {
+		logrus.WithError(err).Fatal("Failed to get logs path")
+	}
+	crashHandler.AddRecoveryAction(logging.DumpStackTrace(logsPath))
+
+	if err := logging.Init(logsPath); err != nil {
+		logrus.WithError(err).Fatal("Failed to setup logging")
+	}
+
+	logging.SetLevel(os.Getenv("VERBOSITY"))
+
+	updatesPath, err := locations.ProvideUpdatesPath()
+	if err != nil {
+		logrus.WithError(err).Fatal("Failed to get updates path")
+	}
+
+	key, err := crypto.NewKeyFromArmored(updater.DefaultPublicKey)
+	if err != nil {
+		logrus.WithError(err).Fatal("Failed to create new verification key")
+	}
+
+	kr, err := crypto.NewKeyRing(key)
+	if err != nil {
+		logrus.WithError(err).Fatal("Failed to create new verification keyring")
+	}
+
+	versioner := versioner.New(updatesPath)
+
+	exe, err := getPathToExecutable(ExeName, versioner, kr, reporter)
+	if err != nil {
+		if exe, err = getFallbackExecutable(ExeName, versioner); err != nil {
+			logrus.WithError(err).Fatal("Failed to find any launchable executable")
+		}
+	}
+
+	launcher, err := os.Executable()
+	if err != nil {
+		logrus.WithError(err).Fatal("Failed to determine path to launcher")
+	}
+
+	cmd := exec.Command(exe, appendLauncherPath(launcher, os.Args[1:])...) // nolint[gosec]
+
+	cmd.Stdin = os.Stdin
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+
+	// On windows, if you use Run(), a terminal stays open; we don't want that.
+	if runtime.GOOS == "windows" {
+		err = cmd.Start()
+	} else {
+		err = cmd.Run()
+	}
+
+	if err != nil {
+		logrus.WithError(err).Fatal("Failed to launch")
+	}
+}
+
+func appendLauncherPath(path string, args []string) []string {
+	res := append([]string{}, args...)
+
+	hasFlag := false
+
+	for k, v := range res {
+		if v != "--launcher" {
+			continue
+		}
+
+		hasFlag = true
+
+		if k+1 >= len(res) {
+			continue
+		}
+
+		res[k+1] = path
+	}
+
+	if !hasFlag {
+		res = append(res, "--launcher", path)
+	}
+
+	return res
+}
+
+func getPathToExecutable(
+	name string,
+	versioner *versioner.Versioner,
+	kr *crypto.KeyRing,
+	reporter *sentry.Reporter,
+) (string, error) {
+	versions, err := versioner.ListVersions()
+	if err != nil {
+		return "", errors.Wrap(err, "failed to list available versions")
+	}
+
+	for _, version := range versions {
+		vlog := logrus.WithField("version", version)
+
+		if err := version.VerifyFiles(kr); err != nil {
+			vlog.WithError(err).Error("Files failed verification and will be removed")
+
+			if err := reporter.ReportMessage(fmt.Sprintf("version %v failed verification: %v", version, err)); err != nil {
+				vlog.WithError(err).Error("Failed to report corrupt update files")
+			}
+
+			if err := version.Remove(); err != nil {
+				vlog.WithError(err).Error("Failed to remove files")
+			}
+
+			continue
+		}
+
+		exe, err := version.GetExecutable(name)
+		if err != nil {
+			vlog.WithError(err).Error("Failed to get executable")
+			continue
+		}
+
+		return exe, nil
+	}
+
+	return "", errors.New("no available versions")
+}
+
+func getFallbackExecutable(name string, versioner *versioner.Versioner) (string, error) {
+	logrus.Info("Searching for fallback executable")
+
+	launcher, err := os.Executable()
+	if err != nil {
+		return "", errors.Wrap(err, "failed to determine path to launcher")
+	}
+
+	return versioner.GetExecutableInDirectory(name, filepath.Dir(launcher))
+}

dist/proton-bridge.desktop

@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Version=1.1
+Name=ProtonMail Bridge
+GenericName=ProtonMail Bridge for Linux
+Comment=The Bridge is an application that runs on your computer in the background and seamlessly encrypts and decrypts your mail as it enters and leaves your computer.
+Icon=protonmail-bridge
+Exec=protonmail-bridge
+Terminal=false
+Categories=Office;Email;Network
+StartupWMClass=protonmail-bridge

dist/proton-ie.desktop

@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Version=1.1
+Name=ProtonMail Import-Export app
+GenericName=ProtonMail Import-Export app for Linux
+Comment=The Import-Export app helps you to migrate your emails from local files or remote IMAP servers to ProtonMail or simply export emails to local folder.
+Icon=protonmail-import-export-app
+Exec=protonmail-import-export-app
+Terminal=false
+Categories=Office;Email;Network
+StartupWMClass=protonmail-import-export-app

go.mod

@@ -1,26 +1,25 @@
 module github.com/ProtonMail/proton-bridge
 
-go 1.13
+go 1.15
 
 // These dependencies are `replace`d below, so the version numbers should be ignored.
 // They are in a separate require block to highlight this.
 require (
 	github.com/docker/docker-credential-helpers v0.6.3
-	github.com/emersion/go-imap v1.0.6-0.20200708083111-011063d6c9df
-	github.com/jameskeane/bcrypt v0.0.0-20170924085257-7509ea014998
-	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
+	github.com/emersion/go-imap v1.0.6
+	github.com/jameskeane/bcrypt v0.0.0-20170924085257-7509ea014998 // indirect
 )
 
 require (
 	github.com/0xAX/notificator v0.0.0-20191016112426-3962a5ea8da1
 	github.com/Masterminds/semver/v3 v3.1.0
-	github.com/ProtonMail/go-appdir v1.1.0
-	github.com/ProtonMail/go-apple-mobileconfig v0.0.0-20160701194735-7ea9927a11f6
 	github.com/ProtonMail/go-autostart v0.0.0-20181114175602-c5272053443a
+	github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7
 	github.com/ProtonMail/go-imap-id v0.0.0-20190926060100-f94a56b9ecde
-	github.com/ProtonMail/go-rfc5322 v0.5.0
+	github.com/ProtonMail/go-rfc5322 v0.8.0
+	github.com/ProtonMail/go-srp v0.0.0-20210514134713-bd9454f3fa01
 	github.com/ProtonMail/go-vcard v0.0.0-20180326232728-33aaa0a0c8a5
-	github.com/ProtonMail/gopenpgp/v2 v2.0.1
+	github.com/ProtonMail/gopenpgp/v2 v2.1.9
 	github.com/PuerkitoBio/goquery v1.5.1
 	github.com/abiosoft/ishell v2.0.0+incompatible
 	github.com/abiosoft/readline v0.0.0-20180607040430-155bce2042db // indirect
@@ -29,9 +28,8 @@ require (
 	github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 // indirect
 	github.com/cucumber/godog v0.8.1
 	github.com/emersion/go-imap-appendlimit v0.0.0-20190308131241-25671c986a6a
-	github.com/emersion/go-imap-idle v0.0.0-20200601154248-f05f54664cc4
 	github.com/emersion/go-imap-move v0.0.0-20190710073258-6e5a51a5b342
-	github.com/emersion/go-imap-quota v0.0.0-20200423100218-dcfd1b7d2b41
+	github.com/emersion/go-imap-quota v0.0.0-20210203125329-619074823f3c
 	github.com/emersion/go-imap-unselect v0.0.0-20171113212723-b985794e5f26
 	github.com/emersion/go-mbox v1.0.2
 	github.com/emersion/go-message v0.12.1-0.20201221184100-40c3f864532b
@@ -42,19 +40,17 @@ require (
 	github.com/fatih/color v1.9.0
 	github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568 // indirect
 	github.com/getsentry/sentry-go v0.8.0
-	github.com/go-resty/resty/v2 v2.3.0
+	github.com/go-resty/resty/v2 v2.6.0
 	github.com/golang/mock v1.4.4
 	github.com/google/go-cmp v0.5.1
 	github.com/google/uuid v1.1.1
 	github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c // indirect
 	github.com/hashicorp/go-multierror v1.1.0
 	github.com/jaytaylor/html2text v0.0.0-20200412013138-3577fbdbcff7
-	github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0
 	github.com/keybase/go-keychain v0.0.0-20200502122510-cda31fe0c86d
 	github.com/logrusorgru/aurora v2.0.3+incompatible
 	github.com/mattn/go-runewidth v0.0.9 // indirect
-	github.com/miekg/dns v1.1.30
-	github.com/myesui/uuid v1.0.0 // indirect
+	github.com/miekg/dns v1.1.41
 	github.com/nsf/jsondiff v0.0.0-20200515183724-f29ed568f4ce
 	github.com/olekukonko/tablewriter v0.0.4 // indirect
 	github.com/pkg/errors v0.9.1
@@ -63,17 +59,17 @@ require (
 	github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect
 	github.com/stretchr/testify v1.6.1
 	github.com/therecipe/qt v0.0.0-20200701200531-7f61353ee73e
-	github.com/twinj/uuid v1.0.0 // indirect
-	github.com/urfave/cli v1.22.4
+	github.com/urfave/cli/v2 v2.2.0
+	github.com/vmihailenco/msgpack/v5 v5.1.3
 	go.etcd.io/bbolt v1.3.5
-	golang.org/x/net v0.0.0-20200707034311-ab3426394381
+	golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2
+	golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4
 	golang.org/x/text v0.3.5-0.20201125200606-c27b9fd57aec
-	gopkg.in/stretchr/testify.v1 v1.2.2 // indirect
+
 )
 
 replace (
 	github.com/docker/docker-credential-helpers => github.com/ProtonMail/docker-credential-helpers v1.1.0
 	github.com/emersion/go-imap => github.com/ProtonMail/go-imap v0.0.0-20201228133358-4db68cea0cac
-	github.com/jameskeane/bcrypt => github.com/ProtonMail/bcrypt v0.0.0-20170924085257-7509ea014998
-	golang.org/x/crypto => github.com/ProtonMail/crypto v0.0.0-20200818122824-ed5d25e28db8
+	github.com/jameskeane/bcrypt => github.com/ProtonMail/bcrypt v0.0.0-20210511135022-227b4adcab57
 )

go.sum

@@ -2,37 +2,34 @@ github.com/0xAX/notificator v0.0.0-20191016112426-3962a5ea8da1 h1:j9HaafapDbPbGR
 github.com/0xAX/notificator v0.0.0-20191016112426-3962a5ea8da1/go.mod h1:NtXa9WwQsukMHZpjNakTTz0LArxvGYdPA9CjIcUSZ6s=
 github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3IMCy2vIlbG1XG/0ggNQv0SvxCAIpPM5b1nCz56Xno=
 github.com/CloudyKit/jet/v3 v3.0.0/go.mod h1:HKQPgSJmdK8hdoAbKUUWajkHyHo4RaU5rMdUywE7VMo=
 github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY=
 github.com/Masterminds/semver/v3 v3.1.0 h1:Y2lUDsFKVRSYGojLJ1yLxSXdMmMYTYls0rCvoqmMUQk=
 github.com/Masterminds/semver/v3 v3.1.0/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
-github.com/ProtonMail/bcrypt v0.0.0-20170924085257-7509ea014998 h1:YT2uVwQiRQZxCaaahwfcgTq2j3j66w00n/27gb/zubs=
-github.com/ProtonMail/bcrypt v0.0.0-20170924085257-7509ea014998/go.mod h1:HecWFHognK8GfRDGnFQbW/LiV7A3MX3gZVs45vk5h8I=
-github.com/ProtonMail/crypto v0.0.0-20200818122824-ed5d25e28db8 h1:u1j0xLTrCHpNS40B6m4Sv3IVUz5m9jt+AnTIopT3IgM=
-github.com/ProtonMail/crypto v0.0.0-20200818122824-ed5d25e28db8/go.mod h1:Pxr7w4gA2ikI4sWyYwEffm+oew1WAJHzG1SiDpQMkrI=
+github.com/ProtonMail/bcrypt v0.0.0-20210511135022-227b4adcab57 h1:pHA4K54ifoogVLunGGHi3xyF5Nz4x+Uh3dJuy3NwGQQ=
+github.com/ProtonMail/bcrypt v0.0.0-20210511135022-227b4adcab57/go.mod h1:HecWFHognK8GfRDGnFQbW/LiV7A3MX3gZVs45vk5h8I=
 github.com/ProtonMail/docker-credential-helpers v1.1.0 h1:+kvUIpwWcbtP3WFv5sSvkFn/XLzSqPOB5AAthuk9xPk=
 github.com/ProtonMail/docker-credential-helpers v1.1.0/go.mod h1:mK0aBveCxhnQ756AmaTfXMZDeULvheYVhF/MWMErN5g=
-github.com/ProtonMail/go-appdir v1.1.0 h1:9hdNDlU9kTqRKVNzmoqah8qqrj5QZyLByQdwQNlFWig=
-github.com/ProtonMail/go-appdir v1.1.0/go.mod h1:3d8Y9F5mbEUjrYbcJ3rcDxcWbqbttF+011nVZmdRdzc=
-github.com/ProtonMail/go-apple-mobileconfig v0.0.0-20160701194735-7ea9927a11f6 h1:YsSJ/mvZFYydQm/hRrt8R8UtgETixN2y3LK98f5LT60=
-github.com/ProtonMail/go-apple-mobileconfig v0.0.0-20160701194735-7ea9927a11f6/go.mod h1:EtDfBMIDWmVe4viZCuBTEfe3OIIo0ghbpOaAZVO+hVg=
 github.com/ProtonMail/go-autostart v0.0.0-20181114175602-c5272053443a h1:fXK2KsfnkBV9Nh+9SKzHchYjuE9s0vI20JG1mbtEAcc=
 github.com/ProtonMail/go-autostart v0.0.0-20181114175602-c5272053443a/go.mod h1:oTGdE7/DlWIr23G0IKW3OXK9wZ5Hw1GGiaJFccTvZi4=
+github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 h1:YoJbenK9C67SkzkDfmQuVln04ygHj3vjZfd9FL+GmQQ=
+github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo=
 github.com/ProtonMail/go-imap v0.0.0-20201228133358-4db68cea0cac h1:2xU3QncAiS/W3UlWZTkbNKW5WkLzk6Egl1T0xX+sbjs=
 github.com/ProtonMail/go-imap v0.0.0-20201228133358-4db68cea0cac/go.mod h1:yKASt+C3ZiDAiCSssxg9caIckWF/JG7ZQTO7GAmvicU=
 github.com/ProtonMail/go-imap-id v0.0.0-20190926060100-f94a56b9ecde h1:5koQozTDELymYOyFbQ/VSubexAEXzDR8qGM5mO8GRdw=
 github.com/ProtonMail/go-imap-id v0.0.0-20190926060100-f94a56b9ecde/go.mod h1:795VPXcRUIQ9JyMNHP4el582VokQfippgjkQP3Gk0r0=
 github.com/ProtonMail/go-mime v0.0.0-20190923161245-9b5a4261663a h1:W6RrgN/sTxg1msqzFFb+G80MFmpjMw61IU+slm+wln4=
 github.com/ProtonMail/go-mime v0.0.0-20190923161245-9b5a4261663a/go.mod h1:NYt+V3/4rEeDuaev/zw1zCq8uqVEuPHzDPo3OZrlGJ4=
-github.com/ProtonMail/go-rfc5322 v0.4.0 h1:H6RJNNu+xdkG7A3xKU+dV9sP8/w2K4e7pz1R2FM8kd8=
-github.com/ProtonMail/go-rfc5322 v0.4.0/go.mod h1:mzZWlMWnQJuYLL7JpzuPF5+FimV2lZ9f0jeq24kJjpU=
-github.com/ProtonMail/go-rfc5322 v0.5.0 h1:LbKWjgfvumYZCr8BgGyTUk3ETGkFLAjQdkuSUpZ5CcE=
-github.com/ProtonMail/go-rfc5322 v0.5.0/go.mod h1:mzZWlMWnQJuYLL7JpzuPF5+FimV2lZ9f0jeq24kJjpU=
+github.com/ProtonMail/go-rfc5322 v0.8.0 h1:7emrf75n3CDIduQflx7aT1nJa5h/kGsiFKUYX/+IAkU=
+github.com/ProtonMail/go-rfc5322 v0.8.0/go.mod h1:BwpTbkJxkMGkc+pC84AXZnwuWOisEULBpfPIyIKS/Us=
+github.com/ProtonMail/go-srp v0.0.0-20210514134713-bd9454f3fa01 h1:sRxNvPGnJFh6yWlSr9BpGsSrshFkZLClSm5oIi++a0I=
+github.com/ProtonMail/go-srp v0.0.0-20210514134713-bd9454f3fa01/go.mod h1:jOXzdvWTILIJzl83yzi/EZcnnhpI+A/5EyflaeVfi/0=
 github.com/ProtonMail/go-vcard v0.0.0-20180326232728-33aaa0a0c8a5 h1:Uga1DHFN4GUxuDQr0F71tpi8I9HqPIlZodZAI1lR6VQ=
 github.com/ProtonMail/go-vcard v0.0.0-20180326232728-33aaa0a0c8a5/go.mod h1:oeP9CMN+ajWp5jKp1kue5daJNwMMxLF+ujPaUIoJWlA=
-github.com/ProtonMail/gopenpgp/v2 v2.0.1 h1:x0uvDhry5WzoHeJO4J3dgMLhG4Z9PeBJ2O+sDOY0LcU=
-github.com/ProtonMail/gopenpgp/v2 v2.0.1/go.mod h1:wQQCJo7DURO6S9VwH+kSDEYs/B63yZnAEfGlOg8YNBY=
+github.com/ProtonMail/gopenpgp/v2 v2.1.9 h1:MdvkFBP8ldOHYOoaVct9LO+Zv5rl6VdeN1QurntRmkc=
+github.com/ProtonMail/gopenpgp/v2 v2.1.9/go.mod h1:CHIXesUdnPxIxtJTg2P/cxoA0cvUwIBpZIS8SsY82QA=
 github.com/PuerkitoBio/goquery v1.5.1 h1:PSPBGne8NIUWw+/7vFBV+kG2J/5MOjbzc7154OaKCSE=
 github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
 github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod h1:a1uqRtAwp2Xwc6WNPJEufxJ7fx3npB4UV/JOLmbu5I0=
@@ -76,19 +73,15 @@ github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25Kn
 github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM=
 github.com/emersion/go-imap-appendlimit v0.0.0-20190308131241-25671c986a6a h1:bMdSPm6sssuOFpIaveu3XGAijMS3Tq2S3EqFZmZxidc=
 github.com/emersion/go-imap-appendlimit v0.0.0-20190308131241-25671c986a6a/go.mod h1:ikgISoP7pRAolqsVP64yMteJa2FIpS6ju88eBT6K1yQ=
-github.com/emersion/go-imap-idle v0.0.0-20200601154248-f05f54664cc4 h1:/JIALzmCduf5o8TWJSiOBzTb9+R0SChwElUrJLlp2po=
-github.com/emersion/go-imap-idle v0.0.0-20200601154248-f05f54664cc4/go.mod h1:o14zPKCmEH5WC1vU5SdPoZGgNvQx7zzKSnxPQlobo78=
 github.com/emersion/go-imap-move v0.0.0-20190710073258-6e5a51a5b342 h1:5p1t3e1PomYgLWwEwhwEU5kVBwcyAcVrOpexv8AeZx0=
 github.com/emersion/go-imap-move v0.0.0-20190710073258-6e5a51a5b342/go.mod h1:QuMaZcKFDVI0yCrnAbPLfbwllz1wtOrZH8/vZ5yzp4w=
-github.com/emersion/go-imap-quota v0.0.0-20200423100218-dcfd1b7d2b41 h1:z5lDGnSURauBEDdNLj3o0+HogVYKQCGeY3Anl/xyRfU=
-github.com/emersion/go-imap-quota v0.0.0-20200423100218-dcfd1b7d2b41/go.mod h1:iApyhIQBiU4XFyr+3kdJyyGqle82TbQyuP2o+OZHrV0=
+github.com/emersion/go-imap-quota v0.0.0-20210203125329-619074823f3c h1:khcEdu1yFiZjBgi7gGnQiLhpSgghJ0YTnKD0l4EUqqc=
+github.com/emersion/go-imap-quota v0.0.0-20210203125329-619074823f3c/go.mod h1:iApyhIQBiU4XFyr+3kdJyyGqle82TbQyuP2o+OZHrV0=
 github.com/emersion/go-imap-unselect v0.0.0-20171113212723-b985794e5f26 h1:FiSb8+XBQQSkcX3ubr+1tAtlRJBYaFmRZqOAweZ9Wy8=
 github.com/emersion/go-imap-unselect v0.0.0-20171113212723-b985794e5f26/go.mod h1:+gnnZx3Mg3MnCzZrv0eZdp5puxXQUgGT/6N6L7ShKfM=
 github.com/emersion/go-mbox v1.0.2 h1:tE/rT+lEugK9y0myEymCCHnwlZN04hlXPrbKkxRBA5I=
 github.com/emersion/go-mbox v1.0.2/go.mod h1:Yp9IVuuOYLEuMv4yjgDHvhb5mHOcYH6x92Oas3QqEZI=
 github.com/emersion/go-message v0.11.1/go.mod h1:C4jnca5HOTo4bGN9YdqNQM9sITuT3Y0K6bSUw9RklvY=
-github.com/emersion/go-message v0.12.1-0.20200903165315-e1abe21f389a h1:3C6qIGgPr1qAT0ikRD5NbyKpME/iHCDeXhpv/JJsFsE=
-github.com/emersion/go-message v0.12.1-0.20200903165315-e1abe21f389a/go.mod h1:kYIioST9GDHte9/BRWgi93rpqbDuFftMjKSMaXS8ABo=
 github.com/emersion/go-message v0.12.1-0.20201221184100-40c3f864532b h1:xYuhW6egTaCP+zjbUcfoy/Dr3ASdVPR9W7fmkHvZHPE=
 github.com/emersion/go-message v0.12.1-0.20201221184100-40c3f864532b/go.mod h1:N1JWdZQ2WRUalmdHAX308CWBq747VJ8oUorFI3VCBwU=
 github.com/emersion/go-sasl v0.0.0-20191210011802-430746ea8b9b/go.mod h1:G/dpzLu16WtQpBfQ/z3LYiYJn3ZhKSGWn83fyoyQe/k=
@@ -96,7 +89,6 @@ github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21 h1:OJyUGMJTzHTd1X
 github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ=
 github.com/emersion/go-smtp v0.14.0 h1:RYW203p+EcPjL8Z/ZpT9lZ6iOc8MG1MQzEx1UKEkXlA=
 github.com/emersion/go-smtp v0.14.0/go.mod h1:qm27SGYgoIPRot6ubfQ/GpiPy/g3PaZAVRxiO/sDUgQ=
-github.com/emersion/go-textwrapper v0.0.0-20160606182133-d0e65e56babe h1:40SWqY0zE3qCi6ZrtTf5OUdNm5lDnGnjRSq9GgmeTrg=
 github.com/emersion/go-textwrapper v0.0.0-20160606182133-d0e65e56babe/go.mod h1:aqO8z8wPrjkscevZJFVE1wXJrLpC5LtJG7fqLOsPb2U=
 github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594 h1:IbFBtwoTQyw0fIM5xv1HF+Y+3ZijDR839WMulgxCcUY=
 github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594/go.mod h1:aqO8z8wPrjkscevZJFVE1wXJrLpC5LtJG7fqLOsPb2U=
@@ -119,8 +111,8 @@ github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclK
 github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w=
 github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
 github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8=
-github.com/go-resty/resty/v2 v2.3.0 h1:JOOeAvjSlapTT92p8xiS19Zxev1neGikoHsXJeOq8So=
-github.com/go-resty/resty/v2 v2.3.0/go.mod h1:UpN9CgLZNsv4e9XG50UU8xdI0F43UQ4HmxLBDwaroHU=
+github.com/go-resty/resty/v2 v2.6.0 h1:joIR5PNLM2EFqqESUjCMGXrWmXNHEU9CEiK813oKYS4=
+github.com/go-resty/resty/v2 v2.6.0/go.mod h1:PwvJS6hvaPkjtjNg9ph+VrSD92bi5Zq73w/BIH7cC3Q=
 github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
 github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
 github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
@@ -161,8 +153,6 @@ github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCV
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k=
-github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uiaSepXwyf3o52HaUYcV+Tu66S3F5GA=
-github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
 github.com/kataras/golog v0.0.10/go.mod h1:yJ8YKCmyL+nWjERB90Qwn+bdyBZsaQwU3bTVFgkFIp8=
 github.com/kataras/iris/v12 v12.1.8/go.mod h1:LMYy4VlP67TQ3Zgriz8RE2h2kMZV2SgMYbq3UhfoFmE=
 github.com/kataras/neffos v0.0.14/go.mod h1:8lqADm8PnbeFfL7CLXh1WHw53dG27MC3pgi2R1rmoTE=
@@ -186,8 +176,8 @@ github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL
 github.com/logrusorgru/aurora v2.0.3+incompatible h1:tOpm7WcpBTn4fjmVfgpQq0EfczGlG91VSDkswnjF5A8=
 github.com/logrusorgru/aurora v2.0.3+incompatible/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
-github.com/martinlindhe/base36 v1.0.0 h1:eYsumTah144C0A8P1T/AVSUk5ZoLnhfYFM3OGQxB52A=
 github.com/martinlindhe/base36 v1.0.0/go.mod h1:+AtEs8xrBpCeYgSLoY/aJ6Wf37jtBuR0s35750M27+8=
+github.com/martinlindhe/base36 v1.1.0 h1:cIwvvwYse/0+1CkUPYH5ZvVIYG3JrILmQEIbLuar02Y=
 github.com/martinlindhe/base36 v1.1.0/go.mod h1:+AtEs8xrBpCeYgSLoY/aJ6Wf37jtBuR0s35750M27+8=
 github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA=
@@ -203,8 +193,8 @@ github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m
 github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw=
 github.com/mediocregopher/radix/v3 v3.4.2/go.mod h1:8FL3F6UQRXHXIBSPUs5h0RybMF8i4n7wVopoX3x7Bv8=
 github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc=
-github.com/miekg/dns v1.1.30 h1:Qww6FseFn8PRfw07jueqIXqodm0JKiiKuK0DeXSqfyo=
-github.com/miekg/dns v1.1.30/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
+github.com/miekg/dns v1.1.41 h1:WMszZWJG0XmzbK9FEmzH2TVcqYzFesusSIB41b8KHxY=
+github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -212,8 +202,6 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/moul/http2curl v1.0.0/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ=
-github.com/myesui/uuid v1.0.0 h1:xCBmH4l5KuvLYc5L7AS7SZg9/jKdIFubM7OVoLqaQUI=
-github.com/myesui/uuid v1.0.0/go.mod h1:2CDfNgU0LR8mIdO8vdWd8i9gWWxLlcoIGGpSNgafq84=
 github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg=
 github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w=
 github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
@@ -272,19 +260,21 @@ github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/therecipe/qt v0.0.0-20200701200531-7f61353ee73e h1:G0DQ/TRQyrEZjtLlLwevFjaRiG8eeCMlq9WXQ2OO2bk=
 github.com/therecipe/qt v0.0.0-20200701200531-7f61353ee73e/go.mod h1:SUUR2j3aE1z6/g76SdD6NwACEpvCxb3fvG82eKbD6us=
-github.com/twinj/uuid v1.0.0 h1:fzz7COZnDrXGTAOHGuUGYd6sG+JMq+AoE7+Jlu0przk=
-github.com/twinj/uuid v1.0.0/go.mod h1:mMgcE1RHFUFqe5AfiwlINXisXfDGro23fWdPUfOMjRY=
 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
 github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
-github.com/urfave/cli v1.22.4 h1:u7tSpNPPswAFymm8IehJhy4uJMlUuU/GmqSkvJ1InXA=
-github.com/urfave/cli v1.22.4/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
+github.com/urfave/cli/v2 v2.2.0 h1:JTTnM6wKzdA0Jqodd966MVj4vWbbquZykeX1sKbe2C4=
+github.com/urfave/cli/v2 v2.2.0/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ=
 github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fasthttp v1.6.0/go.mod h1:FstJa9V+Pj9vQ7OJie2qMHdwemEDaDiSdBnvPM1Su9w=
 github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
 github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio=
+github.com/vmihailenco/msgpack/v5 v5.1.3 h1:FwC9KPjyW8OqTUqMt6rQw9y50vA2cTLXPKCcBCRbQgg=
+github.com/vmihailenco/msgpack/v5 v5.1.3/go.mod h1:C5gboKD0TJPqWDTVTtrQNfRbiBwHZGo8UTqP/9/XvLI=
+github.com/vmihailenco/tagparser v0.1.2 h1:gnjoVuB/kljJ5wICEEOpx98oXMWPLj22G67Vbd1qPqc=
+github.com/vmihailenco/tagparser v0.1.2/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
 github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
 github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
@@ -295,7 +285,25 @@ github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDf
 github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc=
 go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0=
 go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
+golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
+golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 h1:It14KIkyBFYkHkwZ7k45minvA9aorojkyjGk9KJ5B/w=
+golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
+golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4=
+golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
+golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
+golang.org/x/mobile v0.0.0-20190910184405-b558ed863381/go.mod h1:p895TfNkDgPEmEQrNiOtIl3j98d/tGU95djDj7NfyjQ=
+golang.org/x/mobile v0.0.0-20200801112145-973feb4309de/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4=
+golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.1.1-0.20191209134235-331c550502dd/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -306,45 +314,50 @@ golang.org/x/net v0.0.0-20190420063019-afa5a82059c6/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/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-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200707034311-ab3426394381 h1:VXak5I6aEWmAXeQjA+QSZzlgNrpq9mjcfDemuexIKsU=
-golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 h1:4nGaVu0QrbjT/AK2PRLuQfQuh6DJve+pELhqTdAj3x0=
+golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44 h1:Bli41pIlzTzf3KEY06n+xnzK/BESIg2ze4Pgfh/aI8c=
+golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/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/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.5-0.20201125200606-c27b9fd57aec h1:A1qYjneJuzBZZ2gIB8rd6zrfq6l7SoEMJ8EsSilNK/U=
 golang.org/x/text v0.3.5-0.20201125200606-c27b9fd57aec/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-20181221001348-537d06c36207/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190327201419-c70d86f8b7cf/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20190909214602-067311248421/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.0.0-20200117012304-6edc0a871e69/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+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-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -356,8 +369,6 @@ gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8
 gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y=
 gopkg.in/ini.v1 v1.51.1/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
-gopkg.in/stretchr/testify.v1 v1.2.2 h1:yhQC6Uy5CqibAIlk1wlusa/MJ3iAN49/BsR/dCCKz3M=
-gopkg.in/stretchr/testify.v1 v1.2.2/go.mod h1:QI5V/q6UbPmuhtm10CaFZxED9NreB8PnFYN9JcR6TxU=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

internal/api/api.go

@@ -22,14 +22,12 @@
 package api
 
 import (
-	"crypto/tls"
 	"fmt"
 	"net/http"
 
 	"github.com/ProtonMail/proton-bridge/internal/bridge"
+	"github.com/ProtonMail/proton-bridge/internal/config/settings"
 	"github.com/ProtonMail/proton-bridge/internal/events"
-	"github.com/ProtonMail/proton-bridge/internal/preferences"
-	"github.com/ProtonMail/proton-bridge/pkg/config"
 	"github.com/ProtonMail/proton-bridge/pkg/listener"
 	"github.com/ProtonMail/proton-bridge/pkg/ports"
 	"github.com/sirupsen/logrus"
@@ -41,21 +39,15 @@ var (
 
 type apiServer struct {
 	host          string
-	pref          *config.Preferences
-	tls           *tls.Config
-	certPath      string
-	keyPath       string
+	settings      *settings.Settings
 	eventListener listener.Listener
 }
 
 // NewAPIServer returns prepared API server struct.
-func NewAPIServer(pref *config.Preferences, tls *tls.Config, certPath, keyPath string, eventListener listener.Listener) *apiServer { //nolint[golint]
+func NewAPIServer(settings *settings.Settings, eventListener listener.Listener) *apiServer { //nolint[golint]
 	return &apiServer{
 		host:          bridge.Host,
-		pref:          pref,
-		tls:           tls,
-		certPath:      certPath,
-		keyPath:       keyPath,
+		settings:      settings,
 		eventListener: eventListener,
 	}
 }
@@ -67,14 +59,12 @@ func (api *apiServer) ListenAndServe() {
 
 	addr := api.getAddress()
 	server := &http.Server{
-		Addr:         addr,
-		Handler:      mux,
-		TLSConfig:    api.tls,
-		TLSNextProto: make(map[string]func(*http.Server, *tls.Conn, http.Handler)),
+		Addr:    addr,
+		Handler: mux,
 	}
 
 	log.Info("API listening at ", addr)
-	if err := server.ListenAndServeTLS(api.certPath, api.keyPath); err != nil {
+	if err := server.ListenAndServe(); err != nil {
 		api.eventListener.Emit(events.ErrorEvent, "API failed: "+err.Error())
 		log.Error("API failed: ", err)
 	}
@@ -82,10 +72,10 @@ func (api *apiServer) ListenAndServe() {
 }
 
 func (api *apiServer) getAddress() string {
-	port := api.pref.GetInt(preferences.APIPortKey)
+	port := api.settings.GetInt(settings.APIPortKey)
 	newPort := ports.FindFreePortFrom(port)
 	if newPort != port {
-		api.pref.SetInt(preferences.APIPortKey, newPort)
+		api.settings.SetInt(settings.APIPortKey, newPort)
 	}
 	return getAPIAddress(api.host, newPort)
 }

internal/api/focus.go

@@ -18,7 +18,6 @@
 package api
 
 import (
-	"crypto/tls"
 	"fmt"
 	"net/http"
 
@@ -37,12 +36,9 @@ func focusHandler(ctx handlerContext) error {
 
 // CheckOtherInstanceAndFocus is helper for new instances to check if there is
 // already a running instance and get it's focus.
-func CheckOtherInstanceAndFocus(port int, tls *tls.Config) error {
-	transport := &http.Transport{TLSClientConfig: tls}
-	client := &http.Client{Transport: transport}
-
+func CheckOtherInstanceAndFocus(port int) error {
 	addr := getAPIAddress(bridge.Host, port)
-	resp, err := client.Get("https://" + addr + "/focus")
+	resp, err := (&http.Client{}).Get("http://" + addr + "/focus")
 	if err != nil {
 		return err
 	}

internal/app/base/args.go

@@ -15,21 +15,21 @@
 // You should have received a copy of the GNU General Public License
 // along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 
-package cmd
+package base
 
-import (
-	"os"
-	"strings"
-)
+import "strings"
 
-// filterProcessSerialNumberFromArgs removes additional flag from MacOS. More info ProcessSerialNumber
+// StripProcessSerialNumber removes additional flag from macOS.
+// More info:
 // http://mirror.informatimago.com/next/developer.apple.com/documentation/Carbon/Reference/Process_Manager/prmref_main/data_type_5.html#//apple_ref/doc/uid/TP30000208/C001951
-func filterProcessSerialNumberFromArgs() {
-	tmp := os.Args[:0]
-	for _, arg := range os.Args {
+func StripProcessSerialNumber(args []string) []string {
+	res := args[:0]
+
+	for _, arg := range args {
 		if !strings.Contains(arg, "-psn_") {
-			tmp = append(tmp, arg)
+			res = append(res, arg)
 		}
 	}
-	os.Args = tmp
+
+	return res
 }

internal/app/base/base.go

@@ -0,0 +1,388 @@
+// Copyright (c) 2021 Proton Technologies AG
+//
+// This file is part of ProtonMail Bridge.
+//
+// ProtonMail Bridge is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// ProtonMail Bridge is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
+
+// Package base implements a common application base currently shared by bridge and IE.
+// The base includes the following:
+//  - access to standard filesystem locations like config, cache, logging dirs
+//  - an extensible crash handler
+//  - versioned cache directory
+//  - persistent settings
+//  - event listener
+//  - credentials store
+//  - pmapi Manager
+// In addition, the base initialises logging and reacts to command line arguments
+// which control the log verbosity and enable cpu/memory profiling.
+package base
+
+import (
+	"math/rand"
+	"os"
+	"path/filepath"
+	"runtime"
+	"runtime/pprof"
+	"time"
+
+	"github.com/Masterminds/semver/v3"
+	"github.com/ProtonMail/go-autostart"
+	"github.com/ProtonMail/gopenpgp/v2/crypto"
+	"github.com/ProtonMail/proton-bridge/internal/api"
+	"github.com/ProtonMail/proton-bridge/internal/config/cache"
+	"github.com/ProtonMail/proton-bridge/internal/config/settings"
+	"github.com/ProtonMail/proton-bridge/internal/config/tls"
+	"github.com/ProtonMail/proton-bridge/internal/config/useragent"
+	"github.com/ProtonMail/proton-bridge/internal/constants"
+	"github.com/ProtonMail/proton-bridge/internal/cookies"
+	"github.com/ProtonMail/proton-bridge/internal/crash"
+	"github.com/ProtonMail/proton-bridge/internal/events"
+	"github.com/ProtonMail/proton-bridge/internal/locations"
+	"github.com/ProtonMail/proton-bridge/internal/logging"
+	"github.com/ProtonMail/proton-bridge/internal/sentry"
+	"github.com/ProtonMail/proton-bridge/internal/updater"
+	"github.com/ProtonMail/proton-bridge/internal/users/credentials"
+	"github.com/ProtonMail/proton-bridge/internal/versioner"
+	"github.com/ProtonMail/proton-bridge/pkg/keychain"
+	"github.com/ProtonMail/proton-bridge/pkg/listener"
+	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/allan-simon/go-singleinstance"
+	"github.com/sirupsen/logrus"
+	"github.com/urfave/cli/v2"
+)
+
+const (
+	flagCPUProfile      = "cpu-prof"
+	flagCPUProfileShort = "p"
+	flagMemProfile      = "mem-prof"
+	flagMemProfileShort = "m"
+	flagLogLevel        = "log-level"
+	flagLogLevelShort   = "l"
+	// FlagCLI indicate to start with command line interface.
+	FlagCLI      = "cli"
+	flagCLIShort = "c"
+	flagRestart  = "restart"
+	flagLauncher = "launcher"
+)
+
+type Base struct {
+	SentryReporter *sentry.Reporter
+	CrashHandler   *crash.Handler
+	Locations      *locations.Locations
+	Settings       *settings.Settings
+	Lock           *os.File
+	Cache          *cache.Cache
+	Listener       listener.Listener
+	Creds          *credentials.Store
+	CM             pmapi.Manager
+	CookieJar      *cookies.Jar
+	UserAgent      *useragent.UserAgent
+	Updater        *updater.Updater
+	Versioner      *versioner.Versioner
+	TLS            *tls.TLS
+	Autostart      *autostart.App
+
+	Name    string // the app's name
+	usage   string // the app's usage description
+	command string // the command used to launch the app (either the exe path or the launcher path)
+	restart bool   // whether the app is currently set to restart
+
+	teardown []func() error // actions to perform when app is exiting
+}
+
+func New( // nolint[funlen]
+	appName,
+	appUsage,
+	configName,
+	updateURLName,
+	keychainName,
+	cacheVersion string,
+) (*Base, error) {
+	userAgent := useragent.New()
+
+	sentryReporter := sentry.NewReporter(appName, constants.Version, userAgent)
+
+	crashHandler := crash.NewHandler(
+		sentryReporter.ReportException,
+		crash.ShowErrorNotification(appName),
+	)
+	defer crashHandler.HandlePanic()
+
+	rand.Seed(time.Now().UnixNano())
+	os.Args = StripProcessSerialNumber(os.Args)
+
+	locationsProvider, err := locations.NewDefaultProvider(filepath.Join(constants.VendorName, configName))
+	if err != nil {
+		return nil, err
+	}
+
+	locations := locations.New(locationsProvider, configName)
+
+	logsPath, err := locations.ProvideLogsPath()
+	if err != nil {
+		return nil, err
+	}
+	if err := logging.Init(logsPath); err != nil {
+		return nil, err
+	}
+	crashHandler.AddRecoveryAction(logging.DumpStackTrace(logsPath))
+
+	if err := migrateFiles(configName); err != nil {
+		logrus.WithError(err).Warn("Old config files could not be migrated")
+	}
+
+	if err := locations.Clean(); err != nil {
+		return nil, err
+	}
+
+	settingsPath, err := locations.ProvideSettingsPath()
+	if err != nil {
+		return nil, err
+	}
+	settingsObj := settings.New(settingsPath)
+
+	lock, err := singleinstance.CreateLockFile(locations.GetLockFile())
+	if err != nil {
+		logrus.Warnf("%v is already running", appName)
+		return nil, api.CheckOtherInstanceAndFocus(settingsObj.GetInt(settings.APIPortKey))
+	}
+
+	cachePath, err := locations.ProvideCachePath()
+	if err != nil {
+		return nil, err
+	}
+	cache, err := cache.New(cachePath, cacheVersion)
+	if err != nil {
+		return nil, err
+	}
+	if err := cache.RemoveOldVersions(); err != nil {
+		return nil, err
+	}
+
+	listener := listener.New()
+	events.SetupEvents(listener)
+
+	// If we can't load the keychain for whatever reason,
+	// we signal to frontend and supply a dummy keychain that always returns errors.
+	kc, err := keychain.NewKeychain(settingsObj, keychainName)
+	if err != nil {
+		listener.Emit(events.CredentialsErrorEvent, err.Error())
+		kc = keychain.NewMissingKeychain()
+	}
+
+	cfg := pmapi.NewConfig(configName, constants.Version)
+	cfg.GetUserAgent = userAgent.String
+	cfg.UpgradeApplicationHandler = func() { listener.Emit(events.UpgradeApplicationEvent, "") }
+	cfg.TLSIssueHandler = func() { listener.Emit(events.TLSCertIssue, "") }
+
+	cm := pmapi.New(cfg)
+
+	cm.AddConnectionObserver(pmapi.NewConnectionObserver(
+		func() { listener.Emit(events.InternetOffEvent, "") },
+		func() { listener.Emit(events.InternetOnEvent, "") },
+	))
+
+	jar, err := cookies.NewCookieJar(settingsObj)
+	if err != nil {
+		return nil, err
+	}
+
+	cm.SetCookieJar(jar)
+
+	key, err := crypto.NewKeyFromArmored(updater.DefaultPublicKey)
+	if err != nil {
+		return nil, err
+	}
+
+	kr, err := crypto.NewKeyRing(key)
+	if err != nil {
+		return nil, err
+	}
+
+	updatesDir, err := locations.ProvideUpdatesPath()
+	if err != nil {
+		return nil, err
+	}
+
+	versioner := versioner.New(updatesDir)
+	installer := updater.NewInstaller(versioner)
+	updater := updater.New(
+		cm,
+		installer,
+		settingsObj,
+		kr,
+		semver.MustParse(constants.Version),
+		updateURLName,
+		runtime.GOOS,
+	)
+
+	exe, err := os.Executable()
+	if err != nil {
+		return nil, err
+	}
+
+	autostart := &autostart.App{
+		Name:        appName,
+		DisplayName: appName,
+		Exec:        []string{exe},
+	}
+
+	return &Base{
+		SentryReporter: sentryReporter,
+		CrashHandler:   crashHandler,
+		Locations:      locations,
+		Settings:       settingsObj,
+		Lock:           lock,
+		Cache:          cache,
+		Listener:       listener,
+		Creds:          credentials.NewStore(kc),
+		CM:             cm,
+		CookieJar:      jar,
+		UserAgent:      userAgent,
+		Updater:        updater,
+		Versioner:      versioner,
+		TLS:            tls.New(settingsPath),
+		Autostart:      autostart,
+
+		Name:  appName,
+		usage: appUsage,
+
+		// By default, the command is the app's executable.
+		// This can be changed at runtime by using the "--launcher" flag.
+		command: exe,
+	}, nil
+}
+
+func (b *Base) NewApp(action func(*Base, *cli.Context) error) *cli.App {
+	app := cli.NewApp()
+
+	app.Name = b.Name
+	app.Usage = b.usage
+	app.Version = constants.Version
+	app.Action = b.run(action)
+	app.Flags = []cli.Flag{
+		&cli.BoolFlag{
+			Name:    flagCPUProfile,
+			Aliases: []string{flagCPUProfileShort},
+			Usage:   "Generate CPU profile",
+		},
+		&cli.BoolFlag{
+			Name:    flagMemProfile,
+			Aliases: []string{flagMemProfileShort},
+			Usage:   "Generate memory profile",
+		},
+		&cli.StringFlag{
+			Name:    flagLogLevel,
+			Aliases: []string{flagLogLevelShort},
+			Usage:   "Set the log level (one of panic, fatal, error, warn, info, debug)",
+		},
+		&cli.BoolFlag{
+			Name:    FlagCLI,
+			Aliases: []string{flagCLIShort},
+			Usage:   "Use command line interface",
+		},
+		&cli.StringFlag{
+			Name:   flagRestart,
+			Usage:  "The number of times the application has already restarted",
+			Hidden: true,
+		},
+		&cli.StringFlag{
+			Name:   flagLauncher,
+			Usage:  "The launcher to use to restart the application",
+			Hidden: true,
+		},
+	}
+
+	return app
+}
+
+// SetToRestart sets the app to restart the next time it is closed.
+func (b *Base) SetToRestart() {
+	b.restart = true
+}
+
+// AddTeardownAction adds an action to perform during app teardown.
+func (b *Base) AddTeardownAction(fn func() error) {
+	b.teardown = append(b.teardown, fn)
+}
+
+func (b *Base) run(appMainLoop func(*Base, *cli.Context) error) cli.ActionFunc { // nolint[funlen]
+	return func(c *cli.Context) error {
+		defer b.CrashHandler.HandlePanic()
+		defer func() { _ = b.Lock.Close() }()
+
+		// If launcher was used to start the app, use that for restart/autostart.
+		if launcher := c.String(flagLauncher); launcher != "" {
+			b.Autostart.Exec = []string{launcher}
+			b.command = launcher
+		}
+
+		if c.Bool(flagCPUProfile) {
+			startCPUProfile()
+			defer pprof.StopCPUProfile()
+		}
+
+		if c.Bool(flagMemProfile) {
+			defer makeMemoryProfile()
+		}
+
+		logging.SetLevel(c.String(flagLogLevel))
+		b.CM.SetLogging(logrus.WithField("pkg", "pmapi"), logrus.GetLevel() == logrus.TraceLevel)
+
+		logrus.
+			WithField("appName", b.Name).
+			WithField("version", constants.Version).
+			WithField("revision", constants.Revision).
+			WithField("build", constants.BuildTime).
+			WithField("runtime", runtime.GOOS).
+			WithField("args", os.Args).
+			Info("Run app")
+
+		b.CrashHandler.AddRecoveryAction(func(interface{}) error {
+			if c.Int(flagRestart) > maxAllowedRestarts {
+				logrus.
+					WithField("restart", c.Int("restart")).
+					Warn("Not restarting, already restarted too many times")
+
+				return nil
+			}
+
+			return b.restartApp(true)
+		})
+
+		if err := appMainLoop(b, c); err != nil {
+			return err
+		}
+
+		if err := b.doTeardown(); err != nil {
+			return err
+		}
+
+		if b.restart {
+			return b.restartApp(false)
+		}
+
+		return nil
+	}
+}
+
+func (b *Base) doTeardown() error {
+	for _, action := range b.teardown {
+		if err := action(); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}

internal/app/base/migration.go

@@ -0,0 +1,131 @@
+// Copyright (c) 2021 Proton Technologies AG
+//
+// This file is part of ProtonMail Bridge.
+//
+// ProtonMail Bridge is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// ProtonMail Bridge is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
+
+package base
+
+import (
+	"os"
+	"path/filepath"
+
+	"github.com/ProtonMail/proton-bridge/internal/constants"
+	"github.com/ProtonMail/proton-bridge/internal/locations"
+	"github.com/sirupsen/logrus"
+)
+
+// migrateFiles migrates files from their old (pre-refactor) locations to their new locations.
+// We can remove this eventually.
+//
+// | entity    |               old location                |            new location                |
+// |-----------|-------------------------------------------|----------------------------------------|
+// | prefs     | ~/.cache/protonmail/<app>/c11/prefs.json  | ~/.config/protonmail/<app>/prefs.json  |
+// | c11 1.5.x | ~/.cache/protonmail/<app>/c11             | ~/.cache/protonmail/<app>/cache/c11    |
+// | c11 1.6.x | ~/.cache/protonmail/<app>/cache/c11       | ~/.config/protonmail/<app>/cache/c11   |
+// | updates   | ~/.cache/protonmail/<app>/updates         | ~/.config/protonmail/<app>/updates     |.
+func migrateFiles(configName string) error {
+	locationsProvider, err := locations.NewDefaultProvider(filepath.Join(constants.VendorName, configName))
+	if err != nil {
+		return err
+	}
+
+	locations := locations.New(locationsProvider, configName)
+	userCacheDir := locationsProvider.UserCache()
+
+	if err := migratePrefsFrom15x(locations, userCacheDir); err != nil {
+		return err
+	}
+	if err := migrateCacheFromBoth15xAnd16x(locations, userCacheDir); err != nil {
+		return err
+	}
+	if err := migrateUpdatesFrom16x(configName, locations); err != nil { //nolint[revive] It is more clear to structure this way
+		return err
+	}
+	return nil
+}
+
+func migratePrefsFrom15x(locations *locations.Locations, userCacheDir string) error {
+	newSettingsDir, err := locations.ProvideSettingsPath()
+	if err != nil {
+		return err
+	}
+
+	return moveIfExists(
+		filepath.Join(userCacheDir, "c11", "prefs.json"),
+		filepath.Join(newSettingsDir, "prefs.json"),
+	)
+}
+
+func migrateCacheFromBoth15xAnd16x(locations *locations.Locations, userCacheDir string) error {
+	olderCacheDir := userCacheDir
+	newerCacheDir := locations.GetOldCachePath()
+	latestCacheDir, err := locations.ProvideCachePath()
+	if err != nil {
+		return err
+	}
+
+	// Migration for versions before 1.6.x.
+	if err := moveIfExists(
+		filepath.Join(olderCacheDir, "c11"),
+		filepath.Join(latestCacheDir, "c11"),
+	); err != nil {
+		return err
+	}
+
+	// Migration for versions 1.6.x.
+	return moveIfExists(
+		filepath.Join(newerCacheDir, "c11"),
+		filepath.Join(latestCacheDir, "c11"),
+	)
+}
+
+func migrateUpdatesFrom16x(configName string, locations *locations.Locations) error {
+	// In order to properly update Bridge 1.6.X and higher we need to
+	// change the launcher first. Since this is not part of automatic
+	// updates the migration must wait until manual update. Until that
+	// we need to keep old path.
+	if configName == "bridge" {
+		return nil
+	}
+
+	oldUpdatesPath := locations.GetOldUpdatesPath()
+	// Do not use ProvideUpdatesPath, that creates dir right away.
+	newUpdatesPath := locations.GetUpdatesPath()
+
+	return moveIfExists(oldUpdatesPath, newUpdatesPath)
+}
+
+func moveIfExists(source, destination string) error {
+	l := logrus.WithField("source", source).WithField("destination", destination)
+
+	if _, err := os.Stat(source); os.IsNotExist(err) {
+		l.Info("No need to migrate file, source doesn't exist")
+		return nil
+	}
+
+	if _, err := os.Stat(destination); !os.IsNotExist(err) {
+		// Once migrated, files should not stay in source anymore. Therefore
+		// if some files are still in source location but target already exist,
+		// it's suspicious. Could happen by installing new version, then the
+		// old one because of some reason, and then the new one again.
+		// Good to see as warning because it could be a reason why Bridge is
+		// behaving weirdly, like wrong configuration, or db re-sync and so on.
+		l.Warn("No need to migrate file, target already exists")
+		return nil
+	}
+
+	l.Info("Migrating files")
+	return os.Rename(source, destination)
+}

internal/app/base/profiling.go

@@ -15,40 +15,42 @@
 // You should have received a copy of the GNU General Public License
 // along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 
-package cmd
+package base
 
 import (
 	"os"
 	"path/filepath"
 	"runtime"
 	"runtime/pprof"
+
+	"github.com/sirupsen/logrus"
 )
 
-// StartCPUProfile starts CPU pprof.
-func StartCPUProfile() {
+// startCPUProfile starts CPU pprof.
+func startCPUProfile() {
 	f, err := os.Create("./cpu.pprof")
 	if err != nil {
-		log.Fatal("Could not create CPU profile: ", err)
+		logrus.Fatal("Could not create CPU profile: ", err)
 	}
 	if err := pprof.StartCPUProfile(f); err != nil {
-		log.Fatal("Could not start CPU profile: ", err)
+		logrus.Fatal("Could not start CPU profile: ", err)
 	}
 }
 
-// MakeMemoryProfile generates memory pprof.
-func MakeMemoryProfile() {
+// makeMemoryProfile generates memory pprof.
+func makeMemoryProfile() {
 	name := "./mem.pprof"
 	f, err := os.Create(name)
 	if err != nil {
-		log.Fatal("Could not create memory profile: ", err)
+		logrus.Fatal("Could not create memory profile: ", err)
 	}
 	if abs, err := filepath.Abs(name); err == nil {
 		name = abs
 	}
-	log.Info("Writing memory profile to ", name)
+	logrus.Info("Writing memory profile to ", name)
 	runtime.GC() // get up-to-date statistics
 	if err := pprof.WriteHeapProfile(f); err != nil {
-		log.Fatal("Could not write memory profile: ", err)
+		logrus.Fatal("Could not write memory profile: ", err)
 	}
 	_ = f.Close()
 }

internal/app/base/restart.go

@@ -0,0 +1,79 @@
+// Copyright (c) 2021 Proton Technologies AG
+//
+// This file is part of ProtonMail Bridge.
+//
+// ProtonMail Bridge is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// ProtonMail Bridge is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
+
+package base
+
+import (
+	"os"
+	"os/exec"
+	"strconv"
+
+	"github.com/sirupsen/logrus"
+)
+
+// maxAllowedRestarts controls after how many crashes the app will give up restarting.
+const maxAllowedRestarts = 10
+
+func (b *Base) restartApp(crash bool) error {
+	var args []string
+
+	if crash {
+		args = incrementRestartFlag(os.Args)[1:]
+	} else {
+		args = os.Args[1:]
+	}
+
+	logrus.
+		WithField("command", b.command).
+		WithField("args", args).
+		Warn("Restarting")
+
+	return exec.Command(b.command, args...).Start() // nolint[gosec]
+}
+
+// incrementRestartFlag increments the value of the restart flag.
+// If no such flag is present, it is added with initial value 1.
+func incrementRestartFlag(args []string) []string {
+	res := append([]string{}, args...)
+
+	hasFlag := false
+
+	for k, v := range res {
+		if v != "--restart" {
+			continue
+		}
+
+		hasFlag = true
+
+		if k+1 >= len(res) {
+			continue
+		}
+
+		n, err := strconv.Atoi(res[k+1])
+		if err != nil {
+			res[k+1] = "1"
+		} else {
+			res[k+1] = strconv.Itoa(n + 1)
+		}
+	}
+
+	if !hasFlag {
+		res = append(res, "--restart", "1")
+	}
+
+	return res
+}

internal/app/base/restart_test.go

@@ -0,0 +1,49 @@
+// Copyright (c) 2021 Proton Technologies AG
+//
+// This file is part of ProtonMail Bridge.
+//
+// ProtonMail Bridge is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// ProtonMail Bridge is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
+
+package base
+
+import (
+	"strings"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestIncrementRestartFlag(t *testing.T) {
+	var tests = []struct {
+		in  []string
+		out []string
+	}{
+		{[]string{"./bridge", "--restart", "1"}, []string{"./bridge", "--restart", "2"}},
+		{[]string{"./bridge", "--restart", "2"}, []string{"./bridge", "--restart", "3"}},
+		{[]string{"./bridge", "--other", "--restart", "2"}, []string{"./bridge", "--other", "--restart", "3"}},
+		{[]string{"./bridge", "--restart", "2", "--other"}, []string{"./bridge", "--restart", "3", "--other"}},
+		{[]string{"./bridge", "--restart", "2", "--other", "2"}, []string{"./bridge", "--restart", "3", "--other", "2"}},
+		{[]string{"./bridge"}, []string{"./bridge", "--restart", "1"}},
+		{[]string{"./bridge", "--something"}, []string{"./bridge", "--something", "--restart", "1"}},
+		{[]string{"./bridge", "--something", "--else"}, []string{"./bridge", "--something", "--else", "--restart", "1"}},
+		{[]string{"./bridge", "--restart", "bad"}, []string{"./bridge", "--restart", "1"}},
+		{[]string{"./bridge", "--restart", "bad", "--other"}, []string{"./bridge", "--restart", "1", "--other"}},
+	}
+
+	for _, tt := range tests {
+		t.Run(strings.Join(tt.in, " "), func(t *testing.T) {
+			assert.Equal(t, tt.out, incrementRestartFlag(tt.in))
+		})
+	}
+}

internal/app/bridge/bridge.go

@@ -0,0 +1,235 @@
+// Copyright (c) 2021 Proton Technologies AG
+//
+// This file is part of ProtonMail Bridge.
+//
+// ProtonMail Bridge is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// ProtonMail Bridge is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
+
+// Package bridge implements the bridge CLI application.
+package bridge
+
+import (
+	"crypto/tls"
+	"time"
+
+	"github.com/ProtonMail/proton-bridge/internal/api"
+	"github.com/ProtonMail/proton-bridge/internal/app/base"
+	"github.com/ProtonMail/proton-bridge/internal/bridge"
+	"github.com/ProtonMail/proton-bridge/internal/config/settings"
+	pkgTLS "github.com/ProtonMail/proton-bridge/internal/config/tls"
+	"github.com/ProtonMail/proton-bridge/internal/constants"
+	"github.com/ProtonMail/proton-bridge/internal/frontend"
+	"github.com/ProtonMail/proton-bridge/internal/frontend/types"
+	"github.com/ProtonMail/proton-bridge/internal/imap"
+	"github.com/ProtonMail/proton-bridge/internal/smtp"
+	"github.com/ProtonMail/proton-bridge/internal/updater"
+	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
+	"github.com/urfave/cli/v2"
+)
+
+const (
+	flagLogIMAP        = "log-imap"
+	flagLogSMTP        = "log-smtp"
+	flagNoWindow       = "no-window"
+	flagNonInteractive = "noninteractive"
+)
+
+func New(base *base.Base) *cli.App {
+	app := base.NewApp(run)
+
+	app.Flags = append(app.Flags, []cli.Flag{
+		&cli.StringFlag{
+			Name:  flagLogIMAP,
+			Usage: "Enable logging of IMAP communications (all|client|server) (may contain decrypted data!)"},
+		&cli.BoolFlag{
+			Name:  flagLogSMTP,
+			Usage: "Enable logging of SMTP communications (may contain decrypted data!)"},
+		&cli.BoolFlag{
+			Name:  flagNoWindow,
+			Usage: "Don't show window after start"},
+		&cli.BoolFlag{
+			Name:  flagNonInteractive,
+			Usage: "Start Bridge entirely noninteractively"},
+	}...)
+
+	return app
+}
+
+func run(b *base.Base, c *cli.Context) error { // nolint[funlen]
+	tlsConfig, err := loadTLSConfig(b)
+	if err != nil {
+		logrus.WithError(err).Fatal("Failed to load TLS config")
+	}
+	bridge := bridge.New(b.Locations, b.Cache, b.Settings, b.SentryReporter, b.CrashHandler, b.Listener, b.CM, b.Creds, b.Updater, b.Versioner)
+	imapBackend := imap.NewIMAPBackend(b.CrashHandler, b.Listener, b.Cache, bridge)
+	smtpBackend := smtp.NewSMTPBackend(b.CrashHandler, b.Listener, b.Settings, bridge)
+
+	go func() {
+		defer b.CrashHandler.HandlePanic()
+		api.NewAPIServer(b.Settings, b.Listener).ListenAndServe()
+	}()
+
+	go func() {
+		defer b.CrashHandler.HandlePanic()
+		imapPort := b.Settings.GetInt(settings.IMAPPortKey)
+		imap.NewIMAPServer(
+			b.CrashHandler,
+			c.String(flagLogIMAP) == "client" || c.String(flagLogIMAP) == "all",
+			c.String(flagLogIMAP) == "server" || c.String(flagLogIMAP) == "all",
+			imapPort, tlsConfig, imapBackend, b.UserAgent, b.Listener).ListenAndServe()
+	}()
+
+	go func() {
+		defer b.CrashHandler.HandlePanic()
+		smtpPort := b.Settings.GetInt(settings.SMTPPortKey)
+		useSSL := b.Settings.GetBool(settings.SMTPSSLKey)
+		smtp.NewSMTPServer(
+			b.CrashHandler,
+			c.Bool(flagLogSMTP),
+			smtpPort, useSSL, tlsConfig, smtpBackend, b.Listener).ListenAndServe()
+	}()
+
+	// Bridge supports no-window option which we should use for autostart.
+	b.Autostart.Exec = append(b.Autostart.Exec, "--"+flagNoWindow)
+
+	// We want to remove old versions if the app exits successfully.
+	b.AddTeardownAction(b.Versioner.RemoveOldVersions)
+
+	// We want cookies to be saved to disk so they are loaded the next time.
+	b.AddTeardownAction(b.CookieJar.PersistCookies)
+
+	var frontendMode string
+
+	switch {
+	case c.Bool(base.FlagCLI):
+		frontendMode = "cli"
+	case c.Bool(flagNonInteractive):
+		return <-(make(chan error)) // Block forever.
+	default:
+		frontendMode = "qt"
+	}
+
+	f := frontend.New(
+		constants.Version,
+		constants.BuildVersion,
+		b.Name,
+		frontendMode,
+		!c.Bool(flagNoWindow),
+		b.CrashHandler,
+		b.Locations,
+		b.Settings,
+		b.Listener,
+		b.Updater,
+		b.UserAgent,
+		bridge,
+		smtpBackend,
+		b.Autostart,
+		b,
+	)
+
+	// Watch for updates routine
+	go func() {
+		ticker := time.NewTicker(constants.UpdateCheckInterval)
+
+		for {
+			checkAndHandleUpdate(b.Updater, f, b.Settings.GetBool(settings.AutoUpdateKey))
+			<-ticker.C
+		}
+	}()
+
+	return f.Loop()
+}
+
+func loadTLSConfig(b *base.Base) (*tls.Config, error) {
+	if !b.TLS.HasCerts() {
+		if err := generateTLSCerts(b); err != nil {
+			return nil, err
+		}
+	}
+
+	tlsConfig, err := b.TLS.GetConfig()
+	if err == nil {
+		return tlsConfig, nil
+	}
+
+	logrus.WithError(err).Error("Failed to load TLS config, regenerating certificates")
+
+	if err := generateTLSCerts(b); err != nil {
+		return nil, err
+	}
+
+	return b.TLS.GetConfig()
+}
+
+func generateTLSCerts(b *base.Base) error {
+	template, err := pkgTLS.NewTLSTemplate()
+	if err != nil {
+		return errors.Wrap(err, "failed to generate TLS template")
+	}
+
+	if err := b.TLS.GenerateCerts(template); err != nil {
+		return errors.Wrap(err, "failed to generate TLS certs")
+	}
+
+	if err := b.TLS.InstallCerts(); err != nil {
+		return errors.Wrap(err, "failed to install TLS certs")
+	}
+
+	return nil
+}
+
+func checkAndHandleUpdate(u types.Updater, f frontend.Frontend, autoUpdate bool) {
+	log := logrus.WithField("pkg", "app/bridge")
+	version, err := u.Check()
+	if err != nil {
+		log.WithError(err).Error("An error occurred while checking for updates")
+		return
+	}
+
+	f.WaitUntilFrontendIsReady()
+
+	// Update links in UI
+	f.SetVersion(version)
+
+	if !u.IsUpdateApplicable(version) {
+		log.Info("No need to update")
+		return
+	}
+
+	log.WithField("version", version.Version).Info("An update is available")
+
+	if !autoUpdate {
+		f.NotifyManualUpdate(version, u.CanInstall(version))
+		return
+	}
+
+	if !u.CanInstall(version) {
+		log.Info("A manual update is required")
+		f.NotifySilentUpdateError(updater.ErrManualUpdateRequired)
+		return
+	}
+
+	if err := u.InstallUpdate(version); err != nil {
+		if errors.Cause(err) == updater.ErrDownloadVerify {
+			log.WithError(err).Warning("Skipping update installation due to temporary error")
+		} else {
+			log.WithError(err).Error("The update couldn't be installed")
+			f.NotifySilentUpdateError(err)
+		}
+
+		return
+	}
+
+	f.NotifySilentUpdateInstalled()
+}

internal/app/ie/ie.go

@@ -0,0 +1,110 @@
+// Copyright (c) 2021 Proton Technologies AG
+//
+// This file is part of ProtonMail Bridge.
+//
+// ProtonMail Bridge is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// ProtonMail Bridge is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
+
+// Package ie implements the ie CLI application.
+package ie
+
+import (
+	"time"
+
+	"github.com/ProtonMail/proton-bridge/internal/api"
+	"github.com/ProtonMail/proton-bridge/internal/app/base"
+	"github.com/ProtonMail/proton-bridge/internal/config/settings"
+	"github.com/ProtonMail/proton-bridge/internal/constants"
+	"github.com/ProtonMail/proton-bridge/internal/frontend"
+	"github.com/ProtonMail/proton-bridge/internal/frontend/types"
+	"github.com/ProtonMail/proton-bridge/internal/importexport"
+	"github.com/sirupsen/logrus"
+	"github.com/urfave/cli/v2"
+)
+
+func New(b *base.Base) *cli.App {
+	return b.NewApp(run)
+}
+
+func run(b *base.Base, c *cli.Context) error {
+	ie := importexport.New(b.Locations, b.Cache, b.CrashHandler, b.Listener, b.CM, b.Creds)
+
+	go func() {
+		defer b.CrashHandler.HandlePanic()
+		api.NewAPIServer(b.Settings, b.Listener).ListenAndServe()
+	}()
+
+	var frontendMode string
+
+	switch {
+	case c.Bool(base.FlagCLI):
+		frontendMode = "cli"
+	default:
+		frontendMode = "qt"
+	}
+
+	// We want to remove old versions if the app exits successfully.
+	b.AddTeardownAction(b.Versioner.RemoveOldVersions)
+
+	// We want cookies to be saved to disk so they are loaded the next time.
+	b.AddTeardownAction(b.CookieJar.PersistCookies)
+
+	f := frontend.NewImportExport(
+		constants.Version,
+		constants.BuildVersion,
+		b.Name,
+		frontendMode,
+		b.CrashHandler,
+		b.Locations,
+		b.Settings,
+		b.Listener,
+		b.Updater,
+		ie,
+		b,
+	)
+
+	// Watch for updates routine
+	go func() {
+		ticker := time.NewTicker(time.Hour)
+
+		for {
+			checkAndHandleUpdate(b.Updater, f, b.Settings.GetBool(settings.AutoUpdateKey))
+			<-ticker.C
+		}
+	}()
+
+	return f.Loop()
+}
+
+func checkAndHandleUpdate(u types.Updater, f frontend.Frontend, autoUpdate bool) { //nolint[unparam]
+	log := logrus.WithField("pkg", "app/ie")
+	version, err := u.Check()
+	if err != nil {
+		log.WithError(err).Error("An error occurred while checking for updates")
+		return
+	}
+
+	f.WaitUntilFrontendIsReady()
+
+	// Update links in UI
+	f.SetVersion(version)
+
+	if !u.IsUpdateApplicable(version) {
+		log.Info("No need to update")
+		return
+	}
+
+	log.WithField("version", version.Version).Info("An update is available")
+
+	f.NotifyManualUpdate(version, u.CanInstall(version))
+}

internal/bridge/bridge.go

@@ -19,11 +19,16 @@
 package bridge
 
 import (
+	"context"
+	"fmt"
 	"strconv"
 	"time"
 
+	"github.com/ProtonMail/proton-bridge/internal/config/settings"
+	"github.com/ProtonMail/proton-bridge/internal/constants"
 	"github.com/ProtonMail/proton-bridge/internal/metrics"
-	"github.com/ProtonMail/proton-bridge/internal/preferences"
+	"github.com/ProtonMail/proton-bridge/internal/sentry"
+	"github.com/ProtonMail/proton-bridge/internal/updater"
 	"github.com/ProtonMail/proton-bridge/internal/users"
 	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
 
@@ -38,40 +43,49 @@ var (
 type Bridge struct {
 	*users.Users
 
-	pref          PreferenceProvider
-	clientManager users.ClientManager
-
-	userAgentClientName    string
-	userAgentClientVersion string
-	userAgentOS            string
+	locations     Locator
+	settings      SettingsProvider
+	clientManager pmapi.Manager
+	updater       Updater
+	versioner     Versioner
 }
 
 func New(
-	config Configer,
-	pref PreferenceProvider,
+	locations Locator,
+	cache Cacher,
+	s SettingsProvider,
+	sentryReporter *sentry.Reporter,
 	panicHandler users.PanicHandler,
 	eventListener listener.Listener,
-	clientManager users.ClientManager,
+	clientManager pmapi.Manager,
 	credStorer users.CredentialsStorer,
+	updater Updater,
+	versioner Versioner,
 ) *Bridge {
 	// Allow DoH before starting the app if the user has previously set this setting.
 	// This allows us to start even if protonmail is blocked.
-	if pref.GetBool(preferences.AllowProxyKey) {
+	if s.GetBool(settings.AllowProxyKey) {
 		clientManager.AllowProxy()
 	}
 
-	storeFactory := newStoreFactory(config, panicHandler, clientManager, eventListener)
-	u := users.New(config, panicHandler, eventListener, clientManager, credStorer, storeFactory, true)
+	storeFactory := newStoreFactory(cache, sentryReporter, panicHandler, eventListener)
+	u := users.New(locations, panicHandler, eventListener, clientManager, credStorer, storeFactory, true)
 	b := &Bridge{
 		Users: u,
 
-		pref:          pref,
+		locations:     locations,
+		settings:      s,
 		clientManager: clientManager,
+		updater:       updater,
+		versioner:     versioner,
 	}
 
-	if pref.GetBool(preferences.FirstStartKey) {
-		b.SendMetric(metrics.New(metrics.Setup, metrics.FirstStart, metrics.Label(config.GetVersion())))
-		pref.SetBool(preferences.FirstStartKey, false)
+	if s.GetBool(settings.FirstStartKey) {
+		if err := b.SendMetric(metrics.New(metrics.Setup, metrics.FirstStart, metrics.Label(constants.Version))); err != nil {
+			logrus.WithError(err).Error("Failed to send metric")
+		}
+
+		s.SetBool(settings.FirstStartKey, false)
 	}
 
 	go b.heartbeat()
@@ -81,72 +95,85 @@ func New(
 
 // heartbeat sends a heartbeat signal once a day.
 func (b *Bridge) heartbeat() {
-	ticker := time.NewTicker(1 * time.Minute)
-
-	for range ticker.C {
-		next, err := strconv.ParseInt(b.pref.Get(preferences.NextHeartbeatKey), 10, 64)
+	for range time.Tick(time.Minute) {
+		lastHeartbeatDay, err := strconv.ParseInt(b.settings.Get(settings.LastHeartbeatKey), 10, 64)
 		if err != nil {
 			continue
 		}
-		nextTime := time.Unix(next, 0)
-		if time.Now().After(nextTime) {
-			b.SendMetric(metrics.New(metrics.Heartbeat, metrics.Daily, metrics.NoLabel))
-			nextTime = nextTime.Add(24 * time.Hour)
-			b.pref.Set(preferences.NextHeartbeatKey, strconv.FormatInt(nextTime.Unix(), 10))
+
+		// If we're still on the same day, don't send a heartbeat.
+		if time.Now().YearDay() == int(lastHeartbeatDay) {
+			continue
 		}
+
+		// We're on the next (or a different) day, so send a heartbeat.
+		if err := b.SendMetric(metrics.New(metrics.Heartbeat, metrics.Daily, metrics.NoLabel)); err != nil {
+			logrus.WithError(err).Error("Failed to send heartbeat")
+			continue
+		}
+
+		// Heartbeat was sent successfully so update the last heartbeat day.
+		b.settings.Set(settings.LastHeartbeatKey, fmt.Sprintf("%v", time.Now().YearDay()))
 	}
 }
 
-// GetCurrentClient returns currently connected client (e.g. Thunderbird).
-func (b *Bridge) GetCurrentClient() string {
-	res := b.userAgentClientName
-	if b.userAgentClientVersion != "" {
-		res = res + " " + b.userAgentClientVersion
-	}
-	return res
-}
-
-// SetCurrentClient updates client info (e.g. Thunderbird) and sets the user agent
-// on pmapi. By default no client is used, IMAP has to detect it on first login.
-func (b *Bridge) SetCurrentClient(clientName, clientVersion string) {
-	b.userAgentClientName = clientName
-	b.userAgentClientVersion = clientVersion
-	b.updateUserAgent()
-}
-
-// SetCurrentOS updates OS and sets the user agent on pmapi. By default we use
-// `runtime.GOOS`, but this can be overridden in case of better detection.
-func (b *Bridge) SetCurrentOS(os string) {
-	b.userAgentOS = os
-	b.updateUserAgent()
-}
-
-func (b *Bridge) updateUserAgent() {
-	b.clientManager.SetUserAgent(b.userAgentClientName, b.userAgentClientVersion, b.userAgentOS)
-}
-
 // ReportBug reports a new bug from the user.
 func (b *Bridge) ReportBug(osType, osVersion, description, accountName, address, emailClient string) error {
-	c := b.clientManager.GetAnonymousClient()
-	defer c.Logout()
-
-	title := "[Bridge] Bug"
-	report := pmapi.ReportReq{
+	return b.clientManager.ReportBug(context.Background(), pmapi.ReportBugReq{
 		OS:          osType,
 		OSVersion:   osVersion,
 		Browser:     emailClient,
-		Title:       title,
+		Title:       "[Bridge] Bug",
 		Description: description,
 		Username:    accountName,
 		Email:       address,
-	}
-
-	if err := c.Report(report); err != nil {
-		log.Error("Reporting bug failed: ", err)
-		return err
-	}
-
-	log.Info("Bug successfully reported")
-
-	return nil
+	})
+}
+
+// GetUpdateChannel returns currently set update channel.
+func (b *Bridge) GetUpdateChannel() updater.UpdateChannel {
+	return updater.UpdateChannel(b.settings.Get(settings.UpdateChannelKey))
+}
+
+// SetUpdateChannel switches update channel.
+// Downgrading to previous version (by switching from early to stable, for example)
+// requires clearing all data including update files due to possibility of
+// inconsistency between versions and absence of backwards migration scripts.
+func (b *Bridge) SetUpdateChannel(channel updater.UpdateChannel) (needRestart bool, err error) {
+	b.settings.Set(settings.UpdateChannelKey, string(channel))
+
+	version, err := b.updater.Check()
+	if err != nil {
+		return false, err
+	}
+
+	// We have to deal right away only with downgrade - that action needs to
+	// clear data and updates, and install bridge right away. But regular
+	// upgrade can be leaved out for periodic check.
+	if !b.updater.IsDowngrade(version) {
+		return false, nil
+	}
+
+	if err := b.Users.ClearData(); err != nil {
+		log.WithError(err).Error("Failed to clear data while downgrading channel")
+	}
+	if err := b.locations.ClearUpdates(); err != nil {
+		log.WithError(err).Error("Failed to clear updates while downgrading channel")
+	}
+
+	if err := b.updater.InstallUpdate(version); err != nil {
+		return false, err
+	}
+
+	return true, b.versioner.RemoveOtherVersions(version.Version)
+}
+
+// GetKeychainApp returns current keychain helper.
+func (b *Bridge) GetKeychainApp() string {
+	return b.settings.Get(settings.PreferredKeychainKey)
+}
+
+// SetKeychainApp sets current keychain helper.
+func (b *Bridge) SetKeychainApp(helper string) {
+	b.settings.Set(settings.PreferredKeychainKey, helper)
 }

internal/bridge/credits.go

@@ -1,22 +0,0 @@
-// Copyright (c) 2021 Proton Technologies AG
-//
-// This file is part of ProtonMail Bridge.
-//
-// ProtonMail Bridge is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// ProtonMail Bridge is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
-
-// Code generated by ./credits.sh at Mon Dec 28 02:39:43 PM CET 2020. DO NOT EDIT.
-
-package bridge
-
-const Credits = "github.com/0xAX/notificator;github.com/abiosoft/ishell;github.com/abiosoft/readline;github.com/allan-simon/go-singleinstance;github.com/chzyer/logex;github.com/chzyer/test;github.com/cucumber/godog;github.com/docker/docker-credential-helpers;github.com/emersion/go-imap;github.com/emersion/go-imap-appendlimit;github.com/emersion/go-imap-idle;github.com/emersion/go-imap-move;github.com/emersion/go-imap-quota;github.com/emersion/go-imap-unselect;github.com/emersion/go-mbox;github.com/emersion/go-message;github.com/emersion/go-sasl;github.com/emersion/go-smtp;github.com/emersion/go-textwrapper;github.com/emersion/go-vcard;github.com/fatih/color;github.com/flynn-archive/go-shlex;github.com/getsentry/sentry-go;github.com/golang/mock;github.com/google/go-cmp;github.com/google/uuid;github.com/gopherjs/gopherjs;github.com/go-resty/resty/v2;github.com/hashicorp/go-multierror;github.com/jameskeane/bcrypt;github.com/jaytaylor/html2text;github.com/kardianos/osext;github.com/keybase/go-keychain;github.com/logrusorgru/aurora;github.com/Masterminds/semver/v3;github.com/mattn/go-runewidth;github.com/miekg/dns;github.com/myesui/uuid;github.com/nsf/jsondiff;github.com/olekukonko/tablewriter;github.com/pkg/errors;github.com/ProtonMail/bcrypt;github.com/ProtonMail/crypto;github.com/ProtonMail/docker-credential-helpers;github.com/ProtonMail/go-appdir;github.com/ProtonMail/go-apple-mobileconfig;github.com/ProtonMail/go-autostart;github.com/ProtonMail/go-imap;github.com/ProtonMail/go-imap-id;github.com/ProtonMail/gopenpgp/v2;github.com/ProtonMail/go-rfc5322;github.com/ProtonMail/go-vcard;github.com/PuerkitoBio/goquery;github.com/sirupsen/logrus;github.com/skratchdot/open-golang;github.com/ssor/bom;github.com/stretchr/testify;github.com/therecipe/qt;github.com/twinj/uuid;github.com/urfave/cli;go.etcd.io/bbolt;golang.org/x/crypto;golang.org/x/net;golang.org/x/text;gopkg.in/stretchr/testify.v1;;Font Awesome 4.7.0;;Qt 5.13 by Qt group;"

internal/bridge/release_notes.go

@@ -15,18 +15,12 @@
 // You should have received a copy of the GNU General Public License
 // along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 
-// Code generated by ./release-notes.sh at 'Thu Jan 14 04:51:03 PM CET 2021'. DO NOT EDIT.
+// Code generated by ./release-notes.sh at 'Fri Jan 22 11:01:06 AM CET 2021'. DO NOT EDIT.
 
 package bridge
 
-const ReleaseNotes = `• Improvements to message parsing
-• Better error handling
+const ReleaseNotes = `
 `
 
-const ReleaseFixedBugs = `• Message corruption - rare cases of overly long headers
-• AppleMail crashes (related to timestamps)
-• Sending messages from aliases in combined inbox mode
-• Fedora font issues
-
-For more detailed summary of the changes see https://github.com/ProtonMail/proton-bridge/blob/master/Changelog.md
+const ReleaseFixedBugs = `• Fixed sending error caused by inconsistent use of upper and lower case in sender’s email address
 `

internal/bridge/store_factory.go

@@ -21,44 +21,44 @@ import (
 	"fmt"
 	"path/filepath"
 
+	"github.com/ProtonMail/proton-bridge/internal/sentry"
 	"github.com/ProtonMail/proton-bridge/internal/store"
 	"github.com/ProtonMail/proton-bridge/internal/users"
-
 	"github.com/ProtonMail/proton-bridge/pkg/listener"
 )
 
 type storeFactory struct {
-	config        StoreFactoryConfiger
-	panicHandler  users.PanicHandler
-	clientManager users.ClientManager
-	eventListener listener.Listener
-	storeCache    *store.Cache
+	cache          Cacher
+	sentryReporter *sentry.Reporter
+	panicHandler   users.PanicHandler
+	eventListener  listener.Listener
+	storeCache     *store.Cache
 }
 
 func newStoreFactory(
-	config StoreFactoryConfiger,
+	cache Cacher,
+	sentryReporter *sentry.Reporter,
 	panicHandler users.PanicHandler,
-	clientManager users.ClientManager,
 	eventListener listener.Listener,
 ) *storeFactory {
 	return &storeFactory{
-		config:        config,
-		panicHandler:  panicHandler,
-		clientManager: clientManager,
-		eventListener: eventListener,
-		storeCache:    store.NewCache(config.GetIMAPCachePath()),
+		cache:          cache,
+		sentryReporter: sentryReporter,
+		panicHandler:   panicHandler,
+		eventListener:  eventListener,
+		storeCache:     store.NewCache(cache.GetIMAPCachePath()),
 	}
 }
 
 // New creates new store for given user.
 func (f *storeFactory) New(user store.BridgeUser) (*store.Store, error) {
-	storePath := getUserStorePath(f.config.GetDBDir(), user.ID())
-	return store.New(f.panicHandler, user, f.clientManager, f.eventListener, storePath, f.storeCache)
+	storePath := getUserStorePath(f.cache.GetDBDir(), user.ID())
+	return store.New(f.sentryReporter, f.panicHandler, user, f.eventListener, storePath, f.storeCache)
 }
 
 // Remove removes all store files for given user.
 func (f *storeFactory) Remove(userID string) error {
-	storePath := getUserStorePath(f.config.GetDBDir(), userID)
+	storePath := getUserStorePath(f.cache.GetDBDir(), userID)
 	return store.RemoveStore(f.storeCache, storePath, userID)
 }
 

internal/bridge/types.go

@@ -17,22 +17,35 @@
 
 package bridge
 
-import "github.com/ProtonMail/proton-bridge/internal/users"
+import (
+	"github.com/Masterminds/semver/v3"
 
-type Configer interface {
-	users.Configer
-	StoreFactoryConfiger
+	"github.com/ProtonMail/proton-bridge/internal/updater"
+)
+
+type Locator interface {
+	Clear() error
+	ClearUpdates() error
 }
 
-type StoreFactoryConfiger interface {
-	GetDBDir() string
+type Cacher interface {
 	GetIMAPCachePath() string
+	GetDBDir() string
 }
 
-type PreferenceProvider interface {
+type SettingsProvider interface {
 	Get(key string) string
+	Set(key string, value string)
 	GetBool(key string) bool
 	SetBool(key string, val bool)
-	GetInt(key string) int
-	Set(key string, value string)
+}
+
+type Updater interface {
+	Check() (updater.VersionInfo, error)
+	IsDowngrade(updater.VersionInfo) bool
+	InstallUpdate(updater.VersionInfo) error
+}
+
+type Versioner interface {
+	RemoveOtherVersions(*semver.Version) error
 }

internal/cmd/main.go

@@ -1,96 +0,0 @@
-// Copyright (c) 2021 Proton Technologies AG
-//
-// This file is part of ProtonMail Bridge.
-//
-// ProtonMail Bridge is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// ProtonMail Bridge is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
-
-package cmd
-
-import (
-	"os"
-	"runtime"
-
-	"github.com/ProtonMail/proton-bridge/pkg/constants"
-	pkgSentry "github.com/ProtonMail/proton-bridge/pkg/sentry"
-	"github.com/getsentry/sentry-go"
-	"github.com/sirupsen/logrus"
-	"github.com/urfave/cli"
-)
-
-var (
-	log = logrus.WithField("pkg", "cmd") //nolint[gochecknoglobals]
-
-	baseFlags = []cli.Flag{ //nolint[gochecknoglobals]
-		cli.StringFlag{
-			Name:  "log-level, l",
-			Usage: "Set the log level (one of panic, fatal, error, warn, info, debug, debug-client, debug-server)"},
-		cli.BoolFlag{
-			Name:  "cli, c",
-			Usage: "Use command line interface"},
-		cli.StringFlag{
-			Name:  "version-json, g",
-			Usage: "Generate json version file"},
-		cli.BoolFlag{
-			Name:  "mem-prof, m",
-			Usage: "Generate memory profile"},
-		cli.BoolFlag{
-			Name:  "cpu-prof, p",
-			Usage: "Generate CPU profile"},
-	}
-)
-
-// Main sets up Sentry, filters out unwanted args, creates app and runs it.
-func Main(appName, usage string, extraFlags []cli.Flag, run func(*cli.Context) error) {
-	err := sentry.Init(sentry.ClientOptions{
-		Dsn:        constants.DSNSentry,
-		Release:    constants.Revision,
-		BeforeSend: pkgSentry.EnhanceSentryEvent,
-	})
-
-	sentry.ConfigureScope(func(scope *sentry.Scope) {
-		scope.SetFingerprint([]string{"{{ default }}"})
-	})
-
-	if err != nil {
-		log.WithError(err).Errorln("Can not setup sentry DSN")
-	}
-
-	filterProcessSerialNumberFromArgs()
-	filterRestartNumberFromArgs()
-
-	app := newApp(appName, usage, extraFlags, run)
-
-	logrus.SetLevel(logrus.InfoLevel)
-	log.WithField("version", constants.Version).
-		WithField("revision", constants.Revision).
-		WithField("build", constants.BuildTime).
-		WithField("runtime", runtime.GOOS).
-		WithField("args", os.Args).
-		WithField("appName", app.Name).
-		Info("Run app")
-
-	if err := app.Run(os.Args); err != nil {
-		log.Error("Program exited with error: ", err)
-	}
-}
-
-func newApp(appName, usage string, extraFlags []cli.Flag, run func(*cli.Context) error) *cli.App {
-	app := cli.NewApp()
-	app.Name = appName
-	app.Usage = usage
-	app.Version = constants.BuildVersion
-	app.Flags = append(baseFlags, extraFlags...) //nolint[gocritic]
-	app.Action = run
-	return app
-}

internal/cmd/restart.go

@@ -1,111 +0,0 @@
-// Copyright (c) 2021 Proton Technologies AG
-//
-// This file is part of ProtonMail Bridge.
-//
-// ProtonMail Bridge is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// ProtonMail Bridge is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
-
-package cmd
-
-import (
-	"fmt"
-	"os"
-	"os/exec"
-	"strconv"
-	"strings"
-
-	"github.com/ProtonMail/proton-bridge/internal/frontend"
-	"github.com/ProtonMail/proton-bridge/pkg/config"
-	"github.com/ProtonMail/proton-bridge/pkg/sentry"
-	"github.com/urfave/cli"
-)
-
-const (
-	// After how many crashes app gives up starting.
-	maxAllowedCrashes = 10
-)
-
-var (
-	// How many crashes happened so far in a row.
-	// It will be filled from args by `filterRestartNumberFromArgs`.
-	// Every call of `HandlePanic` will increase this number.
-	// Then it will be passed as argument to the next try by `RestartApp`.
-	numberOfCrashes = 0 //nolint[gochecknoglobals]
-)
-
-// filterRestartNumberFromArgs removes flag with a number how many restart we already did.
-// See restartApp how that number is used.
-func filterRestartNumberFromArgs() {
-	tmp := os.Args[:0]
-	for i, arg := range os.Args {
-		if !strings.HasPrefix(arg, "--restart_") {
-			tmp = append(tmp, arg)
-			continue
-		}
-		var err error
-		numberOfCrashes, err = strconv.Atoi(os.Args[i][10:])
-		if err != nil {
-			numberOfCrashes = maxAllowedCrashes
-		}
-	}
-	os.Args = tmp
-}
-
-// DisableRestart disables restart once `RestartApp` is called.
-func DisableRestart() {
-	numberOfCrashes = maxAllowedCrashes
-}
-
-// RestartApp starts a new instance in background.
-func RestartApp() {
-	if numberOfCrashes >= maxAllowedCrashes {
-		log.Error("Too many crashes")
-		return
-	}
-	if exeFile, err := os.Executable(); err == nil {
-		arguments := append(os.Args[1:], fmt.Sprintf("--restart_%d", numberOfCrashes))
-		cmd := exec.Command(exeFile, arguments...) //nolint[gosec]
-		cmd.Stdout = os.Stdout
-		cmd.Stderr = os.Stderr
-		cmd.Stdin = os.Stdin
-		if err := cmd.Start(); err != nil {
-			log.Error("Restart failed: ", err)
-		}
-	}
-}
-
-// PanicHandler defines HandlePanic which can be used anywhere in defer.
-type PanicHandler struct {
-	AppName string
-	Config  *config.Config
-	Err     *error // Pointer to error of cli action.
-}
-
-// HandlePanic should be called in defer to ensure restart of app after error.
-func (ph *PanicHandler) HandlePanic() {
-	sentry.SkipDuringUnwind()
-
-	r := recover()
-	if r == nil {
-		return
-	}
-
-	config.HandlePanic(ph.Config, fmt.Sprintf("Recover: %v", r))
-	frontend.HandlePanic(ph.AppName)
-
-	*ph.Err = cli.NewExitError("Panic and restart", 255)
-	numberOfCrashes++
-	log.Error("Restarting after panic")
-	RestartApp()
-	os.Exit(255)
-}

internal/cmd/version_file.go

@@ -1,32 +0,0 @@
-// Copyright (c) 2021 Proton Technologies AG
-//
-// This file is part of ProtonMail Bridge.
-//
-// ProtonMail Bridge is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// ProtonMail Bridge is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
-
-package cmd
-
-import "github.com/ProtonMail/proton-bridge/internal/updates"
-
-// GenerateVersionFiles writes a JSON file with details about current build.
-// Those files are used for upgrading the app.
-func GenerateVersionFiles(updates *updates.Updates, dir string) {
-	log.Info("Generating version files")
-	for _, goos := range []string{"windows", "darwin", "linux"} {
-		log.Debug("Generating JSON for ", goos)
-		if err := updates.CreateJSONAndSign(dir, goos); err != nil {
-			log.Error(err)
-		}
-	}
-}

internal/config/cache/cache.go

@@ -0,0 +1,65 @@
+// Copyright (c) 2021 Proton Technologies AG
+//
+// This file is part of ProtonMail Bridge.
+//
+// ProtonMail Bridge is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// ProtonMail Bridge is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
+
+// Package cache provides access to contents inside a cache directory.
+package cache
+
+import (
+	"os"
+	"path/filepath"
+
+	"github.com/ProtonMail/proton-bridge/pkg/files"
+)
+
+type Cache struct {
+	dir, version string
+}
+
+func New(dir, version string) (*Cache, error) {
+	if err := os.MkdirAll(filepath.Join(dir, version), 0700); err != nil {
+		return nil, err
+	}
+
+	return &Cache{
+		dir:     dir,
+		version: version,
+	}, nil
+}
+
+// GetDBDir returns folder for db files.
+func (c *Cache) GetDBDir() string {
+	return c.getCurrentCacheDir()
+}
+
+// GetIMAPCachePath returns path to file with IMAP status.
+func (c *Cache) GetIMAPCachePath() string {
+	return filepath.Join(c.getCurrentCacheDir(), "user_info.json")
+}
+
+// GetTransferDir returns folder for import-export rules files.
+func (c *Cache) GetTransferDir() string {
+	return c.getCurrentCacheDir()
+}
+
+// RemoveOldVersions removes any cache dirs that are not the current version.
+func (c *Cache) RemoveOldVersions() error {
+	return files.Remove(c.dir).Except(c.getCurrentCacheDir()).Do()
+}
+
+func (c *Cache) getCurrentCacheDir() string {
+	return filepath.Join(c.dir, c.version)
+}

internal/config/cache/cache_test.go

@@ -0,0 +1,70 @@
+// Copyright (c) 2021 Proton Technologies AG
+//
+// This file is part of ProtonMail Bridge.
+//
+// ProtonMail Bridge is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// ProtonMail Bridge is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
+
+package cache
+
+import (
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestRemoveOldVersions(t *testing.T) {
+	dir, err := ioutil.TempDir("", "test-cache")
+	require.NoError(t, err)
+
+	cache, err := New(dir, "c4")
+	require.NoError(t, err)
+
+	createFilesInDir(t, dir,
+		"unexpected1.txt",
+		"c1/unexpected1.txt",
+		"c2/unexpected2.txt",
+		"c3/unexpected3.txt",
+		"something.txt",
+	)
+
+	require.DirExists(t, filepath.Join(dir, "c4"))
+	require.FileExists(t, filepath.Join(dir, "unexpected1.txt"))
+	require.FileExists(t, filepath.Join(dir, "c1", "unexpected1.txt"))
+	require.FileExists(t, filepath.Join(dir, "c2", "unexpected2.txt"))
+	require.FileExists(t, filepath.Join(dir, "c3", "unexpected3.txt"))
+	require.FileExists(t, filepath.Join(dir, "something.txt"))
+
+	assert.NoError(t, cache.RemoveOldVersions())
+
+	assert.DirExists(t, filepath.Join(dir, "c4"))
+	assert.NoFileExists(t, filepath.Join(dir, "unexpected1.txt"))
+	assert.NoFileExists(t, filepath.Join(dir, "c1", "unexpected1.txt"))
+	assert.NoFileExists(t, filepath.Join(dir, "c2", "unexpected2.txt"))
+	assert.NoFileExists(t, filepath.Join(dir, "c3", "unexpected3.txt"))
+	assert.NoFileExists(t, filepath.Join(dir, "something.txt"))
+}
+
+func createFilesInDir(t *testing.T, dir string, files ...string) {
+	for _, target := range files {
+		require.NoError(t, os.MkdirAll(filepath.Dir(filepath.Join(dir, target)), 0700))
+
+		f, err := os.Create(filepath.Join(dir, target))
+		require.NoError(t, err)
+		require.NoError(t, f.Close())
+	}
+}

internal/config/settings/kvs.go

@@ -15,35 +15,39 @@
 // You should have received a copy of the GNU General Public License
 // along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 
-package config
+package settings
 
 import (
 	"encoding/json"
 	"errors"
+	"fmt"
+	"io/ioutil"
 	"os"
 	"strconv"
 	"sync"
+
+	"github.com/sirupsen/logrus"
 )
 
-type Preferences struct {
+type keyValueStore struct {
 	cache map[string]string
 	path  string
 	lock  *sync.RWMutex
 }
 
-// NewPreferences returns loaded preferences.
-func NewPreferences(preferencesPath string) *Preferences {
-	p := &Preferences{
-		path: preferencesPath,
+// newKeyValueStore returns loaded preferences.
+func newKeyValueStore(path string) *keyValueStore {
+	p := &keyValueStore{
+		path: path,
 		lock: &sync.RWMutex{},
 	}
 	if err := p.load(); err != nil {
-		log.Warn("Cannot load preferences: ", err)
+		logrus.WithError(err).Warn("Cannot load preferences file, creating new one")
 	}
 	return p
 }
 
-func (p *Preferences) load() error {
+func (p *keyValueStore) load() error {
 	if p.cache != nil {
 		return nil
 	}
@@ -62,7 +66,7 @@ func (p *Preferences) load() error {
 	return json.NewDecoder(f).Decode(&p.cache)
 }
 
-func (p *Preferences) save() error {
+func (p *keyValueStore) save() error {
 	if p.cache == nil {
 		return errors.New("cannot save preferences: cache is nil")
 	}
@@ -70,51 +74,58 @@ func (p *Preferences) save() error {
 	p.lock.Lock()
 	defer p.lock.Unlock()
 
-	f, err := os.Create(p.path)
+	b, err := json.MarshalIndent(p.cache, "", "\t")
 	if err != nil {
 		return err
 	}
-	defer f.Close() //nolint[errcheck]
 
-	return json.NewEncoder(f).Encode(p.cache)
+	return ioutil.WriteFile(p.path, b, 0600)
 }
 
-func (p *Preferences) SetDefault(key, value string) {
+func (p *keyValueStore) setDefault(key, value string) {
 	if p.Get(key) == "" {
 		p.Set(key, value)
 	}
 }
 
-func (p *Preferences) Get(key string) string {
+func (p *keyValueStore) Get(key string) string {
 	p.lock.RLock()
 	defer p.lock.RUnlock()
 
 	return p.cache[key]
 }
 
-func (p *Preferences) GetBool(key string) bool {
+func (p *keyValueStore) GetBool(key string) bool {
 	return p.Get(key) == "true"
 }
 
-func (p *Preferences) GetInt(key string) int {
+func (p *keyValueStore) GetInt(key string) int {
 	value, err := strconv.Atoi(p.Get(key))
 	if err != nil {
-		log.Error("Cannot parse int: ", err)
+		logrus.WithError(err).Error("Cannot parse int")
 	}
 	return value
 }
 
-func (p *Preferences) Set(key, value string) {
+func (p *keyValueStore) GetFloat64(key string) float64 {
+	value, err := strconv.ParseFloat(p.Get(key), 64)
+	if err != nil {
+		logrus.WithError(err).Error("Cannot parse float64")
+	}
+	return value
+}
+
+func (p *keyValueStore) Set(key, value string) {
 	p.lock.Lock()
 	p.cache[key] = value
 	p.lock.Unlock()
 
 	if err := p.save(); err != nil {
-		log.Warn("Cannot save preferences: ", err)
+		logrus.WithError(err).Warn("Cannot save preferences")
 	}
 }
 
-func (p *Preferences) SetBool(key string, value bool) {
+func (p *keyValueStore) SetBool(key string, value bool) {
 	if value {
 		p.Set(key, "true")
 	} else {
@@ -122,6 +133,10 @@ func (p *Preferences) SetBool(key string, value bool) {
 	}
 }
 
-func (p *Preferences) SetInt(key string, value int) {
+func (p *keyValueStore) SetInt(key string, value int) {
 	p.Set(key, strconv.Itoa(value))
 }
+
+func (p *keyValueStore) SetFloat64(key string, value float64) {
+	p.Set(key, fmt.Sprintf("%v", value))
+}

internal/config/settings/kvs_test.go

@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 
-package config
+package settings
 
 import (
 	"io/ioutil"
@@ -27,83 +27,79 @@ import (
 
 const testPrefFilePath = "/tmp/pref.json"
 
-func shutdownTestPreferences() {
-	_ = os.RemoveAll(testPrefFilePath)
-}
-
-func TestLoadNoPreferences(t *testing.T) {
-	pref := newTestEmptyPreferences(t)
+func TestLoadNoKeyValueStore(t *testing.T) {
+	pref := newTestEmptyKeyValueStore(t)
 	require.Equal(t, "", pref.Get("key"))
 }
 
-func TestLoadBadPreferences(t *testing.T) {
+func TestLoadBadKeyValueStore(t *testing.T) {
 	require.NoError(t, ioutil.WriteFile(testPrefFilePath, []byte("{\"key\":\"value"), 0700))
-	pref := NewPreferences(testPrefFilePath)
+	pref := newKeyValueStore(testPrefFilePath)
 	require.Equal(t, "", pref.Get("key"))
 }
 
-func TestPreferencesGet(t *testing.T) {
-	pref := newTestPreferences(t)
+func TestKeyValueStoreGet(t *testing.T) {
+	pref := newTestKeyValueStore(t)
 	require.Equal(t, "value", pref.Get("str"))
 	require.Equal(t, "42", pref.Get("int"))
 	require.Equal(t, "true", pref.Get("bool"))
 	require.Equal(t, "t", pref.Get("falseBool"))
 }
 
-func TestPreferencesGetInt(t *testing.T) {
-	pref := newTestPreferences(t)
+func TestKeyValueStoreGetInt(t *testing.T) {
+	pref := newTestKeyValueStore(t)
 	require.Equal(t, 0, pref.GetInt("str"))
 	require.Equal(t, 42, pref.GetInt("int"))
 	require.Equal(t, 0, pref.GetInt("bool"))
 	require.Equal(t, 0, pref.GetInt("falseBool"))
 }
 
-func TestPreferencesGetBool(t *testing.T) {
-	pref := newTestPreferences(t)
+func TestKeyValueStoreGetBool(t *testing.T) {
+	pref := newTestKeyValueStore(t)
 	require.Equal(t, false, pref.GetBool("str"))
 	require.Equal(t, false, pref.GetBool("int"))
 	require.Equal(t, true, pref.GetBool("bool"))
 	require.Equal(t, false, pref.GetBool("falseBool"))
 }
 
-func TestPreferencesSetDefault(t *testing.T) {
-	pref := newTestEmptyPreferences(t)
-	pref.SetDefault("key", "value")
-	pref.SetDefault("key", "othervalue")
+func TestKeyValueStoreSetDefault(t *testing.T) {
+	pref := newTestEmptyKeyValueStore(t)
+	pref.setDefault("key", "value")
+	pref.setDefault("key", "othervalue")
 	require.Equal(t, "value", pref.Get("key"))
 }
 
-func TestPreferencesSet(t *testing.T) {
-	pref := newTestEmptyPreferences(t)
+func TestKeyValueStoreSet(t *testing.T) {
+	pref := newTestEmptyKeyValueStore(t)
 	pref.Set("str", "value")
-	checkSavedPreferences(t, "{\"str\":\"value\"}")
+	checkSavedKeyValueStore(t, "{\n\t\"str\": \"value\"\n}")
 }
 
-func TestPreferencesSetInt(t *testing.T) {
-	pref := newTestEmptyPreferences(t)
+func TestKeyValueStoreSetInt(t *testing.T) {
+	pref := newTestEmptyKeyValueStore(t)
 	pref.SetInt("int", 42)
-	checkSavedPreferences(t, "{\"int\":\"42\"}")
+	checkSavedKeyValueStore(t, "{\n\t\"int\": \"42\"\n}")
 }
 
-func TestPreferencesSetBool(t *testing.T) {
-	pref := newTestEmptyPreferences(t)
+func TestKeyValueStoreSetBool(t *testing.T) {
+	pref := newTestEmptyKeyValueStore(t)
 	pref.SetBool("trueBool", true)
 	pref.SetBool("falseBool", false)
-	checkSavedPreferences(t, "{\"falseBool\":\"false\",\"trueBool\":\"true\"}")
+	checkSavedKeyValueStore(t, "{\n\t\"falseBool\": \"false\",\n\t\"trueBool\": \"true\"\n}")
 }
 
-func newTestEmptyPreferences(t *testing.T) *Preferences {
+func newTestEmptyKeyValueStore(t *testing.T) *keyValueStore {
 	require.NoError(t, os.RemoveAll(testPrefFilePath))
-	return NewPreferences(testPrefFilePath)
+	return newKeyValueStore(testPrefFilePath)
 }
 
-func newTestPreferences(t *testing.T) *Preferences {
+func newTestKeyValueStore(t *testing.T) *keyValueStore {
 	require.NoError(t, ioutil.WriteFile(testPrefFilePath, []byte("{\"str\":\"value\",\"int\":\"42\",\"bool\":\"true\",\"falseBool\":\"t\"}"), 0700))
-	return NewPreferences(testPrefFilePath)
+	return newKeyValueStore(testPrefFilePath)
 }
 
-func checkSavedPreferences(t *testing.T, expected string) {
+func checkSavedKeyValueStore(t *testing.T, expected string) {
 	data, err := ioutil.ReadFile(testPrefFilePath)
 	require.NoError(t, err)
-	require.Equal(t, expected+"\n", string(data))
+	require.Equal(t, expected, string(data))
 }

internal/config/settings/settings.go

@@ -0,0 +1,90 @@
+// Copyright (c) 2021 Proton Technologies AG
+//
+// This file is part of ProtonMail Bridge.
+//
+// ProtonMail Bridge is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// ProtonMail Bridge is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
+
+// Package settings provides access to persistent user settings.
+package settings
+
+import (
+	"fmt"
+	"math/rand"
+	"path/filepath"
+	"time"
+)
+
+// Keys of preferences in JSON file.
+const (
+	FirstStartKey          = "first_time_start"
+	FirstStartGUIKey       = "first_time_start_gui"
+	LastHeartbeatKey       = "last_heartbeat"
+	APIPortKey             = "user_port_api"
+	IMAPPortKey            = "user_port_imap"
+	SMTPPortKey            = "user_port_smtp"
+	SMTPSSLKey             = "user_ssl_smtp"
+	AllowProxyKey          = "allow_proxy"
+	AutostartKey           = "autostart"
+	AutoUpdateKey          = "autoupdate"
+	CookiesKey             = "cookies"
+	ReportOutgoingNoEncKey = "report_outgoing_email_without_encryption"
+	LastVersionKey         = "last_used_version"
+	UpdateChannelKey       = "update_channel"
+	RolloutKey             = "rollout"
+	PreferredKeychainKey   = "preferred_keychain"
+)
+
+type Settings struct {
+	*keyValueStore
+
+	settingsPath string
+}
+
+func New(settingsPath string) *Settings {
+	s := &Settings{
+		keyValueStore: newKeyValueStore(filepath.Join(settingsPath, "prefs.json")),
+		settingsPath:  settingsPath,
+	}
+
+	s.setDefaultValues()
+
+	return s
+}
+
+const (
+	DefaultIMAPPort = "1143"
+	DefaultSMTPPort = "1025"
+	DefaultAPIPort  = "1042"
+)
+
+func (s *Settings) setDefaultValues() {
+	s.setDefault(FirstStartKey, "true")
+	s.setDefault(FirstStartGUIKey, "true")
+	s.setDefault(LastHeartbeatKey, fmt.Sprintf("%v", time.Now().YearDay()))
+	s.setDefault(AllowProxyKey, "true")
+	s.setDefault(AutostartKey, "true")
+	s.setDefault(AutoUpdateKey, "true")
+	s.setDefault(ReportOutgoingNoEncKey, "false")
+	s.setDefault(LastVersionKey, "")
+	s.setDefault(UpdateChannelKey, "")
+	s.setDefault(RolloutKey, fmt.Sprintf("%v", rand.Float64())) //nolint[gosec] G404 It is OK to use weak random number generator here
+	s.setDefault(PreferredKeychainKey, "")
+
+	s.setDefault(APIPortKey, DefaultAPIPort)
+	s.setDefault(IMAPPortKey, DefaultIMAPPort)
+	s.setDefault(SMTPPortKey, DefaultSMTPPort)
+
+	// By default, stick to STARTTLS. If the user uses catalina+applemail they'll have to change to SSL.
+	s.setDefault(SMTPSSLKey, "false")
+}

internal/config/tls/cert_store_darwin.go

@@ -15,36 +15,39 @@
 // You should have received a copy of the GNU General Public License
 // along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 
-package updates
+package tls
 
-const (
-	InfoCurrentVersion = 1 + iota
-	InfoDownloading
-	InfoVerifying
-	InfoUnpacking
-	InfoUpgrading
-	InfoQuitApp
-	InfoRestartApp
-)
+import "os/exec"
 
-type Progress struct {
-	Processed   float32 // fraction of finished procedure [0.0-1.0]
-	Description int     // description by code (needs to be translated anyway)
-	Err         error   // occurred error
-	channel     chan<- Progress
+func addTrustedCert(certPath string) error {
+	return exec.Command( // nolint[gosec]
+		"/usr/bin/security",
+		"execute-with-privileges",
+		"/usr/bin/security",
+		"add-trusted-cert",
+		"-d",
+		"-r", "trustRoot",
+		"-p", "ssl",
+		"-k", "/Library/Keychains/System.keychain",
+		certPath,
+	).Run()
 }
 
-func (s *Progress) Update() {
-	s.channel <- *s
+func removeTrustedCert(certPath string) error {
+	return exec.Command( // nolint[gosec]
+		"/usr/bin/security",
+		"execute-with-privileges",
+		"/usr/bin/security",
+		"remove-trusted-cert",
+		"-d",
+		certPath,
+	).Run()
 }
 
-func (s *Progress) UpdateDescription(description int) {
-	s.Description = description
-	s.Processed = 0
-	s.Update()
+func (t *TLS) InstallCerts() error {
+	return addTrustedCert(t.getTLSCertPath())
 }
 
-func (s *Progress) UpdateProcessed(processed float32) {
-	s.Processed = processed
-	s.Update()
+func (t *TLS) UninstallCerts() error {
+	return removeTrustedCert(t.getTLSCertPath())
 }

internal/config/tls/cert_store_linux.go

@@ -0,0 +1,26 @@
+// Copyright (c) 2021 Proton Technologies AG
+//
+// This file is part of ProtonMail Bridge.
+//
+// ProtonMail Bridge is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// ProtonMail Bridge is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
+
+package tls
+
+func (t *TLS) InstallCerts() error {
+	return nil // Linux doesn't have a root cert store.
+}
+
+func (t *TLS) UninstallCerts() error {
+	return nil // Linux doesn't have a root cert store.
+}

internal/config/tls/cert_store_windows.go

@@ -0,0 +1,26 @@
+// Copyright (c) 2021 Proton Technologies AG
+//
+// This file is part of ProtonMail Bridge.
+//
+// ProtonMail Bridge is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// ProtonMail Bridge is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
+
+package tls
+
+func (t *TLS) InstallCerts() error {
+	return nil // NOTE(GODT-986): Install certs to root cert store?
+}
+
+func (t *TLS) UninstallCerts() error {
+	return nil // NOTE(GODT-986): Uninstall certs from root cert store?
+}

internal/config/tls/tls.go

@@ -0,0 +1,155 @@
+// Copyright (c) 2021 Proton Technologies AG
+//
+// This file is part of ProtonMail Bridge.
+//
+// ProtonMail Bridge is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// ProtonMail Bridge is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
+
+package tls
+
+import (
+	"crypto/rand"
+	"crypto/rsa"
+	"crypto/tls"
+	"crypto/x509"
+	"crypto/x509/pkix"
+	"encoding/pem"
+	"fmt"
+	"math/big"
+	"net"
+	"os"
+	"path/filepath"
+	"time"
+
+	"github.com/pkg/errors"
+)
+
+type TLS struct {
+	settingsPath string
+}
+
+func New(settingsPath string) *TLS {
+	return &TLS{
+		settingsPath: settingsPath,
+	}
+}
+
+// NewTLSTemplate creates a new TLS template certificate with a random serial number.
+func NewTLSTemplate() (*x509.Certificate, error) {
+	serialNumber, err := rand.Int(rand.Reader, new(big.Int).Lsh(big.NewInt(1), 128))
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to generate serial number")
+	}
+
+	return &x509.Certificate{
+		SerialNumber: serialNumber,
+		Subject: pkix.Name{
+			Country:            []string{"CH"},
+			Organization:       []string{"Proton Technologies AG"},
+			OrganizationalUnit: []string{"ProtonMail"},
+			CommonName:         "127.0.0.1",
+		},
+		KeyUsage:              x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign,
+		ExtKeyUsage:           []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth, x509.ExtKeyUsageClientAuth},
+		BasicConstraintsValid: true,
+		IsCA:                  true,
+		IPAddresses:           []net.IP{net.ParseIP("127.0.0.1")},
+		NotBefore:             time.Now(),
+		NotAfter:              time.Now().Add(20 * 365 * 24 * time.Hour),
+	}, nil
+}
+
+var ErrTLSCertExpiresSoon = fmt.Errorf("TLS certificate will expire soon")
+
+// getTLSCertPath returns path to certificate; used for TLS servers (IMAP, SMTP).
+func (t *TLS) getTLSCertPath() string {
+	return filepath.Join(t.settingsPath, "cert.pem")
+}
+
+// getTLSKeyPath returns path to private key; used for TLS servers (IMAP, SMTP).
+func (t *TLS) getTLSKeyPath() string {
+	return filepath.Join(t.settingsPath, "key.pem")
+}
+
+// HasCerts returns whether TLS certs have been generated.
+func (t *TLS) HasCerts() bool {
+	if _, err := os.Stat(t.getTLSCertPath()); err != nil {
+		return false
+	}
+
+	if _, err := os.Stat(t.getTLSKeyPath()); err != nil {
+		return false
+	}
+
+	return true
+}
+
+// GenerateCerts generates certs from the given template.
+func (t *TLS) GenerateCerts(template *x509.Certificate) error {
+	priv, err := rsa.GenerateKey(rand.Reader, 2048)
+	if err != nil {
+		return errors.Wrap(err, "failed to generate private key")
+	}
+
+	derBytes, err := x509.CreateCertificate(rand.Reader, template, template, &priv.PublicKey, priv)
+	if err != nil {
+		return errors.Wrap(err, "failed to create certificate")
+	}
+
+	certOut, err := os.Create(t.getTLSCertPath())
+	if err != nil {
+		return err
+	}
+	defer certOut.Close() // nolint[errcheck]
+
+	if err := pem.Encode(certOut, &pem.Block{Type: "CERTIFICATE", Bytes: derBytes}); err != nil {
+		return err
+	}
+
+	keyOut, err := os.OpenFile(t.getTLSKeyPath(), os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600)
+	if err != nil {
+		return err
+	}
+	defer keyOut.Close() // nolint[errcheck]
+
+	return pem.Encode(keyOut, &pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(priv)})
+}
+
+// GetConfig tries to load TLS config or generate new one which is then returned.
+func (t *TLS) GetConfig() (*tls.Config, error) {
+	c, err := tls.LoadX509KeyPair(t.getTLSCertPath(), t.getTLSKeyPath())
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to load keypair")
+	}
+
+	c.Leaf, err = x509.ParseCertificate(c.Certificate[0])
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to parse certificate")
+	}
+
+	if time.Now().Add(31 * 24 * time.Hour).After(c.Leaf.NotAfter) {
+		return nil, ErrTLSCertExpiresSoon
+	}
+
+	caCertPool := x509.NewCertPool()
+	caCertPool.AddCert(c.Leaf)
+
+	// nolint[gosec]: We need to support older TLS versions for AppleMail and Outlook.
+	return &tls.Config{
+		Certificates: []tls.Certificate{c},
+		ServerName:   "127.0.0.1",
+		ClientAuth:   tls.VerifyClientCertIfGiven,
+		RootCAs:      caCertPool,
+		ClientCAs:    caCertPool,
+	}, nil
+}

internal/config/tls/tls_test.go

@@ -0,0 +1,77 @@
+// Copyright (c) 2021 Proton Technologies AG
+//
+// This file is part of ProtonMail Bridge.
+//
+// ProtonMail Bridge is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// ProtonMail Bridge is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
+
+package tls
+
+import (
+	"io/ioutil"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestGetOldConfig(t *testing.T) {
+	dir, err := ioutil.TempDir("", "test-tls")
+	require.NoError(t, err)
+
+	// Create new tls object.
+	tls := New(dir)
+
+	// Create new TLS template.
+	tlsTemplate, err := NewTLSTemplate()
+	require.NoError(t, err)
+
+	// Make the template be an old key.
+	tlsTemplate.NotBefore = time.Now().Add(-365 * 24 * time.Hour)
+	tlsTemplate.NotAfter = time.Now()
+
+	// Generate the certs from the template.
+	require.NoError(t, tls.GenerateCerts(tlsTemplate))
+
+	// Generate the config from the certs -- it's going to expire soon so we don't want to use it.
+	_, err = tls.GetConfig()
+	require.Equal(t, err, ErrTLSCertExpiresSoon)
+}
+
+func TestGetValidConfig(t *testing.T) {
+	dir, err := ioutil.TempDir("", "test-tls")
+	require.NoError(t, err)
+
+	// Create new tls object.
+	tls := New(dir)
+
+	// Create new TLS template.
+	tlsTemplate, err := NewTLSTemplate()
+	require.NoError(t, err)
+
+	// Make the template be a new key.
+	tlsTemplate.NotBefore = time.Now()
+	tlsTemplate.NotAfter = time.Now().Add(2 * 365 * 24 * time.Hour)
+
+	// Generate the certs from the template.
+	require.NoError(t, tls.GenerateCerts(tlsTemplate))
+
+	// Generate the config from the certs -- it's not going to expire soon so we want to use it.
+	config, err := tls.GetConfig()
+	require.NoError(t, err)
+	require.Equal(t, len(config.Certificates), 1)
+
+	// Check the cert is valid.
+	now, notValidAfter := time.Now(), config.Certificates[0].Leaf.NotAfter
+	require.False(t, now.After(notValidAfter), "new certificate expected to be valid at %v but have valid until %v", now, notValidAfter)
+}

internal/config/useragent/platform.go

@@ -0,0 +1,61 @@
+// Copyright (c) 2021 Proton Technologies AG
+//
+// This file is part of ProtonMail Bridge.
+//
+// ProtonMail Bridge is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// ProtonMail Bridge is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
+
+package useragent
+
+import (
+	"os/exec"
+	"runtime"
+	"strings"
+
+	"github.com/Masterminds/semver/v3"
+)
+
+// IsCatalinaOrNewer checks whether the host is MacOS Catalina 10.15.x or higher.
+func IsCatalinaOrNewer() bool {
+	return isThisDarwinNewerOrEqual(getMinCatalina())
+}
+
+// IsBigSurOrNewer checks whether the host is MacOS BigSur 10.16.x or higher.
+func IsBigSurOrNewer() bool {
+	return isThisDarwinNewerOrEqual(getMinBigSur())
+}
+
+func getMinCatalina() *semver.Version { return semver.MustParse("10.15.0") }
+func getMinBigSur() *semver.Version   { return semver.MustParse("10.16.0") }
+
+func isThisDarwinNewerOrEqual(minVersion *semver.Version) bool {
+	if runtime.GOOS != "darwin" {
+		return false
+	}
+
+	rawVersion, err := exec.Command("sw_vers", "-productVersion").Output()
+	if err != nil {
+		return false
+	}
+
+	return isVersionEqualOrNewer(minVersion, strings.TrimSpace(string(rawVersion)))
+}
+
+// isVersionEqualOrNewer is separated to be able to run test on other than darwin.
+func isVersionEqualOrNewer(minVersion *semver.Version, rawVersion string) bool {
+	semVersion, err := semver.NewVersion(rawVersion)
+	if err != nil {
+		return false
+	}
+	return semVersion.GreaterThan(minVersion) || semVersion.Equal(minVersion)
+}

internal/config/useragent/platform_test.go

@@ -34,10 +34,31 @@ func TestIsVersionCatalinaOrNewer(t *testing.T) {
 		{"10.15.0"}:  true,
 		{"10.16.0"}:  true,
 		{"11.0.0"}:   true,
+		{"11.1"}:     true,
 	}
 
 	for args, exp := range testData {
-		got := isVersionCatalinaOrNewer(args.version)
+		got := isVersionEqualOrNewer(getMinCatalina(), args.version)
+		assert.Equal(t, exp, got, "version %v", args.version)
+	}
+}
+
+func TestIsVersionBigSurOrNewer(t *testing.T) {
+	testData := map[struct{ version string }]bool{
+		{""}:         false,
+		{"9.0.0"}:    false,
+		{"9.15.0"}:   false,
+		{"10.13.0"}:  false,
+		{"10.14.0"}:  false,
+		{"10.14.99"}: false,
+		{"10.15.0"}:  false,
+		{"10.16.0"}:  true,
+		{"11.0.0"}:   true,
+		{"11.1"}:     true,
+	}
+
+	for args, exp := range testData {
+		got := isVersionEqualOrNewer(getMinBigSur(), args.version)
 		assert.Equal(t, exp, got, "version %v", args.version)
 	}
 }

internal/config/useragent/useragent.go

@@ -0,0 +1,59 @@
+// Copyright (c) 2021 Proton Technologies AG
+//
+// This file is part of ProtonMail Bridge.
+//
+// ProtonMail Bridge is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// ProtonMail Bridge is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
+
+package useragent
+
+import (
+	"fmt"
+	"regexp"
+	"runtime"
+)
+
+type UserAgent struct {
+	client, platform string
+}
+
+func New() *UserAgent {
+	return &UserAgent{
+		client:   "",
+		platform: runtime.GOOS,
+	}
+}
+
+func (ua *UserAgent) SetClient(name, version string) {
+	ua.client = fmt.Sprintf("%v/%v", name, regexp.MustCompile(`(.*) \((.*)\)`).ReplaceAllString(version, "$1-$2"))
+}
+
+func (ua *UserAgent) HasClient() bool {
+	return ua.client != ""
+}
+
+func (ua *UserAgent) SetPlatform(platform string) {
+	ua.platform = platform
+}
+
+func (ua *UserAgent) String() string {
+	var client string
+
+	if ua.client != "" {
+		client = ua.client
+	} else {
+		client = "NoClient/0.0.1"
+	}
+
+	return fmt.Sprintf("%v (%v)", client, ua.platform)
+}

internal/config/useragent/useragent_test.go

@@ -0,0 +1,86 @@
+// Copyright (c) 2021 Proton Technologies AG
+//
+// This file is part of ProtonMail Bridge.
+//
+// ProtonMail Bridge is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// ProtonMail Bridge is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
+
+package useragent
+
+import (
+	"fmt"
+	"runtime"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestUserAgent(t *testing.T) {
+	tests := []struct {
+		name, version, platform string
+		want                    string
+	}{
+		// No name/version, no platform.
+		{
+			want: fmt.Sprintf("NoClient/0.0.1 (%v)", runtime.GOOS),
+		},
+
+		// No name/version, with platform.
+		{
+			platform: "macOS 10.15",
+			want:     "NoClient/0.0.1 (macOS 10.15)",
+		},
+
+		// With name/version, with platform.
+		{
+			name:     "Mac OS X Mail",
+			version:  "1.0.0",
+			platform: "macOS 10.15",
+			want:     "Mac OS X Mail/1.0.0 (macOS 10.15)",
+		},
+
+		// With name/version, with platform.
+		{
+			name:     "Mac OS X Mail",
+			version:  "13.4 (3608.120.23.2.4)",
+			platform: "macOS 10.15",
+			want:     "Mac OS X Mail/13.4-3608.120.23.2.4 (macOS 10.15)",
+		},
+
+		// With name/version, with platform.
+		{
+			name:     "Thunderbird",
+			version:  "78.6.1",
+			platform: "Windows 10 (10.0)",
+			want:     "Thunderbird/78.6.1 (Windows 10 (10.0))",
+		},
+	}
+
+	for _, test := range tests {
+		test := test
+
+		t.Run(test.want, func(t *testing.T) {
+			ua := New()
+
+			if test.name != "" && test.version != "" {
+				ua.SetClient(test.name, test.version)
+			}
+
+			if test.platform != "" {
+				ua.SetPlatform(test.platform)
+			}
+
+			assert.Equal(t, test.want, ua.String())
+		})
+	}
+}

internal/constants/constants.go

@@ -18,6 +18,10 @@
 // Package constants contains variables that are set via ldflags during build.
 package constants
 
+import "fmt"
+
+const VendorName = "protonmail"
+
 // nolint[gochecknoglobals]
 var (
 	// Version of the build.
@@ -32,9 +36,6 @@ var (
 	// DSNSentry client keys to be able to report crashes to Sentry.
 	DSNSentry = ""
 
-	// LongVersion is derived from Version and Revision.
-	LongVersion = Version + " (" + Revision + ")"
-
 	// BuildVersion is derived from LongVersion and BuildTime.
-	BuildVersion = LongVersion + " " + BuildTime
+	BuildVersion = fmt.Sprintf("%v (%v) %v", Version, Revision, BuildTime)
 )

internal/constants/update_default.go

@@ -0,0 +1,28 @@
+// Copyright (c) 2021 Proton Technologies AG
+//
+// This file is part of ProtonMail Bridge.
+//
+// ProtonMail Bridge is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// ProtonMail Bridge is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
+
+// +build !build_qa
+
+package constants
+
+import "time"
+
+// nolint[gochecknoglobals]
+var (
+	// UpdateCheckInterval defines how often we check for new version
+	UpdateCheckInterval = time.Hour //nolint[gochecknoglobals]
+)

internal/constants/update_qa.go

@@ -0,0 +1,28 @@
+// Copyright (c) 2021 Proton Technologies AG
+//
+// This file is part of ProtonMail Bridge.
+//
+// ProtonMail Bridge is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// ProtonMail Bridge is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
+
+// +build build_qa
+
+package constants
+
+import "time"
+
+// nolint[gochecknoglobals]
+var (
+	// UpdateCheckInterval defines how often we check for new version
+	UpdateCheckInterval = time.Duration(5 * time.Minute)
+)

internal/cookies/jar.go

@@ -19,46 +19,41 @@
 package cookies
 
 import (
+	"encoding/json"
+	"fmt"
 	"net/http"
 	"net/http/cookiejar"
 	"net/url"
 	"sync"
+	"time"
 
-	"github.com/sirupsen/logrus"
+	"github.com/ProtonMail/proton-bridge/internal/config/settings"
 )
 
+type cookiesByHost map[string][]*http.Cookie
+
 // Jar implements http.CookieJar by wrapping the standard library's cookiejar.Jar.
 // The jar uses a pantry to load cookies at startup and save cookies when set.
 type Jar struct {
-	jar    *cookiejar.Jar
-	pantry *pantry
-	locker sync.Locker
+	jar      *cookiejar.Jar
+	settings *settings.Settings
+	cookies  cookiesByHost
+	locker   sync.Locker
 }
 
-type GetterSetter interface {
-	Get(string) string
-	Set(string, string)
-}
-
-func NewCookieJar(gs GetterSetter) (*Jar, error) {
-	pantry := &pantry{gs: gs}
-
-	if err := pantry.discardExpiredCookies(); err != nil {
-		return nil, err
-	}
-
-	cookies, err := pantry.loadFromJSON()
-	if err != nil {
-		return nil, err
-	}
-
+func NewCookieJar(s *settings.Settings) (*Jar, error) {
 	jar, err := cookiejar.New(nil)
 	if err != nil {
 		return nil, err
 	}
 
-	for rawURL, cookies := range cookies {
-		url, err := url.Parse(rawURL)
+	cookiesByHost, err := loadCookies(s)
+	if err != nil {
+		return nil, err
+	}
+
+	for host, cookies := range cookiesByHost {
+		url, err := url.Parse(host)
 		if err != nil {
 			continue
 		}
@@ -67,9 +62,10 @@ func NewCookieJar(gs GetterSetter) (*Jar, error) {
 	}
 
 	return &Jar{
-		jar:    jar,
-		pantry: pantry,
-		locker: &sync.Mutex{},
+		jar:      jar,
+		settings: s,
+		cookies:  cookiesByHost,
+		locker:   &sync.Mutex{},
 	}, nil
 }
 
@@ -79,9 +75,13 @@ func (j *Jar) SetCookies(u *url.URL, cookies []*http.Cookie) {
 
 	j.jar.SetCookies(u, cookies)
 
-	if err := j.pantry.persistCookies(u.Scheme+"://"+u.Host, cookies); err != nil {
-		logrus.WithError(err).Warn("Failed to persist cookie")
+	for _, cookie := range cookies {
+		if cookie.MaxAge > 0 {
+			cookie.Expires = time.Now().Add(time.Duration(cookie.MaxAge) * time.Second)
+		}
 	}
+
+	j.cookies[fmt.Sprintf("%v://%v", u.Scheme, u.Host)] = cookies
 }
 
 func (j *Jar) Cookies(u *url.URL) []*http.Cookie {
@@ -90,3 +90,54 @@ func (j *Jar) Cookies(u *url.URL) []*http.Cookie {
 
 	return j.jar.Cookies(u)
 }
+
+// PersistCookies persists the cookies to disk.
+func (j *Jar) PersistCookies() error {
+	j.locker.Lock()
+	defer j.locker.Unlock()
+
+	rawCookies, err := json.Marshal(j.cookies)
+	if err != nil {
+		return err
+	}
+
+	j.settings.Set(settings.CookiesKey, string(rawCookies))
+
+	return nil
+}
+
+// loadCookies loads all non-expired cookies from disk.
+func loadCookies(s *settings.Settings) (cookiesByHost, error) {
+	rawCookies := s.Get(settings.CookiesKey)
+
+	if rawCookies == "" {
+		return make(cookiesByHost), nil
+	}
+
+	var cookiesByHost cookiesByHost
+
+	if err := json.Unmarshal([]byte(rawCookies), &cookiesByHost); err != nil {
+		return nil, err
+	}
+
+	for host, cookies := range cookiesByHost {
+		if validCookies := discardExpiredCookies(cookies); len(validCookies) > 0 {
+			cookiesByHost[host] = validCookies
+		}
+	}
+
+	return cookiesByHost, nil
+}
+
+// discardExpiredCookies returns all the given cookies which aren't expired.
+func discardExpiredCookies(cookies []*http.Cookie) []*http.Cookie {
+	var validCookies []*http.Cookie
+
+	for _, cookie := range cookies {
+		if cookie.Expires.After(time.Now()) {
+			validCookies = append(validCookies, cookie)
+		}
+	}
+
+	return validCookies
+}

internal/cookies/jar_test.go

@@ -18,11 +18,13 @@
 package cookies
 
 import (
+	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 	"testing"
 	"time"
 
+	"github.com/ProtonMail/proton-bridge/internal/config/settings"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -35,7 +37,7 @@ func TestJarGetSet(t *testing.T) {
 	})
 	defer ts.Close()
 
-	client := getClientWithJar(t, make(testGetterSetter))
+	client, _ := getClientWithJar(t, newFakeSettings())
 
 	// Hit a server that sets some cookies.
 	setRes, err := client.Get(ts.URL + "/set")
@@ -61,10 +63,10 @@ func TestJarLoad(t *testing.T) {
 	defer ts.Close()
 
 	// This will be our "persistent storage" from which the cookie jar should load cookies.
-	gs := make(testGetterSetter)
+	s := newFakeSettings()
 
 	// This client saves cookies to persistent storage.
-	oldClient := getClientWithJar(t, gs)
+	oldClient, jar := getClientWithJar(t, s)
 
 	// Hit a server that sets some cookies.
 	setRes, err := oldClient.Get(ts.URL + "/set")
@@ -73,8 +75,11 @@ func TestJarLoad(t *testing.T) {
 	}
 	require.NoError(t, setRes.Body.Close())
 
+	// Save the cookies.
+	require.NoError(t, jar.PersistCookies())
+
 	// This client loads cookies from persistent storage.
-	newClient := getClientWithJar(t, gs)
+	newClient, _ := getClientWithJar(t, s)
 
 	// Hit a server that checks the cookies are there.
 	getRes, err := newClient.Get(ts.URL + "/get")
@@ -93,10 +98,10 @@ func TestJarExpiry(t *testing.T) {
 	defer ts.Close()
 
 	// This will be our "persistent storage" from which the cookie jar should load cookies.
-	gs := make(testGetterSetter)
+	s := newFakeSettings()
 
 	// This client saves cookies to persistent storage.
-	oldClient := getClientWithJar(t, gs)
+	oldClient, jar1 := getClientWithJar(t, s)
 
 	// Hit a server that sets some cookies.
 	setRes, err := oldClient.Get(ts.URL + "/set")
@@ -105,15 +110,21 @@ func TestJarExpiry(t *testing.T) {
 	}
 	require.NoError(t, setRes.Body.Close())
 
+	// Save the cookies.
+	require.NoError(t, jar1.PersistCookies())
+
 	// Wait until the second cookie expires.
 	time.Sleep(2 * time.Second)
 
 	// Load a client, which will clear out expired cookies.
-	_ = getClientWithJar(t, gs)
+	_, jar2 := getClientWithJar(t, s)
 
-	assert.Contains(t, gs["cookies"], "TestName1")
-	assert.NotContains(t, gs["cookies"], "TestName2")
-	assert.Contains(t, gs["cookies"], "TestName3")
+	// Save the cookies (expired ones were cleared out).
+	require.NoError(t, jar2.PersistCookies())
+
+	assert.Contains(t, s.Get(settings.CookiesKey), "TestName1")
+	assert.NotContains(t, s.Get(settings.CookiesKey), "TestName2")
+	assert.Contains(t, s.Get(settings.CookiesKey), "TestName3")
 }
 
 type testCookie struct {
@@ -121,11 +132,11 @@ type testCookie struct {
 	maxAge      int
 }
 
-func getClientWithJar(t *testing.T, gs GetterSetter) *http.Client {
-	jar, err := NewCookieJar(gs)
+func getClientWithJar(t *testing.T, s *settings.Settings) (*http.Client, *Jar) {
+	jar, err := NewCookieJar(s)
 	require.NoError(t, err)
 
-	return &http.Client{Jar: jar}
+	return &http.Client{Jar: jar}, jar
 }
 
 func getTestServer(t *testing.T, wantCookies []testCookie) *httptest.Server {
@@ -157,12 +168,12 @@ func getTestServer(t *testing.T, wantCookies []testCookie) *httptest.Server {
 	return httptest.NewServer(mux)
 }
 
-type testGetterSetter map[string]string
+// newFakeSettings creates a temporary folder for files.
+func newFakeSettings() *settings.Settings {
+	dir, err := ioutil.TempDir("", "test-settings")
+	if err != nil {
+		panic(err)
+	}
 
-func (p testGetterSetter) Set(key, value string) {
-	p[key] = value
-}
-
-func (p testGetterSetter) Get(key string) string {
-	return p[key]
+	return settings.New(dir)
 }

internal/cookies/pantry.go

@@ -1,100 +0,0 @@
-// Copyright (c) 2021 Proton Technologies AG
-//
-// This file is part of ProtonMail Bridge.
-//
-// ProtonMail Bridge is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// ProtonMail Bridge is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
-
-package cookies
-
-import (
-	"encoding/json"
-	"net/http"
-	"time"
-
-	"github.com/ProtonMail/proton-bridge/internal/preferences"
-)
-
-// pantry persists and loads cookies to some persistent storage location.
-type pantry struct {
-	gs GetterSetter
-}
-
-func (p *pantry) persistCookies(host string, cookies []*http.Cookie) error {
-	for _, cookie := range cookies {
-		if cookie.MaxAge > 0 {
-			cookie.Expires = time.Now().Add(time.Duration(cookie.MaxAge) * time.Second)
-		}
-	}
-
-	cookiesByHost, err := p.loadFromJSON()
-	if err != nil {
-		return err
-	}
-
-	cookiesByHost[host] = cookies
-
-	return p.saveToJSON(cookiesByHost)
-}
-
-func (p *pantry) discardExpiredCookies() error {
-	cookiesByHost, err := p.loadFromJSON()
-	if err != nil {
-		return err
-	}
-
-	for host, cookies := range cookiesByHost {
-		cookiesByHost[host] = discardExpiredCookies(cookies)
-	}
-
-	return p.saveToJSON(cookiesByHost)
-}
-
-type cookiesByHost map[string][]*http.Cookie
-
-func (p *pantry) loadFromJSON() (cookiesByHost, error) {
-	b := p.gs.Get(preferences.CookiesKey)
-
-	if b == "" {
-		return make(cookiesByHost), nil
-	}
-
-	var cookies cookiesByHost
-
-	if err := json.Unmarshal([]byte(b), &cookies); err != nil {
-		return nil, err
-	}
-
-	return cookies, nil
-}
-
-func (p *pantry) saveToJSON(cookies cookiesByHost) error {
-	b, err := json.Marshal(cookies)
-	if err != nil {
-		return err
-	}
-
-	p.gs.Set(preferences.CookiesKey, string(b))
-
-	return nil
-}
-
-func discardExpiredCookies(cookies []*http.Cookie) (validCookies []*http.Cookie) {
-	for _, cookie := range cookies {
-		if cookie.Expires.After(time.Now()) {
-			validCookies = append(validCookies, cookie)
-		}
-	}
-
-	return
-}

internal/crash/actions.go

@@ -15,42 +15,28 @@
 // You should have received a copy of the GNU General Public License
 // along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 
-package message
+package crash
 
 import (
-	"net/mail"
-	"strings"
+	"fmt"
 
-	"github.com/emersion/go-imap"
+	"github.com/0xAX/notificator"
 )
 
-func getAddresses(addrs []*mail.Address) (imapAddrs []*imap.Address) {
-	for _, a := range addrs {
-		if a == nil {
-			continue
-		}
-
-		parts := strings.SplitN(a.Address, "@", 2)
-		if len(parts) != 2 {
-			continue
-		}
-
-		imapAddrs = append(imapAddrs, &imap.Address{
-			PersonalName: a.Name,
-			MailboxName:  parts[0],
-			HostName:     parts[1],
+// ShowErrorNotification shows a system notification that the app with the given appName has crashed.
+// NOTE: Icons shouldn't be hardcoded.
+func ShowErrorNotification(appName string) RecoveryAction {
+	return func(r interface{}) error {
+		notify := notificator.New(notificator.Options{
+			DefaultIcon: "../frontend/ui/icon/icon.png",
+			AppName:     appName,
 		})
-	}
 
-	return
-}
-
-func formatAddressList(addrs []*mail.Address) (s string) {
-	for i, addr := range addrs {
-		if i > 0 {
-			s += ", "
-		}
-		s += addr.String()
+		return notify.Push(
+			"Fatal Error",
+			fmt.Sprintf("%v has encountered a fatal error.", appName),
+			"/frontend/icon/icon.png",
+			notificator.UR_CRITICAL,
+		)
 	}
-	return
 }

internal/crash/handler.go

@@ -15,35 +15,40 @@
 // You should have received a copy of the GNU General Public License
 // along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 
-// +build !build_qa
-
-package config
+// Package crash implements a crash handler with configurable recovery actions.
+package crash
 
 import (
+	"github.com/ProtonMail/proton-bridge/internal/sentry"
 	"github.com/sirupsen/logrus"
 )
 
-func getLogLevelAndFile(levelFlag string) (level logrus.Level, useFile bool) {
-	useFile = true
-	switch levelFlag {
-	case "panic":
-		level = logrus.PanicLevel
-	case "fatal":
-		level = logrus.FatalLevel
-	case "error":
-		level = logrus.ErrorLevel
-	case "warn":
-		level = logrus.WarnLevel
-	case "info":
-		level = logrus.InfoLevel
-	case "debug", "debug-client", "debug-server", "debug-client-json", "debug-server-json":
-		level = logrus.DebugLevel
-		useFile = false
-	case "trace":
-		level = logrus.TraceLevel
-		useFile = false
-	default:
-		level = logrus.InfoLevel
-	}
-	return
+type RecoveryAction func(interface{}) error
+
+type Handler struct {
+	actions []RecoveryAction
+}
+
+func NewHandler(actions ...RecoveryAction) *Handler {
+	return &Handler{actions: actions}
+}
+
+func (h *Handler) AddRecoveryAction(action RecoveryAction) *Handler {
+	h.actions = append(h.actions, action)
+	return h
+}
+
+func (h *Handler) HandlePanic() {
+	sentry.SkipDuringUnwind()
+
+	r := recover()
+	if r == nil {
+		return
+	}
+
+	for _, action := range h.actions {
+		if err := action(r); err != nil {
+			logrus.WithError(err).Error("Failed to execute recovery action")
+		}
+	}
 }

internal/crash/handler_test.go

@@ -0,0 +1,58 @@
+// Copyright (c) 2021 Proton Technologies AG
+//
+// This file is part of ProtonMail Bridge.
+//
+// ProtonMail Bridge is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// ProtonMail Bridge is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
+
+package crash
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestHandler(t *testing.T) {
+	var s string
+
+	h := NewHandler(
+		func(r interface{}) error {
+			s += fmt.Sprintf("1: %v\n", r)
+			return nil
+		},
+		func(r interface{}) error {
+			s += fmt.Sprintf("2: %v\n", r)
+			return nil
+		},
+	)
+
+	h.
+		AddRecoveryAction(func(r interface{}) error {
+			s += fmt.Sprintf("3: %v\n", r)
+			return nil
+		}).
+		AddRecoveryAction(func(r interface{}) error {
+			s += fmt.Sprintf("4: %v\n", r)
+			return nil
+		})
+
+	defer func() {
+		assert.Equal(t, "1: thing\n2: thing\n3: thing\n4: thing\n", s)
+	}()
+
+	defer h.HandlePanic()
+
+	panic("thing")
+}

internal/events/events.go

@@ -27,6 +27,7 @@ import (
 // Constants of events used by the event listener in bridge.
 const (
 	ErrorEvent                   = "error"
+	CredentialsErrorEvent        = "credentialsError"
 	CloseConnectionEvent         = "closeConnection"
 	LogoutEvent                  = "logout"
 	AddressChangedEvent          = "addressChanged"
@@ -48,6 +49,9 @@ const (
 // SetupEvents specific to event type and data.
 func SetupEvents(listener listener.Listener) {
 	listener.SetLimit(LogoutEvent, LogoutEventTimeout)
-	listener.SetBuffer(TLSCertIssue)
 	listener.SetBuffer(ErrorEvent)
+	listener.SetBuffer(CredentialsErrorEvent)
+	listener.SetBuffer(InternetOffEvent)
+	listener.SetBuffer(UpgradeApplicationEvent)
+	listener.SetBuffer(TLSCertIssue)
 }

internal/frontend/autoconfig/applemail.go

@@ -28,9 +28,14 @@ import (
 	"strings"
 	"time"
 
-	mobileconfig "github.com/ProtonMail/go-apple-mobileconfig"
 	"github.com/ProtonMail/proton-bridge/internal/bridge"
+	"github.com/ProtonMail/proton-bridge/internal/config/useragent"
 	"github.com/ProtonMail/proton-bridge/internal/frontend/types"
+	"github.com/ProtonMail/proton-bridge/pkg/mobileconfig"
+)
+
+const (
+	bigSurPreferncesPane = "/System/Library/PreferencePanes/Profiles.prefPane"
 )
 
 func init() { //nolint[gochecknoinit]
@@ -43,7 +48,22 @@ func (c *appleMail) Name() string {
 	return "Apple Mail"
 }
 
-func (c *appleMail) Configure(imapPort, smtpPort int, imapSSL, smtpSSL bool, user types.User, addressIndex int) error { //nolint[funlen]
+func (c *appleMail) Configure(imapPort, smtpPort int, imapSSL, smtpSSL bool, user types.User, addressIndex int) error {
+	mc := prepareMobileConfig(imapPort, smtpPort, imapSSL, smtpSSL, user, addressIndex)
+
+	confPath, err := saveConfigTemporarily(mc)
+	if err != nil {
+		return err
+	}
+
+	if useragent.IsBigSurOrNewer() {
+		return exec.Command("open", bigSurPreferncesPane, confPath).Run() //nolint[gosec] G204: open command is safe, mobileconfig is generated by us
+	}
+
+	return exec.Command("open", confPath).Run() //nolint[gosec] G204: open command is safe, mobileconfig is generated by us
+}
+
+func prepareMobileConfig(imapPort, smtpPort int, imapSSL, smtpSSL bool, user types.User, addressIndex int) *mobileconfig.Config {
 	var addresses string
 	var displayName string
 
@@ -62,28 +82,30 @@ func (c *appleMail) Configure(imapPort, smtpPort int, imapSSL, smtpSSL bool, use
 
 	timestamp := strconv.FormatInt(time.Now().Unix(), 10)
 
-	mc := &mobileconfig.Config{
+	return &mobileconfig.Config{
 		EmailAddress: addresses,
 		DisplayName:  displayName,
 		Identifier:   "protonmail " + displayName + timestamp,
-		Imap: &mobileconfig.Imap{
+		IMAP: &mobileconfig.IMAP{
 			Hostname: bridge.Host,
 			Port:     imapPort,
-			Tls:      imapSSL,
+			TLS:      imapSSL,
 			Username: displayName,
 			Password: user.GetBridgePassword(),
 		},
-		Smtp: &mobileconfig.Smtp{
+		SMTP: &mobileconfig.SMTP{
 			Hostname: bridge.Host,
 			Port:     smtpPort,
-			Tls:      smtpSSL,
+			TLS:      smtpSSL,
 			Username: displayName,
 		},
 	}
+}
 
+func saveConfigTemporarily(mc *mobileconfig.Config) (fname string, err error) {
 	dir, err := ioutil.TempDir("", "protonmail-autoconfig")
 	if err != nil {
-		return err
+		return
 	}
 
 	// Make sure the temporary file is deleted.
@@ -93,16 +115,17 @@ func (c *appleMail) Configure(imapPort, smtpPort int, imapSSL, smtpSSL bool, use
 	})()
 
 	// Make sure the file is only readable for the current user.
-	f, err := os.OpenFile(filepath.Join(dir, "protonmail.mobileconfig"), os.O_RDWR|os.O_CREATE, 0600)
+	fname = filepath.Clean(filepath.Join(dir, "protonmail.mobileconfig"))
+	f, err := os.OpenFile(fname, os.O_RDWR|os.O_CREATE, 0600)
 	if err != nil {
-		return err
+		return
 	}
 
-	if err := mc.WriteTo(f); err != nil {
+	if err = mc.WriteOut(f); err != nil {
 		_ = f.Close()
-		return err
+		return
 	}
 	_ = f.Close()
 
-	return exec.Command("open", f.Name()).Run() // nolint[gosec]
+	return
 }

internal/frontend/cli-ie/accounts.go

@@ -18,6 +18,7 @@
 package cliie
 
 import (
+	"context"
 	"strings"
 
 	"github.com/abiosoft/ishell"
@@ -25,7 +26,7 @@ import (
 
 func (f *frontendCLI) listAccounts(c *ishell.Context) {
 	spacing := "%-2d: %-20s (%-15s, %-15s)\n"
-	f.Printf(bold(strings.Replace(spacing, "d", "s", -1)), "#", "account", "status", "address mode")
+	f.Printf(bold(strings.ReplaceAll(spacing, "d", "s")), "#", "account", "status", "address mode")
 	for idx, user := range f.ie.GetUsers() {
 		connected := "disconnected"
 		if user.IsConnected() {
@@ -67,7 +68,7 @@ func (f *frontendCLI) loginAccount(c *ishell.Context) { // nolint[funlen]
 	}
 
 	f.Println("Authenticating ... ")
-	client, auth, err := f.ie.Login(loginName, password)
+	client, auth, err := f.ie.Login(loginName, []byte(password))
 	if err != nil {
 		f.processAPIError(err)
 		return
@@ -79,7 +80,7 @@ func (f *frontendCLI) loginAccount(c *ishell.Context) { // nolint[funlen]
 			return
 		}
 
-		err = client.Auth2FA(twoFactor, auth)
+		err = client.Auth2FA(context.Background(), twoFactor)
 		if err != nil {
 			f.processAPIError(err)
 			return
@@ -95,7 +96,7 @@ func (f *frontendCLI) loginAccount(c *ishell.Context) { // nolint[funlen]
 	}
 
 	f.Println("Adding account ...")
-	user, err := f.ie.FinishLogin(client, auth, mailboxPassword)
+	user, err := f.ie.FinishLogin(client, auth, []byte(mailboxPassword))
 	if err != nil {
 		log.WithField("username", loginName).WithError(err).Error("Login was unsuccessful")
 		f.Println("Adding account was unsuccessful:", err)

internal/frontend/cli-ie/frontend.go

@@ -21,7 +21,8 @@ package cliie
 import (
 	"github.com/ProtonMail/proton-bridge/internal/events"
 	"github.com/ProtonMail/proton-bridge/internal/frontend/types"
-	"github.com/ProtonMail/proton-bridge/pkg/config"
+	"github.com/ProtonMail/proton-bridge/internal/locations"
+	"github.com/ProtonMail/proton-bridge/internal/updater"
 	"github.com/ProtonMail/proton-bridge/pkg/listener"
 
 	"github.com/abiosoft/ishell"
@@ -35,31 +36,33 @@ var (
 type frontendCLI struct {
 	*ishell.Shell
 
-	config        *config.Config
+	locations     *locations.Locations
 	eventListener listener.Listener
-	updates       types.Updater
+	updater       types.Updater
 	ie            types.ImportExporter
 
-	appRestart bool
+	restarter types.Restarter
 }
 
 // New returns a new CLI frontend configured with the given options.
 func New( //nolint[funlen]
 	panicHandler types.PanicHandler,
-	config *config.Config,
+
+	locations *locations.Locations,
 	eventListener listener.Listener,
-	updates types.Updater,
+	updater types.Updater,
 	ie types.ImportExporter,
+	restarter types.Restarter,
 ) *frontendCLI { //nolint[golint]
 	fe := &frontendCLI{
 		Shell: ishell.New(),
 
-		config:        config,
+		locations:     locations,
 		eventListener: eventListener,
-		updates:       updates,
+		updater:       updater,
 		ie:            ie,
 
-		appRestart: false,
+		restarter: restarter,
 	}
 
 	// Clear commands.
@@ -81,11 +84,6 @@ func New( //nolint[funlen]
 		Aliases: []string{"u", "version", "v"},
 		Func:    fe.checkUpdates,
 	})
-	checkCmd.AddCmd(&ishell.Cmd{Name: "internet",
-		Help:    "check internet connection. (aliases: i, conn, connection)",
-		Aliases: []string{"i", "con", "connection"},
-		Func:    fe.checkInternetConnection,
-	})
 	fe.AddCmd(checkCmd)
 
 	// Print info commands.
@@ -99,11 +97,6 @@ func New( //nolint[funlen]
 		Aliases: []string{"man"},
 		Func:    fe.printManual,
 	})
-	fe.AddCmd(&ishell.Cmd{Name: "release-notes",
-		Help:    "print release notes. (aliases: notes, fixed-bugs, bugs, ver, version)",
-		Aliases: []string{"notes", "fixed-bugs", "bugs", "ver", "version"},
-		Func:    fe.printLocalReleaseNotes,
-	})
 	fe.AddCmd(&ishell.Cmd{Name: "credits",
 		Help: "print used resources.",
 		Func: fe.printCredits,
@@ -175,22 +168,23 @@ func New( //nolint[funlen]
 		defer panicHandler.HandlePanic()
 		fe.watchEvents()
 	}()
-	fe.eventListener.RetryEmit(events.TLSCertIssue)
-	fe.eventListener.RetryEmit(events.ErrorEvent)
 	return fe
 }
 
 func (f *frontendCLI) watchEvents() {
-	errorCh := f.getEventChannel(events.ErrorEvent)
-	internetOffCh := f.getEventChannel(events.InternetOffEvent)
-	internetOnCh := f.getEventChannel(events.InternetOnEvent)
-	addressChangedLogoutCh := f.getEventChannel(events.AddressChangedLogoutEvent)
-	logoutCh := f.getEventChannel(events.LogoutEvent)
-	certIssue := f.getEventChannel(events.TLSCertIssue)
+	errorCh := f.eventListener.ProvideChannel(events.ErrorEvent)
+	credentialsErrorCh := f.eventListener.ProvideChannel(events.CredentialsErrorEvent)
+	internetOffCh := f.eventListener.ProvideChannel(events.InternetOffEvent)
+	internetOnCh := f.eventListener.ProvideChannel(events.InternetOnEvent)
+	addressChangedLogoutCh := f.eventListener.ProvideChannel(events.AddressChangedLogoutEvent)
+	logoutCh := f.eventListener.ProvideChannel(events.LogoutEvent)
+	certIssue := f.eventListener.ProvideChannel(events.TLSCertIssue)
 	for {
 		select {
 		case errorDetails := <-errorCh:
 			f.Println("Import-Export failed:", errorDetails)
+		case <-credentialsErrorCh:
+			f.notifyCredentialsError()
 		case <-internetOffCh:
 			f.notifyInternetOff()
 		case <-internetOnCh:
@@ -209,24 +203,8 @@ func (f *frontendCLI) watchEvents() {
 	}
 }
 
-func (f *frontendCLI) getEventChannel(event string) <-chan string {
-	ch := make(chan string)
-	f.eventListener.Add(event, ch)
-	return ch
-}
-
-// IsAppRestarting returns whether the app is currently set to restart.
-func (f *frontendCLI) IsAppRestarting() bool {
-	return f.appRestart
-}
-
 // Loop starts the frontend loop with an interactive shell.
-func (f *frontendCLI) Loop(credentialsError error) error {
-	if credentialsError != nil {
-		f.notifyCredentialsError()
-		return credentialsError
-	}
-
+func (f *frontendCLI) Loop() error {
 	f.Print(`
 Welcome to ProtonMail Import-Export app interactive shell
 
@@ -235,3 +213,12 @@ WARNING: The CLI is an experimental feature and does not yet cover all functiona
 	f.Run()
 	return nil
 }
+
+func (f *frontendCLI) NotifyManualUpdate(update updater.VersionInfo, canInstall bool) {
+	// NOTE: Save the update somewhere so that it can be installed when user chooses "install now".
+}
+
+func (f *frontendCLI) WaitUntilFrontendIsReady()              {}
+func (f *frontendCLI) SetVersion(version updater.VersionInfo) {}
+func (f *frontendCLI) NotifySilentUpdateInstalled()           {}
+func (f *frontendCLI) NotifySilentUpdateError(err error)      {}

internal/frontend/cli-ie/importexport.go

@@ -38,7 +38,7 @@ func (f *frontendCLI) importLocalMessages(c *ishell.Context) {
 		return
 	}
 
-	t, err := f.ie.GetLocalImporter(user.GetPrimaryAddress(), path)
+	t, err := f.ie.GetLocalImporter(user.Username(), user.GetPrimaryAddress(), path)
 	f.transfer(t, err, false, true)
 }
 
@@ -68,7 +68,7 @@ func (f *frontendCLI) importRemoteMessages(c *ishell.Context) {
 		return
 	}
 
-	t, err := f.ie.GetRemoteImporter(user.GetPrimaryAddress(), username, password, host, port)
+	t, err := f.ie.GetRemoteImporter(user.Username(), user.GetPrimaryAddress(), username, password, host, port)
 	f.transfer(t, err, false, true)
 }
 
@@ -81,7 +81,7 @@ func (f *frontendCLI) exportMessagesToEML(c *ishell.Context) {
 		return
 	}
 
-	t, err := f.ie.GetEMLExporter(user.GetPrimaryAddress(), path)
+	t, err := f.ie.GetEMLExporter(user.Username(), user.GetPrimaryAddress(), path)
 	f.transfer(t, err, true, false)
 }
 
@@ -94,7 +94,7 @@ func (f *frontendCLI) exportMessagesToMBOX(c *ishell.Context) {
 		return
 	}
 
-	t, err := f.ie.GetMBOXExporter(user.GetPrimaryAddress(), path)
+	t, err := f.ie.GetMBOXExporter(user.Username(), user.GetPrimaryAddress(), path)
 	f.transfer(t, err, true, false)
 }
 

internal/frontend/cli-ie/system.go

@@ -24,21 +24,17 @@ import (
 func (f *frontendCLI) restart(c *ishell.Context) {
 	if f.yesNoQuestion("Are you sure you want to restart the Import-Export app") {
 		f.Println("Restarting the Import-Export app...")
-		f.appRestart = true
+		f.restarter.SetToRestart()
 		f.Stop()
 	}
 }
 
-func (f *frontendCLI) checkInternetConnection(c *ishell.Context) {
-	if f.ie.CheckConnection() == nil {
-		f.Println("Internet connection is available.")
-	} else {
-		f.Println("Can not contact the server, please check your internet connection.")
-	}
-}
-
 func (f *frontendCLI) printLogDir(c *ishell.Context) {
-	f.Println("Log files are stored in\n\n ", f.config.GetLogDir())
+	if path, err := f.locations.ProvideLogsPath(); err != nil {
+		f.Println("Failed to determine location of log files")
+	} else {
+		f.Println("Log files are stored in\n\n ", path)
+	}
 }
 
 func (f *frontendCLI) printManual(c *ishell.Context) {

internal/frontend/cli-ie/updates.go

@@ -21,41 +21,11 @@ import (
 	"strings"
 
 	"github.com/ProtonMail/proton-bridge/internal/importexport"
-	"github.com/ProtonMail/proton-bridge/internal/updates"
 	"github.com/abiosoft/ishell"
 )
 
 func (f *frontendCLI) checkUpdates(c *ishell.Context) {
-	isUpToDate, latestVersionInfo, err := f.updates.CheckIsUpToDate()
-	if err != nil {
-		f.printAndLogError("Cannot retrieve version info: ", err)
-		f.checkInternetConnection(c)
-		return
-	}
-	if isUpToDate {
-		f.Println("Your version is up to date.")
-	} else {
-		f.notifyNeedUpgrade()
-		f.Println("")
-		f.printReleaseNotes(latestVersionInfo)
-	}
-}
-
-func (f *frontendCLI) printLocalReleaseNotes(c *ishell.Context) {
-	localVersion := f.updates.GetLocalVersion()
-	f.printReleaseNotes(localVersion)
-}
-
-func (f *frontendCLI) printReleaseNotes(versionInfo updates.VersionInfo) {
-	f.Println(bold("ProtonMail Import-Export app "+versionInfo.Version), "\n")
-	if versionInfo.ReleaseNotes != "" {
-		f.Println(bold("Release Notes"))
-		f.Println(versionInfo.ReleaseNotes)
-	}
-	if versionInfo.ReleaseFixedBugs != "" {
-		f.Println(bold("Fixed bugs"))
-		f.Println(versionInfo.ReleaseFixedBugs)
-	}
+	f.Println("Your version is up to date.")
 }
 
 func (f *frontendCLI) printCredits(c *ishell.Context) {

internal/frontend/cli-ie/utils.go

@@ -20,7 +20,7 @@ package cliie
 import (
 	"strings"
 
-	pmapi "github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
 	"github.com/fatih/color"
 )
 
@@ -71,7 +71,7 @@ func (f *frontendCLI) printAndLogError(args ...interface{}) {
 func (f *frontendCLI) processAPIError(err error) {
 	log.Warn("API error: ", err)
 	switch err {
-	case pmapi.ErrAPINotReachable:
+	case pmapi.ErrNoConnection:
 		f.notifyInternetOff()
 	case pmapi.ErrUpgradeApplication:
 		f.notifyNeedUpgrade()
@@ -93,10 +93,15 @@ func (f *frontendCLI) notifyLogout(address string) {
 }
 
 func (f *frontendCLI) notifyNeedUpgrade() {
-	f.Println("Please download and install the newest version of application from", f.updates.GetDownloadLink())
+	version, err := f.updater.Check()
+	if err != nil {
+		log.WithError(err).Error("Failed to notify need upgrade")
+		return
+	}
+	f.Println("Please download and install the newest version of application from", version.LandingPage)
 }
 
-func (f *frontendCLI) notifyCredentialsError() {
+func (f *frontendCLI) notifyCredentialsError() { // nolint[unused]
 	// Print in 80-column width.
 	f.Println("ProtonMail Import-Export app is not able to detect a supported password manager")
 	f.Println("(pass, gnome-keyring). Please install and set up a supported password manager")

internal/frontend/cli/accounts.go

@@ -18,17 +18,18 @@
 package cli
 
 import (
+	"context"
 	"strings"
 
 	"github.com/ProtonMail/proton-bridge/internal/bridge"
+	"github.com/ProtonMail/proton-bridge/internal/config/settings"
 	"github.com/ProtonMail/proton-bridge/internal/frontend/types"
-	"github.com/ProtonMail/proton-bridge/internal/preferences"
 	"github.com/abiosoft/ishell"
 )
 
 func (f *frontendCLI) listAccounts(c *ishell.Context) {
 	spacing := "%-2d: %-20s (%-15s, %-15s)\n"
-	f.Printf(bold(strings.Replace(spacing, "d", "s", -1)), "#", "account", "status", "address mode")
+	f.Printf(bold(strings.ReplaceAll(spacing, "d", "s")), "#", "account", "status", "address mode")
 	for idx, user := range f.bridge.GetUsers() {
 		connected := "disconnected"
 		if user.IsConnected() {
@@ -65,13 +66,13 @@ func (f *frontendCLI) showAccountInfo(c *ishell.Context) {
 
 func (f *frontendCLI) showAccountAddressInfo(user types.User, address string) {
 	smtpSecurity := "STARTTLS"
-	if f.preferences.GetBool(preferences.SMTPSSLKey) {
+	if f.settings.GetBool(settings.SMTPSSLKey) {
 		smtpSecurity = "SSL"
 	}
 	f.Println(bold("Configuration for " + address))
 	f.Printf("IMAP Settings\nAddress:   %s\nIMAP port: %d\nUsername:  %s\nPassword:  %s\nSecurity:  %s\n",
 		bridge.Host,
-		f.preferences.GetInt(preferences.IMAPPortKey),
+		f.settings.GetInt(settings.IMAPPortKey),
 		address,
 		user.GetBridgePassword(),
 		"STARTTLS",
@@ -79,7 +80,7 @@ func (f *frontendCLI) showAccountAddressInfo(user types.User, address string) {
 	f.Println("")
 	f.Printf("SMTP Settings\nAddress:   %s\nSMTP port: %d\nUsername:  %s\nPassword:  %s\nSecurity:  %s\n",
 		bridge.Host,
-		f.preferences.GetInt(preferences.SMTPPortKey),
+		f.settings.GetInt(settings.SMTPPortKey),
 		address,
 		user.GetBridgePassword(),
 		smtpSecurity,
@@ -114,7 +115,7 @@ func (f *frontendCLI) loginAccount(c *ishell.Context) { // nolint[funlen]
 	}
 
 	f.Println("Authenticating ... ")
-	client, auth, err := f.bridge.Login(loginName, password)
+	client, auth, err := f.bridge.Login(loginName, []byte(password))
 	if err != nil {
 		f.processAPIError(err)
 		return
@@ -126,7 +127,7 @@ func (f *frontendCLI) loginAccount(c *ishell.Context) { // nolint[funlen]
 			return
 		}
 
-		err = client.Auth2FA(twoFactor, auth)
+		err = client.Auth2FA(context.Background(), twoFactor)
 		if err != nil {
 			f.processAPIError(err)
 			return
@@ -142,7 +143,7 @@ func (f *frontendCLI) loginAccount(c *ishell.Context) { // nolint[funlen]
 	}
 
 	f.Println("Adding account ...")
-	user, err := f.bridge.FinishLogin(client, auth, mailboxPassword)
+	user, err := f.bridge.FinishLogin(client, auth, []byte(mailboxPassword))
 	if err != nil {
 		log.WithField("username", loginName).WithError(err).Error("Login was unsuccessful")
 		f.Println("Adding account was unsuccessful:", err)

internal/frontend/cli/frontend.go

@@ -19,9 +19,11 @@
 package cli
 
 import (
+	"github.com/ProtonMail/proton-bridge/internal/config/settings"
 	"github.com/ProtonMail/proton-bridge/internal/events"
 	"github.com/ProtonMail/proton-bridge/internal/frontend/types"
-	"github.com/ProtonMail/proton-bridge/pkg/config"
+	"github.com/ProtonMail/proton-bridge/internal/locations"
+	"github.com/ProtonMail/proton-bridge/internal/updater"
 	"github.com/ProtonMail/proton-bridge/pkg/listener"
 
 	"github.com/abiosoft/ishell"
@@ -35,34 +37,36 @@ var (
 type frontendCLI struct {
 	*ishell.Shell
 
-	config        *config.Config
-	preferences   *config.Preferences
+	locations     *locations.Locations
+	settings      *settings.Settings
 	eventListener listener.Listener
-	updates       types.Updater
+	updater       types.Updater
 	bridge        types.Bridger
 
-	appRestart bool
+	restarter types.Restarter
 }
 
 // New returns a new CLI frontend configured with the given options.
 func New( //nolint[funlen]
 	panicHandler types.PanicHandler,
-	config *config.Config,
-	preferences *config.Preferences,
+
+	locations *locations.Locations,
+	settings *settings.Settings,
 	eventListener listener.Listener,
-	updates types.Updater,
+	updater types.Updater,
 	bridge types.Bridger,
+	restarter types.Restarter,
 ) *frontendCLI { //nolint[golint]
 	fe := &frontendCLI{
 		Shell: ishell.New(),
 
-		config:        config,
-		preferences:   preferences,
+		locations:     locations,
+		settings:      settings,
 		eventListener: eventListener,
-		updates:       updates,
+		updater:       updater,
 		bridge:        bridge,
 
-		appRestart: false,
+		restarter: restarter,
 	}
 
 	// Clear commands.
@@ -98,10 +102,6 @@ func New( //nolint[funlen]
 		Aliases: []string{"p"},
 		Func:    fe.changePort,
 	})
-	changeCmd.AddCmd(&ishell.Cmd{Name: "proxy",
-		Help: "allow or disallow bridge to securely connect to proton via a third party when it is being blocked",
-		Func: fe.toggleAllowProxy,
-	})
 	changeCmd.AddCmd(&ishell.Cmd{Name: "smtp-security",
 		Help:    "change port numbers of IMAP and SMTP servers.(alias: ssl, starttls)",
 		Aliases: []string{"ssl", "starttls"},
@@ -109,19 +109,53 @@ func New( //nolint[funlen]
 	})
 	fe.AddCmd(changeCmd)
 
-	// Check commands.
-	checkCmd := &ishell.Cmd{Name: "check", Help: "check internet connection or new version."}
-	checkCmd.AddCmd(&ishell.Cmd{Name: "updates",
-		Help:    "check for Bridge updates. (aliases: u, v, version)",
-		Aliases: []string{"u", "version", "v"},
-		Func:    fe.checkUpdates,
+	// DoH commands.
+	dohCmd := &ishell.Cmd{Name: "proxy",
+		Help: "allow or disallow bridge to securely connect to proton via a third party when it is being blocked",
+	}
+	dohCmd.AddCmd(&ishell.Cmd{Name: "allow",
+		Help: "allow bridge to securely connect to proton via a third party when it is being blocked",
+		Func: fe.allowProxy,
 	})
-	checkCmd.AddCmd(&ishell.Cmd{Name: "internet",
-		Help:    "check internet connection. (aliases: i, conn, connection)",
-		Aliases: []string{"i", "con", "connection"},
-		Func:    fe.checkInternetConnection,
+	dohCmd.AddCmd(&ishell.Cmd{Name: "disallow",
+		Help: "disallow bridge to securely connect to proton via a third party when it is being blocked",
+		Func: fe.disallowProxy,
 	})
-	fe.AddCmd(checkCmd)
+	fe.AddCmd(dohCmd)
+
+	// Updates commands.
+	updatesCmd := &ishell.Cmd{Name: "updates",
+		Help: "manage bridge updates",
+	}
+	updatesCmd.AddCmd(&ishell.Cmd{Name: "check",
+		Help: "check for Bridge updates",
+		Func: fe.checkUpdates,
+	})
+	autoUpdatesCmd := &ishell.Cmd{Name: "autoupdates",
+		Help: "manage bridge updates",
+	}
+	updatesCmd.AddCmd(autoUpdatesCmd)
+	autoUpdatesCmd.AddCmd(&ishell.Cmd{Name: "enable",
+		Help: "automatically keep bridge up to date",
+		Func: fe.enableAutoUpdates,
+	})
+	autoUpdatesCmd.AddCmd(&ishell.Cmd{Name: "disable",
+		Help: "require bridge to be manually updated",
+		Func: fe.disableAutoUpdates,
+	})
+	updatesChannelCmd := &ishell.Cmd{Name: "channel",
+		Help: "switch updates channel",
+	}
+	updatesCmd.AddCmd(updatesChannelCmd)
+	updatesChannelCmd.AddCmd(&ishell.Cmd{Name: "early",
+		Help: "switch to the early-access updates channel",
+		Func: fe.selectEarlyChannel,
+	})
+	updatesChannelCmd.AddCmd(&ishell.Cmd{Name: "stable",
+		Help: "switch to the stable updates channel",
+		Func: fe.selectStableChannel,
+	})
+	fe.AddCmd(updatesCmd)
 
 	// Print info commands.
 	fe.AddCmd(&ishell.Cmd{Name: "log-dir",
@@ -134,11 +168,7 @@ func New( //nolint[funlen]
 		Aliases: []string{"man"},
 		Func:    fe.printManual,
 	})
-	fe.AddCmd(&ishell.Cmd{Name: "release-notes",
-		Help:    "print release notes. (aliases: notes, fixed-bugs, bugs, ver, version)",
-		Aliases: []string{"notes", "fixed-bugs", "bugs", "ver", "version"},
-		Func:    fe.printLocalReleaseNotes,
-	})
+
 	fe.AddCmd(&ishell.Cmd{Name: "credits",
 		Help: "print used resources.",
 		Func: fe.printCredits,
@@ -185,23 +215,24 @@ func New( //nolint[funlen]
 		defer panicHandler.HandlePanic()
 		fe.watchEvents()
 	}()
-	fe.eventListener.RetryEmit(events.TLSCertIssue)
-	fe.eventListener.RetryEmit(events.ErrorEvent)
 	return fe
 }
 
 func (f *frontendCLI) watchEvents() {
-	errorCh := f.getEventChannel(events.ErrorEvent)
-	internetOffCh := f.getEventChannel(events.InternetOffEvent)
-	internetOnCh := f.getEventChannel(events.InternetOnEvent)
-	addressChangedCh := f.getEventChannel(events.AddressChangedEvent)
-	addressChangedLogoutCh := f.getEventChannel(events.AddressChangedLogoutEvent)
-	logoutCh := f.getEventChannel(events.LogoutEvent)
-	certIssue := f.getEventChannel(events.TLSCertIssue)
+	errorCh := f.eventListener.ProvideChannel(events.ErrorEvent)
+	credentialsErrorCh := f.eventListener.ProvideChannel(events.CredentialsErrorEvent)
+	internetOffCh := f.eventListener.ProvideChannel(events.InternetOffEvent)
+	internetOnCh := f.eventListener.ProvideChannel(events.InternetOnEvent)
+	addressChangedCh := f.eventListener.ProvideChannel(events.AddressChangedEvent)
+	addressChangedLogoutCh := f.eventListener.ProvideChannel(events.AddressChangedLogoutEvent)
+	logoutCh := f.eventListener.ProvideChannel(events.LogoutEvent)
+	certIssue := f.eventListener.ProvideChannel(events.TLSCertIssue)
 	for {
 		select {
 		case errorDetails := <-errorCh:
 			f.Println("Bridge failed:", errorDetails)
+		case <-credentialsErrorCh:
+			f.notifyCredentialsError()
 		case <-internetOffCh:
 			f.notifyInternetOff()
 		case <-internetOnCh:
@@ -222,24 +253,8 @@ func (f *frontendCLI) watchEvents() {
 	}
 }
 
-func (f *frontendCLI) getEventChannel(event string) <-chan string {
-	ch := make(chan string)
-	f.eventListener.Add(event, ch)
-	return ch
-}
-
-// IsAppRestarting returns whether the app is currently set to restart.
-func (f *frontendCLI) IsAppRestarting() bool {
-	return f.appRestart
-}
-
 // Loop starts the frontend loop with an interactive shell.
-func (f *frontendCLI) Loop(credentialsError error) error {
-	if credentialsError != nil {
-		f.notifyCredentialsError()
-		return credentialsError
-	}
-
+func (f *frontendCLI) Loop() error {
 	f.Print(`
             Welcome to ProtonMail Bridge interactive shell
                               ___....___
@@ -260,3 +275,12 @@ func (f *frontendCLI) Loop(credentialsError error) error {
 	f.Run()
 	return nil
 }
+
+func (f *frontendCLI) NotifyManualUpdate(update updater.VersionInfo, canInstall bool) {
+	// NOTE: Save the update somewhere so that it can be installed when user chooses "install now".
+}
+
+func (f *frontendCLI) WaitUntilFrontendIsReady()              {}
+func (f *frontendCLI) SetVersion(version updater.VersionInfo) {}
+func (f *frontendCLI) NotifySilentUpdateInstalled()           {}
+func (f *frontendCLI) NotifySilentUpdateError(err error)      {}

internal/frontend/cli/system.go

@@ -22,7 +22,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/ProtonMail/proton-bridge/internal/preferences"
+	"github.com/ProtonMail/proton-bridge/internal/config/settings"
 	"github.com/ProtonMail/proton-bridge/pkg/ports"
 	"github.com/abiosoft/ishell"
 )
@@ -34,21 +34,17 @@ var (
 func (f *frontendCLI) restart(c *ishell.Context) {
 	if f.yesNoQuestion("Are you sure you want to restart the Bridge") {
 		f.Println("Restarting Bridge...")
-		f.appRestart = true
+		f.restarter.SetToRestart()
 		f.Stop()
 	}
 }
 
-func (f *frontendCLI) checkInternetConnection(c *ishell.Context) {
-	if f.bridge.CheckConnection() == nil {
-		f.Println("Internet connection is available.")
-	} else {
-		f.Println("Can not contact the server, please check your internet connection.")
-	}
-}
-
 func (f *frontendCLI) printLogDir(c *ishell.Context) {
-	f.Println("Log files are stored in\n\n ", f.config.GetLogDir())
+	if path, err := f.locations.ProvideLogsPath(); err != nil {
+		f.Println("Failed to determine location of log files")
+	} else {
+		f.Println("Log files are stored in\n\n ", path)
+	}
 }
 
 func (f *frontendCLI) printManual(c *ishell.Context) {
@@ -69,7 +65,7 @@ func (f *frontendCLI) deleteCache(c *ishell.Context) {
 	f.Println("Cached cleared, restarting bridge")
 	// Clearing data removes everything (db, preferences, ...)
 	// so everything has to be stopped and started again.
-	f.appRestart = true
+	f.restarter.SetToRestart()
 	f.Stop()
 }
 
@@ -77,7 +73,7 @@ func (f *frontendCLI) changeSMTPSecurity(c *ishell.Context) {
 	f.ShowPrompt(false)
 	defer f.ShowPrompt(true)
 
-	isSSL := f.preferences.GetBool(preferences.SMTPSSLKey)
+	isSSL := f.settings.GetBool(settings.SMTPSSLKey)
 	newSecurity := "SSL"
 	if isSSL {
 		newSecurity = "STARTTLS"
@@ -86,9 +82,9 @@ func (f *frontendCLI) changeSMTPSecurity(c *ishell.Context) {
 	msg := fmt.Sprintf("Are you sure you want to change SMTP setting to %q and restart the Bridge", newSecurity)
 
 	if f.yesNoQuestion(msg) {
-		f.preferences.SetBool(preferences.SMTPSSLKey, !isSSL)
+		f.settings.SetBool(settings.SMTPSSLKey, !isSSL)
 		f.Println("Restarting Bridge...")
-		f.appRestart = true
+		f.restarter.SetToRestart()
 		f.Stop()
 	}
 }
@@ -97,14 +93,14 @@ func (f *frontendCLI) changePort(c *ishell.Context) {
 	f.ShowPrompt(false)
 	defer f.ShowPrompt(true)
 
-	currentPort = f.preferences.Get(preferences.IMAPPortKey)
+	currentPort = f.settings.Get(settings.IMAPPortKey)
 	newIMAPPort := f.readStringInAttempts("Set IMAP port (current "+currentPort+")", c.ReadLine, f.isPortFree)
 	if newIMAPPort == "" {
 		newIMAPPort = currentPort
 	}
 	imapPortChanged := newIMAPPort != currentPort
 
-	currentPort = f.preferences.Get(preferences.SMTPPortKey)
+	currentPort = f.settings.Get(settings.SMTPPortKey)
 	newSMTPPort := f.readStringInAttempts("Set SMTP port (current "+currentPort+")", c.ReadLine, f.isPortFree)
 	if newSMTPPort == "" {
 		newSMTPPort = currentPort
@@ -118,34 +114,46 @@ func (f *frontendCLI) changePort(c *ishell.Context) {
 
 	if imapPortChanged || smtpPortChanged {
 		f.Println("Saving values IMAP:", newIMAPPort, "SMTP:", newSMTPPort)
-		f.preferences.Set(preferences.IMAPPortKey, newIMAPPort)
-		f.preferences.Set(preferences.SMTPPortKey, newSMTPPort)
+		f.settings.Set(settings.IMAPPortKey, newIMAPPort)
+		f.settings.Set(settings.SMTPPortKey, newSMTPPort)
 		f.Println("Restarting Bridge...")
-		f.appRestart = true
+		f.restarter.SetToRestart()
 		f.Stop()
 	} else {
 		f.Println("Nothing changed")
 	}
 }
 
-func (f *frontendCLI) toggleAllowProxy(c *ishell.Context) {
-	if f.preferences.GetBool(preferences.AllowProxyKey) {
-		f.Println("Bridge is currently set to use alternative routing to connect to Proton if it is being blocked.")
-		if f.yesNoQuestion("Are you sure you want to stop bridge from doing this") {
-			f.preferences.SetBool(preferences.AllowProxyKey, false)
-			f.bridge.DisallowProxy()
-		}
-	} else {
-		f.Println("Bridge is currently set to NOT use alternative routing to connect to Proton if it is being blocked.")
-		if f.yesNoQuestion("Are you sure you want to allow bridge to do this") {
-			f.preferences.SetBool(preferences.AllowProxyKey, true)
-			f.bridge.AllowProxy()
-		}
+func (f *frontendCLI) allowProxy(c *ishell.Context) {
+	if f.settings.GetBool(settings.AllowProxyKey) {
+		f.Println("Bridge is already set to use alternative routing to connect to Proton if it is being blocked.")
+		return
+	}
+
+	f.Println("Bridge is currently set to NOT use alternative routing to connect to Proton if it is being blocked.")
+
+	if f.yesNoQuestion("Are you sure you want to allow bridge to do this") {
+		f.settings.SetBool(settings.AllowProxyKey, true)
+		f.bridge.AllowProxy()
+	}
+}
+
+func (f *frontendCLI) disallowProxy(c *ishell.Context) {
+	if !f.settings.GetBool(settings.AllowProxyKey) {
+		f.Println("Bridge is already set to NOT use alternative routing to connect to Proton if it is being blocked.")
+		return
+	}
+
+	f.Println("Bridge is currently set to use alternative routing to connect to Proton if it is being blocked.")
+
+	if f.yesNoQuestion("Are you sure you want to stop bridge from doing this") {
+		f.settings.SetBool(settings.AllowProxyKey, false)
+		f.bridge.DisallowProxy()
 	}
 }
 
 func (f *frontendCLI) isPortFree(port string) bool {
-	port = strings.Replace(port, ":", "", -1)
+	port = strings.ReplaceAll(port, ":", "")
 	if port == "" || port == currentPort {
 		return true
 	}

internal/frontend/cli/updates.go

@@ -21,40 +21,22 @@ import (
 	"strings"
 
 	"github.com/ProtonMail/proton-bridge/internal/bridge"
-	"github.com/ProtonMail/proton-bridge/internal/updates"
+	"github.com/ProtonMail/proton-bridge/internal/config/settings"
+	"github.com/ProtonMail/proton-bridge/internal/updater"
 	"github.com/abiosoft/ishell"
 )
 
 func (f *frontendCLI) checkUpdates(c *ishell.Context) {
-	isUpToDate, latestVersionInfo, err := f.updates.CheckIsUpToDate()
+	version, err := f.updater.Check()
 	if err != nil {
-		f.printAndLogError("Cannot retrieve version info: ", err)
-		f.checkInternetConnection(c)
+		f.Println("An error occurred while checking for updates.")
 		return
 	}
-	if isUpToDate {
-		f.Println("Your version is up to date.")
+
+	if f.updater.IsUpdateApplicable(version) {
+		f.Println("An update is available.")
 	} else {
-		f.notifyNeedUpgrade()
-		f.Println("")
-		f.printReleaseNotes(latestVersionInfo)
-	}
-}
-
-func (f *frontendCLI) printLocalReleaseNotes(c *ishell.Context) {
-	localVersion := f.updates.GetLocalVersion()
-	f.printReleaseNotes(localVersion)
-}
-
-func (f *frontendCLI) printReleaseNotes(versionInfo updates.VersionInfo) {
-	f.Println(bold("ProtonMail Bridge "+versionInfo.Version), "\n")
-	if versionInfo.ReleaseNotes != "" {
-		f.Println(bold("Release Notes"))
-		f.Println(versionInfo.ReleaseNotes)
-	}
-	if versionInfo.ReleaseFixedBugs != "" {
-		f.Println(bold("Fixed bugs"))
-		f.Println(versionInfo.ReleaseFixedBugs)
+		f.Println("Your version is up to date.")
 	}
 }
 
@@ -63,3 +45,68 @@ func (f *frontendCLI) printCredits(c *ishell.Context) {
 		f.Println(pkg)
 	}
 }
+
+func (f *frontendCLI) enableAutoUpdates(c *ishell.Context) {
+	if f.settings.GetBool(settings.AutoUpdateKey) {
+		f.Println("Bridge is already set to automatically install updates.")
+		return
+	}
+
+	f.Println("Bridge is currently set to NOT automatically install updates.")
+
+	if f.yesNoQuestion("Are you sure you want to allow bridge to do this") {
+		f.settings.SetBool(settings.AutoUpdateKey, true)
+	}
+}
+
+func (f *frontendCLI) disableAutoUpdates(c *ishell.Context) {
+	if !f.settings.GetBool(settings.AutoUpdateKey) {
+		f.Println("Bridge is already set to NOT automatically install updates.")
+		return
+	}
+
+	f.Println("Bridge is currently set to automatically install updates.")
+
+	if f.yesNoQuestion("Are you sure you want to stop bridge from doing this") {
+		f.settings.SetBool(settings.AutoUpdateKey, false)
+	}
+}
+
+func (f *frontendCLI) selectEarlyChannel(c *ishell.Context) {
+	if f.bridge.GetUpdateChannel() == updater.EarlyChannel {
+		f.Println("Bridge is already on the early-access update channel.")
+		return
+	}
+
+	f.Println("Bridge is currently on the stable update channel.")
+
+	if f.yesNoQuestion("Are you sure you want to switch to the early-access update channel") {
+		needRestart, err := f.bridge.SetUpdateChannel(updater.EarlyChannel)
+		if err != nil {
+			f.Println("There was a problem switching update channel.")
+		}
+		if needRestart {
+			f.restarter.SetToRestart()
+		}
+	}
+}
+
+func (f *frontendCLI) selectStableChannel(c *ishell.Context) {
+	if f.bridge.GetUpdateChannel() == updater.StableChannel {
+		f.Println("Bridge is already on the stable update channel.")
+		return
+	}
+
+	f.Println("Bridge is currently on the early-access update channel.")
+	f.Println("Switching to the stable channel may reset all data!")
+
+	if f.yesNoQuestion("Are you sure you want to switch to the stable update channel") {
+		needRestart, err := f.bridge.SetUpdateChannel(updater.StableChannel)
+		if err != nil {
+			f.Println("There was a problem switching update channel.")
+		}
+		if needRestart {
+			f.restarter.SetToRestart()
+		}
+	}
+}

internal/frontend/cli/utils.go

@@ -71,7 +71,7 @@ func (f *frontendCLI) printAndLogError(args ...interface{}) {
 func (f *frontendCLI) processAPIError(err error) {
 	log.Warn("API error: ", err)
 	switch err {
-	case pmapi.ErrAPINotReachable:
+	case pmapi.ErrNoConnection:
 		f.notifyInternetOff()
 	case pmapi.ErrUpgradeApplication:
 		f.notifyNeedUpgrade()
@@ -93,10 +93,15 @@ func (f *frontendCLI) notifyLogout(address string) {
 }
 
 func (f *frontendCLI) notifyNeedUpgrade() {
-	f.Println("Please download and install the newest version of application from", f.updates.GetDownloadLink())
+	version, err := f.updater.Check()
+	if err != nil {
+		log.WithError(err).Error("Failed to notify need upgrade")
+		return
+	}
+	f.Println("Please download and install the newest version of application from", version.LandingPage)
 }
 
-func (f *frontendCLI) notifyCredentialsError() {
+func (f *frontendCLI) notifyCredentialsError() { // nolint[unused]
 	// Print in 80-column width.
 	f.Println("ProtonMail Bridge is not able to detect a supported password manager")
 	f.Println("(pass, gnome-keyring). Please install and set up a supported password manager")

internal/frontend/frontend.go

@@ -19,15 +19,18 @@
 package frontend
 
 import (
-	"github.com/0xAX/notificator"
+	"github.com/ProtonMail/go-autostart"
 	"github.com/ProtonMail/proton-bridge/internal/bridge"
+	"github.com/ProtonMail/proton-bridge/internal/config/settings"
+	"github.com/ProtonMail/proton-bridge/internal/config/useragent"
 	"github.com/ProtonMail/proton-bridge/internal/frontend/cli"
 	cliie "github.com/ProtonMail/proton-bridge/internal/frontend/cli-ie"
 	"github.com/ProtonMail/proton-bridge/internal/frontend/qt"
 	qtie "github.com/ProtonMail/proton-bridge/internal/frontend/qt-ie"
 	"github.com/ProtonMail/proton-bridge/internal/frontend/types"
 	"github.com/ProtonMail/proton-bridge/internal/importexport"
-	"github.com/ProtonMail/proton-bridge/pkg/config"
+	"github.com/ProtonMail/proton-bridge/internal/locations"
+	"github.com/ProtonMail/proton-bridge/internal/updater"
 	"github.com/ProtonMail/proton-bridge/pkg/listener"
 	"github.com/sirupsen/logrus"
 )
@@ -38,55 +41,97 @@ var (
 
 // Frontend is an interface to be implemented by each frontend type (cli, gui, html).
 type Frontend interface {
-	Loop(credentialsError error) error
-	IsAppRestarting() bool
-}
-
-// HandlePanic handles panics which occur for users with GUI.
-func HandlePanic(appName string) {
-	notify := notificator.New(notificator.Options{
-		DefaultIcon: "../frontend/ui/icon/icon.png",
-		AppName:     appName,
-	})
-	_ = notify.Push("Fatal Error", "The "+appName+" has encountered a fatal error. ", "/frontend/icon/icon.png", notificator.UR_CRITICAL)
+	Loop() error
+	NotifyManualUpdate(update updater.VersionInfo, canInstall bool)
+	SetVersion(update updater.VersionInfo)
+	NotifySilentUpdateInstalled()
+	NotifySilentUpdateError(error)
+	WaitUntilFrontendIsReady()
 }
 
 // New returns initialized frontend based on `frontendType`, which can be `cli` or `qt`.
 func New(
 	version,
 	buildVersion,
+	programName,
 	frontendType string,
 	showWindowOnStart bool,
 	panicHandler types.PanicHandler,
-	config *config.Config,
-	preferences *config.Preferences,
+	locations *locations.Locations,
+	settings *settings.Settings,
 	eventListener listener.Listener,
-	updates types.Updater,
+	updater types.Updater,
+	userAgent *useragent.UserAgent,
 	bridge *bridge.Bridge,
 	noEncConfirmator types.NoEncConfirmator,
+	autostart *autostart.App,
+	restarter types.Restarter,
 ) Frontend {
 	bridgeWrap := types.NewBridgeWrap(bridge)
-	return new(version, buildVersion, frontendType, showWindowOnStart, panicHandler, config, preferences, eventListener, updates, bridgeWrap, noEncConfirmator)
+	return newBridgeFrontend(
+		version,
+		buildVersion,
+		programName,
+		frontendType,
+		showWindowOnStart,
+		panicHandler,
+		locations,
+		settings,
+		eventListener,
+		updater,
+		userAgent,
+		bridgeWrap,
+		noEncConfirmator,
+		autostart,
+		restarter,
+	)
 }
 
-func new(
+func newBridgeFrontend(
 	version,
 	buildVersion,
+	programName,
 	frontendType string,
 	showWindowOnStart bool,
 	panicHandler types.PanicHandler,
-	config *config.Config,
-	preferences *config.Preferences,
+	locations *locations.Locations,
+	settings *settings.Settings,
 	eventListener listener.Listener,
-	updates types.Updater,
+	updater types.Updater,
+	userAgent *useragent.UserAgent,
 	bridge types.Bridger,
 	noEncConfirmator types.NoEncConfirmator,
+	autostart *autostart.App,
+	restarter types.Restarter,
 ) Frontend {
 	switch frontendType {
 	case "cli":
-		return cli.New(panicHandler, config, preferences, eventListener, updates, bridge)
+		return cli.New(
+			panicHandler,
+			locations,
+			settings,
+			eventListener,
+			updater,
+			bridge,
+			restarter,
+		)
 	default:
-		return qt.New(version, buildVersion, showWindowOnStart, panicHandler, config, preferences, eventListener, updates, bridge, noEncConfirmator)
+		return qt.New(
+			version,
+			buildVersion,
+			programName,
+			showWindowOnStart,
+			panicHandler,
+			locations,
+			settings,
+			eventListener,
+			updater,
+			userAgent,
+			bridge,
+			noEncConfirmator,
+			autostart,
+			restarter,
+		)
 	}
 }
 
@@ -94,31 +139,67 @@ func new(
 func NewImportExport(
 	version,
 	buildVersion,
+	programName,
 	frontendType string,
 	panicHandler types.PanicHandler,
-	config *config.Config,
+	locations *locations.Locations,
+	settings *settings.Settings,
 	eventListener listener.Listener,
-	updates types.Updater,
+	updater types.Updater,
 	ie *importexport.ImportExport,
+	restarter types.Restarter,
 ) Frontend {
 	ieWrap := types.NewImportExportWrap(ie)
-	return newImportExport(version, buildVersion, frontendType, panicHandler, config, eventListener, updates, ieWrap)
+	return newIEFrontend(
+		version,
+		buildVersion,
+		programName,
+		frontendType,
+		panicHandler,
+		locations,
+		settings,
+		eventListener,
+		updater,
+		ieWrap,
+		restarter,
+	)
 }
 
-func newImportExport(
+func newIEFrontend(
 	version,
 	buildVersion,
+	programName,
 	frontendType string,
 	panicHandler types.PanicHandler,
-	config *config.Config,
+	locations *locations.Locations,
+	settings *settings.Settings,
 	eventListener listener.Listener,
-	updates types.Updater,
+	updater types.Updater,
 	ie types.ImportExporter,
+	restarter types.Restarter,
 ) Frontend {
 	switch frontendType {
 	case "cli":
-		return cliie.New(panicHandler, config, eventListener, updates, ie)
+		return cliie.New(
+			panicHandler,
+			locations,
+			eventListener,
+			updater,
+			ie,
+			restarter,
+		)
 	default:
-		return qtie.New(version, buildVersion, panicHandler, config, eventListener, updates, ie)
+		return qtie.New(
+			version,
+			buildVersion,
+			programName,
+			panicHandler,
+			locations,
+			settings,
+			eventListener,
+			updater,
+			ie,
+			restarter,
+		)
 	}
 }

internal/frontend/qml/BridgeUI/DialogKeychainChange.qml

@@ -0,0 +1,194 @@
+// Copyright (c) 2021 Proton Technologies AG
+//
+// This file is part of ProtonMail Bridge.
+//
+// ProtonMail Bridge is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// ProtonMail Bridge is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
+
+// Change default keychain dialog
+
+import QtQuick 2.8
+import BridgeUI 1.0
+import ProtonUI 1.0
+import QtQuick.Controls 2.2 as QC
+import QtQuick.Layouts 1.0
+
+Dialog {
+    id: root
+
+    title : "Change which keychain Bridge uses as default"
+    subtitle : "Select which keychain is used (Bridge will automatically restart)"
+    isDialogBusy: currentIndex==1
+
+    property var selectedKeychain
+
+    Connections {
+        target: go.selectedKeychain
+        onValueChanged: {
+            console.debug("go.selectedKeychain == ", go.selectedKeychain)
+        }
+    }
+
+    ColumnLayout {
+        Layout.fillHeight: true
+        Layout.fillWidth: true
+
+        Item {
+            Layout.fillWidth: true
+            Layout.minimumHeight: root.titleHeight + Style.dialog.heightSeparator
+            Layout.maximumHeight: root.titleHeight + Style.dialog.heightSeparator
+        }
+
+        Item {
+            Layout.fillHeight: true
+            Layout.fillWidth: true
+
+            ColumnLayout {
+                anchors.centerIn: parent
+
+                Repeater {
+                    id: keychainRadioButtons
+                    model: go.availableKeychain
+                    QC.RadioButton {
+                        id: radioDelegate
+                        text: modelData
+                        checked: go.selectedKeychain === modelData
+
+                        Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
+                        spacing: Style.main.spacing
+
+                        indicator: Text {
+                            text  : radioDelegate.checked ? Style.fa.check_circle : Style.fa.circle_o
+                            color : radioDelegate.checked ? Style.main.textBlue   : Style.main.textInactive
+                            font {
+                                pointSize: Style.dialog.iconSize * Style.pt
+                                family: Style.fontawesome.name
+                            }
+                        }
+                        contentItem: Text {
+                            text: radioDelegate.text
+                            color: Style.main.text
+                            font {
+                                pointSize: Style.dialog.fontSize * Style.pt
+                                bold: checked
+                            }
+                            horizontalAlignment : Text.AlignHCenter
+                            verticalAlignment   : Text.AlignVCenter
+                            leftPadding: Style.dialog.iconSize
+                        }
+
+                        onCheckedChanged: {
+                            if (checked) {
+                                root.selectedKeychain = modelData
+                            }
+                        }
+                    }
+                }
+
+                Item {
+                    Layout.fillWidth: true
+                    Layout.minimumHeight: Style.dialog.heightSeparator
+                    Layout.maximumHeight: Style.dialog.heightSeparator
+                }
+
+                Row {
+                    id: buttonRow
+                    Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
+                    spacing: Style.dialog.spacing
+                    ButtonRounded {
+                        id:buttonNo
+                        color_main: Style.dialog.text
+                        fa_icon: Style.fa.times
+                        text: qsTr("Cancel", "dismisses current action")
+                        onClicked : root.hide()
+                    }
+                    ButtonRounded {
+                        id: buttonYes
+                        color_main: Style.dialog.text
+                        color_minor: Style.main.textBlue
+                        isOpaque: true
+                        fa_icon: Style.fa.check
+                        text: qsTr("Okay", "confirms and dismisses a notification")
+                        onClicked : root.confirmed()
+                    }
+                }
+            }
+        }
+    }
+
+    ColumnLayout {
+        Layout.fillHeight: true
+        Layout.fillWidth: true
+
+        Item {
+            Layout.fillWidth: true
+            Layout.minimumHeight: root.titleHeight + Style.dialog.heightSeparator
+            Layout.maximumHeight: root.titleHeight + Style.dialog.heightSeparator
+        }
+
+        Item {
+            Layout.fillHeight: true
+            Layout.fillWidth: true
+            Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
+
+            Text {
+                id: answ
+                anchors.horizontalCenter: parent.horizontalCenter
+                anchors.verticalCenter: parent.verticalCenter
+                width : parent.width/2
+                color: Style.dialog.text
+                font {
+                    pointSize : Style.dialog.fontSize * Style.pt
+                    bold      : true
+                }
+                text : "Default keychain is now set to " + root.selectedKeychain +
+                "\n\n" +
+                qsTr("Settings will be applied after the next start.", "notification about setting being applied after next start") +
+                "\n\n" +
+                qsTr("Bridge will now restart.", "notification about restarting")
+                wrapMode: Text.Wrap
+                horizontalAlignment: Text.AlignHCenter
+            }
+        }
+    }
+
+    Shortcut {
+        sequence: StandardKey.Cancel
+        onActivated: root.hide()
+    }
+
+    Shortcut {
+        sequence: "Enter"
+        onActivated: root.confirmed()
+    }
+
+    function confirmed() {
+        if (selectedKeychain === go.selectedKeychain) {
+            root.hide()
+            return
+        }
+
+        incrementCurrentIndex()
+        timer.start()
+    }
+
+    timer.interval : 5000
+
+    Connections {
+        target: timer
+        onTriggered: {
+            // This action triggers restart on the backend side.
+            go.selectedKeychain = selectedKeychain
+        }
+    }
+}

internal/frontend/qml/BridgeUI/DialogPortChange.qml

@@ -226,7 +226,7 @@ Dialog {
         target: timer
         onTriggered: {
             go.setPortsAndSecurity(imapPort.text, smtpPort.text, securitySMTPSTARTTLS.checked)
-            go.isRestarting = true
+            go.setToRestart()
             Qt.quit()
         }
     }

internal/frontend/qml/BridgeUI/DialogYesNo.qml

@@ -137,6 +137,7 @@ Dialog {
             spacing: Style.dialog.spacing
             ButtonRounded {
                 id:buttonNo
+                visible: root.state != "toggleEarlyAccess"
                 color_main: Style.dialog.text
                 fa_icon: Style.fa.times
                 text: qsTr("No")
@@ -148,7 +149,7 @@ Dialog {
                 color_minor: Style.main.textBlue
                 isOpaque: true
                 fa_icon: Style.fa.check
-                text: qsTr("Yes")
+                text: root.state == "toggleEarlyAccess" ?  qsTr("Ok") : qsTr("Yes")
                 onClicked : {
                     currentIndex=1
                     root.confirmed()
@@ -228,7 +229,7 @@ Dialog {
                 currentIndex : 0
                 title        : qsTr("Clear cache", "title of page that displays during cache clearing")
                 question     : qsTr("Are you sure you want to clear your local cache?", "displays during cache clearing")
-                note         : qsTr("This will delete all of your stored preferences as well as cached email data for all accounts, temporarily slowing down the email download process significantly.", "displays during cache clearing")
+                note         : qsTr("This will delete all of your stored preferences as well as cached email data for all accounts, and requires you to reconfigure your client.", "displays during cache clearing")
                 answer       : qsTr("Clearing the cache ...", "displays during cache clearing")
             }
         },
@@ -292,6 +293,28 @@ Dialog {
                 }
             }
         },
+        State {
+            name: "toggleEarlyAccessOn"
+            PropertyChanges {
+                target: root
+                currentIndex : 0
+                question     : qsTr("Do you want to be the first to get the latest updates? Please keep in mind that early versions may be less stable.")
+                note         : ""
+                title        : qsTr("Enable early access")
+                answer       : qsTr("Enabling early access...")
+            }
+        },
+        State {
+            name: "toggleEarlyAccessOff"
+            PropertyChanges {
+                target: root
+                currentIndex : 0
+                question     : qsTr("Are you sure you want to leave early access? Please keep in mind this operation clears the cache and restarts Bridge.")
+                note         : qsTr("This will delete all of your stored preferences as well as cached email data for all accounts, and requires you to reconfigure your client.")
+                title        : qsTr("Disable early access")
+                answer       : qsTr("Disabling early access...")
+            }
+        },
         State {
             name: "noKeychain"
             PropertyChanges {
@@ -340,13 +363,9 @@ Dialog {
         winMain.dialogAddUser     .visible = false
         winMain.dialogChangePort  .visible = false
         winMain.dialogCredits     .visible = false
-        winMain.dialogVersionInfo .visible = false
-        // dialogFirstStart should reappear again after closing global
         root.visible = true
     }
 
-
-
     onConfirmed : {
         if (state == "quit" || state == "instance exists" ) {
             timer.interval = 1000
@@ -360,17 +379,19 @@ Dialog {
     Connections {
         target: timer
         onTriggered: {
-            if ( state == "addressmode"      ) { go.switchAddressMode   (input) }
-            if ( state == "clearChain"       ) { go.clearKeychain       ()      }
-            if ( state == "clearCache"       ) { go.clearCache          ()      }
-            if ( state == "deleteUser"       ) { go.deleteAccount       (input, checkBoxWrapper.isChecked) }
-            if ( state == "logout"           ) { go.logoutAccount       (input) }
-            if ( state == "toggleAutoStart"  ) { go.toggleAutoStart     ()      }
-            if ( state == "toggleAllowProxy" ) { go.toggleAllowProxy    ()      }
-            if ( state == "quit"             ) { Qt.quit                ()      }
-            if ( state == "instance exists"  ) { Qt.quit                ()      }
-            if ( state == "noKeychain"       ) { Qt.quit                ()      }
-            if ( state == "checkUpdates"     ) { go.runCheckVersion     (true)  }
+            if ( state == "addressmode"       ) { go.switchAddressMode   (input) }
+            if ( state == "clearChain"        ) { go.clearKeychain       ()      }
+            if ( state == "clearCache"        ) { go.clearCache          ()      }
+            if ( state == "deleteUser"        ) { go.deleteAccount       (input, checkBoxWrapper.isChecked) }
+            if ( state == "logout"            ) { go.logoutAccount       (input) }
+            if ( state == "toggleAutoStart"   ) { go.toggleAutoStart     ()      }
+            if ( state == "toggleAllowProxy"  ) { go.toggleAllowProxy    ()      }
+            if ( state == "toggleEarlyAccessOn"  ) { go.toggleEarlyAccess   ()      }
+            if ( state == "toggleEarlyAccessOff" ) { go.toggleEarlyAccess   ()      }
+            if ( state == "quit"              ) { Qt.quit                ()      }
+            if ( state == "instance exists"   ) { Qt.quit                ()      }
+            if ( state == "noKeychain"        ) { Qt.quit                ()      }
+            if ( state == "checkUpdates"      ) { }
         }
     }
 

internal/frontend/qml/BridgeUI/HelpView.qml

@@ -74,9 +74,7 @@ Item {
                 rightIcon.text : Style.fa.chevron_circle_right
                 rightIcon.font.pointSize : Style.settings.toggleSize * Style.pt
                 onClicked: {
-                    dialogGlobal.state="checkUpdates"
-                    dialogGlobal.show()
-                    dialogGlobal.confirmed()
+                    go.checkForUpdates()
                 }
             }
 
@@ -96,7 +94,7 @@ Item {
                     font.pointSize :  Style.main.fontSize * Style.pt
                     text:
                     "ProtonMail Bridge "+go.getBackendVersion()+"\n"+
-                    "© 2020 Proton Technologies AG"
+                    "© 2021 Proton Technologies AG"
                 }
             }
             Row {
@@ -137,10 +135,7 @@ Item {
                     textColor     : Style.main.textDisabled
                     fontSize      : Style.main.fontSize
                     textUnderline : true
-                    onClicked     : {
-                        go.getLocalVersionInfo()
-                        winMain.dialogVersionInfo.show()
-                    }
+                    onClicked : gui.openReleaseNotes()
                 }
             }
         }

internal/frontend/qml/BridgeUI/MainWindow.qml

@@ -38,7 +38,6 @@ Window {
     property alias dialogUpdate                 : dialogUpdate
     property alias dialogFirstStart             : dialogFirstStart
     property alias dialogGlobal                 : dialogGlobal
-    property alias dialogVersionInfo            : dialogVersionInfo
     property alias dialogConnectionTroubleshoot : dialogConnectionTroubleshoot
     property alias bubbleNote                   : bubbleNote
     property alias addAccountTip                : addAccountTip
@@ -66,7 +65,6 @@ Window {
     !dialogUpdate      .visible &&
     !dialogFirstStart  .visible &&
     !dialogGlobal      .visible &&
-    !dialogVersionInfo .visible &&
     !bubbleNote        .visible
 
     Accessible.role: Accessible.Grouping
@@ -305,6 +303,10 @@ Window {
         id: dialogChangePort
     }
 
+    DialogKeychainChange {
+        id: dialogChangeKeychain
+    }
+
     DialogConnectionTroubleshoot {
         id: dialogConnectionTroubleshoot
     }
@@ -316,50 +318,7 @@ Window {
 
     DialogUpdate {
         id: dialogUpdate
-
-        property string manualLinks : {
-            var out = ""
-            var links = go.downloadLink.split("\n")
-            var l;
-            for (l in links) {
-                out += '<a href="%1">%1</a><br>'.arg(links[l])
-            }
-            return out
-        }
-
-        title: root.isOutdateVersion ?
-        qsTr("%1 is outdated", "title of outdate dialog").arg(go.programTitle):
-        qsTr("%1 update to %2", "title of update dialog").arg(go.programTitle).arg(go.newversion)
-        introductionText: {
-            if (root.isOutdateVersion) {
-                if (go.goos=="linux") {
-                    return qsTr('You are using an outdated version of our software.<br>
-                    Please download and install the latest version to continue using %1.<br><br>
-                    %2',
-                    "Message for force-update in Linux").arg(go.programTitle).arg(dialogUpdate.manualLinks)
-                } else {
-                    return qsTr('You are using an outdated version of our software.<br>
-                    Please download and install the latest version to continue using %1.<br><br>
-                    You can continue with the update or download and install the new version manually from<br><br>
-                    <a href="%2">%2</a>',
-                    "Message for force-update in Win/Mac").arg(go.programTitle).arg(go.landingPage)
-                }
-            } else {
-                if (go.goos=="linux") {
-                    return qsTr('A new version of Bridge is available.<br>
-                    Check <a href="%1">release notes</a> to learn what is new in %2.<br>
-                    Use your package manager to update or download and install the new version manually from<br><br>
-                    %3',
-                    "Message for update in Linux").arg("releaseNotes").arg(go.newversion).arg(dialogUpdate.manualLinks)
-                } else {
-                    return qsTr('A new version of Bridge is available.<br>
-                    Check <a href="%1">release notes</a> to learn what is new in %2.<br>
-                    You can continue with the update or download and install the new version manually from<br><br>
-                    <a href="%3">%3</a>',
-                    "Message for update in Win/Mac").arg("releaseNotes").arg(go.newversion).arg(go.landingPage)
-                }
-            }
-        }
+        forceUpdate: root.isOutdateVersion
     }
 
 
@@ -373,25 +332,6 @@ Window {
         id: dialogTlsCert
     }
 
-    Dialog {
-        id: dialogVersionInfo
-        property bool checkVersionOnClose : false
-        title: qsTr("Information about", "title of release notes page") + " v" + go.newversion
-        VersionInfo { }
-        onShow : {
-            // Hide information bar with old version
-            if (infoBar.state=="oldVersion") {
-                infoBar.state="upToDate"
-                dialogVersionInfo.checkVersionOnClose = true
-            }
-        }
-        onHide : {
-            // Reload current version based on online status
-            if (dialogVersionInfo.checkVersionOnClose) go.runCheckVersion(false)
-            dialogVersionInfo.checkVersionOnClose = false
-        }
-    }
-
     DialogYesNo {
         id: dialogGlobal
         question : ""

internal/frontend/qml/BridgeUI/SettingsView.qml

@@ -36,6 +36,24 @@ Item {
             color: Style.main.background
         }
 
+        // horizontall scrollbar sometimes showes up when vertical scrollbar coveres content
+        ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
+        ScrollBar.vertical.policy: ScrollBar.AsNeeded
+
+        // keeping vertical scrollbar allways visible when needed
+        Connections {
+            target: wrapper.ScrollBar.vertical
+            onSizeChanged: {
+                // ScrollBar.size == 0 at creating so no need to make it active
+                if (wrapper.ScrollBar.vertical.size < 1.0 && wrapper.ScrollBar.vertical.size > 0 && !wrapper.ScrollBar.vertical.active) {
+                    wrapper.ScrollBar.vertical.active = true
+                }
+            }
+            onActiveChanged: {
+                wrapper.ScrollBar.vertical.active = true
+            }
+        }
+
         // content
         Column {
             anchors.left : parent.left
@@ -97,6 +115,50 @@ Item {
                 }
             }
 
+            ButtonIconText {
+                id: autoUpdates
+                text: qsTr("Keep the application up to date", "label for toggle that activates and disables the automatic updates")
+                leftIcon.text  : Style.fa.download
+                rightIcon {
+                    font.pointSize : Style.settings.toggleSize * Style.pt
+                    text  : go.isAutoUpdate!=false ? Style.fa.toggle_on  : Style.fa.toggle_off
+                    color : go.isAutoUpdate!=false ? Style.main.textBlue : Style.main.textDisabled
+                }
+                Accessible.description: (
+                    go.isAutoUpdate == false ?
+                    qsTr("Enable"  , "Click to enable the automatic update of Bridge") :
+                    qsTr("Disable" , "Click to disable the automatic update of Bridge")
+                ) + " " + text
+                onClicked: {
+                    go.toggleAutoUpdate()
+                }
+            }
+
+            ButtonIconText {
+                id: earlyAccess
+                text: qsTr("Early access", "label for toggle that enables and disables early access")
+                leftIcon.text  : Style.fa.star
+                rightIcon {
+                    font.pointSize : Style.settings.toggleSize * Style.pt
+                    text  : go.isEarlyAccess!=false ? Style.fa.toggle_on  : Style.fa.toggle_off
+                    color : go.isEarlyAccess!=false ? Style.main.textBlue : Style.main.textDisabled
+                }
+                Accessible.description: (
+                    go.isEarlyAccess == false ?
+                    qsTr("Enable"  , "Click to enable early access") :
+                    qsTr("Disable" , "Click to disable early access")
+                ) + " " + text
+                onClicked: {
+                    if (go.isEarlyAccess == true) {
+                      dialogGlobal.state="toggleEarlyAccessOff"
+                      dialogGlobal.show()
+                    } else {
+                      dialogGlobal.state="toggleEarlyAccessOn"
+                      dialogGlobal.show()
+                    }
+                }
+            }
+
             ButtonIconText {
                 id: advancedSettings
                 property bool isAdvanced : !go.isDefaultPort
@@ -178,6 +240,24 @@ Item {
                 }
             }
 
+            ButtonIconText {
+                id: changeKeychain
+                visible: advancedSettings.isAdvanced && (go.availableKeychain.length > 1)
+                text: qsTr("Change keychain", "button to open dialog with default keychain selection")
+                leftIcon.text  : Style.fa.key
+                rightIcon {
+                    text : qsTr("Change", "clickable link next to change keychain button in settings")
+                    color: Style.main.text
+                    font {
+                        family : changeKeychain.font.family // use default font, not font-awesome
+                        pointSize : Style.settings.fontSize * Style.pt
+                        underline : true
+                    }
+                }
+                onClicked: {
+                    dialogChangeKeychain.show()
+                }
+            }
         }
     }
 }

internal/frontend/qml/BridgeUI/VersionInfo.qml

@@ -1,127 +0,0 @@
-// Copyright (c) 2021 Proton Technologies AG
-//
-// This file is part of ProtonMail Bridge.
-//
-// ProtonMail Bridge is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// ProtonMail Bridge is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
-
-// credits
-
-import QtQuick 2.8
-import BridgeUI 1.0
-import ProtonUI 1.0
-
-Item {
-    Rectangle {
-        id: wrapper
-        anchors.centerIn: parent
-        width: 2*Style.main.width/3
-        height: Style.main.height - 6*Style.dialog.titleSize
-        color: "transparent"
-
-        Flickable {
-            anchors.fill       : wrapper
-            contentWidth       : wrapper.width
-            contentHeight      : content.height
-            flickableDirection : Flickable.VerticalFlick
-            clip               : true
-
-
-            Column {
-                id: content
-                anchors.top: parent.top
-                anchors.horizontalCenter: parent.horizontalCenter
-                width: wrapper.width
-                spacing: Style.dialog.spacing
-
-                AccessibleText {
-                    visible: go.changelog != ""
-                    anchors {
-                        left: parent.left
-                    }
-                    font.bold: true
-                    font.pointSize: Style.main.fontSize * Style.pt
-                    color: Style.main.text
-                    text: qsTr("Release notes", "list of release notes for this version of the app") + ":"
-                }
-
-                AccessibleSelectableText {
-                    anchors {
-                        left: parent.left
-                        leftMargin: Style.main.leftMargin
-                    }
-                    font {
-                        pointSize : Style.main.fontSize * Style.pt
-                    }
-                    width: wrapper.width - anchors.leftMargin
-                    onLinkActivated: {
-                        Qt.openUrlExternally(link)
-                    }
-                    wrapMode: Text.Wrap
-                    color: Style.main.text
-                    text: go.changelog
-                }
-
-                AccessibleText {
-                    visible: go.bugfixes != ""
-                    anchors {
-                        left: parent.left
-                    }
-                    font.bold: true
-                    font.pointSize: Style.main.fontSize * Style.pt
-                    color: Style.main.text
-                    text: qsTr("Fixed bugs", "list of bugs fixed for this version of the app") + ":"
-                }
-
-                AccessibleSelectableText {
-                    visible: go.bugfixes!=""
-                    anchors {
-                        left: parent.left
-                        leftMargin: Style.main.leftMargin
-                    }
-                    font {
-                        pointSize : Style.main.fontSize * Style.pt
-                    }
-                    width: wrapper.width - anchors.leftMargin
-                    onLinkActivated: {
-                        Qt.openUrlExternally(link)
-                    }
-                    wrapMode: Text.Wrap
-                    color: Style.main.text
-                    text: go.bugfixes
-                }
-
-                Rectangle{id:spacer; color:Style.transparent; width: Style.main.dummy; height: buttonClose.height}
-
-                ButtonRounded {
-                    id: buttonClose
-                    anchors.horizontalCenter: content.horizontalCenter
-                    text: qsTr("Close")
-                    onClicked: {
-                        dialogVersionInfo.hide()
-                    }
-                }
-
-
-                AccessibleSelectableText {
-                    anchors.horizontalCenter: content.horizontalCenter
-                    font {
-                        pointSize : Style.main.fontSize * Style.pt
-                    }
-                    color: Style.main.textDisabled
-                    text: "\n Current: "+go.fullversion
-                }
-            }
-        }
-    }
-}

internal/frontend/qml/BridgeUI/qmldir

@@ -2,6 +2,7 @@ module BridgeUI
 AccountDelegate    1.0 AccountDelegate.qml
 Credits            1.0 Credits.qml
 DialogFirstStart   1.0 DialogFirstStart.qml
+DialogKeychainChange 1.0 DialogKeychainChange.qml
 DialogPortChange   1.0 DialogPortChange.qml
 DialogYesNo        1.0 DialogYesNo.qml
 DialogTLSCertInfo  1.0 DialogTLSCertInfo.qml
@@ -12,4 +13,3 @@ ManualWindow       1.0 ManualWindow.qml
 OutgoingNoEncPopup 1.0 OutgoingNoEncPopup.qml
 SettingsView       1.0 SettingsView.qml
 StatusFooter       1.0 StatusFooter.qml
-VersionInfo        1.0 VersionInfo.qml

internal/frontend/qml/Gui.qml

@@ -54,13 +54,15 @@ Item {
     onWarningFlagsChanged : {
         if (gui.warningFlags==Style.okInfoBar) {
             go.normalSystray()
-        } else {
-            if ((gui.warningFlags & Style.errorInfoBar) == Style.errorInfoBar) {
-                go.errorSystray()
-            } else {
-                go.highlightSystray()
-            }
+            return
         }
+
+        if ((gui.warningFlags & Style.errorInfoBar) == Style.errorInfoBar) {
+            go.errorSystray()
+            return
+        }
+
+        go.highlightSystray()
     }
 
     // Signals from Go
@@ -105,25 +107,53 @@ Item {
             gui.openMainWindow(false)
             if (go.isConnectionOK) {
                 if( winMain.updateState=="noInternet") {
-                    go.setUpdateState("upToDate")
+                    go.updateState = "upToDate"
                 }
             } else {
-                go.setUpdateState("noInternet")
+                go.updateState = "noInternet"
             }
         }
 
-        onRunCheckVersion : {
-            gui.openMainWindow(false)
-            go.setUpdateState("upToDate")
-            winMain.dialogGlobal.state="checkUpdates"
-            winMain.dialogGlobal.show()
-            go.isNewVersionAvailable(showMessage)
-        }
+        onUpdateStateChanged : {
+            // Update tray icon if needed
+            switch (go.updateState) {
+                case "internetCheck":
+                    break;
+                case "noInternet" :
+                    gui.warningFlags |= Style.warnInfoBar
+                    break;
+                case "oldVersion":
+                    gui.warningFlags |= Style.warnInfoBar
+                    break;
+                case "forceUpdate":
+                    // Force update should presist once it happened and never be overwritten.
+                    // That means that tray icon should allways remain in error state.
+                    // But since we have only two sources of error icon in tray (force update 
+                    // + installation fail) and both are unrecoverable and we do not ever remove
+                    // error flag from gui.warningFlags - it is ok to rely on gui.warningFlags and
+                    // not on winMain.updateState (which presist forceUpdate)
+                    gui.warningFlags |= Style.errorInfoBar
+                    break;
+                case "upToDate":
+                    gui.warningFlags &= ~Style.warnInfoBar
+                    break;
+                case "updateRestart":
+                    gui.warningFlags |= Style.warnInfoBar
+                    break;
+                case "updateError":
+                    gui.warningFlags |= Style.errorInfoBar
+                    break;
+                default :
+                    break;
+            }
 
-        onSetUpdateState : {
+            // if main window is closed - most probably it is destroyed (see closeMainWindow())
+            if (winMain == null) {
+                return
+            }
             // once app is outdated prevent from state change
             if (winMain.updateState != "forceUpdate") {
-                winMain.updateState = updateState
+                winMain.updateState = go.updateState
             }
         }
 
@@ -134,13 +164,43 @@ Item {
             go.silentBubble(2,qsTr("You have the latest version!", "notification", -1))
         }
 
-        onNotifyUpdate : {
-            go.setUpdateState("forceUpdate")
+        onNotifyManualUpdate: {
+            go.updateState = "oldVersion"
+        }
+
+        onNotifyManualUpdateRestartNeeded: {
             if (!winMain.dialogUpdate.visible) {
-                gui.openMainWindow(true)
-                go.runCheckVersion(false)
                 winMain.dialogUpdate.show()
             }
+            go.updateState = "updateRestart"
+            winMain.dialogUpdate.finished(false)
+
+            // after manual update - just retart immidiatly
+            go.setToRestart()
+            Qt.quit()
+        }
+
+        onNotifyManualUpdateError: {
+            if (!winMain.dialogUpdate.visible) {
+                winMain.dialogUpdate.show()
+            }
+            go.updateState = "updateError"
+            winMain.dialogUpdate.finished(true)
+        }
+
+        onNotifyForceUpdate : {
+            go.updateState = "forceUpdate"
+            if (!winMain.dialogUpdate.visible) {
+                winMain.dialogUpdate.show()
+            }
+        }
+
+        onNotifySilentUpdateRestartNeeded: {
+            go.updateState = "updateRestart"
+        }
+
+        onNotifySilentUpdateError: {
+            go.updateState = "updateError"
         }
 
         onNotifyLogout : {
@@ -229,25 +289,16 @@ Item {
             outgoingNoEncPopup.y = y
         }
 
-        onUpdateFinished : {
-            winMain.dialogUpdate.finished(hasError)
-        }
-
         onShowCertIssue : {
             winMain.tlsBarState="notOK"
         }
 
+        onOpenReleaseNotesExternally: {
+            Qt.openUrlExternally(go.updateReleaseNotesLink)
+        }
 
     }
 
-    Timer {
-        id: checkVersionTimer
-        repeat : true
-        triggeredOnStart: false
-        interval : Style.main.verCheckRepeatTime
-        onTriggered : go.runCheckVersion(false)
-    }
-
     function openMainWindow(showAndRise) {
         // wait and check until font is loaded
         while(true){
@@ -268,9 +319,17 @@ Item {
         if (showAndRise) {
             gui.winMain.showAndRise()
         }
+
+        // restore update notification bar: trigger updateStateChanged
+        var tmp = go.updateState
+        go.updateState = ""
+        go.updateState = tmp
     }
 
     function closeMainWindow () {
+        // Historical reasons: once upon a time there was a report about high GPU
+        // usage on MacOS while bridge is closed. Legends say that destroying 
+        // MainWindow solved this.
         gui.winMain.hide()
         gui.winMain.destroy(5000)
         gui.winMain = null
@@ -287,6 +346,15 @@ Item {
         winMain.bubbleNote.show()
     }
 
+    function openReleaseNotes(){
+        if (go.updateReleaseNotesLink == "") {
+            go.checkAndOpenReleaseNotes()
+            return
+        }
+        go.openReleaseNotesExternally()
+    }
+
+
     // On start
     Component.onCompleted : {
         // set  messages for translations
@@ -299,17 +367,12 @@ Item {
         go.failedAutostart        = qsTr("Unable to configure automatic start."                           , "notification", -1)
         go.genericErrSeeLogs      = qsTr("An error happened during procedure. See logs for more details." , "notification", -1)
 
+        go.guiIsReady()
+
         // start window
         gui.openMainWindow(false)
-        checkVersionTimer.start()
         if (go.isShownOnStart) {
             gui.winMain.showAndRise()
         }
-        go.runCheckVersion(false)
-
-        if (go.isFreshVersion) {
-            go.getLocalVersionInfo()
-            gui.winMain.dialogVersionInfo.show()
-        }
     }
 }

internal/frontend/qml/GuiIE.qml

@@ -30,7 +30,6 @@ Item {
     id: gui
     property alias winMain: winMain
     property bool isFirstWindow: true
-    property int warningFlags: 0
 
     property var locale    : Qt.locale("en_US")
     property date netBday  : new Date("1989-03-13T00:00:00")
@@ -38,7 +37,7 @@ Item {
     property var allMonths : getMonthList(1,12)
     property var allDays   : getDayList(1,31)
 
-    property var enums : JSON.parse('{"pathOK":1,"pathEmptyPath":2,"pathWrongPath":4,"pathNotADir":8,"pathWrongPermissions":16,"pathDirEmpty":32,"errUnknownError":0,"errEventAPILogout":1,"errUpdateAPI":2,"errUpdateJSON":3,"errUserAuth":4,"errQApplication":18,"errEmailExportFailed":6,"errEmailExportMissing":7,"errNothingToImport":8,"errEmailImportFailed":12,"errDraftImportFailed":13,"errDraftLabelFailed":14,"errEncryptMessageAttachment":15,"errEncryptMessage":16,"errNoInternetWhileImport":17,"errUnlockUser":5,"errSourceMessageNotSelected":19,"errCannotParseMail":5000,"errWrongLoginOrPassword":5001,"errWrongServerPathOrPort":5002,"errWrongAuthMethod":5003,"errIMAPFetchFailed":5004,"errLocalSourceLoadFailed":1000,"errPMLoadFailed":1001,"errRemoteSourceLoadFailed":1002,"errLoadAccountList":1005,"errExit":1006,"errRetry":1007,"errAsk":1008,"errImportFailed":1009,"errCreateLabelFailed":1010,"errCreateFolderFailed":1011,"errUpdateLabelFailed":1012,"errUpdateFolderFailed":1013,"errFillFolderName":1014,"errSelectFolderColor":1015,"errNoInternet":1016,"folderTypeSystem":"system","folderTypeLabel":"label","folderTypeFolder":"folder","folderTypeExternal":"external","progressInit":"init","progressLooping":"looping","statusNoInternet":"noInternet","statusCheckingInternet":"internetCheck","statusNewVersionAvailable":"oldVersion","statusUpToDate":"upToDate","statusForceUpdate":"forceupdate"}')
+    property var enums : JSON.parse('{"pathOK":1,"pathEmptyPath":2,"pathWrongPath":4,"pathNotADir":8,"pathWrongPermissions":16,"pathDirEmpty":32,"errUnknownError":0,"errEventAPILogout":1,"errUpdateAPI":2,"errUpdateJSON":3,"errUserAuth":4,"errQApplication":18,"errEmailExportFailed":6,"errEmailExportMissing":7,"errNothingToImport":8,"errEmailImportFailed":12,"errDraftImportFailed":13,"errDraftLabelFailed":14,"errEncryptMessageAttachment":15,"errEncryptMessage":16,"errNoInternetWhileImport":17,"errUnlockUser":5,"errSourceMessageNotSelected":19,"errCannotParseMail":5000,"errWrongLoginOrPassword":5001,"errWrongServerPathOrPort":5002,"errWrongAuthMethod":5003,"errIMAPFetchFailed":5004,"errLocalSourceLoadFailed":1000,"errPMLoadFailed":1001,"errRemoteSourceLoadFailed":1002,"errLoadAccountList":1005,"errExit":1006,"errRetry":1007,"errAsk":1008,"errImportFailed":1009,"errCreateLabelFailed":1010,"errCreateFolderFailed":1011,"errUpdateLabelFailed":1012,"errUpdateFolderFailed":1013,"errFillFolderName":1014,"errSelectFolderColor":1015,"errNoInternet":1016,"folderTypeSystem":"system","folderTypeLabel":"label","folderTypeFolder":"folder","folderTypeExternal":"external","progressInit":"init","progressLooping":"looping","statusNoInternet":"noInternet","statusCheckingInternet":"internetCheck","statusNewVersionAvailable":"oldVersion","statusUpToDate":"upToDate","statusForceUpdate":"forceUpdate"}')
 
     IEStyle{}
 
@@ -69,20 +68,9 @@ Item {
     Connections {
         target: go
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+        onShowWindow : {
+            winMain.showAndRise()
+        }
 
         onProcessFinished :  {
             winMain.dialogAddUser.hide()
@@ -107,24 +95,17 @@ Item {
             go.isConnectionOK = isAvailable
             if (go.isConnectionOK) {
                 if( winMain.updateState==gui.enums.statusNoInternet) {
-                    go.setUpdateState(gui.enums.statusUpToDate)
+                    go.updateState = gui.enums.statusUpToDate
                 }
             } else {
-                go.setUpdateState(gui.enums.statusNoInternet)
+                go.updateState = gui.enums.statusNoInternet
             }
         }
 
-        onRunCheckVersion : {
-            go.setUpdateState(gui.enums.statusUpToDate)
-            winMain.dialogGlobal.state=gui.enums.statusCheckingInternet
-            winMain.dialogGlobal.show()
-            go.isNewVersionAvailable(showMessage)
-        }
-
-        onSetUpdateState : {
+        onUpdateStateChanged : {
             // once app is outdated prevent from state change
-            if (winMain.updateState != gui.enums.statusForceUpdate) {
-                winMain.updateState = updateState
+            if (winMain.updateState != "forceUpdate") {
+                winMain.updateState = go.updateState
             }
         }
 
@@ -224,15 +205,45 @@ Item {
             }
         }
 
-        onNotifyUpdate : {
-            go.setUpdateState("forceUpdate")
+        onNotifyManualUpdate: {
+            go.updateState = "oldVersion"
+        }
+
+        onNotifyManualUpdateRestartNeeded: {
+            if (!winMain.dialogUpdate.visible) {
+                winMain.dialogUpdate.show()
+            }
+            go.updateState = "updateRestart"
+            winMain.dialogUpdate.finished(false)
+        
+            // after manual update - just retart immidiatly
+            go.setToRestart()
+            Qt.quit()
+        }
+
+        onNotifyManualUpdateError: {
+            if (!winMain.dialogUpdate.visible) {
+                winMain.dialogUpdate.show()
+            }
+            go.updateState = "updateError"
+            winMain.dialogUpdate.finished(true)
+        }
+
+        onNotifyForceUpdate : {
+            go.updateState = "forceUpdate"
             if (!winMain.dialogUpdate.visible) {
-                gui.openMainWindow(true)
-                go.runCheckVersion(false)
                 winMain.dialogUpdate.show()
             }
         }
 
+        //onNotifySilentUpdateRestartNeeded: {
+        //    go.updateState = "updateRestart"
+        //}
+        //
+        //onNotifySilentUpdateError: {
+        //    go.updateState = "updateError"
+        //}
+
         onNotifyLogout : {
             go.notifyBubble(0, qsTr("Account %1 has been disconnected. Please log in to continue to use the Import-Export app with this account.").arg(accname) )
         }
@@ -280,6 +291,12 @@ Item {
         onUpdateFinished : {
             winMain.dialogUpdate.finished(hasError)
         }
+
+        onOpenReleaseNotesExternally: {
+            Qt.openUrlExternally(go.updateReleaseNotesLink)
+        }
+
+
     }
 
     function folderIcon(folderName, folderType) { // translations
@@ -393,14 +410,15 @@ Item {
      }
      */
 
-    Timer {
-        id: checkVersionTimer
-        repeat : true
-        triggeredOnStart: false
-        interval : Style.main.verCheckRepeatTime
-        onTriggered : go.runCheckVersion(false)
+    function openReleaseNotes(){
+        if (go.updateReleaseNotesLink == "") {
+            go.checkAndOpenReleaseNotes()
+            return
+        }
+        go.openReleaseNotesExternally()
     }
 
+
     property string  areYouSureYouWantToQuit : qsTr("There are incomplete processes - some items are not yet transferred. Do you really want to stop and quit?")
     // On start
     Component.onCompleted : {
@@ -413,8 +431,8 @@ Item {
         go.bugNotSent             = qsTr("Unable to submit bug report."                                  , "notification", -1)
         go.bugReportSent          = qsTr("Bug report successfully sent."                                 , "notification", -1)
 
-        go.runCheckVersion(false)
-        checkVersionTimer.start()
+
+        go.guiIsReady()
 
         gui.allMonths = getMonthList(1,12)
         gui.allMonthsChanged()

internal/frontend/qml/ImportExportUI/AccountDelegate.qml

@@ -165,6 +165,7 @@ Column {
             textColor : Style.main.textBlue
             onClicked: {
                 dialogExport.currentIndex = 0
+                dialogExport.account = account
                 dialogExport.address = account
                 dialogExport.show()
             }
@@ -321,6 +322,7 @@ Column {
                         textBold: true
                         textColor: Style.main.textBlue
                         onClicked: {
+                            dialogExport.account = account
                             dialogExport.address = listalias[index]
                             dialogExport.show()
                         }
@@ -339,6 +341,7 @@ Column {
                         textBold: true
                         textColor: enabled ? Style.main.textBlue : Style.main.textDisabled
                         onClicked: {
+                            dialogImport.account = account
                             dialogImport.address = listalias[index]
                             dialogImport.show()
                         }

internal/frontend/qml/ImportExportUI/DialogExport.qml

@@ -35,6 +35,7 @@ Dialog {
 
     title : set_title()
 
+    property string account
     property string address
     property alias finish: finish
 
@@ -408,7 +409,6 @@ Dialog {
 
     onShow: {
         if (winMain.updateState==gui.enums.statusNoInternet) {
-            go.checkInternet()
             if (winMain.updateState==gui.enums.statusNoInternet) {
                 go.notifyError(gui.enums.errNoInternet)
                 root.hide()
@@ -428,7 +428,7 @@ Dialog {
         onTriggered : {
             switch (currentIndex) {
                 case 0:
-                go.loadStructureForExport(root.address)
+                go.loadStructureForExport(root.account, root.address)
                 sourceFoldersInput.hasItems = (transferRules.rowCount() > 0)
                 break
                 case 2:

internal/frontend/qml/ImportExportUI/DialogImport.qml

@@ -34,6 +34,7 @@ Dialog {
 
     isDialogBusy: currentIndex==3 || currentIndex==4
 
+    property string account
     property string address
     property string inputPath  : ""
     property bool   isFromFile : inputEmail.text == "" && root.inputPath != ""
@@ -856,14 +857,12 @@ Dialog {
                 inputPort     . checkIsANumber()
                 //emailProvider . currentIndex!=0
             )) isOK = false
-            go.checkInternet()
             if (winMain.updateState == gui.enums.statusNoInternet) { // todo: use main error dialog for this
                 errorPopup.show(qsTr("Please check your internet connection."))
                 return false
             }
             break
             case 2: // loading structure
-            go.checkInternet()
             if (winMain.updateState == gui.enums.statusNoInternet) {
                 errorPopup.show(qsTr("Please check your internet connection."))
                 return false
@@ -948,7 +947,6 @@ Dialog {
     onShow : {
         root.clear()
         if (winMain.updateState==gui.enums.statusNoInternet) {
-            go.checkInternet()
             if (winMain.updateState==gui.enums.statusNoInternet) {
                 winMain.popupMessage.show(go.canNotReachAPI)
                 root.hide()
@@ -1032,6 +1030,7 @@ Dialog {
                     root.isFromIMAP,
                     root.inputPath,
                     inputEmail.text, inputPassword.text, inputServer.text, inputPort.text,
+                    root.account,
                     root.address
                 )
                 break

internal/frontend/qml/ImportExportUI/DialogYesNo.qml

@@ -314,7 +314,6 @@ Dialog {
         // hide all other dialogs
         winMain.dialogAddUser     .visible = false
         winMain.dialogCredits     .visible = false
-        //winMain.dialogVersionInfo .visible = false
         // dialogFirstStart should reappear again after closing global
         root.visible = true
     }
@@ -342,7 +341,7 @@ Dialog {
             if ( state == "toggleAutoStart" ) { go.toggleAutoStart     ()      }
             if ( state == "quit"            ) { Qt.quit                ()      }
             if ( state == "instance exists" ) { Qt.quit                ()      }
-            if ( state == "checkUpdates"    ) { go.runCheckVersion     (true)  }
+            if ( state == "checkUpdates"    ) { }
         }
     }
 

internal/frontend/qml/ImportExportUI/HelpView.qml

@@ -55,9 +55,7 @@ Item {
                 rightIcon.text : Style.fa.chevron_circle_right
                 rightIcon.font.pointSize : Style.settings.toggleSize * Style.pt
                 onClicked: {
-                    dialogGlobal.state="checkUpdates"
-                    dialogGlobal.show()
-                    dialogGlobal.confirmed()
+                    go.checkForUpdates()
                 }
             }
 
@@ -83,7 +81,7 @@ Item {
                     color: Style.main.textDisabled
                     horizontalAlignment: Qt.AlignHCenter
                     font.pointSize :  Style.main.fontSize * Style.pt
-                    text: "ProtonMail Import-Export app Version "+go.getBackendVersion()+"\n© 2020 Proton Technologies AG"
+                    text: "ProtonMail Import-Export app Version "+go.getBackendVersion()+"\n© 2021 Proton Technologies AG"
                 }
             }
 
@@ -115,7 +113,7 @@ Item {
                     MouseArea {
                         anchors.fill: parent
                         onClicked : {
-                        go.openLicenseFile()
+                            go.openLicenseFile()
                         }
                         cursorShape: Qt.PointingHandCursor
                     }
@@ -129,10 +127,7 @@ Item {
                     font.underline: true
                     MouseArea {
                         anchors.fill: parent
-                        onClicked : {
-                            go.getLocalVersionInfo()
-                            winMain.dialogVersionInfo.show()
-                        }
+                        onClicked : gui.openReleaseNotes()
                         cursorShape: Qt.PointingHandCursor
                     }
                 }

internal/frontend/qml/ImportExportUI/MainWindow.qml

@@ -34,7 +34,6 @@ Window {
     property alias dialogAddUser     : dialogAddUser
     property alias dialogGlobal      : dialogGlobal
     property alias dialogCredits     : dialogCredits
-    property alias dialogVersionInfo : dialogVersionInfo
     property alias dialogUpdate      : dialogUpdate
     property alias popupMessage      : popupMessage
     property alias popupFolderEdit   : popupFolderEdit
@@ -56,12 +55,11 @@ Window {
     minimumWidth  : Style.main.width
     minimumHeight : Style.main.height
 
-    property bool isOutdateVersion : root.updateState == "forceUpgrade"
+    property bool isOutdateVersion : root.updateState == "forceUpdate"
 
     property bool activeContent :
     !dialogAddUser     .visible &&
     !dialogCredits     .visible &&
-    !dialogVersionInfo .visible &&
     !dialogGlobal      .visible &&
     !dialogUpdate      .visible &&
     !dialogImport      .visible &&
@@ -254,40 +252,7 @@ Window {
 
     DialogUpdate {
         id: dialogUpdate
-
-        title: root.isOutdateVersion ?
-        qsTr("%1 is outdated", "title of outdate dialog").arg(go.programTitle):
-        qsTr("%1 update to %2", "title of update dialog").arg(go.programTitle).arg(go.newversion)
-        introductionText: {
-            if (root.isOutdateVersion) {
-                if (go.goos=="linux") {
-                    return qsTr('You are using an outdated version of our software.<br>
-                    Please dowload and install the latest version to continue using %1.<br><br>
-                    <a href="%2">%2</a>',
-                    "Message for force-update in Linux").arg(go.programTitle).arg(go.landingPage)
-                } else {
-                    return qsTr('You are using an outdated version of our software.<br>
-                    Please dowload and install the latest version to continue using %1.<br><br>
-                    You can continue with update or download and install the new version manually from<br><br>
-                    <a href="%2">%2</a>',
-                    "Message for force-update in Win/Mac").arg(go.programTitle).arg(go.landingPage)
-                }
-            } else {
-                if (go.goos=="linux") {
-                    return qsTr('A new version of %1 is available.<br>
-                    Check <a href="%2">release notes</a> to learn what is new in %3.<br>
-                    Use your package manager to update or download and install new the version manually from<br><br>
-                    <a href="%4">%4</a>',
-                    "Message for update in Linux").arg(go.programTitle).arg("releaseNotes").arg(go.newversion).arg(go.landingPage)
-                } else {
-                    return qsTr('A new version of %1 is available.<br>
-                    Check <a href="%2">release notes</a> to learn what is new in %3.<br>
-                    You can continue with update or download and install new the version manually from<br><br>
-                    <a href="%4">%4</a>',
-                    "Message for update in Win/Mac").arg(go.programTitle).arg("releaseNotes").arg(go.newversion).arg(go.landingPage)
-                }
-            }
-        }
+        forceUpdate: root.isOutdateVersion
     }
 
 
@@ -327,31 +292,6 @@ Window {
         Credits { }
     }
 
-    Dialog {
-        id: dialogVersionInfo
-        anchors {
-            top   : infoBar.bottom
-            bottomMargin: innerWindowBorder
-            leftMargin: innerWindowBorder
-            rightMargin: innerWindowBorder
-        }
-        property bool checkVersion : false
-        title: qsTr("Information about", "title of release notes page") + " v" + go.newversion
-        VersionInfo { }
-        onShow : {
-            // Hide information bar with olde version
-            if ( infoBar.state=="oldVersion" ) {
-                infoBar.state="upToDate"
-                dialogVersionInfo.checkVersion = true
-            }
-        }
-        onHide : {
-            // Reload current version based on online status
-            if (dialogVersionInfo.checkVersion) go.runCheckVersion(false)
-            dialogVersionInfo.checkVersion = false
-        }
-    }
-
     DialogYesNo {
         id: dialogGlobal
         question : ""

internal/frontend/qml/ImportExportUI/SettingsView.qml

@@ -20,17 +20,38 @@
 import QtQuick 2.8
 import ProtonUI 1.0
 import ImportExportUI 1.0
+import QtQuick.Controls 2.4
 
 Item {
     id: root
 
     // must have wrapper
-    Rectangle {
+    ScrollView {
         id: wrapper
         anchors.centerIn: parent
         width: parent.width
         height: parent.height
-        color: Style.main.background
+        background: Rectangle {
+            color: Style.main.background
+        }
+
+        // horizontall scrollbar sometimes showes up when vertical scrollbar coveres content
+        ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
+        ScrollBar.vertical.policy: ScrollBar.AsNeeded
+
+        // keeping vertical scrollbar allways visible when needed
+        Connections {
+            target: wrapper.ScrollBar.vertical
+            onSizeChanged: {
+                // ScrollBar.size == 0 at creating so no need to make it active
+                if (wrapper.ScrollBar.vertical.size < 1.0 && wrapper.ScrollBar.vertical.size > 0 && !wrapper.ScrollBar.vertical.active) {
+                    wrapper.ScrollBar.vertical.active = true
+                }
+            }
+            onActiveChanged: {
+                wrapper.ScrollBar.vertical.active = true
+            }
+        }
 
         // content
         Column {
@@ -77,6 +98,25 @@ Item {
 
             /*
 
+            ButtonIconText {
+                id: autoUpdates
+                text: qsTr("Keep the application up to date", "label for toggle that activates and disables the automatic updates")
+                leftIcon.text  : Style.fa.download
+                rightIcon {
+                    font.pointSize : Style.settings.toggleSize * Style.pt
+                    text  : go.isAutoUpdate!=false ? Style.fa.toggle_on  : Style.fa.toggle_off
+                    color : go.isAutoUpdate!=false ? Style.main.textBlue : Style.main.textDisabled
+                }
+                Accessible.description: (
+                    go.isAutoUpdate == false ?
+                    qsTr("Enable"  , "Click to enable the automatic update of Bridge") :
+                    qsTr("Disable" , "Click to disable the automatic update of Bridge")
+                ) + " " + text
+                onClicked: {
+                    go.toggleAutoUpdate()
+                }
+            }
+
              ButtonIconText {
                  id: cacheClear
                  text: qsTr("Clear Cache")

internal/frontend/qml/ImportExportUI/VersionInfo.qml

@@ -1,125 +0,0 @@
-// Copyright (c) 2021 Proton Technologies AG
-//
-// This file is part of ProtonMail Bridge.
-//
-// ProtonMail Bridge is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// ProtonMail Bridge is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
-
-// credits
-
-import QtQuick 2.8
-import ProtonUI 1.0
-import ImportExportUI 1.0
-
-Item {
-    id: root
-    Rectangle {
-        id: wrapper
-        anchors.centerIn: parent
-        width: 2*Style.main.width/3
-        height: Style.main.height - 6*Style.dialog.titleSize
-        color: "transparent"
-
-        Flickable {
-            anchors.fill       : wrapper
-            contentWidth       : wrapper.width
-            contentHeight      : content.height
-            flickableDirection : Flickable.VerticalFlick
-            clip               : true
-
-
-            Column {
-                id: content
-                anchors.top: parent.top
-                anchors.horizontalCenter: parent.horizontalCenter
-                width: wrapper.width
-                spacing: 5
-
-                Text {
-                    visible: go.changelog != ""
-                    anchors {
-                        left: parent.left
-                    }
-                    font.bold: true
-                    font.pointSize: Style.main.fontSize * Style.pt
-                    color: Style.main.text
-                    text: qsTr("Release notes:")
-                }
-
-                Text {
-                    anchors {
-                        left: parent.left
-                        leftMargin: Style.main.leftMargin
-                    }
-                    font.pointSize: Style.main.fontSize * Style.pt
-                    width: wrapper.width - anchors.leftMargin
-                    wrapMode: Text.Wrap
-                    color: Style.main.text
-                    text: go.changelog
-                }
-
-                Text {
-                    visible: go.bugfixes != ""
-                    anchors {
-                        left: parent.left
-                    }
-                    font.bold: true
-                    font.pointSize: Style.main.fontSize * Style.pt
-                    color: Style.main.text
-                    text: qsTr("Fixed bugs:")
-                }
-
-                Repeater {
-                    anchors.fill: parent
-                    model: go.bugfixes.split(";")
-
-                    Text {
-                        visible: go.bugfixes!=""
-                        anchors {
-                            left: parent.left
-                            leftMargin: Style.main.leftMargin
-                        }
-                        font.pointSize: Style.main.fontSize * Style.pt
-                        width: wrapper.width - anchors.leftMargin
-                        wrapMode: Text.Wrap
-                        color: Style.main.text
-                        text: modelData
-                    }
-                }
-
-                Rectangle{id:spacer; color:"transparent"; width:10; height: buttonClose.height}
-
-
-                ButtonRounded {
-                    id: buttonClose
-                    anchors.horizontalCenter: content.horizontalCenter
-                    text: "Close"
-                    onClicked: {
-                        root.parent.hide()
-                    }
-                }
-
-
-                AccessibleSelectableText {
-                    anchors.horizontalCenter: content.horizontalCenter
-                    font {
-                        pointSize : Style.main.fontSize * Style.pt
-                    }
-                    color: Style.main.textDisabled
-                    text: "\n Current: "+go.fullversion
-                }
-            }
-        }
-    }
-}
-

internal/frontend/qml/ProtonUI/Dialog.qml

@@ -18,6 +18,7 @@
 // Dialog with adding new user
 
 import QtQuick 2.8
+import QtQuick.Controls 2.1
 import QtQuick.Layouts 1.3
 import ProtonUI 1.0
 
@@ -38,6 +39,14 @@ StackLayout {
         visible: root.visible
         z: -1
 
+        // Looks like StackLayout explicatly sets visible=false to all viasual children except selected.
+        // We want this background to be also visible.
+        onVisibleChanged: {
+            if (visible != parent.visible) {
+                visible = parent.visible
+            }
+        }
+
         AccessibleText {
             id: titleText
             anchors {
@@ -75,6 +84,9 @@ StackLayout {
             text : ""
             color: Style.main.textBlue
             visible: false
+            width: root.width
+            horizontalAlignment: Text.AlignHCenter
+            wrapMode: Text.WordWrap
         }
 
         // prevent any action below
@@ -103,6 +115,11 @@ StackLayout {
     Accessible.description: title
     Accessible.focusable: true
 
+    onVisibleChanged: {
+        if (background.visible != visible) {
+            background.visible = visible
+        }
+    }
 
     visible      : false
     anchors {

internal/frontend/qml/ProtonUI/DialogAddUser.qml

@@ -70,7 +70,8 @@ Dialog {
             id: topSep
             color  : "transparent"
             width  : Style.main.dummy
-            height : root.height/2 - (dialogNameAndPassword.heightInputs)/2
+            // Hacky hack: +10 is to make title of Dialog bigger so longer error can fit just fine.
+            height : root.height/2 + 10 - (dialogNameAndPassword.heightInputs)/2
         }
 
         InputField {

internal/frontend/qml/ProtonUI/DialogUpdate.qml

@@ -25,16 +25,17 @@ import ProtonUI 1.0
 Dialog {
     id: root
 
-    title: "Bridge update "+go.newversion
-
-    property alias introductionText : introduction.text
     property bool hasError : false
+    property bool forceUpdate : false
 
     signal cancel()
     signal okay()
 
+    title: forceUpdate ?
+        qsTr("Update %1 now", "title of force update dialog").arg(go.programTitle):
+        qsTr("Update to %1 %2", "title of normal update dialog").arg(go.programTitle).arg(go.updateVersion)
 
-    isDialogBusy: currentIndex==1
+    isDialogBusy: currentIndex==1 || forceUpdate
 
     Rectangle { // 0: Release notes and confirm
         width: parent.width
@@ -51,24 +52,46 @@ Dialog {
                 color: Style.dialog.text
                 linkColor: Style.dialog.textBlue
                 font {
-                    pointSize: 0.8 * Style.dialog.fontSize * Style.pt
+                    pointSize: Style.dialog.fontSize * Style.pt
                 }
                 width: 2*root.width/3
                 horizontalAlignment: Text.AlignHCenter
                 wrapMode: Text.Wrap
 
-                // customize message per application
-                text: ' <a href="%1">Release notes</a><br> New version %2<br> <br><br> <a href="%3">%3</a>'
+                text: {
+                    if (forceUpdate) {
+                        if (go.updateCanInstall) {
+                            return qsTr('You need to update this app to continue using it.<br>
+                                Update now or manually download the most recent version here:<br>
+                                <a href="%1">%1</a><br>
+                                <a href="https://protonmail.com/support/knowledge-base/update-required/">Learn why</a> you need to update',
+                                "Message for force-update").arg(go.updateLandingPage)
+                        } else {
+                            return qsTr('You need to update this app to continue using it.<br>
+                                Download the most recent version here:<br>
+                                <a href="%1">%1</a><br>
+                                <a href="https://protonmail.com/support/knowledge-base/update-required/">Learn why</a> you need to update',
+                                "Message for force-update").arg(go.updateLandingPage)
+                        }
+                    }
+
+                    if (go.updateCanInstall) {
+                        return qsTr('Update to the newest version or download it from:<br>
+                            <a href="%1">%1</a><br>
+                            <a href="%2">View release notes</a>',
+                            "Message for manual update").arg(go.updateLandingPage).arg(go.updateReleaseNotesLink)
+                    } else {
+                         return qsTr('Update to the newest version from:<br>
+                            <a href="%1">%1</a><br>
+                            <a href="%2">View release notes</a>',
+                            "Message for manual update").arg(go.updateLandingPage).arg(go.updateReleaseNotesLink)
+                    }
+                }
+                
 
                 onLinkActivated : {
                     console.log("clicked link:", link)
-                    if (link == "releaseNotes"){
-                        root.hide()
-                        winMain.dialogVersionInfo.show()
-                    } else {
-                        root.hide()
-                        Qt.openUrlExternally(link)
-                    }
+                    Qt.openUrlExternally(link)
                 }
 
                 MouseArea {
@@ -78,21 +101,30 @@ Dialog {
                 }
             }
 
+            CheckBoxLabel {
+                id: autoUpdate
+                anchors.horizontalCenter: parent.horizontalCenter
+                text: qsTr("Automatically update in the future", "Checkbox label for using autoupdates later on")
+                checked: go.isAutoUpdate
+                onToggled: go.toggleAutoUpdate()
+                visible: !root.forceUpdate && (go.isAutoUpdate != undefined)
+            }
+
             Row {
                 anchors.horizontalCenter: parent.horizontalCenter
                 spacing: Style.dialog.spacing
 
                 ButtonRounded {
                     fa_icon: Style.fa.times
-                    text: (go.goos=="linux" ? qsTr("Okay") : qsTr("Cancel"))
+                    text: root.forceUpdate ? qsTr("Quit") : qsTr("Cancel")
                     color_main: Style.dialog.text
-                    onClicked: root.cancel()
+                    onClicked: root.forceUpdate ? Qt.quit() : root.cancel()
                 }
 
                 ButtonRounded {
                     fa_icon: Style.fa.check
                     text: qsTr("Update")
-                    visible: go.goos!="linux"
+                    visible: go.updateCanInstall
                     color_main: Style.dialog.text
                     color_minor: Style.main.textBlue
                     isOpaque: true
@@ -102,7 +134,7 @@ Dialog {
         }
     }
 
-    Rectangle { // 0: Check / download / unpack / prepare
+    Rectangle { // 1: Installing update
         id: updateStatus
         width: parent.width
         height: parent.height
@@ -121,35 +153,29 @@ Dialog {
                 width: 2*root.width/3
                 horizontalAlignment: Text.AlignHCenter
                 wrapMode: Text.Wrap
-                text: {
-                    switch (go.progressDescription) {
-                        case "1": return qsTr("Checking the current version.")
-                        case "2": return qsTr("Downloading the update files.")
-                        case "3": return qsTr("Verifying the update files.")
-                        case "4": return qsTr("Unpacking the update files.")
-                        case "5": return qsTr("Starting the update.")
-                        case "6": return qsTr("Quitting the application.")
-                        default: return ""
-                    }
-                }
+                text:  qsTr("Updating...") 
             }
 
             ProgressBar {
-                id: progressbar
-                implicitWidth  : 2*updateStatus.width/3
-                implicitHeight : Style.exporting.rowHeight
-                visible: go.progress!=0 // hack hide animation when clearing out progress bar
-                value: go.progress
-                property int current:  go.total * go.progress
-                property bool isFinished:  finishedPartBar.width == progressbar.width
+                id: updateProgressBar
+                width: 2*updateStatus.width/3
+                height: Style.exporting.rowHeight
+                //implicitWidth  : 2*updateStatus.width/3
+                //implicitHeight : Style.exporting.rowHeight
+                indeterminate: true
+                //value: 0.5
+                //property int current:  go.total * go.progress
+                //property bool isFinished:  finishedPartBar.width == progressbar.width
                 background: Rectangle {
                     radius         : Style.exporting.boxRadius
                     color          : Style.exporting.progressBackground
                 }
+
                 contentItem: Item {
+                    clip: true
                     Rectangle {
-                        id: finishedPartBar
-                        width  : parent.width * progressbar.visualPosition
+                        id: progressIndicator
+                        width  : updateProgressBar.indeterminate ? 50 : parent.width * updateProgressBar.visualPosition
                         height : parent.height
                         radius : Style.exporting.boxRadius
                         gradient  : Gradient {
@@ -161,6 +187,27 @@ Dialog {
                         Behavior on width {
                             NumberAnimation { duration:300;  easing.type: Easing.InOutQuad }
                         }
+
+                        SequentialAnimation {
+                            running: updateProgressBar.visible && updateProgressBar.indeterminate
+                            loops: Animation.Infinite
+
+                            SmoothedAnimation { 
+                                target: progressIndicator
+                                property: "x"
+                                from: 0
+                                to: updateProgressBar.width - progressIndicator.width
+                                duration: 2000 
+                            }
+
+                            SmoothedAnimation { 
+                                target: progressIndicator
+                                property: "x"
+                                from: updateProgressBar.width - progressIndicator.width
+                                to: 0
+                                duration: 2000 
+                            }
+                        }
                     }
                     Text {
                         anchors.centerIn: parent
@@ -175,7 +222,7 @@ Dialog {
         }
     }
 
-    Rectangle { // 1: Something went wrong / All ok, closing bridge
+    Rectangle { // 2: Something went wrong / All ok, closing bridge
         width: parent.width
         height: parent.height
         color: Style.transparent
@@ -193,8 +240,8 @@ Dialog {
                 width: 2*root.width/3
                 horizontalAlignment: Text.AlignHCenter
                 wrapMode: Text.Wrap
-                text: !root.hasError ?  qsTr('Application will quit now to finish the update.', "message after successful update") :
-                qsTr('<b>The update procedure was not successful!</b><br>Please follow the download link and update manually. <br><br><a href="%1">%1</a>').arg(go.downloadLink)
+                text: !root.hasError ?  qsTr('%1 will restart now to finish the update.', "message after successful update").arg(go.programTitle) :
+                qsTr('<b>The update procedure was not successful!</b><br>Please follow the download link and update manually. <br><br><a href="%1">%1</a>').arg(go.updateLandingPage)
 
                 onLinkActivated : {
                     console.log("clicked link:", link)
@@ -225,7 +272,7 @@ Dialog {
 
     function finished(hasError) {
         root.hasError = hasError
-        root.incrementCurrentIndex()
+        root.currentIndex = 2
     }
 
     onShow: {
@@ -239,9 +286,10 @@ Dialog {
     onOkay: {
         switch (root.currentIndex) {
             case 0:
-            go.startUpdate()
+                go.startManualUpdate()
+                root.currentIndex = 1
+                break
         }
-        root.incrementCurrentIndex()
     }
 
     onCancel: {

internal/frontend/qml/ProtonUI/InformationBar.qml

@@ -25,34 +25,14 @@ import ProtonUI 1.0
 Rectangle {
     id: root
     property var iTry: 0
-    property var secLeft: 0
     property var second: 1000 // convert millisecond to second
-    property var checkInterval: [ 5, 10, 30, 60, 120, 300, 600 ] // seconds
     property bool isVisible: true
     property var fontSize : 1.2 * Style.main.fontSize
     color : "black"
     state: "upToDate"
 
-    Timer {
-        id: retryInternet
-        interval: second
-        triggeredOnStart: false
-        repeat: true
-        onTriggered : {
-            secLeft--
-            if (secLeft <= 0) {
-                retryInternet.stop()
-                go.checkInternet()
-                if (iTry < checkInterval.length-1) {
-                    iTry++
-                }
-                secLeft=checkInterval[iTry]
-                retryInternet.start()
-            }
-        }
-    }
-
     Row {
+        id: messageRow
         anchors.centerIn: root
         visible: root.isVisible
         spacing: Style.main.leftMarginButton
@@ -63,98 +43,65 @@ Rectangle {
         }
 
         ClickIconText {
+            id: linkText
             anchors.verticalCenter : message.verticalCenter
-            text      : "("+go.newversion+" " + qsTr("release notes", "display the release notes from the new version")+")"
-            visible   : root.state=="oldVersion" && ( go.changelog!="" || go.bugfixes!="")
-            iconText  : ""
-            onClicked : {
-                dialogVersionInfo.show()
-            }
+            iconText  : " "
             fontSize : root.fontSize
+            textUnderline: true
         }
 
         ClickIconText {
+            id: actionText
             anchors.verticalCenter : message.verticalCenter
-            text : root.state=="oldVersion" || root.state == "forceUpdate" ?
-            qsTr("Update", "click to update to a new version when one is available") :
-            qsTr("Retry now", "click to try to connect to the internet when the app is disconnected from the internet")
-            visible   : root.state!="internetCheck"
-            iconText  : ""
-            onClicked : {
-                if (root.state=="oldVersion" || root.state=="forceUpdate" ) {
-                    winMain.dialogUpdate.show()
-                } else {
-                    go.checkInternet()
-                }
-            }
+            iconText  : " "
             fontSize : root.fontSize
             textUnderline: true
         }
         Text {
+            id: separatorText
             anchors.baseline : message.baseline
             color: Style.main.text
             font {
                 pointSize : root.fontSize * Style.pt
                 bold      : true
             }
-            visible: root.state=="oldVersion" || root.state=="noInternet"
-            text : "|"
         }
         ClickIconText {
+            id: action2Text
             anchors.verticalCenter : message.verticalCenter
             iconText  : ""
-            text      : root.state == "noInternet" ?
-            qsTr("Troubleshoot", "Show modal screen with additional tips for troubleshooting connection issues") :
-            qsTr("Remind me later", "Do not install new version and dismiss a notification")
-            visible   : root.state=="oldVersion" || root.state=="noInternet"
-            onClicked : {
-                if (root.state == "oldVersion") {
-                    root.state = "upToDate"
-                }
-                if (root.state == "noInternet") {
-                    dialogConnectionTroubleshoot.show()
-                }
-            }
             fontSize : root.fontSize
             textUnderline: true
         }
     }
 
-    onStateChanged : {
-        switch (root.state) {
-            case "forceUpdate" :
-            gui.warningFlags |= Style.errorInfoBar
-            break;
-            case "upToDate" :
-            gui.warningFlags &= ~Style.warnInfoBar
-            iTry = 0
-            secLeft=checkInterval[iTry]
-            break;
-            case "noInternet" :
-            gui.warningFlags |= Style.warnInfoBar
-            retryInternet.start()
-            secLeft=checkInterval[iTry]
-            break;
-            default :
-            gui.warningFlags |= Style.warnInfoBar
-        }
-
-        if (root.state!="noInternet") {
-            retryInternet.stop()
-        }
+    ClickIconText {
+        id: closeSign
+        anchors.verticalCenter : messageRow.verticalCenter
+        anchors.right: root.right
+        iconText  : Style.fa.close
+        fontSize : root.fontSize
+        textUnderline: true
     }
 
-    function timeToRetry() {
-        if (secLeft==1){
-            return qsTr("a second", "time to wait till internet connection is retried")
-        } else if (secLeft<60){
-            return secLeft + " " + qsTr("seconds", "time to wait till internet connection is retried")
-        } else {
-            var leading = ""+secLeft%60
-            if (leading.length < 2) {
-                leading = "0" + leading
-            }
-            return Math.floor(secLeft/60) + ":" + leading
+    onStateChanged : {
+        switch (root.state) {
+            case "internetCheck":
+                break;
+            case "noInternet" :
+                break;
+            case "oldVersion":
+                break;
+            case "forceUpdate":
+                break;
+            case "upToDate":
+                break;
+            case "updateRestart":
+                break;
+            case "updateError":
+                break;
+            default :
+                break;
         }
     }
 
@@ -172,6 +119,26 @@ Rectangle {
                 color: Style.main.background
                 text: qsTr("Checking connection. Please wait...", "displayed after user retries internet connection")
             }
+            PropertyChanges {
+                target: linkText
+                visible: false
+            }
+            PropertyChanges {
+                target: actionText
+                visible: false
+            }
+            PropertyChanges {
+                target: separatorText
+                visible: false
+            }
+            PropertyChanges {
+                target: action2Text
+                visible: false
+            }
+            PropertyChanges {
+                target: closeSign
+                visible: false
+            }
         },
         State {
             name: "noInternet"
@@ -184,7 +151,28 @@ Rectangle {
             PropertyChanges {
                 target: message
                 color: Style.main.line
-                text: qsTr("Cannot contact server. Retrying in ", "displayed when the app is disconnected from the internet or server has problems")+timeToRetry()+"."
+                text: qsTr("Cannot contact server. Please wait...", "displayed when the app is disconnected from the internet or server has problems")
+            }
+            PropertyChanges {
+                target: linkText
+                visible: false
+            }
+            PropertyChanges {
+                target: separatorText
+                visible: false
+                text: "|"
+            }
+            PropertyChanges {
+                target: action2Text
+                visible: true
+                text: qsTr("Troubleshoot", "Show modal screen with additional tips for troubleshooting connection issues")
+                onClicked: {
+                    dialogConnectionTroubleshoot.show()
+                }
+            }
+            PropertyChanges {
+                target: closeSign
+                visible: false
             }
         },
         State {
@@ -198,7 +186,36 @@ Rectangle {
             PropertyChanges {
                 target: message
                 color: Style.main.background
-                text:  qsTr("An update is available.", "displayed in a notification when an app update is available")
+                text:  qsTr("Update available", "displayed in a notification when an app update is available")
+            }
+            PropertyChanges {
+                target: linkText
+                visible: true
+                text: qsTr("Release Notes", "display the release notes from the new version")
+                onClicked: gui.openReleaseNotes()
+            }
+            PropertyChanges {
+                target: actionText
+                visible: true
+                text: qsTr("Update", "click to update to a new version when one is available")
+                onClicked: {
+                    winMain.dialogUpdate.show()
+                }
+            }
+            PropertyChanges {
+                target: separatorText
+                visible: false
+            }
+            PropertyChanges {
+                target: action2Text
+                visible: false
+            }
+            PropertyChanges {
+                target: closeSign
+                visible: true
+                onClicked: {
+                    go.updateState = "upToDate"
+                }
             }
         },
         State {
@@ -214,6 +231,30 @@ Rectangle {
                 color: Style.main.line
                 text:  qsTr("%1 is outdated.", "displayed in a notification when app is outdated").arg(go.programTitle)
             }
+            PropertyChanges {
+                target: linkText
+                visible: false
+            }
+            PropertyChanges {
+                target: actionText
+                visible: true
+                text: qsTr("Update", "click to update to a new version when one is available")
+                onClicked: {
+                    winMain.dialogUpdate.show()
+                }
+            }
+            PropertyChanges {
+                target: separatorText
+                visible: false
+            }
+            PropertyChanges {
+                target: action2Text
+                visible: false
+            }
+            PropertyChanges {
+                target: closeSign
+                visible: false
+            }
         },
         State {
             name: "upToDate"
@@ -228,6 +269,103 @@ Rectangle {
                 color: Style.main.background
                 text:  ""
             }
+            PropertyChanges {
+                target: linkText
+                visible: false
+            }
+            PropertyChanges {
+                target: actionText
+                visible: false
+            }
+            PropertyChanges {
+                target: separatorText
+                visible: false
+            }
+            PropertyChanges {
+                target: action2Text
+                visible: false
+            }
+            PropertyChanges {
+                target: closeSign
+                visible: false
+            }
+        },
+        State {
+            name: "updateRestart"
+            PropertyChanges {
+                target: root
+                height: 2* Style.main.fontSize
+                isVisible: true
+                color: Style.main.textBlue
+            }
+            PropertyChanges {
+                target: message
+                color: Style.main.background
+                text:  qsTr("%1 update is ready", "displayed in a notification when an app update is installed and restart is needed").arg(go.programTitle)
+            }
+            PropertyChanges {
+                target: linkText
+                visible: false
+            }
+            PropertyChanges {
+                target: actionText
+                visible: true
+                text: qsTr("Restart now", "click to restart application as new version was installed")
+                onClicked: {
+                    go.setToRestart()
+                    Qt.quit()
+                }
+            }
+            PropertyChanges {
+                target: separatorText
+                visible: false
+            }
+            PropertyChanges {
+                target: action2Text
+                visible: false
+            }
+            PropertyChanges {
+                target: closeSign
+                visible: false
+            }
+        },
+        State {
+            name: "updateError"
+            PropertyChanges {
+                target: root
+                height: 2* Style.main.fontSize
+                isVisible: true
+                color: Style.main.textRed
+            }
+            PropertyChanges {
+                target: message
+                color: Style.main.line
+                text:  qsTr("Sorry, %1 couldn't update.", "displayed in a notification when app failed to autoupdate").arg(go.programTitle)
+            }
+            PropertyChanges {
+                target: linkText
+                visible: false
+            }
+            PropertyChanges {
+                target: actionText
+                visible: true
+                text: qsTr("Please update manually", "click to open download page to update manally")
+                onClicked: {
+                    Qt.openUrlExternally(go.updateLandingPage)
+                }
+            }
+            PropertyChanges {
+                target: separatorText
+                visible: false
+            }
+            PropertyChanges {
+                target: action2Text
+                visible: false
+            }
+            PropertyChanges {
+                target: closeSign
+                visible: false
+            }
         }
     ]
 }

internal/frontend/qml/ProtonUI/Style.qml

@@ -59,7 +59,6 @@ QtObject {
         property real fontSize           : 12  * px
         property real iconSize           : 15  * px
         property real leftMarginButton   : 9   * px
-        property real verCheckRepeatTime : 15*60*60*1000 // milliseconds
         property real topMargin          : fontSize
         property real bottomMargin       : fontSize
         property real border             : 1   * px

internal/frontend/qml/tst_Gui.qml

@@ -24,7 +24,7 @@ import QtQuick.Window 2.2
 
 Window {
     id: testroot
-    width   : 150
+    width   : 250
     height  : 600
     flags   : Qt.Window | Qt.Dialog | Qt.FramelessWindowHint
     visible : true
@@ -60,7 +60,7 @@ Window {
         Text {
             id: systrText
             anchors {
-                right : test_systray.right
+                horizontalCenter: parent.horizontalCenter
                 verticalCenter: test_systray.verticalCenter
             }
             text: "unset"
@@ -108,9 +108,14 @@ Window {
         ListElement { title: "Logout bridge"  }
         ListElement { title: "Internet on"    }
         ListElement { title: "Internet off"   }
-        ListElement { title: "NeedUpdate"     }
         ListElement { title: "UpToDate"       }
-        ListElement { title: "ForceUpdate"    }
+        ListElement { title: "NotifyManualUpdate(CanInstall)" }
+        ListElement { title: "NotifyManualUpdate(CantInstall)" }
+        ListElement { title: "NotifyManualUpdateRestart" }
+        ListElement { title: "NotifyManualUpdateError" }
+        ListElement { title: "ForceUpdate" }
+        ListElement { title: "NotifySilentUpdateRestartNeeded" }
+        ListElement { title: "NotifySilentUpdateError" }
         ListElement { title: "Linux"          }
         ListElement { title: "Windows"        }
         ListElement { title: "Macos"          }
@@ -196,11 +201,28 @@ Window {
                     case "UpToDate" :
                     testroot.newVersion = false
                     break;
-                    case "NeedUpdate" :
-                    testroot.newVersion = true
+                    case "NotifyManualUpdate(CanInstall)" :
+                    go.notifyManualUpdate()
+                    go.updateCanInstall = true
+                    break;
+                    case "NotifyManualUpdate(CantInstall)" :
+                    go.notifyManualUpdate()
+                    go.updateCanInstall = false
+                    break;
+                    case "NotifyManualUpdateRestart":
+                    go.notifyManualUpdateRestartNeeded()
+                    break;
+                    case "NotifyManualUpdateError":
+                    go.notifyManualUpdateError()
                     break;
                     case "ForceUpdate" :
-                    go.notifyUpdate()
+                    go.notifyForceUpdate()
+                    break;
+                    case "NotifySilentUpdateRestartNeeded" :
+                    go.notifySilentUpdateRestartNeeded()
+                    break;
+                    case "NotifySilentUpdateError" :
+                    go.notifySilentUpdateError()
                     break;
                     case "SendAlertPopup" :
                     go.showOutgoingNoEncPopup("Alert sending unencrypted!")
@@ -244,6 +266,8 @@ Window {
         id: go
 
         property bool isAutoStart : true
+        property bool isAutoUpdate : false
+        property bool isEarlyAccess : false
         property bool isProxyAllowed : false
         property bool isFirstStart : false
         property bool isFreshVersion : false
@@ -257,6 +281,9 @@ Window {
 
         property bool hasNoKeychain : true
 
+        property var availableKeychain: ["pass-app", "gnome-keyring"]
+        property var selectedKeychain: "gnome-keyring"
+
         property string wrongCredentials
         property string wrongMailboxPassword
         property string canNotReachAPI
@@ -269,19 +296,42 @@ Window {
         property string genericErrSeeLogs
 
         property string programTitle : "ProtonMail Bridge"
-        property string newversion : "QA.1.0"
         property string fullversion : "QA.1.0 (d9f8sdf9) 2020-02-19T10:57:23+01:00"
-        property string landingPage : "https://landing.page"
-        //property string downloadLink: "https://landing.page/download/link"
         property string downloadLink: "https://protonmail.com/download/beta/protonmail-bridge-1.1.5-1.x86_64.rpm;https://www.protonmail.com/downloads/beta/Desktop-Bridge-link1.exe;https://www.protonmail.com/downloads/beta/Desktop-Bridge-link1.exe;https://www.protonmail.com/downloads/beta/Desktop-Bridge-link1.exe;"
-        //property string changelog  : "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet."
-        property string changelog  : "• Support of encryption to external PGP recipients using contacts created on beta.protonmail.com (see https://protonmail.com/blog/pgp-vulnerability-efail/ to understand the vulnerabilities that may be associated with sending to other PGP clients)\n• Notification that outgoing email will be delivered as non-encrypted.\n• NOTE: Due to a change of the keychain format, you will need to add your account(s) to the Bridge after installing this version"
-        property string bugfixes   : "• Support accounts with same user names\n• Support sending vCalendar event"
+
+        property string updateState
+        property string updateVersion : "QA.1.0"
+        property bool updateCanInstall: true
+        property string updateLandingPage : "https://protonmail.com/bridge/download/"
+        property string updateReleaseNotesLink  : "" // "https://protonmail.com/download/bridge/release_notes.html"
+        signal notifyManualUpdate()
+        signal notifyManualUpdateRestartNeeded()
+        signal notifyManualUpdateError()
+        signal notifyForceUpdate()
+        signal notifySilentUpdateRestartNeeded()
+        signal notifySilentUpdateError()
+        function checkForUpdates() {
+            console.log("checkForUpdates")
+            go.notifyVersionIsTheLatest()
+        }
+        function startManualUpdate() {
+            console.log("startManualUpdate")
+        }
+        function checkAndOpenReleaseNotes() {
+            console.log("check for release notes")
+            go.updateReleaseNotesLink = "https://protonmail.com/download/bridge/release_notes.html"
+            go.openReleaseNotesExternally()
+        }
+
+
         property string credits    : "here;goes;list;;of;;used;packages;"
 
         property real progress: 0.3
         property int progressDescription: 2
 
+        function setToRestart() {
+            console.log("setting to restart")
+        }
 
         signal toggleMainWin(int systX, int systY, int systW, int systH)
 
@@ -291,28 +341,29 @@ Window {
 
         signal notifyPortIssue(bool busyPortIMAP, bool busyPortSMTP)
         signal notifyVersionIsTheLatest()
-        signal setUpdateState(string updateState)
         signal notifyKeychainRebuild()
         signal notifyHasNoKeychain()
 
         signal processFinished()
         signal toggleAutoStart()
+        signal toggleEarlyAccess()
+        signal toggleAutoUpdate()
         signal notifyBubble(int tabIndex, string message)
         signal silentBubble(int tabIndex, string message)
-        signal runCheckVersion(bool showMessage)
         signal setAddAccountWarning(string message)
 
-        signal notifyUpdate()
         signal notifyFirewall()
         signal notifyLogout(string accname)
         signal notifyAddressChanged(string accname)
         signal notifyAddressChangedLogout(string accname)
         signal failedAutostartCode(string code)
 
+        signal openReleaseNotesExternally()
         signal showCertIssue()
 
         signal updateFinished(bool hasError)
 
+        signal guiIsReady()
 
         signal  showOutgoingNoEncPopup(string subject)
         signal  setOutgoingNoEncPopupCoord(real x, real y)
@@ -465,9 +516,6 @@ Window {
                 switch (timer.work) {
                     case "wait":
                     break
-                    case "startUpdate":
-                    go.animateProgressBar.start()
-                    go.updateFinished(true)
                     default:
                     go.processFinished()
                 }
@@ -478,11 +526,6 @@ Window {
             timer.start()
         }
 
-        function startUpdate() {
-            timer.work="startUpdate"
-            timer.start()
-        }
-
         function loadAccounts() {
             console.log("Test: Account loaded")
         }
@@ -502,21 +545,7 @@ Window {
         }
 
         function getLocalVersionInfo(){
-            go.newversion = "QA.1.0"
-        }
-
-        function isNewVersionAvailable(showMessage){
-            if (testroot.newVersion)  {
-                go.newversion = "QA.2.0"
-                setUpdateState("oldVersion")
-            } else {
-                go.newversion = "QA.1.0"
-                setUpdateState("upToDate")
-                if(showMessage) {
-                    notifyVersionIsTheLatest()
-                }
-            }
-            workAndClose()
+            go.updateVersion = "QA.1.0"
         }
 
         function getBackendVersion() {
@@ -566,7 +595,6 @@ Window {
             return 0
         }
 
-        property bool isRestarting: false
         function setPortsAndSecurity(portIMAP, portSMTP, secSMTP) {
             console.log("Test: ports changed", portIMAP, portSMTP, secSMTP)
         }
@@ -606,6 +634,18 @@ Window {
             isAutoStart = (isAutoStart!=false) ? false : true
             console.log (" Test: toggleAutoStart "+isAutoStart)
         }
+
+        onToggleAutoUpdate: {
+            workAndClose()
+            isAutoUpdate = (isAutoUpdate!=false) ? false : true
+            console.log (" Test: onToggleAutoUpdate "+isAutoUpdate)
+        }
+
+        onToggleEarlyAccess: {
+            workAndClose()
+            isEarlyAccess = (isEarlyAccess!=false) ? false : true
+            console.log (" Test: onToggleEarlyAccess "+isEarlyAccess)
+        }
     }
 }
 

internal/frontend/qml/tst_GuiIE.qml

@@ -23,13 +23,13 @@ import QtQuick.Window 2.2
 
 Window {
     id      : testroot
-    width   : 100
+    width   : 150
     height  : 600
     flags   : Qt.Window | Qt.Dialog | Qt.FramelessWindowHint
     visible : true
     title   : "GUI test Window"
     color   : "transparent"
-    x       : testgui.winMain.x - 120
+    x       : testgui.winMain.x - 170
     y       : testgui.winMain.y
 
     property bool newVersion : true
@@ -98,24 +98,29 @@ Window {
     ListModel {
         id: buttons
 
-        ListElement { title : "Show window"        }
-        ListElement { title : "Logout"      }
-        ListElement { title : "Internet on"        }
-        ListElement { title : "Internet off"       }
-        ListElement { title : "Macos"              }
-        ListElement { title : "Windows"            }
-        ListElement { title : "Linux"              }
-        ListElement { title : "New Version"        }
-        ListElement { title : "ForceUpgrade"       }
-        ListElement { title : "ImportStructure"    }
-        ListElement { title : "DraftImpFailed"     }
-        ListElement { title : "NoInterImp"         }
-        ListElement { title : "ReportImp"          }
-        ListElement { title : "NewFolder"          }
-        ListElement { title : "EditFolder"         }
-        ListElement { title : "EditLabel"          }
-        ListElement { title : "ExpProgErr"         }
-        ListElement { title : "ImpProgErr"         }
+        ListElement { title : "Show window"         }
+        ListElement { title : "Logout"              }
+        ListElement { title : "Internet on"         }
+        ListElement { title : "Internet off"        }
+        ListElement { title : "Macos"               }
+        ListElement { title : "Windows"             }
+        ListElement { title : "Linux"               }
+        ListElement { title: "NotifyManualUpdate(CanInstall)" }
+        ListElement { title: "NotifyManualUpdate(CantInstall)" }
+        ListElement { title: "NotifyManualUpdateRestart" }
+        ListElement { title: "NotifyManualUpdateError" }
+        ListElement { title: "ForceUpdate" }
+        //ListElement { title: "NotifySilentUpdateRestartNeeded" }
+        //ListElement { title: "NotifySilentUpdateError" }
+        ListElement { title : "ImportStructure"     }
+        ListElement { title : "DraftImpFailed"      }
+        ListElement { title : "NoInterImp"          }
+        ListElement { title : "ReportImp"           }
+        ListElement { title : "NewFolder"           }
+        ListElement { title : "EditFolder"          }
+        ListElement { title : "EditLabel"           }
+        ListElement { title : "ExpProgErr"          }
+        ListElement { title : "ImpProgErr"          }
     }
 
     ListView {
@@ -161,13 +166,29 @@ Window {
                     case "Linux" :
                     go.goos = "linux";
                     break;
-                    case "New Version" :
-                    testroot.newVersion = !testroot.newVersion
-                    systrText.text = testroot.newVersion ? "new version" : "uptodate"
-                    break
-                    case "ForceUpgrade" :
-                    go.notifyUpgrade()
+                    case "NotifyManualUpdate(CanInstall)" :
+                    go.notifyManualUpdate()
+                    go.updateCanInstall = true
                     break;
+                    case "NotifyManualUpdate(CantInstall)" :
+                    go.notifyManualUpdate()
+                    go.updateCanInstall = false
+                    break;
+                    case "NotifyManualUpdateRestart":
+                    go.notifyManualUpdateRestartNeeded()
+                    break;
+                    case "NotifyManualUpdateError":
+                    go.notifyManualUpdateError()
+                    break;
+                    case "ForceUpdate" :
+                    go.notifyForceUpdate()
+                    break;
+                    //case "NotifySilentUpdateRestartNeeded" :
+                    //go.notifySilentUpdateRestartNeeded()
+                    //break;
+                    //case "NotifySilentUpdateError" :
+                    //go.notifySilentUpdateError()
+                    //break;
                     case "ImportStructure" :
                     testgui.winMain.dialogImport.address = "cuto@pm.com"
                     testgui.winMain.dialogImport.show()
@@ -815,6 +836,7 @@ Window {
         id: go
 
         property int isAutoStart : 1
+        //property bool isAutoUpdate : false
         property bool isFirstStart : false
         property string currentAddress : "none"
         //property string goos : "windows"
@@ -831,12 +853,32 @@ Window {
         property string bugReportSent
 
         property string programTitle : "ProtonMail Import-Export app"
-        property string newversion : "q0.1.0"
-        property string landingPage : "https://landing.page"
-        property string changelog  : "• Lorem ipsum dolor sit amet\n• consetetur sadipscing elitr,\n• sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat,\n• sed diam voluptua.\n• At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet."
-        //property string changelog  : ""
-        property string bugfixes   : "• lorem ipsum dolor sit amet;• consetetur sadipscing elitr;• sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat;• sed diam voluptua;• at vero eos et accusam et justo duo dolores et ea rebum;• stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet"
-        //property string bugfixes   : ""
+        property string fullversion : "QA.1.0 (d9f8sdf9) 2020-02-19T10:57:23+01:00"
+        property string downloadLink: "https://protonmail.com/download/beta/protonmail-bridge-1.1.5-1.x86_64.rpm;https://www.protonmail.com/downloads/beta/Desktop-Bridge-link1.exe;https://www.protonmail.com/downloads/beta/Desktop-Bridge-link1.exe;https://www.protonmail.com/downloads/beta/Desktop-Bridge-link1.exe;"
+
+        property string updateState
+        property string updateVersion : "q0.1.0"
+        property bool updateCanInstall: false
+        property string updateLandingPage : "https://protonmail.com/import-export/download/"
+        property string updateReleaseNotesLink  : "https://protonmail.com/download/ie/release_notes.html"
+        signal notifyManualUpdate()
+        signal notifyManualUpdateRestartNeeded()
+        signal notifyManualUpdateError()
+        signal notifyForceUpdate()
+        //signal notifySilentUpdateRestartNeeded()
+        //signal notifySilentUpdateError()
+        function checkForUpdates() {
+            console.log("checkForUpdates")
+            go.notifyVersionIsTheLatest()
+        }
+        function startManualUpdate() {
+            console.log("startManualUpdate")
+        }
+        function checkAndOpenReleaseNotes() {
+            console.log("check for release notes")
+            go.updateReleaseNotesLink = "https://protonmail.com/download/import-export/release_notes.html"
+            go.openReleaseNotesExternally()
+        }
 
         property real progress: 0.0
         property int progressFails: 0
@@ -849,20 +891,16 @@ Window {
 
         signal toggleMainWin(int systX, int systY, int systW, int systH)
 
-
-
         signal notifyHasNoKeychain()
         signal notifyKeychainRebuild()
         signal notifyAddressChangedLogout()
         signal notifyAddressChanged()
-        signal notifyUpdate()
 
         signal showWindow()
         signal showHelp()
         signal showQuit()
 
         signal notifyVersionIsTheLatest()
-        signal setUpdateState(string updateState)
 
         signal showMainWin()
         signal hideMainWin()
@@ -874,17 +912,25 @@ Window {
 
         signal processFinished()
         signal toggleAutoStart()
+        signal toggleAutoUpdate()
         signal notifyBubble(int tabIndex, string message)
-        signal runCheckVersion(bool showMessage)
         signal setAddAccountWarning(string message)
-        signal notifyUpgrade()
+        signal notifyUpdate()
         signal updateFinished(bool hasError)
 
+        signal guiIsReady()
+
+        signal openReleaseNotesExternally()
+
         signal notifyLogout(string accname)
 
         signal notifyError(int errCode)
         property string errorDescription : ""
 
+        function setToRestart() {
+            console.log("setting to restart")
+        }
+
         function delay(duration) {
             var timeStart = new Date().getTime();
 
@@ -958,7 +1004,7 @@ Window {
             workAndClose("addAccount")
         }
 
-        property SequentialAnimation animateProgressBarUpgrade : SequentialAnimation {
+        property SequentialAnimation animateProgressBarUpdate : SequentialAnimation {
             // version
             PropertyAnimation{ target: go; properties: "progressDescription"; to: 1; duration: 1; }
             PropertyAnimation{ duration: 2000; }
@@ -1069,7 +1115,6 @@ Window {
             onTriggered : {
                 console.log("triggered "+timer.work)
                 switch (timer.work) {
-                    case "isNewVersionAvailable" :
                     case "clearCache" :
                     case "clearKeychain" :
                     case "logout" :
@@ -1096,8 +1141,8 @@ Window {
                     go.animateProgressBar.start()
                     break;
 
-                    case "startUpgrade":
-                    go.animateProgressBarUpgrade.start()
+                    case "startManualUpdate":
+                    go.animateProgressBarUpdate.start()
                     go.updateFinished(true)
 
                     default:
@@ -1108,18 +1153,10 @@ Window {
 
         function workAndClose(workDescription) {
             go.progress=0.0
-            timer.work = workDescription
+            timer.work = workDescription === undefined ? "" : workDescription
             timer.start()
         }
 
-        function startUpgrade() {
-            timer.work="startUpgrade"
-            timer.start()
-        }
-
-
-
-
         function checkPathStatus(path) {
             if ( path == ""                     ) return testgui.enums.pathEmptyPath
             if ( path == "wrong"                ) return testgui.enums.pathWrongPath
@@ -1221,20 +1258,6 @@ Window {
             workAndClose("switchAddressMode")
         }
 
-        function isNewVersionAvailable(showMessage){
-            if (testroot.newVersion)  {
-                setUpdateState("oldVersion")
-            } else {
-                setUpdateState("upToDate")
-                if(showMessage) {
-                    notifyVersionIsTheLatest()
-                }
-            }
-            workAndClose("isNewVersionAvailable")
-            //notifyBubble(2,go.versionCheckFailed)
-            return 0
-        }
-
         function getLocalVersionInfo(){}
 
         function getBackendVersion() {
@@ -1308,10 +1331,6 @@ Window {
             return (fname!="fail")
         }
 
-        function checkInternet() {
-            // nothing to do
-        }
-
         function loadImportReports(fname) {
             console.log("load import reports for ", fname)
         }
@@ -1331,5 +1350,11 @@ Window {
             console.log("sending import report from ", address, " file ", fname)
             return !fname.includes("fail")
         }
+
+        //onToggleAutoUpdate: {
+        //    workAndClose()
+        //    isAutoUpdate = (isAutoUpdate!=false) ? false : true
+        //    console.log (" Test: onToggleAutoUpdate "+isAutoUpdate)
+        //}
     }
 }

internal/frontend/qt-common/account_model.go

@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 
-// +build !nogui
+// +build build_qt
 
 package qtcommon
 

internal/frontend/qt-common/accounts.go

@@ -15,20 +15,20 @@
 // You should have received a copy of the GNU General Public License
 // along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 
-// +build !nogui
+// +build build_qt
 
 package qtcommon
 
 import (
+	"context"
 	"fmt"
 	"strings"
 	"sync"
 
 	"github.com/ProtonMail/proton-bridge/internal/bridge"
+	"github.com/ProtonMail/proton-bridge/internal/config/settings"
 	"github.com/ProtonMail/proton-bridge/internal/events"
 	"github.com/ProtonMail/proton-bridge/internal/frontend/types"
-	"github.com/ProtonMail/proton-bridge/internal/preferences"
-	"github.com/ProtonMail/proton-bridge/pkg/config"
 	"github.com/ProtonMail/proton-bridge/pkg/keychain"
 	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
 )
@@ -38,7 +38,6 @@ type QMLer interface {
 	ProcessFinished()
 	NotifyHasNoKeychain()
 	SetConnectionStatus(bool)
-	SetIsRestarting(bool)
 	SetAddAccountWarning(string, int)
 	NotifyBubble(int, string)
 	EmitEvent(string, string)
@@ -50,23 +49,25 @@ type QMLer interface {
 
 // Accounts holds functionality of users
 type Accounts struct {
-	Model *AccountsModel
-	qml   QMLer
-	um    types.UserManager
-	prefs *config.Preferences
+	Model    *AccountsModel
+	qml      QMLer
+	um       types.UserManager
+	settings *settings.Settings
 
 	authClient pmapi.Client
 	auth       *pmapi.Auth
 
 	LatestUserID string
 	accountMutex sync.Mutex
+	restarter    types.Restarter
 }
 
 // SetupAccounts will create Model and set QMLer and UserManager
-func (a *Accounts) SetupAccounts(qml QMLer, um types.UserManager) {
+func (a *Accounts) SetupAccounts(qml QMLer, um types.UserManager, restarter types.Restarter) {
 	a.Model = NewAccountsModel(nil)
 	a.qml = qml
 	a.um = um
+	a.restarter = restarter
 }
 
 // LoadAccounts refreshes the current account list in GUI
@@ -102,9 +103,9 @@ func (a *Accounts) LoadAccounts() {
 		accInfo.SetUserID(user.ID())
 		accInfo.SetHostname(bridge.Host)
 		accInfo.SetPassword(user.GetBridgePassword())
-		if a.prefs != nil {
-			accInfo.SetPortIMAP(a.prefs.GetInt(preferences.IMAPPortKey))
-			accInfo.SetPortSMTP(a.prefs.GetInt(preferences.SMTPPortKey))
+		if a.settings != nil {
+			accInfo.SetPortIMAP(a.settings.GetInt(settings.IMAPPortKey))
+			accInfo.SetPortSMTP(a.settings.GetInt(settings.SMTPPortKey))
 		}
 
 		// Set aliases.
@@ -127,7 +128,7 @@ func (a *Accounts) ClearCache() {
 	}
 	// Clearing data removes everything (db, preferences, ...)
 	// so everything has to be stopped and started again.
-	a.qml.SetIsRestarting(true)
+	a.restarter.SetToRestart()
 	a.qml.Quit()
 }
 
@@ -137,7 +138,7 @@ func (a *Accounts) ClearKeychain() {
 	for _, user := range a.um.GetUsers() {
 		if err := a.um.DeleteUser(user.ID(), false); err != nil {
 			log.Error("While deleting user: ", err)
-			if err == keychain.ErrNoKeychainInstalled { // Probably not needed anymore.
+			if err == keychain.ErrNoKeychain { // Probably not needed anymore.
 				a.qml.NotifyHasNoKeychain()
 			}
 		}
@@ -164,7 +165,7 @@ func (a *Accounts) showLoginError(err error, scope string) bool {
 		return false
 	}
 	log.Warnf("%s: %v", scope, err)
-	if err == pmapi.ErrAPINotReachable {
+	if err == pmapi.ErrNoConnection {
 		a.qml.SetConnectionStatus(false)
 		SendNotification(a.qml, TabAccount, a.qml.CanNotReachAPI())
 		a.qml.ProcessFinished()
@@ -172,7 +173,6 @@ func (a *Accounts) showLoginError(err error, scope string) bool {
 	}
 	a.qml.SetConnectionStatus(true) // If we are here connection is ok.
 	if err == pmapi.ErrUpgradeApplication {
-		a.qml.EmitEvent(events.UpgradeApplicationEvent, "")
 		return true
 	}
 	a.qml.SetAddAccountWarning(err.Error(), -1)
@@ -186,7 +186,7 @@ func (a *Accounts) showLoginError(err error, scope string) bool {
 //  2: when has no 2FA but have MBOX
 func (a *Accounts) Login(login, password string) int {
 	var err error
-	a.authClient, a.auth, err = a.um.Login(login, password)
+	a.authClient, a.auth, err = a.um.Login(login, []byte(password))
 	if a.showLoginError(err, "login") {
 		return -1
 	}
@@ -208,7 +208,7 @@ func (a *Accounts) Auth2FA(twoFacAuth string) int {
 	if a.auth == nil || a.authClient == nil {
 		err = fmt.Errorf("missing authentication in auth2FA %p %p", a.auth, a.authClient)
 	} else {
-		err = a.authClient.Auth2FA(twoFacAuth, a.auth)
+		err = a.authClient.Auth2FA(context.Background(), twoFacAuth)
 	}
 
 	if a.showLoginError(err, "auth2FA") {
@@ -230,7 +230,7 @@ func (a *Accounts) AddAccount(mailboxPassword string) int {
 		return -1
 	}
 
-	user, err := a.um.FinishLogin(a.authClient, a.auth, mailboxPassword)
+	user, err := a.um.FinishLogin(a.authClient, a.auth, []byte(mailboxPassword))
 	if err != nil {
 		log.WithError(err).Error("Login was unsuccessful")
 		a.qml.SetAddAccountWarning("Failure: "+err.Error(), -2)
@@ -249,7 +249,7 @@ func (a *Accounts) DeleteAccount(iAccount int, removePreferences bool) {
 	userID := a.Model.get(iAccount).UserID()
 	if err := a.um.DeleteUser(userID, removePreferences); err != nil {
 		log.Warn("deleteUser: cannot remove user: ", err)
-		if err == keychain.ErrNoKeychainInstalled {
+		if err == keychain.ErrNoKeychain {
 			a.qml.NotifyHasNoKeychain()
 			return
 		}

internal/frontend/qt-common/common.cpp

@@ -1,4 +1,4 @@
-// +build !nogui
+// +build build_qt
 
 #include "common.h"
 #include "_cgo_export.h"

internal/frontend/qt-common/common.go

@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 
-// +build !nogui
+// +build build_qt
 
 package qtcommon
 
@@ -111,10 +111,5 @@ func WaitForEnter() {
 
 type Listener interface {
 	Add(string, chan<- string)
-}
-
-func MakeAndRegisterEvent(eventListener Listener, event string) <-chan string {
-	ch := make(chan string)
-	eventListener.Add(event, ch)
-	return ch
+	RetryEmit(string)
 }

internal/frontend/qt-common/notification.go

@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 
-// +build !nogui
+// +build build_qt
 
 package qtcommon
 

internal/frontend/qt-ie/enums.go

@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 
-// +build !nogui
+// +build build_qt
 
 package qtie