mirror of
https://github.com/ProtonMail/proton-bridge.git
synced 2025-12-12 05:36:43 +00:00
Compare commits
2 Commits
v3.8.2
...
release/tr
| Author | SHA1 | Date | |
|---|---|---|---|
| a80fd92018 | |||
| 71063ac5ee |
221
.gitlab-ci.yml
221
.gitlab-ci.yml
@ -18,10 +18,6 @@
|
|||||||
---
|
---
|
||||||
image: gitlab.protontech.ch:4567/go/bridge-internal:test-go1.20
|
image: gitlab.protontech.ch:4567/go/bridge-internal:test-go1.20
|
||||||
|
|
||||||
default:
|
|
||||||
tags:
|
|
||||||
- shared-small
|
|
||||||
|
|
||||||
variables:
|
variables:
|
||||||
GOPRIVATE: gitlab.protontech.ch
|
GOPRIVATE: gitlab.protontech.ch
|
||||||
GOMAXPROCS: $(( ${CI_TAG_CPU} / 2 ))
|
GOMAXPROCS: $(( ${CI_TAG_CPU} / 2 ))
|
||||||
@ -34,9 +30,216 @@ stages:
|
|||||||
- test
|
- test
|
||||||
- build
|
- build
|
||||||
|
|
||||||
include:
|
.rules-branch-and-MR-manual:
|
||||||
- local: ci/rules.yml
|
rules:
|
||||||
- local: ci/env.yml
|
- if: $CI_COMMIT_BRANCH || $CI_PIPELINE_SOURCE == "merge_request_event"
|
||||||
- local: ci/test.yml
|
when: manual
|
||||||
- local: ci/build.yml
|
allow_failure: true
|
||||||
|
- when: never
|
||||||
|
|
||||||
|
.rules-branch-manual-MR-and-devel-always:
|
||||||
|
rules:
|
||||||
|
- if: $CI_COMMIT_BRANCH == "devel" || $CI_PIPELINE_SOURCE == "merge_request_event"
|
||||||
|
when: always
|
||||||
|
allow_failure: false
|
||||||
|
- if: $CI_COMMIT_BRANCH
|
||||||
|
when: manual
|
||||||
|
allow_failure: true
|
||||||
|
- when: never
|
||||||
|
|
||||||
|
# ENV
|
||||||
|
.env-windows:
|
||||||
|
before_script:
|
||||||
|
- export BRIDGE_SYNC_FORCE_MINIMUM_SPEC=1
|
||||||
|
- export GOROOT=/c/Go1.20/
|
||||||
|
- export PATH=$GOROOT/bin:$PATH
|
||||||
|
- export GOARCH=amd64
|
||||||
|
- export GOPATH=~/go1.20
|
||||||
|
- export GO111MODULE=on
|
||||||
|
- export PATH="${GOPATH}/bin:${PATH}"
|
||||||
|
- export MSYSTEM=
|
||||||
|
- export QT6DIR=/c/grrrQt/6.3.2/msvc2019_64
|
||||||
|
- export PATH=$PATH:${QT6DIR}/bin
|
||||||
|
- export PATH="/c/Program Files/Microsoft Visual Studio/2022/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin:$PATH"
|
||||||
|
- $(git config --global -l | grep -o 'url.*gitlab.protontech.ch.*insteadof' | xargs -L 1 git config --global --unset &> /dev/null) || echo "nothing to remove"
|
||||||
|
- git config --global url.https://gitlab-ci-token:${CI_JOB_TOKEN}@${CI_SERVER_HOST}.insteadOf https://${CI_SERVER_HOST}
|
||||||
|
- git config --global safe.directory '*'
|
||||||
|
- git status --porcelain
|
||||||
|
cache: {}
|
||||||
|
tags:
|
||||||
|
- windows-bridge
|
||||||
|
|
||||||
|
.env-darwin:
|
||||||
|
before_script:
|
||||||
|
- export BRIDGE_SYNC_FORCE_MINIMUM_SPEC=1
|
||||||
|
- export PATH=/usr/local/bin:$PATH
|
||||||
|
- export PATH=/usr/local/opt/git/bin:$PATH
|
||||||
|
- export PATH=/usr/local/opt/make/libexec/gnubin:$PATH
|
||||||
|
- export PATH=/usr/local/opt/gnu-sed/libexec/gnubin:$PATH
|
||||||
|
- export GOROOT=~/local/opt/go@1.20
|
||||||
|
- export PATH="${GOROOT}/bin:$PATH"
|
||||||
|
- export GOPATH=~/go1.20
|
||||||
|
- export PATH="${GOPATH}/bin:$PATH"
|
||||||
|
- export QT6DIR=/opt/Qt/6.3.2/macos
|
||||||
|
- export PATH="${QT6DIR}/bin:$PATH"
|
||||||
|
- uname -a
|
||||||
|
cache: {}
|
||||||
|
tags:
|
||||||
|
- macos-m1-bridge
|
||||||
|
|
||||||
|
.env-linux-build:
|
||||||
|
image: gitlab.protontech.ch:4567/go/bridge-internal:build-go1.20-qt6.3.2
|
||||||
|
variables:
|
||||||
|
VCPKG_DEFAULT_BINARY_CACHE: ${CI_PROJECT_DIR}/.cache
|
||||||
|
cache:
|
||||||
|
key: linux-vcpkg
|
||||||
|
paths:
|
||||||
|
- .cache
|
||||||
|
when: 'always'
|
||||||
|
before_script:
|
||||||
|
- mkdir -p .cache/bin
|
||||||
|
- export BRIDGE_SYNC_FORCE_MINIMUM_SPEC=1
|
||||||
|
- export PATH=$(pwd)/.cache/bin:$PATH
|
||||||
|
- export GOPATH="$CI_PROJECT_DIR/.cache"
|
||||||
|
- export PATH=$PATH:$QT6DIR/bin
|
||||||
|
- $(git config --global -l | grep -o 'url.*gitlab.protontech.ch.*insteadof' | xargs -L 1 git config --global --unset &> /dev/null) || echo "nothing to remove"
|
||||||
|
- git config --global url.https://gitlab-ci-token:${CI_JOB_TOKEN}@${CI_SERVER_HOST}.insteadOf https://${CI_SERVER_HOST}
|
||||||
|
tags:
|
||||||
|
- large
|
||||||
|
|
||||||
|
# Stage: TEST
|
||||||
|
|
||||||
|
lint:
|
||||||
|
stage: test
|
||||||
|
extends:
|
||||||
|
- .rules-branch-manual-MR-and-devel-always
|
||||||
|
script:
|
||||||
|
- make lint
|
||||||
|
tags:
|
||||||
|
- medium
|
||||||
|
|
||||||
|
.script-test:
|
||||||
|
stage: test
|
||||||
|
extends:
|
||||||
|
- .rules-branch-manual-MR-and-devel-always
|
||||||
|
script:
|
||||||
|
- make test
|
||||||
|
artifacts:
|
||||||
|
paths:
|
||||||
|
- coverage/**
|
||||||
|
|
||||||
|
test-linux:
|
||||||
|
extends:
|
||||||
|
- .script-test
|
||||||
|
tags:
|
||||||
|
- large
|
||||||
|
|
||||||
|
test-linux-race:
|
||||||
|
extends:
|
||||||
|
- test-linux
|
||||||
|
- .rules-branch-and-MR-manual
|
||||||
|
script:
|
||||||
|
- make test-race
|
||||||
|
|
||||||
|
test-integration:
|
||||||
|
extends:
|
||||||
|
- test-linux
|
||||||
|
script:
|
||||||
|
- make test-integration
|
||||||
|
|
||||||
|
test-integration-race:
|
||||||
|
extends:
|
||||||
|
- test-integration
|
||||||
|
- .rules-branch-and-MR-manual
|
||||||
|
script:
|
||||||
|
- make test-integration-race
|
||||||
|
|
||||||
|
test-windows:
|
||||||
|
extends:
|
||||||
|
- .env-windows
|
||||||
|
- .script-test
|
||||||
|
- .rules-branch-and-MR-manual
|
||||||
|
|
||||||
|
test-darwin:
|
||||||
|
extends:
|
||||||
|
- .env-darwin
|
||||||
|
- .script-test
|
||||||
|
|
||||||
|
test-coverage:
|
||||||
|
stage: test
|
||||||
|
extends:
|
||||||
|
- .rules-branch-manual-MR-and-devel-always
|
||||||
|
script:
|
||||||
|
- ./utils/coverage.sh
|
||||||
|
coverage: '/total:.*\(statements\).*\d+\.\d+%/'
|
||||||
|
needs:
|
||||||
|
- test-linux
|
||||||
|
#- test-windows
|
||||||
|
- test-darwin
|
||||||
|
- test-integration
|
||||||
|
tags:
|
||||||
|
- small
|
||||||
|
artifacts:
|
||||||
|
paths:
|
||||||
|
- coverage*
|
||||||
|
- coverage/**
|
||||||
|
when: 'always'
|
||||||
|
reports:
|
||||||
|
coverage_report:
|
||||||
|
coverage_format: cobertura
|
||||||
|
path: coverage.xml
|
||||||
|
|
||||||
|
# Stage: BUILD
|
||||||
|
|
||||||
|
.script-build:
|
||||||
|
stage: build
|
||||||
|
needs: ["lint"]
|
||||||
|
extends:
|
||||||
|
- .rules-branch-and-MR-manual
|
||||||
|
script:
|
||||||
|
- make build
|
||||||
|
- git diff && git diff-index --quiet HEAD
|
||||||
|
- make vault-editor
|
||||||
|
artifacts:
|
||||||
|
expire_in: 1 day
|
||||||
|
when: always
|
||||||
|
name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
|
||||||
|
paths:
|
||||||
|
- bridge_*.tgz
|
||||||
|
- vault-editor
|
||||||
|
|
||||||
|
build-linux:
|
||||||
|
extends:
|
||||||
|
- .script-build
|
||||||
|
- .env-linux-build
|
||||||
|
|
||||||
|
build-linux-qa:
|
||||||
|
extends:
|
||||||
|
- build-linux
|
||||||
|
- .rules-branch-manual-MR-and-devel-always
|
||||||
|
variables:
|
||||||
|
BUILD_TAGS: "build_qa"
|
||||||
|
|
||||||
|
build-darwin:
|
||||||
|
extends:
|
||||||
|
- .script-build
|
||||||
|
- .env-darwin
|
||||||
|
|
||||||
|
build-darwin-qa:
|
||||||
|
extends:
|
||||||
|
- build-darwin
|
||||||
|
variables:
|
||||||
|
BUILD_TAGS: "build_qa"
|
||||||
|
|
||||||
|
build-windows:
|
||||||
|
extends:
|
||||||
|
- .script-build
|
||||||
|
- .env-windows
|
||||||
|
|
||||||
|
build-windows-qa:
|
||||||
|
extends:
|
||||||
|
- build-windows
|
||||||
|
variables:
|
||||||
|
BUILD_TAGS: "build_qa"
|
||||||
|
|
||||||
|
# TODO: PUT BACK ALL THE JOBS! JUST DID THIS FOR NOW TO GET CI WORKING AGAIN...
|
||||||
|
|||||||
@ -10,7 +10,7 @@
|
|||||||
* Windres (Windows)
|
* Windres (Windows)
|
||||||
* libglvnd and libsecret development files (Linux)
|
* libglvnd and libsecret development files (Linux)
|
||||||
* pkg-config (Linux)
|
* pkg-config (Linux)
|
||||||
* cmake, ninja-build and Qt 6.4.3 are required to build the graphical user interface. On Linux,
|
* cmake, ninja-build and Qt 6 are required to build the graphical user interface. On Linux,
|
||||||
the Mesa OpenGL development files are also needed.
|
the Mesa OpenGL development files are also needed.
|
||||||
|
|
||||||
To enable the sending of crash reports using Sentry please set the
|
To enable the sending of crash reports using Sentry please set the
|
||||||
@ -19,7 +19,7 @@ Otherwise, the sending of crash reports will be disabled.
|
|||||||
|
|
||||||
## Build
|
## Build
|
||||||
In order to build Bridge app with Qt interface we are using
|
In order to build Bridge app with Qt interface we are using
|
||||||
[Qt 6.4.3](https://doc.qt.io/qt-6/gettingstarted.html).
|
[Qt 6.3](https://doc.qt.io/qt-6/gettingstarted.html).
|
||||||
|
|
||||||
Please note that qmake path must be in your `PATH` to ensure Qt to be found.
|
Please note that qmake path must be in your `PATH` to ensure Qt to be found.
|
||||||
Also, before you start build **on Windows**, please unset the `MSYSTEM` variable
|
Also, before you start build **on Windows**, please unset the `MSYSTEM` variable
|
||||||
|
|||||||
@ -40,7 +40,6 @@ Proton Mail Bridge includes the following 3rd party software:
|
|||||||
* [go-message](https://github.com/emersion/go-message) available under [license](https://github.com/emersion/go-message/blob/master/LICENSE)
|
* [go-message](https://github.com/emersion/go-message) available under [license](https://github.com/emersion/go-message/blob/master/LICENSE)
|
||||||
* [go-sasl](https://github.com/emersion/go-sasl) available under [license](https://github.com/emersion/go-sasl/blob/master/LICENSE)
|
* [go-sasl](https://github.com/emersion/go-sasl) available under [license](https://github.com/emersion/go-sasl/blob/master/LICENSE)
|
||||||
* [go-smtp](https://github.com/emersion/go-smtp) available under [license](https://github.com/emersion/go-smtp/blob/master/LICENSE)
|
* [go-smtp](https://github.com/emersion/go-smtp) available under [license](https://github.com/emersion/go-smtp/blob/master/LICENSE)
|
||||||
* [go-vcard](https://github.com/emersion/go-vcard) available under [license](https://github.com/emersion/go-vcard/blob/master/LICENSE)
|
|
||||||
* [color](https://github.com/fatih/color) available under [license](https://github.com/fatih/color/blob/master/LICENSE)
|
* [color](https://github.com/fatih/color) available under [license](https://github.com/fatih/color/blob/master/LICENSE)
|
||||||
* [sentry-go](https://github.com/getsentry/sentry-go) available under [license](https://github.com/getsentry/sentry-go/blob/master/LICENSE)
|
* [sentry-go](https://github.com/getsentry/sentry-go) available under [license](https://github.com/getsentry/sentry-go/blob/master/LICENSE)
|
||||||
* [resty](https://github.com/go-resty/resty/v2) available under [license](https://github.com/go-resty/resty/v2/blob/master/LICENSE)
|
* [resty](https://github.com/go-resty/resty/v2) available under [license](https://github.com/go-resty/resty/v2/blob/master/LICENSE)
|
||||||
@ -50,7 +49,6 @@ Proton Mail Bridge includes the following 3rd party software:
|
|||||||
* [uuid](https://github.com/google/uuid) available under [license](https://github.com/google/uuid/blob/master/LICENSE)
|
* [uuid](https://github.com/google/uuid) available under [license](https://github.com/google/uuid/blob/master/LICENSE)
|
||||||
* [go-multierror](https://github.com/hashicorp/go-multierror) available under [license](https://github.com/hashicorp/go-multierror/blob/master/LICENSE)
|
* [go-multierror](https://github.com/hashicorp/go-multierror) available under [license](https://github.com/hashicorp/go-multierror/blob/master/LICENSE)
|
||||||
* [html2text](https://github.com/jaytaylor/html2text) available under [license](https://github.com/jaytaylor/html2text/blob/master/LICENSE)
|
* [html2text](https://github.com/jaytaylor/html2text) available under [license](https://github.com/jaytaylor/html2text/blob/master/LICENSE)
|
||||||
* [go-locale](https://github.com/jeandeaual/go-locale) available under [license](https://github.com/jeandeaual/go-locale/blob/master/LICENSE)
|
|
||||||
* [go-keychain](https://github.com/keybase/go-keychain) available under [license](https://github.com/keybase/go-keychain/blob/master/LICENSE)
|
* [go-keychain](https://github.com/keybase/go-keychain) available under [license](https://github.com/keybase/go-keychain/blob/master/LICENSE)
|
||||||
* [dns](https://github.com/miekg/dns) available under [license](https://github.com/miekg/dns/blob/master/LICENSE)
|
* [dns](https://github.com/miekg/dns) available under [license](https://github.com/miekg/dns/blob/master/LICENSE)
|
||||||
* [memory](https://github.com/pbnjay/memory) available under [license](https://github.com/pbnjay/memory/blob/master/LICENSE)
|
* [memory](https://github.com/pbnjay/memory) available under [license](https://github.com/pbnjay/memory/blob/master/LICENSE)
|
||||||
@ -85,6 +83,7 @@ Proton Mail Bridge includes the following 3rd party software:
|
|||||||
* [go-spew](https://github.com/davecgh/go-spew) available under [license](https://github.com/davecgh/go-spew/blob/master/LICENSE)
|
* [go-spew](https://github.com/davecgh/go-spew) available under [license](https://github.com/davecgh/go-spew/blob/master/LICENSE)
|
||||||
* [go-windows](https://github.com/elastic/go-windows) available under [license](https://github.com/elastic/go-windows/blob/master/LICENSE)
|
* [go-windows](https://github.com/elastic/go-windows) available under [license](https://github.com/elastic/go-windows/blob/master/LICENSE)
|
||||||
* [go-textwrapper](https://github.com/emersion/go-textwrapper) available under [license](https://github.com/emersion/go-textwrapper/blob/master/LICENSE)
|
* [go-textwrapper](https://github.com/emersion/go-textwrapper) available under [license](https://github.com/emersion/go-textwrapper/blob/master/LICENSE)
|
||||||
|
* [go-vcard](https://github.com/emersion/go-vcard) available under [license](https://github.com/emersion/go-vcard/blob/master/LICENSE)
|
||||||
* [fgprof](https://github.com/felixge/fgprof) available under [license](https://github.com/felixge/fgprof/blob/master/LICENSE)
|
* [fgprof](https://github.com/felixge/fgprof) available under [license](https://github.com/felixge/fgprof/blob/master/LICENSE)
|
||||||
* [go-shlex](https://github.com/flynn-archive/go-shlex) available under [license](https://github.com/flynn-archive/go-shlex/blob/master/LICENSE)
|
* [go-shlex](https://github.com/flynn-archive/go-shlex) available under [license](https://github.com/flynn-archive/go-shlex/blob/master/LICENSE)
|
||||||
* [mimetype](https://github.com/gabriel-vasile/mimetype) available under [license](https://github.com/gabriel-vasile/mimetype/blob/master/LICENSE)
|
* [mimetype](https://github.com/gabriel-vasile/mimetype) available under [license](https://github.com/gabriel-vasile/mimetype/blob/master/LICENSE)
|
||||||
@ -124,7 +123,6 @@ Proton Mail Bridge includes the following 3rd party software:
|
|||||||
* [codec](https://github.com/ugorji/go/codec) available under [license](https://github.com/ugorji/go/codec/blob/master/LICENSE)
|
* [codec](https://github.com/ugorji/go/codec) available under [license](https://github.com/ugorji/go/codec/blob/master/LICENSE)
|
||||||
* [tagparser](https://github.com/vmihailenco/tagparser/v2) available under [license](https://github.com/vmihailenco/tagparser/v2/blob/master/LICENSE)
|
* [tagparser](https://github.com/vmihailenco/tagparser/v2) available under [license](https://github.com/vmihailenco/tagparser/v2/blob/master/LICENSE)
|
||||||
* [smetrics](https://github.com/xrash/smetrics) available under [license](https://github.com/xrash/smetrics/blob/master/LICENSE)
|
* [smetrics](https://github.com/xrash/smetrics) available under [license](https://github.com/xrash/smetrics/blob/master/LICENSE)
|
||||||
* [go-ordered-json](https://gitlab.com/c0b/go-ordered-json)
|
|
||||||
* [arch](https://golang.org/x/arch) available under [license](https://cs.opensource.google/go/x/arch/+/master:LICENSE)
|
* [arch](https://golang.org/x/arch) available under [license](https://cs.opensource.google/go/x/arch/+/master:LICENSE)
|
||||||
* [crypto](https://golang.org/x/crypto) available under [license](https://cs.opensource.google/go/x/crypto/+/master:LICENSE)
|
* [crypto](https://golang.org/x/crypto) available under [license](https://cs.opensource.google/go/x/crypto/+/master:LICENSE)
|
||||||
* [mod](https://golang.org/x/mod) available under [license](https://cs.opensource.google/go/x/mod/+/master:LICENSE)
|
* [mod](https://golang.org/x/mod) available under [license](https://cs.opensource.google/go/x/mod/+/master:LICENSE)
|
||||||
@ -134,7 +132,5 @@ Proton Mail Bridge includes the following 3rd party software:
|
|||||||
* [yaml](https://gopkg.in/yaml.v3) available under [license](https://github.com/go-yaml/yaml/blob/v3.0.1/LICENSE)
|
* [yaml](https://gopkg.in/yaml.v3) available under [license](https://github.com/go-yaml/yaml/blob/v3.0.1/LICENSE)
|
||||||
* [docker-credential-helpers](https://github.com/ProtonMail/docker-credential-helpers) available under [license](https://github.com/ProtonMail/docker-credential-helpers/blob/master/LICENSE)
|
* [docker-credential-helpers](https://github.com/ProtonMail/docker-credential-helpers) available under [license](https://github.com/ProtonMail/docker-credential-helpers/blob/master/LICENSE)
|
||||||
* [go-message](https://github.com/ProtonMail/go-message) available under [license](https://github.com/ProtonMail/go-message/blob/master/LICENSE)
|
* [go-message](https://github.com/ProtonMail/go-message) available under [license](https://github.com/ProtonMail/go-message/blob/master/LICENSE)
|
||||||
* [go-smtp](https://github.com/ProtonMail/go-smtp) available under [license](https://github.com/ProtonMail/go-smtp/blob/master/LICENSE)
|
|
||||||
* [resty](https://github.com/LBeernaertProton/resty/v2) available under [license](https://github.com/LBeernaertProton/resty/v2/blob/master/LICENSE)
|
|
||||||
* [go-keychain](https://github.com/cuthix/go-keychain) available under [license](https://github.com/cuthix/go-keychain/blob/master/LICENSE)
|
* [go-keychain](https://github.com/cuthix/go-keychain) available under [license](https://github.com/cuthix/go-keychain/blob/master/LICENSE)
|
||||||
<!-- END AUTOGEN -->
|
<!-- END AUTOGEN -->
|
||||||
|
|||||||
326
Changelog.md
326
Changelog.md
@ -3,276 +3,10 @@
|
|||||||
Changelog [format](http://keepachangelog.com/en/1.0.0/)
|
Changelog [format](http://keepachangelog.com/en/1.0.0/)
|
||||||
|
|
||||||
|
|
||||||
## Xikou Bridge 3.8.2
|
## Trift Bridge 3.4.2
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
* GODT-3235: Update bridge update key.
|
* GODT-2902: Do not check for changed values. Related to GODT-2857.
|
||||||
|
|
||||||
|
|
||||||
## Xikou Bridge 3.8.1
|
|
||||||
|
|
||||||
### Added
|
|
||||||
* GODT-3121: Suggest relevant KB articles in the in-app bug report form.
|
|
||||||
* GODT-2001: Add govulncheck to scan for vulnerabilities.
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
* Keep nighlty-job log as artifact.
|
|
||||||
* Test: Improve TestMetadata_JobCorrectlyFinishesAfterCancel.
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
* GODT-3153: Do not take into account full address when hasing messages.
|
|
||||||
|
|
||||||
|
|
||||||
## Xikou Bridge 3.8.0
|
|
||||||
|
|
||||||
### Added
|
|
||||||
* Test: Add test scenarios to add an /Answered flag to a replied message and revert.
|
|
||||||
* GODT-3046: Added links to KB in error messages.
|
|
||||||
* Test(GODT-3113): Inline HTML message and HTML attachment is getting altered.
|
|
||||||
* Test(GODT-3124): Attempt to fix 401 during login.
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
* GODT-3134: Br tag triggers installer.
|
|
||||||
* Added update events to bridge GUI tester.
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
* GODT-3142: Pass br tag if available.
|
|
||||||
* GODT-3151: Fix feature test with non modified HTML part.
|
|
||||||
* GODT-3151: Only modify HTML Meta content if UTF-8 charset override is needed.
|
|
||||||
* GODT-2851: Add empty text part if no text part when importing multipart.
|
|
||||||
* GODT-3102: Distinguish Vault Decryption from Serialization Errors.
|
|
||||||
* GODT-3124: Handling of sync child jobs.
|
|
||||||
* GODT-3148: Bump go-sysinfo to get rid of linker warning on macOS Sonoma.
|
|
||||||
* GODT-3124: Flaky tests.
|
|
||||||
* GODT-3022: Handle multipart/related on fake server.
|
|
||||||
* GODT-3133: Fix GetSystemLanguage.
|
|
||||||
* GODT-3124: Race condition in sync task waiter.
|
|
||||||
* GODT-3124: Race conditions reported by race check.
|
|
||||||
* GODT-2797: Encode attached key name and use same pubkey name as web-app.
|
|
||||||
* Fix case of IMAP login error.
|
|
||||||
* GODT-3132: Do not allow sending on disabled accounts.
|
|
||||||
* GODT-3046: fix typo spotted during KB article review.
|
|
||||||
* GODT-3129: Bad Event during after address order change.
|
|
||||||
* GODT-3117: Improve GetAllContacts and GetAllContactsEmail.
|
|
||||||
|
|
||||||
|
|
||||||
## Wakato Bridge 3.7.1
|
|
||||||
|
|
||||||
### Added
|
|
||||||
* Test(GODT-2740): Sending Plain text messages to internal recipient.
|
|
||||||
* Test(GODT-2892): Create fake log file.
|
|
||||||
* GODT-3122: Added test, changed interface for accessing display name.
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
* Remove debug prints.
|
|
||||||
* GODT-2576: Forward and $Forward Flag Support.
|
|
||||||
* GODT-3053: Use smaller bridge window on small screens.
|
|
||||||
* GODT-3113: Only force UTF-8 charset for HTML part when needed.
|
|
||||||
* GODT-3113: Do not render HTML for attachment.
|
|
||||||
* GODT-3112: Replaced error message when bridge exists prematurely. Added a link to support form.
|
|
||||||
* GODT-2947: Remove 'blame it on the weather' error part from go-smtp.
|
|
||||||
* GODT-3010: Log MimeType parsing issue.
|
|
||||||
* GODT-3104: Added log entry for cert install status on startup on macOS.
|
|
||||||
* GODT-2277: Move Keychain helpers creation in main.
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
* GODT-3054: Only delete drafts after message has been Sent.
|
|
||||||
* GODT-2576: Correctly handle Forwarded messages from Thunderbird.
|
|
||||||
* GODT-3122: Use display name as 'Email Account Name' in macOS profile.
|
|
||||||
* GODT-3125: Heartbeat crash on exit.
|
|
||||||
* GODT-2617: Validate user can send from the SMTP sender address.
|
|
||||||
* GODT-3123: Trigger bad event on empty EventID on existing accounts.
|
|
||||||
* GODT-3118: Do not reset EventID when migrating sync settings.
|
|
||||||
* GODT-3116: Panic on closed channel.
|
|
||||||
* GODT-1623: Throttle SMTP failed requests.
|
|
||||||
* GODT-3047: Fixed 'disk full' error message.
|
|
||||||
* GODT-3054: Delete draft create from reply.
|
|
||||||
* GODT-3048: WKD Policy behavior.
|
|
||||||
|
|
||||||
|
|
||||||
## Wakato Bridge 3.7.0
|
|
||||||
|
|
||||||
### Added
|
|
||||||
* Test(GODT-1224): Add testing around package creation.
|
|
||||||
* Add debug_assemble binary.
|
|
||||||
* Test(GODT-2723): Add importing a message with remote content.
|
|
||||||
* Test(GODT-2737): Sending HTML messages to internal.
|
|
||||||
* Test(GODT-3036): Keep inline attachment order on GPA Fake Server.
|
|
||||||
* GODT-3015: Add simple algorithm to deal with multiple attachment for bug report.
|
|
||||||
* Test: make message structure check more verbose.
|
|
||||||
* Test: Add test around account settings.
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
* GODT-3097: Warn about PGPInline encryption scheme which will be deprecated.
|
|
||||||
* Test: Support multiple users when waiting for sync event.
|
|
||||||
* Test: Update fake server with defautl draft content-type and test it.
|
|
||||||
* Test: be less aggressive while checking for message structure.
|
|
||||||
* GODT-2996: Set password fields to hidden when resetting the login form.
|
|
||||||
* GODT-2990: Change runner tags.
|
|
||||||
* GODT-2835: Bump GPA adding support for AsyncAttachments for BugReport +...
|
|
||||||
* GODT-2940: Allow 3 attempts for mailbox password.
|
|
||||||
* GODT-3095: Update GOpenPGP.
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
* GODT-3106: Broken import route.
|
|
||||||
* GODT-3041: Fix Invalid Or Missing message signature during send.
|
|
||||||
* GODT-3087: Exclude attachment content-disposition part when determining...
|
|
||||||
* GODT-2887: Inline images with Apple Mail.
|
|
||||||
* GODT-3100: Fix issue where a fatal error that bubble up to cli.Run() is not written in the log file.
|
|
||||||
* GODT-3094: Clean up old update files on bridge startup.
|
|
||||||
* GODT-3012: Fix multipart request retries.
|
|
||||||
* GODT-2935: Do not allow parentID into drafts.
|
|
||||||
* GODT-2935: Correct error message when draft fails to create.
|
|
||||||
* GODT-2970: Correctly handle rename of Inbox.
|
|
||||||
* GODT-2969: Prevent duration corruption for config status event.
|
|
||||||
* Fixed type in QA installer CI job name.
|
|
||||||
* GODT-3019: Fix title of main window when no account is connected.
|
|
||||||
* GODT-3013: IMAP service getting "stuck".
|
|
||||||
* GODT-2966: Allow permissive parsing of MediaType parameters for import.
|
|
||||||
* GODT-2966: Add more test regarding quoted/unquoted filename in attachment.
|
|
||||||
* GODT-2490: Fix sync progress not being reset when toggling split mode.
|
|
||||||
* GODT-2515: Customized notification of unavailable keychain on macOS.
|
|
||||||
|
|
||||||
|
|
||||||
## Vasco da Gama Bridge 3.6.1
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
* GODT-3033: Unable to receive new mail.
|
|
||||||
|
|
||||||
|
|
||||||
## Umshiang Bridge 3.5.4
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
* GODT-3033: Unable to receive new mail.
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## Vasco da Gama Bridge 3.6.0
|
|
||||||
|
|
||||||
### Added
|
|
||||||
* GODT-2762: Setup wizard.
|
|
||||||
* GODT-2772: Setup wizard content.
|
|
||||||
* GODT-2769: Setup Wizard architecture.
|
|
||||||
* GODT-2767: Setup Wizard foundations.
|
|
||||||
* GODT-2725: Implement receive message step with expected structure exposed.
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
* GODT-2960: Added content in empty view when there is no account.
|
|
||||||
* GODT-2771: Cert related tools for macOS.
|
|
||||||
* GODT-2770: Proof of concept for web view as a tool window and overlay (not used).
|
|
||||||
* GODT-2916: Split Decryption from Message Building.
|
|
||||||
* GODT-2597: Implement contact specific settings in integration tests.
|
|
||||||
* GODT-2664: Trigger QA installer.
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
* GODT-2992: Fix link in 'no account view' in main window after 2FA or TOTP are cancelled.
|
|
||||||
* GODT-2989: Allow to send bug report when no account connected.
|
|
||||||
* GODT-2988: Fix setup wizard KB links.
|
|
||||||
* GODT-2968: Use proper base64 encoded string even for bad password test.
|
|
||||||
* GODT-2965: Fix multipart/mixed testdata + structure parsing steps related to this.
|
|
||||||
* GODT-2932: Fix syncing not being reported in GUI.
|
|
||||||
* GODT-2967: Tray menu entries close the setup wizard when needed.
|
|
||||||
* GODT-2212: Preserver Header order in message building.
|
|
||||||
* Fixed missing GoOs gRPC call in bridge-gui-tester.
|
|
||||||
* GODT-2929: Message dedup with different text transfer encoding.
|
|
||||||
|
|
||||||
|
|
||||||
## Umshiang Bridge 3.5.3
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
* GODT-3004: Update gopenpgp and dependencies.
|
|
||||||
|
|
||||||
|
|
||||||
## Umshiang Bridge 3.5.2
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
* GODT-3003: Ensure IMAP State is reset after vault corruption.
|
|
||||||
* GODT-3001: Only create system labels during system label sync.
|
|
||||||
|
|
||||||
|
|
||||||
## Umshiang Bridge 3.5.1
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
* GODT-2963: Use multi error to report file removal errors.
|
|
||||||
* GODT-2956: Restore old deletion rules.
|
|
||||||
* GODT-2951: Negative WaitGroup Counter.
|
|
||||||
* GODT-2590: Fix send on closed channel.
|
|
||||||
* GODT-2949: Fix close of close channel in event service.
|
|
||||||
|
|
||||||
|
|
||||||
## Umshiang Bridge 3.5.0
|
|
||||||
|
|
||||||
### Added
|
|
||||||
* GODT-2734: Add testing steps to modify account settings.
|
|
||||||
* GODT-2746: Integration tests for reporting a problem.
|
|
||||||
* GODT-2891: Allow message create & delete during sync.
|
|
||||||
* GODT-2848: Decouple IMAP service from Event Loop.
|
|
||||||
* Add trace profiling option.
|
|
||||||
* GODT-2829: New Sync Service.
|
|
||||||
* Test: oss-fuzz support for fuzzing.
|
|
||||||
* GODT-2799: SMTP Service.
|
|
||||||
* GODT-2800: User Event Service.
|
|
||||||
* GODT-2801: Identity Service.
|
|
||||||
* GODT-2802: IMAP Serivce.
|
|
||||||
* GODT-2788: Add preview to bug report validation and JSON file validator.
|
|
||||||
* GODT-2803: Bridge Database access.
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
* GODT-2909: Remove Timeout on event publish.
|
|
||||||
* GODT-2913: Reduce the number of configuration failure detected.
|
|
||||||
* GODT-2828: Increase sync progress report frequency.
|
|
||||||
* Test: Fix TestBridge_SyncWithOnGoingEvents.
|
|
||||||
* GODT-2871: Is telemetry enabled as service.
|
|
||||||
* Test(GODT-2873): Wait for Gluon Watcher to finish.
|
|
||||||
* Test(GODT-2744): Add integration tests for moving messages (with MOVE support).
|
|
||||||
* Test(GODT-2872): Fix nightly job.
|
|
||||||
* Test(GODT-2742): Add more integration tests regarding drafts.
|
|
||||||
* GODT-2787: Force Scrollview to top when re-opening questions set.
|
|
||||||
* GODT-2787: Tweaking Bug Report form with last Review.
|
|
||||||
* Ci(GODT-2717): Create a job that will run on schedule.
|
|
||||||
* GODT-2787: Fix vertical alignement on CategoryItem.
|
|
||||||
* GODT-2842: Implement Bug Report Fallback notification.
|
|
||||||
* Chore(GODT-2848): Simplify User Event Service.
|
|
||||||
* GODT-2808: Apply comment from Bug Report content review.
|
|
||||||
* Test(GODT-2743): Sync high number of messages.
|
|
||||||
* GODT-2814: Standalone Server Manager.
|
|
||||||
* GODT-2808: Initial list of categories and questions.
|
|
||||||
* GODT-2787: Replace the PathTracker by a more visual NavigationIndicator.
|
|
||||||
* GODT-2816: Wait until mandatory fields are filled then fill body and title.
|
|
||||||
* GODT-2794: Clear cached answers when report is sent.
|
|
||||||
* GODT-2793: Feed the bug report body with the answered questions.
|
|
||||||
* GODT-2791: Parse the Bug Report Flow description file and ensure forward compatibility (GODT-2789).
|
|
||||||
* GODT-2821: Display questions in one page.
|
|
||||||
* GODT-2786: Init bug report flow description file.
|
|
||||||
* GODT-2792: Implement display of question set for bug report.
|
|
||||||
* Use qmlformat on qml files, and removed deprecated tests.
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
* GODT-2828: Fix negative report time.
|
|
||||||
* GODT-2828: Fix sync progress report after restart.
|
|
||||||
* GODT-2867: Do not crash on timeout or context cancel.
|
|
||||||
* GODT-2693: Duplicate messages in sent folder.
|
|
||||||
* GODT-2867: Get attachment returns API error on network problem.
|
|
||||||
* GODT-2805: Ignore Contact Group Labels.
|
|
||||||
* GODT-2866: Add 429/5xx Retry to Event Service.
|
|
||||||
* GODT-2855: Fix for text overlapping in settings view.
|
|
||||||
* Test: Verify leaks at end of WithEnv.
|
|
||||||
* Test: Fix event registration in TestBridge_SyncWithOngoingEvents.
|
|
||||||
* Test: Fix deadlock in chToType.
|
|
||||||
* GODT-2865: Add error on failed unlock.
|
|
||||||
* GODT-2857: Do not check changed values in clear recent flag.
|
|
||||||
* GODT-2827: Restore ticker to event poller.
|
|
||||||
* Test: TestBridge_SendAddTextBodyPartIfNotExists eventually fix.
|
|
||||||
* GODT-2813: Write new vault to temporary file first.
|
|
||||||
* GODT-2807: Fix issue where sessionID would not be removed from command-line on restart by bridge-gui.
|
|
||||||
* GODT-2687: Tabs after header field colon.
|
|
||||||
* GODT-2764: Allow perma-delete for messages which still have labels.
|
|
||||||
* GODT-2693: Fix message appearing twice after sent.
|
|
||||||
* GODT-2781: Try to remove stale lock file before failing in checkSingleInstance.
|
|
||||||
* GODT-2780: Fix 'QSystemTrayIcon::setVisible: No Icon set' warning in bridge-gui log on startup.
|
|
||||||
* GODT-2778: Fix login screen being disabled after an 'already logged in' error.
|
|
||||||
* Fix typos found by codespell.
|
|
||||||
* GODT-2577: Answered flag should only be applied to replied messages.
|
|
||||||
|
|
||||||
|
|
||||||
## Trift Bridge 3.4.1
|
## Trift Bridge 3.4.1
|
||||||
@ -321,7 +55,7 @@ Changelog [format](http://keepachangelog.com/en/1.0.0/)
|
|||||||
* GODT-2578: Refresh literals appended to Sent folder.
|
* GODT-2578: Refresh literals appended to Sent folder.
|
||||||
* GODT-2753: Vault test now check that value auto-assigned is first available port.
|
* GODT-2753: Vault test now check that value auto-assigned is first available port.
|
||||||
* GODT-2522: Handle migration with unreferenced db values.
|
* GODT-2522: Handle migration with unreferenced db values.
|
||||||
* GODT-2670: Allow missing whitespace after header field colon.
|
* GODT-2693: Allow missing whitespace after header field colon.
|
||||||
* GODT-2653: Only log when err is not nil.
|
* GODT-2653: Only log when err is not nil.
|
||||||
* GODT-2680: Fix for C++ debugger not working on ARM64 because of OpenSSL 3.1.
|
* GODT-2680: Fix for C++ debugger not working on ARM64 because of OpenSSL 3.1.
|
||||||
* GODT-2675: Update GPA to applye togin-gonic/gin patch + update COPYING_NOTES.
|
* GODT-2675: Update GPA to applye togin-gonic/gin patch + update COPYING_NOTES.
|
||||||
@ -406,7 +140,7 @@ Changelog [format](http://keepachangelog.com/en/1.0.0/)
|
|||||||
* GODT-2437: Silence harmless report to sentry.
|
* GODT-2437: Silence harmless report to sentry.
|
||||||
* GODT-2649: Clean up cache files after failed connector create (Gluon).
|
* GODT-2649: Clean up cache files after failed connector create (Gluon).
|
||||||
* GODT-2638: Validate messages before import.
|
* GODT-2638: Validate messages before import.
|
||||||
* GODT-2646: Bump GPA and Gluon dependency after CIRCL upgrade.
|
* GODT-2646: Bump GPA and Gluon dependecy after CIRCL upgrade.
|
||||||
* GODT-2454: Only Send status update if transaction succeeded.
|
* GODT-2454: Only Send status update if transaction succeeded.
|
||||||
* Test: fix flaky tests.
|
* Test: fix flaky tests.
|
||||||
* GODT-2628: Attempt to fix closed channel panic on logout.
|
* GODT-2628: Attempt to fix closed channel panic on logout.
|
||||||
@ -466,7 +200,7 @@ Changelog [format](http://keepachangelog.com/en/1.0.0/)
|
|||||||
* GODT-2574: Fix label/unlabel of large amounts of messages.
|
* GODT-2574: Fix label/unlabel of large amounts of messages.
|
||||||
* GODT-2573: Handle invalid header fields in message.
|
* GODT-2573: Handle invalid header fields in message.
|
||||||
* GODT-2573: Crash on null update.
|
* GODT-2573: Crash on null update.
|
||||||
* GODT-2407: Replace invalid email addresses with empty for new Drafts.
|
* GODT-2407: Replace invalid email addresses with emtpy for new Drafts.
|
||||||
|
|
||||||
## [Bridge 3.1.3] Quebec
|
## [Bridge 3.1.3] Quebec
|
||||||
|
|
||||||
@ -607,7 +341,7 @@ Changelog [format](http://keepachangelog.com/en/1.0.0/)
|
|||||||
* GODT-2429: Do not report context cancel to sentry.
|
* GODT-2429: Do not report context cancel to sentry.
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
* GODT-2467: elide long email addresses in 'bad event' QML notification dialog.
|
* GODT-2467: elide long email adresses in 'bad event' QML notification dialog.
|
||||||
* GODT-2449: fix bug in Bridge-GUI's Exception::what().
|
* GODT-2449: fix bug in Bridge-GUI's Exception::what().
|
||||||
* GODT-2427: Parsing header issues.
|
* GODT-2427: Parsing header issues.
|
||||||
* GODT-2426: Fix crash on user delete.
|
* GODT-2426: Fix crash on user delete.
|
||||||
@ -624,7 +358,7 @@ Changelog [format](http://keepachangelog.com/en/1.0.0/)
|
|||||||
* GODT-2404: Handle unexpected EOF.
|
* GODT-2404: Handle unexpected EOF.
|
||||||
* GODT-2400: Allow state updates to be applied if command fails.
|
* GODT-2400: Allow state updates to be applied if command fails.
|
||||||
* GODT-2399: Fix immediate message deletion during updates.
|
* GODT-2399: Fix immediate message deletion during updates.
|
||||||
* GODT-2390: Missing changes from previous commit.
|
* GODT-2390: Missing changes from pervious commit.
|
||||||
* GODT-2390: Add reports for uncaught json and net.opErr.
|
* GODT-2390: Add reports for uncaught json and net.opErr.
|
||||||
* GODT-2414: Multiple deletion bug in WriteControlledStore.
|
* GODT-2414: Multiple deletion bug in WriteControlledStore.
|
||||||
|
|
||||||
@ -689,7 +423,7 @@ GODT-1804: Preserve MIME parameters when uploading attachments.
|
|||||||
* GODT-2223: Improve event handling.
|
* GODT-2223: Improve event handling.
|
||||||
* GODT-2305: Detect missing gluon DB.
|
* GODT-2305: Detect missing gluon DB.
|
||||||
* GODT-2291: Change gluon store default location from Cache to Data.
|
* GODT-2291: Change gluon store default location from Cache to Data.
|
||||||
* Other: Disable dialer test until badssl cert is bumped.
|
* Other: Disable dialer test until badssl cert is bumbed.
|
||||||
* GODT-2292: Updated BUILDS.md doc.
|
* GODT-2292: Updated BUILDS.md doc.
|
||||||
* GODT-2258: suggest email as login when signing in via status window.
|
* GODT-2258: suggest email as login when signing in via status window.
|
||||||
* Other: Report corrupt and/or insecure vaults to sentry.
|
* Other: Report corrupt and/or insecure vaults to sentry.
|
||||||
@ -969,7 +703,7 @@ GODT-1804: Preserve MIME parameters when uploading attachments.
|
|||||||
## [Bridge 2.4.6] Osney
|
## [Bridge 2.4.6] Osney
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
* GODT-2019: When signing out and a single user is connected we do not go back to the welcome screen.
|
* GODT-2019: When signing out and a single user is connecte* we do not go back to the welcome screen.
|
||||||
* GODT-2071: Bridge-gui report error if an orphan bridge is detected.
|
* GODT-2071: Bridge-gui report error if an orphan bridge is detected.
|
||||||
* GODT-2046: Bridge-gui log is included in optional archive sent with bug reports.
|
* GODT-2046: Bridge-gui log is included in optional archive sent with bug reports.
|
||||||
* GODT-2039: Bridge monitors bridge-gui via its PID.
|
* GODT-2039: Bridge monitors bridge-gui via its PID.
|
||||||
@ -1123,7 +857,7 @@ GODT-1804: Preserve MIME parameters when uploading attachments.
|
|||||||
* GODT-1260: Renaming.
|
* GODT-1260: Renaming.
|
||||||
* GODT-1502: Rebranding: color and radius.
|
* GODT-1502: Rebranding: color and radius.
|
||||||
* GODT-1549: Add notification when address list changes.
|
* GODT-1549: Add notification when address list changes.
|
||||||
* GODT-1560: Dependency licenses update and link.
|
* GODT-1560: Dependecy licenses update and link.
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
* GODT-1543: Using one buffered event for off and on connection.
|
* GODT-1543: Using one buffered event for off and on connection.
|
||||||
@ -1220,7 +954,7 @@ GODT-1537: Manual in-app update mechanism.
|
|||||||
* GODT-1338: GODT-1343 Help view buttons.
|
* GODT-1338: GODT-1343 Help view buttons.
|
||||||
* GODT-1340: Not crashing, user list updating in main thread.
|
* GODT-1340: Not crashing, user list updating in main thread.
|
||||||
* GODT-1345: Adding panic handlers.
|
* GODT-1345: Adding panic handlers.
|
||||||
* GODT-1271: Fix Status margins.
|
* GODT-1271: Fix Status margings.
|
||||||
* GODT-1320: Add loading property to each action within a notification.
|
* GODT-1320: Add loading property to each action within a notification.
|
||||||
* GODT-1210: Add "free user" banner.
|
* GODT-1210: Add "free user" banner.
|
||||||
* GODT-1314: Limit description field length within 150/800 bounds.
|
* GODT-1314: Limit description field length within 150/800 bounds.
|
||||||
@ -1262,7 +996,7 @@ GODT-1537: Manual in-app update mechanism.
|
|||||||
* GODT-1381 Treat readonly folder as failure for cache on disk.
|
* GODT-1381 Treat readonly folder as failure for cache on disk.
|
||||||
* GODT-1431 Prevent watcher when not using disk on cache.
|
* GODT-1431 Prevent watcher when not using disk on cache.
|
||||||
* GODT-1381: Use in-memory cache in case local cache is unavailable.
|
* GODT-1381: Use in-memory cache in case local cache is unavailable.
|
||||||
* GODT-1356 GODT-1302: Cache on disk concurrency and API retries.
|
* GODT-1356 GODT-1302: Cache on disk concurency and API retries.
|
||||||
* GODT-1332 Added tests for cache move functions.
|
* GODT-1332 Added tests for cache move functions.
|
||||||
* GODT-1332: moved cache related functions to separate file.
|
* GODT-1332: moved cache related functions to separate file.
|
||||||
* GODT-1332 moving cache does not work on Windows.
|
* GODT-1332 moving cache does not work on Windows.
|
||||||
@ -1513,7 +1247,7 @@ GODT-1537: Manual in-app update mechanism.
|
|||||||
### Fixed
|
### Fixed
|
||||||
* GODT-1029 Fix tray icon not updating under certain conditions.
|
* GODT-1029 Fix tray icon not updating under certain conditions.
|
||||||
* GODT-1062 Fix lost notification bar when window is closed.
|
* GODT-1062 Fix lost notification bar when window is closed.
|
||||||
* GODT-1058 Install version after changing channel right away only in case of downgrade.
|
* 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-1073 Re-write autostart link on every start if turned on in preferences.
|
||||||
* GODT-1055 Fix flaky empty trash test.
|
* GODT-1055 Fix flaky empty trash test.
|
||||||
|
|
||||||
@ -1603,7 +1337,7 @@ GODT-1537: Manual in-app update mechanism.
|
|||||||
* GODT-820 Added GUI notification on impossibility of update installation (both silent and manual).
|
* 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-870 Added GUI notification on error during silent update.
|
||||||
* GODT-805 Added GUI notification on update available.
|
* GODT-805 Added GUI notification on update available.
|
||||||
* GODT-804 Added GUI notification on silent update installed (prompt to restart).
|
* 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-275 Added option to disable autoupdates in settings (default autoupdate is enabled).
|
||||||
* GODT-874 Added manual triggers to Updater module.
|
* GODT-874 Added manual triggers to Updater module.
|
||||||
* GODT-851 Added support of UID EXPUNGE.
|
* GODT-851 Added support of UID EXPUNGE.
|
||||||
@ -1927,7 +1661,7 @@ CSB-331 Fix sending error due to mixed case in sender address.
|
|||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
* GODT-360 Detect charset embedded in html/xml.
|
* GODT-360 Detect charset embedded in html/xml.
|
||||||
* GODT-354 Do not label/unlabel messages from `All Mail` folder.
|
* GODT-354 Do not label/unlabel messsages from `All Mail` folder.
|
||||||
* GODT-388 Support for both bridge and import/export credentials by package users.
|
* GODT-388 Support for both bridge and import/export credentials by package users.
|
||||||
* GODT-387 Store factory to make store optional.
|
* GODT-387 Store factory to make store optional.
|
||||||
* GODT-386 Renamed bridge to general users and keep bridge only for bridge stuff.
|
* GODT-386 Renamed bridge to general users and keep bridge only for bridge stuff.
|
||||||
@ -2092,13 +1826,13 @@ CSB-331 Fix sending error due to mixed case in sender address.
|
|||||||
* GODT-88 Run mbox sync in parallel when switch password mode (re-init not user).
|
* GODT-88 Run mbox sync in parallel when switch password mode (re-init not user).
|
||||||
* GODT-95 Do not throw error when trying to create new mailbox in IMAP root.
|
* GODT-95 Do not throw error when trying to create new mailbox in IMAP root.
|
||||||
* GODT-75 Do not fail on unlabel inside delete.
|
* GODT-75 Do not fail on unlabel inside delete.
|
||||||
* #1095 always delete IMAP USER including wrong password.
|
* #1095 always delete IMAP USER including wrong pasword.
|
||||||
* Unique pmapi client userID (including #1098).
|
* Unique pmapi client userID (including #1098).
|
||||||
* Using go.enmime@v0.6.1 snapshot.
|
* Using go.enmime@v0.6.1 snapshot.
|
||||||
* Better detection of non-auth-error.
|
* Better detection of non-auth-error.
|
||||||
* Reset `hasAuthChannel` during logout for proper login functionality (set up auth channel and unlock keys).
|
* Reset `hasAuthChannel` during logout for proper login functionality (set up auth channel and unlock keys).
|
||||||
* Allow `APPEND` messages without parsable email address in sender field.
|
* Allow `APPEND` messages without parsable email address in sender field.
|
||||||
* #1060 avoid `Append` after internal message ID was found and message was copied to mailbox using `MessageLabel`.
|
* #1060 avoid `Append` after internal message ID was found and message was copyed to mailbox using `MessageLabel`.
|
||||||
* #1049 Basic usage of store in SMTP package to poll event loop during sending message.
|
* #1049 Basic usage of store in SMTP package to poll event loop during sending message.
|
||||||
* #1050 pollNow waits for events to be processed.
|
* #1050 pollNow waits for events to be processed.
|
||||||
* #1047 Fix fetch of empty mailbox.
|
* #1047 Fix fetch of empty mailbox.
|
||||||
@ -2224,7 +1958,7 @@ CSB-331 Fix sending error due to mixed case in sender address.
|
|||||||
* #903 added http.Client timeout to not hang out forever.
|
* #903 added http.Client timeout to not hang out forever.
|
||||||
* Closing body after checking internet connection.
|
* Closing body after checking internet connection.
|
||||||
* Pedantic lint for bridgeUtils.
|
* Pedantic lint for bridgeUtils.
|
||||||
* Selected events are buffered and emitted again when frontend loop is ready.
|
* Selected events are buffered and emited again when frontend loop is ready.
|
||||||
* #890 implemented 2FA endpoint (auth split).
|
* #890 implemented 2FA endpoint (auth split).
|
||||||
* #888 TLS Cert.
|
* #888 TLS Cert.
|
||||||
* Error bar and modal with explanation in GUI.
|
* Error bar and modal with explanation in GUI.
|
||||||
@ -2232,7 +1966,7 @@ CSB-331 Fix sending error due to mixed case in sender address.
|
|||||||
* Add pinning to bridge (only for live API builds).
|
* Add pinning to bridge (only for live API builds).
|
||||||
* #887 #883:
|
* #887 #883:
|
||||||
* Wait before clearing data.
|
* Wait before clearing data.
|
||||||
* Configure which provides pmapi.ClientConfig and app directories.
|
* Configer which provides pmapi.ClientConfig and app directories.
|
||||||
* #861 restart after clear data.
|
* #861 restart after clear data.
|
||||||
* Panic handler for all goroutines.
|
* Panic handler for all goroutines.
|
||||||
* CD for linux.
|
* CD for linux.
|
||||||
@ -2280,7 +2014,7 @@ CSB-331 Fix sending error due to mixed case in sender address.
|
|||||||
* #882 unassign PMAPI client after logout and force to run garbage collector.
|
* #882 unassign PMAPI client after logout and force to run garbage collector.
|
||||||
* #880, #884, #885, #886 fix of informing user about outgoing non-encrypted e-mail.
|
* #880, #884, #885, #886 fix of informing user about outgoing non-encrypted e-mail.
|
||||||
* #838 `Sirupsen` -> `sirupsen`.
|
* #838 `Sirupsen` -> `sirupsen`.
|
||||||
* #893 save panic report file every time.
|
* #893 save panic report file everytime.
|
||||||
* #880 fix of informing user about outgoing non-encrypted e-mail.
|
* #880 fix of informing user about outgoing non-encrypted e-mail.
|
||||||
* Fix aliases in split mode.
|
* Fix aliases in split mode.
|
||||||
* Fix decrypted data in log notification.
|
* Fix decrypted data in log notification.
|
||||||
@ -2354,7 +2088,7 @@ CSB-331 Fix sending error due to mixed case in sender address.
|
|||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
* Fix custom message format.
|
* Fix custom message format.
|
||||||
* #802 accumulated long lines while parsing body structure.
|
* #802 acumulated long lines while parsing body structure.
|
||||||
* Process `AddressEvent` before `MessageEvent`.
|
* Process `AddressEvent` before `MessageEvent`.
|
||||||
* #791 updated crypto: fix wrong signature format.
|
* #791 updated crypto: fix wrong signature format.
|
||||||
* #793 fix returning size.
|
* #793 fix returning size.
|
||||||
@ -2376,7 +2110,7 @@ CSB-331 Fix sending error due to mixed case in sender address.
|
|||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
* #748 when charset missing assume utf8 and check the validity.
|
* #748 when charset missing assume utf8 and check the validity.
|
||||||
* #750 before sync check that events are up-to-date, if not poll events instead of sync.
|
* #750 before sync check that events are uptodate, if not poll events instead of sync.
|
||||||
* Use pmapi with support of decrypted access token.
|
* Use pmapi with support of decrypted access token.
|
||||||
* #750 Status is using DB status instead of API.
|
* #750 Status is using DB status instead of API.
|
||||||
* Format panic error as string instead of struct dump.
|
* Format panic error as string instead of struct dump.
|
||||||
@ -2393,7 +2127,7 @@ CSB-331 Fix sending error due to mixed case in sender address.
|
|||||||
* Full version of program visible on release notes.
|
* Full version of program visible on release notes.
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
* #720 only one concurrent DB sync.
|
* #720 only one concurent DB sync.
|
||||||
* #720 sync every 3 pages.
|
* #720 sync every 3 pages.
|
||||||
* #512 extending list of charsets go-pm-mime!4.
|
* #512 extending list of charsets go-pm-mime!4.
|
||||||
|
|
||||||
@ -2417,7 +2151,7 @@ CSB-331 Fix sending error due to mixed case in sender address.
|
|||||||
* Fix srp modulus issue with new `ProtonMail/crypto`.
|
* Fix srp modulus issue with new `ProtonMail/crypto`.
|
||||||
* Generate version files from main file.
|
* Generate version files from main file.
|
||||||
* Be able to set update set on build.
|
* Be able to set update set on build.
|
||||||
* #597 check on start that certificate will be still valid after one month and generate new cert if not.
|
* #597 check on start that certificat will be still valid after one month and generate new cert if not.
|
||||||
* #597 extended certificate validity to 2 years.
|
* #597 extended certificate validity to 2 years.
|
||||||
* Copyright 2019.
|
* Copyright 2019.
|
||||||
* Exclude `protontech` repos from credits.
|
* Exclude `protontech` repos from credits.
|
||||||
@ -2436,7 +2170,7 @@ CSB-331 Fix sending error due to mixed case in sender address.
|
|||||||
* #592 internal references are added only when not present already.
|
* #592 internal references are added only when not present already.
|
||||||
* #592 field `Date` changed to m.Time only when wrong format or missing `Date`.
|
* #592 field `Date` changed to m.Time only when wrong format or missing `Date`.
|
||||||
* #645 pmapi#26 `Message.Flags` instead of `IsEncrypted`, `Type`, `IsReplied`, `IsRepliedAll`, `IsForwarded`.
|
* #645 pmapi#26 `Message.Flags` instead of `IsEncrypted`, `Type`, `IsReplied`, `IsRepliedAll`, `IsForwarded`.
|
||||||
* DB: do not allow to put Body or Attachments to db.
|
* DB: do not allow to put Body or Attachements to db.
|
||||||
* #574 SMTP: can now send more than one email.
|
* #574 SMTP: can now send more than one email.
|
||||||
* #671 Verbosity levels: `debug` (only bridge), `debug-client` (bridge and client communication), `debug-server` (bridge, whole SMTP/IMAP communication).
|
* #671 Verbosity levels: `debug` (only bridge), `debug-client` (bridge and client communication), `debug-server` (bridge, whole SMTP/IMAP communication).
|
||||||
* #644 Return rfc.size 0 or correct size of fetched body (stored in DB).
|
* #644 Return rfc.size 0 or correct size of fetched body (stored in DB).
|
||||||
@ -2508,7 +2242,7 @@ CSB-331 Fix sending error due to mixed case in sender address.
|
|||||||
* Start with new versioning.
|
* Start with new versioning.
|
||||||
|
|
||||||
1.1.0
|
1.1.0
|
||||||
| | `--- bug fix number (internal, irregular, beta releases)
|
| | `--- bug fix number (internal, irregular, beta relases)
|
||||||
| `----- minor version (features, release once per month, live release, milestones)
|
| `----- minor version (features, release once per month, live release, milestones)
|
||||||
`------- major version (big changes, once per year, breaking changes, api force upgrade)
|
`------- major version (big changes, once per year, breaking changes, api force upgrade)
|
||||||
|
|
||||||
@ -2574,7 +2308,7 @@ CSB-331 Fix sending error due to mixed case in sender address.
|
|||||||
* All `client.Do` errors are interpreted as connection issue.
|
* All `client.Do` errors are interpreted as connection issue.
|
||||||
* Moved to internal gitlab.
|
* Moved to internal gitlab.
|
||||||
* Typo `frontend-qml`.
|
* Typo `frontend-qml`.
|
||||||
* Better message for case when server is not reachable.
|
* Better message for case when server is not reacheable.
|
||||||
* Setting 1min timeout to IMAP connection.
|
* Setting 1min timeout to IMAP connection.
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
@ -2606,12 +2340,12 @@ CSB-331 Fix sending error due to mixed case in sender address.
|
|||||||
* Keychain format and function refactor.
|
* Keychain format and function refactor.
|
||||||
* Create crash file on panic with full trace.
|
* Create crash file on panic with full trace.
|
||||||
* Clear old data only in main process (no double keychain typing).
|
* Clear old data only in main process (no double keychain typing).
|
||||||
* Create label update API route.
|
* Create label udpate API route.
|
||||||
* Selectable text in release notes.
|
* Selectable text in release notes.
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
* Support sending to external PGP recipients.
|
* Support sending to external PGP recipients.
|
||||||
* Return error codes: `0: Ok`, `2: Frontend crashed`, `3: Bridge already running`, `4: Unknown argument`, `42: Restart application`.
|
* Return error codes: `0: Ok`, `2: Frontend crashed`, `3: Bridge already running`, `4: Uknown argument`, `42: Restart application`.
|
||||||
|
|
||||||
### Release notes
|
### Release notes
|
||||||
* 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).
|
* 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).
|
||||||
@ -2636,7 +2370,7 @@ CSB-331 Fix sending error due to mixed case in sender address.
|
|||||||
* Bug report window.
|
* Bug report window.
|
||||||
* Checkbox and with label (only I/E).
|
* Checkbox and with label (only I/E).
|
||||||
* Error dialog and Info tooltip (only I/E).
|
* Error dialog and Info tooltip (only I/E).
|
||||||
* Add user modal formatting (colors, text).
|
* Add user modal formating (colors, text).
|
||||||
* Account view style.
|
* Account view style.
|
||||||
* Input box style (used in bug report).
|
* Input box style (used in bug report).
|
||||||
* Input field style (used in add account and change port).
|
* Input field style (used in add account and change port).
|
||||||
|
|||||||
47
Makefile
47
Makefile
@ -11,7 +11,7 @@ ROOT_DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
|
|||||||
.PHONY: build build-gui build-nogui build-launcher versioner hasher
|
.PHONY: build build-gui build-nogui build-launcher versioner hasher
|
||||||
|
|
||||||
# Keep version hardcoded so app build works also without Git repository.
|
# Keep version hardcoded so app build works also without Git repository.
|
||||||
BRIDGE_APP_VERSION?=3.8.2+git
|
BRIDGE_APP_VERSION?=3.4.2+git
|
||||||
APP_VERSION:=${BRIDGE_APP_VERSION}
|
APP_VERSION:=${BRIDGE_APP_VERSION}
|
||||||
APP_FULL_NAME:=Proton Mail Bridge
|
APP_FULL_NAME:=Proton Mail Bridge
|
||||||
APP_VENDOR:=Proton AG
|
APP_VENDOR:=Proton AG
|
||||||
@ -246,7 +246,7 @@ test-race: gofiles
|
|||||||
test-integration: gofiles
|
test-integration: gofiles
|
||||||
mkdir -p coverage/integration
|
mkdir -p coverage/integration
|
||||||
go test \
|
go test \
|
||||||
-v -timeout=60m -p=1 -count=1 -tags=test_integration \
|
-v -timeout=60m -p=1 -count=1 \
|
||||||
${GOCOVERAGE} \
|
${GOCOVERAGE} \
|
||||||
github.com/ProtonMail/proton-bridge/v3/tests \
|
github.com/ProtonMail/proton-bridge/v3/tests \
|
||||||
${GOCOVERDIR}/integration
|
${GOCOVERDIR}/integration
|
||||||
@ -258,22 +258,6 @@ test-integration-debug: gofiles
|
|||||||
test-integration-race: gofiles
|
test-integration-race: gofiles
|
||||||
go test -v -timeout=60m -p=1 -count=1 -race -failfast github.com/ProtonMail/proton-bridge/v3/tests
|
go test -v -timeout=60m -p=1 -count=1 -race -failfast github.com/ProtonMail/proton-bridge/v3/tests
|
||||||
|
|
||||||
test-integration-nightly: gofiles
|
|
||||||
mkdir -p coverage/integration
|
|
||||||
go test \
|
|
||||||
-v -timeout=90m -p=1 -count=1 -tags=test_integration \
|
|
||||||
${GOCOVERAGE} \
|
|
||||||
github.com/ProtonMail/proton-bridge/v3/tests \
|
|
||||||
${GOCOVERDIR}/integration \
|
|
||||||
nightly
|
|
||||||
|
|
||||||
fuzz: gofiles
|
|
||||||
go test -fuzz=FuzzUnmarshal -parallel=4 -fuzztime=60s $(PWD)/internal/legacy/credentials
|
|
||||||
go test -fuzz=FuzzNewParser -parallel=4 -fuzztime=60s $(PWD)/pkg/message/parser
|
|
||||||
go test -fuzz=FuzzReadHeaderBody -parallel=4 -fuzztime=60s $(PWD)/pkg/message
|
|
||||||
go test -fuzz=FuzzDecodeHeader -parallel=4 -fuzztime=60s $(PWD)/pkg/mime
|
|
||||||
go test -fuzz=FuzzDecodeCharset -parallel=4 -fuzztime=60s $(PWD)/pkg/mime
|
|
||||||
|
|
||||||
bench:
|
bench:
|
||||||
go test -run '^$$' -bench=. -memprofile bench_mem.pprof -cpuprofile bench_cpu.pprof ./internal/store
|
go test -run '^$$' -bench=. -memprofile bench_mem.pprof -cpuprofile bench_cpu.pprof ./internal/store
|
||||||
go tool pprof -png -output bench_mem.png bench_mem.pprof
|
go tool pprof -png -output bench_mem.png bench_mem.pprof
|
||||||
@ -290,23 +274,9 @@ mocks:
|
|||||||
mockgen --package mocks github.com/ProtonMail/proton-bridge/v3/internal/updater Downloader,Installer > internal/updater/mocks/mocks.go
|
mockgen --package mocks github.com/ProtonMail/proton-bridge/v3/internal/updater Downloader,Installer > internal/updater/mocks/mocks.go
|
||||||
mockgen --package mocks github.com/ProtonMail/proton-bridge/v3/internal/telemetry HeartbeatManager > internal/telemetry/mocks/mocks.go
|
mockgen --package mocks github.com/ProtonMail/proton-bridge/v3/internal/telemetry HeartbeatManager > internal/telemetry/mocks/mocks.go
|
||||||
cp internal/telemetry/mocks/mocks.go internal/bridge/mocks/telemetry_mocks.go
|
cp internal/telemetry/mocks/mocks.go internal/bridge/mocks/telemetry_mocks.go
|
||||||
mockgen --package mocks github.com/ProtonMail/proton-bridge/v3/internal/services/userevents \
|
mockgen --package mocks github.com/ProtonMail/proton-bridge/v3/internal/user MessageDownloader > internal/user/mocks/mocks.go
|
||||||
EventSource,EventIDStore > internal/services/userevents/mocks/mocks.go
|
|
||||||
mockgen --package userevents github.com/ProtonMail/proton-bridge/v3/internal/services/userevents \
|
|
||||||
EventSubscriber,MessageEventHandler,LabelEventHandler,AddressEventHandler,RefreshEventHandler,UserEventHandler,UserUsedSpaceEventHandler > tmp
|
|
||||||
mv tmp internal/services/userevents/mocks_test.go
|
|
||||||
mockgen --package mocks github.com/ProtonMail/proton-bridge/v3/internal/events EventPublisher \
|
|
||||||
> internal/events/mocks/mocks.go
|
|
||||||
mockgen --package mocks github.com/ProtonMail/proton-bridge/v3/internal/services/useridentity IdentityProvider,Telemetry \
|
|
||||||
> internal/services/useridentity/mocks/mocks.go
|
|
||||||
mockgen --self_package "github.com/ProtonMail/proton-bridge/v3/internal/services/syncservice" -package syncservice github.com/ProtonMail/proton-bridge/v3/internal/services/syncservice \
|
|
||||||
ApplyStageInput,BuildStageInput,BuildStageOutput,DownloadStageInput,DownloadStageOutput,MetadataStageInput,MetadataStageOutput,\
|
|
||||||
StateProvider,Regulator,UpdateApplier,MessageBuilder,APIClient,Reporter,DownloadRateModifier \
|
|
||||||
> tmp
|
|
||||||
mv tmp internal/services/syncservice/mocks_test.go
|
|
||||||
mockgen --package mocks github.com/ProtonMail/gluon/connector IMAPStateWrite > internal/services/imapservice/mocks/mocks.go
|
|
||||||
|
|
||||||
lint: gofiles lint-golang lint-license lint-dependencies lint-changelog lint-bug-report
|
lint: gofiles lint-golang lint-license lint-dependencies lint-changelog
|
||||||
|
|
||||||
lint-license:
|
lint-license:
|
||||||
./utils/missing_license.sh check
|
./utils/missing_license.sh check
|
||||||
@ -322,11 +292,12 @@ lint-golang:
|
|||||||
$(info linting with GOMAXPROCS=${GOMAXPROCS})
|
$(info linting with GOMAXPROCS=${GOMAXPROCS})
|
||||||
golangci-lint run ./...
|
golangci-lint run ./...
|
||||||
|
|
||||||
lint-bug-report:
|
gobinsec: gobinsec-cache.yml build
|
||||||
python3 utils/validate_bug_report_file.py --file "internal/frontend/bridge-gui/bridge-gui/qml/Resources/bug_report_flow.json"
|
gobinsec -wait -cache -config utils/gobinsec_conf.yml ${EXE_TARGET} ${DEPLOY_DIR}/${TARGET_OS}/${LAUNCHER_EXE}
|
||||||
|
|
||||||
lint-bug-report-preview:
|
gobinsec-cache.yml:
|
||||||
python3 utils/validate_bug_report_file.py --file "internal/frontend/bridge-gui/bridge-gui/qml/Resources/bug_report_flow.json" --preview
|
./utils/gobinsec_update.sh
|
||||||
|
cp ./utils/gobinsec_update/gobinsec-cache-valid.yml ./gobinsec-cache.yml
|
||||||
|
|
||||||
updates: install-go-mod-outdated
|
updates: install-go-mod-outdated
|
||||||
# Uncomment the "-ci" to fail the job if something can be updated.
|
# Uncomment the "-ci" to fail the job if something can be updated.
|
||||||
|
|||||||
69
ci/build.yml
69
ci/build.yml
@ -1,69 +0,0 @@
|
|||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
.script-build:
|
|
||||||
stage: build
|
|
||||||
needs: ["lint"]
|
|
||||||
extends:
|
|
||||||
- .rules-branch-and-MR-manual
|
|
||||||
script:
|
|
||||||
- make build
|
|
||||||
- git diff && git diff-index --quiet HEAD
|
|
||||||
- make vault-editor
|
|
||||||
artifacts:
|
|
||||||
expire_in: 1 day
|
|
||||||
when: always
|
|
||||||
name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
|
|
||||||
paths:
|
|
||||||
- bridge_*.tgz
|
|
||||||
- vault-editor
|
|
||||||
|
|
||||||
build-linux:
|
|
||||||
extends:
|
|
||||||
- .script-build
|
|
||||||
- .env-linux-build
|
|
||||||
|
|
||||||
build-linux-qa:
|
|
||||||
extends:
|
|
||||||
- build-linux
|
|
||||||
- .rules-branch-manual-MR-and-devel-always
|
|
||||||
variables:
|
|
||||||
BUILD_TAGS: "build_qa"
|
|
||||||
|
|
||||||
build-darwin:
|
|
||||||
extends:
|
|
||||||
- .script-build
|
|
||||||
- .env-darwin
|
|
||||||
|
|
||||||
build-darwin-qa:
|
|
||||||
extends:
|
|
||||||
- build-darwin
|
|
||||||
variables:
|
|
||||||
BUILD_TAGS: "build_qa"
|
|
||||||
|
|
||||||
build-windows:
|
|
||||||
extends:
|
|
||||||
- .script-build
|
|
||||||
- .env-windows
|
|
||||||
|
|
||||||
build-windows-qa:
|
|
||||||
extends:
|
|
||||||
- build-windows
|
|
||||||
variables:
|
|
||||||
BUILD_TAGS: "build_qa"
|
|
||||||
|
|
||||||
trigger-qa-installer:
|
|
||||||
stage: build
|
|
||||||
needs: ["lint"]
|
|
||||||
extends:
|
|
||||||
- .rules-br-tag-always-branch-and-MR-manual
|
|
||||||
variables:
|
|
||||||
APP: bridge
|
|
||||||
WORKFLOW: build-all
|
|
||||||
SRC_TAG: $CI_COMMIT_BRANCH
|
|
||||||
TAG: $CI_COMMIT_TAG
|
|
||||||
SRC_HASH: $CI_COMMIT_SHA
|
|
||||||
trigger:
|
|
||||||
project: "jcuth/bridge-release"
|
|
||||||
branch: release/xikou
|
|
||||||
|
|
||||||
62
ci/env.yml
62
ci/env.yml
@ -1,62 +0,0 @@
|
|||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
.env-windows:
|
|
||||||
before_script:
|
|
||||||
- export BRIDGE_SYNC_FORCE_MINIMUM_SPEC=1
|
|
||||||
- export GOROOT=/c/Go1.20/
|
|
||||||
- export PATH=$GOROOT/bin:$PATH
|
|
||||||
- export GOARCH=amd64
|
|
||||||
- export GOPATH=~/go1.20
|
|
||||||
- export GO111MODULE=on
|
|
||||||
- export PATH="${GOPATH}/bin:${PATH}"
|
|
||||||
- export MSYSTEM=
|
|
||||||
- export QT6DIR=/c/grrrQt/6.4.3/msvc2019_64
|
|
||||||
- export PATH=$PATH:${QT6DIR}/bin
|
|
||||||
- export PATH="/c/Program Files/Microsoft Visual Studio/2022/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin:$PATH"
|
|
||||||
- $(git config --global -l | grep -o 'url.*gitlab.protontech.ch.*insteadof' | xargs -L 1 git config --global --unset &> /dev/null) || echo "nothing to remove"
|
|
||||||
- git config --global url.https://gitlab-ci-token:${CI_JOB_TOKEN}@${CI_SERVER_HOST}.insteadOf https://${CI_SERVER_HOST}
|
|
||||||
- git config --global safe.directory '*'
|
|
||||||
- git status --porcelain
|
|
||||||
cache: {}
|
|
||||||
tags:
|
|
||||||
- windows-bridge
|
|
||||||
|
|
||||||
.env-darwin:
|
|
||||||
before_script:
|
|
||||||
- export BRIDGE_SYNC_FORCE_MINIMUM_SPEC=1
|
|
||||||
- export PATH=/usr/local/bin:$PATH
|
|
||||||
- export PATH=/usr/local/opt/git/bin:$PATH
|
|
||||||
- export PATH=/usr/local/opt/make/libexec/gnubin:$PATH
|
|
||||||
- export PATH=/usr/local/opt/gnu-sed/libexec/gnubin:$PATH
|
|
||||||
- export GOROOT=~/local/opt/go@1.20
|
|
||||||
- export PATH="${GOROOT}/bin:$PATH"
|
|
||||||
- export GOPATH=~/go1.20
|
|
||||||
- export PATH="${GOPATH}/bin:$PATH"
|
|
||||||
- export QT6DIR=/opt/Qt/6.4.3/macos
|
|
||||||
- export PATH="${QT6DIR}/bin:$PATH"
|
|
||||||
- uname -a
|
|
||||||
cache: {}
|
|
||||||
tags:
|
|
||||||
- macos-m1-bridge
|
|
||||||
|
|
||||||
.env-linux-build:
|
|
||||||
image: gitlab.protontech.ch:4567/go/bridge-internal:build-go1.20-qt6.4.3
|
|
||||||
variables:
|
|
||||||
VCPKG_DEFAULT_BINARY_CACHE: ${CI_PROJECT_DIR}/.cache
|
|
||||||
cache:
|
|
||||||
key: linux-vcpkg
|
|
||||||
paths:
|
|
||||||
- .cache
|
|
||||||
when: 'always'
|
|
||||||
before_script:
|
|
||||||
- mkdir -p .cache/bin
|
|
||||||
- export BRIDGE_SYNC_FORCE_MINIMUM_SPEC=1
|
|
||||||
- export PATH=$(pwd)/.cache/bin:$PATH
|
|
||||||
- export GOPATH="$CI_PROJECT_DIR/.cache"
|
|
||||||
- export PATH=$PATH:$QT6DIR/bin
|
|
||||||
- $(git config --global -l | grep -o 'url.*gitlab.protontech.ch.*insteadof' | xargs -L 1 git config --global --unset &> /dev/null) || echo "nothing to remove"
|
|
||||||
- git config --global url.https://gitlab-ci-token:${CI_JOB_TOKEN}@${CI_SERVER_HOST}.insteadOf https://${CI_SERVER_HOST}
|
|
||||||
tags:
|
|
||||||
- shared-large
|
|
||||||
|
|
||||||
58
ci/rules.yml
58
ci/rules.yml
@ -1,58 +0,0 @@
|
|||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
.rules-branch-and-MR-manual:
|
|
||||||
rules:
|
|
||||||
- if: $CI_COMMIT_BRANCH || $CI_PIPELINE_SOURCE == "merge_request_event"
|
|
||||||
when: manual
|
|
||||||
allow_failure: true
|
|
||||||
- when: never
|
|
||||||
|
|
||||||
.rules-branch-manual-MR-and-devel-always:
|
|
||||||
rules:
|
|
||||||
- if: $CI_COMMIT_BRANCH == "devel" || $CI_PIPELINE_SOURCE == "merge_request_event"
|
|
||||||
when: always
|
|
||||||
allow_failure: false
|
|
||||||
- if: $CI_COMMIT_BRANCH
|
|
||||||
when: manual
|
|
||||||
allow_failure: true
|
|
||||||
- when: never
|
|
||||||
|
|
||||||
.rules-branch-manual-br-tag-and-MR-and-devel-always:
|
|
||||||
rules:
|
|
||||||
- if: $CI_COMMIT_BRANCH == "devel" || $CI_PIPELINE_SOURCE == "merge_request_event"
|
|
||||||
when: always
|
|
||||||
allow_failure: false
|
|
||||||
- if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_TAG =~ /^br-\d+/
|
|
||||||
when: always
|
|
||||||
allow_failure: false
|
|
||||||
- if: $CI_COMMIT_BRANCH
|
|
||||||
when: manual
|
|
||||||
allow_failure: true
|
|
||||||
- when: never
|
|
||||||
|
|
||||||
.rules-branch-manual-scheduled-and-test-branch-always:
|
|
||||||
rules:
|
|
||||||
- if: $CI_PIPELINE_SOURCE == "schedule"
|
|
||||||
when: always
|
|
||||||
allow_failure: false
|
|
||||||
- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME=~ /^test/
|
|
||||||
when: always
|
|
||||||
allow_failure: false
|
|
||||||
- if: $CI_COMMIT_BRANCH
|
|
||||||
when: manual
|
|
||||||
allow_failure: true
|
|
||||||
- when: never
|
|
||||||
|
|
||||||
.rules-br-tag-always-branch-and-MR-manual:
|
|
||||||
rules:
|
|
||||||
- if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH
|
|
||||||
when: manual
|
|
||||||
allow_failure: true
|
|
||||||
- if: $CI_PIPELINE_SOURCE == 'merge_request_event'
|
|
||||||
when: manual
|
|
||||||
allow_failure: true
|
|
||||||
- if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_TAG =~ /^br-\d+/
|
|
||||||
when: always
|
|
||||||
- when: never
|
|
||||||
|
|
||||||
128
ci/test.yml
128
ci/test.yml
@ -1,128 +0,0 @@
|
|||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
lint:
|
|
||||||
stage: test
|
|
||||||
extends:
|
|
||||||
- .rules-branch-manual-br-tag-and-MR-and-devel-always
|
|
||||||
script:
|
|
||||||
- make lint
|
|
||||||
tags:
|
|
||||||
- shared-medium
|
|
||||||
|
|
||||||
bug-report-preview:
|
|
||||||
stage: test
|
|
||||||
extends:
|
|
||||||
- .rules-branch-and-MR-manual
|
|
||||||
script:
|
|
||||||
- make lint-bug-report-preview
|
|
||||||
tags:
|
|
||||||
- shared-medium
|
|
||||||
|
|
||||||
.script-test:
|
|
||||||
stage: test
|
|
||||||
extends:
|
|
||||||
- .rules-branch-manual-MR-and-devel-always
|
|
||||||
script:
|
|
||||||
- make test
|
|
||||||
artifacts:
|
|
||||||
paths:
|
|
||||||
- coverage/**
|
|
||||||
|
|
||||||
test-linux:
|
|
||||||
extends:
|
|
||||||
- .script-test
|
|
||||||
tags:
|
|
||||||
- shared-large
|
|
||||||
|
|
||||||
fuzz-linux:
|
|
||||||
stage: test
|
|
||||||
extends:
|
|
||||||
- .rules-branch-manual-MR-and-devel-always
|
|
||||||
script:
|
|
||||||
- make fuzz
|
|
||||||
tags:
|
|
||||||
- shared-large
|
|
||||||
|
|
||||||
test-linux-race:
|
|
||||||
extends:
|
|
||||||
- test-linux
|
|
||||||
- .rules-branch-and-MR-manual
|
|
||||||
script:
|
|
||||||
- make test-race
|
|
||||||
|
|
||||||
test-integration:
|
|
||||||
extends:
|
|
||||||
- test-linux
|
|
||||||
script:
|
|
||||||
- make test-integration
|
|
||||||
|
|
||||||
test-integration-race:
|
|
||||||
extends:
|
|
||||||
- test-integration
|
|
||||||
- .rules-branch-and-MR-manual
|
|
||||||
script:
|
|
||||||
- make test-integration-race
|
|
||||||
|
|
||||||
test-integration-nightly:
|
|
||||||
extends:
|
|
||||||
- test-integration
|
|
||||||
- .rules-branch-manual-scheduled-and-test-branch-always
|
|
||||||
needs:
|
|
||||||
- test-integration
|
|
||||||
script:
|
|
||||||
- make test-integration-nightly | tee -a nightly-job.log
|
|
||||||
artifacts:
|
|
||||||
when: always
|
|
||||||
paths:
|
|
||||||
- nightly-job.log
|
|
||||||
|
|
||||||
test-windows:
|
|
||||||
extends:
|
|
||||||
- .env-windows
|
|
||||||
- .script-test
|
|
||||||
|
|
||||||
test-darwin:
|
|
||||||
extends:
|
|
||||||
- .env-darwin
|
|
||||||
- .script-test
|
|
||||||
|
|
||||||
test-coverage:
|
|
||||||
stage: test
|
|
||||||
extends:
|
|
||||||
- .rules-branch-manual-scheduled-and-test-branch-always
|
|
||||||
script:
|
|
||||||
- ./utils/coverage.sh
|
|
||||||
coverage: '/total:.*\(statements\).*\d+\.\d+%/'
|
|
||||||
needs:
|
|
||||||
- test-linux
|
|
||||||
- test-windows
|
|
||||||
- test-darwin
|
|
||||||
- test-integration
|
|
||||||
- test-integration-nightly
|
|
||||||
tags:
|
|
||||||
- shared-small
|
|
||||||
artifacts:
|
|
||||||
paths:
|
|
||||||
- coverage*
|
|
||||||
- coverage/**
|
|
||||||
when: 'always'
|
|
||||||
reports:
|
|
||||||
coverage_report:
|
|
||||||
coverage_format: cobertura
|
|
||||||
path: coverage.xml
|
|
||||||
|
|
||||||
go-vuln-check:
|
|
||||||
extends:
|
|
||||||
- .rules-branch-manual-MR-and-devel-always
|
|
||||||
stage: test
|
|
||||||
tags:
|
|
||||||
- shared-medium
|
|
||||||
script:
|
|
||||||
- apt-get -y install jq
|
|
||||||
- ./utils/govulncheck.sh
|
|
||||||
artifacts:
|
|
||||||
when: always
|
|
||||||
paths:
|
|
||||||
- vulns*
|
|
||||||
|
|
||||||
@ -23,6 +23,7 @@ import (
|
|||||||
|
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/app"
|
"github.com/ProtonMail/proton-bridge/v3/internal/app"
|
||||||
"github.com/bradenaw/juniper/xslices"
|
"github.com/bradenaw/juniper/xslices"
|
||||||
|
"github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -43,5 +44,7 @@ import (
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
_ = app.New().Run(xslices.Filter(os.Args, func(arg string) bool { return !strings.Contains(arg, "-psn_") }))
|
if err := app.New().Run(xslices.Filter(os.Args, func(arg string) bool { return !strings.Contains(arg, "-psn_") })); err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -2,13 +2,13 @@
|
|||||||
|
|
||||||
## First login and sync
|
## First login and sync
|
||||||
|
|
||||||
When user logs in to the bridge for the first time, immediately starts the first sync.
|
When user logs in to the bridge for the first time, immediatelly starts the first sync.
|
||||||
First sync downloads all headers of all e-mails and creates database to have proper UIDs
|
First sync downloads all headers of all e-mails and creates database to have proper UIDs
|
||||||
and indexes for IMAP. See [database](database.md) for more information.
|
and indexes for IMAP. See [database](database.md) for more information.
|
||||||
|
|
||||||
By default, whenever it's possible, sync downloads only all e-mails maiblox which already
|
By default, whenever it's possible, sync downloads only all e-mails maiblox which already
|
||||||
have list of labels so we can construct all mailboxes (inbox, sent, trash, custom folders
|
have list of labels so we can construct all mailboxes (inbox, sent, trash, custom folders
|
||||||
and labels) without need to download each e-mail headers many times.
|
and lables) without need to download each e-mail headers many times.
|
||||||
|
|
||||||
Note that we need to download also bodies to calculate size of the e-mail and set proper
|
Note that we need to download also bodies to calculate size of the e-mail and set proper
|
||||||
content type (clients uses content type for guess if e-mail contains attachment)--but only
|
content type (clients uses content type for guess if e-mail contains attachment)--but only
|
||||||
@ -22,7 +22,7 @@ client right after adding account.
|
|||||||
|
|
||||||
When account is added to client, client start the sync. This sync will ask Bridge app
|
When account is added to client, client start the sync. This sync will ask Bridge app
|
||||||
for all headers (done quickly) and then starts to download all bodies and attachment.
|
for all headers (done quickly) and then starts to download all bodies and attachment.
|
||||||
Unfortunately for some e-mail more than once if the same e-mail is in more mailboxes
|
Unfortunatelly for some e-mail more than once if the same e-mail is in more mailboxes
|
||||||
(e.g. inbox and all mail)--there is no way to tell over IMAP it's the same message.
|
(e.g. inbox and all mail)--there is no way to tell over IMAP it's the same message.
|
||||||
|
|
||||||
After successful login of client to IMAP, Bridge starts event loop. That periodicly ask
|
After successful login of client to IMAP, Bridge starts event loop. That periodicly ask
|
||||||
@ -37,7 +37,7 @@ sequenceDiagram
|
|||||||
Note right of B: Set up PM account<br/>by user
|
Note right of B: Set up PM account<br/>by user
|
||||||
|
|
||||||
loop First sync
|
loop First sync
|
||||||
B ->> S: Fetch body and attachments
|
B ->> S: Fetch body and attachements
|
||||||
Note right of B: Build local database<br/>(e-mail UIDs)
|
Note right of B: Build local database<br/>(e-mail UIDs)
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -58,8 +58,8 @@ sequenceDiagram
|
|||||||
C ->> B: IMAP SELECT directory
|
C ->> B: IMAP SELECT directory
|
||||||
C ->> B: IMAP SEARCH e-mails UIDs
|
C ->> B: IMAP SEARCH e-mails UIDs
|
||||||
C ->> B: IMAP FETCH of e-mail UID
|
C ->> B: IMAP FETCH of e-mail UID
|
||||||
B ->> S: Fetch body and attachments
|
B ->> S: Fetch body and attachements
|
||||||
Note right of B: Decrypt message<br/>and attachment
|
Note right of B: Decrypt message<br/>and attachement
|
||||||
B ->> C: IMAP response
|
B ->> C: IMAP response
|
||||||
end
|
end
|
||||||
```
|
```
|
||||||
|
|||||||
@ -1,12 +1,12 @@
|
|||||||
# Update mechanism of Bridge
|
# Update mechanism of Bridge
|
||||||
|
|
||||||
There are multiple options how to change version of application:
|
There are mulitple options how to change version of application:
|
||||||
* Automatic in-app update
|
* Automatic in-app update
|
||||||
* Manual in-app update
|
* Manual in-app update
|
||||||
* Manual install
|
* Manual install
|
||||||
|
|
||||||
In-app update ends with restarting bridge into new version. Automatic in-app
|
In-app update ends with restarting bridge into new version. Automatic in-app
|
||||||
update is downloading, verifying and installing the new version immediately
|
update is downloading, verifying and installing the new version immediatelly
|
||||||
without user confirmation. For manual in-app update user needs to confirm first.
|
without user confirmation. For manual in-app update user needs to confirm first.
|
||||||
Update is done from special update file published on website.
|
Update is done from special update file published on website.
|
||||||
|
|
||||||
@ -25,7 +25,7 @@ The bridge is installed and executed differently for given OS:
|
|||||||
|
|
||||||
* macOS app does not use launcher
|
* macOS app does not use launcher
|
||||||
* No launcher, only one executable
|
* No launcher, only one executable
|
||||||
* In-App update replaces the bridge files in installation path directly
|
* In-App udpate replaces the bridge files in installation path directly
|
||||||
|
|
||||||
|
|
||||||
```mermaid
|
```mermaid
|
||||||
|
|||||||
30
go.mod
30
go.mod
@ -5,10 +5,10 @@ go 1.20
|
|||||||
require (
|
require (
|
||||||
github.com/0xAX/notificator v0.0.0-20220220101646-ee9b8921e557
|
github.com/0xAX/notificator v0.0.0-20220220101646-ee9b8921e557
|
||||||
github.com/Masterminds/semver/v3 v3.2.0
|
github.com/Masterminds/semver/v3 v3.2.0
|
||||||
github.com/ProtonMail/gluon v0.17.1-0.20231206152152-caaf10897f9e
|
github.com/ProtonMail/gluon v0.16.1-0.20230901124123-075229a92cc4
|
||||||
github.com/ProtonMail/go-autostart v0.0.0-20210130080809-00ed301c8e9a
|
github.com/ProtonMail/go-autostart v0.0.0-20210130080809-00ed301c8e9a
|
||||||
github.com/ProtonMail/go-proton-api v0.4.1-0.20231130083229-e8aa47d7a366
|
github.com/ProtonMail/go-proton-api v0.4.1-0.20230727082922-9115b4750ec7
|
||||||
github.com/ProtonMail/gopenpgp/v2 v2.7.4-proton
|
github.com/ProtonMail/gopenpgp/v2 v2.7.1-proton
|
||||||
github.com/PuerkitoBio/goquery v1.8.1
|
github.com/PuerkitoBio/goquery v1.8.1
|
||||||
github.com/abiosoft/ishell v2.0.0+incompatible
|
github.com/abiosoft/ishell v2.0.0+incompatible
|
||||||
github.com/allan-simon/go-singleinstance v0.0.0-20210120080615-d0997106ab37
|
github.com/allan-simon/go-singleinstance v0.0.0-20210120080615-d0997106ab37
|
||||||
@ -16,13 +16,12 @@ require (
|
|||||||
github.com/cucumber/godog v0.12.5
|
github.com/cucumber/godog v0.12.5
|
||||||
github.com/cucumber/messages-go/v16 v16.0.1
|
github.com/cucumber/messages-go/v16 v16.0.1
|
||||||
github.com/docker/docker-credential-helpers v0.6.3
|
github.com/docker/docker-credential-helpers v0.6.3
|
||||||
github.com/elastic/go-sysinfo v1.11.2-0.20231129083954-35e55cd2a542
|
github.com/elastic/go-sysinfo v1.8.1
|
||||||
github.com/emersion/go-imap v1.2.1
|
github.com/emersion/go-imap v1.2.1
|
||||||
github.com/emersion/go-imap-id v0.0.0-20190926060100-f94a56b9ecde
|
github.com/emersion/go-imap-id v0.0.0-20190926060100-f94a56b9ecde
|
||||||
github.com/emersion/go-message v0.16.0
|
github.com/emersion/go-message v0.16.0
|
||||||
github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead
|
github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead
|
||||||
github.com/emersion/go-smtp v0.15.1-0.20221021114529-49b17434419d
|
github.com/emersion/go-smtp v0.15.1-0.20221021114529-49b17434419d
|
||||||
github.com/emersion/go-vcard v0.0.0-20230331202150-f3d26859ccd3
|
|
||||||
github.com/fatih/color v1.13.0
|
github.com/fatih/color v1.13.0
|
||||||
github.com/getsentry/sentry-go v0.15.0
|
github.com/getsentry/sentry-go v0.15.0
|
||||||
github.com/go-resty/resty/v2 v2.7.0
|
github.com/go-resty/resty/v2 v2.7.0
|
||||||
@ -32,7 +31,6 @@ require (
|
|||||||
github.com/google/uuid v1.3.0
|
github.com/google/uuid v1.3.0
|
||||||
github.com/hashicorp/go-multierror v1.1.1
|
github.com/hashicorp/go-multierror v1.1.1
|
||||||
github.com/jaytaylor/html2text v0.0.0-20211105163654-bc68cce691ba
|
github.com/jaytaylor/html2text v0.0.0-20211105163654-bc68cce691ba
|
||||||
github.com/jeandeaual/go-locale v0.0.0-20220711133428-7de61946b173
|
|
||||||
github.com/keybase/go-keychain v0.0.0
|
github.com/keybase/go-keychain v0.0.0
|
||||||
github.com/miekg/dns v1.1.50
|
github.com/miekg/dns v1.1.50
|
||||||
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58
|
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58
|
||||||
@ -44,17 +42,17 @@ require (
|
|||||||
github.com/vmihailenco/msgpack/v5 v5.3.5
|
github.com/vmihailenco/msgpack/v5 v5.3.5
|
||||||
go.uber.org/goleak v1.2.1
|
go.uber.org/goleak v1.2.1
|
||||||
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1
|
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1
|
||||||
golang.org/x/net v0.17.0
|
golang.org/x/net v0.10.0
|
||||||
golang.org/x/sys v0.13.0
|
golang.org/x/sys v0.8.0
|
||||||
golang.org/x/text v0.13.0
|
golang.org/x/text v0.9.0
|
||||||
google.golang.org/grpc v1.56.3
|
google.golang.org/grpc v1.53.0
|
||||||
google.golang.org/protobuf v1.30.0
|
google.golang.org/protobuf v1.30.0
|
||||||
howett.net/plist v1.0.0
|
howett.net/plist v1.0.0
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/ProtonMail/bcrypt v0.0.0-20211005172633-e235017c1baf // indirect
|
github.com/ProtonMail/bcrypt v0.0.0-20211005172633-e235017c1baf // indirect
|
||||||
github.com/ProtonMail/go-crypto v0.0.0-20230717121622-edf196117233 // indirect
|
github.com/ProtonMail/go-crypto v0.0.0-20230518184743-7afd39499903 // indirect
|
||||||
github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f // indirect
|
github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f // indirect
|
||||||
github.com/ProtonMail/go-srp v0.0.7 // indirect
|
github.com/ProtonMail/go-srp v0.0.7 // indirect
|
||||||
github.com/abiosoft/readline v0.0.0-20180607040430-155bce2042db // indirect
|
github.com/abiosoft/readline v0.0.0-20180607040430-155bce2042db // indirect
|
||||||
@ -70,6 +68,7 @@ require (
|
|||||||
github.com/davecgh/go-spew v1.1.1 // indirect
|
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||||
github.com/elastic/go-windows v1.0.1 // indirect
|
github.com/elastic/go-windows v1.0.1 // indirect
|
||||||
github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594 // indirect
|
github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594 // indirect
|
||||||
|
github.com/emersion/go-vcard v0.0.0-20230331202150-f3d26859ccd3 // indirect
|
||||||
github.com/felixge/fgprof v0.9.3 // indirect
|
github.com/felixge/fgprof v0.9.3 // indirect
|
||||||
github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568 // indirect
|
github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568 // indirect
|
||||||
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
|
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
|
||||||
@ -80,7 +79,7 @@ require (
|
|||||||
github.com/go-playground/validator/v10 v10.14.0 // indirect
|
github.com/go-playground/validator/v10 v10.14.0 // indirect
|
||||||
github.com/goccy/go-json v0.10.2 // indirect
|
github.com/goccy/go-json v0.10.2 // indirect
|
||||||
github.com/gofrs/uuid v4.3.0+incompatible // indirect
|
github.com/gofrs/uuid v4.3.0+incompatible // indirect
|
||||||
github.com/golang/protobuf v1.5.3 // indirect
|
github.com/golang/protobuf v1.5.2 // indirect
|
||||||
github.com/google/pprof v0.0.0-20211214055906-6f57359322fd // indirect
|
github.com/google/pprof v0.0.0-20211214055906-6f57359322fd // indirect
|
||||||
github.com/hashicorp/errwrap v1.1.0 // indirect
|
github.com/hashicorp/errwrap v1.1.0 // indirect
|
||||||
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
|
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
|
||||||
@ -109,20 +108,17 @@ require (
|
|||||||
github.com/ugorji/go/codec v1.2.11 // indirect
|
github.com/ugorji/go/codec v1.2.11 // indirect
|
||||||
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
|
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
|
||||||
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
|
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
|
||||||
gitlab.com/c0b/go-ordered-json v0.0.0-20201030195603-febf46534d5a // indirect
|
|
||||||
golang.org/x/arch v0.3.0 // indirect
|
golang.org/x/arch v0.3.0 // indirect
|
||||||
golang.org/x/crypto v0.14.0 // indirect
|
golang.org/x/crypto v0.9.0 // indirect
|
||||||
golang.org/x/mod v0.8.0 // indirect
|
golang.org/x/mod v0.8.0 // indirect
|
||||||
golang.org/x/sync v0.2.0 // indirect
|
golang.org/x/sync v0.2.0 // indirect
|
||||||
golang.org/x/tools v0.6.0 // indirect
|
golang.org/x/tools v0.6.0 // indirect
|
||||||
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
|
google.golang.org/genproto v0.0.0-20230221151758-ace64dc21148 // indirect
|
||||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||||
)
|
)
|
||||||
|
|
||||||
replace (
|
replace (
|
||||||
github.com/docker/docker-credential-helpers => github.com/ProtonMail/docker-credential-helpers v1.1.0
|
github.com/docker/docker-credential-helpers => github.com/ProtonMail/docker-credential-helpers v1.1.0
|
||||||
github.com/emersion/go-message => github.com/ProtonMail/go-message v0.13.1-0.20230526094639-b62c999c85b7
|
github.com/emersion/go-message => github.com/ProtonMail/go-message v0.13.1-0.20230526094639-b62c999c85b7
|
||||||
github.com/emersion/go-smtp => github.com/ProtonMail/go-smtp v0.0.0-20231109081432-2b3d50599865
|
|
||||||
github.com/go-resty/resty/v2 => github.com/LBeernaertProton/resty/v2 v2.0.0-20231129100320-dddf8030d93a
|
|
||||||
github.com/keybase/go-keychain => github.com/cuthix/go-keychain v0.0.0-20230517073537-fc1740a83768
|
github.com/keybase/go-keychain => github.com/cuthix/go-keychain v0.0.0-20230517073537-fc1740a83768
|
||||||
)
|
)
|
||||||
|
|||||||
111
go.sum
111
go.sum
@ -11,49 +11,42 @@ cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqCl
|
|||||||
cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
|
cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
|
||||||
cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
|
cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
|
||||||
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
|
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
|
||||||
fyne.io/fyne v1.4.2/go.mod h1:xL4c3WmpE/Tvz5CEm5vqsaizU/EeOCm9DYlL2GtTSiM=
|
|
||||||
github.com/0xAX/notificator v0.0.0-20220220101646-ee9b8921e557 h1:l6surSnJ3RP4qA1qmKJ+hQn3UjytosdoG27WGjrDlVs=
|
github.com/0xAX/notificator v0.0.0-20220220101646-ee9b8921e557 h1:l6surSnJ3RP4qA1qmKJ+hQn3UjytosdoG27WGjrDlVs=
|
||||||
github.com/0xAX/notificator v0.0.0-20220220101646-ee9b8921e557/go.mod h1:sTrmvD/TxuypdOERsDOS7SndZg0rzzcCi1b6wQMXUYM=
|
github.com/0xAX/notificator v0.0.0-20220220101646-ee9b8921e557/go.mod h1:sTrmvD/TxuypdOERsDOS7SndZg0rzzcCi1b6wQMXUYM=
|
||||||
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
|
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/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
|
||||||
github.com/Kodeworks/golang-image-ico v0.0.0-20141118225523-73f0f4cfade9/go.mod h1:7uhhqiBaR4CpN0k9rMjOtjpcfGd6DG2m04zQxKnWQ0I=
|
|
||||||
github.com/LBeernaertProton/resty/v2 v2.0.0-20231129100320-dddf8030d93a h1:eQO/GF/+H8/9udc9QAgieFr+jr1tjXlJo35RAhsUbWY=
|
|
||||||
github.com/LBeernaertProton/resty/v2 v2.0.0-20231129100320-dddf8030d93a/go.mod h1:iiP/OpA0CkcL3IGt1O0+/SIItFUbkkyw5BGXiVdTu+A=
|
|
||||||
github.com/Masterminds/semver/v3 v3.2.0 h1:3MEsd0SM6jqZojhjLWWeBY+Kcjy9i6MQAeY7YgDP83g=
|
github.com/Masterminds/semver/v3 v3.2.0 h1:3MEsd0SM6jqZojhjLWWeBY+Kcjy9i6MQAeY7YgDP83g=
|
||||||
github.com/Masterminds/semver/v3 v3.2.0/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=
|
github.com/Masterminds/semver/v3 v3.2.0/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=
|
||||||
github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg=
|
|
||||||
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
|
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
|
||||||
github.com/ProtonMail/bcrypt v0.0.0-20210511135022-227b4adcab57/go.mod h1:HecWFHognK8GfRDGnFQbW/LiV7A3MX3gZVs45vk5h8I=
|
github.com/ProtonMail/bcrypt v0.0.0-20210511135022-227b4adcab57/go.mod h1:HecWFHognK8GfRDGnFQbW/LiV7A3MX3gZVs45vk5h8I=
|
||||||
github.com/ProtonMail/bcrypt v0.0.0-20211005172633-e235017c1baf h1:yc9daCCYUefEs69zUkSzubzjBbL+cmOXgnmt9Fyd9ug=
|
github.com/ProtonMail/bcrypt v0.0.0-20211005172633-e235017c1baf h1:yc9daCCYUefEs69zUkSzubzjBbL+cmOXgnmt9Fyd9ug=
|
||||||
github.com/ProtonMail/bcrypt v0.0.0-20211005172633-e235017c1baf/go.mod h1:o0ESU9p83twszAU8LBeJKFAAMX14tISa0yk4Oo5TOqo=
|
github.com/ProtonMail/bcrypt v0.0.0-20211005172633-e235017c1baf/go.mod h1:o0ESU9p83twszAU8LBeJKFAAMX14tISa0yk4Oo5TOqo=
|
||||||
github.com/ProtonMail/docker-credential-helpers v1.1.0 h1:+kvUIpwWcbtP3WFv5sSvkFn/XLzSqPOB5AAthuk9xPk=
|
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/docker-credential-helpers v1.1.0/go.mod h1:mK0aBveCxhnQ756AmaTfXMZDeULvheYVhF/MWMErN5g=
|
||||||
github.com/ProtonMail/gluon v0.17.1-0.20231206152152-caaf10897f9e h1:kHmSOTxynSip1WJvwZTFOGJPVfI42e/I8bDzDjLK7aM=
|
github.com/ProtonMail/gluon v0.16.1-0.20230901124123-075229a92cc4 h1:Uq2v2NYEtlTaK2WTh9BMph2Kv51JxMgvTkd7CjGPYc8=
|
||||||
github.com/ProtonMail/gluon v0.17.1-0.20231206152152-caaf10897f9e/go.mod h1:Og5/Dz1MiGpCJn51XujZwxiLG7WzvvjE5PRpZBQmAHo=
|
github.com/ProtonMail/gluon v0.16.1-0.20230901124123-075229a92cc4/go.mod h1:Og5/Dz1MiGpCJn51XujZwxiLG7WzvvjE5PRpZBQmAHo=
|
||||||
github.com/ProtonMail/go-autostart v0.0.0-20210130080809-00ed301c8e9a h1:D+aZah+k14Gn6kmL7eKxoo/4Dr/lK3ChBcwce2+SQP4=
|
github.com/ProtonMail/go-autostart v0.0.0-20210130080809-00ed301c8e9a h1:D+aZah+k14Gn6kmL7eKxoo/4Dr/lK3ChBcwce2+SQP4=
|
||||||
github.com/ProtonMail/go-autostart v0.0.0-20210130080809-00ed301c8e9a/go.mod h1:oTGdE7/DlWIr23G0IKW3OXK9wZ5Hw1GGiaJFccTvZi4=
|
github.com/ProtonMail/go-autostart v0.0.0-20210130080809-00ed301c8e9a/go.mod h1:oTGdE7/DlWIr23G0IKW3OXK9wZ5Hw1GGiaJFccTvZi4=
|
||||||
github.com/ProtonMail/go-crypto v0.0.0-20230321155629-9a39f2531310/go.mod h1:8TI4H3IbrackdNgv+92dI+rhpCaLqM0IfpgCgenFvRE=
|
github.com/ProtonMail/go-crypto v0.0.0-20230321155629-9a39f2531310/go.mod h1:8TI4H3IbrackdNgv+92dI+rhpCaLqM0IfpgCgenFvRE=
|
||||||
github.com/ProtonMail/go-crypto v0.0.0-20230717121622-edf196117233 h1:bdoKdh0f66/lrgVfYlxw0aqISY/KOqXmFJyGt7rGmnc=
|
github.com/ProtonMail/go-crypto v0.0.0-20230322105811-d73448b7e800/go.mod h1:8TI4H3IbrackdNgv+92dI+rhpCaLqM0IfpgCgenFvRE=
|
||||||
github.com/ProtonMail/go-crypto v0.0.0-20230717121622-edf196117233/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0=
|
github.com/ProtonMail/go-crypto v0.0.0-20230518184743-7afd39499903 h1:ZK3C5DtzV2nVAQTx5S5jQvMeDqWtD1By5mOoyY/xJek=
|
||||||
|
github.com/ProtonMail/go-crypto v0.0.0-20230518184743-7afd39499903/go.mod h1:8TI4H3IbrackdNgv+92dI+rhpCaLqM0IfpgCgenFvRE=
|
||||||
github.com/ProtonMail/go-message v0.13.1-0.20230526094639-b62c999c85b7 h1:+j+Kd/DyZ/qGfMT9htAT7HxqIEbZHsatsx+m8AoV6fc=
|
github.com/ProtonMail/go-message v0.13.1-0.20230526094639-b62c999c85b7 h1:+j+Kd/DyZ/qGfMT9htAT7HxqIEbZHsatsx+m8AoV6fc=
|
||||||
github.com/ProtonMail/go-message v0.13.1-0.20230526094639-b62c999c85b7/go.mod h1:NBAn21zgCJ/52WLDyed18YvYFm5tEoeDauubFqLokM4=
|
github.com/ProtonMail/go-message v0.13.1-0.20230526094639-b62c999c85b7/go.mod h1:NBAn21zgCJ/52WLDyed18YvYFm5tEoeDauubFqLokM4=
|
||||||
github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f h1:tCbYj7/299ekTTXpdwKYF8eBlsYsDVoggDAuAjoK66k=
|
github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f h1:tCbYj7/299ekTTXpdwKYF8eBlsYsDVoggDAuAjoK66k=
|
||||||
github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f/go.mod h1:gcr0kNtGBqin9zDW9GOHcVntrwnjrK+qdJ06mWYBybw=
|
github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f/go.mod h1:gcr0kNtGBqin9zDW9GOHcVntrwnjrK+qdJ06mWYBybw=
|
||||||
github.com/ProtonMail/go-proton-api v0.4.1-0.20231130083229-e8aa47d7a366 h1:W9P5GdDnuGkB3tbzKnXmUrTjIs6zk/K+4lpPTWzsoRE=
|
github.com/ProtonMail/go-proton-api v0.4.1-0.20230727082922-9115b4750ec7 h1:Rmg3TPK6vFGNWR4hxmPoBhV75Sl716iB46wEi2U4Q+c=
|
||||||
github.com/ProtonMail/go-proton-api v0.4.1-0.20231130083229-e8aa47d7a366/go.mod h1:t+hb0BfkmZ9fpvzVRpHC7limoowym6ln/j0XL9a8DDw=
|
github.com/ProtonMail/go-proton-api v0.4.1-0.20230727082922-9115b4750ec7/go.mod h1:+aTJoYu8bqzGECXL2DOdiZTZ64bGn3w0NC8VcFpJrFM=
|
||||||
github.com/ProtonMail/go-smtp v0.0.0-20231109081432-2b3d50599865 h1:EP1gnxLL5Z7xBSymE9nSTM27nRYINuvssAtDmG0suD8=
|
|
||||||
github.com/ProtonMail/go-smtp v0.0.0-20231109081432-2b3d50599865/go.mod h1:qm27SGYgoIPRot6ubfQ/GpiPy/g3PaZAVRxiO/sDUgQ=
|
|
||||||
github.com/ProtonMail/go-srp v0.0.7 h1:Sos3Qk+th4tQR64vsxGIxYpN3rdnG9Wf9K4ZloC1JrI=
|
github.com/ProtonMail/go-srp v0.0.7 h1:Sos3Qk+th4tQR64vsxGIxYpN3rdnG9Wf9K4ZloC1JrI=
|
||||||
github.com/ProtonMail/go-srp v0.0.7/go.mod h1:giCp+7qRnMIcCvI6V6U3S1lDDXDQYx2ewJ6F/9wdlJk=
|
github.com/ProtonMail/go-srp v0.0.7/go.mod h1:giCp+7qRnMIcCvI6V6U3S1lDDXDQYx2ewJ6F/9wdlJk=
|
||||||
github.com/ProtonMail/gopenpgp/v2 v2.7.4-proton h1:8tqHYM6IGsdEc6Vxf1TWiwpHNj8yIEQNACPhxsDagrk=
|
github.com/ProtonMail/gopenpgp/v2 v2.7.1-proton h1:YS6M20yvjCJPR1r4ADW5TPn6rahs4iAyZaACei86bEc=
|
||||||
github.com/ProtonMail/gopenpgp/v2 v2.7.4-proton/go.mod h1:omVkSsfPAhmptzPF/piMXb16wKIWUvVhZbVW7sJKh0A=
|
github.com/ProtonMail/gopenpgp/v2 v2.7.1-proton/go.mod h1:S1lYsaGHykYpxxh2SnJL6ypcAlANKj5NRSY6HxKryKQ=
|
||||||
github.com/PuerkitoBio/goquery v1.8.1 h1:uQxhNlArOIdbrH1tr0UXwdVFgDcZDrZVdcpygAcwmWM=
|
github.com/PuerkitoBio/goquery v1.8.1 h1:uQxhNlArOIdbrH1tr0UXwdVFgDcZDrZVdcpygAcwmWM=
|
||||||
github.com/PuerkitoBio/goquery v1.8.1/go.mod h1:Q8ICL1kNUJ2sXGoAhPGUdYDJvgQgHzJsnnd3H7Ho5jQ=
|
github.com/PuerkitoBio/goquery v1.8.1/go.mod h1:Q8ICL1kNUJ2sXGoAhPGUdYDJvgQgHzJsnnd3H7Ho5jQ=
|
||||||
github.com/abiosoft/ishell v2.0.0+incompatible h1:zpwIuEHc37EzrsIYah3cpevrIc8Oma7oZPxr03tlmmw=
|
github.com/abiosoft/ishell v2.0.0+incompatible h1:zpwIuEHc37EzrsIYah3cpevrIc8Oma7oZPxr03tlmmw=
|
||||||
github.com/abiosoft/ishell v2.0.0+incompatible/go.mod h1:HQR9AqF2R3P4XXpMpI0NAzgHf/aS6+zVXRj14cVk9qg=
|
github.com/abiosoft/ishell v2.0.0+incompatible/go.mod h1:HQR9AqF2R3P4XXpMpI0NAzgHf/aS6+zVXRj14cVk9qg=
|
||||||
github.com/abiosoft/readline v0.0.0-20180607040430-155bce2042db h1:CjPUSXOiYptLbTdr1RceuZgSFDQ7U15ITERUGrUORx8=
|
github.com/abiosoft/readline v0.0.0-20180607040430-155bce2042db h1:CjPUSXOiYptLbTdr1RceuZgSFDQ7U15ITERUGrUORx8=
|
||||||
github.com/abiosoft/readline v0.0.0-20180607040430-155bce2042db/go.mod h1:rB3B4rKii8V21ydCbIzH5hZiCQE7f5E9SzUb/ZZx530=
|
github.com/abiosoft/readline v0.0.0-20180607040430-155bce2042db/go.mod h1:rB3B4rKii8V21ydCbIzH5hZiCQE7f5E9SzUb/ZZx530=
|
||||||
github.com/akavel/rsrc v0.8.0/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c=
|
|
||||||
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
|
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
|
||||||
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
|
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
|
||||||
github.com/allan-simon/go-singleinstance v0.0.0-20210120080615-d0997106ab37 h1:28uU3TtuvQ6KRndxg9TrC868jBWmSKgh0GTXkACCXmA=
|
github.com/allan-simon/go-singleinstance v0.0.0-20210120080615-d0997106ab37 h1:28uU3TtuvQ6KRndxg9TrC868jBWmSKgh0GTXkACCXmA=
|
||||||
@ -71,7 +64,6 @@ github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJm
|
|||||||
github.com/bradenaw/juniper v0.12.0 h1:Q/7icpPQD1nH/La5DobQfNEtwyrBSiSu47jOQx7lJEM=
|
github.com/bradenaw/juniper v0.12.0 h1:Q/7icpPQD1nH/La5DobQfNEtwyrBSiSu47jOQx7lJEM=
|
||||||
github.com/bradenaw/juniper v0.12.0/go.mod h1:Z2B7aJlQ7xbfWsnMLROj5t/5FQ94/MkIdKC30J4WvzI=
|
github.com/bradenaw/juniper v0.12.0/go.mod h1:Z2B7aJlQ7xbfWsnMLROj5t/5FQ94/MkIdKC30J4WvzI=
|
||||||
github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
|
github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
|
||||||
github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
|
|
||||||
github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
|
github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
|
||||||
github.com/bytedance/sonic v1.9.1 h1:6iJ6NqdoxCDr6mbY8h18oSO+cShGSMRGCEo7F2h0x8s=
|
github.com/bytedance/sonic v1.9.1 h1:6iJ6NqdoxCDr6mbY8h18oSO+cShGSMRGCEo7F2h0x8s=
|
||||||
github.com/bytedance/sonic v1.9.1/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U=
|
github.com/bytedance/sonic v1.9.1/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U=
|
||||||
@ -117,12 +109,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
|
|||||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
|
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
|
||||||
github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
|
github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
|
||||||
github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=
|
github.com/elastic/go-sysinfo v1.8.1 h1:4Yhj+HdV6WjbCRgGdZpPJ8lZQlXZLKDAeIkmQ/VRvi4=
|
||||||
github.com/docker/docker v24.0.7+incompatible h1:Wo6l37AuwP3JaMnZa226lzVXGA3F9Ig1seQen0cKYlM=
|
github.com/elastic/go-sysinfo v1.8.1/go.mod h1:JfllUnzoQV/JRYymbH3dO1yggI3mV2oTKSXsDHM+uIM=
|
||||||
github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
|
|
||||||
github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
|
|
||||||
github.com/elastic/go-sysinfo v1.11.2-0.20231129083954-35e55cd2a542 h1:IFTm6NBbfSgZCaeEzorQhH4T7ZERl4j+1u7oXWzmJcM=
|
|
||||||
github.com/elastic/go-sysinfo v1.11.2-0.20231129083954-35e55cd2a542/go.mod h1:GKqR8bbMK/1ITnez9NIsIfXQr25aLhRJa7AfT8HpBFQ=
|
|
||||||
github.com/elastic/go-windows v1.0.1 h1:AlYZOldA+UJ0/2nBuqWdo90GFCgG9xuyw9SYzGUtJm0=
|
github.com/elastic/go-windows v1.0.1 h1:AlYZOldA+UJ0/2nBuqWdo90GFCgG9xuyw9SYzGUtJm0=
|
||||||
github.com/elastic/go-windows v1.0.1/go.mod h1:FoVvqWSun28vaDQPbj2Elfc0JahhPB7WQEGa3c814Ss=
|
github.com/elastic/go-windows v1.0.1/go.mod h1:FoVvqWSun28vaDQPbj2Elfc0JahhPB7WQEGa3c814Ss=
|
||||||
github.com/emersion/go-imap v1.2.1 h1:+s9ZjMEjOB8NzZMVTM3cCenz2JrQIGGo5j1df19WjTA=
|
github.com/emersion/go-imap v1.2.1 h1:+s9ZjMEjOB8NzZMVTM3cCenz2JrQIGGo5j1df19WjTA=
|
||||||
@ -132,6 +120,8 @@ github.com/emersion/go-imap-id v0.0.0-20190926060100-f94a56b9ecde/go.mod h1:sPwp
|
|||||||
github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ=
|
github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ=
|
||||||
github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead h1:fI1Jck0vUrXT8bnphprS1EoVRe2Q5CKCX8iDlpqjQ/Y=
|
github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead h1:fI1Jck0vUrXT8bnphprS1EoVRe2Q5CKCX8iDlpqjQ/Y=
|
||||||
github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ=
|
github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ=
|
||||||
|
github.com/emersion/go-smtp v0.15.1-0.20221021114529-49b17434419d h1:hFRM6zCBSc+Xa0rBOqSlG6Qe9dKC/2vLhGAuZlWxTsc=
|
||||||
|
github.com/emersion/go-smtp v0.15.1-0.20221021114529-49b17434419d/go.mod h1:qm27SGYgoIPRot6ubfQ/GpiPy/g3PaZAVRxiO/sDUgQ=
|
||||||
github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594 h1:IbFBtwoTQyw0fIM5xv1HF+Y+3ZijDR839WMulgxCcUY=
|
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=
|
github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594/go.mod h1:aqO8z8wPrjkscevZJFVE1wXJrLpC5LtJG7fqLOsPb2U=
|
||||||
github.com/emersion/go-vcard v0.0.0-20230331202150-f3d26859ccd3 h1:hQ1wTMaKcGfobYRT88RM8NFNyX+IQHvagkm/tqViU98=
|
github.com/emersion/go-vcard v0.0.0-20230331202150-f3d26859ccd3 h1:hQ1wTMaKcGfobYRT88RM8NFNyX+IQHvagkm/tqViU98=
|
||||||
@ -144,9 +134,6 @@ github.com/felixge/fgprof v0.9.3/go.mod h1:RdbpDgzqYVh/T9fPELJyV7EYJuHB55UTEULNu
|
|||||||
github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BMXYYRWTLOJKlh+lOBt6nUQgXAfB7oVIQt5cNreqSLI=
|
github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BMXYYRWTLOJKlh+lOBt6nUQgXAfB7oVIQt5cNreqSLI=
|
||||||
github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:rZfgFAXFS/z/lEd6LJmf9HVZ1LkgYiHx5pHhV5DR16M=
|
github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:rZfgFAXFS/z/lEd6LJmf9HVZ1LkgYiHx5pHhV5DR16M=
|
||||||
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
|
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
|
||||||
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
|
|
||||||
github.com/fyne-io/mobile v0.1.2-0.20201127155338-06aeb98410cc/go.mod h1:/kOrWrZB6sasLbEy2JIvr4arEzQTXBTZGb3Y96yWbHY=
|
|
||||||
github.com/fyne-io/mobile v0.1.2/go.mod h1:/kOrWrZB6sasLbEy2JIvr4arEzQTXBTZGb3Y96yWbHY=
|
|
||||||
github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU=
|
github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU=
|
||||||
github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA=
|
github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA=
|
||||||
github.com/getsentry/sentry-go v0.15.0 h1:CP9bmA7pralrVUedYZsmIHWpq/pBtXTSew7xvVpfLaA=
|
github.com/getsentry/sentry-go v0.15.0 h1:CP9bmA7pralrVUedYZsmIHWpq/pBtXTSew7xvVpfLaA=
|
||||||
@ -157,9 +144,7 @@ github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm
|
|||||||
github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
|
github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
|
||||||
github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU=
|
github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU=
|
||||||
github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
|
github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
|
||||||
github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7/go.mod h1:482civXOzJJCPzJ4ZOX/pwvXBWSnzD4OKMdH4ClKGbk=
|
|
||||||
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
|
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
|
||||||
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200625191551-73d3c3675aa3/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
|
|
||||||
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
|
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
|
||||||
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
|
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
|
||||||
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
|
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
|
||||||
@ -170,19 +155,18 @@ github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJn
|
|||||||
github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
|
github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
|
||||||
github.com/go-playground/validator/v10 v10.14.0 h1:vgvQWe3XCz3gIeFDm/HnTIbj6UGmg/+t63MyGU2n5js=
|
github.com/go-playground/validator/v10 v10.14.0 h1:vgvQWe3XCz3gIeFDm/HnTIbj6UGmg/+t63MyGU2n5js=
|
||||||
github.com/go-playground/validator/v10 v10.14.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
|
github.com/go-playground/validator/v10 v10.14.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
|
||||||
|
github.com/go-resty/resty/v2 v2.7.0 h1:me+K9p3uhSmXtrBZ4k9jcEAfJmuC8IivWHwaLZwPrFY=
|
||||||
|
github.com/go-resty/resty/v2 v2.7.0/go.mod h1:9PWDzw47qPphMRFfhsyk0NnSgvluHcljSMVIq3w7q0I=
|
||||||
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
|
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
|
||||||
github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
|
github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
|
||||||
github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
|
github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
|
||||||
github.com/godbus/dbus v4.1.0+incompatible h1:WqqLRTsQic3apZUK9qC5sGNfXthmPXzUZ7nQPrNITa4=
|
github.com/godbus/dbus v4.1.0+incompatible h1:WqqLRTsQic3apZUK9qC5sGNfXthmPXzUZ7nQPrNITa4=
|
||||||
github.com/godbus/dbus v4.1.0+incompatible/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
|
github.com/godbus/dbus v4.1.0+incompatible/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
|
||||||
github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
|
|
||||||
github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
|
github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
|
||||||
github.com/gofrs/uuid v4.3.0+incompatible h1:CaSVZxm5B+7o45rtab4jC2G37WGYX1zQfuU2i6DSvnc=
|
github.com/gofrs/uuid v4.3.0+incompatible h1:CaSVZxm5B+7o45rtab4jC2G37WGYX1zQfuU2i6DSvnc=
|
||||||
github.com/gofrs/uuid v4.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
|
github.com/gofrs/uuid v4.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
|
||||||
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
|
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
|
||||||
github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
|
github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
|
||||||
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
|
|
||||||
github.com/goki/freetype v0.0.0-20181231101311-fa8a33aabaff/go.mod h1:wfqRWLHRBsRgkp5dmbG56SA0DmVtwrF5N3oPdI8t+Aw=
|
|
||||||
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
|
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
|
||||||
github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
|
github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
|
||||||
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
|
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
|
||||||
@ -194,8 +178,8 @@ github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y
|
|||||||
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
||||||
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
||||||
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
|
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
|
||||||
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
|
github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
|
||||||
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
|
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
|
||||||
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
|
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
|
||||||
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
|
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
|
||||||
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
|
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
|
||||||
@ -256,16 +240,12 @@ github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2p
|
|||||||
github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
|
github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
|
||||||
github.com/ianlancetaylor/demangle v0.0.0-20210905161508-09a460cdf81d/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w=
|
github.com/ianlancetaylor/demangle v0.0.0-20210905161508-09a460cdf81d/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w=
|
||||||
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
|
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
|
||||||
github.com/jackmordaunt/icns v0.0.0-20181231085925-4f16af745526/go.mod h1:UQkeMHVoNcyXYq9otUupF7/h/2tmHlhrS2zw7ZVvUqc=
|
|
||||||
github.com/jaytaylor/html2text v0.0.0-20211105163654-bc68cce691ba h1:QFQpJdgbON7I0jr2hYW7Bs+XV0qjc3d5tZoDnRFnqTg=
|
github.com/jaytaylor/html2text v0.0.0-20211105163654-bc68cce691ba h1:QFQpJdgbON7I0jr2hYW7Bs+XV0qjc3d5tZoDnRFnqTg=
|
||||||
github.com/jaytaylor/html2text v0.0.0-20211105163654-bc68cce691ba/go.mod h1:CVKlgaMiht+LXvHG173ujK6JUhZXKb2u/BQtjPDIvyk=
|
github.com/jaytaylor/html2text v0.0.0-20211105163654-bc68cce691ba/go.mod h1:CVKlgaMiht+LXvHG173ujK6JUhZXKb2u/BQtjPDIvyk=
|
||||||
github.com/jeandeaual/go-locale v0.0.0-20220711133428-7de61946b173 h1:jOONCXyzHWM+ukp+weX77o//U3pMeOj62CNxChJLxIU=
|
|
||||||
github.com/jeandeaual/go-locale v0.0.0-20220711133428-7de61946b173/go.mod h1:uO/uctjf8AcWhNfp5Ili6oPtyFrAoQXEtVY3N798VkQ=
|
|
||||||
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
|
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
|
||||||
github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 h1:rp+c0RAYOWj8l6qbCUTSiRLG/iKnW3K3/QfPPuSsBt4=
|
github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 h1:rp+c0RAYOWj8l6qbCUTSiRLG/iKnW3K3/QfPPuSsBt4=
|
||||||
github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901/go.mod h1:Z86h9688Y0wesXCyonoVr47MasHilkuLMqGhRZ4Hpak=
|
github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901/go.mod h1:Z86h9688Y0wesXCyonoVr47MasHilkuLMqGhRZ4Hpak=
|
||||||
github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
|
github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
|
||||||
github.com/josephspurrier/goversioninfo v0.0.0-20200309025242-14b0ab84c6ca/go.mod h1:eJTEwMjXb7kZ633hO3Ln9mBUCOjX2+FlTljvpl9SYdE=
|
|
||||||
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
|
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
|
||||||
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
|
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
|
||||||
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
|
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
|
||||||
@ -288,7 +268,6 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
|
|||||||
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
|
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
|
||||||
github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q=
|
github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q=
|
||||||
github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4=
|
github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4=
|
||||||
github.com/lucor/goinfo v0.0.0-20200401173949-526b5363a13a/go.mod h1:ORP3/rB5IsulLEBwQZCJyyV6niqmI7P4EWSmkug+1Ng=
|
|
||||||
github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
|
github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
|
||||||
github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
|
github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
|
||||||
github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
|
github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
|
||||||
@ -324,14 +303,9 @@ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3Rllmb
|
|||||||
github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
|
github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
|
||||||
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
|
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
|
||||||
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
|
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
|
||||||
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
|
|
||||||
github.com/nicksnyder/go-i18n/v2 v2.1.1/go.mod h1:d++QJC9ZVf7pa48qrsRWhMJ5pSHIPmS3OLqK1niyLxs=
|
|
||||||
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
|
|
||||||
github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
|
github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
|
||||||
github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
|
github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
|
||||||
github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
|
github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
|
||||||
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
|
|
||||||
github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM=
|
|
||||||
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
|
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
|
||||||
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 h1:onHthvaw9LFnH4t2DcNVpwGmV9E1BkGknEliJkfwQj0=
|
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 h1:onHthvaw9LFnH4t2DcNVpwGmV9E1BkGknEliJkfwQj0=
|
||||||
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58/go.mod h1:DXv8WO4yhMYhSNPKjeNKa5WY9YCIEBRbNzFFPJbWO6Y=
|
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58/go.mod h1:DXv8WO4yhMYhSNPKjeNKa5WY9YCIEBRbNzFFPJbWO6Y=
|
||||||
@ -390,8 +364,6 @@ github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn
|
|||||||
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
|
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
|
||||||
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
|
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
|
||||||
github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
|
github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
|
||||||
github.com/srwiley/oksvg v0.0.0-20200311192757-870daf9aa564/go.mod h1:afMbS0qvv1m5tfENCwnOdZGOF8RGR/FsZ7bvBxQGZG4=
|
|
||||||
github.com/srwiley/rasterx v0.0.0-20200120212402-85cb7272f5e9/go.mod h1:mvWM0+15UqyrFKqdRjY6LuAVJR0HOVhJlEgZ5JWtSWU=
|
|
||||||
github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf h1:pvbZ0lM0XWPBqUKqFU8cmavspvIl9nulOYwdy6IFRRo=
|
github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf h1:pvbZ0lM0XWPBqUKqFU8cmavspvIl9nulOYwdy6IFRRo=
|
||||||
github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf/go.mod h1:RJID2RhlZKId02nZ62WenDCkgHFerpIOmW0iT7GKmXM=
|
github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf/go.mod h1:RJID2RhlZKId02nZ62WenDCkgHFerpIOmW0iT7GKmXM=
|
||||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||||
@ -425,11 +397,8 @@ github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV
|
|||||||
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
|
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
|
||||||
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
|
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
|
||||||
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
|
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
|
||||||
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
|
||||||
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
|
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
|
||||||
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
|
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
|
||||||
gitlab.com/c0b/go-ordered-json v0.0.0-20201030195603-febf46534d5a h1:DxppxFKRqJ8WD6oJ3+ZXKDY0iMONQDl5UTg2aTyHh8k=
|
|
||||||
gitlab.com/c0b/go-ordered-json v0.0.0-20201030195603-febf46534d5a/go.mod h1:NREvu3a57BaK0R1+ztrEzHWiZAihohNLQ6trPxlIqZI=
|
|
||||||
go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
|
go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
|
||||||
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
|
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
|
||||||
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
|
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
|
||||||
@ -448,10 +417,9 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U
|
|||||||
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
||||||
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
||||||
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
|
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
|
||||||
golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
|
|
||||||
golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
|
golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
|
||||||
golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
|
golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g=
|
||||||
golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
|
golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
|
||||||
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
||||||
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
||||||
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
|
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
|
||||||
@ -461,7 +429,6 @@ golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 h1:k/i9J1pBpvlfR+9QsetwPyERs
|
|||||||
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w=
|
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w=
|
||||||
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
|
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/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
|
||||||
golang.org/x/image v0.0.0-20200430140353-33d19683fad8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
|
|
||||||
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
|
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
|
||||||
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
|
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
|
||||||
golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
|
golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
|
||||||
@ -473,7 +440,6 @@ golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU
|
|||||||
golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
|
golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
|
||||||
golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
|
golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
|
||||||
golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
|
golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
|
||||||
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
|
||||||
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||||
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
|
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
|
||||||
golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
|
golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
|
||||||
@ -492,21 +458,18 @@ golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn
|
|||||||
golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||||
golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
|
golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
|
||||||
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||||
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
|
||||||
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
|
|
||||||
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
|
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
|
||||||
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
|
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
|
||||||
golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
||||||
golang.org/x/net v0.0.0-20210916014120-12bc252f5db8/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
golang.org/x/net v0.0.0-20210916014120-12bc252f5db8/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
||||||
|
golang.org/x/net v0.0.0-20211029224645-99673261e6eb/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
||||||
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
|
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
|
||||||
golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
|
|
||||||
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
|
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
|
||||||
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
|
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
|
||||||
golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
|
golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
|
||||||
golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
|
golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
|
||||||
|
golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
|
||||||
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
|
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
|
||||||
golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
|
|
||||||
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
|
|
||||||
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
|
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
|
||||||
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
||||||
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
||||||
@ -515,7 +478,6 @@ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJ
|
|||||||
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
|
||||||
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
@ -535,11 +497,8 @@ golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7w
|
|||||||
golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20200720211630-cb9d2d5c5666/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
@ -548,46 +507,34 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc
|
|||||||
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.0.0-20211013075003-97ac67df715c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
|
golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
|
||||||
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
|
|
||||||
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
||||||
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
||||||
golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
|
|
||||||
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
|
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
|
||||||
golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
|
golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
|
||||||
golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY=
|
golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY=
|
||||||
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
|
|
||||||
golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
|
|
||||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||||
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/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.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
|
||||||
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||||
golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
|
||||||
golang.org/x/text v0.3.5-0.20201125200606-c27b9fd57aec/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
golang.org/x/text v0.3.5-0.20201125200606-c27b9fd57aec/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||||
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||||
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
|
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
|
||||||
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
|
|
||||||
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
|
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
|
||||||
golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
|
golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
|
||||||
|
golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
|
||||||
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
|
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
|
||||||
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
|
|
||||||
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
|
|
||||||
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||||
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||||
golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
|
|
||||||
golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
|
||||||
golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||||
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||||
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||||
@ -601,13 +548,11 @@ golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBn
|
|||||||
golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
|
golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
|
||||||
golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
|
golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
|
||||||
golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
|
golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
|
||||||
golang.org/x/tools v0.0.0-20190808195139-e713427fea3f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
|
||||||
golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||||
golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||||
golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||||
golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/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-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||||
golang.org/x/tools v0.0.0-20200328031815-3db5fc6bac03/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
|
|
||||||
golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
|
golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
|
||||||
golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
|
golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
|
||||||
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
|
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
|
||||||
@ -635,13 +580,13 @@ google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98
|
|||||||
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
|
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
|
||||||
google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
|
google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
|
||||||
google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
|
google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
|
||||||
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A=
|
google.golang.org/genproto v0.0.0-20230221151758-ace64dc21148 h1:muK+gVBJBfFb4SejshDBlN2/UgxCCOKH9Y34ljqEGOc=
|
||||||
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU=
|
google.golang.org/genproto v0.0.0-20230221151758-ace64dc21148/go.mod h1:3Dl5ZL0q0isWJt+FVcfpQyirqemEuLAK/iFvg1UP1Hw=
|
||||||
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
|
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
|
||||||
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
|
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
|
||||||
google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
|
google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
|
||||||
google.golang.org/grpc v1.56.3 h1:8I4C0Yq1EjstUzUJzpcRVbuYA2mODtEmpWiQoN/b2nc=
|
google.golang.org/grpc v1.53.0 h1:LAv2ds7cmFV/XTS3XG1NneeENYrXGmorPxsBbptIjNc=
|
||||||
google.golang.org/grpc v1.56.3/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s=
|
google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw=
|
||||||
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
|
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
|
||||||
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
|
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
|
||||||
google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
|
google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
|
||||||
@ -649,7 +594,6 @@ google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqw
|
|||||||
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
|
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
|
||||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
|
||||||
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
|
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
|
||||||
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
|
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
|
||||||
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
|
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
|
||||||
@ -661,7 +605,6 @@ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
|||||||
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
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=
|
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||||
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||||
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
|
||||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||||
|
|||||||
@ -41,7 +41,6 @@ import (
|
|||||||
"github.com/ProtonMail/proton-bridge/v3/internal/sentry"
|
"github.com/ProtonMail/proton-bridge/v3/internal/sentry"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/useragent"
|
"github.com/ProtonMail/proton-bridge/v3/internal/useragent"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/vault"
|
"github.com/ProtonMail/proton-bridge/v3/internal/vault"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/pkg/keychain"
|
|
||||||
"github.com/ProtonMail/proton-bridge/v3/pkg/restarter"
|
"github.com/ProtonMail/proton-bridge/v3/pkg/restarter"
|
||||||
"github.com/pkg/profile"
|
"github.com/pkg/profile"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
@ -53,9 +52,6 @@ const (
|
|||||||
flagCPUProfile = "cpu-prof"
|
flagCPUProfile = "cpu-prof"
|
||||||
flagCPUProfileShort = "p"
|
flagCPUProfileShort = "p"
|
||||||
|
|
||||||
flagTraceProfile = "trace-prof"
|
|
||||||
flagTraceProfileShort = "t"
|
|
||||||
|
|
||||||
flagMemProfile = "mem-prof"
|
flagMemProfile = "mem-prof"
|
||||||
flagMemProfileShort = "m"
|
flagMemProfileShort = "m"
|
||||||
|
|
||||||
@ -100,11 +96,6 @@ func New() *cli.App {
|
|||||||
Aliases: []string{flagCPUProfileShort},
|
Aliases: []string{flagCPUProfileShort},
|
||||||
Usage: "Generate CPU profile",
|
Usage: "Generate CPU profile",
|
||||||
},
|
},
|
||||||
&cli.BoolFlag{
|
|
||||||
Name: flagTraceProfile,
|
|
||||||
Aliases: []string{flagTraceProfileShort},
|
|
||||||
Usage: "Generate Trace profile",
|
|
||||||
},
|
|
||||||
&cli.BoolFlag{
|
&cli.BoolFlag{
|
||||||
Name: flagMemProfile,
|
Name: flagMemProfile,
|
||||||
Aliases: []string{flagMemProfileShort},
|
Aliases: []string{flagMemProfileShort},
|
||||||
@ -205,7 +196,7 @@ func run(c *cli.Context) error {
|
|||||||
}()
|
}()
|
||||||
|
|
||||||
// Restart the app if requested.
|
// Restart the app if requested.
|
||||||
err = withRestarter(exe, func(restarter *restarter.Restarter) error {
|
return withRestarter(exe, func(restarter *restarter.Restarter) error {
|
||||||
// Handle crashes with various actions.
|
// Handle crashes with various actions.
|
||||||
return withCrashHandler(restarter, reporter, func(crashHandler *crash.Handler, quitCh <-chan struct{}) error {
|
return withCrashHandler(restarter, reporter, func(crashHandler *crash.Handler, quitCh <-chan struct{}) error {
|
||||||
migrationErr := migrateOldVersions()
|
migrationErr := migrateOldVersions()
|
||||||
@ -235,56 +226,53 @@ func run(c *cli.Context) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return withSingleInstance(settings, locations.GetLockFile(), version, func() error {
|
return withSingleInstance(settings, locations.GetLockFile(), version, func() error {
|
||||||
// Look for available keychains
|
// Unlock the encrypted vault.
|
||||||
return WithKeychainList(func(keychains *keychain.List) error {
|
return WithVault(locations, crashHandler, func(v *vault.Vault, insecure, corrupt bool) error {
|
||||||
// Unlock the encrypted vault.
|
if !v.Migrated() {
|
||||||
return WithVault(locations, keychains, crashHandler, func(v *vault.Vault, insecure, corrupt bool) error {
|
// Migrate old settings into the vault.
|
||||||
if !v.Migrated() {
|
if err := migrateOldSettings(v); err != nil {
|
||||||
// Migrate old settings into the vault.
|
logrus.WithError(err).Error("Failed to migrate old settings")
|
||||||
if err := migrateOldSettings(v); err != nil {
|
|
||||||
logrus.WithError(err).Error("Failed to migrate old settings")
|
|
||||||
}
|
|
||||||
|
|
||||||
// Migrate old accounts into the vault.
|
|
||||||
if err := migrateOldAccounts(locations, keychains, v); err != nil {
|
|
||||||
logrus.WithError(err).Error("Failed to migrate old accounts")
|
|
||||||
}
|
|
||||||
|
|
||||||
// The vault has been migrated.
|
|
||||||
if err := v.SetMigrated(); err != nil {
|
|
||||||
logrus.WithError(err).Error("Failed to mark vault as migrated")
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.WithFields(logrus.Fields{
|
// Migrate old accounts into the vault.
|
||||||
"lastVersion": v.GetLastVersion().String(),
|
if err := migrateOldAccounts(locations, v); err != nil {
|
||||||
"showAllMail": v.GetShowAllMail(),
|
logrus.WithError(err).Error("Failed to migrate old accounts")
|
||||||
"updateCh": v.GetUpdateChannel(),
|
}
|
||||||
"autoUpdate": v.GetAutoUpdate(),
|
|
||||||
"rollout": v.GetUpdateRollout(),
|
|
||||||
"DoH": v.GetProxyAllowed(),
|
|
||||||
}).Info("Vault loaded")
|
|
||||||
|
|
||||||
// Load the cookies from the vault.
|
// The vault has been migrated.
|
||||||
return withCookieJar(v, func(cookieJar http.CookieJar) error {
|
if err := v.SetMigrated(); err != nil {
|
||||||
// Create a new bridge instance.
|
logrus.WithError(err).Error("Failed to mark vault as migrated")
|
||||||
return withBridge(c, exe, locations, version, identifier, crashHandler, reporter, v, cookieJar, keychains, func(b *bridge.Bridge, eventCh <-chan events.Event) error {
|
}
|
||||||
if insecure {
|
}
|
||||||
logrus.Warn("The vault key could not be retrieved; the vault will not be encrypted")
|
|
||||||
b.PushError(bridge.ErrVaultInsecure)
|
|
||||||
}
|
|
||||||
|
|
||||||
if corrupt {
|
logrus.WithFields(logrus.Fields{
|
||||||
logrus.Warn("The vault is corrupt and has been wiped")
|
"lastVersion": v.GetLastVersion().String(),
|
||||||
b.PushError(bridge.ErrVaultCorrupt)
|
"showAllMail": v.GetShowAllMail(),
|
||||||
}
|
"updateCh": v.GetUpdateChannel(),
|
||||||
|
"autoUpdate": v.GetAutoUpdate(),
|
||||||
|
"rollout": v.GetUpdateRollout(),
|
||||||
|
"DoH": v.GetProxyAllowed(),
|
||||||
|
}).Info("Vault loaded")
|
||||||
|
|
||||||
// Remove old updates files
|
// Load the cookies from the vault.
|
||||||
b.RemoveOldUpdates()
|
return withCookieJar(v, func(cookieJar http.CookieJar) error {
|
||||||
|
// Create a new bridge instance.
|
||||||
|
return withBridge(c, exe, locations, version, identifier, crashHandler, reporter, v, cookieJar, func(b *bridge.Bridge, eventCh <-chan events.Event) error {
|
||||||
|
if insecure {
|
||||||
|
logrus.Warn("The vault key could not be retrieved; the vault will not be encrypted")
|
||||||
|
b.PushError(bridge.ErrVaultInsecure)
|
||||||
|
}
|
||||||
|
|
||||||
// Run the frontend.
|
if corrupt {
|
||||||
return runFrontend(c, crashHandler, restarter, locations, b, eventCh, quitCh, c.Int(flagParentPID))
|
logrus.Warn("The vault is corrupt and has been wiped")
|
||||||
})
|
b.PushError(bridge.ErrVaultCorrupt)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Start telemetry heartbeat process
|
||||||
|
b.StartHeartbeat(b)
|
||||||
|
|
||||||
|
// Run the frontend.
|
||||||
|
return runFrontend(c, crashHandler, restarter, locations, b, eventCh, quitCh, c.Int(flagParentPID))
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
@ -294,13 +282,6 @@ func run(c *cli.Context) error {
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
// if an error occurs, it must be logged now because we're about to close the log file.
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
return err
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// If there's another instance already running, try to raise it and exit.
|
// If there's another instance already running, try to raise it and exit.
|
||||||
@ -398,11 +379,6 @@ func withProfiler(c *cli.Context, fn func() error) error {
|
|||||||
defer profile.Start(profile.CPUProfile, profile.ProfilePath(".")).Stop()
|
defer profile.Start(profile.CPUProfile, profile.ProfilePath(".")).Stop()
|
||||||
}
|
}
|
||||||
|
|
||||||
if c.Bool(flagTraceProfile) {
|
|
||||||
logrus.Debug("Running with Trace profiling")
|
|
||||||
defer profile.Start(profile.TraceProfile, profile.ProfilePath(".")).Stop()
|
|
||||||
}
|
|
||||||
|
|
||||||
if c.Bool(flagMemProfile) {
|
if c.Bool(flagMemProfile) {
|
||||||
logrus.Debug("Running with memory profiling")
|
logrus.Debug("Running with memory profiling")
|
||||||
defer profile.Start(profile.MemProfile, profile.MemProfileAllocs, profile.ProfilePath(".")).Stop()
|
defer profile.Start(profile.MemProfile, profile.MemProfileAllocs, profile.ProfilePath(".")).Stop()
|
||||||
@ -481,13 +457,6 @@ func withCookieJar(vault *vault.Vault, fn func(http.CookieJar) error) error {
|
|||||||
return fn(persister)
|
return fn(persister)
|
||||||
}
|
}
|
||||||
|
|
||||||
// WithKeychainList init the list of usable keychains.
|
|
||||||
func WithKeychainList(fn func(*keychain.List) error) error {
|
|
||||||
logrus.Debug("Creating keychain list")
|
|
||||||
defer logrus.Debug("Keychain list stop")
|
|
||||||
return fn(keychain.NewList())
|
|
||||||
}
|
|
||||||
|
|
||||||
func setDeviceCookies(jar *cookies.Jar) error {
|
func setDeviceCookies(jar *cookies.Jar) error {
|
||||||
url, err := url.Parse(constants.APIHost)
|
url, err := url.Parse(constants.APIHost)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
@ -37,7 +37,6 @@ import (
|
|||||||
"github.com/ProtonMail/proton-bridge/v3/internal/useragent"
|
"github.com/ProtonMail/proton-bridge/v3/internal/useragent"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/vault"
|
"github.com/ProtonMail/proton-bridge/v3/internal/vault"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/versioner"
|
"github.com/ProtonMail/proton-bridge/v3/internal/versioner"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/pkg/keychain"
|
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli/v2"
|
||||||
)
|
)
|
||||||
@ -56,7 +55,6 @@ func withBridge(
|
|||||||
reporter *sentry.Reporter,
|
reporter *sentry.Reporter,
|
||||||
vault *vault.Vault,
|
vault *vault.Vault,
|
||||||
cookieJar http.CookieJar,
|
cookieJar http.CookieJar,
|
||||||
keychains *keychain.List,
|
|
||||||
fn func(*bridge.Bridge, <-chan events.Event) error,
|
fn func(*bridge.Bridge, <-chan events.Event) error,
|
||||||
) error {
|
) error {
|
||||||
logrus.Debug("Creating bridge")
|
logrus.Debug("Creating bridge")
|
||||||
@ -99,7 +97,6 @@ func withBridge(
|
|||||||
autostarter,
|
autostarter,
|
||||||
updater,
|
updater,
|
||||||
version,
|
version,
|
||||||
keychains,
|
|
||||||
|
|
||||||
// The API stuff.
|
// The API stuff.
|
||||||
constants.APIHost,
|
constants.APIHost,
|
||||||
@ -113,7 +110,6 @@ func withBridge(
|
|||||||
crashHandler,
|
crashHandler,
|
||||||
reporter,
|
reporter,
|
||||||
imap.DefaultEpochUIDValidityGenerator(),
|
imap.DefaultEpochUIDValidityGenerator(),
|
||||||
nil,
|
|
||||||
|
|
||||||
// The logging stuff.
|
// The logging stuff.
|
||||||
c.String(flagLogIMAP) == "client" || c.String(flagLogIMAP) == "all",
|
c.String(flagLogIMAP) == "client" || c.String(flagLogIMAP) == "all",
|
||||||
@ -159,7 +155,7 @@ func newUpdater(locations *locations.Locations) (*updater.Updater, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return updater.NewUpdater(
|
return updater.NewUpdater(
|
||||||
versioner.New(updatesDir),
|
updater.NewInstaller(versioner.New(updatesDir)),
|
||||||
verifier,
|
verifier,
|
||||||
constants.UpdateName,
|
constants.UpdateName,
|
||||||
runtime.GOOS,
|
runtime.GOOS,
|
||||||
|
|||||||
@ -122,7 +122,7 @@ func migrateOldSettingsWithDir(configDir string, v *vault.Vault) error {
|
|||||||
return v.SetBridgeTLSCertKey(certPEM, keyPEM)
|
return v.SetBridgeTLSCertKey(certPEM, keyPEM)
|
||||||
}
|
}
|
||||||
|
|
||||||
func migrateOldAccounts(locations *locations.Locations, keychains *keychain.List, v *vault.Vault) error {
|
func migrateOldAccounts(locations *locations.Locations, v *vault.Vault) error {
|
||||||
logrus.Info("Migrating accounts")
|
logrus.Info("Migrating accounts")
|
||||||
|
|
||||||
settings, err := locations.ProvideSettingsPath()
|
settings, err := locations.ProvideSettingsPath()
|
||||||
@ -134,7 +134,8 @@ func migrateOldAccounts(locations *locations.Locations, keychains *keychain.List
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("failed to get helper: %w", err)
|
return fmt.Errorf("failed to get helper: %w", err)
|
||||||
}
|
}
|
||||||
keychain, err := keychain.NewKeychain(helper, "bridge", keychains.GetHelpers(), keychains.GetDefaultHelper())
|
|
||||||
|
keychain, err := keychain.NewKeychain(helper, "bridge")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("failed to create keychain: %w", err)
|
return fmt.Errorf("failed to create keychain: %w", err)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -35,6 +35,7 @@ import (
|
|||||||
"github.com/ProtonMail/proton-bridge/v3/internal/vault"
|
"github.com/ProtonMail/proton-bridge/v3/internal/vault"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/pkg/algo"
|
"github.com/ProtonMail/proton-bridge/v3/pkg/algo"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/pkg/keychain"
|
"github.com/ProtonMail/proton-bridge/v3/pkg/keychain"
|
||||||
|
dockerCredentials "github.com/docker/docker-credential-helpers/credentials"
|
||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -42,7 +43,7 @@ func TestMigratePrefsToVaultWithKeys(t *testing.T) {
|
|||||||
// Create a new vault.
|
// Create a new vault.
|
||||||
vault, corrupt, err := vault.New(t.TempDir(), t.TempDir(), []byte("my secret key"), async.NoopPanicHandler{})
|
vault, corrupt, err := vault.New(t.TempDir(), t.TempDir(), []byte("my secret key"), async.NoopPanicHandler{})
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.NoError(t, corrupt)
|
require.False(t, corrupt)
|
||||||
|
|
||||||
// load the old prefs file.
|
// load the old prefs file.
|
||||||
configDir := filepath.Join("testdata", "with_keys")
|
configDir := filepath.Join("testdata", "with_keys")
|
||||||
@ -63,7 +64,7 @@ func TestMigratePrefsToVaultWithoutKeys(t *testing.T) {
|
|||||||
// Create a new vault.
|
// Create a new vault.
|
||||||
vault, corrupt, err := vault.New(t.TempDir(), t.TempDir(), []byte("my secret key"), async.NoopPanicHandler{})
|
vault, corrupt, err := vault.New(t.TempDir(), t.TempDir(), []byte("my secret key"), async.NoopPanicHandler{})
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.NoError(t, corrupt)
|
require.False(t, corrupt)
|
||||||
|
|
||||||
// load the old prefs file.
|
// load the old prefs file.
|
||||||
configDir := filepath.Join("testdata", "without_keys")
|
configDir := filepath.Join("testdata", "without_keys")
|
||||||
@ -132,9 +133,11 @@ func TestKeychainMigration(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestUserMigration(t *testing.T) {
|
func TestUserMigration(t *testing.T) {
|
||||||
kcl := keychain.NewTestKeychainsList()
|
keychainHelper := keychain.NewTestHelper()
|
||||||
|
|
||||||
kc, err := keychain.NewKeychain("mock", "bridge", kcl.GetHelpers(), kcl.GetDefaultHelper())
|
keychain.Helpers["mock"] = func(string) (dockerCredentials.Helper, error) { return keychainHelper, nil }
|
||||||
|
|
||||||
|
kc, err := keychain.NewKeychain("mock", "bridge")
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
require.NoError(t, kc.Put("brokenID", "broken"))
|
require.NoError(t, kc.Put("brokenID", "broken"))
|
||||||
@ -173,9 +176,9 @@ func TestUserMigration(t *testing.T) {
|
|||||||
|
|
||||||
v, corrupt, err := vault.New(settingsFolder, settingsFolder, token, async.NoopPanicHandler{})
|
v, corrupt, err := vault.New(settingsFolder, settingsFolder, token, async.NoopPanicHandler{})
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.NoError(t, corrupt)
|
require.False(t, corrupt)
|
||||||
|
|
||||||
require.NoError(t, migrateOldAccounts(locations, kcl, v))
|
require.NoError(t, migrateOldAccounts(locations, v))
|
||||||
require.Equal(t, []string{wantCredentials.UserID}, v.GetUserIDs())
|
require.Equal(t, []string{wantCredentials.UserID}, v.GetUserIDs())
|
||||||
|
|
||||||
require.NoError(t, v.GetUser(wantCredentials.UserID, func(u *vault.User) {
|
require.NoError(t, v.GetUser(wantCredentials.UserID, func(u *vault.User) {
|
||||||
|
|||||||
@ -30,37 +30,47 @@ import (
|
|||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
|
|
||||||
func WithVault(locations *locations.Locations, keychains *keychain.List, panicHandler async.PanicHandler, fn func(*vault.Vault, bool, bool) error) error {
|
func WithVault(locations *locations.Locations, panicHandler async.PanicHandler, fn func(*vault.Vault, bool, bool) error) error {
|
||||||
logrus.Debug("Creating vault")
|
logrus.Debug("Creating vault")
|
||||||
defer logrus.Debug("Vault stopped")
|
defer logrus.Debug("Vault stopped")
|
||||||
|
|
||||||
// Create the encVault.
|
// Create the encVault.
|
||||||
encVault, insecure, corrupt, err := newVault(locations, keychains, panicHandler)
|
encVault, insecure, corrupt, err := newVault(locations, panicHandler)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("could not create vault: %w", err)
|
return fmt.Errorf("could not create vault: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.WithFields(logrus.Fields{
|
logrus.WithFields(logrus.Fields{
|
||||||
"insecure": insecure,
|
"insecure": insecure,
|
||||||
"corrupt": corrupt != nil,
|
"corrupt": corrupt,
|
||||||
}).Debug("Vault created")
|
}).Debug("Vault created")
|
||||||
|
|
||||||
if corrupt != nil {
|
// Install the certificates if needed.
|
||||||
logrus.WithError(corrupt).Warn("Failed to load existing vault, vault has been reset")
|
if installed := encVault.GetCertsInstalled(); !installed {
|
||||||
}
|
logrus.Debug("Installing certificates")
|
||||||
|
|
||||||
cert, _ := encVault.GetBridgeTLSCert()
|
certPEM, _ := encVault.GetBridgeTLSCert()
|
||||||
certs.NewInstaller().LogCertInstallStatus(cert)
|
|
||||||
|
if err := certs.NewInstaller().InstallCert(certPEM); err != nil {
|
||||||
|
return fmt.Errorf("failed to install certs: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := encVault.SetCertsInstalled(true); err != nil {
|
||||||
|
return fmt.Errorf("failed to set certs installed: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.Debug("Certificates successfully installed")
|
||||||
|
}
|
||||||
|
|
||||||
// GODT-1950: Add teardown actions (e.g. to close the vault).
|
// GODT-1950: Add teardown actions (e.g. to close the vault).
|
||||||
|
|
||||||
return fn(encVault, insecure, corrupt != nil)
|
return fn(encVault, insecure, corrupt)
|
||||||
}
|
}
|
||||||
|
|
||||||
func newVault(locations *locations.Locations, keychains *keychain.List, panicHandler async.PanicHandler) (*vault.Vault, bool, error, error) {
|
func newVault(locations *locations.Locations, panicHandler async.PanicHandler) (*vault.Vault, bool, bool, error) {
|
||||||
vaultDir, err := locations.ProvideSettingsPath()
|
vaultDir, err := locations.ProvideSettingsPath()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, false, nil, fmt.Errorf("could not get vault dir: %w", err)
|
return nil, false, false, fmt.Errorf("could not get vault dir: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.WithField("vaultDir", vaultDir).Debug("Loading vault from directory")
|
logrus.WithField("vaultDir", vaultDir).Debug("Loading vault from directory")
|
||||||
@ -70,7 +80,7 @@ func newVault(locations *locations.Locations, keychains *keychain.List, panicHan
|
|||||||
insecure bool
|
insecure bool
|
||||||
)
|
)
|
||||||
|
|
||||||
if key, err := loadVaultKey(vaultDir, keychains); err != nil {
|
if key, err := loadVaultKey(vaultDir); err != nil {
|
||||||
logrus.WithError(err).Error("Could not load/create vault key")
|
logrus.WithError(err).Error("Could not load/create vault key")
|
||||||
insecure = true
|
insecure = true
|
||||||
|
|
||||||
@ -82,24 +92,24 @@ func newVault(locations *locations.Locations, keychains *keychain.List, panicHan
|
|||||||
|
|
||||||
gluonCacheDir, err := locations.ProvideGluonCachePath()
|
gluonCacheDir, err := locations.ProvideGluonCachePath()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, false, nil, fmt.Errorf("could not provide gluon path: %w", err)
|
return nil, false, false, fmt.Errorf("could not provide gluon path: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
vault, corrupt, err := vault.New(vaultDir, gluonCacheDir, vaultKey, panicHandler)
|
vault, corrupt, err := vault.New(vaultDir, gluonCacheDir, vaultKey, panicHandler)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, false, corrupt, fmt.Errorf("could not create vault: %w", err)
|
return nil, false, false, fmt.Errorf("could not create vault: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
return vault, insecure, corrupt, nil
|
return vault, insecure, corrupt, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func loadVaultKey(vaultDir string, keychains *keychain.List) ([]byte, error) {
|
func loadVaultKey(vaultDir string) ([]byte, error) {
|
||||||
helper, err := vault.GetHelper(vaultDir)
|
helper, err := vault.GetHelper(vaultDir)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("could not get keychain helper: %w", err)
|
return nil, fmt.Errorf("could not get keychain helper: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
kc, err := keychain.NewKeychain(helper, constants.KeyChainName, keychains.GetHelpers(), keychains.GetDefaultHelper())
|
kc, err := keychain.NewKeychain(helper, constants.KeyChainName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("could not create keychain: %w", err)
|
return nil, fmt.Errorf("could not create keychain: %w", err)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -15,7 +15,7 @@
|
|||||||
// You should have received a copy of the GNU General Public License
|
// You should have received a copy of the GNU General Public License
|
||||||
// along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
|
// along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
//go:build !build_qa && !test_integration
|
//go:build !build_qa
|
||||||
|
|
||||||
package bridge
|
package bridge
|
||||||
|
|
||||||
|
|||||||
@ -15,7 +15,7 @@
|
|||||||
// You should have received a copy of the GNU General Public License
|
// You should have received a copy of the GNU General Public License
|
||||||
// along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
|
// along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
//go:build build_qa || test_integration
|
//go:build build_qa
|
||||||
|
|
||||||
package bridge
|
package bridge
|
||||||
|
|
||||||
|
|||||||
@ -23,6 +23,7 @@ import (
|
|||||||
"crypto/tls"
|
"crypto/tls"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"net"
|
||||||
"net/http"
|
"net/http"
|
||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
@ -37,15 +38,11 @@ import (
|
|||||||
"github.com/ProtonMail/proton-bridge/v3/internal/constants"
|
"github.com/ProtonMail/proton-bridge/v3/internal/constants"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/events"
|
"github.com/ProtonMail/proton-bridge/v3/internal/events"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/focus"
|
"github.com/ProtonMail/proton-bridge/v3/internal/focus"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/identifier"
|
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/safe"
|
"github.com/ProtonMail/proton-bridge/v3/internal/safe"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/sentry"
|
"github.com/ProtonMail/proton-bridge/v3/internal/sentry"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/services/imapsmtpserver"
|
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/services/syncservice"
|
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/telemetry"
|
"github.com/ProtonMail/proton-bridge/v3/internal/telemetry"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/user"
|
"github.com/ProtonMail/proton-bridge/v3/internal/user"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/vault"
|
"github.com/ProtonMail/proton-bridge/v3/internal/vault"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/pkg/keychain"
|
|
||||||
"github.com/bradenaw/juniper/xslices"
|
"github.com/bradenaw/juniper/xslices"
|
||||||
"github.com/go-resty/resty/v2"
|
"github.com/go-resty/resty/v2"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
@ -62,7 +59,7 @@ type Bridge struct {
|
|||||||
// api manages user API clients.
|
// api manages user API clients.
|
||||||
api *proton.Manager
|
api *proton.Manager
|
||||||
proxyCtl ProxyController
|
proxyCtl ProxyController
|
||||||
identifier identifier.Identifier
|
identifier Identifier
|
||||||
|
|
||||||
// tlsConfig holds the bridge TLS config used by the IMAP and SMTP servers.
|
// tlsConfig holds the bridge TLS config used by the IMAP and SMTP servers.
|
||||||
tlsConfig *tls.Config
|
tlsConfig *tls.Config
|
||||||
@ -75,7 +72,7 @@ type Bridge struct {
|
|||||||
installCh chan installJob
|
installCh chan installJob
|
||||||
|
|
||||||
// heartbeat is the telemetry heartbeat for metrics.
|
// heartbeat is the telemetry heartbeat for metrics.
|
||||||
heartbeat *heartBeatState
|
heartbeat telemetry.Heartbeat
|
||||||
|
|
||||||
// curVersion is the current version of the bridge,
|
// curVersion is the current version of the bridge,
|
||||||
// newVersion is the version that was installed by the updater.
|
// newVersion is the version that was installed by the updater.
|
||||||
@ -83,9 +80,6 @@ type Bridge struct {
|
|||||||
newVersion *semver.Version
|
newVersion *semver.Version
|
||||||
newVersionLock safe.RWMutex
|
newVersionLock safe.RWMutex
|
||||||
|
|
||||||
// keychains is the utils that own usable keychains found in the OS.
|
|
||||||
keychains *keychain.List
|
|
||||||
|
|
||||||
// focusService is used to raise the bridge window when needed.
|
// focusService is used to raise the bridge window when needed.
|
||||||
focusService *focus.Service
|
focusService *focus.Service
|
||||||
|
|
||||||
@ -128,8 +122,12 @@ type Bridge struct {
|
|||||||
// goUpdate triggers a check/install of updates.
|
// goUpdate triggers a check/install of updates.
|
||||||
goUpdate func()
|
goUpdate func()
|
||||||
|
|
||||||
serverManager *imapsmtpserver.Service
|
// goHeartbeat triggers a check/sending if heartbeat is needed.
|
||||||
syncService *syncservice.Service
|
goHeartbeat func()
|
||||||
|
|
||||||
|
uidValidityGenerator imap.UIDValidityGenerator
|
||||||
|
|
||||||
|
serverManager *ServerManager
|
||||||
}
|
}
|
||||||
|
|
||||||
// New creates a new bridge.
|
// New creates a new bridge.
|
||||||
@ -139,18 +137,16 @@ func New(
|
|||||||
autostarter Autostarter, // the autostarter to manage autostart settings
|
autostarter Autostarter, // the autostarter to manage autostart settings
|
||||||
updater Updater, // the updater to fetch and install updates
|
updater Updater, // the updater to fetch and install updates
|
||||||
curVersion *semver.Version, // the current version of the bridge
|
curVersion *semver.Version, // the current version of the bridge
|
||||||
keychains *keychain.List, // usable keychains
|
|
||||||
|
|
||||||
apiURL string, // the URL of the API to use
|
apiURL string, // the URL of the API to use
|
||||||
cookieJar http.CookieJar, // the cookie jar to use
|
cookieJar http.CookieJar, // the cookie jar to use
|
||||||
identifier identifier.Identifier, // the identifier to keep track of the user agent
|
identifier Identifier, // the identifier to keep track of the user agent
|
||||||
tlsReporter TLSReporter, // the TLS reporter to report TLS errors
|
tlsReporter TLSReporter, // the TLS reporter to report TLS errors
|
||||||
roundTripper http.RoundTripper, // the round tripper to use for API requests
|
roundTripper http.RoundTripper, // the round tripper to use for API requests
|
||||||
proxyCtl ProxyController, // the DoH controller
|
proxyCtl ProxyController, // the DoH controller
|
||||||
panicHandler async.PanicHandler,
|
panicHandler async.PanicHandler,
|
||||||
reporter reporter.Reporter,
|
reporter reporter.Reporter,
|
||||||
uidValidityGenerator imap.UIDValidityGenerator,
|
uidValidityGenerator imap.UIDValidityGenerator,
|
||||||
heartBeatManager telemetry.HeartbeatManager,
|
|
||||||
|
|
||||||
logIMAPClient, logIMAPServer bool, // whether to log IMAP client/server activity
|
logIMAPClient, logIMAPServer bool, // whether to log IMAP client/server activity
|
||||||
logSMTP bool, // whether to log SMTP activity
|
logSMTP bool, // whether to log SMTP activity
|
||||||
@ -166,7 +162,6 @@ func New(
|
|||||||
|
|
||||||
// bridge is the bridge.
|
// bridge is the bridge.
|
||||||
bridge, err := newBridge(
|
bridge, err := newBridge(
|
||||||
context.Background(),
|
|
||||||
tasks,
|
tasks,
|
||||||
imapEventCh,
|
imapEventCh,
|
||||||
|
|
||||||
@ -175,7 +170,6 @@ func New(
|
|||||||
autostarter,
|
autostarter,
|
||||||
updater,
|
updater,
|
||||||
curVersion,
|
curVersion,
|
||||||
keychains,
|
|
||||||
panicHandler,
|
panicHandler,
|
||||||
reporter,
|
reporter,
|
||||||
|
|
||||||
@ -183,7 +177,6 @@ func New(
|
|||||||
identifier,
|
identifier,
|
||||||
proxyCtl,
|
proxyCtl,
|
||||||
uidValidityGenerator,
|
uidValidityGenerator,
|
||||||
heartBeatManager,
|
|
||||||
logIMAPClient, logIMAPServer, logSMTP,
|
logIMAPClient, logIMAPServer, logSMTP,
|
||||||
)
|
)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -202,7 +195,6 @@ func New(
|
|||||||
}
|
}
|
||||||
|
|
||||||
func newBridge(
|
func newBridge(
|
||||||
ctx context.Context,
|
|
||||||
tasks *async.Group,
|
tasks *async.Group,
|
||||||
imapEventCh chan imapEvents.Event,
|
imapEventCh chan imapEvents.Event,
|
||||||
|
|
||||||
@ -211,15 +203,13 @@ func newBridge(
|
|||||||
autostarter Autostarter,
|
autostarter Autostarter,
|
||||||
updater Updater,
|
updater Updater,
|
||||||
curVersion *semver.Version,
|
curVersion *semver.Version,
|
||||||
keychains *keychain.List,
|
|
||||||
panicHandler async.PanicHandler,
|
panicHandler async.PanicHandler,
|
||||||
reporter reporter.Reporter,
|
reporter reporter.Reporter,
|
||||||
|
|
||||||
api *proton.Manager,
|
api *proton.Manager,
|
||||||
identifier identifier.Identifier,
|
identifier Identifier,
|
||||||
proxyCtl ProxyController,
|
proxyCtl ProxyController,
|
||||||
uidValidityGenerator imap.UIDValidityGenerator,
|
uidValidityGenerator imap.UIDValidityGenerator,
|
||||||
heartbeatManager telemetry.HeartbeatManager,
|
|
||||||
|
|
||||||
logIMAPClient, logIMAPServer, logSMTP bool,
|
logIMAPClient, logIMAPServer, logSMTP bool,
|
||||||
) (*Bridge, error) {
|
) (*Bridge, error) {
|
||||||
@ -265,13 +255,9 @@ func newBridge(
|
|||||||
newVersion: curVersion,
|
newVersion: curVersion,
|
||||||
newVersionLock: safe.NewRWMutex(),
|
newVersionLock: safe.NewRWMutex(),
|
||||||
|
|
||||||
keychains: keychains,
|
|
||||||
|
|
||||||
panicHandler: panicHandler,
|
panicHandler: panicHandler,
|
||||||
reporter: reporter,
|
reporter: reporter,
|
||||||
|
|
||||||
heartbeat: newHeartBeatState(ctx, panicHandler),
|
|
||||||
|
|
||||||
focusService: focusService,
|
focusService: focusService,
|
||||||
autostarter: autostarter,
|
autostarter: autostarter,
|
||||||
locator: locator,
|
locator: locator,
|
||||||
@ -283,32 +269,17 @@ func newBridge(
|
|||||||
firstStart: firstStart,
|
firstStart: firstStart,
|
||||||
lastVersion: lastVersion,
|
lastVersion: lastVersion,
|
||||||
|
|
||||||
tasks: tasks,
|
tasks: tasks,
|
||||||
syncService: syncservice.NewService(reporter, panicHandler),
|
|
||||||
|
uidValidityGenerator: uidValidityGenerator,
|
||||||
|
|
||||||
|
serverManager: newServerManager(),
|
||||||
}
|
}
|
||||||
|
|
||||||
bridge.serverManager = imapsmtpserver.NewService(context.Background(),
|
if err := bridge.serverManager.Init(bridge); err != nil {
|
||||||
&bridgeSMTPSettings{b: bridge},
|
|
||||||
&bridgeIMAPSettings{b: bridge},
|
|
||||||
&bridgeEventPublisher{b: bridge},
|
|
||||||
panicHandler,
|
|
||||||
reporter,
|
|
||||||
uidValidityGenerator,
|
|
||||||
&bridgeIMAPSMTPTelemetry{b: bridge},
|
|
||||||
)
|
|
||||||
|
|
||||||
if err := bridge.serverManager.Init(context.Background(), bridge.tasks, &bridgeEventSubscription{b: bridge}); err != nil {
|
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
if heartbeatManager == nil {
|
|
||||||
bridge.heartbeat.init(bridge, bridge)
|
|
||||||
} else {
|
|
||||||
bridge.heartbeat.init(bridge, heartbeatManager)
|
|
||||||
}
|
|
||||||
|
|
||||||
bridge.syncService.Run()
|
|
||||||
|
|
||||||
return bridge, nil
|
return bridge, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -436,8 +407,10 @@ func (bridge *Bridge) GetErrors() []error {
|
|||||||
func (bridge *Bridge) Close(ctx context.Context) {
|
func (bridge *Bridge) Close(ctx context.Context) {
|
||||||
logrus.Info("Closing bridge")
|
logrus.Info("Closing bridge")
|
||||||
|
|
||||||
// Stop heart beat before closing users.
|
// Close the servers
|
||||||
bridge.heartbeat.stop()
|
if err := bridge.serverManager.CloseServers(ctx); err != nil {
|
||||||
|
logrus.WithError(err).Error("Failed to close servers")
|
||||||
|
}
|
||||||
|
|
||||||
// Close all users.
|
// Close all users.
|
||||||
safe.Lock(func() {
|
safe.Lock(func() {
|
||||||
@ -446,13 +419,6 @@ func (bridge *Bridge) Close(ctx context.Context) {
|
|||||||
}
|
}
|
||||||
}, bridge.usersLock)
|
}, bridge.usersLock)
|
||||||
|
|
||||||
// Close the servers
|
|
||||||
if err := bridge.serverManager.CloseServers(ctx); err != nil {
|
|
||||||
logrus.WithError(err).Error("Failed to close servers")
|
|
||||||
}
|
|
||||||
|
|
||||||
bridge.syncService.Close()
|
|
||||||
|
|
||||||
// Stop all ongoing tasks.
|
// Stop all ongoing tasks.
|
||||||
bridge.tasks.CancelAndWait()
|
bridge.tasks.CancelAndWait()
|
||||||
|
|
||||||
@ -511,15 +477,27 @@ func (bridge *Bridge) remWatcher(watcher *watcher.Watcher[events.Event]) {
|
|||||||
watcher.Close()
|
watcher.Close()
|
||||||
}
|
}
|
||||||
|
|
||||||
func (bridge *Bridge) onStatusUp(_ context.Context) {
|
func (bridge *Bridge) onStatusUp(ctx context.Context) {
|
||||||
logrus.Info("Handling API status up")
|
logrus.Info("Handling API status up")
|
||||||
|
|
||||||
|
safe.RLock(func() {
|
||||||
|
for _, user := range bridge.users {
|
||||||
|
user.OnStatusUp(ctx)
|
||||||
|
}
|
||||||
|
}, bridge.usersLock)
|
||||||
|
|
||||||
bridge.goLoad()
|
bridge.goLoad()
|
||||||
}
|
}
|
||||||
|
|
||||||
func (bridge *Bridge) onStatusDown(ctx context.Context) {
|
func (bridge *Bridge) onStatusDown(ctx context.Context) {
|
||||||
logrus.Info("Handling API status down")
|
logrus.Info("Handling API status down")
|
||||||
|
|
||||||
|
safe.RLock(func() {
|
||||||
|
for _, user := range bridge.users {
|
||||||
|
user.OnStatusDown(ctx)
|
||||||
|
}
|
||||||
|
}, bridge.usersLock)
|
||||||
|
|
||||||
for backoff := time.Second; ; backoff = min(backoff*2, 30*time.Second) {
|
for backoff := time.Second; ; backoff = min(backoff*2, 30*time.Second) {
|
||||||
select {
|
select {
|
||||||
case <-ctx.Done():
|
case <-ctx.Done():
|
||||||
@ -549,6 +527,24 @@ func loadTLSConfig(vault *vault.Vault) (*tls.Config, error) {
|
|||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func newListener(port int, useTLS bool, tlsConfig *tls.Config) (net.Listener, error) {
|
||||||
|
if useTLS {
|
||||||
|
tlsListener, err := tls.Listen("tcp", fmt.Sprintf("%v:%v", constants.Host, port), tlsConfig)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return tlsListener, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
netListener, err := net.Listen("tcp", fmt.Sprintf("%v:%v", constants.Host, port))
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return netListener, nil
|
||||||
|
}
|
||||||
|
|
||||||
func min(a, b time.Duration) time.Duration {
|
func min(a, b time.Duration) time.Duration {
|
||||||
if a < b {
|
if a < b {
|
||||||
return a
|
return a
|
||||||
|
|||||||
@ -44,19 +44,16 @@ import (
|
|||||||
"github.com/ProtonMail/proton-bridge/v3/internal/events"
|
"github.com/ProtonMail/proton-bridge/v3/internal/events"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/focus"
|
"github.com/ProtonMail/proton-bridge/v3/internal/focus"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/locations"
|
"github.com/ProtonMail/proton-bridge/v3/internal/locations"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/services/imapsmtpserver"
|
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/updater"
|
"github.com/ProtonMail/proton-bridge/v3/internal/updater"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/user"
|
"github.com/ProtonMail/proton-bridge/v3/internal/user"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/useragent"
|
"github.com/ProtonMail/proton-bridge/v3/internal/useragent"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/vault"
|
"github.com/ProtonMail/proton-bridge/v3/internal/vault"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/pkg/keychain"
|
|
||||||
"github.com/ProtonMail/proton-bridge/v3/tests"
|
"github.com/ProtonMail/proton-bridge/v3/tests"
|
||||||
"github.com/bradenaw/juniper/xslices"
|
"github.com/bradenaw/juniper/xslices"
|
||||||
imapid "github.com/emersion/go-imap-id"
|
imapid "github.com/emersion/go-imap-id"
|
||||||
"github.com/emersion/go-sasl"
|
"github.com/emersion/go-sasl"
|
||||||
"github.com/emersion/go-smtp"
|
"github.com/emersion/go-smtp"
|
||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
"go.uber.org/goleak"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
@ -586,7 +583,7 @@ func TestBridge_MissingGluonStore(t *testing.T) {
|
|||||||
require.NoError(t, os.RemoveAll(gluonDir))
|
require.NoError(t, os.RemoveAll(gluonDir))
|
||||||
|
|
||||||
// Bridge starts but can't find the gluon store dir; there should be no error.
|
// Bridge starts but can't find the gluon store dir; there should be no error.
|
||||||
withBridgeWaitForServers(ctx, t, s.GetHostURL(), netCtl, locator, vaultKey, func(bridge *bridge.Bridge, mocks *bridge.Mocks) {
|
withBridge(ctx, t, s.GetHostURL(), netCtl, locator, vaultKey, func(bridge *bridge.Bridge, mocks *bridge.Mocks) {
|
||||||
// ...
|
// ...
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
@ -624,10 +621,6 @@ func TestBridge_AddressWithoutKeys(t *testing.T) {
|
|||||||
defer m.Close()
|
defer m.Close()
|
||||||
|
|
||||||
withBridge(ctx, t, s.GetHostURL(), netCtl, locator, vaultKey, func(bridge *bridge.Bridge, mocks *bridge.Mocks) {
|
withBridge(ctx, t, s.GetHostURL(), netCtl, locator, vaultKey, func(bridge *bridge.Bridge, mocks *bridge.Mocks) {
|
||||||
// Watch for sync finished event.
|
|
||||||
syncCh, done := chToType[events.Event, events.SyncFinished](bridge.GetEvents(events.SyncFinished{}))
|
|
||||||
defer done()
|
|
||||||
|
|
||||||
// Create a user which will have an address without keys.
|
// Create a user which will have an address without keys.
|
||||||
userID, _, err := s.CreateUser("nokeys", []byte("password"))
|
userID, _, err := s.CreateUser("nokeys", []byte("password"))
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
@ -648,6 +641,10 @@ func TestBridge_AddressWithoutKeys(t *testing.T) {
|
|||||||
// Remove the address keys.
|
// Remove the address keys.
|
||||||
require.NoError(t, s.RemoveAddressKey(userID, aliasAddrID, aliasAddr.Keys[0].ID))
|
require.NoError(t, s.RemoveAddressKey(userID, aliasAddrID, aliasAddr.Keys[0].ID))
|
||||||
|
|
||||||
|
// Watch for sync finished event.
|
||||||
|
syncCh, done := chToType[events.Event, events.SyncFinished](bridge.GetEvents(events.SyncFinished{}))
|
||||||
|
defer done()
|
||||||
|
|
||||||
// We should be able to log the user in.
|
// We should be able to log the user in.
|
||||||
require.NoError(t, getErr(bridge.LoginFull(context.Background(), "nokeys", []byte("password"), nil, nil)))
|
require.NoError(t, getErr(bridge.LoginFull(context.Background(), "nokeys", []byte("password"), nil, nil)))
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
@ -703,10 +700,10 @@ func TestBridge_InitGluonDirectory(t *testing.T) {
|
|||||||
configDir, err := b.GetGluonDataDir()
|
configDir, err := b.GetGluonDataDir()
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
_, err = os.ReadDir(imapsmtpserver.ApplyGluonCachePathSuffix(b.GetGluonCacheDir()))
|
_, err = os.ReadDir(bridge.ApplyGluonCachePathSuffix(b.GetGluonCacheDir()))
|
||||||
require.False(t, os.IsNotExist(err))
|
require.False(t, os.IsNotExist(err))
|
||||||
|
|
||||||
_, err = os.ReadDir(imapsmtpserver.ApplyGluonConfigPathSuffix(configDir))
|
_, err = os.ReadDir(bridge.ApplyGluonConfigPathSuffix(configDir))
|
||||||
require.False(t, os.IsNotExist(err))
|
require.False(t, os.IsNotExist(err))
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
@ -779,16 +776,16 @@ func TestBridge_ChangeCacheDirectory(t *testing.T) {
|
|||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
// Old store should no more exists.
|
// Old store should no more exists.
|
||||||
_, err = os.ReadDir(imapsmtpserver.ApplyGluonCachePathSuffix(currentCacheDir))
|
_, err = os.ReadDir(bridge.ApplyGluonCachePathSuffix(currentCacheDir))
|
||||||
require.True(t, os.IsNotExist(err))
|
require.True(t, os.IsNotExist(err))
|
||||||
// Database should not have changed.
|
// Database should not have changed.
|
||||||
_, err = os.ReadDir(imapsmtpserver.ApplyGluonConfigPathSuffix(configDir))
|
_, err = os.ReadDir(bridge.ApplyGluonConfigPathSuffix(configDir))
|
||||||
require.False(t, os.IsNotExist(err))
|
require.False(t, os.IsNotExist(err))
|
||||||
|
|
||||||
// New path should have Gluon sub-folder.
|
// New path should have Gluon sub-folder.
|
||||||
require.Equal(t, filepath.Join(newCacheDir, "gluon"), b.GetGluonCacheDir())
|
require.Equal(t, filepath.Join(newCacheDir, "gluon"), b.GetGluonCacheDir())
|
||||||
// And store should be inside it.
|
// And store should be inside it.
|
||||||
_, err = os.ReadDir(imapsmtpserver.ApplyGluonCachePathSuffix(b.GetGluonCacheDir()))
|
_, err = os.ReadDir(bridge.ApplyGluonCachePathSuffix(b.GetGluonCacheDir()))
|
||||||
require.False(t, os.IsNotExist(err))
|
require.False(t, os.IsNotExist(err))
|
||||||
|
|
||||||
// We should be able to fetch.
|
// We should be able to fetch.
|
||||||
@ -876,9 +873,6 @@ func TestBridge_ChangeAddressOrder(t *testing.T) {
|
|||||||
|
|
||||||
// withEnv creates the full test environment and runs the tests.
|
// withEnv creates the full test environment and runs the tests.
|
||||||
func withEnv(t *testing.T, tests func(context.Context, *server.Server, *proton.NetCtl, bridge.Locator, []byte), opts ...server.Option) {
|
func withEnv(t *testing.T, tests func(context.Context, *server.Server, *proton.NetCtl, bridge.Locator, []byte), opts ...server.Option) {
|
||||||
opt := goleak.IgnoreCurrent()
|
|
||||||
defer goleak.VerifyNone(t, opt)
|
|
||||||
|
|
||||||
server := server.New(opts...)
|
server := server.New(opts...)
|
||||||
defer server.Close()
|
defer server.Close()
|
||||||
|
|
||||||
@ -951,7 +945,6 @@ func withBridgeNoMocks(
|
|||||||
mocks.Autostarter,
|
mocks.Autostarter,
|
||||||
mocks.Updater,
|
mocks.Updater,
|
||||||
v2_3_0,
|
v2_3_0,
|
||||||
keychain.NewTestKeychainsList(),
|
|
||||||
|
|
||||||
// The API stuff.
|
// The API stuff.
|
||||||
apiURL,
|
apiURL,
|
||||||
@ -963,7 +956,6 @@ func withBridgeNoMocks(
|
|||||||
mocks.CrashHandler,
|
mocks.CrashHandler,
|
||||||
mocks.Reporter,
|
mocks.Reporter,
|
||||||
testUIDValidityGenerator,
|
testUIDValidityGenerator,
|
||||||
mocks.Heartbeat,
|
|
||||||
|
|
||||||
// The logging stuff.
|
// The logging stuff.
|
||||||
os.Getenv("BRIDGE_LOG_IMAP_CLIENT") == "1",
|
os.Getenv("BRIDGE_LOG_IMAP_CLIENT") == "1",
|
||||||
@ -973,6 +965,9 @@ func withBridgeNoMocks(
|
|||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Empty(t, bridge.GetErrors())
|
require.Empty(t, bridge.GetErrors())
|
||||||
|
|
||||||
|
// Start the Heartbeat process.
|
||||||
|
bridge.StartHeartbeat(mocks.Heartbeat)
|
||||||
|
|
||||||
// Wait for bridge to finish loading users.
|
// Wait for bridge to finish loading users.
|
||||||
waitForEvent(t, eventCh, events.AllUsersLoaded{})
|
waitForEvent(t, eventCh, events.AllUsersLoaded{})
|
||||||
|
|
||||||
@ -1062,7 +1057,6 @@ func getConnectedUserIDs(t *testing.T, b *bridge.Bridge) []string {
|
|||||||
func chToType[In, Out any](inCh <-chan In, done func()) (<-chan Out, func()) {
|
func chToType[In, Out any](inCh <-chan In, done func()) (<-chan Out, func()) {
|
||||||
outCh := make(chan Out)
|
outCh := make(chan Out)
|
||||||
|
|
||||||
ctx, cancel := context.WithCancel(context.Background())
|
|
||||||
go func() {
|
go func() {
|
||||||
defer close(outCh)
|
defer close(outCh)
|
||||||
|
|
||||||
@ -1072,19 +1066,11 @@ func chToType[In, Out any](inCh <-chan In, done func()) (<-chan Out, func()) {
|
|||||||
panic(fmt.Sprintf("unexpected type %T", in))
|
panic(fmt.Sprintf("unexpected type %T", in))
|
||||||
}
|
}
|
||||||
|
|
||||||
select {
|
outCh <- out
|
||||||
case <-ctx.Done():
|
|
||||||
return
|
|
||||||
|
|
||||||
case outCh <- out:
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
return outCh, func() {
|
return outCh, done
|
||||||
cancel()
|
|
||||||
done()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type eventWaiter struct {
|
type eventWaiter struct {
|
||||||
|
|||||||
@ -19,7 +19,6 @@ package bridge
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"errors"
|
|
||||||
"io"
|
"io"
|
||||||
|
|
||||||
"github.com/ProtonMail/go-proton-api"
|
"github.com/ProtonMail/go-proton-api"
|
||||||
@ -34,133 +33,63 @@ const (
|
|||||||
DefaultMaxSessionCountForBugReport = 10
|
DefaultMaxSessionCountForBugReport = 10
|
||||||
)
|
)
|
||||||
|
|
||||||
type ReportBugReq struct {
|
func (bridge *Bridge) ReportBug(ctx context.Context, osType, osVersion, description, username, email, client string, attachLogs bool) error {
|
||||||
OSType string
|
var account string
|
||||||
OSVersion string
|
|
||||||
Title string
|
|
||||||
Description string
|
|
||||||
Username string
|
|
||||||
Email string
|
|
||||||
EmailClient string
|
|
||||||
IncludeLogs bool
|
|
||||||
}
|
|
||||||
|
|
||||||
func (bridge *Bridge) ReportBug(ctx context.Context, report *ReportBugReq) error {
|
if info, err := bridge.QueryUserInfo(username); err == nil {
|
||||||
if info, err := bridge.QueryUserInfo(report.Username); err == nil {
|
account = info.Username
|
||||||
report.Username = info.Username
|
|
||||||
} else if userIDs := bridge.GetUserIDs(); len(userIDs) > 0 {
|
} else if userIDs := bridge.GetUserIDs(); len(userIDs) > 0 {
|
||||||
if err := bridge.vault.GetUser(userIDs[0], func(user *vault.User) {
|
if err := bridge.vault.GetUser(userIDs[0], func(user *vault.User) {
|
||||||
report.Username = user.Username()
|
account = user.Username()
|
||||||
}); err != nil {
|
}); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var attachments []proton.ReportBugAttachment
|
var attachment []proton.ReportBugAttachment
|
||||||
if report.IncludeLogs {
|
|
||||||
logs, err := bridge.CollectLogs()
|
if attachLogs {
|
||||||
|
logsPath, err := bridge.locator.ProvideLogsPath()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
attachments = append(attachments, logs)
|
|
||||||
|
buffer, err := logging.ZipLogsForBugReport(logsPath, DefaultMaxSessionCountForBugReport, DefaultMaxBugReportZipSize)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
body, err := io.ReadAll(buffer)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
attachment = append(attachment, proton.ReportBugAttachment{
|
||||||
|
Name: "logs.zip",
|
||||||
|
Filename: "logs.zip",
|
||||||
|
MIMEType: "application/zip",
|
||||||
|
Body: body,
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
var firstAtt proton.ReportBugAttachment
|
safe.Lock(func() {
|
||||||
if len(attachments) > 0 && report.IncludeLogs {
|
|
||||||
firstAtt = attachments[0]
|
|
||||||
}
|
|
||||||
|
|
||||||
attachmentType := proton.AttachmentTypeSync
|
|
||||||
if len(attachments) > 1 {
|
|
||||||
attachmentType = proton.AttachmentTypeAsync
|
|
||||||
}
|
|
||||||
|
|
||||||
token, err := bridge.createTicket(ctx, report, attachmentType, firstAtt)
|
|
||||||
if err != nil || token == "" {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
safe.RLock(func() {
|
|
||||||
for _, user := range bridge.users {
|
for _, user := range bridge.users {
|
||||||
user.ReportBugSent()
|
user.ReportBugSent()
|
||||||
}
|
}
|
||||||
}, bridge.usersLock)
|
}, bridge.usersLock)
|
||||||
|
|
||||||
// if we have a token we can append more attachment to the bugReport
|
return bridge.api.ReportBug(ctx, proton.ReportBugReq{
|
||||||
for i, att := range attachments {
|
OS: osType,
|
||||||
if i == 0 && report.IncludeLogs {
|
OSVersion: osVersion,
|
||||||
continue
|
|
||||||
}
|
|
||||||
err := bridge.appendComment(ctx, token, att)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
func (bridge *Bridge) CollectLogs() (proton.ReportBugAttachment, error) {
|
Title: "[Bridge] Bug",
|
||||||
logsPath, err := bridge.locator.ProvideLogsPath()
|
Description: description,
|
||||||
if err != nil {
|
|
||||||
return proton.ReportBugAttachment{}, err
|
|
||||||
}
|
|
||||||
|
|
||||||
buffer, err := logging.ZipLogsForBugReport(logsPath, DefaultMaxSessionCountForBugReport, DefaultMaxBugReportZipSize)
|
Client: client,
|
||||||
if err != nil {
|
|
||||||
return proton.ReportBugAttachment{}, err
|
|
||||||
}
|
|
||||||
|
|
||||||
body, err := io.ReadAll(buffer)
|
|
||||||
if err != nil {
|
|
||||||
return proton.ReportBugAttachment{}, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return proton.ReportBugAttachment{
|
|
||||||
Name: "logs.zip",
|
|
||||||
Filename: "logs.zip",
|
|
||||||
MIMEType: "application/zip",
|
|
||||||
Body: body,
|
|
||||||
}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (bridge *Bridge) createTicket(ctx context.Context, report *ReportBugReq,
|
|
||||||
asyncAttach proton.AttachmentType, att proton.ReportBugAttachment) (string, error) {
|
|
||||||
var attachments []proton.ReportBugAttachment
|
|
||||||
attachments = append(attachments, att)
|
|
||||||
res, err := bridge.api.ReportBug(ctx, proton.ReportBugReq{
|
|
||||||
OS: report.OSType,
|
|
||||||
OSVersion: report.OSVersion,
|
|
||||||
|
|
||||||
Title: "[Bridge] Bug - " + report.Title,
|
|
||||||
Description: report.Description,
|
|
||||||
|
|
||||||
Client: report.EmailClient,
|
|
||||||
ClientType: proton.ClientTypeEmail,
|
ClientType: proton.ClientTypeEmail,
|
||||||
ClientVersion: constants.AppVersion(bridge.curVersion.Original()),
|
ClientVersion: constants.AppVersion(bridge.curVersion.Original()),
|
||||||
|
|
||||||
Username: report.Username,
|
Username: account,
|
||||||
Email: report.Email,
|
Email: email,
|
||||||
|
}, attachment...)
|
||||||
AsyncAttachments: asyncAttach,
|
|
||||||
}, attachments...)
|
|
||||||
|
|
||||||
if err != nil || asyncAttach != proton.AttachmentTypeAsync {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
|
|
||||||
if asyncAttach == proton.AttachmentTypeAsync && res.Token == nil {
|
|
||||||
return "", errors.New("no token returns for AsyncAttachments")
|
|
||||||
}
|
|
||||||
|
|
||||||
return *res.Token, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (bridge *Bridge) appendComment(ctx context.Context, token string, att proton.ReportBugAttachment) error {
|
|
||||||
var attachments []proton.ReportBugAttachment
|
|
||||||
attachments = append(attachments, att)
|
|
||||||
return bridge.api.ReportBugAttachement(ctx, proton.ReportBugAttachmentReq{
|
|
||||||
Product: proton.ClientTypeEmail,
|
|
||||||
Body: "Comment adding attachment: " + att.Filename,
|
|
||||||
Token: token,
|
|
||||||
}, attachments...)
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -22,7 +22,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func (bridge *Bridge) ReportBugClicked() {
|
func (bridge *Bridge) ReportBugClicked() {
|
||||||
safe.RLock(func() {
|
safe.Lock(func() {
|
||||||
for _, user := range bridge.users {
|
for _, user := range bridge.users {
|
||||||
user.ReportBugClicked()
|
user.ReportBugClicked()
|
||||||
}
|
}
|
||||||
@ -30,17 +30,17 @@ func (bridge *Bridge) ReportBugClicked() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (bridge *Bridge) AutoconfigUsed(client string) {
|
func (bridge *Bridge) AutoconfigUsed(client string) {
|
||||||
safe.RLock(func() {
|
safe.Lock(func() {
|
||||||
for _, user := range bridge.users {
|
for _, user := range bridge.users {
|
||||||
user.AutoconfigUsed(client)
|
user.AutoconfigUsed(client)
|
||||||
}
|
}
|
||||||
}, bridge.usersLock)
|
}, bridge.usersLock)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (bridge *Bridge) ExternalLinkClicked(article string) {
|
func (bridge *Bridge) KBArticleOpened(article string) {
|
||||||
safe.RLock(func() {
|
safe.Lock(func() {
|
||||||
for _, user := range bridge.users {
|
for _, user := range bridge.users {
|
||||||
user.ExternalLinkClicked(article)
|
user.KBArticleOpened(article)
|
||||||
}
|
}
|
||||||
}, bridge.usersLock)
|
}, bridge.usersLock)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -19,7 +19,6 @@ package bridge
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"errors"
|
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/clientconfig"
|
"github.com/ProtonMail/proton-bridge/v3/internal/clientconfig"
|
||||||
@ -31,8 +30,8 @@ import (
|
|||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
|
|
||||||
// ConfigureAppleMail configures Apple Mail for the given userID and address.
|
// ConfigureAppleMail configures apple mail for the given userID and address.
|
||||||
// If configuring Apple Mail for Catalina or newer, it ensures Bridge is using SSL.
|
// If configuring apple mail for Catalina or newer, it ensures Bridge is using SSL.
|
||||||
func (bridge *Bridge) ConfigureAppleMail(ctx context.Context, userID, address string) error {
|
func (bridge *Bridge) ConfigureAppleMail(ctx context.Context, userID, address string) error {
|
||||||
logrus.WithFields(logrus.Fields{
|
logrus.WithFields(logrus.Fields{
|
||||||
"userID": userID,
|
"userID": userID,
|
||||||
@ -45,28 +44,16 @@ func (bridge *Bridge) ConfigureAppleMail(ctx context.Context, userID, address st
|
|||||||
return ErrNoSuchUser
|
return ErrNoSuchUser
|
||||||
}
|
}
|
||||||
|
|
||||||
emails := user.Emails()
|
|
||||||
displayNames := user.DisplayNames()
|
|
||||||
if (len(emails) == 0) || (len(displayNames) == 0) {
|
|
||||||
return errors.New("could not retrieve user address info")
|
|
||||||
}
|
|
||||||
|
|
||||||
if address == "" {
|
if address == "" {
|
||||||
address = emails[0]
|
address = user.Emails()[0]
|
||||||
}
|
}
|
||||||
|
|
||||||
var username, displayName, addresses string
|
username := address
|
||||||
|
addresses := address
|
||||||
|
|
||||||
if user.GetAddressMode() == vault.CombinedMode {
|
if user.GetAddressMode() == vault.CombinedMode {
|
||||||
username = address
|
username = user.Emails()[0]
|
||||||
displayName = displayNames[username]
|
addresses = strings.Join(user.Emails(), ",")
|
||||||
addresses = strings.Join(emails, ",")
|
|
||||||
} else {
|
|
||||||
username = address
|
|
||||||
addresses = address
|
|
||||||
displayName = displayNames[address]
|
|
||||||
if len(displayName) == 0 {
|
|
||||||
displayName = address
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if useragent.IsCatalinaOrNewer() && !bridge.vault.GetSMTPSSL() {
|
if useragent.IsCatalinaOrNewer() && !bridge.vault.GetSMTPSSL() {
|
||||||
@ -82,7 +69,6 @@ func (bridge *Bridge) ConfigureAppleMail(ctx context.Context, userID, address st
|
|||||||
bridge.vault.GetIMAPSSL(),
|
bridge.vault.GetIMAPSSL(),
|
||||||
bridge.vault.GetSMTPSSL(),
|
bridge.vault.GetSMTPSSL(),
|
||||||
username,
|
username,
|
||||||
displayName,
|
|
||||||
addresses,
|
addresses,
|
||||||
user.BridgePass(),
|
user.BridgePass(),
|
||||||
)
|
)
|
||||||
|
|||||||
@ -79,7 +79,7 @@ func (bridge *Bridge) CheckClientState(ctx context.Context, checkFlags bool, pro
|
|||||||
}
|
}
|
||||||
|
|
||||||
log.Debug("Building state")
|
log.Debug("Building state")
|
||||||
state, err := meta.BuildMailboxToMessageMap(ctx, usr)
|
state, err := meta.BuildMailboxToMessageMap(usr)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.WithError(err).Error("Failed to build state")
|
log.WithError(err).Error("Failed to build state")
|
||||||
return result, err
|
return result, err
|
||||||
|
|||||||
@ -1,45 +0,0 @@
|
|||||||
// Copyright (c) 2023 Proton AG
|
|
||||||
//
|
|
||||||
// This file is part of Proton Mail Bridge.
|
|
||||||
//
|
|
||||||
// Proton Mail 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.
|
|
||||||
//
|
|
||||||
// Proton Mail 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 Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
package bridge
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
|
|
||||||
"github.com/ProtonMail/gluon/watcher"
|
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/events"
|
|
||||||
)
|
|
||||||
|
|
||||||
type bridgeEventSubscription struct {
|
|
||||||
b *Bridge
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b bridgeEventSubscription) Add(ofType ...events.Event) *watcher.Watcher[events.Event] {
|
|
||||||
return b.b.addWatcher(ofType...)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b bridgeEventSubscription) Remove(watcher *watcher.Watcher[events.Event]) {
|
|
||||||
b.b.remWatcher(watcher)
|
|
||||||
}
|
|
||||||
|
|
||||||
type bridgeEventPublisher struct {
|
|
||||||
b *Bridge
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b bridgeEventPublisher) PublishEvent(_ context.Context, event events.Event) {
|
|
||||||
b.b.publish(event)
|
|
||||||
}
|
|
||||||
@ -15,7 +15,7 @@
|
|||||||
// You should have received a copy of the GNU General Public License
|
// You should have received a copy of the GNU General Public License
|
||||||
// along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
|
// along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package files
|
package bridge
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
@ -24,7 +24,7 @@ import (
|
|||||||
"path/filepath"
|
"path/filepath"
|
||||||
)
|
)
|
||||||
|
|
||||||
func MoveDir(from, to string) error {
|
func moveDir(from, to string) error {
|
||||||
entries, err := os.ReadDir(from)
|
entries, err := os.ReadDir(from)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@ -36,7 +36,7 @@ func MoveDir(from, to string) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := MoveDir(filepath.Join(from, entry.Name()), filepath.Join(to, entry.Name())); err != nil {
|
if err := moveDir(filepath.Join(from, entry.Name()), filepath.Join(to, entry.Name())); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -61,12 +61,12 @@ func moveFile(from, to string) error {
|
|||||||
return os.Rename(from, to)
|
return os.Rename(from, to)
|
||||||
}
|
}
|
||||||
|
|
||||||
func CopyDir(from, to string) error {
|
func copyDir(from, to string) error {
|
||||||
entries, err := os.ReadDir(from)
|
entries, err := os.ReadDir(from)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if err := CreateIfNotExists(to, 0o700); err != nil {
|
if err := createIfNotExists(to, 0o700); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
for _, entry := range entries {
|
for _, entry := range entries {
|
||||||
@ -74,11 +74,11 @@ func CopyDir(from, to string) error {
|
|||||||
destPath := filepath.Join(to, entry.Name())
|
destPath := filepath.Join(to, entry.Name())
|
||||||
|
|
||||||
if entry.IsDir() {
|
if entry.IsDir() {
|
||||||
if err := CopyDir(sourcePath, destPath); err != nil {
|
if err := copyDir(sourcePath, destPath); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if err := CopyFile(sourcePath, destPath); err != nil {
|
if err := copyFile(sourcePath, destPath); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -86,7 +86,7 @@ func CopyDir(from, to string) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func CopyFile(srcFile, dstFile string) error {
|
func copyFile(srcFile, dstFile string) error {
|
||||||
out, err := os.Create(filepath.Clean(dstFile))
|
out, err := os.Create(filepath.Clean(dstFile))
|
||||||
defer func(out *os.File) {
|
defer func(out *os.File) {
|
||||||
_ = out.Close()
|
_ = out.Close()
|
||||||
@ -113,7 +113,7 @@ func CopyFile(srcFile, dstFile string) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func Exists(filePath string) bool {
|
func exists(filePath string) bool {
|
||||||
if _, err := os.Stat(filePath); os.IsNotExist(err) {
|
if _, err := os.Stat(filePath); os.IsNotExist(err) {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
@ -121,8 +121,8 @@ func Exists(filePath string) bool {
|
|||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
func CreateIfNotExists(dir string, perm os.FileMode) error {
|
func createIfNotExists(dir string, perm os.FileMode) error {
|
||||||
if Exists(dir) {
|
if exists(dir) {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -15,7 +15,7 @@
|
|||||||
// You should have received a copy of the GNU General Public License
|
// You should have received a copy of the GNU General Public License
|
||||||
// along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
|
// along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package files
|
package bridge
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"os"
|
"os"
|
||||||
@ -41,7 +41,7 @@ func TestMoveDir(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Move the files.
|
// Move the files.
|
||||||
if err := MoveDir(from, to); err != nil {
|
if err := moveDir(from, to); err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -20,100 +20,18 @@ package bridge
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"sync"
|
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/ProtonMail/gluon/async"
|
|
||||||
"github.com/ProtonMail/gluon/reporter"
|
"github.com/ProtonMail/gluon/reporter"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/safe"
|
"github.com/ProtonMail/proton-bridge/v3/internal/safe"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/telemetry"
|
"github.com/ProtonMail/proton-bridge/v3/internal/telemetry"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/vault"
|
"github.com/ProtonMail/proton-bridge/v3/internal/vault"
|
||||||
|
"github.com/ProtonMail/proton-bridge/v3/pkg/keychain"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
|
|
||||||
const HeartbeatCheckInterval = time.Hour
|
const HeartbeatCheckInterval = time.Hour
|
||||||
|
|
||||||
type heartBeatState struct {
|
|
||||||
task *async.Group
|
|
||||||
telemetry.Heartbeat
|
|
||||||
taskLock sync.Mutex
|
|
||||||
taskStarted bool
|
|
||||||
taskInterval time.Duration
|
|
||||||
}
|
|
||||||
|
|
||||||
func newHeartBeatState(ctx context.Context, panicHandler async.PanicHandler) *heartBeatState {
|
|
||||||
return &heartBeatState{
|
|
||||||
task: async.NewGroup(ctx, panicHandler),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *heartBeatState) init(bridge *Bridge, manager telemetry.HeartbeatManager) {
|
|
||||||
h.Heartbeat = telemetry.NewHeartbeat(manager, 1143, 1025, bridge.GetGluonCacheDir(), bridge.keychains.GetDefaultHelper())
|
|
||||||
h.taskInterval = manager.GetHeartbeatPeriodicInterval()
|
|
||||||
h.SetRollout(bridge.GetUpdateRollout())
|
|
||||||
h.SetAutoStart(bridge.GetAutostart())
|
|
||||||
h.SetAutoUpdate(bridge.GetAutoUpdate())
|
|
||||||
h.SetBeta(bridge.GetUpdateChannel())
|
|
||||||
h.SetDoh(bridge.GetProxyAllowed())
|
|
||||||
h.SetShowAllMail(bridge.GetShowAllMail())
|
|
||||||
h.SetIMAPConnectionMode(bridge.GetIMAPSSL())
|
|
||||||
h.SetSMTPConnectionMode(bridge.GetSMTPSSL())
|
|
||||||
h.SetIMAPPort(bridge.GetIMAPPort())
|
|
||||||
h.SetSMTPPort(bridge.GetSMTPPort())
|
|
||||||
h.SetCacheLocation(bridge.GetGluonCacheDir())
|
|
||||||
if val, err := bridge.GetKeychainApp(); err != nil {
|
|
||||||
h.SetKeyChainPref(val)
|
|
||||||
} else {
|
|
||||||
h.SetKeyChainPref(bridge.keychains.GetDefaultHelper())
|
|
||||||
}
|
|
||||||
h.SetPrevVersion(bridge.GetLastVersion().String())
|
|
||||||
|
|
||||||
safe.RLock(func() {
|
|
||||||
var splitMode = false
|
|
||||||
for _, user := range bridge.users {
|
|
||||||
if user.GetAddressMode() == vault.SplitMode {
|
|
||||||
splitMode = true
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
var nbAccount = len(bridge.users)
|
|
||||||
h.SetNbAccount(nbAccount)
|
|
||||||
h.SetSplitMode(splitMode)
|
|
||||||
|
|
||||||
// Do not try to send if there is no user yet.
|
|
||||||
if nbAccount > 0 {
|
|
||||||
defer h.start()
|
|
||||||
}
|
|
||||||
}, bridge.usersLock)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *heartBeatState) start() {
|
|
||||||
h.taskLock.Lock()
|
|
||||||
defer h.taskLock.Unlock()
|
|
||||||
if h.taskStarted {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
h.taskStarted = true
|
|
||||||
|
|
||||||
h.task.PeriodicOrTrigger(h.taskInterval, 0, func(ctx context.Context) {
|
|
||||||
logrus.Debug("Checking for heartbeat")
|
|
||||||
|
|
||||||
h.TrySending(ctx)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *heartBeatState) stop() {
|
|
||||||
h.taskLock.Lock()
|
|
||||||
defer h.taskLock.Unlock()
|
|
||||||
if !h.taskStarted {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
h.task.CancelAndWait()
|
|
||||||
h.taskStarted = false
|
|
||||||
}
|
|
||||||
|
|
||||||
func (bridge *Bridge) IsTelemetryAvailable(ctx context.Context) bool {
|
func (bridge *Bridge) IsTelemetryAvailable(ctx context.Context) bool {
|
||||||
var flag = true
|
var flag = true
|
||||||
if bridge.GetTelemetryDisabled() {
|
if bridge.GetTelemetryDisabled() {
|
||||||
@ -162,6 +80,49 @@ func (bridge *Bridge) SetLastHeartbeatSent(timestamp time.Time) error {
|
|||||||
return bridge.vault.SetLastHeartbeatSent(timestamp)
|
return bridge.vault.SetLastHeartbeatSent(timestamp)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (bridge *Bridge) GetHeartbeatPeriodicInterval() time.Duration {
|
func (bridge *Bridge) StartHeartbeat(manager telemetry.HeartbeatManager) {
|
||||||
return HeartbeatCheckInterval
|
bridge.heartbeat = telemetry.NewHeartbeat(manager, 1143, 1025, bridge.GetGluonCacheDir(), keychain.DefaultHelper)
|
||||||
|
|
||||||
|
// Check for heartbeat when triggered.
|
||||||
|
bridge.goHeartbeat = bridge.tasks.PeriodicOrTrigger(HeartbeatCheckInterval, 0, func(ctx context.Context) {
|
||||||
|
logrus.Debug("Checking for heartbeat")
|
||||||
|
|
||||||
|
bridge.heartbeat.TrySending(ctx)
|
||||||
|
})
|
||||||
|
|
||||||
|
bridge.heartbeat.SetRollout(bridge.GetUpdateRollout())
|
||||||
|
bridge.heartbeat.SetAutoStart(bridge.GetAutostart())
|
||||||
|
bridge.heartbeat.SetAutoUpdate(bridge.GetAutoUpdate())
|
||||||
|
bridge.heartbeat.SetBeta(bridge.GetUpdateChannel())
|
||||||
|
bridge.heartbeat.SetDoh(bridge.GetProxyAllowed())
|
||||||
|
bridge.heartbeat.SetShowAllMail(bridge.GetShowAllMail())
|
||||||
|
bridge.heartbeat.SetIMAPConnectionMode(bridge.GetIMAPSSL())
|
||||||
|
bridge.heartbeat.SetSMTPConnectionMode(bridge.GetSMTPSSL())
|
||||||
|
bridge.heartbeat.SetIMAPPort(bridge.GetIMAPPort())
|
||||||
|
bridge.heartbeat.SetSMTPPort(bridge.GetSMTPPort())
|
||||||
|
bridge.heartbeat.SetCacheLocation(bridge.GetGluonCacheDir())
|
||||||
|
if val, err := bridge.GetKeychainApp(); err != nil {
|
||||||
|
bridge.heartbeat.SetKeyChainPref(val)
|
||||||
|
} else {
|
||||||
|
bridge.heartbeat.SetKeyChainPref(keychain.DefaultHelper)
|
||||||
|
}
|
||||||
|
bridge.heartbeat.SetPrevVersion(bridge.GetLastVersion().String())
|
||||||
|
|
||||||
|
safe.RLock(func() {
|
||||||
|
var splitMode = false
|
||||||
|
for _, user := range bridge.users {
|
||||||
|
if user.GetAddressMode() == vault.SplitMode {
|
||||||
|
splitMode = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
var nbAccount = len(bridge.users)
|
||||||
|
bridge.heartbeat.SetNbAccount(nbAccount)
|
||||||
|
bridge.heartbeat.SetSplitMode(splitMode)
|
||||||
|
|
||||||
|
// Do not try to send if there is no user yet.
|
||||||
|
if nbAccount > 0 {
|
||||||
|
defer bridge.goHeartbeat()
|
||||||
|
}
|
||||||
|
}, bridge.usersLock)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -40,35 +40,3 @@ func (bridge *Bridge) setUserAgent(name, version string) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
type bridgeUserAgentUpdater struct {
|
|
||||||
*Bridge
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *bridgeUserAgentUpdater) GetUserAgent() string {
|
|
||||||
return b.identifier.GetUserAgent()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *bridgeUserAgentUpdater) HasClient() bool {
|
|
||||||
return b.identifier.HasClient()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *bridgeUserAgentUpdater) SetClient(name, version string) {
|
|
||||||
b.identifier.SetClient(name, version)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *bridgeUserAgentUpdater) SetPlatform(platform string) {
|
|
||||||
b.identifier.SetPlatform(platform)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *bridgeUserAgentUpdater) SetClientString(client string) {
|
|
||||||
b.identifier.SetClientString(client)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *bridgeUserAgentUpdater) GetClientString() string {
|
|
||||||
return b.identifier.GetClientString()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *bridgeUserAgentUpdater) SetUserAgent(name, version string) {
|
|
||||||
b.setUserAgent(name, version)
|
|
||||||
}
|
|
||||||
|
|||||||
@ -20,12 +20,23 @@ package bridge
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"crypto/tls"
|
"crypto/tls"
|
||||||
|
"io"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/Masterminds/semver/v3"
|
"github.com/Masterminds/semver/v3"
|
||||||
|
"github.com/ProtonMail/gluon"
|
||||||
|
"github.com/ProtonMail/gluon/async"
|
||||||
imapEvents "github.com/ProtonMail/gluon/events"
|
imapEvents "github.com/ProtonMail/gluon/events"
|
||||||
|
"github.com/ProtonMail/gluon/imap"
|
||||||
|
"github.com/ProtonMail/gluon/reporter"
|
||||||
|
"github.com/ProtonMail/gluon/store"
|
||||||
|
"github.com/ProtonMail/gluon/store/fallback_v0"
|
||||||
|
"github.com/ProtonMail/proton-bridge/v3/internal/constants"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/events"
|
"github.com/ProtonMail/proton-bridge/v3/internal/events"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/services/imapsmtpserver"
|
"github.com/ProtonMail/proton-bridge/v3/internal/logging"
|
||||||
|
"github.com/ProtonMail/proton-bridge/v3/internal/user"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/useragent"
|
"github.com/ProtonMail/proton-bridge/v3/internal/useragent"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
@ -34,6 +45,16 @@ func (bridge *Bridge) restartIMAP(ctx context.Context) error {
|
|||||||
return bridge.serverManager.RestartIMAP(ctx)
|
return bridge.serverManager.RestartIMAP(ctx)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// addIMAPUser connects the given user to gluon.
|
||||||
|
func (bridge *Bridge) addIMAPUser(ctx context.Context, user *user.User) error {
|
||||||
|
return bridge.serverManager.AddIMAPUser(ctx, user)
|
||||||
|
}
|
||||||
|
|
||||||
|
// removeIMAPUser disconnects the given user from gluon, optionally also removing its files.
|
||||||
|
func (bridge *Bridge) removeIMAPUser(ctx context.Context, user *user.User, withData bool) error {
|
||||||
|
return bridge.serverManager.RemoveIMAPUser(ctx, user, withData)
|
||||||
|
}
|
||||||
|
|
||||||
func (bridge *Bridge) handleIMAPEvent(event imapEvents.Event) {
|
func (bridge *Bridge) handleIMAPEvent(event imapEvents.Event) {
|
||||||
switch event := event.(type) {
|
switch event := event.(type) {
|
||||||
case imapEvents.UserAdded:
|
case imapEvents.UserAdded:
|
||||||
@ -71,59 +92,108 @@ func (bridge *Bridge) handleIMAPEvent(event imapEvents.Event) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
type bridgeIMAPSettings struct {
|
func ApplyGluonCachePathSuffix(basePath string) string {
|
||||||
b *Bridge
|
return filepath.Join(basePath, "backend", "store")
|
||||||
}
|
}
|
||||||
|
|
||||||
func (b *bridgeIMAPSettings) EventPublisher() imapsmtpserver.IMAPEventPublisher {
|
func ApplyGluonConfigPathSuffix(basePath string) string {
|
||||||
return b
|
return filepath.Join(basePath, "backend", "db")
|
||||||
}
|
}
|
||||||
|
|
||||||
func (b *bridgeIMAPSettings) TLSConfig() *tls.Config {
|
func newIMAPServer(
|
||||||
return b.b.tlsConfig
|
gluonCacheDir, gluonConfigDir string,
|
||||||
}
|
version *semver.Version,
|
||||||
|
tlsConfig *tls.Config,
|
||||||
|
reporter reporter.Reporter,
|
||||||
|
logClient, logServer bool,
|
||||||
|
eventCh chan<- imapEvents.Event,
|
||||||
|
tasks *async.Group,
|
||||||
|
uidValidityGenerator imap.UIDValidityGenerator,
|
||||||
|
panicHandler async.PanicHandler,
|
||||||
|
) (*gluon.Server, error) {
|
||||||
|
gluonCacheDir = ApplyGluonCachePathSuffix(gluonCacheDir)
|
||||||
|
gluonConfigDir = ApplyGluonConfigPathSuffix(gluonConfigDir)
|
||||||
|
|
||||||
func (b *bridgeIMAPSettings) LogClient() bool {
|
logrus.WithFields(logrus.Fields{
|
||||||
return b.b.logIMAPClient
|
"gluonStore": gluonCacheDir,
|
||||||
}
|
"gluonDB": gluonConfigDir,
|
||||||
|
"version": version,
|
||||||
|
"logClient": logClient,
|
||||||
|
"logServer": logServer,
|
||||||
|
}).Info("Creating IMAP server")
|
||||||
|
|
||||||
func (b *bridgeIMAPSettings) LogServer() bool {
|
if logClient || logServer {
|
||||||
return b.b.logIMAPServer
|
log := logrus.WithField("protocol", "IMAP")
|
||||||
}
|
log.Warning("================================================")
|
||||||
|
log.Warning("THIS LOG WILL CONTAIN **DECRYPTED** MESSAGE DATA")
|
||||||
func (b *bridgeIMAPSettings) Port() int {
|
log.Warning("================================================")
|
||||||
return b.b.vault.GetIMAPPort()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *bridgeIMAPSettings) SetPort(i int) error {
|
|
||||||
return b.b.vault.SetIMAPPort(i)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *bridgeIMAPSettings) UseSSL() bool {
|
|
||||||
return b.b.vault.GetIMAPSSL()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *bridgeIMAPSettings) CacheDirectory() string {
|
|
||||||
return b.b.GetGluonCacheDir()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *bridgeIMAPSettings) DataDirectory() (string, error) {
|
|
||||||
return b.b.GetGluonDataDir()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *bridgeIMAPSettings) SetCacheDirectory(s string) error {
|
|
||||||
return b.b.vault.SetGluonDir(s)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *bridgeIMAPSettings) Version() *semver.Version {
|
|
||||||
return b.b.curVersion
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *bridgeIMAPSettings) PublishIMAPEvent(ctx context.Context, event imapEvents.Event) {
|
|
||||||
select {
|
|
||||||
case <-ctx.Done():
|
|
||||||
return
|
|
||||||
case b.b.imapEventCh <- event:
|
|
||||||
// do nothing
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var imapClientLog io.Writer
|
||||||
|
|
||||||
|
if logClient {
|
||||||
|
imapClientLog = logging.NewIMAPLogger()
|
||||||
|
} else {
|
||||||
|
imapClientLog = io.Discard
|
||||||
|
}
|
||||||
|
|
||||||
|
var imapServerLog io.Writer
|
||||||
|
|
||||||
|
if logServer {
|
||||||
|
imapServerLog = logging.NewIMAPLogger()
|
||||||
|
} else {
|
||||||
|
imapServerLog = io.Discard
|
||||||
|
}
|
||||||
|
|
||||||
|
imapServer, err := gluon.New(
|
||||||
|
gluon.WithTLS(tlsConfig),
|
||||||
|
gluon.WithDataDir(gluonCacheDir),
|
||||||
|
gluon.WithDatabaseDir(gluonConfigDir),
|
||||||
|
gluon.WithStoreBuilder(new(storeBuilder)),
|
||||||
|
gluon.WithLogger(imapClientLog, imapServerLog),
|
||||||
|
getGluonVersionInfo(version),
|
||||||
|
gluon.WithReporter(reporter),
|
||||||
|
gluon.WithUIDValidityGenerator(uidValidityGenerator),
|
||||||
|
gluon.WithPanicHandler(panicHandler),
|
||||||
|
)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.Once(func(ctx context.Context) {
|
||||||
|
async.ForwardContext(ctx, eventCh, imapServer.AddWatcher())
|
||||||
|
})
|
||||||
|
|
||||||
|
tasks.Once(func(ctx context.Context) {
|
||||||
|
async.RangeContext(ctx, imapServer.GetErrorCh(), func(err error) {
|
||||||
|
logrus.WithError(err).Error("IMAP server error")
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
return imapServer, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func getGluonVersionInfo(version *semver.Version) gluon.Option {
|
||||||
|
return gluon.WithVersionInfo(
|
||||||
|
int(version.Major()),
|
||||||
|
int(version.Minor()),
|
||||||
|
int(version.Patch()),
|
||||||
|
constants.FullAppName,
|
||||||
|
"TODO",
|
||||||
|
"TODO",
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
type storeBuilder struct{}
|
||||||
|
|
||||||
|
func (*storeBuilder) New(path, userID string, passphrase []byte) (store.Store, error) {
|
||||||
|
return store.NewOnDiskStore(
|
||||||
|
filepath.Join(path, userID),
|
||||||
|
passphrase,
|
||||||
|
store.WithFallback(fallback_v0.NewOnDiskStoreV0WithCompressor(&fallback_v0.GZipCompressor{})),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (*storeBuilder) Delete(path, userID string) error {
|
||||||
|
return os.RemoveAll(filepath.Join(path, userID))
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,26 +0,0 @@
|
|||||||
// Copyright (c) 2023 Proton AG
|
|
||||||
//
|
|
||||||
// This file is part of Proton Mail Bridge.
|
|
||||||
//
|
|
||||||
// Proton Mail 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.
|
|
||||||
//
|
|
||||||
// Proton Mail 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 Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
package bridge
|
|
||||||
|
|
||||||
type bridgeIMAPSMTPTelemetry struct {
|
|
||||||
b *Bridge
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b bridgeIMAPSMTPTelemetry) SetCacheLocation(s string) {
|
|
||||||
b.b.heartbeat.SetCacheLocation(s)
|
|
||||||
}
|
|
||||||
@ -1,24 +0,0 @@
|
|||||||
// Copyright (c) 2023 Proton AG
|
|
||||||
//
|
|
||||||
// This file is part of Proton Mail Bridge.
|
|
||||||
//
|
|
||||||
// Proton Mail 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.
|
|
||||||
//
|
|
||||||
// Proton Mail 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 Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
package bridge
|
|
||||||
|
|
||||||
import "golang.org/x/exp/maps"
|
|
||||||
|
|
||||||
func (bridge *Bridge) GetHelpersNames() []string {
|
|
||||||
return maps.Keys(bridge.keychains.GetHelpers())
|
|
||||||
}
|
|
||||||
55
internal/bridge/migration.go
Normal file
55
internal/bridge/migration.go
Normal file
@ -0,0 +1,55 @@
|
|||||||
|
// Copyright (c) 2023 Proton AG
|
||||||
|
//
|
||||||
|
// This file is part of Proton Mail Bridge.
|
||||||
|
//
|
||||||
|
// Proton Mail 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.
|
||||||
|
//
|
||||||
|
// Proton Mail 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 Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
package bridge
|
||||||
|
|
||||||
|
import (
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/ProtonMail/gluon/reporter"
|
||||||
|
"github.com/ProtonMail/proton-bridge/v3/internal/vault"
|
||||||
|
"github.com/sirupsen/logrus"
|
||||||
|
)
|
||||||
|
|
||||||
|
func (bridge *Bridge) databaseResyncNeeded() bool {
|
||||||
|
if strings.HasPrefix(bridge.lastVersion.String(), "3.4.0") &&
|
||||||
|
strings.HasPrefix(bridge.curVersion.String(), "3.4.1") {
|
||||||
|
logrus.WithFields(logrus.Fields{
|
||||||
|
"lastVersion": bridge.lastVersion.String(),
|
||||||
|
"currVersion": bridge.curVersion.String(),
|
||||||
|
}).Warning("Database re-synchronisation needed")
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
func (bridge *Bridge) migrateUser(vault *vault.User) {
|
||||||
|
if bridge.databaseResyncNeeded() {
|
||||||
|
if err := bridge.reporter.ReportMessage("Database need to be re-sync for migration."); err != nil {
|
||||||
|
logrus.WithError(err).Error("Failed to report database re-sync for migration.")
|
||||||
|
}
|
||||||
|
if err := vault.ClearSyncStatus(); err != nil {
|
||||||
|
logrus.WithError(err).Error("Failed reset to SyncStatus.")
|
||||||
|
if err2 := bridge.reporter.ReportMessageWithContext("Failed to reset SyncStatus for Database migration.",
|
||||||
|
reporter.Context{
|
||||||
|
"error": err,
|
||||||
|
}); err2 != nil {
|
||||||
|
logrus.WithError(err2).Error("Failed to report reset SyncStatus error.")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -7,7 +7,6 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
"sync"
|
"sync"
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/Masterminds/semver/v3"
|
"github.com/Masterminds/semver/v3"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/bridge/mocks"
|
"github.com/ProtonMail/proton-bridge/v3/internal/bridge/mocks"
|
||||||
@ -52,7 +51,6 @@ func NewMocks(tb testing.TB, version, minAuto *semver.Version) *Mocks {
|
|||||||
|
|
||||||
// this is called at start of heartbeat process.
|
// this is called at start of heartbeat process.
|
||||||
mocks.Heartbeat.EXPECT().IsTelemetryAvailable(gomock.Any()).AnyTimes()
|
mocks.Heartbeat.EXPECT().IsTelemetryAvailable(gomock.Any()).AnyTimes()
|
||||||
mocks.Heartbeat.EXPECT().GetHeartbeatPeriodicInterval().AnyTimes().Return(500 * time.Millisecond)
|
|
||||||
|
|
||||||
return mocks
|
return mocks
|
||||||
}
|
}
|
||||||
@ -156,7 +154,3 @@ func (testUpdater *TestUpdater) GetVersionInfo(_ context.Context, _ updater.Down
|
|||||||
func (testUpdater *TestUpdater) InstallUpdate(_ context.Context, _ updater.Downloader, _ updater.VersionInfo) error {
|
func (testUpdater *TestUpdater) InstallUpdate(_ context.Context, _ updater.Downloader, _ updater.VersionInfo) error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (testUpdater *TestUpdater) RemoveOldUpdates() error {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|||||||
@ -36,20 +36,6 @@ func (m *MockHeartbeatManager) EXPECT() *MockHeartbeatManagerMockRecorder {
|
|||||||
return m.recorder
|
return m.recorder
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetHeartbeatPeriodicInterval mocks base method.
|
|
||||||
func (m *MockHeartbeatManager) GetHeartbeatPeriodicInterval() time.Duration {
|
|
||||||
m.ctrl.T.Helper()
|
|
||||||
ret := m.ctrl.Call(m, "GetHeartbeatPeriodicInterval")
|
|
||||||
ret0, _ := ret[0].(time.Duration)
|
|
||||||
return ret0
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetHeartbeatPeriodicInterval indicates an expected call of GetHeartbeatPeriodicInterval.
|
|
||||||
func (mr *MockHeartbeatManagerMockRecorder) GetHeartbeatPeriodicInterval() *gomock.Call {
|
|
||||||
mr.mock.ctrl.T.Helper()
|
|
||||||
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetHeartbeatPeriodicInterval", reflect.TypeOf((*MockHeartbeatManager)(nil).GetHeartbeatPeriodicInterval))
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetLastHeartbeatSent mocks base method.
|
// GetLastHeartbeatSent mocks base method.
|
||||||
func (m *MockHeartbeatManager) GetLastHeartbeatSent() time.Time {
|
func (m *MockHeartbeatManager) GetLastHeartbeatSent() time.Time {
|
||||||
m.ctrl.T.Helper()
|
m.ctrl.T.Helper()
|
||||||
|
|||||||
@ -84,11 +84,6 @@ func TestBridge_Refresh(t *testing.T) {
|
|||||||
withBridge(ctx, t, s.GetHostURL(), netCtl, locator, storeKey, func(b *bridge.Bridge, mocks *bridge.Mocks) {
|
withBridge(ctx, t, s.GetHostURL(), netCtl, locator, storeKey, func(b *bridge.Bridge, mocks *bridge.Mocks) {
|
||||||
mocks.Reporter.EXPECT().ReportMessageWithContext(gomock.Any(), gomock.Any()).AnyTimes()
|
mocks.Reporter.EXPECT().ReportMessageWithContext(gomock.Any(), gomock.Any()).AnyTimes()
|
||||||
|
|
||||||
// Wait for refresh event first
|
|
||||||
refreshCh, refreshChDone := chToType[events.Event, events.UserRefreshed](b.GetEvents(events.UserRefreshed{}))
|
|
||||||
defer refreshChDone()
|
|
||||||
require.Equal(t, userID, (<-refreshCh).UserID)
|
|
||||||
// Then sync event
|
|
||||||
syncCh, done := chToType[events.Event, events.SyncFinished](b.GetEvents(events.SyncFinished{}))
|
syncCh, done := chToType[events.Event, events.SyncFinished](b.GetEvents(events.SyncFinished{}))
|
||||||
defer done()
|
defer done()
|
||||||
|
|
||||||
|
|||||||
@ -33,7 +33,6 @@ import (
|
|||||||
"github.com/ProtonMail/proton-bridge/v3/internal/bridge"
|
"github.com/ProtonMail/proton-bridge/v3/internal/bridge"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/constants"
|
"github.com/ProtonMail/proton-bridge/v3/internal/constants"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/events"
|
"github.com/ProtonMail/proton-bridge/v3/internal/events"
|
||||||
smtpservice "github.com/ProtonMail/proton-bridge/v3/internal/services/smtp"
|
|
||||||
"github.com/emersion/go-imap"
|
"github.com/emersion/go-imap"
|
||||||
"github.com/emersion/go-sasl"
|
"github.com/emersion/go-sasl"
|
||||||
"github.com/emersion/go-smtp"
|
"github.com/emersion/go-smtp"
|
||||||
@ -337,9 +336,6 @@ func TestBridge_SendInvite(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestBridge_SendAddTextBodyPartIfNotExists(t *testing.T) {
|
func TestBridge_SendAddTextBodyPartIfNotExists(t *testing.T) {
|
||||||
// NOTE: Prior to GODT-2887, these tests had inline images, however after the implementation to support
|
|
||||||
// inline images new parts are injected to reference inline images without content-id set. The images
|
|
||||||
// in this test have been changed to regular attachments to keep the original checks in place.
|
|
||||||
const messageMultipartWithoutText = `Content-Type: multipart/mixed;
|
const messageMultipartWithoutText = `Content-Type: multipart/mixed;
|
||||||
boundary="Apple-Mail=_E7AC06C7-4EB2-4453-8CBB-80F4412A7C84"
|
boundary="Apple-Mail=_E7AC06C7-4EB2-4453-8CBB-80F4412A7C84"
|
||||||
Subject: A new message
|
Subject: A new message
|
||||||
@ -347,7 +343,7 @@ Date: Mon, 13 Mar 2023 16:06:16 +0100
|
|||||||
|
|
||||||
|
|
||||||
--Apple-Mail=_E7AC06C7-4EB2-4453-8CBB-80F4412A7C84
|
--Apple-Mail=_E7AC06C7-4EB2-4453-8CBB-80F4412A7C84
|
||||||
Content-Disposition: attachment;
|
Content-Disposition: inline;
|
||||||
filename=Cat_August_2010-4.jpeg
|
filename=Cat_August_2010-4.jpeg
|
||||||
Content-Type: image/jpeg;
|
Content-Type: image/jpeg;
|
||||||
name="Cat_August_2010-4.jpeg"
|
name="Cat_August_2010-4.jpeg"
|
||||||
@ -364,7 +360,7 @@ Subject: A new message Part2
|
|||||||
Date: Mon, 13 Mar 2023 16:06:16 +0100
|
Date: Mon, 13 Mar 2023 16:06:16 +0100
|
||||||
|
|
||||||
--Apple-Mail=_E7AC06C7-4EB2-4453-8CBB-80F4412A7C84
|
--Apple-Mail=_E7AC06C7-4EB2-4453-8CBB-80F4412A7C84
|
||||||
Content-Disposition: attachment;
|
Content-Disposition: inline;
|
||||||
filename=Cat_August_2010-4.jpeg
|
filename=Cat_August_2010-4.jpeg
|
||||||
Content-Type: image/jpeg;
|
Content-Type: image/jpeg;
|
||||||
name="Cat_August_2010-4.jpeg"
|
name="Cat_August_2010-4.jpeg"
|
||||||
@ -471,9 +467,7 @@ SGVsbG8gd29ybGQK
|
|||||||
require.Eventually(t, func() bool {
|
require.Eventually(t, func() bool {
|
||||||
messages, err := clientFetch(senderIMAPClient, `Sent`, imap.FetchBodyStructure)
|
messages, err := clientFetch(senderIMAPClient, `Sent`, imap.FetchBodyStructure)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
if len(messages) != 4 {
|
require.Equal(t, 4, len(messages))
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
// messages may not be in order
|
// messages may not be in order
|
||||||
for _, message := range messages {
|
for _, message := range messages {
|
||||||
@ -524,234 +518,3 @@ SGVsbG8gd29ybGQK
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestBridge_SendInlineImage(t *testing.T) {
|
|
||||||
const messageInlineImageOnly = `Content-Type: multipart/mixed;
|
|
||||||
boundary="Apple-Mail=_E7AC06C7-4EB2-4453-8CBB-80F4412A7C84"
|
|
||||||
Subject: A new message
|
|
||||||
Date: Mon, 13 Mar 2023 16:06:16 +0100
|
|
||||||
|
|
||||||
|
|
||||||
--Apple-Mail=_E7AC06C7-4EB2-4453-8CBB-80F4412A7C84
|
|
||||||
Content-Disposition: inline;
|
|
||||||
filename=Cat_August_2010-4.jpeg
|
|
||||||
Content-Type: image/jpeg;
|
|
||||||
name="Cat_August_2010-4.jpeg"
|
|
||||||
Content-Transfer-Encoding: base64
|
|
||||||
|
|
||||||
SGVsbG8gd29ybGQ=
|
|
||||||
|
|
||||||
--Apple-Mail=_E7AC06C7-4EB2-4453-8CBB-80F4412A7C84--
|
|
||||||
`
|
|
||||||
|
|
||||||
const messageInlineImageWithHTML = `Content-Type: multipart/mixed;
|
|
||||||
boundary="Apple-Mail=_E7AC06C7-4EB2-4453-8CBB-80F4412A7C84"
|
|
||||||
Subject: A new message Part2
|
|
||||||
Date: Mon, 13 Mar 2023 16:06:16 +0100
|
|
||||||
|
|
||||||
--Apple-Mail=_E7AC06C7-4EB2-4453-8CBB-80F4412A7C84
|
|
||||||
Content-Type: text/html;charset=utf8
|
|
||||||
Content-Transfer-Encoding: quoted-printable
|
|
||||||
|
|
||||||
Hello world
|
|
||||||
|
|
||||||
--Apple-Mail=_E7AC06C7-4EB2-4453-8CBB-80F4412A7C84
|
|
||||||
Content-Disposition: inline;
|
|
||||||
filename=Cat_August_2010-4.jpeg
|
|
||||||
Content-Type: image/jpeg;
|
|
||||||
name="Cat_August_2010-4.jpeg"
|
|
||||||
Content-Transfer-Encoding: base64
|
|
||||||
|
|
||||||
SGVsbG8gd29ybGQ=
|
|
||||||
|
|
||||||
--Apple-Mail=_E7AC06C7-4EB2-4453-8CBB-80F4412A7C84--
|
|
||||||
`
|
|
||||||
|
|
||||||
const messageInlineImageWithText = `Content-Type: multipart/mixed;
|
|
||||||
boundary="Apple-Mail=_E7AC06C7-4EB2-4453-8CBB-80F4412A7C84"
|
|
||||||
Subject: A new message Part3
|
|
||||||
Date: Mon, 13 Mar 2023 16:06:16 +0100
|
|
||||||
|
|
||||||
--Apple-Mail=_E7AC06C7-4EB2-4453-8CBB-80F4412A7C84
|
|
||||||
Content-Type: text/plain;charset=utf8
|
|
||||||
Content-Transfer-Encoding: quoted-printable
|
|
||||||
|
|
||||||
Hello world
|
|
||||||
|
|
||||||
--Apple-Mail=_E7AC06C7-4EB2-4453-8CBB-80F4412A7C84
|
|
||||||
Content-Disposition: inline;
|
|
||||||
filename=Cat_August_2010-4.jpeg
|
|
||||||
Content-Type: image/jpeg;
|
|
||||||
name="Cat_August_2010-4.jpeg"
|
|
||||||
Content-Transfer-Encoding: base64
|
|
||||||
|
|
||||||
SGVsbG8gd29ybGQ=
|
|
||||||
|
|
||||||
--Apple-Mail=_E7AC06C7-4EB2-4453-8CBB-80F4412A7C84--
|
|
||||||
`
|
|
||||||
|
|
||||||
const messageInlineImageFollowedByText = `Content-Type: multipart/mixed;
|
|
||||||
boundary="Apple-Mail=_E7AC06C7-4EB2-4453-8CBB-80F4412A7C84"
|
|
||||||
Subject: A new message Part4
|
|
||||||
Date: Mon, 13 Mar 2023 16:06:16 +0100
|
|
||||||
|
|
||||||
--Apple-Mail=_E7AC06C7-4EB2-4453-8CBB-80F4412A7C84
|
|
||||||
Content-Disposition: inline;
|
|
||||||
filename=Cat_August_2010-4.jpeg
|
|
||||||
Content-Type: image/jpeg;
|
|
||||||
name="Cat_August_2010-4.jpeg"
|
|
||||||
Content-Transfer-Encoding: base64
|
|
||||||
|
|
||||||
SGVsbG8gd29ybGQ=
|
|
||||||
|
|
||||||
--Apple-Mail=_E7AC06C7-4EB2-4453-8CBB-80F4412A7C84
|
|
||||||
Content-Type: text/plain;charset=utf8
|
|
||||||
Content-Transfer-Encoding: quoted-printable
|
|
||||||
|
|
||||||
Hello world
|
|
||||||
|
|
||||||
--Apple-Mail=_E7AC06C7-4EB2-4453-8CBB-80F4412A7C84--
|
|
||||||
`
|
|
||||||
withEnv(t, func(ctx context.Context, s *server.Server, netCtl *proton.NetCtl, locator bridge.Locator, storeKey []byte) {
|
|
||||||
_, _, err := s.CreateUser("recipient", password)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
withBridge(ctx, t, s.GetHostURL(), netCtl, locator, storeKey, func(bridge *bridge.Bridge, _ *bridge.Mocks) {
|
|
||||||
smtpWaiter := waitForSMTPServerReady(bridge)
|
|
||||||
defer smtpWaiter.Done()
|
|
||||||
|
|
||||||
senderUserID, err := bridge.LoginFull(ctx, username, password, nil, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
recipientUserID, err := bridge.LoginFull(ctx, "recipient", password, nil, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
senderInfo, err := bridge.GetUserInfo(senderUserID)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
recipientInfo, err := bridge.GetUserInfo(recipientUserID)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
messages := []string{
|
|
||||||
messageInlineImageOnly,
|
|
||||||
messageInlineImageWithHTML,
|
|
||||||
messageInlineImageWithText,
|
|
||||||
messageInlineImageFollowedByText,
|
|
||||||
}
|
|
||||||
|
|
||||||
smtpWaiter.Wait()
|
|
||||||
|
|
||||||
for _, m := range messages {
|
|
||||||
// Dial the server.
|
|
||||||
client, err := smtp.Dial(net.JoinHostPort(constants.Host, fmt.Sprint(bridge.GetSMTPPort())))
|
|
||||||
require.NoError(t, err)
|
|
||||||
defer client.Close() //nolint:errcheck
|
|
||||||
|
|
||||||
// Upgrade to TLS.
|
|
||||||
require.NoError(t, client.StartTLS(&tls.Config{InsecureSkipVerify: true}))
|
|
||||||
|
|
||||||
// Authorize with SASL LOGIN.
|
|
||||||
require.NoError(t, client.Auth(sasl.NewLoginClient(
|
|
||||||
senderInfo.Addresses[0],
|
|
||||||
string(senderInfo.BridgePass)),
|
|
||||||
))
|
|
||||||
|
|
||||||
// Send the message.
|
|
||||||
require.NoError(t, client.SendMail(
|
|
||||||
senderInfo.Addresses[0],
|
|
||||||
[]string{recipientInfo.Addresses[0]},
|
|
||||||
strings.NewReader(m),
|
|
||||||
))
|
|
||||||
}
|
|
||||||
|
|
||||||
// Connect the sender IMAP client.
|
|
||||||
senderIMAPClient, err := eventuallyDial(net.JoinHostPort(constants.Host, fmt.Sprint(bridge.GetIMAPPort())))
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.NoError(t, senderIMAPClient.Login(senderInfo.Addresses[0], string(senderInfo.BridgePass)))
|
|
||||||
defer senderIMAPClient.Logout() //nolint:errcheck
|
|
||||||
|
|
||||||
// Connect the recipient IMAP client.
|
|
||||||
recipientIMAPClient, err := eventuallyDial(net.JoinHostPort(constants.Host, fmt.Sprint(bridge.GetIMAPPort())))
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.NoError(t, recipientIMAPClient.Login(recipientInfo.Addresses[0], string(recipientInfo.BridgePass)))
|
|
||||||
defer recipientIMAPClient.Logout() //nolint:errcheck
|
|
||||||
|
|
||||||
require.Eventually(t, func() bool {
|
|
||||||
messages, err := clientFetch(senderIMAPClient, `Sent`, imap.FetchBodyStructure)
|
|
||||||
require.NoError(t, err)
|
|
||||||
if len(messages) != 4 {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
// messages may not be in order
|
|
||||||
for _, message := range messages {
|
|
||||||
require.Equal(t, 1, len(message.BodyStructure.Parts))
|
|
||||||
require.Equal(t, "multipart", message.BodyStructure.MIMEType)
|
|
||||||
require.Equal(t, "mixed", message.BodyStructure.MIMESubType)
|
|
||||||
require.Equal(t, "multipart", message.BodyStructure.Parts[0].MIMEType)
|
|
||||||
require.Equal(t, "related", message.BodyStructure.Parts[0].MIMESubType)
|
|
||||||
require.Len(t, message.BodyStructure.Parts[0].Parts, 2)
|
|
||||||
require.Equal(t, "text", message.BodyStructure.Parts[0].Parts[0].MIMEType)
|
|
||||||
require.Equal(t, "html", message.BodyStructure.Parts[0].Parts[0].MIMESubType)
|
|
||||||
require.Equal(t, "image", message.BodyStructure.Parts[0].Parts[1].MIMEType)
|
|
||||||
require.Equal(t, "jpeg", message.BodyStructure.Parts[0].Parts[1].MIMESubType)
|
|
||||||
}
|
|
||||||
|
|
||||||
return true
|
|
||||||
}, 10*time.Second, 100*time.Millisecond)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestBridge_SendAddressDisabled(t *testing.T) {
|
|
||||||
withEnv(t, func(ctx context.Context, s *server.Server, netCtl *proton.NetCtl, locator bridge.Locator, storeKey []byte) {
|
|
||||||
recipientUserID, _, err := s.CreateUser("recipient", password)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
senderUserID, addrID, err := s.CreateUser("sender", password)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
require.NoError(t, s.ChangeAddressAllowSend(senderUserID, addrID, false))
|
|
||||||
|
|
||||||
withBridge(ctx, t, s.GetHostURL(), netCtl, locator, storeKey, func(bridge *bridge.Bridge, _ *bridge.Mocks) {
|
|
||||||
smtpWaiter := waitForSMTPServerReady(bridge)
|
|
||||||
defer smtpWaiter.Done()
|
|
||||||
|
|
||||||
senderUserID, err := bridge.LoginFull(ctx, "sender", password, nil, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
_, err = bridge.LoginFull(ctx, "recipient", password, nil, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
smtpWaiter.Wait()
|
|
||||||
|
|
||||||
recipientInfo, err := bridge.GetUserInfo(recipientUserID)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
senderInfo, err := bridge.GetUserInfo(senderUserID)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
// Dial the server.
|
|
||||||
client, err := smtp.Dial(net.JoinHostPort(constants.Host, fmt.Sprint(bridge.GetSMTPPort())))
|
|
||||||
require.NoError(t, err)
|
|
||||||
defer client.Close() //nolint:errcheck
|
|
||||||
|
|
||||||
// Upgrade to TLS.
|
|
||||||
require.NoError(t, client.StartTLS(&tls.Config{InsecureSkipVerify: true}))
|
|
||||||
require.NoError(t, client.Auth(sasl.NewLoginClient(
|
|
||||||
senderInfo.Addresses[0],
|
|
||||||
string(senderInfo.BridgePass)),
|
|
||||||
))
|
|
||||||
|
|
||||||
// Send the message.
|
|
||||||
err = client.SendMail(
|
|
||||||
senderInfo.Addresses[0],
|
|
||||||
[]string{recipientInfo.Addresses[0]},
|
|
||||||
strings.NewReader("Subject: Test 1\r\n\r\nHello world!"),
|
|
||||||
)
|
|
||||||
|
|
||||||
smtpErr := smtpservice.NewErrCanNotSendOnAddress(senderInfo.Addresses[0])
|
|
||||||
require.Equal(t, fmt.Sprintf("Error: %v", smtpErr.Error()), err.Error())
|
|
||||||
})
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|||||||
696
internal/bridge/server_manager.go
Normal file
696
internal/bridge/server_manager.go
Normal file
@ -0,0 +1,696 @@
|
|||||||
|
// Copyright (c) 2023 Proton AG
|
||||||
|
//
|
||||||
|
// This file is part of Proton Mail Bridge.
|
||||||
|
//
|
||||||
|
// Proton Mail 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.
|
||||||
|
//
|
||||||
|
// Proton Mail 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 Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
package bridge
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"net"
|
||||||
|
"path/filepath"
|
||||||
|
|
||||||
|
"github.com/ProtonMail/gluon"
|
||||||
|
"github.com/ProtonMail/gluon/connector"
|
||||||
|
"github.com/ProtonMail/gluon/logging"
|
||||||
|
"github.com/ProtonMail/proton-bridge/v3/internal/events"
|
||||||
|
"github.com/ProtonMail/proton-bridge/v3/internal/safe"
|
||||||
|
"github.com/ProtonMail/proton-bridge/v3/internal/user"
|
||||||
|
"github.com/ProtonMail/proton-bridge/v3/pkg/cpc"
|
||||||
|
"github.com/emersion/go-smtp"
|
||||||
|
"github.com/sirupsen/logrus"
|
||||||
|
)
|
||||||
|
|
||||||
|
// ServerManager manages the IMAP & SMTP servers and their listeners.
|
||||||
|
type ServerManager struct {
|
||||||
|
requests *cpc.CPC
|
||||||
|
|
||||||
|
imapServer *gluon.Server
|
||||||
|
imapListener net.Listener
|
||||||
|
|
||||||
|
smtpServer *smtp.Server
|
||||||
|
smtpListener net.Listener
|
||||||
|
|
||||||
|
loadedUserCount int
|
||||||
|
}
|
||||||
|
|
||||||
|
func newServerManager() *ServerManager {
|
||||||
|
return &ServerManager{
|
||||||
|
requests: cpc.NewCPC(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sm *ServerManager) Init(bridge *Bridge) error {
|
||||||
|
imapServer, err := createIMAPServer(bridge)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
smtpServer := createSMTPServer(bridge)
|
||||||
|
|
||||||
|
sm.imapServer = imapServer
|
||||||
|
sm.smtpServer = smtpServer
|
||||||
|
|
||||||
|
bridge.tasks.Once(func(ctx context.Context) {
|
||||||
|
logging.DoAnnotated(ctx, func(ctx context.Context) {
|
||||||
|
sm.run(ctx, bridge)
|
||||||
|
}, logging.Labels{
|
||||||
|
"service": "server-manager",
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sm *ServerManager) CloseServers(ctx context.Context) error {
|
||||||
|
defer sm.requests.Close()
|
||||||
|
_, err := sm.requests.Send(ctx, &smRequestClose{})
|
||||||
|
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sm *ServerManager) RestartIMAP(ctx context.Context) error {
|
||||||
|
_, err := sm.requests.Send(ctx, &smRequestRestartIMAP{})
|
||||||
|
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sm *ServerManager) RestartSMTP(ctx context.Context) error {
|
||||||
|
_, err := sm.requests.Send(ctx, &smRequestRestartSMTP{})
|
||||||
|
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sm *ServerManager) AddIMAPUser(ctx context.Context, user *user.User) error {
|
||||||
|
_, err := sm.requests.Send(ctx, &smRequestAddIMAPUser{user: user})
|
||||||
|
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sm *ServerManager) RemoveIMAPUser(ctx context.Context, user *user.User, withData bool) error {
|
||||||
|
_, err := sm.requests.Send(ctx, &smRequestRemoveIMAPUser{
|
||||||
|
user: user,
|
||||||
|
withData: withData,
|
||||||
|
})
|
||||||
|
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sm *ServerManager) SetGluonDir(ctx context.Context, gluonDir string) error {
|
||||||
|
_, err := sm.requests.Send(ctx, &smRequestSetGluonDir{
|
||||||
|
dir: gluonDir,
|
||||||
|
})
|
||||||
|
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sm *ServerManager) AddGluonUser(ctx context.Context, conn connector.Connector, passphrase []byte) (string, error) {
|
||||||
|
reply, err := cpc.SendTyped[string](ctx, sm.requests, &smRequestAddGluonUser{
|
||||||
|
conn: conn,
|
||||||
|
passphrase: passphrase,
|
||||||
|
})
|
||||||
|
|
||||||
|
return reply, err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sm *ServerManager) RemoveGluonUser(ctx context.Context, gluonID string) error {
|
||||||
|
_, err := sm.requests.Send(ctx, &smRequestRemoveGluonUser{
|
||||||
|
userID: gluonID,
|
||||||
|
})
|
||||||
|
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sm *ServerManager) run(ctx context.Context, bridge *Bridge) {
|
||||||
|
eventCh, cancel := bridge.GetEvents()
|
||||||
|
defer cancel()
|
||||||
|
|
||||||
|
for {
|
||||||
|
select {
|
||||||
|
case <-ctx.Done():
|
||||||
|
sm.handleClose(ctx, bridge)
|
||||||
|
return
|
||||||
|
|
||||||
|
case evt := <-eventCh:
|
||||||
|
switch evt.(type) {
|
||||||
|
case events.ConnStatusDown:
|
||||||
|
logrus.Info("Server Manager, network down stopping listeners")
|
||||||
|
if err := sm.closeSMTPServer(bridge); err != nil {
|
||||||
|
logrus.WithError(err).Error("Failed to close SMTP server")
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := sm.stopIMAPListener(bridge); err != nil {
|
||||||
|
logrus.WithError(err)
|
||||||
|
}
|
||||||
|
case events.ConnStatusUp:
|
||||||
|
logrus.Info("Server Manager, network up starting listeners")
|
||||||
|
sm.handleLoadedUserCountChange(ctx, bridge)
|
||||||
|
}
|
||||||
|
|
||||||
|
case request, ok := <-sm.requests.ReceiveCh():
|
||||||
|
if !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
switch r := request.Value().(type) {
|
||||||
|
case *smRequestClose:
|
||||||
|
sm.handleClose(ctx, bridge)
|
||||||
|
request.Reply(ctx, nil, nil)
|
||||||
|
return
|
||||||
|
|
||||||
|
case *smRequestRestartSMTP:
|
||||||
|
err := sm.restartSMTP(bridge)
|
||||||
|
request.Reply(ctx, nil, err)
|
||||||
|
|
||||||
|
case *smRequestRestartIMAP:
|
||||||
|
err := sm.restartIMAP(ctx, bridge)
|
||||||
|
request.Reply(ctx, nil, err)
|
||||||
|
|
||||||
|
case *smRequestAddIMAPUser:
|
||||||
|
err := sm.handleAddIMAPUser(ctx, r.user)
|
||||||
|
request.Reply(ctx, nil, err)
|
||||||
|
if err == nil {
|
||||||
|
sm.loadedUserCount++
|
||||||
|
sm.handleLoadedUserCountChange(ctx, bridge)
|
||||||
|
}
|
||||||
|
|
||||||
|
case *smRequestRemoveIMAPUser:
|
||||||
|
err := sm.handleRemoveIMAPUser(ctx, r.user, r.withData)
|
||||||
|
request.Reply(ctx, nil, err)
|
||||||
|
if err == nil {
|
||||||
|
sm.loadedUserCount--
|
||||||
|
sm.handleLoadedUserCountChange(ctx, bridge)
|
||||||
|
}
|
||||||
|
|
||||||
|
case *smRequestSetGluonDir:
|
||||||
|
err := sm.handleSetGluonDir(ctx, bridge, r.dir)
|
||||||
|
request.Reply(ctx, nil, err)
|
||||||
|
|
||||||
|
case *smRequestAddGluonUser:
|
||||||
|
id, err := sm.handleAddGluonUser(ctx, r.conn, r.passphrase)
|
||||||
|
request.Reply(ctx, id, err)
|
||||||
|
|
||||||
|
case *smRequestRemoveGluonUser:
|
||||||
|
err := sm.handleRemoveGluonUser(ctx, r.userID)
|
||||||
|
request.Reply(ctx, nil, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sm *ServerManager) handleLoadedUserCountChange(ctx context.Context, bridge *Bridge) {
|
||||||
|
logrus.Infof("Validating Listener State %v", sm.loadedUserCount)
|
||||||
|
if sm.shouldStartServers() {
|
||||||
|
if sm.imapListener == nil {
|
||||||
|
if err := sm.serveIMAP(ctx, bridge); err != nil {
|
||||||
|
logrus.WithError(err).Error("Failed to start IMAP server")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if sm.smtpListener == nil {
|
||||||
|
if err := sm.restartSMTP(bridge); err != nil {
|
||||||
|
logrus.WithError(err).Error("Failed to start SMTP server")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if sm.imapListener != nil {
|
||||||
|
if err := sm.stopIMAPListener(bridge); err != nil {
|
||||||
|
logrus.WithError(err).Error("Failed to stop IMAP server")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if sm.smtpListener != nil {
|
||||||
|
if err := sm.closeSMTPServer(bridge); err != nil {
|
||||||
|
logrus.WithError(err).Error("Failed to stop SMTP server")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sm *ServerManager) handleClose(ctx context.Context, bridge *Bridge) {
|
||||||
|
// Close the IMAP server.
|
||||||
|
if err := sm.closeIMAPServer(ctx, bridge); err != nil {
|
||||||
|
logrus.WithError(err).Error("Failed to close IMAP server")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Close the SMTP server.
|
||||||
|
if err := sm.closeSMTPServer(bridge); err != nil {
|
||||||
|
logrus.WithError(err).Error("Failed to close SMTP server")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sm *ServerManager) handleAddIMAPUser(ctx context.Context, user *user.User) error {
|
||||||
|
if sm.imapServer == nil {
|
||||||
|
return fmt.Errorf("no imap server instance running")
|
||||||
|
}
|
||||||
|
|
||||||
|
imapConn, err := user.NewIMAPConnectors()
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to create IMAP connectors: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
for addrID, imapConn := range imapConn {
|
||||||
|
log := logrus.WithFields(logrus.Fields{
|
||||||
|
"userID": user.ID(),
|
||||||
|
"addrID": addrID,
|
||||||
|
})
|
||||||
|
|
||||||
|
if gluonID, ok := user.GetGluonID(addrID); ok {
|
||||||
|
log.WithField("gluonID", gluonID).Info("Loading existing IMAP user")
|
||||||
|
|
||||||
|
// Load the user, checking whether the DB was newly created.
|
||||||
|
isNew, err := sm.imapServer.LoadUser(ctx, imapConn, gluonID, user.GluonKey())
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to load IMAP user: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if isNew {
|
||||||
|
// If the DB was newly created, clear the sync status; gluon's DB was not found.
|
||||||
|
logrus.Warn("IMAP user DB was newly created, clearing sync status")
|
||||||
|
|
||||||
|
// Remove the user from IMAP so we can clear the sync status.
|
||||||
|
if err := sm.imapServer.RemoveUser(ctx, gluonID, false); err != nil {
|
||||||
|
return fmt.Errorf("failed to remove IMAP user: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Clear the sync status -- we need to resync all messages.
|
||||||
|
if err := user.ClearSyncStatus(); err != nil {
|
||||||
|
return fmt.Errorf("failed to clear sync status: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add the user back to the IMAP server.
|
||||||
|
if isNew, err := sm.imapServer.LoadUser(ctx, imapConn, gluonID, user.GluonKey()); err != nil {
|
||||||
|
return fmt.Errorf("failed to add IMAP user: %w", err)
|
||||||
|
} else if isNew {
|
||||||
|
panic("IMAP user should already have a database")
|
||||||
|
}
|
||||||
|
} else if status := user.GetSyncStatus(); !status.HasLabels {
|
||||||
|
// Otherwise, the DB already exists -- if the labels are not yet synced, we need to re-create the DB.
|
||||||
|
if err := sm.imapServer.RemoveUser(ctx, gluonID, true); err != nil {
|
||||||
|
return fmt.Errorf("failed to remove old IMAP user: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := user.RemoveGluonID(addrID, gluonID); err != nil {
|
||||||
|
return fmt.Errorf("failed to remove old IMAP user ID: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
gluonID, err := sm.imapServer.AddUser(ctx, imapConn, user.GluonKey())
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to add IMAP user: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := user.SetGluonID(addrID, gluonID); err != nil {
|
||||||
|
return fmt.Errorf("failed to set IMAP user ID: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
log.WithField("gluonID", gluonID).Info("Re-created IMAP user")
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
log.Info("Creating new IMAP user")
|
||||||
|
|
||||||
|
gluonID, err := sm.imapServer.AddUser(ctx, imapConn, user.GluonKey())
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to add IMAP user: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := user.SetGluonID(addrID, gluonID); err != nil {
|
||||||
|
return fmt.Errorf("failed to set IMAP user ID: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
log.WithField("gluonID", gluonID).Info("Created new IMAP user")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Trigger a sync for the user, if needed.
|
||||||
|
user.TriggerSync()
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sm *ServerManager) handleRemoveIMAPUser(ctx context.Context, user *user.User, withData bool) error {
|
||||||
|
if sm.imapServer == nil {
|
||||||
|
return fmt.Errorf("no imap server instance running")
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.WithFields(logrus.Fields{
|
||||||
|
"userID": user.ID(),
|
||||||
|
"withData": withData,
|
||||||
|
}).Debug("Removing IMAP user")
|
||||||
|
|
||||||
|
for addrID, gluonID := range user.GetGluonIDs() {
|
||||||
|
if err := sm.imapServer.RemoveUser(ctx, gluonID, withData); err != nil {
|
||||||
|
return fmt.Errorf("failed to remove IMAP user: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if withData {
|
||||||
|
if err := user.RemoveGluonID(addrID, gluonID); err != nil {
|
||||||
|
return fmt.Errorf("failed to remove IMAP user ID: %w", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func createIMAPServer(bridge *Bridge) (*gluon.Server, error) {
|
||||||
|
gluonDataDir, err := bridge.GetGluonDataDir()
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("failed to get Gluon Database directory: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return newIMAPServer(
|
||||||
|
bridge.vault.GetGluonCacheDir(),
|
||||||
|
gluonDataDir,
|
||||||
|
bridge.curVersion,
|
||||||
|
bridge.tlsConfig,
|
||||||
|
bridge.reporter,
|
||||||
|
bridge.logIMAPClient,
|
||||||
|
bridge.logIMAPServer,
|
||||||
|
bridge.imapEventCh,
|
||||||
|
bridge.tasks,
|
||||||
|
bridge.uidValidityGenerator,
|
||||||
|
bridge.panicHandler,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
func createSMTPServer(bridge *Bridge) *smtp.Server {
|
||||||
|
return newSMTPServer(bridge, bridge.tlsConfig, bridge.logSMTP)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sm *ServerManager) closeSMTPServer(bridge *Bridge) error {
|
||||||
|
// We close the listener ourselves even though it's also closed by smtpServer.Close().
|
||||||
|
// This is because smtpServer.Serve() is called in a separate goroutine and might be executed
|
||||||
|
// after we've already closed the server. However, go-smtp has a bug; it blocks on the listener
|
||||||
|
// even after the server has been closed. So we close the listener ourselves to unblock it.
|
||||||
|
|
||||||
|
if sm.smtpListener != nil {
|
||||||
|
logrus.Info("Closing SMTP Listener")
|
||||||
|
if err := sm.smtpListener.Close(); err != nil {
|
||||||
|
return fmt.Errorf("failed to close SMTP listener: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
sm.smtpListener = nil
|
||||||
|
}
|
||||||
|
|
||||||
|
if sm.smtpServer != nil {
|
||||||
|
logrus.Info("Closing SMTP server")
|
||||||
|
if err := sm.smtpServer.Close(); err != nil {
|
||||||
|
logrus.WithError(err).Debug("Failed to close SMTP server (expected -- we close the listener ourselves)")
|
||||||
|
}
|
||||||
|
|
||||||
|
sm.smtpServer = nil
|
||||||
|
|
||||||
|
bridge.publish(events.SMTPServerStopped{})
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sm *ServerManager) closeIMAPServer(ctx context.Context, bridge *Bridge) error {
|
||||||
|
if sm.imapListener != nil {
|
||||||
|
logrus.Info("Closing IMAP Listener")
|
||||||
|
|
||||||
|
if err := sm.imapListener.Close(); err != nil {
|
||||||
|
return fmt.Errorf("failed to close IMAP listener: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
sm.imapListener = nil
|
||||||
|
|
||||||
|
bridge.publish(events.IMAPServerStopped{})
|
||||||
|
}
|
||||||
|
|
||||||
|
if sm.imapServer != nil {
|
||||||
|
logrus.Info("Closing IMAP server")
|
||||||
|
if err := sm.imapServer.Close(ctx); err != nil {
|
||||||
|
return fmt.Errorf("failed to close IMAP server: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
sm.imapServer = nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sm *ServerManager) restartIMAP(ctx context.Context, bridge *Bridge) error {
|
||||||
|
logrus.Info("Restarting IMAP server")
|
||||||
|
|
||||||
|
if sm.imapListener != nil {
|
||||||
|
if err := sm.imapListener.Close(); err != nil {
|
||||||
|
return fmt.Errorf("failed to close IMAP listener: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
sm.imapListener = nil
|
||||||
|
|
||||||
|
bridge.publish(events.IMAPServerStopped{})
|
||||||
|
}
|
||||||
|
|
||||||
|
if sm.shouldStartServers() {
|
||||||
|
return sm.serveIMAP(ctx, bridge)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sm *ServerManager) restartSMTP(bridge *Bridge) error {
|
||||||
|
logrus.Info("Restarting SMTP server")
|
||||||
|
|
||||||
|
if err := sm.closeSMTPServer(bridge); err != nil {
|
||||||
|
return fmt.Errorf("failed to close SMTP: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
bridge.publish(events.SMTPServerStopped{})
|
||||||
|
|
||||||
|
sm.smtpServer = newSMTPServer(bridge, bridge.tlsConfig, bridge.logSMTP)
|
||||||
|
|
||||||
|
if sm.shouldStartServers() {
|
||||||
|
return sm.serveSMTP(bridge)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sm *ServerManager) serveSMTP(bridge *Bridge) error {
|
||||||
|
port, err := func() (int, error) {
|
||||||
|
logrus.WithFields(logrus.Fields{
|
||||||
|
"port": bridge.vault.GetSMTPPort(),
|
||||||
|
"ssl": bridge.vault.GetSMTPSSL(),
|
||||||
|
}).Info("Starting SMTP server")
|
||||||
|
|
||||||
|
smtpListener, err := newListener(bridge.vault.GetSMTPPort(), bridge.vault.GetSMTPSSL(), bridge.tlsConfig)
|
||||||
|
if err != nil {
|
||||||
|
return 0, fmt.Errorf("failed to create SMTP listener: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
sm.smtpListener = smtpListener
|
||||||
|
|
||||||
|
bridge.tasks.Once(func(context.Context) {
|
||||||
|
if err := sm.smtpServer.Serve(smtpListener); err != nil {
|
||||||
|
logrus.WithError(err).Info("SMTP server stopped")
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
if err := bridge.vault.SetSMTPPort(getPort(smtpListener.Addr())); err != nil {
|
||||||
|
return 0, fmt.Errorf("failed to store SMTP port in vault: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return getPort(smtpListener.Addr()), nil
|
||||||
|
}()
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
bridge.publish(events.SMTPServerError{
|
||||||
|
Error: err,
|
||||||
|
})
|
||||||
|
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
bridge.publish(events.SMTPServerReady{
|
||||||
|
Port: port,
|
||||||
|
})
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sm *ServerManager) serveIMAP(ctx context.Context, bridge *Bridge) error {
|
||||||
|
port, err := func() (int, error) {
|
||||||
|
if sm.imapServer == nil {
|
||||||
|
return 0, fmt.Errorf("no IMAP server instance running")
|
||||||
|
}
|
||||||
|
|
||||||
|
logrus.WithFields(logrus.Fields{
|
||||||
|
"port": bridge.vault.GetIMAPPort(),
|
||||||
|
"ssl": bridge.vault.GetIMAPSSL(),
|
||||||
|
}).Info("Starting IMAP server")
|
||||||
|
|
||||||
|
imapListener, err := newListener(bridge.vault.GetIMAPPort(), bridge.vault.GetIMAPSSL(), bridge.tlsConfig)
|
||||||
|
if err != nil {
|
||||||
|
return 0, fmt.Errorf("failed to create IMAP listener: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
sm.imapListener = imapListener
|
||||||
|
|
||||||
|
if err := sm.imapServer.Serve(ctx, sm.imapListener); err != nil {
|
||||||
|
return 0, fmt.Errorf("failed to serve IMAP: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := bridge.vault.SetIMAPPort(getPort(imapListener.Addr())); err != nil {
|
||||||
|
return 0, fmt.Errorf("failed to store IMAP port in vault: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return getPort(imapListener.Addr()), nil
|
||||||
|
}()
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
bridge.publish(events.IMAPServerError{
|
||||||
|
Error: err,
|
||||||
|
})
|
||||||
|
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
bridge.publish(events.IMAPServerReady{
|
||||||
|
Port: port,
|
||||||
|
})
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sm *ServerManager) stopIMAPListener(bridge *Bridge) error {
|
||||||
|
logrus.Info("Stopping IMAP listener")
|
||||||
|
if sm.imapListener != nil {
|
||||||
|
if err := sm.imapListener.Close(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
sm.imapListener = nil
|
||||||
|
|
||||||
|
bridge.publish(events.IMAPServerStopped{})
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sm *ServerManager) handleSetGluonDir(ctx context.Context, bridge *Bridge, newGluonDir string) error {
|
||||||
|
return safe.RLockRet(func() error {
|
||||||
|
currentGluonDir := bridge.GetGluonCacheDir()
|
||||||
|
newGluonDir = filepath.Join(newGluonDir, "gluon")
|
||||||
|
if newGluonDir == currentGluonDir {
|
||||||
|
return fmt.Errorf("new gluon dir is the same as the old one")
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := sm.closeIMAPServer(context.Background(), bridge); err != nil {
|
||||||
|
return fmt.Errorf("failed to close IMAP: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
sm.loadedUserCount = 0
|
||||||
|
|
||||||
|
if err := bridge.moveGluonCacheDir(currentGluonDir, newGluonDir); err != nil {
|
||||||
|
logrus.WithError(err).Error("failed to move GluonCacheDir")
|
||||||
|
|
||||||
|
if err := bridge.vault.SetGluonDir(currentGluonDir); err != nil {
|
||||||
|
return fmt.Errorf("failed to revert GluonCacheDir: %w", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bridge.heartbeat.SetCacheLocation(newGluonDir)
|
||||||
|
|
||||||
|
gluonDataDir, err := bridge.GetGluonDataDir()
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to get Gluon Database directory: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
imapServer, err := newIMAPServer(
|
||||||
|
bridge.vault.GetGluonCacheDir(),
|
||||||
|
gluonDataDir,
|
||||||
|
bridge.curVersion,
|
||||||
|
bridge.tlsConfig,
|
||||||
|
bridge.reporter,
|
||||||
|
bridge.logIMAPClient,
|
||||||
|
bridge.logIMAPServer,
|
||||||
|
bridge.imapEventCh,
|
||||||
|
bridge.tasks,
|
||||||
|
bridge.uidValidityGenerator,
|
||||||
|
bridge.panicHandler,
|
||||||
|
)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to create new IMAP server: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
sm.imapServer = imapServer
|
||||||
|
for _, bridgeUser := range bridge.users {
|
||||||
|
if err := sm.handleAddIMAPUser(ctx, bridgeUser); err != nil {
|
||||||
|
return fmt.Errorf("failed to add users to new IMAP server: %w", err)
|
||||||
|
}
|
||||||
|
sm.loadedUserCount++
|
||||||
|
}
|
||||||
|
|
||||||
|
if sm.shouldStartServers() {
|
||||||
|
if err := sm.serveIMAP(ctx, bridge); err != nil {
|
||||||
|
return fmt.Errorf("failed to serve IMAP: %w", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}, bridge.usersLock)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sm *ServerManager) handleAddGluonUser(ctx context.Context, conn connector.Connector, passphrase []byte) (string, error) {
|
||||||
|
if sm.imapServer == nil {
|
||||||
|
return "", fmt.Errorf("no imap server instance running")
|
||||||
|
}
|
||||||
|
|
||||||
|
return sm.imapServer.AddUser(ctx, conn, passphrase)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sm *ServerManager) handleRemoveGluonUser(ctx context.Context, userID string) error {
|
||||||
|
if sm.imapServer == nil {
|
||||||
|
return fmt.Errorf("no imap server instance running")
|
||||||
|
}
|
||||||
|
|
||||||
|
return sm.imapServer.RemoveUser(ctx, userID, true)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sm *ServerManager) shouldStartServers() bool {
|
||||||
|
return sm.loadedUserCount >= 1
|
||||||
|
}
|
||||||
|
|
||||||
|
type smRequestClose struct{}
|
||||||
|
|
||||||
|
type smRequestRestartIMAP struct{}
|
||||||
|
|
||||||
|
type smRequestRestartSMTP struct{}
|
||||||
|
|
||||||
|
type smRequestAddIMAPUser struct {
|
||||||
|
user *user.User
|
||||||
|
}
|
||||||
|
|
||||||
|
type smRequestRemoveIMAPUser struct {
|
||||||
|
user *user.User
|
||||||
|
withData bool
|
||||||
|
}
|
||||||
|
|
||||||
|
type smRequestSetGluonDir struct {
|
||||||
|
dir string
|
||||||
|
}
|
||||||
|
|
||||||
|
type smRequestAddGluonUser struct {
|
||||||
|
conn connector.Connector
|
||||||
|
passphrase []byte
|
||||||
|
}
|
||||||
|
|
||||||
|
type smRequestRemoveGluonUser struct {
|
||||||
|
userID string
|
||||||
|
}
|
||||||
@ -20,11 +20,11 @@ package bridge
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"net"
|
||||||
|
"os"
|
||||||
|
|
||||||
"github.com/Masterminds/semver/v3"
|
"github.com/Masterminds/semver/v3"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/kb"
|
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/safe"
|
"github.com/ProtonMail/proton-bridge/v3/internal/safe"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/services/userevents"
|
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/updater"
|
"github.com/ProtonMail/proton-bridge/v3/internal/updater"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/vault"
|
"github.com/ProtonMail/proton-bridge/v3/internal/vault"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
@ -131,41 +131,26 @@ func (bridge *Bridge) GetGluonDataDir() (string, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (bridge *Bridge) SetGluonDir(ctx context.Context, newGluonDir string) error {
|
func (bridge *Bridge) SetGluonDir(ctx context.Context, newGluonDir string) error {
|
||||||
bridge.usersLock.RLock()
|
|
||||||
|
|
||||||
defer func() {
|
|
||||||
logrus.Info("Restarting user event loops")
|
|
||||||
for _, u := range bridge.users {
|
|
||||||
u.ResumeEventLoop()
|
|
||||||
}
|
|
||||||
|
|
||||||
bridge.usersLock.RUnlock()
|
|
||||||
}()
|
|
||||||
|
|
||||||
type waiter struct {
|
|
||||||
w *userevents.EventPollWaiter
|
|
||||||
id string
|
|
||||||
}
|
|
||||||
|
|
||||||
waiters := make([]waiter, 0, len(bridge.users))
|
|
||||||
|
|
||||||
logrus.Info("Pausing user event loops for gluon dir change")
|
|
||||||
for id, u := range bridge.users {
|
|
||||||
waiters = append(waiters, waiter{w: u.PauseEventLoopWithWaiter(), id: id})
|
|
||||||
}
|
|
||||||
|
|
||||||
logrus.Info("Waiting on user event loop completion")
|
|
||||||
for _, waiter := range waiters {
|
|
||||||
if err := waiter.w.WaitPollFinished(ctx); err != nil {
|
|
||||||
logrus.WithError(err).Errorf("Failed to wait on event loop pause for user %v", waiter.id)
|
|
||||||
return fmt.Errorf("failed on event loop pause: %w", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
logrus.Info("Changing gluon directory")
|
|
||||||
return bridge.serverManager.SetGluonDir(ctx, newGluonDir)
|
return bridge.serverManager.SetGluonDir(ctx, newGluonDir)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (bridge *Bridge) moveGluonCacheDir(oldGluonDir, newGluonDir string) error {
|
||||||
|
logrus.Infof("gluon cache moving from %s to %s", oldGluonDir, newGluonDir)
|
||||||
|
oldCacheDir := ApplyGluonCachePathSuffix(oldGluonDir)
|
||||||
|
if err := copyDir(oldCacheDir, ApplyGluonCachePathSuffix(newGluonDir)); err != nil {
|
||||||
|
return fmt.Errorf("failed to copy gluon dir: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := bridge.vault.SetGluonDir(newGluonDir); err != nil {
|
||||||
|
return fmt.Errorf("failed to set new gluon cache dir: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := os.RemoveAll(oldCacheDir); err != nil {
|
||||||
|
logrus.WithError(err).Error("failed to remove old gluon cache dir")
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
func (bridge *Bridge) GetProxyAllowed() bool {
|
func (bridge *Bridge) GetProxyAllowed() bool {
|
||||||
return bridge.vault.GetProxyAllowed()
|
return bridge.vault.GetProxyAllowed()
|
||||||
}
|
}
|
||||||
@ -262,12 +247,9 @@ func (bridge *Bridge) SetTelemetryDisabled(isDisabled bool) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
// If telemetry is re-enabled locally, try to send the heartbeat.
|
// If telemetry is re-enabled locally, try to send the heartbeat.
|
||||||
if isDisabled {
|
if !isDisabled {
|
||||||
bridge.heartbeat.stop()
|
defer bridge.goHeartbeat()
|
||||||
} else {
|
|
||||||
bridge.heartbeat.start()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -311,10 +293,6 @@ func (bridge *Bridge) SetColorScheme(colorScheme string) error {
|
|||||||
return bridge.vault.SetColorScheme(colorScheme)
|
return bridge.vault.SetColorScheme(colorScheme)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (bridge *Bridge) GetKnowledgeBaseSuggestions(userInput string) (kb.ArticleList, error) {
|
|
||||||
return kb.GetSuggestions(userInput)
|
|
||||||
}
|
|
||||||
|
|
||||||
// FactoryReset deletes all users, wipes the vault, and deletes all files.
|
// FactoryReset deletes all users, wipes the vault, and deletes all files.
|
||||||
// Note: it does not clear the keychain. The only entry in the keychain is the vault password,
|
// Note: it does not clear the keychain. The only entry in the keychain is the vault password,
|
||||||
// which we need at next startup to decrypt the vault.
|
// which we need at next startup to decrypt the vault.
|
||||||
@ -340,3 +318,16 @@ func (bridge *Bridge) FactoryReset(ctx context.Context) {
|
|||||||
logrus.WithError(err).Error("Failed to clear data paths")
|
logrus.WithError(err).Error("Failed to clear data paths")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func getPort(addr net.Addr) int {
|
||||||
|
switch addr := addr.(type) {
|
||||||
|
case *net.TCPAddr:
|
||||||
|
return addr.Port
|
||||||
|
|
||||||
|
case *net.UDPAddr:
|
||||||
|
return addr.Port
|
||||||
|
|
||||||
|
default:
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@ -25,7 +25,6 @@ import (
|
|||||||
"github.com/ProtonMail/go-proton-api"
|
"github.com/ProtonMail/go-proton-api"
|
||||||
"github.com/ProtonMail/go-proton-api/server"
|
"github.com/ProtonMail/go-proton-api/server"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/bridge"
|
"github.com/ProtonMail/proton-bridge/v3/internal/bridge"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/events"
|
|
||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -52,45 +51,6 @@ func TestBridge_Settings_GluonDir(t *testing.T) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestBridge_Settings_GluonDirWithOnGoingEvents(t *testing.T) {
|
|
||||||
withEnv(t, func(ctx context.Context, s *server.Server, netCtl *proton.NetCtl, locator bridge.Locator, storeKey []byte) {
|
|
||||||
userID, addrID, err := s.CreateUser("imap", password)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
withBridge(ctx, t, s.GetHostURL(), netCtl, locator, storeKey, func(bridge *bridge.Bridge, mocks *bridge.Mocks) {
|
|
||||||
syncCh, done := chToType[events.Event, events.SyncFinished](bridge.GetEvents(events.SyncFinished{}))
|
|
||||||
defer done()
|
|
||||||
|
|
||||||
_, err := bridge.LoginFull(context.Background(), "imap", password, nil, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
<-syncCh
|
|
||||||
})
|
|
||||||
|
|
||||||
labelID, err := s.CreateLabel(userID, "folder", "", proton.LabelTypeFolder)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
withClient(ctx, t, s, "imap", password, func(ctx context.Context, c *proton.Client) {
|
|
||||||
createNumMessages(ctx, t, c, addrID, labelID, 200)
|
|
||||||
})
|
|
||||||
|
|
||||||
withBridgeWaitForServers(ctx, t, s.GetHostURL(), netCtl, locator, storeKey, func(bridge *bridge.Bridge, mocks *bridge.Mocks) {
|
|
||||||
// Create a new location for the Gluon data.
|
|
||||||
newGluonDir := t.TempDir()
|
|
||||||
|
|
||||||
// Move the gluon dir; it should also move the user's data.
|
|
||||||
require.NoError(t, bridge.SetGluonDir(context.Background(), newGluonDir))
|
|
||||||
|
|
||||||
// Check that the new directory is not empty.
|
|
||||||
entries, err := os.ReadDir(newGluonDir)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
// There should be at least one entry.
|
|
||||||
require.NotEmpty(t, entries)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestBridge_Settings_IMAPPort(t *testing.T) {
|
func TestBridge_Settings_IMAPPort(t *testing.T) {
|
||||||
withEnv(t, func(ctx context.Context, s *server.Server, netCtl *proton.NetCtl, locator bridge.Locator, storeKey []byte) {
|
withEnv(t, func(ctx context.Context, s *server.Server, netCtl *proton.NetCtl, locator bridge.Locator, storeKey []byte) {
|
||||||
withBridge(ctx, t, s.GetHostURL(), netCtl, locator, storeKey, func(bridge *bridge.Bridge, mocks *bridge.Mocks) {
|
withBridge(ctx, t, s.GetHostURL(), netCtl, locator, storeKey, func(bridge *bridge.Bridge, mocks *bridge.Mocks) {
|
||||||
|
|||||||
@ -21,37 +21,43 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
"crypto/tls"
|
"crypto/tls"
|
||||||
|
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/identifier"
|
"github.com/ProtonMail/proton-bridge/v3/internal/constants"
|
||||||
|
"github.com/ProtonMail/proton-bridge/v3/internal/logging"
|
||||||
|
"github.com/emersion/go-sasl"
|
||||||
|
"github.com/emersion/go-smtp"
|
||||||
|
"github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
|
|
||||||
func (bridge *Bridge) restartSMTP(ctx context.Context) error {
|
func (bridge *Bridge) restartSMTP(ctx context.Context) error {
|
||||||
return bridge.serverManager.RestartSMTP(ctx)
|
return bridge.serverManager.RestartSMTP(ctx)
|
||||||
}
|
}
|
||||||
|
|
||||||
type bridgeSMTPSettings struct {
|
func newSMTPServer(bridge *Bridge, tlsConfig *tls.Config, logSMTP bool) *smtp.Server {
|
||||||
b *Bridge
|
logrus.WithField("logSMTP", logSMTP).Info("Creating SMTP server")
|
||||||
}
|
|
||||||
|
|
||||||
func (b *bridgeSMTPSettings) TLSConfig() *tls.Config {
|
smtpServer := smtp.NewServer(&smtpBackend{Bridge: bridge})
|
||||||
return b.b.tlsConfig
|
|
||||||
}
|
|
||||||
|
|
||||||
func (b *bridgeSMTPSettings) Log() bool {
|
smtpServer.TLSConfig = tlsConfig
|
||||||
return b.b.logSMTP
|
smtpServer.Domain = constants.Host
|
||||||
}
|
smtpServer.AllowInsecureAuth = true
|
||||||
|
smtpServer.MaxLineLength = 1 << 16
|
||||||
|
smtpServer.ErrorLog = logging.NewSMTPLogger()
|
||||||
|
|
||||||
func (b *bridgeSMTPSettings) Port() int {
|
// go-smtp suppors SASL PLAIN but not LOGIN. We need to add LOGIN support ourselves.
|
||||||
return b.b.vault.GetSMTPPort()
|
smtpServer.EnableAuth(sasl.Login, func(conn *smtp.Conn) sasl.Server {
|
||||||
}
|
return sasl.NewLoginServer(func(username, password string) error {
|
||||||
|
return conn.Session().AuthPlain(username, password)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
func (b *bridgeSMTPSettings) SetPort(i int) error {
|
if logSMTP {
|
||||||
return b.b.vault.SetSMTPPort(i)
|
log := logrus.WithField("protocol", "SMTP")
|
||||||
}
|
log.Warning("================================================")
|
||||||
|
log.Warning("THIS LOG WILL CONTAIN **DECRYPTED** MESSAGE DATA")
|
||||||
|
log.Warning("================================================")
|
||||||
|
|
||||||
func (b *bridgeSMTPSettings) UseSSL() bool {
|
smtpServer.Debug = logging.NewSMTPDebugLogger()
|
||||||
return b.b.vault.GetSMTPSSL()
|
}
|
||||||
}
|
|
||||||
|
|
||||||
func (b *bridgeSMTPSettings) Identifier() identifier.UserAgentUpdater {
|
return smtpServer
|
||||||
return &bridgeUserAgentUpdater{Bridge: b.b}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -15,36 +15,26 @@
|
|||||||
// You should have received a copy of the GNU General Public License
|
// You should have received a copy of the GNU General Public License
|
||||||
// along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
|
// along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package smtp
|
package bridge
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"errors"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/identifier"
|
"github.com/ProtonMail/proton-bridge/v3/internal/safe"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/useragent"
|
"github.com/ProtonMail/proton-bridge/v3/internal/useragent"
|
||||||
"github.com/emersion/go-smtp"
|
"github.com/emersion/go-smtp"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Backend struct {
|
type smtpBackend struct {
|
||||||
accounts *Accounts
|
*Bridge
|
||||||
userAgent identifier.UserAgentUpdater
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewBackend(accounts *Accounts, userAgent identifier.UserAgentUpdater) *Backend {
|
|
||||||
return &Backend{
|
|
||||||
accounts: accounts,
|
|
||||||
userAgent: userAgent,
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type smtpSession struct {
|
type smtpSession struct {
|
||||||
accounts *Accounts
|
*Bridge
|
||||||
userAgent identifier.UserAgentUpdater
|
|
||||||
|
|
||||||
userID string
|
userID string
|
||||||
authID string
|
authID string
|
||||||
@ -53,32 +43,45 @@ type smtpSession struct {
|
|||||||
to []string
|
to []string
|
||||||
}
|
}
|
||||||
|
|
||||||
func (be *Backend) NewSession(*smtp.Conn) (smtp.Session, error) {
|
func (be *smtpBackend) NewSession(*smtp.Conn) (smtp.Session, error) {
|
||||||
return &smtpSession{accounts: be.accounts, userAgent: be.userAgent}, nil
|
return &smtpSession{Bridge: be.Bridge}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *smtpSession) AuthPlain(username, password string) error {
|
func (s *smtpSession) AuthPlain(username, password string) error {
|
||||||
userID, authID, err := s.accounts.CheckAuth(username, []byte(password))
|
return safe.RLockRet(func() error {
|
||||||
if err != nil {
|
for _, user := range s.users {
|
||||||
if !errors.Is(err, ErrNoSuchUser) {
|
addrID, err := user.CheckAuth(username, []byte(password))
|
||||||
return fmt.Errorf("unknown error")
|
if err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
s.userID = user.ID()
|
||||||
|
s.authID = addrID
|
||||||
|
|
||||||
|
if strings.Contains(s.Bridge.GetCurrentUserAgent(), useragent.DefaultUserAgent) {
|
||||||
|
s.Bridge.setUserAgent(useragent.UnknownClient, useragent.DefaultVersion)
|
||||||
|
}
|
||||||
|
|
||||||
|
user.SendConfigStatusSuccess(context.Background())
|
||||||
|
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.WithFields(logrus.Fields{
|
logrus.WithFields(logrus.Fields{
|
||||||
"username": username,
|
"username": username,
|
||||||
"pkg": "smtp",
|
"pkg": "smtp",
|
||||||
}).Error("Incorrect login credentials.")
|
}).Error("Incorrect login credentials.")
|
||||||
|
err := fmt.Errorf("invalid username or password")
|
||||||
return fmt.Errorf("invalid username or password")
|
for _, user := range s.users {
|
||||||
}
|
for _, mail := range user.Emails() {
|
||||||
|
if mail == username {
|
||||||
s.userID = userID
|
user.ReportConfigStatusFailure(err.Error())
|
||||||
s.authID = authID
|
return err
|
||||||
|
}
|
||||||
if strings.Contains(s.userAgent.GetUserAgent(), useragent.DefaultUserAgent) {
|
}
|
||||||
s.userAgent.SetUserAgent(useragent.UnknownClient, useragent.DefaultVersion)
|
}
|
||||||
}
|
return err
|
||||||
|
}, s.usersLock)
|
||||||
return nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *smtpSession) Reset() {
|
func (s *smtpSession) Reset() {
|
||||||
@ -105,7 +108,14 @@ func (s *smtpSession) Rcpt(to string) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (s *smtpSession) Data(r io.Reader) error {
|
func (s *smtpSession) Data(r io.Reader) error {
|
||||||
err := s.accounts.SendMail(context.Background(), s.userID, s.authID, s.from, s.to, r)
|
err := safe.RLockRet(func() error {
|
||||||
|
user, ok := s.users[s.userID]
|
||||||
|
if !ok {
|
||||||
|
return ErrNoSuchUser
|
||||||
|
}
|
||||||
|
|
||||||
|
return user.SendMail(s.authID, s.from, s.to, r)
|
||||||
|
}, s.usersLock)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.WithField("pkg", "smtp").WithError(err).Error("Send mail failed.")
|
logrus.WithField("pkg", "smtp").WithError(err).Error("Send mail failed.")
|
||||||
@ -21,11 +21,9 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"net/http"
|
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"runtime"
|
"runtime"
|
||||||
"strings"
|
|
||||||
"sync/atomic"
|
"sync/atomic"
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
@ -37,7 +35,6 @@ import (
|
|||||||
"github.com/ProtonMail/proton-bridge/v3/internal/bridge"
|
"github.com/ProtonMail/proton-bridge/v3/internal/bridge"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/constants"
|
"github.com/ProtonMail/proton-bridge/v3/internal/constants"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/events"
|
"github.com/ProtonMail/proton-bridge/v3/internal/events"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/services/imapservice"
|
|
||||||
"github.com/bradenaw/juniper/iterator"
|
"github.com/bradenaw/juniper/iterator"
|
||||||
"github.com/bradenaw/juniper/stream"
|
"github.com/bradenaw/juniper/stream"
|
||||||
"github.com/bradenaw/juniper/xslices"
|
"github.com/bradenaw/juniper/xslices"
|
||||||
@ -255,17 +252,14 @@ func TestBridge_SyncWithOngoingEvents(t *testing.T) {
|
|||||||
|
|
||||||
// Login the user; its sync should fail.
|
// Login the user; its sync should fail.
|
||||||
withBridge(ctx, t, s.GetHostURL(), netCtl, locator, storeKey, func(b *bridge.Bridge, mocks *bridge.Mocks) {
|
withBridge(ctx, t, s.GetHostURL(), netCtl, locator, storeKey, func(b *bridge.Bridge, mocks *bridge.Mocks) {
|
||||||
syncCh, done := chToType[events.Event, events.SyncFinished](b.GetEvents(events.SyncFinished{}))
|
|
||||||
defer done()
|
|
||||||
|
|
||||||
{
|
{
|
||||||
syncFailedCh, syncFailedDone := chToType[events.Event, events.SyncFailed](b.GetEvents(events.SyncFailed{}))
|
syncCh, done := chToType[events.Event, events.SyncFailed](b.GetEvents(events.SyncFailed{}))
|
||||||
defer syncFailedDone()
|
defer done()
|
||||||
|
|
||||||
userID, err := b.LoginFull(ctx, "imap", password, nil, nil)
|
userID, err := b.LoginFull(ctx, "imap", password, nil, nil)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
require.Equal(t, userID, (<-syncFailedCh).UserID)
|
require.Equal(t, userID, (<-syncCh).UserID)
|
||||||
|
|
||||||
info, err := b.GetUserInfo(userID)
|
info, err := b.GetUserInfo(userID)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
@ -288,7 +282,11 @@ func TestBridge_SyncWithOngoingEvents(t *testing.T) {
|
|||||||
|
|
||||||
// Remove the network limit, allowing the sync to finish.
|
// Remove the network limit, allowing the sync to finish.
|
||||||
netCtl.SetReadLimit(0)
|
netCtl.SetReadLimit(0)
|
||||||
|
|
||||||
{
|
{
|
||||||
|
syncCh, done := chToType[events.Event, events.SyncFinished](b.GetEvents(events.SyncFinished{}))
|
||||||
|
defer done()
|
||||||
|
|
||||||
require.Equal(t, userID, (<-syncCh).UserID)
|
require.Equal(t, userID, (<-syncCh).UserID)
|
||||||
|
|
||||||
info, err := b.GetUserInfo(userID)
|
info, err := b.GetUserInfo(userID)
|
||||||
@ -300,6 +298,12 @@ func TestBridge_SyncWithOngoingEvents(t *testing.T) {
|
|||||||
require.NoError(t, client.Login(info.Addresses[0], string(info.BridgePass)))
|
require.NoError(t, client.Login(info.Addresses[0], string(info.BridgePass)))
|
||||||
defer func() { _ = client.Logout() }()
|
defer func() { _ = client.Logout() }()
|
||||||
|
|
||||||
|
status, err := client.Select(`Folders/folder`, false)
|
||||||
|
require.NoError(t, err)
|
||||||
|
// Original folder should have more than 0 messages and less than the total.
|
||||||
|
require.Greater(t, status.Messages, uint32(0))
|
||||||
|
require.Less(t, status.Messages, uint32(numMsg))
|
||||||
|
|
||||||
// Check that the new messages arrive in the right location.
|
// Check that the new messages arrive in the right location.
|
||||||
require.Eventually(t, func() bool {
|
require.Eventually(t, func() bool {
|
||||||
status, err := client.Select(`Folders/folder2`, true)
|
status, err := client.Select(`Folders/folder2`, true)
|
||||||
@ -317,379 +321,6 @@ func TestBridge_SyncWithOngoingEvents(t *testing.T) {
|
|||||||
}, server.WithTLS(false))
|
}, server.WithTLS(false))
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestBridge_CanProcessEventsDuringSync(t *testing.T) {
|
|
||||||
numMsg := 1 << 8
|
|
||||||
|
|
||||||
withEnv(t, func(ctx context.Context, s *server.Server, netCtl *proton.NetCtl, locator bridge.Locator, storeKey []byte) {
|
|
||||||
userID, addrID, err := s.CreateUser("imap", password)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
labelID, err := s.CreateLabel(userID, "folder", "", proton.LabelTypeFolder)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
withClient(ctx, t, s, "imap", password, func(ctx context.Context, c *proton.Client) {
|
|
||||||
createNumMessages(ctx, t, c, addrID, labelID, numMsg)
|
|
||||||
})
|
|
||||||
|
|
||||||
// Simulate 429 to prevent sync from progressing.
|
|
||||||
s.AddStatusHook(func(request *http.Request) (int, bool) {
|
|
||||||
if strings.Contains(request.URL.Path, "/mail/v4/messages/") {
|
|
||||||
return http.StatusTooManyRequests, true
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0, false
|
|
||||||
})
|
|
||||||
|
|
||||||
// The initial user should be fully synced.
|
|
||||||
withBridge(ctx, t, s.GetHostURL(), netCtl, locator, storeKey, func(bridge *bridge.Bridge, _ *bridge.Mocks) {
|
|
||||||
syncStartedCh, syncStartedDone := chToType[events.Event, events.SyncStarted](bridge.GetEvents(events.SyncStarted{}))
|
|
||||||
defer syncStartedDone()
|
|
||||||
|
|
||||||
addressCreatedCh, addressCreatedDone := chToType[events.Event, events.UserAddressCreated](bridge.GetEvents(events.UserAddressCreated{}))
|
|
||||||
defer addressCreatedDone()
|
|
||||||
|
|
||||||
userID, err := bridge.LoginFull(ctx, "imap", password, nil, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
require.Equal(t, userID, (<-syncStartedCh).UserID)
|
|
||||||
|
|
||||||
// Create a new address
|
|
||||||
newAddress := "foo@proton.ch"
|
|
||||||
addrID, err := s.CreateAddress(userID, newAddress, password)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
event := <-addressCreatedCh
|
|
||||||
require.Equal(t, userID, event.UserID)
|
|
||||||
require.Equal(t, newAddress, event.Email)
|
|
||||||
require.Equal(t, addrID, event.AddressID)
|
|
||||||
})
|
|
||||||
}, server.WithTLS(false))
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestBridge_RefreshDuringSyncRestartSync(t *testing.T) {
|
|
||||||
numMsg := 1 << 8
|
|
||||||
|
|
||||||
withEnv(t, func(ctx context.Context, s *server.Server, netCtl *proton.NetCtl, locator bridge.Locator, storeKey []byte) {
|
|
||||||
userID, addrID, err := s.CreateUser("imap", password)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
labelID, err := s.CreateLabel(userID, "folder", "", proton.LabelTypeFolder)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
withClient(ctx, t, s, "imap", password, func(ctx context.Context, c *proton.Client) {
|
|
||||||
createNumMessages(ctx, t, c, addrID, labelID, numMsg)
|
|
||||||
})
|
|
||||||
|
|
||||||
var refreshPerformed atomic.Bool
|
|
||||||
refreshPerformed.Store(false)
|
|
||||||
|
|
||||||
// Simulate 429 to prevent sync from progressing.
|
|
||||||
s.AddStatusHook(func(request *http.Request) (int, bool) {
|
|
||||||
if strings.Contains(request.URL.Path, "/mail/v4/messages/") {
|
|
||||||
if !refreshPerformed.Load() {
|
|
||||||
return http.StatusTooManyRequests, true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0, false
|
|
||||||
})
|
|
||||||
|
|
||||||
// The initial user should be fully synced.
|
|
||||||
withBridge(ctx, t, s.GetHostURL(), netCtl, locator, storeKey, func(bridge *bridge.Bridge, _ *bridge.Mocks) {
|
|
||||||
syncCh, done := chToType[events.Event, events.SyncFinished](bridge.GetEvents(events.SyncFinished{}))
|
|
||||||
defer done()
|
|
||||||
|
|
||||||
userID, err := bridge.LoginFull(ctx, "imap", password, nil, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
syncStartedCh, syncStartedDone := chToType[events.Event, events.SyncStarted](bridge.GetEvents(events.SyncStarted{}))
|
|
||||||
defer syncStartedDone()
|
|
||||||
|
|
||||||
require.Equal(t, userID, (<-syncStartedCh).UserID)
|
|
||||||
|
|
||||||
require.NoError(t, err, s.RefreshUser(userID, proton.RefreshMail))
|
|
||||||
require.Equal(t, userID, (<-syncStartedCh).UserID)
|
|
||||||
refreshPerformed.Store(true)
|
|
||||||
|
|
||||||
require.Equal(t, userID, (<-syncCh).UserID)
|
|
||||||
})
|
|
||||||
}, server.WithTLS(false))
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestBridge_EventReplayAfterSyncHasFinished(t *testing.T) {
|
|
||||||
numMsg := 1 << 8
|
|
||||||
|
|
||||||
withEnv(t, func(ctx context.Context, s *server.Server, netCtl *proton.NetCtl, locator bridge.Locator, storeKey []byte) {
|
|
||||||
userID, addrID, err := s.CreateUser("imap", password)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
labelID, err := s.CreateLabel(userID, "folder", "", proton.LabelTypeFolder)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
withClient(ctx, t, s, "imap", password, func(ctx context.Context, c *proton.Client) {
|
|
||||||
createNumMessages(ctx, t, c, addrID, labelID, numMsg)
|
|
||||||
})
|
|
||||||
|
|
||||||
addrID1, err := s.CreateAddress(userID, "foo@proton.ch", password)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
var allowSyncToProgress atomic.Bool
|
|
||||||
allowSyncToProgress.Store(false)
|
|
||||||
|
|
||||||
// Simulate 429 to prevent sync from progressing.
|
|
||||||
s.AddStatusHook(func(request *http.Request) (int, bool) {
|
|
||||||
if request.Method == "GET" && strings.Contains(request.URL.Path, "/mail/v4/messages/") {
|
|
||||||
if !allowSyncToProgress.Load() {
|
|
||||||
return http.StatusTooManyRequests, true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0, false
|
|
||||||
})
|
|
||||||
|
|
||||||
// The initial user should be fully synced.
|
|
||||||
withBridge(ctx, t, s.GetHostURL(), netCtl, locator, storeKey, func(bridge *bridge.Bridge, _ *bridge.Mocks) {
|
|
||||||
syncCh, done := chToType[events.Event, events.SyncFinished](bridge.GetEvents(events.SyncFinished{}))
|
|
||||||
defer done()
|
|
||||||
|
|
||||||
syncStartedCh, syncStartedDone := chToType[events.Event, events.SyncStarted](bridge.GetEvents(events.SyncStarted{}))
|
|
||||||
defer syncStartedDone()
|
|
||||||
|
|
||||||
addressCreatedCh, addressCreatedDone := chToType[events.Event, events.UserAddressCreated](bridge.GetEvents(events.UserAddressCreated{}))
|
|
||||||
defer addressCreatedDone()
|
|
||||||
|
|
||||||
userID, err := bridge.LoginFull(ctx, "imap", password, nil, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
require.Equal(t, userID, (<-syncStartedCh).UserID)
|
|
||||||
|
|
||||||
// create 20 more messages and move them to inbox
|
|
||||||
withClient(ctx, t, s, "imap", password, func(ctx context.Context, c *proton.Client) {
|
|
||||||
createNumMessages(ctx, t, c, addrID, proton.InboxLabel, 20)
|
|
||||||
})
|
|
||||||
|
|
||||||
// User AddrID2 event as a check point to see when the new address was created.
|
|
||||||
addrID2, err := s.CreateAddress(userID, "bar@proton.ch", password)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
allowSyncToProgress.Store(true)
|
|
||||||
require.Equal(t, userID, (<-syncCh).UserID)
|
|
||||||
|
|
||||||
// At most two events can be published, one for the first address, then for the second.
|
|
||||||
// if the second event is not `addrID2` then something went wrong.
|
|
||||||
event := <-addressCreatedCh
|
|
||||||
if event.AddressID == addrID1 {
|
|
||||||
event = <-addressCreatedCh
|
|
||||||
}
|
|
||||||
|
|
||||||
require.Equal(t, addrID2, event.AddressID)
|
|
||||||
|
|
||||||
info, err := bridge.GetUserInfo(userID)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
client, err := eventuallyDial(fmt.Sprintf("%v:%v", constants.Host, bridge.GetIMAPPort()))
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.NoError(t, client.Login(info.Addresses[0], string(info.BridgePass)))
|
|
||||||
defer func() { _ = client.Logout() }()
|
|
||||||
|
|
||||||
// Finally check if the 20 messages are in INBOX.
|
|
||||||
status, err := client.Status("INBOX", []imap.StatusItem{imap.StatusMessages})
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.Equal(t, uint32(20), status.Messages)
|
|
||||||
|
|
||||||
// Finally check if the numMsg are in the folder.
|
|
||||||
status, err = client.Status("Folders/folder", []imap.StatusItem{imap.StatusMessages})
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.Equal(t, uint32(numMsg), status.Messages)
|
|
||||||
})
|
|
||||||
}, server.WithTLS(false))
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestBridge_MessageCreateDuringSync(t *testing.T) {
|
|
||||||
numMsg := 1 << 8
|
|
||||||
|
|
||||||
withEnv(t, func(ctx context.Context, s *server.Server, netCtl *proton.NetCtl, locator bridge.Locator, storeKey []byte) {
|
|
||||||
userID, addrID, err := s.CreateUser("imap", password)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
labelID, err := s.CreateLabel(userID, "folder", "", proton.LabelTypeFolder)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
withClient(ctx, t, s, "imap", password, func(ctx context.Context, c *proton.Client) {
|
|
||||||
createNumMessages(ctx, t, c, addrID, labelID, numMsg)
|
|
||||||
})
|
|
||||||
|
|
||||||
var allowSyncToProgress atomic.Bool
|
|
||||||
allowSyncToProgress.Store(false)
|
|
||||||
|
|
||||||
// Simulate 429 to prevent sync from progressing.
|
|
||||||
s.AddStatusHook(func(request *http.Request) (int, bool) {
|
|
||||||
if request.Method == "GET" && strings.Contains(request.URL.Path, "/mail/v4/messages/") {
|
|
||||||
if !allowSyncToProgress.Load() {
|
|
||||||
return http.StatusTooManyRequests, true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0, false
|
|
||||||
})
|
|
||||||
|
|
||||||
// The initial user should be fully synced.
|
|
||||||
withBridge(ctx, t, s.GetHostURL(), netCtl, locator, storeKey, func(bridge *bridge.Bridge, _ *bridge.Mocks) {
|
|
||||||
syncStartedCh, syncStartedDone := chToType[events.Event, events.SyncStarted](bridge.GetEvents(events.SyncStarted{}))
|
|
||||||
defer syncStartedDone()
|
|
||||||
|
|
||||||
addressCreatedCh, addressCreatedDone := chToType[events.Event, events.UserAddressCreated](bridge.GetEvents(events.UserAddressCreated{}))
|
|
||||||
defer addressCreatedDone()
|
|
||||||
|
|
||||||
userID, err := bridge.LoginFull(ctx, "imap", password, nil, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
require.Equal(t, userID, (<-syncStartedCh).UserID)
|
|
||||||
|
|
||||||
// create 20 more messages and move them to inbox
|
|
||||||
withClient(ctx, t, s, "imap", password, func(ctx context.Context, c *proton.Client) {
|
|
||||||
createNumMessages(ctx, t, c, addrID, proton.InboxLabel, 20)
|
|
||||||
})
|
|
||||||
|
|
||||||
// User AddrID2 event as a check point to see when the new address was created.
|
|
||||||
addrID, err := s.CreateAddress(userID, "bar@proton.ch", password)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
// At most two events can be published, one for the first address, then for the second.
|
|
||||||
// if the second event is not `addrID` then something went wrong.
|
|
||||||
event := <-addressCreatedCh
|
|
||||||
require.Equal(t, addrID, event.AddressID)
|
|
||||||
allowSyncToProgress.Store(true)
|
|
||||||
|
|
||||||
info, err := bridge.GetUserInfo(userID)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
client, err := eventuallyDial(fmt.Sprintf("%v:%v", constants.Host, bridge.GetIMAPPort()))
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.NoError(t, client.Login(info.Addresses[0], string(info.BridgePass)))
|
|
||||||
defer func() { _ = client.Logout() }()
|
|
||||||
|
|
||||||
require.Eventually(t, func() bool {
|
|
||||||
// Finally check if the 20 messages are in INBOX.
|
|
||||||
status, err := client.Status("INBOX", []imap.StatusItem{imap.StatusMessages})
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
return uint32(20) == status.Messages
|
|
||||||
}, 10*time.Second, time.Second)
|
|
||||||
})
|
|
||||||
}, server.WithTLS(false))
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestBridge_CorruptedVaultClearsPreviousIMAPSyncState(t *testing.T) {
|
|
||||||
withEnv(t, func(ctx context.Context, s *server.Server, netCtl *proton.NetCtl, locator bridge.Locator, vaultKey []byte) {
|
|
||||||
userID, addrID, err := s.CreateUser("imap", password)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
labelID, err := s.CreateLabel(userID, "folder", "", proton.LabelTypeFolder)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
withClient(ctx, t, s, "imap", password, func(ctx context.Context, c *proton.Client) {
|
|
||||||
createNumMessages(ctx, t, c, addrID, labelID, 100)
|
|
||||||
})
|
|
||||||
|
|
||||||
withBridge(ctx, t, s.GetHostURL(), netCtl, locator, vaultKey, func(bridge *bridge.Bridge, mocks *bridge.Mocks) {
|
|
||||||
syncCh, done := chToType[events.Event, events.SyncFinished](bridge.GetEvents(events.SyncFinished{}))
|
|
||||||
defer done()
|
|
||||||
|
|
||||||
var err error
|
|
||||||
|
|
||||||
userID, err = bridge.LoginFull(context.Background(), "imap", password, nil, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
// Wait for sync to finish
|
|
||||||
require.Equal(t, userID, (<-syncCh).UserID)
|
|
||||||
})
|
|
||||||
|
|
||||||
settingsPath, err := locator.ProvideSettingsPath()
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
syncConfigPath, err := locator.ProvideIMAPSyncConfigPath()
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
syncStatePath := imapservice.GetSyncConfigPath(syncConfigPath, userID)
|
|
||||||
// Check sync state is complete
|
|
||||||
{
|
|
||||||
state, err := imapservice.NewSyncState(syncStatePath)
|
|
||||||
require.NoError(t, err)
|
|
||||||
syncStatus, err := state.GetSyncStatus(context.Background())
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.True(t, syncStatus.IsComplete())
|
|
||||||
}
|
|
||||||
|
|
||||||
// corrupt the vault
|
|
||||||
require.NoError(t, os.WriteFile(filepath.Join(settingsPath, "vault.enc"), []byte("Trash!"), 0o600))
|
|
||||||
|
|
||||||
// Bridge starts but can't find the gluon database dir; there should be no error.
|
|
||||||
withBridge(ctx, t, s.GetHostURL(), netCtl, locator, vaultKey, func(bridge *bridge.Bridge, mocks *bridge.Mocks) {
|
|
||||||
_, err := bridge.LoginFull(context.Background(), "imap", password, nil, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
})
|
|
||||||
|
|
||||||
// Check sync state is reset.
|
|
||||||
{
|
|
||||||
state, err := imapservice.NewSyncState(syncStatePath)
|
|
||||||
require.NoError(t, err)
|
|
||||||
syncStatus, err := state.GetSyncStatus(context.Background())
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.False(t, syncStatus.IsComplete())
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestBridge_AddressOrderChangeDuringSyncInCombinedModeDoesNotTriggerBadEventOnNewMessage(t *testing.T) {
|
|
||||||
withEnv(t, func(ctx context.Context, s *server.Server, netCtl *proton.NetCtl, locator bridge.Locator, storeKey []byte) {
|
|
||||||
// Create a user.
|
|
||||||
userID, addrID, err := s.CreateUser("user", password)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
withBridge(ctx, t, s.GetHostURL(), netCtl, locator, storeKey, func(bridge *bridge.Bridge, _ *bridge.Mocks) {
|
|
||||||
userInfoChanged, done := chToType[events.Event, events.UserChanged](bridge.GetEvents(events.UserChanged{}))
|
|
||||||
defer done()
|
|
||||||
|
|
||||||
withClient(ctx, t, s, "user", password, func(ctx context.Context, c *proton.Client) {
|
|
||||||
createNumMessages(ctx, t, c, addrID, proton.InboxLabel, 300)
|
|
||||||
})
|
|
||||||
|
|
||||||
_, err := bridge.LoginFull(ctx, "user", password, nil, nil)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
info, err := bridge.GetUserInfo(userID)
|
|
||||||
require.NoError(t, err)
|
|
||||||
require.Equal(t, 1, len(info.Addresses))
|
|
||||||
require.Equal(t, info.Addresses[0], "user@proton.local")
|
|
||||||
|
|
||||||
addrID2, err := s.CreateAddress(userID, "foo@"+s.GetDomain(), password)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
require.NoError(t, s.SetAddressOrder(userID, []string{addrID2, addrID}))
|
|
||||||
|
|
||||||
withClient(ctx, t, s, "user", password, func(ctx context.Context, c *proton.Client) {
|
|
||||||
createNumMessages(ctx, t, c, addrID2, proton.InboxLabel, 1)
|
|
||||||
})
|
|
||||||
|
|
||||||
// Since we can't intercept events at this time, we sleep for a bit to make sure the
|
|
||||||
// new message does not get combined into the event below. This ensures the newly created
|
|
||||||
// goes through the full code flow which triggered the original bad event.
|
|
||||||
time.Sleep(time.Second)
|
|
||||||
require.NoError(t, s.SetAddressOrder(userID, []string{addrID, addrID2}))
|
|
||||||
|
|
||||||
for i := 0; i < 2; i++ {
|
|
||||||
select {
|
|
||||||
case <-ctx.Done():
|
|
||||||
return
|
|
||||||
case e := <-userInfoChanged:
|
|
||||||
require.Equal(t, userID, e.UserID)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
func withClient(ctx context.Context, t *testing.T, s *server.Server, username string, password []byte, fn func(context.Context, *proton.Client)) { //nolint:unparam
|
func withClient(ctx context.Context, t *testing.T, s *server.Server, username string, password []byte, fn func(context.Context, *proton.Client)) { //nolint:unparam
|
||||||
m := proton.New(
|
m := proton.New(
|
||||||
proton.WithHostURL(s.GetHostURL()),
|
proton.WithHostURL(s.GetHostURL()),
|
||||||
|
|||||||
@ -31,7 +31,7 @@ import (
|
|||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Disabled due to flakiness.
|
// Disabled due to flakyness.
|
||||||
func _TestBridge_SyncExistsWithErrorWhenTooManyFilesAreOpen(t *testing.T) { //nolint:unused
|
func _TestBridge_SyncExistsWithErrorWhenTooManyFilesAreOpen(t *testing.T) { //nolint:unused
|
||||||
var rlimitCurrent syscall.Rlimit
|
var rlimitCurrent syscall.Rlimit
|
||||||
|
|
||||||
|
|||||||
@ -32,7 +32,15 @@ type Locator interface {
|
|||||||
GetLicenseFilePath() string
|
GetLicenseFilePath() string
|
||||||
GetDependencyLicensesLink() string
|
GetDependencyLicensesLink() string
|
||||||
Clear(...string) error
|
Clear(...string) error
|
||||||
ProvideIMAPSyncConfigPath() (string, error)
|
}
|
||||||
|
|
||||||
|
type Identifier interface {
|
||||||
|
GetUserAgent() string
|
||||||
|
HasClient() bool
|
||||||
|
SetClient(name, version string)
|
||||||
|
SetPlatform(platform string)
|
||||||
|
SetClientString(client string)
|
||||||
|
GetClientString() string
|
||||||
}
|
}
|
||||||
|
|
||||||
type ProxyController interface {
|
type ProxyController interface {
|
||||||
@ -53,5 +61,4 @@ type Autostarter interface {
|
|||||||
type Updater interface {
|
type Updater interface {
|
||||||
GetVersionInfo(context.Context, updater.Downloader, updater.Channel) (updater.VersionInfo, error)
|
GetVersionInfo(context.Context, updater.Downloader, updater.Channel) (updater.VersionInfo, error)
|
||||||
InstallUpdate(context.Context, updater.Downloader, updater.VersionInfo) error
|
InstallUpdate(context.Context, updater.Downloader, updater.VersionInfo) error
|
||||||
RemoveOldUpdates() error
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -139,9 +139,3 @@ func (bridge *Bridge) installUpdate(ctx context.Context, job installJob) {
|
|||||||
}
|
}
|
||||||
}, bridge.newVersionLock)
|
}, bridge.newVersionLock)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (bridge *Bridge) RemoveOldUpdates() {
|
|
||||||
if err := bridge.updater.RemoveOldUpdates(); err != nil {
|
|
||||||
logrus.WithError(err).Error("Remove old updates fails")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@ -30,7 +30,6 @@ import (
|
|||||||
"github.com/ProtonMail/proton-bridge/v3/internal/events"
|
"github.com/ProtonMail/proton-bridge/v3/internal/events"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/logging"
|
"github.com/ProtonMail/proton-bridge/v3/internal/logging"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/safe"
|
"github.com/ProtonMail/proton-bridge/v3/internal/safe"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/services/imapservice"
|
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/try"
|
"github.com/ProtonMail/proton-bridge/v3/internal/try"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/user"
|
"github.com/ProtonMail/proton-bridge/v3/internal/user"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/vault"
|
"github.com/ProtonMail/proton-bridge/v3/internal/vault"
|
||||||
@ -46,8 +45,6 @@ const (
|
|||||||
Connected
|
Connected
|
||||||
)
|
)
|
||||||
|
|
||||||
var ErrFailedToUnlock = errors.New("failed to unlock user keys")
|
|
||||||
|
|
||||||
type UserInfo struct {
|
type UserInfo struct {
|
||||||
// UserID is the user's API ID.
|
// UserID is the user's API ID.
|
||||||
UserID string
|
UserID string
|
||||||
@ -68,10 +65,10 @@ type UserInfo struct {
|
|||||||
BridgePass []byte
|
BridgePass []byte
|
||||||
|
|
||||||
// UsedSpace is the amount of space used by the user.
|
// UsedSpace is the amount of space used by the user.
|
||||||
UsedSpace uint64
|
UsedSpace int
|
||||||
|
|
||||||
// MaxSpace is the total amount of space available to the user.
|
// MaxSpace is the total amount of space available to the user.
|
||||||
MaxSpace uint64
|
MaxSpace int
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetUserIDs returns the IDs of all known users (authorized or not).
|
// GetUserIDs returns the IDs of all known users (authorized or not).
|
||||||
@ -159,15 +156,11 @@ func (bridge *Bridge) LoginUser(
|
|||||||
func() (string, error) {
|
func() (string, error) {
|
||||||
return bridge.loginUser(ctx, client, auth.UID, auth.RefreshToken, keyPass)
|
return bridge.loginUser(ctx, client, auth.UID, auth.RefreshToken, keyPass)
|
||||||
},
|
},
|
||||||
|
func() error {
|
||||||
|
return client.AuthDelete(ctx)
|
||||||
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
// Failure to unlock will allow retries, so we do not delete auth.
|
|
||||||
if !errors.Is(err, ErrFailedToUnlock) {
|
|
||||||
if deleteErr := client.AuthDelete(ctx); deleteErr != nil {
|
|
||||||
logrus.WithError(deleteErr).Error("Failed to delete auth")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return "", fmt.Errorf("failed to login user: %w", err)
|
return "", fmt.Errorf("failed to login user: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -223,16 +216,7 @@ func (bridge *Bridge) LoginFull(
|
|||||||
keyPass = password
|
keyPass = password
|
||||||
}
|
}
|
||||||
|
|
||||||
userID, err := bridge.LoginUser(ctx, client, auth, keyPass)
|
return bridge.LoginUser(ctx, client, auth, keyPass)
|
||||||
if err != nil {
|
|
||||||
if deleteErr := client.AuthDelete(ctx); deleteErr != nil {
|
|
||||||
logrus.WithError(err).Error("Failed to delete auth")
|
|
||||||
}
|
|
||||||
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
|
|
||||||
return userID, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// LogoutUser logs out the given user.
|
// LogoutUser logs out the given user.
|
||||||
@ -259,11 +243,6 @@ func (bridge *Bridge) LogoutUser(ctx context.Context, userID string) error {
|
|||||||
func (bridge *Bridge) DeleteUser(ctx context.Context, userID string) error {
|
func (bridge *Bridge) DeleteUser(ctx context.Context, userID string) error {
|
||||||
logrus.WithField("userID", userID).Info("Deleting user")
|
logrus.WithField("userID", userID).Info("Deleting user")
|
||||||
|
|
||||||
syncConfigDir, err := bridge.locator.ProvideIMAPSyncConfigPath()
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("failed to get sync config path")
|
|
||||||
}
|
|
||||||
|
|
||||||
return safe.LockRet(func() error {
|
return safe.LockRet(func() error {
|
||||||
if !bridge.vault.HasUser(userID) {
|
if !bridge.vault.HasUser(userID) {
|
||||||
return ErrNoSuchUser
|
return ErrNoSuchUser
|
||||||
@ -273,10 +252,6 @@ func (bridge *Bridge) DeleteUser(ctx context.Context, userID string) error {
|
|||||||
bridge.logoutUser(ctx, user, true, true, !bridge.GetTelemetryDisabled())
|
bridge.logoutUser(ctx, user, true, true, !bridge.GetTelemetryDisabled())
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := imapservice.DeleteSyncState(syncConfigDir, userID); err != nil {
|
|
||||||
return fmt.Errorf("failed to delete use sync config")
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := bridge.vault.DeleteUser(userID); err != nil {
|
if err := bridge.vault.DeleteUser(userID); err != nil {
|
||||||
logrus.WithError(err).Error("Failed to delete vault user")
|
logrus.WithError(err).Error("Failed to delete vault user")
|
||||||
}
|
}
|
||||||
@ -303,10 +278,18 @@ func (bridge *Bridge) SetAddressMode(ctx context.Context, userID string, mode va
|
|||||||
return fmt.Errorf("address mode is already %q", mode)
|
return fmt.Errorf("address mode is already %q", mode)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if err := bridge.removeIMAPUser(ctx, user, true); err != nil {
|
||||||
|
return fmt.Errorf("failed to remove IMAP user: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
if err := user.SetAddressMode(ctx, mode); err != nil {
|
if err := user.SetAddressMode(ctx, mode); err != nil {
|
||||||
return fmt.Errorf("failed to set address mode: %w", err)
|
return fmt.Errorf("failed to set address mode: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if err := bridge.addIMAPUser(ctx, user); err != nil {
|
||||||
|
return fmt.Errorf("failed to add IMAP user: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
bridge.publish(events.AddressModeChanged{
|
bridge.publish(events.AddressModeChanged{
|
||||||
UserID: userID,
|
UserID: userID,
|
||||||
AddressMode: mode,
|
AddressMode: mode,
|
||||||
@ -329,7 +312,7 @@ func (bridge *Bridge) SetAddressMode(ctx context.Context, userID string, mode va
|
|||||||
func (bridge *Bridge) SendBadEventUserFeedback(_ context.Context, userID string, doResync bool) error {
|
func (bridge *Bridge) SendBadEventUserFeedback(_ context.Context, userID string, doResync bool) error {
|
||||||
logrus.WithField("userID", userID).WithField("doResync", doResync).Info("Passing bad event feedback to user")
|
logrus.WithField("userID", userID).WithField("doResync", doResync).Info("Passing bad event feedback to user")
|
||||||
|
|
||||||
return safe.RLockRet(func() error {
|
return safe.LockRet(func() error {
|
||||||
ctx := context.Background()
|
ctx := context.Background()
|
||||||
|
|
||||||
user, ok := bridge.users[userID]
|
user, ok := bridge.users[userID]
|
||||||
@ -352,7 +335,13 @@ func (bridge *Bridge) SendBadEventUserFeedback(_ context.Context, userID string,
|
|||||||
logrus.WithError(rerr).Error("Failed to report feedback failure")
|
logrus.WithError(rerr).Error("Failed to report feedback failure")
|
||||||
}
|
}
|
||||||
|
|
||||||
return user.BadEventFeedbackResync(ctx)
|
if err := bridge.addIMAPUser(ctx, user); err != nil {
|
||||||
|
return fmt.Errorf("failed to add IMAP user: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
user.BadEventFeedbackResync(ctx)
|
||||||
|
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
if rerr := bridge.reporter.ReportMessageWithContext(
|
if rerr := bridge.reporter.ReportMessageWithContext(
|
||||||
@ -389,9 +378,9 @@ func (bridge *Bridge) loginUser(ctx context.Context, client *proton.Client, auth
|
|||||||
}
|
}
|
||||||
|
|
||||||
if userKR, err := apiUser.Keys.Unlock(saltedKeyPass, nil); err != nil {
|
if userKR, err := apiUser.Keys.Unlock(saltedKeyPass, nil); err != nil {
|
||||||
return "", fmt.Errorf("%w: %w", ErrFailedToUnlock, err)
|
return "", fmt.Errorf("failed to unlock user keys: %w", err)
|
||||||
} else if userKR.CountDecryptionEntities() == 0 {
|
} else if userKR.CountDecryptionEntities() == 0 {
|
||||||
return "", ErrFailedToUnlock
|
return "", fmt.Errorf("failed to unlock user keys")
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := bridge.addUser(ctx, client, apiUser, authUID, authRef, saltedKeyPass, true); err != nil {
|
if err := bridge.addUser(ctx, client, apiUser, authUID, authRef, saltedKeyPass, true); err != nil {
|
||||||
@ -494,7 +483,7 @@ func (bridge *Bridge) addUser(
|
|||||||
return fmt.Errorf("failed to add vault user: %w", err)
|
return fmt.Errorf("failed to add vault user: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := bridge.addUserWithVault(ctx, client, apiUser, vaultUser, isNew); err != nil {
|
if err := bridge.addUserWithVault(ctx, client, apiUser, vaultUser); err != nil {
|
||||||
if _, ok := err.(*resty.ResponseError); ok || isLogin {
|
if _, ok := err.(*resty.ResponseError); ok || isLogin {
|
||||||
logrus.WithError(err).Error("Failed to add user, clearing its secrets from vault")
|
logrus.WithError(err).Error("Failed to add user, clearing its secrets from vault")
|
||||||
|
|
||||||
@ -529,17 +518,14 @@ func (bridge *Bridge) addUserWithVault(
|
|||||||
client *proton.Client,
|
client *proton.Client,
|
||||||
apiUser proton.User,
|
apiUser proton.User,
|
||||||
vault *vault.User,
|
vault *vault.User,
|
||||||
isNew bool,
|
|
||||||
) error {
|
) error {
|
||||||
statsPath, err := bridge.locator.ProvideStatsPath()
|
statsPath, err := bridge.locator.ProvideStatsPath()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("failed to get Statistics directory: %w", err)
|
return fmt.Errorf("failed to get Statistics directory: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
syncSettingsPath, err := bridge.locator.ProvideIMAPSyncConfigPath()
|
// re-set SyncStatus if database need to be re-synced for migration.
|
||||||
if err != nil {
|
bridge.migrateUser(vault)
|
||||||
return fmt.Errorf("failed to get IMAP sync config path: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
user, err := user.New(
|
user, err := user.New(
|
||||||
ctx,
|
ctx,
|
||||||
@ -552,17 +538,16 @@ func (bridge *Bridge) addUserWithVault(
|
|||||||
bridge.vault.GetMaxSyncMemory(),
|
bridge.vault.GetMaxSyncMemory(),
|
||||||
statsPath,
|
statsPath,
|
||||||
bridge,
|
bridge,
|
||||||
bridge.serverManager,
|
|
||||||
bridge.serverManager,
|
|
||||||
&bridgeEventSubscription{b: bridge},
|
|
||||||
bridge.syncService,
|
|
||||||
syncSettingsPath,
|
|
||||||
isNew,
|
|
||||||
)
|
)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("failed to create user: %w", err)
|
return fmt.Errorf("failed to create user: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Connect the user's address(es) to gluon.
|
||||||
|
if err := bridge.addIMAPUser(ctx, user); err != nil {
|
||||||
|
return fmt.Errorf("failed to add IMAP user: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
// Handle events coming from the user before forwarding them to the bridge.
|
// Handle events coming from the user before forwarding them to the bridge.
|
||||||
// For example, if the user's addresses change, we need to update them in gluon.
|
// For example, if the user's addresses change, we need to update them in gluon.
|
||||||
bridge.tasks.Once(func(ctx context.Context) {
|
bridge.tasks.Once(func(ctx context.Context) {
|
||||||
@ -572,8 +557,11 @@ func (bridge *Bridge) addUserWithVault(
|
|||||||
"event": event,
|
"event": event,
|
||||||
}).Debug("Received user event")
|
}).Debug("Received user event")
|
||||||
|
|
||||||
bridge.handleUserEvent(ctx, user, event)
|
if err := bridge.handleUserEvent(ctx, user, event); err != nil {
|
||||||
bridge.publish(event)
|
logrus.WithError(err).Error("Failed to handle user event")
|
||||||
|
} else {
|
||||||
|
bridge.publish(event)
|
||||||
|
}
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
@ -594,7 +582,7 @@ func (bridge *Bridge) addUserWithVault(
|
|||||||
}, bridge.usersLock)
|
}, bridge.usersLock)
|
||||||
|
|
||||||
// As we need at least one user to send heartbeat, try to send it.
|
// As we need at least one user to send heartbeat, try to send it.
|
||||||
bridge.heartbeat.start()
|
defer bridge.goHeartbeat()
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
@ -624,6 +612,10 @@ func (bridge *Bridge) logoutUser(ctx context.Context, user *user.User, withAPI,
|
|||||||
"withData": withData,
|
"withData": withData,
|
||||||
}).Debug("Logging out user")
|
}).Debug("Logging out user")
|
||||||
|
|
||||||
|
if err := bridge.removeIMAPUser(ctx, user, withData); err != nil {
|
||||||
|
logrus.WithError(err).Error("Failed to remove IMAP user")
|
||||||
|
}
|
||||||
|
|
||||||
if err := user.Logout(ctx, withAPI); err != nil {
|
if err := user.Logout(ctx, withAPI); err != nil {
|
||||||
logrus.WithError(err).Error("Failed to logout user")
|
logrus.WithError(err).Error("Failed to logout user")
|
||||||
}
|
}
|
||||||
|
|||||||
@ -19,17 +19,44 @@ package bridge
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"fmt"
|
||||||
|
|
||||||
"github.com/ProtonMail/gluon/reporter"
|
"github.com/ProtonMail/gluon/reporter"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal"
|
"github.com/ProtonMail/proton-bridge/v3/internal"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/events"
|
"github.com/ProtonMail/proton-bridge/v3/internal/events"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/safe"
|
"github.com/ProtonMail/proton-bridge/v3/internal/safe"
|
||||||
"github.com/ProtonMail/proton-bridge/v3/internal/user"
|
"github.com/ProtonMail/proton-bridge/v3/internal/user"
|
||||||
|
"github.com/ProtonMail/proton-bridge/v3/internal/vault"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
|
|
||||||
func (bridge *Bridge) handleUserEvent(ctx context.Context, user *user.User, event events.Event) {
|
func (bridge *Bridge) handleUserEvent(ctx context.Context, user *user.User, event events.Event) error {
|
||||||
switch event := event.(type) {
|
switch event := event.(type) {
|
||||||
|
case events.UserAddressCreated:
|
||||||
|
if err := bridge.handleUserAddressCreated(ctx, user, event); err != nil {
|
||||||
|
return fmt.Errorf("failed to handle user address created event: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
case events.UserAddressEnabled:
|
||||||
|
if err := bridge.handleUserAddressEnabled(ctx, user, event); err != nil {
|
||||||
|
return fmt.Errorf("failed to handle user address enabled event: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
case events.UserAddressDisabled:
|
||||||
|
if err := bridge.handleUserAddressDisabled(ctx, user, event); err != nil {
|
||||||
|
return fmt.Errorf("failed to handle user address disabled event: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
case events.UserAddressDeleted:
|
||||||
|
if err := bridge.handleUserAddressDeleted(ctx, user, event); err != nil {
|
||||||
|
return fmt.Errorf("failed to handle user address deleted event: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
case events.UserRefreshed:
|
||||||
|
if err := bridge.handleUserRefreshed(ctx, user, event); err != nil {
|
||||||
|
return fmt.Errorf("failed to handle user refreshed event: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
case events.UserDeauth:
|
case events.UserDeauth:
|
||||||
bridge.handleUserDeauth(ctx, user)
|
bridge.handleUserDeauth(ctx, user)
|
||||||
|
|
||||||
@ -39,6 +66,102 @@ func (bridge *Bridge) handleUserEvent(ctx context.Context, user *user.User, even
|
|||||||
case events.UncategorizedEventError:
|
case events.UncategorizedEventError:
|
||||||
bridge.handleUncategorizedErrorEvent(event)
|
bridge.handleUncategorizedErrorEvent(event)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (bridge *Bridge) handleUserAddressCreated(ctx context.Context, user *user.User, event events.UserAddressCreated) error {
|
||||||
|
if user.GetAddressMode() == vault.CombinedMode {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
gluonID, err := bridge.serverManager.AddGluonUser(ctx, user.NewIMAPConnector(event.AddressID), user.GluonKey())
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to add user to IMAP server: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := user.SetGluonID(event.AddressID, gluonID); err != nil {
|
||||||
|
return fmt.Errorf("failed to set gluon ID: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (bridge *Bridge) handleUserAddressEnabled(ctx context.Context, user *user.User, event events.UserAddressEnabled) error {
|
||||||
|
if user.GetAddressMode() == vault.CombinedMode {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
gluonID, err := bridge.serverManager.AddGluonUser(ctx, user.NewIMAPConnector(event.AddressID), user.GluonKey())
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to add user to IMAP server: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := user.SetGluonID(event.AddressID, gluonID); err != nil {
|
||||||
|
return fmt.Errorf("failed to set gluon ID: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (bridge *Bridge) handleUserAddressDisabled(ctx context.Context, user *user.User, event events.UserAddressDisabled) error {
|
||||||
|
if user.GetAddressMode() == vault.CombinedMode {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
gluonID, ok := user.GetGluonID(event.AddressID)
|
||||||
|
if !ok {
|
||||||
|
return fmt.Errorf("gluon ID not found for address %s", event.AddressID)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := bridge.serverManager.RemoveGluonUser(ctx, gluonID); err != nil {
|
||||||
|
return fmt.Errorf("failed to remove user from IMAP server: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := user.RemoveGluonID(event.AddressID, gluonID); err != nil {
|
||||||
|
return fmt.Errorf("failed to remove gluon ID for address: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (bridge *Bridge) handleUserAddressDeleted(ctx context.Context, user *user.User, event events.UserAddressDeleted) error {
|
||||||
|
if user.GetAddressMode() == vault.CombinedMode {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
gluonID, ok := user.GetGluonID(event.AddressID)
|
||||||
|
if !ok {
|
||||||
|
return fmt.Errorf("gluon ID not found for address %s", event.AddressID)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := bridge.serverManager.handleRemoveGluonUser(ctx, gluonID); err != nil {
|
||||||
|
return fmt.Errorf("failed to remove user from IMAP server: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := user.RemoveGluonID(event.AddressID, gluonID); err != nil {
|
||||||
|
return fmt.Errorf("failed to remove gluon ID for address: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (bridge *Bridge) handleUserRefreshed(ctx context.Context, user *user.User, event events.UserRefreshed) error {
|
||||||
|
return safe.RLockRet(func() error {
|
||||||
|
if event.CancelEventPool {
|
||||||
|
user.CancelSyncAndEventPoll()
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := bridge.removeIMAPUser(ctx, user, true); err != nil {
|
||||||
|
return fmt.Errorf("failed to remove IMAP user: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := bridge.addIMAPUser(ctx, user); err != nil {
|
||||||
|
return fmt.Errorf("failed to add IMAP user: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}, bridge.usersLock)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (bridge *Bridge) handleUserDeauth(ctx context.Context, user *user.User) {
|
func (bridge *Bridge) handleUserDeauth(ctx context.Context, user *user.User) {
|
||||||
@ -48,8 +171,8 @@ func (bridge *Bridge) handleUserDeauth(ctx context.Context, user *user.User) {
|
|||||||
}, bridge.usersLock)
|
}, bridge.usersLock)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (bridge *Bridge) handleUserBadEvent(ctx context.Context, user *user.User, event events.UserBadEvent) {
|
func (bridge *Bridge) handleUserBadEvent(_ context.Context, user *user.User, event events.UserBadEvent) {
|
||||||
safe.RLock(func() {
|
safe.Lock(func() {
|
||||||
if rerr := bridge.reporter.ReportMessageWithContext("Failed to handle event", reporter.Context{
|
if rerr := bridge.reporter.ReportMessageWithContext("Failed to handle event", reporter.Context{
|
||||||
"user_id": user.ID(),
|
"user_id": user.ID(),
|
||||||
"old_event_id": event.OldEventID,
|
"old_event_id": event.OldEventID,
|
||||||
@ -61,7 +184,12 @@ func (bridge *Bridge) handleUserBadEvent(ctx context.Context, user *user.User, e
|
|||||||
logrus.WithError(rerr).Error("Failed to report failed event handling")
|
logrus.WithError(rerr).Error("Failed to report failed event handling")
|
||||||
}
|
}
|
||||||
|
|
||||||
user.OnBadEvent(ctx)
|
user.CancelSyncAndEventPoll()
|
||||||
|
|
||||||
|
// Disable IMAP user
|
||||||
|
if err := bridge.removeIMAPUser(context.Background(), user, false); err != nil {
|
||||||
|
logrus.WithError(err).Error("Failed to remove IMAP user")
|
||||||
|
}
|
||||||
}, bridge.usersLock)
|
}, bridge.usersLock)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -23,200 +23,71 @@ package certs
|
|||||||
#import <Foundation/Foundation.h>
|
#import <Foundation/Foundation.h>
|
||||||
#import <Security/Security.h>
|
#import <Security/Security.h>
|
||||||
|
|
||||||
// Memory management rules:
|
|
||||||
// Foundation object (Objective-C prefixed with `NS`) get ARC (Automatic Reference Counting), and do not need to be released manually.
|
|
||||||
// Core Foundation objects (C), prefixed with need to be released manually using CFRelease() unless:
|
|
||||||
// - They're obtained using a CF method containing the word Get (a.k.a. the Get Rule).
|
|
||||||
// - They're obtained using toll-free bridging from a Foundation Object (using the __bridge keyword).
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
int installTrustedCert(char const *bytes, unsigned long long length) {
|
||||||
/// \brief Create a certificate object from DER-encoded data.
|
if (length == 0) {
|
||||||
///
|
return errSecInvalidData;
|
||||||
/// \return The certifcation. The caller is responsible for releasing the object using CFRelease.
|
}
|
||||||
/// \return NULL if data is not a valid DER-encoded certificate.
|
|
||||||
//****************************************************************************************************************************************************
|
NSData *der = [NSData dataWithBytes:bytes length:length];
|
||||||
SecCertificateRef certFromData(char const* data, uint64_t length) {
|
|
||||||
NSData *der = [NSData dataWithBytes:data length:length];
|
// Step 1. Import the certificate in the keychain.
|
||||||
return SecCertificateCreateWithData(NULL, (__bridge CFDataRef)der);
|
SecCertificateRef cert = SecCertificateCreateWithData(NULL, (CFDataRef) der);
|
||||||
|
NSDictionary* addQuery = @{
|
||||||
|
(id)kSecValueRef: (__bridge id) cert,
|
||||||
|
(id)kSecClass: (id)kSecClassCertificate,
|
||||||
|
};
|
||||||
|
|
||||||
|
OSStatus status = SecItemAdd((__bridge CFDictionaryRef) addQuery, NULL);
|
||||||
|
if ((errSecSuccess != status) && (errSecDuplicateItem != status)) {
|
||||||
|
CFRelease(cert);
|
||||||
|
return status;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Step 2. Set the trust for the certificate.
|
||||||
|
SecPolicyRef policy = SecPolicyCreateSSL(true, NULL); // we limit our trust to SSL
|
||||||
|
NSDictionary *trustSettings = @{
|
||||||
|
(id)kSecTrustSettingsResult: [NSNumber numberWithInt:kSecTrustSettingsResultTrustRoot],
|
||||||
|
(id)kSecTrustSettingsPolicy: (__bridge id) policy,
|
||||||
|
};
|
||||||
|
status = SecTrustSettingsSetTrustSettings(cert, kSecTrustSettingsDomainUser, (__bridge CFTypeRef)(trustSettings));
|
||||||
|
CFRelease(policy);
|
||||||
|
CFRelease(cert);
|
||||||
|
|
||||||
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
int removeTrustedCert(char const *bytes, unsigned long long length) {
|
||||||
/// \brief Check if a certificate is in the user's keychain.
|
if (0 == length) {
|
||||||
///
|
return errSecInvalidData;
|
||||||
/// \param[in] cert The certificate.
|
}
|
||||||
/// \return true iff the certificate is in the user's keychain.
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
bool _isCertificateInKeychain(SecCertificateRef const cert) {
|
|
||||||
NSDictionary *attrs = @{
|
|
||||||
(id)kSecMatchItemList: @[(__bridge id)cert],
|
|
||||||
(id)kSecClass: (id)kSecClassCertificate,
|
|
||||||
(id)kSecReturnData: @YES
|
|
||||||
};
|
|
||||||
return errSecSuccess == SecItemCopyMatching((__bridge CFDictionaryRef)attrs, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
NSData *der = [NSData dataWithBytes: bytes length: length];
|
||||||
/// \brief Check if a certificate is in the user's keychain.
|
SecCertificateRef cert = SecCertificateCreateWithData(NULL, (CFDataRef) der);
|
||||||
///
|
|
||||||
/// \param[in] certData The certificate data in DER encoded format.
|
|
||||||
/// \param[in] certSize The size of the certData in bytes.
|
|
||||||
/// \return true iff the certificate is in the user's keychain.
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
bool isCertificateInKeychain(char const* certData, uint64_t certSize) {
|
|
||||||
return _isCertificateInKeychain(certFromData(certData, certSize));
|
|
||||||
}
|
|
||||||
|
|
||||||
|
// Step 1. Unset the trust for the certificate.
|
||||||
|
SecPolicyRef policy = SecPolicyCreateSSL(true, NULL);
|
||||||
|
NSDictionary * trustSettings = @{
|
||||||
|
(id)kSecTrustSettingsResult: [NSNumber numberWithInt:kSecTrustSettingsResultUnspecified],
|
||||||
|
(id)kSecTrustSettingsPolicy: (__bridge id) policy,
|
||||||
|
};
|
||||||
|
OSStatus status = SecTrustSettingsSetTrustSettings(cert, kSecTrustSettingsDomainUser, (__bridge CFTypeRef)(trustSettings));
|
||||||
|
CFRelease(policy);
|
||||||
|
if (errSecSuccess != status) {
|
||||||
|
CFRelease(cert);
|
||||||
|
return status;
|
||||||
|
}
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
// Step 2. Remove the certificate from the keychain.
|
||||||
/// \brief Add a certificate to the user's keychain.
|
NSDictionary *query = @{ (id)kSecClass: (id)kSecClassCertificate,
|
||||||
///
|
(id)kSecMatchItemList: @[(__bridge id)cert],
|
||||||
/// \param[in] cert The certificate.
|
(id)kSecMatchLimit: (id)kSecMatchLimitOne,
|
||||||
/// \return The status for the operation.
|
};
|
||||||
//****************************************************************************************************************************************************
|
status = SecItemDelete((__bridge CFDictionaryRef) query);
|
||||||
OSStatus _addCertificateToKeychain(SecCertificateRef const cert) {
|
|
||||||
NSDictionary* addQuery = @{
|
|
||||||
(id)kSecValueRef: (__bridge id) cert,
|
|
||||||
(id)kSecClass: (id)kSecClassCertificate,
|
|
||||||
};
|
|
||||||
return SecItemAdd((__bridge CFDictionaryRef) addQuery, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
CFRelease(cert);
|
||||||
/// \brief Add a certificate to the user's keychain.
|
return status;
|
||||||
///
|
|
||||||
/// \param[in] certData The certificate data in DER encoded format.
|
|
||||||
/// \param[in] certSize The size of the certData in bytes.
|
|
||||||
/// \return The status for the operation.
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
OSStatus addCertificateToKeychain(char const* certData, uint64_t certSize) {
|
|
||||||
return _addCertificateToKeychain(certFromData(certData, certSize));
|
|
||||||
}
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
/// \brief Add a certificate to the user's keychain.
|
|
||||||
///
|
|
||||||
/// \param[in] cert The certificate.
|
|
||||||
/// \return The status for the operation.
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
OSStatus _removeCertificateFromKeychain(SecCertificateRef const cert) {
|
|
||||||
NSDictionary *query = @{ (id)kSecClass: (id)kSecClassCertificate,
|
|
||||||
(id)kSecMatchItemList: @[(__bridge id)cert],
|
|
||||||
(id)kSecMatchLimit: (id)kSecMatchLimitOne,
|
|
||||||
};
|
|
||||||
return SecItemDelete((__bridge CFDictionaryRef) query);
|
|
||||||
}
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
/// \brief Add a certificate to the user's keychain.
|
|
||||||
///
|
|
||||||
/// \param[in] certData The certificate data in DER encoded format.
|
|
||||||
/// \param[in] certSize The size of the certData in bytes.
|
|
||||||
/// \return The status for the operation.
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
OSStatus removeCertificateFromKeychain(char const* certData, uint64_t certSize) {
|
|
||||||
return _removeCertificateFromKeychain(certFromData(certData, certSize));
|
|
||||||
}
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
/// \brief Check if a certificate is trusted in the user's keychain.
|
|
||||||
///
|
|
||||||
/// \param[in] cert The certificate.
|
|
||||||
/// \return true iff the certificate is trusted in the user's keychain.
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
bool _isCertificateTrusted(SecCertificateRef const cert) {
|
|
||||||
CFArrayRef trustSettings = NULL;
|
|
||||||
OSStatus status = SecTrustSettingsCopyTrustSettings(cert, kSecTrustSettingsDomainUser, &trustSettings);
|
|
||||||
if (status != errSecSuccess) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
CFIndex count = CFArrayGetCount(trustSettings);
|
|
||||||
bool result = false;
|
|
||||||
for (CFIndex index = 0; index < count; ++index) {
|
|
||||||
CFDictionaryRef dict = (CFDictionaryRef)CFArrayGetValueAtIndex(trustSettings, index);
|
|
||||||
if (!dict) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
CFNumberRef num = (CFNumberRef)CFDictionaryGetValue(dict, kSecTrustSettingsResult);
|
|
||||||
int value;
|
|
||||||
if (num && CFNumberGetValue(num, kCFNumberSInt32Type, &value) && (value == kSecTrustSettingsResultTrustRoot)) {
|
|
||||||
result = true;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
CFRelease(trustSettings);
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
/// \brief Check if a certificate is trusted in the user's keychain.
|
|
||||||
///
|
|
||||||
/// \param[in] certData The certificate data in DER encoded format.
|
|
||||||
/// \param[in] certSize The size of the certData in bytes.
|
|
||||||
/// \return true iff the certificate is trusted in the user's keychain.
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
bool isCertificateTrusted(char const* certData, uint64_t certSize) {
|
|
||||||
return _isCertificateTrusted(certFromData(certData, certSize));
|
|
||||||
}
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
/// \brief Set the trust level for a certificate in the user's keychain. This call will trigger a security prompt.
|
|
||||||
///
|
|
||||||
/// \param[in] cert The certificate.
|
|
||||||
/// \param[in] trustLevel The trust level.
|
|
||||||
/// \return The status for the operation.
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
OSStatus _setCertificateTrustLevel(SecCertificateRef const cert, int trustLevel) {
|
|
||||||
SecPolicyRef policy = SecPolicyCreateSSL(true, NULL); // we limit our trust to SSL
|
|
||||||
NSDictionary *trustSettings = @{
|
|
||||||
(id)kSecTrustSettingsResult: [NSNumber numberWithInt:trustLevel],
|
|
||||||
(id)kSecTrustSettingsPolicy: (__bridge id) policy,
|
|
||||||
};
|
|
||||||
OSStatus status = SecTrustSettingsSetTrustSettings(cert, kSecTrustSettingsDomainUser, (__bridge CFTypeRef)(trustSettings));
|
|
||||||
CFRelease(policy);
|
|
||||||
return status;
|
|
||||||
}
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
/// \brief Set a certificate as trusted in the user's keychain. This call will trigger a security prompt.
|
|
||||||
///
|
|
||||||
/// \param[in] cert The certificate.
|
|
||||||
/// \return The status for the operation.
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
OSStatus _setCertificateTrusted(SecCertificateRef cert) {
|
|
||||||
return _setCertificateTrustLevel(cert, kSecTrustSettingsResultTrustRoot);
|
|
||||||
}
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
/// \brief Set a certificate as trusted in the user's keychain. This call will trigger a security prompt.
|
|
||||||
///
|
|
||||||
/// \param[in] certData The certificate data in DER encoded format.
|
|
||||||
/// \param[in] certSize The size of the certData in bytes.
|
|
||||||
/// \return The status for the operation.
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
OSStatus setCertificateTrusted(char const* certData, uint64_t certSize) {
|
|
||||||
return _setCertificateTrusted(certFromData(certData, certSize));
|
|
||||||
}
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
/// \brief Remove the trust level of a certificate in the user's keychain.
|
|
||||||
///
|
|
||||||
/// \param[in] cert The certificate.
|
|
||||||
/// \return The status for the operation.
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
OSStatus _removeCertificateTrust(SecCertificateRef cert) {
|
|
||||||
return _setCertificateTrustLevel(cert, kSecTrustSettingsResultUnspecified);
|
|
||||||
}
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
/// \brief Remove the trust level of a certificate in the user's keychain.
|
|
||||||
///
|
|
||||||
/// \param[in] certData The certificate data in DER encoded format.
|
|
||||||
/// \param[in] certSize The size of the certData in bytes.
|
|
||||||
/// \return The status for the operation.
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
OSStatus removeCertificateTrust(char const* certData, uint64_t certSize) {
|
|
||||||
return _removeCertificateTrust(certFromData(certData, certSize));
|
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
import "C"
|
import "C"
|
||||||
@ -248,120 +119,6 @@ func certPEMToDER(certPEM []byte) ([]byte, error) {
|
|||||||
return block.Bytes, nil
|
return block.Bytes, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// wrapCGoCertCallReturningBool wrap call to a CGo function returning a bool.
|
|
||||||
// if the certificate is invalid the call will return false.
|
|
||||||
func wrapCGoCertCallReturningBool(certPEM []byte, fn func(*C.char, C.ulonglong) bool) bool {
|
|
||||||
certDER, err := certPEMToDER(certPEM)
|
|
||||||
if err != nil {
|
|
||||||
return false // error are ignored
|
|
||||||
}
|
|
||||||
|
|
||||||
buffer := C.CBytes(certDER)
|
|
||||||
defer C.free(unsafe.Pointer(buffer)) //nolint:unconvert
|
|
||||||
|
|
||||||
return fn((*C.char)(buffer), C.ulonglong(len(certDER)))
|
|
||||||
}
|
|
||||||
|
|
||||||
// wrapCGoCertCallReturningBool wrap call to a CGo function returning an error
|
|
||||||
func wrapCGoCertCallReturningError(certPEM []byte, fn func(*C.char, C.ulonglong) error) error {
|
|
||||||
certDER, err := certPEMToDER(certPEM)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
buffer := C.CBytes(certDER)
|
|
||||||
defer C.free(unsafe.Pointer(buffer)) //nolint:unconvert
|
|
||||||
|
|
||||||
return fn((*C.char)(buffer), C.ulonglong(len(certDER)))
|
|
||||||
}
|
|
||||||
|
|
||||||
// isCertInKeychain returns true if the given certificate is stored in the user's keychain.
|
|
||||||
func isCertInKeychain(certPEM []byte) bool {
|
|
||||||
return wrapCGoCertCallReturningBool(certPEM, isCertInKeychainCGo)
|
|
||||||
}
|
|
||||||
|
|
||||||
func isCertInKeychainCGo(buffer *C.char, size C.ulonglong) bool {
|
|
||||||
return bool(C.isCertificateInKeychain(buffer, size))
|
|
||||||
}
|
|
||||||
|
|
||||||
// addCertToKeychain adds a certificate to the user's keychain.
|
|
||||||
// Trying to add a certificate that is already in the keychain will result in an error.
|
|
||||||
func addCertToKeychain(certPEM []byte) error {
|
|
||||||
return wrapCGoCertCallReturningError(certPEM, addCertToKeychainCGo)
|
|
||||||
}
|
|
||||||
|
|
||||||
func addCertToKeychainCGo(buffer *C.char, size C.ulonglong) error {
|
|
||||||
if errCode := C.addCertificateToKeychain(buffer, size); errCode != errSecSuccess {
|
|
||||||
return fmt.Errorf("could not add certificate to keychain (error %v)", errCode)
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// removeCertFromKeychain removes a certificate from the user's keychain.
|
|
||||||
// Trying to remove a certificate that is not in the keychain will result in an error.
|
|
||||||
func removeCertFromKeychain(certPEM []byte) error {
|
|
||||||
return wrapCGoCertCallReturningError(certPEM, removeCertFromKeychainCGo)
|
|
||||||
}
|
|
||||||
|
|
||||||
func removeCertFromKeychainCGo(buffer *C.char, size C.ulonglong) error {
|
|
||||||
if errCode := C.removeCertificateFromKeychain(buffer, size); errCode != errSecSuccess {
|
|
||||||
return fmt.Errorf("could not remove certificate from keychain (error %v)", errCode)
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// isCertTrusted check if a certificate is trusted in the user's keychain.
|
|
||||||
func isCertTrusted(certPEM []byte) bool {
|
|
||||||
return wrapCGoCertCallReturningBool(certPEM, isCertTrustedCGo)
|
|
||||||
}
|
|
||||||
|
|
||||||
func isCertTrustedCGo(buffer *C.char, size C.ulonglong) bool {
|
|
||||||
return bool(C.isCertificateTrusted(buffer, size))
|
|
||||||
}
|
|
||||||
|
|
||||||
// setCertTrusted sets a certificate as trusted in the user's keychain.
|
|
||||||
// This function will trigger a security prompt from the system.
|
|
||||||
func setCertTrusted(certPEM []byte) error {
|
|
||||||
return wrapCGoCertCallReturningError(certPEM, setCertTrustedCGo)
|
|
||||||
}
|
|
||||||
|
|
||||||
func setCertTrustedCGo(buffer *C.char, size C.ulonglong) error {
|
|
||||||
errCode := C.setCertificateTrusted(buffer, size)
|
|
||||||
switch errCode {
|
|
||||||
case errSecSuccess:
|
|
||||||
return nil
|
|
||||||
case errAuthorizationCanceled:
|
|
||||||
return ErrUserCanceledCertificateInstall
|
|
||||||
default:
|
|
||||||
return fmt.Errorf("could not set certificate trust in keychain (error %v)", errCode)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// removeCertTrust remove the trust level of the certificated from the user's keychain.
|
|
||||||
// This function will trigger a security prompt from the system.
|
|
||||||
func removeCertTrust(certPEM []byte) error {
|
|
||||||
return wrapCGoCertCallReturningError(certPEM, removeCertTrustCGo)
|
|
||||||
}
|
|
||||||
|
|
||||||
func removeCertTrustCGo(buffer *C.char, size C.ulonglong) error {
|
|
||||||
errCode := C.removeCertificateTrust(buffer, size)
|
|
||||||
switch errCode {
|
|
||||||
case errSecSuccess:
|
|
||||||
return nil
|
|
||||||
case errAuthorizationCanceled:
|
|
||||||
return ErrUserCanceledCertificateInstall
|
|
||||||
default:
|
|
||||||
return fmt.Errorf("could not set certificate trust in keychain (error %v)", errCode)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func osSupportCertInstall() bool {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
// installCert installs a certificate in the keychain. The certificate is added to the keychain and it is set as trusted.
|
|
||||||
// This function will trigger a security prompt from the system, unless the certificate is already trusted in the user keychain.
|
|
||||||
func installCert(certPEM []byte) error {
|
func installCert(certPEM []byte) error {
|
||||||
certDER, err := certPEMToDER(certPEM)
|
certDER, err := certPEMToDER(certPEM)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -370,24 +127,18 @@ func installCert(certPEM []byte) error {
|
|||||||
|
|
||||||
p := C.CBytes(certDER)
|
p := C.CBytes(certDER)
|
||||||
defer C.free(unsafe.Pointer(p)) //nolint:unconvert
|
defer C.free(unsafe.Pointer(p)) //nolint:unconvert
|
||||||
buffer := (*C.char)(p)
|
|
||||||
size := C.ulonglong(len(certDER))
|
|
||||||
|
|
||||||
if !isCertInKeychainCGo(buffer, size) {
|
errCode := C.installTrustedCert((*C.char)(p), (C.ulonglong)(len(certDER)))
|
||||||
if err := addCertToKeychainCGo(buffer, size); err != nil {
|
switch errCode {
|
||||||
return err
|
case errSecSuccess:
|
||||||
}
|
return nil
|
||||||
|
case errAuthorizationCanceled:
|
||||||
|
return fmt.Errorf("the user cancelled the authorization dialog")
|
||||||
|
default:
|
||||||
|
return fmt.Errorf("could not install certification into keychain (error %v)", errCode)
|
||||||
}
|
}
|
||||||
|
|
||||||
if !isCertTrustedCGo(buffer, size) {
|
|
||||||
return setCertTrustedCGo(buffer, size)
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// uninstallCert uninstalls a certificate in the keychain. The certificate trust is removed and the certificated is deleted from the keychain.
|
|
||||||
// This function will trigger a security prompt from the system, unless the certificate is not trusted in the user keychain.
|
|
||||||
func uninstallCert(certPEM []byte) error {
|
func uninstallCert(certPEM []byte) error {
|
||||||
certDER, err := certPEMToDER(certPEM)
|
certDER, err := certPEMToDER(certPEM)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -396,32 +147,10 @@ func uninstallCert(certPEM []byte) error {
|
|||||||
|
|
||||||
p := C.CBytes(certDER)
|
p := C.CBytes(certDER)
|
||||||
defer C.free(unsafe.Pointer(p)) //nolint:unconvert
|
defer C.free(unsafe.Pointer(p)) //nolint:unconvert
|
||||||
buffer := (*C.char)(p)
|
|
||||||
size := C.ulonglong(len(certDER))
|
|
||||||
|
|
||||||
if isCertTrustedCGo(buffer, size) {
|
if errCode := C.removeTrustedCert((*C.char)(p), (C.ulonglong)(len(certDER))); errCode != 0 {
|
||||||
if err := removeCertTrustCGo(buffer, size); err != nil {
|
return fmt.Errorf("could not install certificate from keychain (error %v)", errCode)
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if isCertInKeychainCGo(buffer, size) {
|
|
||||||
return removeCertFromKeychainCGo(buffer, size)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func isCertInstalled(certPEM []byte) bool {
|
|
||||||
certDER, err := certPEMToDER(certPEM)
|
|
||||||
if err != nil {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
p := C.CBytes(certDER)
|
|
||||||
defer C.free(unsafe.Pointer(p)) //nolint:unconvert
|
|
||||||
buffer := (*C.char)(p)
|
|
||||||
size := C.ulonglong(len(certDER))
|
|
||||||
|
|
||||||
return isCertInKeychainCGo(buffer, size) && isCertTrustedCGo(buffer, size)
|
|
||||||
}
|
|
||||||
|
|||||||
@ -25,74 +25,20 @@ import (
|
|||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestCertInKeychain(t *testing.T) {
|
// This test implies human interactions to enter password and is disabled by default.
|
||||||
// no trust settings change is performed, so this test will not trigger an OS security prompt.
|
func _TestTrustedCertsDarwin(t *testing.T) { //nolint:unused
|
||||||
certPEM := generatePEMCertificate(t)
|
|
||||||
require.True(t, osSupportCertInstall())
|
|
||||||
require.False(t, isCertInKeychain(certPEM))
|
|
||||||
require.NoError(t, addCertToKeychain(certPEM))
|
|
||||||
require.True(t, isCertInKeychain(certPEM))
|
|
||||||
require.Error(t, addCertToKeychain(certPEM))
|
|
||||||
require.True(t, isCertInKeychain(certPEM))
|
|
||||||
require.NoError(t, removeCertFromKeychain(certPEM))
|
|
||||||
require.False(t, isCertInKeychain(certPEM))
|
|
||||||
require.Error(t, removeCertFromKeychain(certPEM))
|
|
||||||
require.False(t, isCertInKeychain(certPEM))
|
|
||||||
}
|
|
||||||
|
|
||||||
// This test require human interaction (macOS security prompts), and is disabled by default.
|
|
||||||
func _TestCertificateTrust(t *testing.T) { //nolint:unused
|
|
||||||
certPEM := generatePEMCertificate(t)
|
|
||||||
require.False(t, isCertTrusted(certPEM))
|
|
||||||
require.NoError(t, addCertToKeychain(certPEM))
|
|
||||||
require.NoError(t, setCertTrusted(certPEM))
|
|
||||||
require.True(t, isCertTrusted(certPEM))
|
|
||||||
require.NoError(t, removeCertTrust(certPEM))
|
|
||||||
require.False(t, isCertTrusted(certPEM))
|
|
||||||
require.NoError(t, removeCertFromKeychain(certPEM))
|
|
||||||
}
|
|
||||||
|
|
||||||
// This test require human interaction (macOS security prompts), and is disabled by default.
|
|
||||||
func _TestInstallAndRemove(t *testing.T) { //nolint:unused
|
|
||||||
certPEM := generatePEMCertificate(t)
|
|
||||||
|
|
||||||
// fresh install
|
|
||||||
require.False(t, isCertInstalled(certPEM))
|
|
||||||
require.NoError(t, installCert(certPEM))
|
|
||||||
require.True(t, isCertInKeychain(certPEM))
|
|
||||||
require.True(t, isCertTrusted(certPEM))
|
|
||||||
require.True(t, isCertInstalled(certPEM))
|
|
||||||
require.NoError(t, uninstallCert(certPEM))
|
|
||||||
require.False(t, isCertInKeychain(certPEM))
|
|
||||||
require.False(t, isCertTrusted(certPEM))
|
|
||||||
require.False(t, isCertInstalled(certPEM))
|
|
||||||
|
|
||||||
// Install where certificate is already in Keychain, but not trusted.
|
|
||||||
require.NoError(t, addCertToKeychain(certPEM))
|
|
||||||
require.False(t, isCertInstalled(certPEM))
|
|
||||||
require.NoError(t, installCert(certPEM))
|
|
||||||
require.True(t, isCertInstalled(certPEM))
|
|
||||||
|
|
||||||
// Install where certificate is already installed
|
|
||||||
require.NoError(t, installCert(certPEM))
|
|
||||||
|
|
||||||
// Remove when certificate is not trusted.
|
|
||||||
require.NoError(t, removeCertTrust(certPEM))
|
|
||||||
require.NoError(t, uninstallCert(certPEM))
|
|
||||||
require.False(t, isCertInstalled(certPEM))
|
|
||||||
|
|
||||||
// Remove when certificate has already been removed.
|
|
||||||
require.NoError(t, uninstallCert(certPEM))
|
|
||||||
require.False(t, isCertTrusted(certPEM))
|
|
||||||
require.False(t, isCertInKeychain(certPEM))
|
|
||||||
}
|
|
||||||
|
|
||||||
func generatePEMCertificate(t *testing.T) []byte {
|
|
||||||
template, err := NewTLSTemplate()
|
template, err := NewTLSTemplate()
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
certPEM, _, err := GenerateCert(template)
|
certPEM, _, err := GenerateCert(template)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
return certPEM
|
require.Error(t, installCert([]byte{0})) // Cannot install an invalid cert.
|
||||||
|
require.Error(t, uninstallCert(certPEM)) // Cannot uninstall a cert that is not installed.
|
||||||
|
require.NoError(t, installCert(certPEM)) // Can install a valid cert.
|
||||||
|
require.NoError(t, installCert(certPEM)) // Can install an already installed cert.
|
||||||
|
require.NoError(t, uninstallCert(certPEM)) // Can uninstall an installed cert.
|
||||||
|
require.Error(t, uninstallCert(certPEM)) // Cannot uninstall an already uninstalled cert.
|
||||||
|
require.NoError(t, installCert(certPEM)) // Can reinstall an uninstalled cert.
|
||||||
|
require.NoError(t, uninstallCert(certPEM)) // Can uninstall a reinstalled cert.
|
||||||
}
|
}
|
||||||
|
|||||||
@ -17,10 +17,6 @@
|
|||||||
|
|
||||||
package certs
|
package certs
|
||||||
|
|
||||||
func osSupportCertInstall() bool {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
func installCert([]byte) error {
|
func installCert([]byte) error {
|
||||||
return nil // Linux doesn't have a root cert store.
|
return nil // Linux doesn't have a root cert store.
|
||||||
}
|
}
|
||||||
@ -28,7 +24,3 @@ func installCert([]byte) error {
|
|||||||
func uninstallCert([]byte) error {
|
func uninstallCert([]byte) error {
|
||||||
return nil // Linux doesn't have a root cert store.
|
return nil // Linux doesn't have a root cert store.
|
||||||
}
|
}
|
||||||
|
|
||||||
func isCertInstalled([]byte) bool {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|||||||
@ -17,10 +17,6 @@
|
|||||||
|
|
||||||
package certs
|
package certs
|
||||||
|
|
||||||
func osSupportCertInstall() bool {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
func installCert([]byte) error {
|
func installCert([]byte) error {
|
||||||
return nil // NOTE(GODT-986): Install certs to root cert store?
|
return nil // NOTE(GODT-986): Install certs to root cert store?
|
||||||
}
|
}
|
||||||
@ -28,7 +24,3 @@ func installCert([]byte) error {
|
|||||||
func uninstallCert([]byte) error {
|
func uninstallCert([]byte) error {
|
||||||
return nil // NOTE(GODT-986): Uninstall certs from root cert store?
|
return nil // NOTE(GODT-986): Uninstall certs from root cert store?
|
||||||
}
|
}
|
||||||
|
|
||||||
func isCertInstalled([]byte) bool {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|||||||
@ -17,66 +17,16 @@
|
|||||||
|
|
||||||
package certs
|
package certs
|
||||||
|
|
||||||
import (
|
type Installer struct{}
|
||||||
"errors"
|
|
||||||
|
|
||||||
"github.com/sirupsen/logrus"
|
|
||||||
)
|
|
||||||
|
|
||||||
var (
|
|
||||||
ErrUserCanceledCertificateInstall = errors.New("the user cancelled the authorization dialog")
|
|
||||||
)
|
|
||||||
|
|
||||||
type Installer struct {
|
|
||||||
log *logrus.Entry
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewInstaller() *Installer {
|
func NewInstaller() *Installer {
|
||||||
return &Installer{
|
return &Installer{}
|
||||||
log: logrus.WithField("pkg", "certs"),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (installer *Installer) OSSupportCertInstall() bool {
|
|
||||||
return osSupportCertInstall()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (installer *Installer) InstallCert(certPEM []byte) error {
|
func (installer *Installer) InstallCert(certPEM []byte) error {
|
||||||
installer.log.Info("Installing the Bridge TLS certificate in the OS keychain")
|
return installCert(certPEM)
|
||||||
|
|
||||||
if err := installCert(certPEM); err != nil {
|
|
||||||
installer.log.WithError(err).Error("The Bridge TLS certificate could not be installed in the OS keychain")
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
installer.log.Info("The Bridge TLS certificate was successfully installed in the OS keychain")
|
|
||||||
return nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (installer *Installer) UninstallCert(certPEM []byte) error {
|
func (installer *Installer) UninstallCert(certPEM []byte) error {
|
||||||
installer.log.Info("Uninstalling the Bridge TLS certificate from the OS keychain")
|
return uninstallCert(certPEM)
|
||||||
|
|
||||||
if err := uninstallCert(certPEM); err != nil {
|
|
||||||
installer.log.WithError(err).Error("The Bridge TLS certificate could not be uninstalled from the OS keychain")
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
installer.log.Info("The Bridge TLS certificate was successfully uninstalled from the OS keychain")
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (installer *Installer) IsCertInstalled(certPEM []byte) bool {
|
|
||||||
return isCertInstalled(certPEM)
|
|
||||||
}
|
|
||||||
|
|
||||||
// LogCertInstallStatus reports the current status of the certificate installation in the log.
|
|
||||||
// If certificate installation is not supported on the platform, this function does nothing.
|
|
||||||
func (installer *Installer) LogCertInstallStatus(certPEM []byte) {
|
|
||||||
if installer.OSSupportCertInstall() {
|
|
||||||
if installer.IsCertInstalled(certPEM) {
|
|
||||||
installer.log.Info("The Bridge TLS certificate is installed in the OS keychain")
|
|
||||||
} else {
|
|
||||||
installer.log.Info("The Bridge TLS certificate is not installed in the OS keychain")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -39,10 +39,10 @@ func (c *AppleMail) Configure(
|
|||||||
hostname string,
|
hostname string,
|
||||||
imapPort, smtpPort int,
|
imapPort, smtpPort int,
|
||||||
imapSSL, smtpSSL bool,
|
imapSSL, smtpSSL bool,
|
||||||
username, displayName, addresses string,
|
username, addresses string,
|
||||||
password []byte,
|
password []byte,
|
||||||
) error {
|
) error {
|
||||||
mc := prepareMobileConfig(hostname, imapPort, smtpPort, imapSSL, smtpSSL, username, displayName, addresses, password)
|
mc := prepareMobileConfig(hostname, imapPort, smtpPort, imapSSL, smtpSSL, username, addresses, password)
|
||||||
|
|
||||||
confPath, err := saveConfigTemporarily(mc)
|
confPath, err := saveConfigTemporarily(mc)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -66,13 +66,13 @@ func prepareMobileConfig(
|
|||||||
hostname string,
|
hostname string,
|
||||||
imapPort, smtpPort int,
|
imapPort, smtpPort int,
|
||||||
imapSSL, smtpSSL bool,
|
imapSSL, smtpSSL bool,
|
||||||
username, displayName, addresses string,
|
username, addresses string,
|
||||||
password []byte,
|
password []byte,
|
||||||
) *mobileconfig.Config {
|
) *mobileconfig.Config {
|
||||||
return &mobileconfig.Config{
|
return &mobileconfig.Config{
|
||||||
DisplayName: username,
|
DisplayName: username,
|
||||||
EmailAddress: addresses,
|
EmailAddress: addresses,
|
||||||
AccountName: displayName,
|
AccountName: username,
|
||||||
AccountDescription: username,
|
AccountDescription: username,
|
||||||
Identifier: "protonmail " + username + strconv.FormatInt(time.Now().Unix(), 10),
|
Identifier: "protonmail " + username + strconv.FormatInt(time.Now().Unix(), 10),
|
||||||
IMAP: &mobileconfig.IMAP{
|
IMAP: &mobileconfig.IMAP{
|
||||||
|
|||||||
@ -95,13 +95,6 @@ func (status *ConfigurationStatus) IsPending() bool {
|
|||||||
return !status.Data.DataV1.PendingSince.IsZero()
|
return !status.Data.DataV1.PendingSince.IsZero()
|
||||||
}
|
}
|
||||||
|
|
||||||
func (status *ConfigurationStatus) isPendingSinceMin() int {
|
|
||||||
if min := int(time.Since(status.Data.DataV1.PendingSince).Minutes()); min > 0 {
|
|
||||||
return min
|
|
||||||
}
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
func (status *ConfigurationStatus) IsFromFailure() bool {
|
func (status *ConfigurationStatus) IsFromFailure() bool {
|
||||||
status.DataLock.RLock()
|
status.DataLock.RLock()
|
||||||
defer status.DataLock.RUnlock()
|
defer status.DataLock.RUnlock()
|
||||||
@ -135,7 +128,7 @@ func (status *ConfigurationStatus) ApplyProgress() error {
|
|||||||
return status.Save()
|
return status.Save()
|
||||||
}
|
}
|
||||||
|
|
||||||
func (status *ConfigurationStatus) RecordLinkClicked(link uint64) error {
|
func (status *ConfigurationStatus) RecordLinkClicked(link uint) error {
|
||||||
status.DataLock.Lock()
|
status.DataLock.Lock()
|
||||||
defer status.DataLock.Unlock()
|
defer status.DataLock.Unlock()
|
||||||
|
|
||||||
@ -198,11 +191,11 @@ func (data *ConfigurationStatusData) init() {
|
|||||||
data.DataV1.FailureDetails = ""
|
data.DataV1.FailureDetails = ""
|
||||||
}
|
}
|
||||||
|
|
||||||
func (data *ConfigurationStatusData) setClickedLink(pos uint64) {
|
func (data *ConfigurationStatusData) setClickedLink(pos uint) {
|
||||||
data.DataV1.ClickedLink |= 1 << pos
|
data.DataV1.ClickedLink |= 1 << pos
|
||||||
}
|
}
|
||||||
|
|
||||||
func (data *ConfigurationStatusData) hasLinkClicked(pos uint64) bool {
|
func (data *ConfigurationStatusData) hasLinkClicked(pos uint) bool {
|
||||||
val := data.DataV1.ClickedLink & (1 << pos)
|
val := data.DataV1.ClickedLink & (1 << pos)
|
||||||
return val > 0
|
return val > 0
|
||||||
}
|
}
|
||||||
@ -211,7 +204,7 @@ func (data *ConfigurationStatusData) clickedLinkToString() string {
|
|||||||
var str = ""
|
var str = ""
|
||||||
var first = true
|
var first = true
|
||||||
for i := 0; i < 64; i++ {
|
for i := 0; i < 64; i++ {
|
||||||
if data.hasLinkClicked(uint64(i)) {
|
if data.hasLinkClicked(uint(i)) {
|
||||||
if !first {
|
if !first {
|
||||||
str += ","
|
str += ","
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@ -19,6 +19,7 @@ package configstatus
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"strconv"
|
"strconv"
|
||||||
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
type ConfigAbortValues struct {
|
type ConfigAbortValues struct {
|
||||||
@ -40,20 +41,17 @@ type ConfigAbortData struct {
|
|||||||
|
|
||||||
type ConfigAbortBuilder struct{}
|
type ConfigAbortBuilder struct{}
|
||||||
|
|
||||||
func (*ConfigAbortBuilder) New(config *ConfigurationStatus) ConfigAbortData {
|
func (*ConfigAbortBuilder) New(data *ConfigurationStatusData) ConfigAbortData {
|
||||||
config.DataLock.RLock()
|
|
||||||
defer config.DataLock.RUnlock()
|
|
||||||
|
|
||||||
return ConfigAbortData{
|
return ConfigAbortData{
|
||||||
MeasurementGroup: "bridge.any.configuration",
|
MeasurementGroup: "bridge.any.configuration",
|
||||||
Event: "bridge_config_abort",
|
Event: "bridge_config_abort",
|
||||||
Values: ConfigSuccessValues{
|
Values: ConfigSuccessValues{
|
||||||
Duration: config.isPendingSinceMin(),
|
Duration: int(time.Since(data.DataV1.PendingSince).Minutes()),
|
||||||
},
|
},
|
||||||
Dimensions: ConfigSuccessDimensions{
|
Dimensions: ConfigSuccessDimensions{
|
||||||
ReportClick: strconv.FormatBool(config.Data.DataV1.ReportClick),
|
ReportClick: strconv.FormatBool(data.DataV1.ReportClick),
|
||||||
ReportSent: strconv.FormatBool(config.Data.DataV1.ReportSent),
|
ReportSent: strconv.FormatBool(data.DataV1.ReportSent),
|
||||||
ClickedLink: config.Data.clickedLinkToString(),
|
ClickedLink: data.clickedLinkToString(),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -33,7 +33,7 @@ func TestConfigurationAbort_default(t *testing.T) {
|
|||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
var builder = configstatus.ConfigAbortBuilder{}
|
var builder = configstatus.ConfigAbortBuilder{}
|
||||||
req := builder.New(config)
|
req := builder.New(config.Data)
|
||||||
|
|
||||||
require.Equal(t, "bridge.any.configuration", req.MeasurementGroup)
|
require.Equal(t, "bridge.any.configuration", req.MeasurementGroup)
|
||||||
require.Equal(t, "bridge_config_abort", req.Event)
|
require.Equal(t, "bridge_config_abort", req.Event)
|
||||||
@ -64,7 +64,7 @@ func TestConfigurationAbort_fed(t *testing.T) {
|
|||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
var builder = configstatus.ConfigAbortBuilder{}
|
var builder = configstatus.ConfigAbortBuilder{}
|
||||||
req := builder.New(config)
|
req := builder.New(config.Data)
|
||||||
|
|
||||||
require.Equal(t, "bridge.any.configuration", req.MeasurementGroup)
|
require.Equal(t, "bridge.any.configuration", req.MeasurementGroup)
|
||||||
require.Equal(t, "bridge_config_abort", req.Event)
|
require.Equal(t, "bridge_config_abort", req.Event)
|
||||||
|
|||||||
@ -33,16 +33,13 @@ type ConfigProgressData struct {
|
|||||||
|
|
||||||
type ConfigProgressBuilder struct{}
|
type ConfigProgressBuilder struct{}
|
||||||
|
|
||||||
func (*ConfigProgressBuilder) New(config *ConfigurationStatus) ConfigProgressData {
|
func (*ConfigProgressBuilder) New(data *ConfigurationStatusData) ConfigProgressData {
|
||||||
config.DataLock.RLock()
|
|
||||||
defer config.DataLock.RUnlock()
|
|
||||||
|
|
||||||
return ConfigProgressData{
|
return ConfigProgressData{
|
||||||
MeasurementGroup: "bridge.any.configuration",
|
MeasurementGroup: "bridge.any.configuration",
|
||||||
Event: "bridge_config_progress",
|
Event: "bridge_config_progress",
|
||||||
Values: ConfigProgressValues{
|
Values: ConfigProgressValues{
|
||||||
NbDay: numberOfDay(time.Now(), config.Data.DataV1.PendingSince),
|
NbDay: numberOfDay(time.Now(), data.DataV1.PendingSince),
|
||||||
NbDaySinceLast: numberOfDay(time.Now(), config.Data.DataV1.LastProgress),
|
NbDaySinceLast: numberOfDay(time.Now(), data.DataV1.LastProgress),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -33,7 +33,7 @@ func TestConfigurationProgress_default(t *testing.T) {
|
|||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
var builder = configstatus.ConfigProgressBuilder{}
|
var builder = configstatus.ConfigProgressBuilder{}
|
||||||
req := builder.New(config)
|
req := builder.New(config.Data)
|
||||||
|
|
||||||
require.Equal(t, "bridge.any.configuration", req.MeasurementGroup)
|
require.Equal(t, "bridge.any.configuration", req.MeasurementGroup)
|
||||||
require.Equal(t, "bridge_config_progress", req.Event)
|
require.Equal(t, "bridge_config_progress", req.Event)
|
||||||
@ -62,7 +62,7 @@ func TestConfigurationProgress_fed(t *testing.T) {
|
|||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
var builder = configstatus.ConfigProgressBuilder{}
|
var builder = configstatus.ConfigProgressBuilder{}
|
||||||
req := builder.New(config)
|
req := builder.New(config.Data)
|
||||||
|
|
||||||
require.Equal(t, "bridge.any.configuration", req.MeasurementGroup)
|
require.Equal(t, "bridge.any.configuration", req.MeasurementGroup)
|
||||||
require.Equal(t, "bridge_config_progress", req.Event)
|
require.Equal(t, "bridge_config_progress", req.Event)
|
||||||
|
|||||||
@ -19,6 +19,7 @@ package configstatus
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"strconv"
|
"strconv"
|
||||||
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
type ConfigRecoveryValues struct {
|
type ConfigRecoveryValues struct {
|
||||||
@ -42,22 +43,19 @@ type ConfigRecoveryData struct {
|
|||||||
|
|
||||||
type ConfigRecoveryBuilder struct{}
|
type ConfigRecoveryBuilder struct{}
|
||||||
|
|
||||||
func (*ConfigRecoveryBuilder) New(config *ConfigurationStatus) ConfigRecoveryData {
|
func (*ConfigRecoveryBuilder) New(data *ConfigurationStatusData) ConfigRecoveryData {
|
||||||
config.DataLock.RLock()
|
|
||||||
defer config.DataLock.RUnlock()
|
|
||||||
|
|
||||||
return ConfigRecoveryData{
|
return ConfigRecoveryData{
|
||||||
MeasurementGroup: "bridge.any.configuration",
|
MeasurementGroup: "bridge.any.configuration",
|
||||||
Event: "bridge_config_recovery",
|
Event: "bridge_config_recovery",
|
||||||
Values: ConfigRecoveryValues{
|
Values: ConfigRecoveryValues{
|
||||||
Duration: config.isPendingSinceMin(),
|
Duration: int(time.Since(data.DataV1.PendingSince).Minutes()),
|
||||||
},
|
},
|
||||||
Dimensions: ConfigRecoveryDimensions{
|
Dimensions: ConfigRecoveryDimensions{
|
||||||
Autoconf: config.Data.DataV1.Autoconf,
|
Autoconf: data.DataV1.Autoconf,
|
||||||
ReportClick: strconv.FormatBool(config.Data.DataV1.ReportClick),
|
ReportClick: strconv.FormatBool(data.DataV1.ReportClick),
|
||||||
ReportSent: strconv.FormatBool(config.Data.DataV1.ReportSent),
|
ReportSent: strconv.FormatBool(data.DataV1.ReportSent),
|
||||||
ClickedLink: config.Data.clickedLinkToString(),
|
ClickedLink: data.clickedLinkToString(),
|
||||||
FailureDetails: config.Data.DataV1.FailureDetails,
|
FailureDetails: data.DataV1.FailureDetails,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -33,7 +33,7 @@ func TestConfigurationRecovery_default(t *testing.T) {
|
|||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
var builder = configstatus.ConfigRecoveryBuilder{}
|
var builder = configstatus.ConfigRecoveryBuilder{}
|
||||||
req := builder.New(config)
|
req := builder.New(config.Data)
|
||||||
|
|
||||||
require.Equal(t, "bridge.any.configuration", req.MeasurementGroup)
|
require.Equal(t, "bridge.any.configuration", req.MeasurementGroup)
|
||||||
require.Equal(t, "bridge_config_recovery", req.Event)
|
require.Equal(t, "bridge_config_recovery", req.Event)
|
||||||
@ -66,7 +66,7 @@ func TestConfigurationRecovery_fed(t *testing.T) {
|
|||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
var builder = configstatus.ConfigRecoveryBuilder{}
|
var builder = configstatus.ConfigRecoveryBuilder{}
|
||||||
req := builder.New(config)
|
req := builder.New(config.Data)
|
||||||
|
|
||||||
require.Equal(t, "bridge.any.configuration", req.MeasurementGroup)
|
require.Equal(t, "bridge.any.configuration", req.MeasurementGroup)
|
||||||
require.Equal(t, "bridge_config_recovery", req.Event)
|
require.Equal(t, "bridge_config_recovery", req.Event)
|
||||||
|
|||||||
@ -19,6 +19,7 @@ package configstatus
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"strconv"
|
"strconv"
|
||||||
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
type ConfigSuccessValues struct {
|
type ConfigSuccessValues struct {
|
||||||
@ -41,21 +42,18 @@ type ConfigSuccessData struct {
|
|||||||
|
|
||||||
type ConfigSuccessBuilder struct{}
|
type ConfigSuccessBuilder struct{}
|
||||||
|
|
||||||
func (*ConfigSuccessBuilder) New(config *ConfigurationStatus) ConfigSuccessData {
|
func (*ConfigSuccessBuilder) New(data *ConfigurationStatusData) ConfigSuccessData {
|
||||||
config.DataLock.RLock()
|
|
||||||
defer config.DataLock.RUnlock()
|
|
||||||
|
|
||||||
return ConfigSuccessData{
|
return ConfigSuccessData{
|
||||||
MeasurementGroup: "bridge.any.configuration",
|
MeasurementGroup: "bridge.any.configuration",
|
||||||
Event: "bridge_config_success",
|
Event: "bridge_config_success",
|
||||||
Values: ConfigSuccessValues{
|
Values: ConfigSuccessValues{
|
||||||
Duration: config.isPendingSinceMin(),
|
Duration: int(time.Since(data.DataV1.PendingSince).Minutes()),
|
||||||
},
|
},
|
||||||
Dimensions: ConfigSuccessDimensions{
|
Dimensions: ConfigSuccessDimensions{
|
||||||
Autoconf: config.Data.DataV1.Autoconf,
|
Autoconf: data.DataV1.Autoconf,
|
||||||
ReportClick: strconv.FormatBool(config.Data.DataV1.ReportClick),
|
ReportClick: strconv.FormatBool(data.DataV1.ReportClick),
|
||||||
ReportSent: strconv.FormatBool(config.Data.DataV1.ReportSent),
|
ReportSent: strconv.FormatBool(data.DataV1.ReportSent),
|
||||||
ClickedLink: config.Data.clickedLinkToString(),
|
ClickedLink: data.clickedLinkToString(),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -33,7 +33,7 @@ func TestConfigurationSuccess_default(t *testing.T) {
|
|||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
var builder = configstatus.ConfigSuccessBuilder{}
|
var builder = configstatus.ConfigSuccessBuilder{}
|
||||||
req := builder.New(config)
|
req := builder.New(config.Data)
|
||||||
|
|
||||||
require.Equal(t, "bridge.any.configuration", req.MeasurementGroup)
|
require.Equal(t, "bridge.any.configuration", req.MeasurementGroup)
|
||||||
require.Equal(t, "bridge_config_success", req.Event)
|
require.Equal(t, "bridge_config_success", req.Event)
|
||||||
@ -65,7 +65,7 @@ func TestConfigurationSuccess_fed(t *testing.T) {
|
|||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
var builder = configstatus.ConfigSuccessBuilder{}
|
var builder = configstatus.ConfigSuccessBuilder{}
|
||||||
req := builder.New(config)
|
req := builder.New(config.Data)
|
||||||
|
|
||||||
require.Equal(t, "bridge.any.configuration", req.MeasurementGroup)
|
require.Equal(t, "bridge.any.configuration", req.MeasurementGroup)
|
||||||
require.Equal(t, "bridge_config_success", req.Event)
|
require.Equal(t, "bridge_config_success", req.Event)
|
||||||
|
|||||||
@ -17,13 +17,7 @@
|
|||||||
|
|
||||||
package events
|
package events
|
||||||
|
|
||||||
import (
|
import "fmt"
|
||||||
"context"
|
|
||||||
"fmt"
|
|
||||||
|
|
||||||
"github.com/ProtonMail/gluon/async"
|
|
||||||
"github.com/ProtonMail/gluon/watcher"
|
|
||||||
)
|
|
||||||
|
|
||||||
type Event interface {
|
type Event interface {
|
||||||
fmt.Stringer
|
fmt.Stringer
|
||||||
@ -34,30 +28,3 @@ type Event interface {
|
|||||||
type eventBase struct{}
|
type eventBase struct{}
|
||||||
|
|
||||||
func (eventBase) _isEvent() {}
|
func (eventBase) _isEvent() {}
|
||||||
|
|
||||||
type EventPublisher interface {
|
|
||||||
PublishEvent(ctx context.Context, event Event)
|
|
||||||
}
|
|
||||||
|
|
||||||
type NullEventPublisher struct{}
|
|
||||||
|
|
||||||
func (NullEventPublisher) PublishEvent(_ context.Context, _ Event) {}
|
|
||||||
|
|
||||||
type Subscription interface {
|
|
||||||
Add(ofType ...Event) *watcher.Watcher[Event]
|
|
||||||
Remove(watcher *watcher.Watcher[Event])
|
|
||||||
}
|
|
||||||
|
|
||||||
type NullSubscription struct{}
|
|
||||||
|
|
||||||
func (n NullSubscription) Add(ofType ...Event) *watcher.Watcher[Event] {
|
|
||||||
return watcher.New[Event](&async.NoopPanicHandler{}, ofType...)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (n NullSubscription) Remove(watcher *watcher.Watcher[Event]) {
|
|
||||||
watcher.Close()
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewNullSubscription() *NullSubscription {
|
|
||||||
return &NullSubscription{}
|
|
||||||
}
|
|
||||||
|
|||||||
@ -1,48 +0,0 @@
|
|||||||
// Code generated by MockGen. DO NOT EDIT.
|
|
||||||
// Source: github.com/ProtonMail/proton-bridge/v3/internal/events (interfaces: EventPublisher)
|
|
||||||
|
|
||||||
// Package mocks is a generated GoMock package.
|
|
||||||
package mocks
|
|
||||||
|
|
||||||
import (
|
|
||||||
context "context"
|
|
||||||
reflect "reflect"
|
|
||||||
|
|
||||||
events "github.com/ProtonMail/proton-bridge/v3/internal/events"
|
|
||||||
gomock "github.com/golang/mock/gomock"
|
|
||||||
)
|
|
||||||
|
|
||||||
// MockEventPublisher is a mock of EventPublisher interface.
|
|
||||||
type MockEventPublisher struct {
|
|
||||||
ctrl *gomock.Controller
|
|
||||||
recorder *MockEventPublisherMockRecorder
|
|
||||||
}
|
|
||||||
|
|
||||||
// MockEventPublisherMockRecorder is the mock recorder for MockEventPublisher.
|
|
||||||
type MockEventPublisherMockRecorder struct {
|
|
||||||
mock *MockEventPublisher
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewMockEventPublisher creates a new mock instance.
|
|
||||||
func NewMockEventPublisher(ctrl *gomock.Controller) *MockEventPublisher {
|
|
||||||
mock := &MockEventPublisher{ctrl: ctrl}
|
|
||||||
mock.recorder = &MockEventPublisherMockRecorder{mock}
|
|
||||||
return mock
|
|
||||||
}
|
|
||||||
|
|
||||||
// EXPECT returns an object that allows the caller to indicate expected use.
|
|
||||||
func (m *MockEventPublisher) EXPECT() *MockEventPublisherMockRecorder {
|
|
||||||
return m.recorder
|
|
||||||
}
|
|
||||||
|
|
||||||
// PublishEvent mocks base method.
|
|
||||||
func (m *MockEventPublisher) PublishEvent(arg0 context.Context, arg1 events.Event) {
|
|
||||||
m.ctrl.T.Helper()
|
|
||||||
m.ctrl.Call(m, "PublishEvent", arg0, arg1)
|
|
||||||
}
|
|
||||||
|
|
||||||
// PublishEvent indicates an expected call of PublishEvent.
|
|
||||||
func (mr *MockEventPublisherMockRecorder) PublishEvent(arg0, arg1 interface{}) *gomock.Call {
|
|
||||||
mr.mock.ctrl.T.Helper()
|
|
||||||
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PublishEvent", reflect.TypeOf((*MockEventPublisher)(nil).PublishEvent), arg0, arg1)
|
|
||||||
}
|
|
||||||
@ -37,22 +37,6 @@ func (event IMAPServerStopped) String() string {
|
|||||||
return "IMAPServerStopped"
|
return "IMAPServerStopped"
|
||||||
}
|
}
|
||||||
|
|
||||||
type IMAPServerClosed struct {
|
|
||||||
eventBase
|
|
||||||
}
|
|
||||||
|
|
||||||
func (event IMAPServerClosed) String() string {
|
|
||||||
return "IMAPServerClosed"
|
|
||||||
}
|
|
||||||
|
|
||||||
type IMAPServerCreated struct {
|
|
||||||
eventBase
|
|
||||||
}
|
|
||||||
|
|
||||||
func (event IMAPServerCreated) String() string {
|
|
||||||
return "IMAPServerCreated"
|
|
||||||
}
|
|
||||||
|
|
||||||
type IMAPServerError struct {
|
type IMAPServerError struct {
|
||||||
eventBase
|
eventBase
|
||||||
|
|
||||||
|
|||||||
@ -175,7 +175,7 @@ type UsedSpaceChanged struct {
|
|||||||
|
|
||||||
UserID string
|
UserID string
|
||||||
|
|
||||||
UsedSpace uint64
|
UsedSpace int
|
||||||
}
|
}
|
||||||
|
|
||||||
func (event UsedSpaceChanged) String() string {
|
func (event UsedSpaceChanged) String() string {
|
||||||
|
|||||||
@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
// Code generated by protoc-gen-go. DO NOT EDIT.
|
// Code generated by protoc-gen-go. DO NOT EDIT.
|
||||||
// versions:
|
// versions:
|
||||||
// protoc-gen-go v1.31.0
|
// protoc-gen-go v1.28.0
|
||||||
// protoc v3.21.12
|
// protoc v3.21.12
|
||||||
// source: focus.proto
|
// source: focus.proto
|
||||||
|
|
||||||
|
|||||||
@ -1,23 +1,6 @@
|
|||||||
// Copyright (c) 2022 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 protoc-gen-go-grpc. DO NOT EDIT.
|
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
|
||||||
// versions:
|
// versions:
|
||||||
// - protoc-gen-go-grpc v1.3.0
|
// - protoc-gen-go-grpc v1.2.0
|
||||||
// - protoc v3.21.12
|
// - protoc v3.21.12
|
||||||
// source: focus.proto
|
// source: focus.proto
|
||||||
|
|
||||||
@ -37,11 +20,6 @@ import (
|
|||||||
// Requires gRPC-Go v1.32.0 or later.
|
// Requires gRPC-Go v1.32.0 or later.
|
||||||
const _ = grpc.SupportPackageIsVersion7
|
const _ = grpc.SupportPackageIsVersion7
|
||||||
|
|
||||||
const (
|
|
||||||
Focus_Raise_FullMethodName = "/focus.Focus/Raise"
|
|
||||||
Focus_Version_FullMethodName = "/focus.Focus/Version"
|
|
||||||
)
|
|
||||||
|
|
||||||
// FocusClient is the client API for Focus service.
|
// FocusClient is the client API for Focus service.
|
||||||
//
|
//
|
||||||
// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
|
// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
|
||||||
@ -60,7 +38,7 @@ func NewFocusClient(cc grpc.ClientConnInterface) FocusClient {
|
|||||||
|
|
||||||
func (c *focusClient) Raise(ctx context.Context, in *wrapperspb.StringValue, opts ...grpc.CallOption) (*emptypb.Empty, error) {
|
func (c *focusClient) Raise(ctx context.Context, in *wrapperspb.StringValue, opts ...grpc.CallOption) (*emptypb.Empty, error) {
|
||||||
out := new(emptypb.Empty)
|
out := new(emptypb.Empty)
|
||||||
err := c.cc.Invoke(ctx, Focus_Raise_FullMethodName, in, out, opts...)
|
err := c.cc.Invoke(ctx, "/focus.Focus/Raise", in, out, opts...)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@ -69,7 +47,7 @@ func (c *focusClient) Raise(ctx context.Context, in *wrapperspb.StringValue, opt
|
|||||||
|
|
||||||
func (c *focusClient) Version(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*VersionResponse, error) {
|
func (c *focusClient) Version(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*VersionResponse, error) {
|
||||||
out := new(VersionResponse)
|
out := new(VersionResponse)
|
||||||
err := c.cc.Invoke(ctx, Focus_Version_FullMethodName, in, out, opts...)
|
err := c.cc.Invoke(ctx, "/focus.Focus/Version", in, out, opts...)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@ -118,7 +96,7 @@ func _Focus_Raise_Handler(srv interface{}, ctx context.Context, dec func(interfa
|
|||||||
}
|
}
|
||||||
info := &grpc.UnaryServerInfo{
|
info := &grpc.UnaryServerInfo{
|
||||||
Server: srv,
|
Server: srv,
|
||||||
FullMethod: Focus_Raise_FullMethodName,
|
FullMethod: "/focus.Focus/Raise",
|
||||||
}
|
}
|
||||||
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
|
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
|
||||||
return srv.(FocusServer).Raise(ctx, req.(*wrapperspb.StringValue))
|
return srv.(FocusServer).Raise(ctx, req.(*wrapperspb.StringValue))
|
||||||
@ -136,7 +114,7 @@ func _Focus_Version_Handler(srv interface{}, ctx context.Context, dec func(inter
|
|||||||
}
|
}
|
||||||
info := &grpc.UnaryServerInfo{
|
info := &grpc.UnaryServerInfo{
|
||||||
Server: srv,
|
Server: srv,
|
||||||
FullMethod: Focus_Version_FullMethodName,
|
FullMethod: "/focus.Focus/Version",
|
||||||
}
|
}
|
||||||
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
|
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
|
||||||
return srv.(FocusServer).Version(ctx, req.(*emptypb.Empty))
|
return srv.(FocusServer).Version(ctx, req.(*emptypb.Empty))
|
||||||
|
|||||||
@ -18,6 +18,7 @@
|
|||||||
|
|
||||||
#include "AppController.h"
|
#include "AppController.h"
|
||||||
#include "GRPCService.h"
|
#include "GRPCService.h"
|
||||||
|
#include <bridgepp/GRPC/GRPCUtils.h>
|
||||||
#include <bridgepp/Exception/Exception.h>
|
#include <bridgepp/Exception/Exception.h>
|
||||||
#include "MainWindow.h"
|
#include "MainWindow.h"
|
||||||
#include <bridgepp/Log/Log.h>
|
#include <bridgepp/Log/Log.h>
|
||||||
@ -67,7 +68,7 @@ void AppController::setMainWindow(MainWindow *mainWindow) {
|
|||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
/// \return The main window.
|
/// \return The main window.
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
MainWindow &AppController::mainWindow() const {
|
MainWindow &AppController::mainWindow() {
|
||||||
if (!mainWindow_) {
|
if (!mainWindow_) {
|
||||||
throw Exception("mainWindow has not yet been registered.");
|
throw Exception("mainWindow has not yet been registered.");
|
||||||
}
|
}
|
||||||
@ -78,7 +79,7 @@ MainWindow &AppController::mainWindow() const {
|
|||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
/// \return A reference to the log.
|
/// \return A reference to the log.
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
bridgepp::Log &AppController::log() const {
|
bridgepp::Log &AppController::log() {
|
||||||
return *log_;
|
return *log_;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -86,7 +87,7 @@ bridgepp::Log &AppController::log() const {
|
|||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
/// \return A reference to the bridge-gui log.
|
/// \return A reference to the bridge-gui log.
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
bridgepp::Log &AppController::bridgeGUILog() const {
|
bridgepp::Log &AppController::bridgeGUILog() {
|
||||||
return *bridgeGUILog_;
|
return *bridgeGUILog_;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -94,6 +95,6 @@ bridgepp::Log &AppController::bridgeGUILog() const {
|
|||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
/// \return A reference to the gRPC service.
|
/// \return A reference to the gRPC service.
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
GRPCService &AppController::grpc() const {
|
GRPCService &AppController::grpc() {
|
||||||
return *grpc_;
|
return *grpc_;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -42,10 +42,10 @@ public: // member functions.
|
|||||||
AppController &operator=(AppController const &) = delete; ///< Disabled assignment operator.
|
AppController &operator=(AppController const &) = delete; ///< Disabled assignment operator.
|
||||||
AppController &operator=(AppController &&) = delete; ///< Disabled move assignment operator.
|
AppController &operator=(AppController &&) = delete; ///< Disabled move assignment operator.
|
||||||
void setMainWindow(MainWindow *mainWindow); ///< Set the main window.
|
void setMainWindow(MainWindow *mainWindow); ///< Set the main window.
|
||||||
MainWindow &mainWindow() const; ///< Return the main window.
|
MainWindow &mainWindow(); ///< Return the main window.
|
||||||
bridgepp::Log &log() const; ///< Return a reference to the log.
|
bridgepp::Log &log(); ///< Return a reference to the log.
|
||||||
bridgepp::Log &bridgeGUILog() const; ///< Return a reference to the bridge-gui log.
|
bridgepp::Log &bridgeGUILog(); ///< Return a reference to the bridge-gui log.
|
||||||
GRPCService &grpc() const; ///< Return a reference to the gRPC service.
|
GRPCService &grpc(); ///< Return a reference to the gRPC service.
|
||||||
|
|
||||||
private: // member functions.
|
private: // member functions.
|
||||||
AppController(); ///< Default constructor.
|
AppController(); ///< Default constructor.
|
||||||
|
|||||||
@ -66,13 +66,11 @@ add_executable(bridge-gui-tester
|
|||||||
GRPCQtProxy.cpp GRPCQtProxy.h
|
GRPCQtProxy.cpp GRPCQtProxy.h
|
||||||
GRPCService.cpp GRPCService.h
|
GRPCService.cpp GRPCService.h
|
||||||
GRPCServerWorker.cpp GRPCServerWorker.h
|
GRPCServerWorker.cpp GRPCServerWorker.h
|
||||||
Tabs/EventsTab.cpp Tabs/EventsTab.h
|
|
||||||
Tabs/KnowledgeBaseTab.cpp Tabs/KnowledgeBaseTab.h
|
|
||||||
Tabs/SettingsTab.cpp Tabs/SettingsTab.h
|
Tabs/SettingsTab.cpp Tabs/SettingsTab.h
|
||||||
Tabs/UsersTab.cpp Tabs/UsersTab.h
|
Tabs/UsersTab.cpp Tabs/UsersTab.h
|
||||||
UserDialog.cpp UserDialog.h
|
UserDialog.cpp UserDialog.h
|
||||||
UserTable.cpp UserTable.h
|
UserTable.cpp UserTable.h
|
||||||
)
|
)
|
||||||
|
|
||||||
target_precompile_headers(bridge-gui-tester PRIVATE Pch.h)
|
target_precompile_headers(bridge-gui-tester PRIVATE Pch.h)
|
||||||
target_include_directories(bridge-gui-tester PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
|
target_include_directories(bridge-gui-tester PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
|
||||||
|
|||||||
@ -26,7 +26,7 @@ using namespace grpc;
|
|||||||
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
/// \param[in] serverToken The server token expected from gRPC calls
|
/// \param[in] The server token expected from gRPC calls
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
GRPCMetadataProcessor::GRPCMetadataProcessor(QString const &serverToken)
|
GRPCMetadataProcessor::GRPCMetadataProcessor(QString const &serverToken)
|
||||||
: serverToken_(serverToken.toStdString()) {
|
: serverToken_(serverToken.toStdString()) {
|
||||||
@ -43,16 +43,16 @@ bool GRPCMetadataProcessor::IsBlocking() const {
|
|||||||
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
/// \param authMetadata The authentication metadata.
|
/// \param[in] inputMeta
|
||||||
/// \return the result of the metadata processing.
|
/// \return the result of the metadata processing.
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
Status GRPCMetadataProcessor::Process(InputMetadata const &authMetadata, AuthContext *,
|
Status GRPCMetadataProcessor::Process(AuthMetadataProcessor::InputMetadata const &auth_metadata, AuthContext *,
|
||||||
OutputMetadata *, OutputMetadata *) {
|
AuthMetadataProcessor::OutputMetadata *, AuthMetadataProcessor::OutputMetadata *) {
|
||||||
try {
|
try {
|
||||||
const InputMetadata::const_iterator pathIt = authMetadata.find(":path");
|
AuthMetadataProcessor::InputMetadata::const_iterator pathIt = auth_metadata.find(":path");
|
||||||
QString const callName = (pathIt == authMetadata.end()) ? ("unkown gRPC call") : QString::fromLocal8Bit(pathIt->second);
|
QString const callName = (pathIt == auth_metadata.end()) ? ("unkown gRPC call") : QString::fromLocal8Bit(pathIt->second);
|
||||||
|
|
||||||
AuthMetadataProcessor::InputMetadata::size_type const count = authMetadata.count(grpcMetadataServerTokenKey);
|
AuthMetadataProcessor::InputMetadata::size_type const count = auth_metadata.count(grpcMetadataServerTokenKey);
|
||||||
if (count == 0) {
|
if (count == 0) {
|
||||||
throw Exception(QString("Missing server token in gRPC client call '%1'.").arg(callName));
|
throw Exception(QString("Missing server token in gRPC client call '%1'.").arg(callName));
|
||||||
}
|
}
|
||||||
@ -61,7 +61,7 @@ Status GRPCMetadataProcessor::Process(InputMetadata const &authMetadata, AuthCon
|
|||||||
throw Exception(QString("Several server tokens were provided in gRPC client call '%1'.").arg(callName));
|
throw Exception(QString("Several server tokens were provided in gRPC client call '%1'.").arg(callName));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (authMetadata.find(grpcMetadataServerTokenKey)->second != serverToken_) {
|
if (auth_metadata.find(grpcMetadataServerTokenKey)->second != serverToken_) {
|
||||||
throw Exception(QString("Invalid server token provided by gRPC client call '%1'.").arg(callName));
|
throw Exception(QString("Invalid server token provided by gRPC client call '%1'.").arg(callName));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -70,7 +70,7 @@ Status GRPCMetadataProcessor::Process(InputMetadata const &authMetadata, AuthCon
|
|||||||
}
|
}
|
||||||
catch (Exception const &e) {
|
catch (Exception const &e) {
|
||||||
app().log().error(e.qwhat());
|
app().log().error(e.qwhat());
|
||||||
return Status(UNAUTHENTICATED, e.qwhat().toStdString());
|
return Status(StatusCode::UNAUTHENTICATED, e.qwhat().toStdString());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -35,7 +35,7 @@ public: // member functions.
|
|||||||
GRPCMetadataProcessor &operator=(GRPCMetadataProcessor const &) = delete; ///< Disabled assignment operator.
|
GRPCMetadataProcessor &operator=(GRPCMetadataProcessor const &) = delete; ///< Disabled assignment operator.
|
||||||
GRPCMetadataProcessor &operator=(GRPCMetadataProcessor &&) = delete; ///< Disabled move assignment operator.
|
GRPCMetadataProcessor &operator=(GRPCMetadataProcessor &&) = delete; ///< Disabled move assignment operator.
|
||||||
bool IsBlocking() const override; ///< Is the processor blocking?
|
bool IsBlocking() const override; ///< Is the processor blocking?
|
||||||
grpc::Status Process(InputMetadata const &authMetadata, grpc::AuthContext *context, OutputMetadata *consumed_auth_metadata,
|
grpc::Status Process(InputMetadata const &auth_metadata, grpc::AuthContext *context, OutputMetadata *consumed_auth_metadata,
|
||||||
OutputMetadata *response_metadata) override; ///< Process the metadata
|
OutputMetadata *response_metadata) override; ///< Process the metadata
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|||||||
@ -31,11 +31,10 @@ GRPCQtProxy::GRPCQtProxy()
|
|||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
//
|
//
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
void GRPCQtProxy::connectSignals() const {
|
void GRPCQtProxy::connectSignals() {
|
||||||
MainWindow &mainWindow = app().mainWindow();
|
MainWindow &mainWindow = app().mainWindow();
|
||||||
SettingsTab const &settingsTab = mainWindow.settingsTab();
|
SettingsTab &settingsTab = mainWindow.settingsTab();
|
||||||
UsersTab const &usersTab = mainWindow.usersTab();
|
UsersTab &usersTab = mainWindow.usersTab();
|
||||||
KnowledgeBaseTab const &kbTab = mainWindow.knowledgeBaseTab();
|
|
||||||
connect(this, &GRPCQtProxy::delayedEventRequested, &mainWindow, &MainWindow::sendDelayedEvent);
|
connect(this, &GRPCQtProxy::delayedEventRequested, &mainWindow, &MainWindow::sendDelayedEvent);
|
||||||
connect(this, &GRPCQtProxy::setIsAutostartOnReceived, &settingsTab, &SettingsTab::setIsAutostartOn);
|
connect(this, &GRPCQtProxy::setIsAutostartOnReceived, &settingsTab, &SettingsTab::setIsAutostartOn);
|
||||||
connect(this, &GRPCQtProxy::setIsBetaEnabledReceived, &settingsTab, &SettingsTab::setIsBetaEnabled);
|
connect(this, &GRPCQtProxy::setIsBetaEnabledReceived, &settingsTab, &SettingsTab::setIsBetaEnabled);
|
||||||
@ -43,7 +42,6 @@ void GRPCQtProxy::connectSignals() const {
|
|||||||
connect(this, &GRPCQtProxy::setIsTelemetryDisabledReceived, &settingsTab, &SettingsTab::setIsTelemetryDisabled);
|
connect(this, &GRPCQtProxy::setIsTelemetryDisabledReceived, &settingsTab, &SettingsTab::setIsTelemetryDisabled);
|
||||||
connect(this, &GRPCQtProxy::setColorSchemeNameReceived, &settingsTab, &SettingsTab::setColorSchemeName);
|
connect(this, &GRPCQtProxy::setColorSchemeNameReceived, &settingsTab, &SettingsTab::setColorSchemeName);
|
||||||
connect(this, &GRPCQtProxy::reportBugReceived, &settingsTab, &SettingsTab::setBugReport);
|
connect(this, &GRPCQtProxy::reportBugReceived, &settingsTab, &SettingsTab::setBugReport);
|
||||||
connect(this, &GRPCQtProxy::installTLSCertificateReceived, &settingsTab, &SettingsTab::installTLSCertificate);
|
|
||||||
connect(this, &GRPCQtProxy::exportTLSCertificatesReceived, &settingsTab, &SettingsTab::exportTLSCertificates);
|
connect(this, &GRPCQtProxy::exportTLSCertificatesReceived, &settingsTab, &SettingsTab::exportTLSCertificates);
|
||||||
connect(this, &GRPCQtProxy::setIsStreamingReceived, &settingsTab, &SettingsTab::setIsStreaming);
|
connect(this, &GRPCQtProxy::setIsStreamingReceived, &settingsTab, &SettingsTab::setIsStreaming);
|
||||||
connect(this, &GRPCQtProxy::setClientPlatformReceived, &settingsTab, &SettingsTab::setClientPlatform);
|
connect(this, &GRPCQtProxy::setClientPlatformReceived, &settingsTab, &SettingsTab::setClientPlatform);
|
||||||
@ -57,7 +55,6 @@ void GRPCQtProxy::connectSignals() const {
|
|||||||
connect(this, &GRPCQtProxy::setUserSplitModeReceived, &usersTab, &UsersTab::setUserSplitMode);
|
connect(this, &GRPCQtProxy::setUserSplitModeReceived, &usersTab, &UsersTab::setUserSplitMode);
|
||||||
connect(this, &GRPCQtProxy::configureUserAppleMailReceived, &usersTab, &UsersTab::configureUserAppleMail);
|
connect(this, &GRPCQtProxy::configureUserAppleMailReceived, &usersTab, &UsersTab::configureUserAppleMail);
|
||||||
connect(this, &GRPCQtProxy::sendBadEventUserFeedbackReceived, &usersTab, &UsersTab::processBadEventUserFeedback);
|
connect(this, &GRPCQtProxy::sendBadEventUserFeedbackReceived, &usersTab, &UsersTab::processBadEventUserFeedback);
|
||||||
connect(this, &GRPCQtProxy::requestKnowledgeBaseSuggestionsReceived, &kbTab, &KnowledgeBaseTab::requestKnowledgeBaseSuggestions);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -121,20 +118,6 @@ void GRPCQtProxy::reportBug(QString const &osType, QString const &osVersion, QSt
|
|||||||
emit reportBugReceived(osType, osVersion, emailClient, address, description, includeLogs);
|
emit reportBugReceived(osType, osVersion, emailClient, address, description, includeLogs);
|
||||||
}
|
}
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
/// \param[in] userInput The user input.
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
void GRPCQtProxy::requestKnowledgeBaseSuggestions(QString const& userInput) {
|
|
||||||
emit requestKnowledgeBaseSuggestionsReceived(userInput);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
//
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
void GRPCQtProxy::installTLSCertificate() {
|
|
||||||
emit installTLSCertificateReceived();
|
|
||||||
}
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
/// \param[in] folderPath The folder path.
|
/// \param[in] folderPath The folder path.
|
||||||
@ -166,8 +149,8 @@ void GRPCQtProxy::setClientPlatform(QString const &clientPlatform) {
|
|||||||
/// \param[in] useSSLForIMAP The IMAP connexion mode.
|
/// \param[in] useSSLForIMAP The IMAP connexion mode.
|
||||||
/// \param[in] useSSLForSMTP The IMAP connexion mode.
|
/// \param[in] useSSLForSMTP The IMAP connexion mode.
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
void GRPCQtProxy::setMailServerSettings(qint32 imapPort, qint32 smtpPort, bool useSSLForIMAP, bool useSSLForSMTP) {
|
void GRPCQtProxy::setMailServerSettings(qint32 imapPort, qint32 smtpPort, bool useSSLForIMAP, bool userSSLForSMTP) {
|
||||||
emit setMailServerSettingsReceived(imapPort, smtpPort, useSSLForIMAP, useSSLForSMTP);
|
emit setMailServerSettingsReceived(imapPort, smtpPort, useSSLForIMAP, userSSLForSMTP);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -36,7 +36,7 @@ public: // member functions.
|
|||||||
GRPCQtProxy &operator=(GRPCQtProxy const &) = delete; ///< Disabled assignment operator.
|
GRPCQtProxy &operator=(GRPCQtProxy const &) = delete; ///< Disabled assignment operator.
|
||||||
GRPCQtProxy &operator=(GRPCQtProxy &&) = delete; ///< Disabled move assignment operator.
|
GRPCQtProxy &operator=(GRPCQtProxy &&) = delete; ///< Disabled move assignment operator.
|
||||||
|
|
||||||
void connectSignals() const; // connect the signals to the main window.
|
void connectSignals(); // connect the signals to the main window.
|
||||||
void sendDelayedEvent(bridgepp::SPStreamEvent const &event); ///< Sends a delayed stream event.
|
void sendDelayedEvent(bridgepp::SPStreamEvent const &event); ///< Sends a delayed stream event.
|
||||||
void setIsAutostartOn(bool on); ///< Forwards a SetIsAutostartOn call via a Qt signal.
|
void setIsAutostartOn(bool on); ///< Forwards a SetIsAutostartOn call via a Qt signal.
|
||||||
void setIsBetaEnabled(bool enabled); ///< Forwards a SetIsBetaEnabled call via a Qt signal.
|
void setIsBetaEnabled(bool enabled); ///< Forwards a SetIsBetaEnabled call via a Qt signal.
|
||||||
@ -45,12 +45,10 @@ public: // member functions.
|
|||||||
void setColorSchemeName(QString const &name); ///< Forward a SetColorSchemeName call via a Qt Signal
|
void setColorSchemeName(QString const &name); ///< Forward a SetColorSchemeName call via a Qt Signal
|
||||||
void reportBug(QString const &osType, QString const &osVersion, QString const &emailClient, QString const &address,
|
void reportBug(QString const &osType, QString const &osVersion, QString const &emailClient, QString const &address,
|
||||||
QString const &description, bool includeLogs); ///< Forwards a ReportBug call via a Qt signal.
|
QString const &description, bool includeLogs); ///< Forwards a ReportBug call via a Qt signal.
|
||||||
void requestKnowledgeBaseSuggestions(QString const &userInput); ///< Forwards a RequestKnowledgeBaseSuggestions call via a Qt signal.
|
|
||||||
void installTLSCertificate(); ///< Forwards a InstallTLScertificate call via a Qt signal.
|
|
||||||
void exportTLSCertificates(QString const &folderPath); //< Forward an 'ExportTLSCertificates' call via a Qt signal.
|
void exportTLSCertificates(QString const &folderPath); //< Forward an 'ExportTLSCertificates' call via a Qt signal.
|
||||||
void setIsStreaming(bool isStreaming); ///< Forward a isStreaming internal messages via a Qt signal.
|
void setIsStreaming(bool isStreaming); ///< Forward a isStreaming internal messages via a Qt signal.
|
||||||
void setClientPlatform(QString const &clientPlatform); ///< Forward a setClientPlatform call via a Qt signal.
|
void setClientPlatform(QString const &clientPlatform); ///< Forward a setClientPlatform call via a Qt signal.
|
||||||
void setMailServerSettings(qint32 imapPort, qint32 smtpPort, bool useSSLForIMAP, bool useSSLForSMTP); ///< Forwards a setMailServerSettings' call via a Qt signal.
|
void setMailServerSettings(qint32 imapPort, qint32 smtpPort, bool useSSLForIMAP, bool userSSLForSMTP); ///< Forwards a setMailServerSettings' call via a Qt signal.
|
||||||
void setIsDoHEnabled(bool enabled); ///< Forwards a setIsDoHEnabled call via a Qt signal.
|
void setIsDoHEnabled(bool enabled); ///< Forwards a setIsDoHEnabled call via a Qt signal.
|
||||||
void setDiskCachePath(QString const &path); ///< Forwards a setDiskCachePath call via a Qt signal.
|
void setDiskCachePath(QString const &path); ///< Forwards a setDiskCachePath call via a Qt signal.
|
||||||
void setIsAutomaticUpdateOn(bool on); ///< Forwards a SetIsAutomaticUpdateOn call via a Qt signal.
|
void setIsAutomaticUpdateOn(bool on); ///< Forwards a SetIsAutomaticUpdateOn call via a Qt signal.
|
||||||
@ -69,8 +67,6 @@ signals:
|
|||||||
void setColorSchemeNameReceived(QString const &name); ///< Forward a SetColorScheme call via a Qt Signal
|
void setColorSchemeNameReceived(QString const &name); ///< Forward a SetColorScheme call via a Qt Signal
|
||||||
void reportBugReceived(QString const &osType, QString const &osVersion, QString const &emailClient, QString const &address,
|
void reportBugReceived(QString const &osType, QString const &osVersion, QString const &emailClient, QString const &address,
|
||||||
QString const &description, bool includeLogs); ///< Signal for the ReportBug gRPC call
|
QString const &description, bool includeLogs); ///< Signal for the ReportBug gRPC call
|
||||||
void requestKnowledgeBaseSuggestionsReceived(QString const &userInput); ///< Signal for the RequestKnowledgeBaseSuggestions gRPC call.
|
|
||||||
void installTLSCertificateReceived(); ///< Signal for the InstallTLSCertificate gRPC call.
|
|
||||||
void exportTLSCertificatesReceived(QString const &folderPath); ///< Signal for the ExportTLSCertificates gRPC call.
|
void exportTLSCertificatesReceived(QString const &folderPath); ///< Signal for the ExportTLSCertificates gRPC call.
|
||||||
void setIsStreamingReceived(bool isStreaming); ///< Signal for the IsStreaming internal message.
|
void setIsStreamingReceived(bool isStreaming); ///< Signal for the IsStreaming internal message.
|
||||||
void setClientPlatformReceived(QString const &clientPlatform); ///< Signal for the SetClientPlatform gRPC call.
|
void setClientPlatformReceived(QString const &clientPlatform); ///< Signal for the SetClientPlatform gRPC call.
|
||||||
|
|||||||
@ -50,7 +50,7 @@ void GRPCServerWorker::run() {
|
|||||||
SslServerCredentialsOptions ssl_opts;
|
SslServerCredentialsOptions ssl_opts;
|
||||||
ssl_opts.pem_root_certs = "";
|
ssl_opts.pem_root_certs = "";
|
||||||
ssl_opts.pem_key_cert_pairs.push_back(pair);
|
ssl_opts.pem_key_cert_pairs.push_back(pair);
|
||||||
std::shared_ptr<ServerCredentials> const credentials = SslServerCredentials(ssl_opts);
|
std::shared_ptr<ServerCredentials> credentials = grpc::SslServerCredentials(ssl_opts);
|
||||||
|
|
||||||
GRPCConfig config;
|
GRPCConfig config;
|
||||||
config.cert = testTLSCert;
|
config.cert = testTLSCert;
|
||||||
@ -59,7 +59,8 @@ void GRPCServerWorker::run() {
|
|||||||
credentials->SetAuthMetadataProcessor(processor_); // gRPC interceptors are still experimental in C++, so we use AuthMetadataProcessor
|
credentials->SetAuthMetadataProcessor(processor_); // gRPC interceptors are still experimental in C++, so we use AuthMetadataProcessor
|
||||||
ServerBuilder builder;
|
ServerBuilder builder;
|
||||||
int port = 0; // Port will not be known until ServerBuilder::BuildAndStart() is called
|
int port = 0; // Port will not be known until ServerBuilder::BuildAndStart() is called
|
||||||
if (useFileSocketForGRPC()) {
|
bool const useFileSocket = useFileSocketForGRPC();
|
||||||
|
if (useFileSocket) {
|
||||||
QString const fileSocketPath = getAvailableFileSocketPath();
|
QString const fileSocketPath = getAvailableFileSocketPath();
|
||||||
if (fileSocketPath.isEmpty()) {
|
if (fileSocketPath.isEmpty()) {
|
||||||
throw Exception("Could not get an available file socket.");
|
throw Exception("Could not get an available file socket.");
|
||||||
@ -101,7 +102,7 @@ void GRPCServerWorker::run() {
|
|||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
//
|
//
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
void GRPCServerWorker::stop() const {
|
void GRPCServerWorker::stop() {
|
||||||
if (server_) {
|
if (server_) {
|
||||||
server_->Shutdown();
|
server_->Shutdown();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -40,7 +40,7 @@ public: // member functions.
|
|||||||
GRPCServerWorker &operator=(GRPCServerWorker &&) = delete; ///< Disabled move assignment operator.
|
GRPCServerWorker &operator=(GRPCServerWorker &&) = delete; ///< Disabled move assignment operator.
|
||||||
|
|
||||||
void run() override; ///< Run the worker.
|
void run() override; ///< Run the worker.
|
||||||
void stop() const; ///< Stop the gRPC service.
|
void stop(); ///< Stop the gRPC service.
|
||||||
|
|
||||||
private: // data members
|
private: // data members
|
||||||
std::unique_ptr<grpc::Server> server_ { nullptr }; ///< The gRPC server.
|
std::unique_ptr<grpc::Server> server_ { nullptr }; ///< The gRPC server.
|
||||||
|
|||||||
@ -39,7 +39,7 @@ QString const defaultKeychain = "defaultKeychain"; ///< The default keychain.
|
|||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
//
|
//
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
void GRPCService::connectProxySignals() const {
|
void GRPCService::connectProxySignals() {
|
||||||
qtProxy_.connectSignals();
|
qtProxy_.connectSignals();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -185,7 +185,7 @@ Status GRPCService::SetIsAllMailVisible(ServerContext *, BoolValue const *reques
|
|||||||
/// \param[out] response The response.
|
/// \param[out] response The response.
|
||||||
/// \return The status for the call.
|
/// \return The status for the call.
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
Status GRPCService::IsAllMailVisible(ServerContext *, Empty const *, BoolValue *response) {
|
Status GRPCService::IsAllMailVisible(ServerContext *, Empty const *request, BoolValue *response) {
|
||||||
app().log().debug(__FUNCTION__);
|
app().log().debug(__FUNCTION__);
|
||||||
response->set_value(app().mainWindow().settingsTab().isAllMailVisible());
|
response->set_value(app().mainWindow().settingsTab().isAllMailVisible());
|
||||||
return Status::OK;
|
return Status::OK;
|
||||||
@ -214,16 +214,6 @@ grpc::Status GRPCService::IsTelemetryDisabled(::grpc::ServerContext *, ::google:
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
/// \param[out] response The response.
|
|
||||||
/// \return The status for the call.
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
Status GRPCService::GoOs(ServerContext *, Empty const*, StringValue *response) {
|
|
||||||
response->set_value(app().mainWindow().settingsTab().os().toStdString());
|
|
||||||
return Status::OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
/// \return The status for the call.
|
/// \return The status for the call.
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
@ -354,23 +344,19 @@ Status GRPCService::SetMainExecutable(ServerContext *, StringValue const *reques
|
|||||||
return Status::OK;
|
return Status::OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
/// \param[in] request The request.
|
|
||||||
/// \return The status for the call.
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
grpc::Status GRPCService::RequestKnowledgeBaseSuggestions(ServerContext*, StringValue const* request, Empty*) {
|
|
||||||
QString const userInput = QString::fromUtf8(request->value());
|
|
||||||
app().log().info(QString("RequestKnowledgeBaseSuggestions: %1").arg(userInput.left(10) + "..."));
|
|
||||||
qtProxy_.requestKnowledgeBaseSuggestionsReceived(userInput);
|
|
||||||
|
|
||||||
QList<bridgepp::KnowledgeBaseSuggestion> suggestions;
|
//****************************************************************************************************************************************************
|
||||||
for (qsizetype i = 1; i <= 3; ++i) {
|
/// \param[in] request The request
|
||||||
suggestions.push_back( {
|
//****************************************************************************************************************************************************
|
||||||
.title = QString("Suggested link %1").arg(i),
|
Status GRPCService::ReportBug(ServerContext *, ReportBugRequest const *request, Empty *) {
|
||||||
.url = QString("https://proton.me/support/bridge#%1").arg(i),
|
app().log().debug(__FUNCTION__);
|
||||||
});
|
SettingsTab &tab = app().mainWindow().settingsTab();
|
||||||
}
|
qtProxy_.reportBug(QString::fromStdString(request->ostype()), QString::fromStdString(request->osversion()),
|
||||||
qtProxy_.sendDelayedEvent(newKnowledgeBaseSuggestionsEvent(app().mainWindow().knowledgeBaseTab().getSuggestions()));
|
QString::fromStdString(request->emailclient()), QString::fromStdString(request->address()), QString::fromStdString(request->description()),
|
||||||
|
request->includelogs());
|
||||||
|
qtProxy_.sendDelayedEvent(tab.nextBugReportWillSucceed() ? newReportBugSuccessEvent() : newReportBugErrorEvent());
|
||||||
|
qtProxy_.sendDelayedEvent(newReportBugFinishedEvent());
|
||||||
|
|
||||||
return Status::OK;
|
return Status::OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -378,27 +364,15 @@ grpc::Status GRPCService::RequestKnowledgeBaseSuggestions(ServerContext*, String
|
|||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
/// \param[in] request The request
|
/// \param[in] request The request
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
Status GRPCService::ReportBug(ServerContext *, ReportBugRequest const *request, Empty *) {
|
Status GRPCService::ExportTLSCertificates(ServerContext *, StringValue const *request, Empty *response) {
|
||||||
app().log().debug(__FUNCTION__);
|
SettingsTab &tab = app().mainWindow().settingsTab();
|
||||||
EventsTab const&eventsTab = app().mainWindow().eventsTab();
|
if (!tab.nextTLSCertExportWillSucceed()) {
|
||||||
qtProxy_.reportBug(QString::fromStdString(request->ostype()), QString::fromStdString(request->osversion()),
|
qtProxy_.sendDelayedEvent(newGenericErrorEvent(grpc::TLS_CERT_EXPORT_ERROR));
|
||||||
QString::fromStdString(request->emailclient()), QString::fromStdString(request->address()), QString::fromStdString(request->description()),
|
|
||||||
request->includelogs());
|
|
||||||
SPStreamEvent event;
|
|
||||||
switch (eventsTab.nextBugReportResult()) {
|
|
||||||
case EventsTab::BugReportResult::Success:
|
|
||||||
event = newReportBugSuccessEvent();
|
|
||||||
break;
|
|
||||||
case EventsTab::BugReportResult::Error:
|
|
||||||
event = newReportBugErrorEvent();
|
|
||||||
break;
|
|
||||||
case EventsTab::BugReportResult::DataSharingError:
|
|
||||||
event = newReportBugFallbackEvent();
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
qtProxy_.sendDelayedEvent(event);
|
if (!tab.nextTLSKeyExportWillSucceed()) {
|
||||||
qtProxy_.sendDelayedEvent(newReportBugFinishedEvent());
|
qtProxy_.sendDelayedEvent(newGenericErrorEvent(grpc::TLS_KEY_EXPORT_ERROR));
|
||||||
|
}
|
||||||
|
qtProxy_.exportTLSCertificates(QString::fromStdString(request->value()));
|
||||||
return Status::OK;
|
return Status::OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -411,14 +385,6 @@ Status GRPCService::Login(ServerContext *, LoginRequest const *request, Empty *)
|
|||||||
app().log().debug(__FUNCTION__);
|
app().log().debug(__FUNCTION__);
|
||||||
UsersTab &usersTab = app().mainWindow().usersTab();
|
UsersTab &usersTab = app().mainWindow().usersTab();
|
||||||
loginUsername_ = QString::fromStdString(request->username());
|
loginUsername_ = QString::fromStdString(request->username());
|
||||||
|
|
||||||
SPUser const &user = usersTab.userTable().userWithUsernameOrEmail(QString::fromStdString(request->username()));
|
|
||||||
if (user) {
|
|
||||||
qtProxy_.sendDelayedEvent(newLoginAlreadyLoggedInEvent(user->id()));
|
|
||||||
return Status::OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
if (usersTab.nextUserUsernamePasswordError()) {
|
if (usersTab.nextUserUsernamePasswordError()) {
|
||||||
qtProxy_.sendDelayedEvent(newLoginError(LoginErrorType::USERNAME_PASSWORD_ERROR, usersTab.usernamePasswordErrorMessage()));
|
qtProxy_.sendDelayedEvent(newLoginError(LoginErrorType::USERNAME_PASSWORD_ERROR, usersTab.usernamePasswordErrorMessage()));
|
||||||
return Status::OK;
|
return Status::OK;
|
||||||
@ -432,7 +398,7 @@ Status GRPCService::Login(ServerContext *, LoginRequest const *request, Empty *)
|
|||||||
return Status::OK;
|
return Status::OK;
|
||||||
}
|
}
|
||||||
if (usersTab.nextUserTwoPasswordsRequired()) {
|
if (usersTab.nextUserTwoPasswordsRequired()) {
|
||||||
qtProxy_.sendDelayedEvent(newLoginTwoPasswordsRequestedEvent(loginUsername_));
|
qtProxy_.sendDelayedEvent(newLoginTwoPasswordsRequestedEvent());
|
||||||
return Status::OK;
|
return Status::OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -447,7 +413,7 @@ Status GRPCService::Login(ServerContext *, LoginRequest const *request, Empty *)
|
|||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
Status GRPCService::Login2FA(ServerContext *, LoginRequest const *request, Empty *) {
|
Status GRPCService::Login2FA(ServerContext *, LoginRequest const *request, Empty *) {
|
||||||
app().log().debug(__FUNCTION__);
|
app().log().debug(__FUNCTION__);
|
||||||
UsersTab const &usersTab = app().mainWindow().usersTab();
|
UsersTab &usersTab = app().mainWindow().usersTab();
|
||||||
if (usersTab.nextUserTFAError()) {
|
if (usersTab.nextUserTFAError()) {
|
||||||
qtProxy_.sendDelayedEvent(newLoginError(LoginErrorType::TFA_ERROR, "2FA Error."));
|
qtProxy_.sendDelayedEvent(newLoginError(LoginErrorType::TFA_ERROR, "2FA Error."));
|
||||||
return Status::OK;
|
return Status::OK;
|
||||||
@ -457,7 +423,7 @@ Status GRPCService::Login2FA(ServerContext *, LoginRequest const *request, Empty
|
|||||||
return Status::OK;
|
return Status::OK;
|
||||||
}
|
}
|
||||||
if (usersTab.nextUserTwoPasswordsRequired()) {
|
if (usersTab.nextUserTwoPasswordsRequired()) {
|
||||||
qtProxy_.sendDelayedEvent(newLoginTwoPasswordsRequestedEvent(loginUsername_));
|
qtProxy_.sendDelayedEvent(newLoginTwoPasswordsRequestedEvent());
|
||||||
return Status::OK;
|
return Status::OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -472,7 +438,7 @@ Status GRPCService::Login2FA(ServerContext *, LoginRequest const *request, Empty
|
|||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
Status GRPCService::Login2Passwords(ServerContext *, LoginRequest const *request, Empty *) {
|
Status GRPCService::Login2Passwords(ServerContext *, LoginRequest const *request, Empty *) {
|
||||||
app().log().debug(__FUNCTION__);
|
app().log().debug(__FUNCTION__);
|
||||||
UsersTab const &usersTab = app().mainWindow().usersTab();
|
UsersTab &usersTab = app().mainWindow().usersTab();
|
||||||
|
|
||||||
if (usersTab.nextUserTwoPasswordsError()) {
|
if (usersTab.nextUserTwoPasswordsError()) {
|
||||||
qtProxy_.sendDelayedEvent(newLoginError(LoginErrorType::TWO_PASSWORDS_ERROR, "Two Passwords error."));
|
qtProxy_.sendDelayedEvent(newLoginError(LoginErrorType::TWO_PASSWORDS_ERROR, "Two Passwords error."));
|
||||||
@ -562,12 +528,12 @@ Status GRPCService::DiskCachePath(ServerContext *, Empty const *, StringValue *r
|
|||||||
Status GRPCService::SetDiskCachePath(ServerContext *, StringValue const *path, Empty *) {
|
Status GRPCService::SetDiskCachePath(ServerContext *, StringValue const *path, Empty *) {
|
||||||
app().log().debug(__FUNCTION__);
|
app().log().debug(__FUNCTION__);
|
||||||
|
|
||||||
EventsTab const &eventsTab = app().mainWindow().eventsTab();
|
SettingsTab &tab = app().mainWindow().settingsTab();
|
||||||
QString const qPath = QString::fromStdString(path->value());
|
QString const qPath = QString::fromStdString(path->value());
|
||||||
|
|
||||||
// we mimic the behaviour of Bridge
|
// we mimic the behaviour of Bridge
|
||||||
if (!eventsTab.nextCacheChangeWillSucceed()) {
|
if (!tab.nextCacheChangeWillSucceed()) {
|
||||||
qtProxy_.sendDelayedEvent(newDiskCacheErrorEvent(static_cast<DiskCacheErrorType>(CANT_MOVE_DISK_CACHE_ERROR)));
|
qtProxy_.sendDelayedEvent(newDiskCacheErrorEvent(grpc::DiskCacheErrorType(tab.cacheError())));
|
||||||
} else {
|
} else {
|
||||||
qtProxy_.setDiskCachePath(qPath);
|
qtProxy_.setDiskCachePath(qPath);
|
||||||
qtProxy_.sendDelayedEvent(newDiskCachePathChangedEvent(qPath));
|
qtProxy_.sendDelayedEvent(newDiskCachePathChangedEvent(qPath));
|
||||||
@ -604,7 +570,7 @@ Status GRPCService::IsDoHEnabled(ServerContext *, Empty const *, BoolValue *resp
|
|||||||
/// \param[in] settings The IMAP/SMTP settings.
|
/// \param[in] settings The IMAP/SMTP settings.
|
||||||
/// \return The status for the call.
|
/// \return The status for the call.
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
Status GRPCService::SetMailServerSettings(ServerContext *, ImapSmtpSettings const *settings, Empty *) {
|
Status GRPCService::SetMailServerSettings(::grpc::ServerContext *context, ImapSmtpSettings const *settings, Empty *) {
|
||||||
app().log().debug(__FUNCTION__);
|
app().log().debug(__FUNCTION__);
|
||||||
qtProxy_.setMailServerSettings(settings->imapport(), settings->smtpport(), settings->usesslforimap(), settings->usesslforsmtp());
|
qtProxy_.setMailServerSettings(settings->imapport(), settings->smtpport(), settings->usesslforimap(), settings->usesslforsmtp());
|
||||||
qtProxy_.sendDelayedEvent(newMailServerSettingsChanged(*settings));
|
qtProxy_.sendDelayedEvent(newMailServerSettingsChanged(*settings));
|
||||||
@ -617,9 +583,9 @@ Status GRPCService::SetMailServerSettings(ServerContext *, ImapSmtpSettings cons
|
|||||||
/// \param[out] outSettings The settings
|
/// \param[out] outSettings The settings
|
||||||
/// \return The status for the call.
|
/// \return The status for the call.
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
Status GRPCService::MailServerSettings(ServerContext *, Empty const *, ImapSmtpSettings *outSettings) {
|
Status GRPCService::MailServerSettings(::grpc::ServerContext *, Empty const *, ImapSmtpSettings *outSettings) {
|
||||||
app().log().debug(__FUNCTION__);
|
app().log().debug(__FUNCTION__);
|
||||||
SettingsTab const &tab = app().mainWindow().settingsTab();
|
SettingsTab &tab = app().mainWindow().settingsTab();
|
||||||
outSettings->set_imapport(tab.imapPort());
|
outSettings->set_imapport(tab.imapPort());
|
||||||
outSettings->set_smtpport(tab.smtpPort());
|
outSettings->set_smtpport(tab.smtpPort());
|
||||||
outSettings->set_usesslforimap(tab.useSSLForIMAP());
|
outSettings->set_usesslforimap(tab.useSSLForIMAP());
|
||||||
@ -646,7 +612,7 @@ Status GRPCService::Hostname(ServerContext *, Empty const *, StringValue *respon
|
|||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
Status GRPCService::IsPortFree(ServerContext *, Int32Value const *request, BoolValue *response) {
|
Status GRPCService::IsPortFree(ServerContext *, Int32Value const *request, BoolValue *response) {
|
||||||
app().log().debug(__FUNCTION__);
|
app().log().debug(__FUNCTION__);
|
||||||
response->set_value(app().mainWindow().eventsTab().isPortFree());
|
response->set_value(app().mainWindow().settingsTab().isPortFree());
|
||||||
return Status::OK;
|
return Status::OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -717,8 +683,8 @@ Status GRPCService::GetUserList(ServerContext *, Empty const *, UserListResponse
|
|||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
Status GRPCService::GetUser(ServerContext *, StringValue const *request, grpc::User *response) {
|
Status GRPCService::GetUser(ServerContext *, StringValue const *request, grpc::User *response) {
|
||||||
app().log().debug(__FUNCTION__);
|
app().log().debug(__FUNCTION__);
|
||||||
QString const userID = QString::fromStdString(request->value());
|
QString userID = QString::fromStdString(request->value());
|
||||||
SPUser const user = app().mainWindow().usersTab().userWithID(userID);
|
SPUser user = app().mainWindow().usersTab().userWithID(userID);
|
||||||
if (!user) {
|
if (!user) {
|
||||||
return Status(NOT_FOUND, QString("user not found %1").arg(userID).toStdString());
|
return Status(NOT_FOUND, QString("user not found %1").arg(userID).toStdString());
|
||||||
}
|
}
|
||||||
@ -782,87 +748,10 @@ Status GRPCService::ConfigureUserAppleMail(ServerContext *, ConfigureAppleMailRe
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
/// \param[in] request The request
|
|
||||||
/// \return The status for the call.
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
Status GRPCService::ExportTLSCertificates(ServerContext *, StringValue const *request, Empty *) {
|
|
||||||
app().log().debug(__FUNCTION__);
|
|
||||||
SettingsTab const &tab = app().mainWindow().settingsTab();
|
|
||||||
if (!tab.nextTLSCertExportWillSucceed()) {
|
|
||||||
qtProxy_.sendDelayedEvent(newGenericErrorEvent(TLS_CERT_EXPORT_ERROR));
|
|
||||||
}
|
|
||||||
if (!tab.nextTLSKeyExportWillSucceed()) {
|
|
||||||
qtProxy_.sendDelayedEvent(newGenericErrorEvent(TLS_KEY_EXPORT_ERROR));
|
|
||||||
}
|
|
||||||
qtProxy_.exportTLSCertificates(QString::fromStdString(request->value()));
|
|
||||||
return Status::OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
/// \param[in] response The reponse.
|
|
||||||
/// \return The status for the call.
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
Status GRPCService::IsTLSCertificateInstalled(ServerContext *, const Empty *request, BoolValue *response) {
|
|
||||||
app().log().debug(__FUNCTION__);
|
|
||||||
response->set_value(app().mainWindow().settingsTab().isTLSCertificateInstalled());
|
|
||||||
return Status::OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
//
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
Status GRPCService::InstallTLSCertificate(ServerContext *, Empty const *, Empty *) {
|
|
||||||
app().log().debug(__FUNCTION__);
|
|
||||||
SPStreamEvent event;
|
|
||||||
qtProxy_.installTLSCertificate();
|
|
||||||
switch (app().mainWindow().settingsTab().nextTLSCertInstallResult()) {
|
|
||||||
case SettingsTab::TLSCertInstallResult::Success:
|
|
||||||
event = newCertificateInstallSuccessEvent();
|
|
||||||
break;
|
|
||||||
case SettingsTab::TLSCertInstallResult::Canceled:
|
|
||||||
event = newCertificateInstallCanceledEvent();
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
event = newCertificateInstallFailedEvent();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
qtProxy_.sendDelayedEvent(event);
|
|
||||||
return Status::OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
/// \param[in] request The request.
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
Status GRPCService::ExternalLinkClicked(::grpc::ServerContext *, ::google::protobuf::StringValue const *request, ::google::protobuf::Empty *) {
|
|
||||||
app().log().debug(QString("%1 - URL = %2").arg(__FUNCTION__, QString::fromStdString(request->value())));
|
|
||||||
return Status::OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
//
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
Status GRPCService::ReportBugClicked(::grpc::ServerContext *, ::google::protobuf::Empty const *, ::google::protobuf::Empty *) {
|
|
||||||
app().log().debug(__FUNCTION__);
|
|
||||||
return Status::OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
/// \param[in] request The request.
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
Status GRPCService::AutoconfigClicked(::grpc::ServerContext *, ::google::protobuf::StringValue const *request, ::google::protobuf::Empty *response) {
|
|
||||||
app().log().debug(QString("%1 - Client = %2").arg(__FUNCTION__, QString::fromStdString(request->value())));
|
|
||||||
return Status::OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
/// \param[in] request The request
|
/// \param[in] request The request
|
||||||
/// \param[in] writer The writer
|
/// \param[in] writer The writer
|
||||||
|
/// \return The status for the call.
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
Status GRPCService::RunEventStream(ServerContext *ctx, EventStreamRequest const *request, ServerWriter<StreamEvent> *writer) {
|
Status GRPCService::RunEventStream(ServerContext *ctx, EventStreamRequest const *request, ServerWriter<StreamEvent> *writer) {
|
||||||
app().log().debug(__FUNCTION__);
|
app().log().debug(__FUNCTION__);
|
||||||
@ -937,7 +826,7 @@ bool GRPCService::sendEvent(SPStreamEvent const &event) {
|
|||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
void GRPCService::finishLogin() {
|
void GRPCService::finishLogin() {
|
||||||
UsersTab &usersTab = app().mainWindow().usersTab();
|
UsersTab &usersTab = app().mainWindow().usersTab();
|
||||||
SPUser user = usersTab.userWithUsernameOrEmail(loginUsername_);
|
SPUser user = usersTab.userWithUsername(loginUsername_);
|
||||||
bool const alreadyExist = user.get();
|
bool const alreadyExist = user.get();
|
||||||
if (!user) {
|
if (!user) {
|
||||||
user = randomUser();
|
user = randomUser();
|
||||||
@ -953,3 +842,4 @@ void GRPCService::finishLogin() {
|
|||||||
|
|
||||||
qtProxy_.sendDelayedEvent(newLoginFinishedEvent(user->id(), alreadyExist));
|
qtProxy_.sendDelayedEvent(newLoginFinishedEvent(user->id(), alreadyExist));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -37,7 +37,7 @@ public: // member functions.
|
|||||||
~GRPCService() override = default; ///< Destructor.
|
~GRPCService() override = default; ///< Destructor.
|
||||||
GRPCService &operator=(GRPCService const &) = delete; ///< Disabled assignment operator.
|
GRPCService &operator=(GRPCService const &) = delete; ///< Disabled assignment operator.
|
||||||
GRPCService &operator=(GRPCService &&) = delete; ///< Disabled move assignment operator.
|
GRPCService &operator=(GRPCService &&) = delete; ///< Disabled move assignment operator.
|
||||||
void connectProxySignals() const; ///< Connect the signals of the Qt Proxy to the GUI components
|
void connectProxySignals(); ///< Connect the signals of the Qt Proxy to the GUI components
|
||||||
bool isStreaming() const; ///< Check if the service is currently streaming events.
|
bool isStreaming() const; ///< Check if the service is currently streaming events.
|
||||||
grpc::Status CheckTokens(::grpc::ServerContext *context, ::google::protobuf::StringValue const *request, ::google::protobuf::StringValue *response) override;
|
grpc::Status CheckTokens(::grpc::ServerContext *context, ::google::protobuf::StringValue const *request, ::google::protobuf::StringValue *response) override;
|
||||||
grpc::Status AddLogEntry(::grpc::ServerContext *, ::grpc::AddLogEntryRequest const *request, ::google::protobuf::Empty *) override;
|
grpc::Status AddLogEntry(::grpc::ServerContext *, ::grpc::AddLogEntryRequest const *request, ::google::protobuf::Empty *) override;
|
||||||
@ -53,7 +53,6 @@ public: // member functions.
|
|||||||
grpc::Status IsAllMailVisible(::grpc::ServerContext *context, ::google::protobuf::Empty const *request, ::google::protobuf::BoolValue *response) override;
|
grpc::Status IsAllMailVisible(::grpc::ServerContext *context, ::google::protobuf::Empty const *request, ::google::protobuf::BoolValue *response) override;
|
||||||
grpc::Status SetIsTelemetryDisabled(::grpc::ServerContext *, ::google::protobuf::BoolValue const *request, ::google::protobuf::Empty *response) override;
|
grpc::Status SetIsTelemetryDisabled(::grpc::ServerContext *, ::google::protobuf::BoolValue const *request, ::google::protobuf::Empty *response) override;
|
||||||
grpc::Status IsTelemetryDisabled(::grpc::ServerContext *, ::google::protobuf::Empty const *request, ::google::protobuf::BoolValue *response) override;
|
grpc::Status IsTelemetryDisabled(::grpc::ServerContext *, ::google::protobuf::Empty const *request, ::google::protobuf::BoolValue *response) override;
|
||||||
grpc::Status GoOs(::grpc::ServerContext *, ::google::protobuf::Empty const*, ::google::protobuf::StringValue *response) override;
|
|
||||||
grpc::Status TriggerReset(::grpc::ServerContext *, ::google::protobuf::Empty const *, ::google::protobuf::Empty *) override;
|
grpc::Status TriggerReset(::grpc::ServerContext *, ::google::protobuf::Empty const *, ::google::protobuf::Empty *) override;
|
||||||
grpc::Status Version(::grpc::ServerContext *, ::google::protobuf::Empty const *, ::google::protobuf::StringValue *response) override;
|
grpc::Status Version(::grpc::ServerContext *, ::google::protobuf::Empty const *, ::google::protobuf::StringValue *response) override;
|
||||||
grpc::Status LogsPath(::grpc::ServerContext *, ::google::protobuf::Empty const *, ::google::protobuf::StringValue *response) override;
|
grpc::Status LogsPath(::grpc::ServerContext *, ::google::protobuf::Empty const *, ::google::protobuf::StringValue *response) override;
|
||||||
@ -65,9 +64,9 @@ public: // member functions.
|
|||||||
grpc::Status ColorSchemeName(::grpc::ServerContext *, ::google::protobuf::Empty const *, ::google::protobuf::StringValue *response) override;
|
grpc::Status ColorSchemeName(::grpc::ServerContext *, ::google::protobuf::Empty const *, ::google::protobuf::StringValue *response) override;
|
||||||
grpc::Status CurrentEmailClient(::grpc::ServerContext *, ::google::protobuf::Empty const *, ::google::protobuf::StringValue *response) override;
|
grpc::Status CurrentEmailClient(::grpc::ServerContext *, ::google::protobuf::Empty const *, ::google::protobuf::StringValue *response) override;
|
||||||
grpc::Status ReportBug(::grpc::ServerContext *, ::grpc::ReportBugRequest const *request, ::google::protobuf::Empty *) override;
|
grpc::Status ReportBug(::grpc::ServerContext *, ::grpc::ReportBugRequest const *request, ::google::protobuf::Empty *) override;
|
||||||
|
grpc::Status ExportTLSCertificates(::grpc::ServerContext *context, ::google::protobuf::StringValue const *request, ::google::protobuf::Empty *response) override;
|
||||||
grpc::Status ForceLauncher(::grpc::ServerContext *, ::google::protobuf::StringValue const *request, ::google::protobuf::Empty *) override;
|
grpc::Status ForceLauncher(::grpc::ServerContext *, ::google::protobuf::StringValue const *request, ::google::protobuf::Empty *) override;
|
||||||
grpc::Status SetMainExecutable(::grpc::ServerContext *, ::google::protobuf::StringValue const *request, ::google::protobuf::Empty *) override;
|
grpc::Status SetMainExecutable(::grpc::ServerContext *, ::google::protobuf::StringValue const *request, ::google::protobuf::Empty *) override;
|
||||||
grpc::Status RequestKnowledgeBaseSuggestions(::grpc::ServerContext *, ::google::protobuf::StringValue const *request, ::google::protobuf::Empty *) override;
|
|
||||||
grpc::Status Login(::grpc::ServerContext *, ::grpc::LoginRequest const *request, ::google::protobuf::Empty *) override;
|
grpc::Status Login(::grpc::ServerContext *, ::grpc::LoginRequest const *request, ::google::protobuf::Empty *) override;
|
||||||
grpc::Status Login2FA(::grpc::ServerContext *, ::grpc::LoginRequest const *request, ::google::protobuf::Empty *) override;
|
grpc::Status Login2FA(::grpc::ServerContext *, ::grpc::LoginRequest const *request, ::google::protobuf::Empty *) override;
|
||||||
grpc::Status Login2Passwords(::grpc::ServerContext *, ::grpc::LoginRequest const *request, ::google::protobuf::Empty *) override;
|
grpc::Status Login2Passwords(::grpc::ServerContext *, ::grpc::LoginRequest const *request, ::google::protobuf::Empty *) override;
|
||||||
@ -94,12 +93,6 @@ public: // member functions.
|
|||||||
grpc::Status LogoutUser(::grpc::ServerContext *, ::google::protobuf::StringValue const *request, ::google::protobuf::Empty *) override;
|
grpc::Status LogoutUser(::grpc::ServerContext *, ::google::protobuf::StringValue const *request, ::google::protobuf::Empty *) override;
|
||||||
grpc::Status RemoveUser(::grpc::ServerContext *, ::google::protobuf::StringValue const *request, ::google::protobuf::Empty *) override;
|
grpc::Status RemoveUser(::grpc::ServerContext *, ::google::protobuf::StringValue const *request, ::google::protobuf::Empty *) override;
|
||||||
grpc::Status ConfigureUserAppleMail(::grpc::ServerContext *, ::grpc::ConfigureAppleMailRequest const *request, ::google::protobuf::Empty *) override;
|
grpc::Status ConfigureUserAppleMail(::grpc::ServerContext *, ::grpc::ConfigureAppleMailRequest const *request, ::google::protobuf::Empty *) override;
|
||||||
grpc::Status IsTLSCertificateInstalled(::grpc::ServerContext *, ::google::protobuf::Empty const*, ::google::protobuf::BoolValue *response) override;
|
|
||||||
grpc::Status InstallTLSCertificate(::grpc::ServerContext *, ::google::protobuf::Empty const*, ::google::protobuf::Empty *) override;
|
|
||||||
grpc::Status ExportTLSCertificates(::grpc::ServerContext *, ::google::protobuf::StringValue const *request, ::google::protobuf::Empty *) override;
|
|
||||||
grpc::Status ReportBugClicked(::grpc::ServerContext *context, ::google::protobuf::Empty const *request, ::google::protobuf::Empty *) override;
|
|
||||||
grpc::Status AutoconfigClicked(::grpc::ServerContext *context, ::google::protobuf::StringValue const *request, ::google::protobuf::Empty *) override;
|
|
||||||
grpc::Status ExternalLinkClicked(::grpc::ServerContext *, ::google::protobuf::StringValue const *request, ::google::protobuf::Empty *) override;
|
|
||||||
grpc::Status RunEventStream(::grpc::ServerContext *ctx, ::grpc::EventStreamRequest const *request, ::grpc::ServerWriter<::grpc::StreamEvent> *writer) override;
|
grpc::Status RunEventStream(::grpc::ServerContext *ctx, ::grpc::EventStreamRequest const *request, ::grpc::ServerWriter<::grpc::StreamEvent> *writer) override;
|
||||||
grpc::Status StopEventStream(::grpc::ServerContext *, ::google::protobuf::Empty const *, ::google::protobuf::Empty *) override;
|
grpc::Status StopEventStream(::grpc::ServerContext *, ::google::protobuf::Empty const *, ::google::protobuf::Empty *) override;
|
||||||
bool sendEvent(bridgepp::SPStreamEvent const &event); ///< Queue an event for sending through the event stream.
|
bool sendEvent(bridgepp::SPStreamEvent const &event); ///< Queue an event for sending through the event stream.
|
||||||
|
|||||||
@ -63,7 +63,7 @@ MainWindow::MainWindow(QWidget *parent)
|
|||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
/// \return A reference to the 'General' tab.
|
/// \return A reference to the 'General' tab.
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
SettingsTab &MainWindow::settingsTab() const {
|
SettingsTab &MainWindow::settingsTab() {
|
||||||
return *ui_.settingsTab;
|
return *ui_.settingsTab;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -71,32 +71,16 @@ SettingsTab &MainWindow::settingsTab() const {
|
|||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
/// \return A reference to the users tab.
|
/// \return A reference to the users tab.
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
UsersTab &MainWindow::usersTab() const {
|
UsersTab &MainWindow::usersTab() {
|
||||||
return *ui_.usersTab;
|
return *ui_.usersTab;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
/// \return A reference to the events tab.
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
EventsTab& MainWindow::eventsTab() const {
|
|
||||||
return *ui_.eventsTab;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
/// \return A reference to the knowledge base tab.
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
KnowledgeBaseTab& MainWindow::knowledgeBaseTab() const {
|
|
||||||
return *ui_.knowledgeBaseTab;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
/// \param[in] level The log level.
|
/// \param[in] level The log level.
|
||||||
/// \param[in] message The log message
|
/// \param[in] message The log message
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
void MainWindow::addLogEntry(bridgepp::Log::Level level, const QString &message) const {
|
void MainWindow::addLogEntry(bridgepp::Log::Level level, const QString &message) {
|
||||||
addEntryToLogEdit(level, message, *ui_.editLog);
|
addEntryToLogEdit(level, message, *ui_.editLog);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -105,7 +89,7 @@ void MainWindow::addLogEntry(bridgepp::Log::Level level, const QString &message)
|
|||||||
/// \param[in] level The log level.
|
/// \param[in] level The log level.
|
||||||
/// \param[in] message The log message
|
/// \param[in] message The log message
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
void MainWindow::addBridgeGUILogEntry(bridgepp::Log::Level level, const QString &message) const {
|
void MainWindow::addBridgeGUILogEntry(bridgepp::Log::Level level, const QString &message) {
|
||||||
addEntryToLogEdit(level, message, *ui_.editBridgeGUILog);
|
addEntryToLogEdit(level, message, *ui_.editBridgeGUILog);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -113,8 +97,8 @@ void MainWindow::addBridgeGUILogEntry(bridgepp::Log::Level level, const QString
|
|||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
/// \param[in] event The event.
|
/// \param[in] event The event.
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
void MainWindow::sendDelayedEvent(SPStreamEvent const &event) const {
|
void MainWindow::sendDelayedEvent(SPStreamEvent const &event) {
|
||||||
QTimer::singleShot(this->eventsTab().eventDelayMs(), [event] { app().grpc().sendEvent(event); });
|
QTimer::singleShot(this->settingsTab().eventDelayMs(), [event] { app().grpc().sendEvent(event); });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -38,17 +38,15 @@ public: // member functions.
|
|||||||
MainWindow &operator=(MainWindow const &) = delete; ///< Disabled assignment operator.
|
MainWindow &operator=(MainWindow const &) = delete; ///< Disabled assignment operator.
|
||||||
MainWindow &operator=(MainWindow &&) = delete; ///< Disabled move assignment operator.
|
MainWindow &operator=(MainWindow &&) = delete; ///< Disabled move assignment operator.
|
||||||
|
|
||||||
SettingsTab &settingsTab() const; ///< Returns a reference the 'Settings' tab.
|
SettingsTab &settingsTab(); ///< Returns a reference the 'Settings' tab.
|
||||||
UsersTab &usersTab() const; ///< Returns a reference to the 'Users' tab.
|
UsersTab &usersTab(); ///< Returns a reference to the 'Users' tab.
|
||||||
EventsTab &eventsTab() const; ///< Returns a reference to the 'Events' tab.
|
|
||||||
KnowledgeBaseTab &knowledgeBaseTab() const; ///< Returns a reference to the 'Knowledge Base' tab.
|
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
void sendDelayedEvent(bridgepp::SPStreamEvent const &event) const; ///< Sends a gRPC event after the delay specified in the UI. The call is non blocking.
|
void sendDelayedEvent(bridgepp::SPStreamEvent const &event); ///< Sends a gRPC event after the delay specified in the UI. The call is non blocking.
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void addLogEntry(bridgepp::Log::Level level, QString const &message) const; ///< Add an entry to the log.
|
void addLogEntry(bridgepp::Log::Level level, QString const &message); ///< Add an entry to the log.
|
||||||
void addBridgeGUILogEntry(bridgepp::Log::Level level, const QString &message) const; ///< Add an entry to the log.
|
void addBridgeGUILogEntry(bridgepp::Log::Level level, const QString &message); ///< Add an entry to the log.
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Ui::MainWindow ui_ {}; ///< The GUI for the window.
|
Ui::MainWindow ui_ {}; ///< The GUI for the window.
|
||||||
|
|||||||
@ -6,8 +6,8 @@
|
|||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>1096</width>
|
<width>1226</width>
|
||||||
<height>876</height>
|
<height>1086</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
@ -22,7 +22,7 @@
|
|||||||
</property>
|
</property>
|
||||||
<widget class="QTabWidget" name="tabTop">
|
<widget class="QTabWidget" name="tabTop">
|
||||||
<property name="currentIndex">
|
<property name="currentIndex">
|
||||||
<number>3</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
<widget class="SettingsTab" name="settingsTab">
|
<widget class="SettingsTab" name="settingsTab">
|
||||||
<attribute name="title">
|
<attribute name="title">
|
||||||
@ -34,16 +34,6 @@
|
|||||||
<string>Users</string>
|
<string>Users</string>
|
||||||
</attribute>
|
</attribute>
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="EventsTab" name="eventsTab">
|
|
||||||
<attribute name="title">
|
|
||||||
<string>Events && Errors</string>
|
|
||||||
</attribute>
|
|
||||||
</widget>
|
|
||||||
<widget class="KnowledgeBaseTab" name="knowledgeBaseTab">
|
|
||||||
<attribute name="title">
|
|
||||||
<string>Knowledge Base</string>
|
|
||||||
</attribute>
|
|
||||||
</widget>
|
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QTabWidget" name="tabBottom">
|
<widget class="QTabWidget" name="tabBottom">
|
||||||
<property name="currentIndex">
|
<property name="currentIndex">
|
||||||
@ -106,18 +96,6 @@
|
|||||||
<header>Tabs/UsersTab.h</header>
|
<header>Tabs/UsersTab.h</header>
|
||||||
<container>1</container>
|
<container>1</container>
|
||||||
</customwidget>
|
</customwidget>
|
||||||
<customwidget>
|
|
||||||
<class>EventsTab</class>
|
|
||||||
<extends>QWidget</extends>
|
|
||||||
<header>Tabs/EventsTab.h</header>
|
|
||||||
<container>1</container>
|
|
||||||
</customwidget>
|
|
||||||
<customwidget>
|
|
||||||
<class>KnowledgeBaseTab</class>
|
|
||||||
<extends>QWidget</extends>
|
|
||||||
<header>Tabs/KnowledgeBaseTab.h</header>
|
|
||||||
<container>1</container>
|
|
||||||
</customwidget>
|
|
||||||
</customwidgets>
|
</customwidgets>
|
||||||
<resources/>
|
<resources/>
|
||||||
<connections/>
|
<connections/>
|
||||||
|
|||||||
@ -1,109 +0,0 @@
|
|||||||
// Copyright (c) 2023 Proton AG
|
|
||||||
//
|
|
||||||
// This file is part of Proton Mail Bridge.
|
|
||||||
//
|
|
||||||
// Proton Mail 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.
|
|
||||||
//
|
|
||||||
// Proton Mail 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 Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
|
|
||||||
#include "EventsTab.h"
|
|
||||||
#include "GRPCService.h"
|
|
||||||
#include <bridgepp/GRPC/EventFactory.h>
|
|
||||||
|
|
||||||
|
|
||||||
using namespace bridgepp;
|
|
||||||
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
/// \brief Connect an address error button to the generation of an address error event.
|
|
||||||
///
|
|
||||||
/// \param[in] button The error button.
|
|
||||||
/// \param[in] edit The edit containing the address.
|
|
||||||
/// \param[in] eventGenerator The factory function creating the event.
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
void connectAddressError(QPushButton const* button, QLineEdit* edit, SPStreamEvent (*eventGenerator)(QString const&)) {
|
|
||||||
QObject::connect(button, &QPushButton::clicked, [edit, eventGenerator]() { app().grpc().sendEvent(eventGenerator(edit->text())); });
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
/// \param[in] parent The parent widget.
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
EventsTab::EventsTab(QWidget* parent)
|
|
||||||
: QWidget(parent) {
|
|
||||||
ui_.setupUi(this);
|
|
||||||
this->resetUI();
|
|
||||||
|
|
||||||
connect(ui_.buttonInternetOn, &QPushButton::clicked, []() { app().grpc().sendEvent(newInternetStatusEvent(true)); });
|
|
||||||
connect(ui_.buttonInternetOff, &QPushButton::clicked, []() { app().grpc().sendEvent(newInternetStatusEvent(false)); });
|
|
||||||
connect(ui_.buttonShowMainWindow, &QPushButton::clicked, []() { app().grpc().sendEvent(newShowMainWindowEvent()); });
|
|
||||||
connect(ui_.buttonNoKeychain, &QPushButton::clicked, []() { app().grpc().sendEvent(newHasNoKeychainEvent()); });
|
|
||||||
connect(ui_.buttonAPICertIssue, &QPushButton::clicked, []() { app().grpc().sendEvent(newApiCertIssueEvent()); });
|
|
||||||
connectAddressError(ui_.buttonAddressChanged, ui_.editAddressErrors, newAddressChangedEvent);
|
|
||||||
connectAddressError(ui_.buttonAddressChangedLogout, ui_.editAddressErrors, newAddressChangedLogoutEvent);
|
|
||||||
//connect(ui_.checkNextCacheChangeWillSucceed, &QCheckBox::toggled, this, &SettingsTab::updateGUIState);
|
|
||||||
connect(ui_.buttonUpdateError, &QPushButton::clicked, [&]() {
|
|
||||||
app().grpc().sendEvent(newUpdateErrorEvent(static_cast<grpc::UpdateErrorType>(ui_.comboUpdateError->currentIndex())));
|
|
||||||
});
|
|
||||||
connect(ui_.buttonUpdateManualReady, &QPushButton::clicked, [&] {
|
|
||||||
app().grpc().sendEvent(newUpdateManualReadyEvent(ui_.editUpdateVersion->text()));
|
|
||||||
});
|
|
||||||
connect(ui_.buttonUpdateForce, &QPushButton::clicked, [&] {
|
|
||||||
app().grpc().sendEvent(newUpdateForceEvent(ui_.editUpdateVersion->text()));
|
|
||||||
});
|
|
||||||
connect(ui_.buttonUpdateManualRestart, &QPushButton::clicked, []() { app().grpc().sendEvent(newUpdateManualRestartNeededEvent()); });
|
|
||||||
connect(ui_.buttonUpdateSilentRestart, &QPushButton::clicked, []() { app().grpc().sendEvent(newUpdateSilentRestartNeededEvent()); });
|
|
||||||
connect(ui_.buttonUpdateIsLatest, &QPushButton::clicked, []() { app().grpc().sendEvent(newUpdateIsLatestVersionEvent()); });
|
|
||||||
connect(ui_.buttonUpdateCheckFinished, &QPushButton::clicked, []() { app().grpc().sendEvent(newUpdateCheckFinishedEvent()); });
|
|
||||||
connect(ui_.buttonUpdateVersionChanged, &QPushButton::clicked, []() { app().grpc().sendEvent(newUpdateVersionChangedEvent()); });
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
/// \return The delay to apply before sending automatically generated events.
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
qint32 EventsTab::eventDelayMs() const {
|
|
||||||
return ui_.spinEventDelay->value();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
/// \return The bug report results
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
EventsTab::BugReportResult EventsTab::nextBugReportResult() const {
|
|
||||||
return static_cast<BugReportResult>(ui_.comboBugReportResult->currentIndex());
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
/// \return The reply for the next IsPortFree gRPC call.
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
bool EventsTab::isPortFree() const {
|
|
||||||
return ui_.checkIsPortFree->isChecked();
|
|
||||||
}
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
/// \return The value for the 'Next Cache Change Will Succeed' check box.
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
bool EventsTab::nextCacheChangeWillSucceed() const {
|
|
||||||
return ui_.checkNextCacheChangeWillSucceed->isChecked();
|
|
||||||
}
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
//
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
void EventsTab::resetUI() const {
|
|
||||||
ui_.comboBugReportResult->setCurrentIndex(0);
|
|
||||||
ui_.checkIsPortFree->setChecked(true);
|
|
||||||
ui_.checkNextCacheChangeWillSucceed->setChecked(true);
|
|
||||||
}
|
|
||||||
@ -1,59 +0,0 @@
|
|||||||
// Copyright (c) 2023 Proton AG
|
|
||||||
//
|
|
||||||
// This file is part of Proton Mail Bridge.
|
|
||||||
//
|
|
||||||
// Proton Mail 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.
|
|
||||||
//
|
|
||||||
// Proton Mail 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 Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef BRIDGE_GUI_TESTER_EVENTS_TAB_H
|
|
||||||
#define BRIDGE_GUI_TESTER_EVENTS_TAB_H
|
|
||||||
|
|
||||||
|
|
||||||
#include "ui_EventsTab.h"
|
|
||||||
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
/// \brief Events tabs
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
class EventsTab: public QWidget {
|
|
||||||
Q_OBJECT
|
|
||||||
|
|
||||||
public: // data types
|
|
||||||
enum class BugReportResult {
|
|
||||||
Success = 0,
|
|
||||||
Error = 1,
|
|
||||||
DataSharingError = 2,
|
|
||||||
}; ///< Enumeration for the result of bug report sending
|
|
||||||
|
|
||||||
public: // member functions.
|
|
||||||
explicit EventsTab(QWidget *parent = nullptr); ///< Default constructor.
|
|
||||||
EventsTab(EventsTab const&) = delete; ///< Disabled copy-constructor.
|
|
||||||
EventsTab(EventsTab&&) = delete; ///< Disabled assignment copy-constructor.
|
|
||||||
~EventsTab() override = default; ///< Destructor.
|
|
||||||
EventsTab& operator=(EventsTab const&) = delete; ///< Disabled assignment operator.
|
|
||||||
EventsTab& operator=(EventsTab&&) = delete; ///< Disabled move assignment operator.
|
|
||||||
|
|
||||||
qint32 eventDelayMs() const; ///< Get the delay for sending automatically generated events.
|
|
||||||
BugReportResult nextBugReportResult() const; ///< Get the value of the 'Next bug report result' combo box.
|
|
||||||
bool isPortFree() const; ///< Get the value for the "Is Port Free" check box.
|
|
||||||
bool nextCacheChangeWillSucceed() const; ///< Get the value for the 'Next Cache Change will succeed' edit.
|
|
||||||
|
|
||||||
void resetUI() const; ///< Resets the UI.
|
|
||||||
|
|
||||||
private: // data members
|
|
||||||
Ui::EventsTab ui_ {}; ///< The UI for the widget.
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@ -1,359 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<ui version="4.0">
|
|
||||||
<class>EventsTab</class>
|
|
||||||
<widget class="QWidget" name="EventsTab">
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>0</x>
|
|
||||||
<y>0</y>
|
|
||||||
<width>563</width>
|
|
||||||
<height>571</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<property name="windowTitle">
|
|
||||||
<string>Form</string>
|
|
||||||
</property>
|
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
|
||||||
<item>
|
|
||||||
<layout class="QVBoxLayout" name="verticalLayout">
|
|
||||||
<item>
|
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_11">
|
|
||||||
<item>
|
|
||||||
<widget class="QLabel" name="labelEventDelay">
|
|
||||||
<property name="toolTip">
|
|
||||||
<string>Delay applied before sending automatically generated events</string>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Delay for asynchronous events</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QSpinBox" name="spinEventDelay">
|
|
||||||
<property name="suffix">
|
|
||||||
<string> ms</string>
|
|
||||||
</property>
|
|
||||||
<property name="minimum">
|
|
||||||
<number>-1</number>
|
|
||||||
</property>
|
|
||||||
<property name="maximum">
|
|
||||||
<number>3600000</number>
|
|
||||||
</property>
|
|
||||||
<property name="singleStep">
|
|
||||||
<number>100</number>
|
|
||||||
</property>
|
|
||||||
<property name="value">
|
|
||||||
<number>0</number>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<spacer name="horizontalSpacer_5">
|
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Horizontal</enum>
|
|
||||||
</property>
|
|
||||||
<property name="sizeHint" stdset="0">
|
|
||||||
<size>
|
|
||||||
<width>40</width>
|
|
||||||
<height>1</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
</spacer>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QGroupBox" name="groupBox">
|
|
||||||
<property name="minimumSize">
|
|
||||||
<size>
|
|
||||||
<width>0</width>
|
|
||||||
<height>0</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
<property name="title">
|
|
||||||
<string>Address related errors</string>
|
|
||||||
</property>
|
|
||||||
<layout class="QVBoxLayout" name="verticalLayout_9">
|
|
||||||
<item>
|
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_12">
|
|
||||||
<item>
|
|
||||||
<widget class="QLabel" name="label">
|
|
||||||
<property name="text">
|
|
||||||
<string>Address</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QLineEdit" name="editAddressErrors">
|
|
||||||
<property name="text">
|
|
||||||
<string>dummy.user@proton.me</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_15">
|
|
||||||
<item>
|
|
||||||
<widget class="QPushButton" name="buttonAddressChanged">
|
|
||||||
<property name="text">
|
|
||||||
<string>Address Changed</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QPushButton" name="buttonAddressChangedLogout">
|
|
||||||
<property name="text">
|
|
||||||
<string>Address Changed Logout</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<layout class="QGridLayout" name="gridLayout">
|
|
||||||
<item row="0" column="2">
|
|
||||||
<widget class="QCheckBox" name="checkNextCacheChangeWillSucceed">
|
|
||||||
<property name="text">
|
|
||||||
<string>Next Cache Change will succeed</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="3">
|
|
||||||
<spacer name="horizontalSpacer">
|
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Horizontal</enum>
|
|
||||||
</property>
|
|
||||||
<property name="sizeHint" stdset="0">
|
|
||||||
<size>
|
|
||||||
<width>40</width>
|
|
||||||
<height>1</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
</spacer>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="1">
|
|
||||||
<widget class="QCheckBox" name="checkIsPortFree">
|
|
||||||
<property name="text">
|
|
||||||
<string>Reply true to the next 'Is Port Free' request.</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_13">
|
|
||||||
<item>
|
|
||||||
<widget class="QLabel" name="labelNextBugReportResult">
|
|
||||||
<property name="text">
|
|
||||||
<string>Next bug report result</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QComboBox" name="comboBugReportResult">
|
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string>Success</string>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string>Error</string>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string>Data sharing error</string>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<spacer name="horizontalSpacer_2">
|
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Horizontal</enum>
|
|
||||||
</property>
|
|
||||||
<property name="sizeHint" stdset="0">
|
|
||||||
<size>
|
|
||||||
<width>40</width>
|
|
||||||
<height>1</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
</spacer>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<layout class="QGridLayout" name="gridLayout_6">
|
|
||||||
<property name="verticalSpacing">
|
|
||||||
<number>8</number>
|
|
||||||
</property>
|
|
||||||
<item row="0" column="0">
|
|
||||||
<widget class="QPushButton" name="buttonUpdateManualReady">
|
|
||||||
<property name="text">
|
|
||||||
<string>Update Manual Ready</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="2">
|
|
||||||
<widget class="QLineEdit" name="editUpdateVersion">
|
|
||||||
<property name="text">
|
|
||||||
<string>4.0</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="4" column="0">
|
|
||||||
<widget class="QPushButton" name="buttonUpdateVersionChanged">
|
|
||||||
<property name="text">
|
|
||||||
<string>Update version changed</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="1">
|
|
||||||
<widget class="QPushButton" name="buttonUpdateForce">
|
|
||||||
<property name="text">
|
|
||||||
<string>Update Force</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="0">
|
|
||||||
<widget class="QPushButton" name="buttonUpdateManualRestart">
|
|
||||||
<property name="text">
|
|
||||||
<string>Update manual restart</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="2">
|
|
||||||
<widget class="QPushButton" name="buttonUpdateCheckFinished">
|
|
||||||
<property name="text">
|
|
||||||
<string>Update check finished</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="1">
|
|
||||||
<widget class="QPushButton" name="buttonUpdateSilentRestart">
|
|
||||||
<property name="text">
|
|
||||||
<string>Update silent restart</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="2" column="2">
|
|
||||||
<widget class="QComboBox" name="comboUpdateError">
|
|
||||||
<property name="sizeAdjustPolicy">
|
|
||||||
<enum>QComboBox::AdjustToContents</enum>
|
|
||||||
</property>
|
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string>Update manual error</string>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string>Update force error</string>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string>Update silent error</string>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="2" column="1">
|
|
||||||
<widget class="QPushButton" name="buttonUpdateError">
|
|
||||||
<property name="text">
|
|
||||||
<string>Update error</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="2" column="0">
|
|
||||||
<widget class="QPushButton" name="buttonUpdateIsLatest">
|
|
||||||
<property name="text">
|
|
||||||
<string>Update is latest</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="4" column="1" colspan="2">
|
|
||||||
<spacer name="horizontalSpacer_6">
|
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Horizontal</enum>
|
|
||||||
</property>
|
|
||||||
<property name="sizeHint" stdset="0">
|
|
||||||
<size>
|
|
||||||
<width>40</width>
|
|
||||||
<height>1</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
</spacer>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<layout class="QGridLayout" name="gridLayout_5">
|
|
||||||
<property name="horizontalSpacing">
|
|
||||||
<number>-1</number>
|
|
||||||
</property>
|
|
||||||
<property name="verticalSpacing">
|
|
||||||
<number>8</number>
|
|
||||||
</property>
|
|
||||||
<item row="0" column="1">
|
|
||||||
<widget class="QPushButton" name="buttonInternetOn">
|
|
||||||
<property name="text">
|
|
||||||
<string>Internet On</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="2">
|
|
||||||
<widget class="QPushButton" name="buttonShowMainWindow">
|
|
||||||
<property name="text">
|
|
||||||
<string>Show Main Window</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="0">
|
|
||||||
<widget class="QPushButton" name="buttonInternetOff">
|
|
||||||
<property name="text">
|
|
||||||
<string>Internet Off</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="1">
|
|
||||||
<widget class="QPushButton" name="buttonAPICertIssue">
|
|
||||||
<property name="text">
|
|
||||||
<string>API Certficate Issue</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="0">
|
|
||||||
<widget class="QPushButton" name="buttonNoKeychain">
|
|
||||||
<property name="text">
|
|
||||||
<string>No Keychain</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<spacer name="verticalSpacer">
|
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Vertical</enum>
|
|
||||||
</property>
|
|
||||||
<property name="sizeHint" stdset="0">
|
|
||||||
<size>
|
|
||||||
<width>20</width>
|
|
||||||
<height>200</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
</spacer>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
<resources/>
|
|
||||||
<connections/>
|
|
||||||
</ui>
|
|
||||||
@ -1,96 +0,0 @@
|
|||||||
// Copyright (c) 2023 Proton AG
|
|
||||||
//
|
|
||||||
// This file is part of Proton Mail Bridge.
|
|
||||||
//
|
|
||||||
// Proton Mail 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.
|
|
||||||
//
|
|
||||||
// Proton Mail 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 Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
|
|
||||||
#include "KnowledgeBaseTab.h"
|
|
||||||
|
|
||||||
#include "GRPCService.h"
|
|
||||||
#include "bridgepp/GRPC/EventFactory.h"
|
|
||||||
|
|
||||||
|
|
||||||
using namespace bridgepp;
|
|
||||||
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
/// \param[in] parent The parent widget of the tab.
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
KnowledgeBaseTab::KnowledgeBaseTab(QWidget* parent)
|
|
||||||
: QWidget(parent) {
|
|
||||||
ui_.setupUi(this);
|
|
||||||
|
|
||||||
connect(ui_.checkSuggestion1, &QCheckBox::stateChanged, this, &KnowledgeBaseTab::updateGuiState);
|
|
||||||
connect(ui_.checkSuggestion2, &QCheckBox::stateChanged, this, &KnowledgeBaseTab::updateGuiState);
|
|
||||||
connect(ui_.checkSuggestion3, &QCheckBox::stateChanged, this, &KnowledgeBaseTab::updateGuiState);
|
|
||||||
connect(ui_.buttonSend, &QCheckBox::clicked, this, &KnowledgeBaseTab::sendKnowledgeBaseSuggestions);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
/// \param[in] checkbox The check box.
|
|
||||||
/// \param[in] widgets The widgets to conditionally enable.
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
void enableWidgetsIfChecked(QCheckBox const* checkbox, QWidgetList const& widgets) {
|
|
||||||
bool const checked = checkbox->isChecked();
|
|
||||||
for (QWidget *const widget: widgets) {
|
|
||||||
widget->setEnabled(checked);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
/// \return The suggestions.
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
QList<KnowledgeBaseSuggestion> KnowledgeBaseTab::getSuggestions() const {
|
|
||||||
QList<KnowledgeBaseSuggestion> result;
|
|
||||||
if (ui_.checkSuggestion1->isChecked()) {
|
|
||||||
result.push_back({ .url = ui_.editUrl1->text(), .title = ui_.editTitle1->text() });
|
|
||||||
}
|
|
||||||
if (ui_.checkSuggestion2->isChecked()) {
|
|
||||||
result.push_back({ .url = ui_.editUrl2->text(), .title = ui_.editTitle2->text() });
|
|
||||||
}
|
|
||||||
if (ui_.checkSuggestion3->isChecked()) {
|
|
||||||
result.push_back({ .url = ui_.editUrl3->text(), .title = ui_.editTitle3->text() });
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
//
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
void KnowledgeBaseTab::sendKnowledgeBaseSuggestions() const {
|
|
||||||
app().grpc().sendEvent(newKnowledgeBaseSuggestionsEvent(this->getSuggestions()));
|
|
||||||
}
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
//
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
void KnowledgeBaseTab::updateGuiState() {
|
|
||||||
enableWidgetsIfChecked(ui_.checkSuggestion1, { ui_.labelTitle1, ui_.editTitle1, ui_.labelUrl1, ui_.editUrl1});
|
|
||||||
enableWidgetsIfChecked(ui_.checkSuggestion2, { ui_.labelTitle2, ui_.editTitle2, ui_.labelUrl2, ui_.editUrl2});
|
|
||||||
enableWidgetsIfChecked(ui_.checkSuggestion3, { ui_.labelTitle3, ui_.editTitle3, ui_.labelUrl3, ui_.editUrl3});
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
/// \param[in] userInput The user input.
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
void KnowledgeBaseTab::requestKnowledgeBaseSuggestions(QString const& userInput) const {
|
|
||||||
ui_.editUserInput->setPlainText(userInput);
|
|
||||||
ui_.labelLastReceived->setText(tr("Last received: %1").arg(QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss.zzz")));
|
|
||||||
}
|
|
||||||
@ -1,53 +0,0 @@
|
|||||||
// Copyright (c) 2023 Proton AG
|
|
||||||
//
|
|
||||||
// This file is part of Proton Mail Bridge.
|
|
||||||
//
|
|
||||||
// Proton Mail 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.
|
|
||||||
//
|
|
||||||
// Proton Mail 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 Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef BRIDGE_GUI_TESTER_KNOWLEDGE_BASE_TAB_H
|
|
||||||
#define BRIDGE_GUI_TESTER_KNOWLEDGE_BASE_TAB_H
|
|
||||||
|
|
||||||
|
|
||||||
#include "ui_KnowledgeBaseTab.h"
|
|
||||||
#include <bridgepp/GRPC/GRPCClient.h>
|
|
||||||
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
/// \brief Knowledge base table.
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
class KnowledgeBaseTab: public QWidget {
|
|
||||||
public: // member functions.
|
|
||||||
explicit KnowledgeBaseTab(QWidget *parent = nullptr); ///< Default constructor.
|
|
||||||
KnowledgeBaseTab(KnowledgeBaseTab const&) = delete; ///< Disabled copy-constructor.
|
|
||||||
KnowledgeBaseTab(KnowledgeBaseTab&&) = delete; ///< Disabled assignment copy-constructor.
|
|
||||||
~KnowledgeBaseTab() override = default; ///< Destructor.
|
|
||||||
KnowledgeBaseTab& operator=(KnowledgeBaseTab const&) = delete; ///< Disabled assignment operator.
|
|
||||||
KnowledgeBaseTab& operator=(KnowledgeBaseTab&&) = delete; ///< Disabled move assignment operator.
|
|
||||||
QList<bridgepp::KnowledgeBaseSuggestion> getSuggestions() const; ///< Returns the suggestions.
|
|
||||||
|
|
||||||
public slots:
|
|
||||||
void requestKnowledgeBaseSuggestions(QString const &userInput) const; ///< Slot for the 'RequestKnowledgeBaseSuggestions' gRPC call.
|
|
||||||
|
|
||||||
private slots:
|
|
||||||
void sendKnowledgeBaseSuggestions() const; ///< Send a KnowledgeBaseSuggestions event.
|
|
||||||
void updateGuiState(); ///< Update the GUI state.
|
|
||||||
|
|
||||||
private: // data members
|
|
||||||
Ui::KnowledgeBaseTab ui_ {}; ///< The UI for the widget.
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#endif //BRIDGE_GUI_TESTER_KNOWLEDGE_BASE_TAB_H
|
|
||||||
@ -1,239 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<ui version="4.0">
|
|
||||||
<class>KnowledgeBaseTab</class>
|
|
||||||
<widget class="QWidget" name="KnowledgeBaseTab">
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>0</x>
|
|
||||||
<y>0</y>
|
|
||||||
<width>857</width>
|
|
||||||
<height>905</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<property name="windowTitle">
|
|
||||||
<string>Form</string>
|
|
||||||
</property>
|
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
|
||||||
<item>
|
|
||||||
<widget class="QGroupBox" name="groupUserInput">
|
|
||||||
<property name="title">
|
|
||||||
<string>User Input</string>
|
|
||||||
</property>
|
|
||||||
<layout class="QVBoxLayout" name="verticalLayout_2">
|
|
||||||
<item>
|
|
||||||
<widget class="QPlainTextEdit" name="editUserInput">
|
|
||||||
<property name="readOnly">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QLabel" name="labelLastReceived">
|
|
||||||
<property name="text">
|
|
||||||
<string>Last received: never</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<layout class="QVBoxLayout" name="verticalLayout">
|
|
||||||
<item>
|
|
||||||
<widget class="QGroupBox" name="groupBoxSuggestion1">
|
|
||||||
<property name="title">
|
|
||||||
<string>Suggestion 1</string>
|
|
||||||
</property>
|
|
||||||
<layout class="QGridLayout" name="gridLayout">
|
|
||||||
<item row="0" column="0" colspan="2">
|
|
||||||
<widget class="QCheckBox" name="checkSuggestion1">
|
|
||||||
<property name="text">
|
|
||||||
<string>Enabled</string>
|
|
||||||
</property>
|
|
||||||
<property name="checked">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="0">
|
|
||||||
<widget class="QLabel" name="labelTitle1">
|
|
||||||
<property name="text">
|
|
||||||
<string>Title</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="1">
|
|
||||||
<widget class="QLineEdit" name="editTitle1">
|
|
||||||
<property name="text">
|
|
||||||
<string>Automatically start Bridge</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="2" column="0">
|
|
||||||
<widget class="QLabel" name="labelUrl1">
|
|
||||||
<property name="text">
|
|
||||||
<string>URL</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="2" column="1">
|
|
||||||
<widget class="QLineEdit" name="editUrl1">
|
|
||||||
<property name="text">
|
|
||||||
<string>https://proton.me/support/automatically-start-bridge</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QGroupBox" name="groupBoxSuggestion2">
|
|
||||||
<property name="title">
|
|
||||||
<string>Suggestion 2</string>
|
|
||||||
</property>
|
|
||||||
<layout class="QGridLayout" name="gridLayout_2">
|
|
||||||
<item row="0" column="0" colspan="2">
|
|
||||||
<widget class="QCheckBox" name="checkSuggestion2">
|
|
||||||
<property name="text">
|
|
||||||
<string>Enabled</string>
|
|
||||||
</property>
|
|
||||||
<property name="checked">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="0">
|
|
||||||
<widget class="QLabel" name="labelTitle2">
|
|
||||||
<property name="text">
|
|
||||||
<string>Title</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="1">
|
|
||||||
<widget class="QLineEdit" name="editTitle2">
|
|
||||||
<property name="text">
|
|
||||||
<string>Proton Mail Bridge connection issues with Thunderbird, Outlook, and Apple Mail</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="2" column="0">
|
|
||||||
<widget class="QLabel" name="labelUrl2">
|
|
||||||
<property name="text">
|
|
||||||
<string>URL</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="2" column="1">
|
|
||||||
<widget class="QLineEdit" name="editUrl2">
|
|
||||||
<property name="text">
|
|
||||||
<string>https://proton.me/support/bridge-ssl-connection-issue</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QGroupBox" name="groupBoxSuggestion3">
|
|
||||||
<property name="title">
|
|
||||||
<string>Suggestion 3</string>
|
|
||||||
</property>
|
|
||||||
<layout class="QGridLayout" name="gridLayout_3">
|
|
||||||
<item row="0" column="0" colspan="2">
|
|
||||||
<widget class="QCheckBox" name="checkSuggestion3">
|
|
||||||
<property name="text">
|
|
||||||
<string>Enabled</string>
|
|
||||||
</property>
|
|
||||||
<property name="checked">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="0">
|
|
||||||
<widget class="QLabel" name="labelTitle3">
|
|
||||||
<property name="text">
|
|
||||||
<string>Title</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="1">
|
|
||||||
<widget class="QLineEdit" name="editTitle3">
|
|
||||||
<property name="text">
|
|
||||||
<string>Difference between combined addresses mode and split addresses mode</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="2" column="0">
|
|
||||||
<widget class="QLabel" name="labelUrl3">
|
|
||||||
<property name="text">
|
|
||||||
<string>URL</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="2" column="1">
|
|
||||||
<widget class="QLineEdit" name="editUrl3">
|
|
||||||
<property name="text">
|
|
||||||
<string>https://proton.me/support/difference-combined-addresses-mode-split-addresses-mode</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
|
||||||
<item>
|
|
||||||
<spacer name="horizontalSpacer">
|
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Horizontal</enum>
|
|
||||||
</property>
|
|
||||||
<property name="sizeHint" stdset="0">
|
|
||||||
<size>
|
|
||||||
<width>40</width>
|
|
||||||
<height>20</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
</spacer>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QPushButton" name="buttonSend">
|
|
||||||
<property name="text">
|
|
||||||
<string>Send Knowledge Base Suggestions</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<spacer name="horizontalSpacer_2">
|
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Horizontal</enum>
|
|
||||||
</property>
|
|
||||||
<property name="sizeHint" stdset="0">
|
|
||||||
<size>
|
|
||||||
<width>40</width>
|
|
||||||
<height>20</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
</spacer>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<spacer name="verticalSpacer">
|
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Vertical</enum>
|
|
||||||
</property>
|
|
||||||
<property name="sizeHint" stdset="0">
|
|
||||||
<size>
|
|
||||||
<width>208</width>
|
|
||||||
<height>289</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
</spacer>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
<resources/>
|
|
||||||
<connections/>
|
|
||||||
</ui>
|
|
||||||
@ -18,6 +18,7 @@
|
|||||||
|
|
||||||
#include "SettingsTab.h"
|
#include "SettingsTab.h"
|
||||||
#include "GRPCService.h"
|
#include "GRPCService.h"
|
||||||
|
#include <bridgepp/GRPC/EventFactory.h>
|
||||||
#include <bridgepp/BridgeUtils.h>
|
#include <bridgepp/BridgeUtils.h>
|
||||||
|
|
||||||
|
|
||||||
@ -37,6 +38,23 @@ SettingsTab::SettingsTab(QWidget *parent)
|
|||||||
: QWidget(parent) {
|
: QWidget(parent) {
|
||||||
ui_.setupUi(this);
|
ui_.setupUi(this);
|
||||||
|
|
||||||
|
connect(ui_.buttonInternetOn, &QPushButton::clicked, []() { app().grpc().sendEvent(newInternetStatusEvent(true)); });
|
||||||
|
connect(ui_.buttonInternetOff, &QPushButton::clicked, []() { app().grpc().sendEvent(newInternetStatusEvent(false)); });
|
||||||
|
connect(ui_.buttonShowMainWindow, &QPushButton::clicked, []() { app().grpc().sendEvent(newShowMainWindowEvent()); });
|
||||||
|
connect(ui_.buttonAPICertIssue, &QPushButton::clicked, []() { app().grpc().sendEvent(newApiCertIssueEvent()); });
|
||||||
|
connect(ui_.buttonDiskCacheUnavailable, &QPushButton::clicked, []() {
|
||||||
|
app().grpc().sendEvent(
|
||||||
|
newDiskCacheErrorEvent(grpc::DiskCacheErrorType::DISK_CACHE_UNAVAILABLE_ERROR));
|
||||||
|
});
|
||||||
|
connect(ui_.buttonDiskFull, &QPushButton::clicked, []() {
|
||||||
|
app().grpc().sendEvent(
|
||||||
|
newDiskCacheErrorEvent(grpc::DiskCacheErrorType::DISK_FULL_ERROR));
|
||||||
|
});
|
||||||
|
connect(ui_.buttonNoActiveKeyForRecipient, &QPushButton::clicked, [&]() {
|
||||||
|
app().grpc().sendEvent(
|
||||||
|
newNoActiveKeyForRecipientEvent(ui_.editNoActiveKeyForRecipient->text()));
|
||||||
|
});
|
||||||
|
connect(ui_.checkNextCacheChangeWillSucceed, &QCheckBox::toggled, this, &SettingsTab::updateGUIState);
|
||||||
this->resetUI();
|
this->resetUI();
|
||||||
this->updateGUIState();
|
this->updateGUIState();
|
||||||
}
|
}
|
||||||
@ -46,10 +64,11 @@ SettingsTab::SettingsTab(QWidget *parent)
|
|||||||
//
|
//
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
void SettingsTab::updateGUIState() {
|
void SettingsTab::updateGUIState() {
|
||||||
bool const connected = app().grpc().isStreaming();
|
bool connected = app().grpc().isStreaming();
|
||||||
for (QWidget *widget: { ui_.groupVersion, ui_.groupGeneral, ui_.groupMail, ui_.groupPaths, ui_.groupCache }) {
|
for (QWidget *widget: { ui_.groupVersion, ui_.groupGeneral, ui_.groupMail, ui_.groupPaths, ui_.groupCache }) {
|
||||||
widget->setEnabled(!connected);
|
widget->setEnabled(!connected);
|
||||||
}
|
}
|
||||||
|
ui_.comboCacheError->setEnabled(!ui_.checkNextCacheChangeWillSucceed->isChecked());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -65,7 +84,7 @@ void SettingsTab::setIsStreaming(bool isStreaming) {
|
|||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
/// \param[in] clientPlatform The client platform.
|
/// \param[in] clientPlatform The client platform.
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
void SettingsTab::setClientPlatform(QString const &clientPlatform) const {
|
void SettingsTab::setClientPlatform(QString const &clientPlatform) {
|
||||||
ui_.labelClientPlatformValue->setText(clientPlatform);
|
ui_.labelClientPlatformValue->setText(clientPlatform);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -120,7 +139,7 @@ bool SettingsTab::showSplashScreen() const {
|
|||||||
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
/// \return true iff autostart is on.
|
/// \return true iff autosart is on.
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
bool SettingsTab::isAutostartOn() const {
|
bool SettingsTab::isAutostartOn() const {
|
||||||
return ui_.checkAutostart->isChecked();
|
return ui_.checkAutostart->isChecked();
|
||||||
@ -130,7 +149,7 @@ bool SettingsTab::isAutostartOn() const {
|
|||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
/// \param[in] on Should autostart be turned on?
|
/// \param[in] on Should autostart be turned on?
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
void SettingsTab::setIsAutostartOn(bool on) const {
|
void SettingsTab::setIsAutostartOn(bool on) {
|
||||||
ui_.checkAutostart->setChecked(on);
|
ui_.checkAutostart->setChecked(on);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -146,7 +165,7 @@ QString SettingsTab::colorSchemeName() const {
|
|||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
/// \param[in] name True if the 'Use Dark Theme' check box should be checked.
|
/// \param[in] name True if the 'Use Dark Theme' check box should be checked.
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
void SettingsTab::setColorSchemeName(QString const &name) const {
|
void SettingsTab::setColorSchemeName(QString const &name) {
|
||||||
ui_.checkDarkTheme->setChecked(name == colorSchemeDark);
|
ui_.checkDarkTheme->setChecked(name == colorSchemeDark);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -162,7 +181,7 @@ bool SettingsTab::isBetaEnabled() const {
|
|||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
/// \param[in] enabled The new state for the 'Beta Enabled' check box.
|
/// \param[in] enabled The new state for the 'Beta Enabled' check box.
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
void SettingsTab::setIsBetaEnabled(bool enabled) const {
|
void SettingsTab::setIsBetaEnabled(bool enabled) {
|
||||||
ui_.checkBetaEnabled->setChecked(enabled);
|
ui_.checkBetaEnabled->setChecked(enabled);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -178,7 +197,7 @@ bool SettingsTab::isAllMailVisible() const {
|
|||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
/// \param[in] visible The new value for the 'All Mail Visible' check box.
|
/// \param[in] visible The new value for the 'All Mail Visible' check box.
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
void SettingsTab::setIsAllMailVisible(bool visible) const {
|
void SettingsTab::setIsAllMailVisible(bool visible) {
|
||||||
ui_.checkAllMailVisible->setChecked(visible);
|
ui_.checkAllMailVisible->setChecked(visible);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -194,11 +213,19 @@ bool SettingsTab::isTelemetryDisabled() const {
|
|||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
/// \param[in] isDisabled The new value for the 'Disable Telemetry' check box.
|
/// \param[in] isDisabled The new value for the 'Disable Telemetry' check box.
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
void SettingsTab::setIsTelemetryDisabled(bool isDisabled) const {
|
void SettingsTab::setIsTelemetryDisabled(bool isDisabled) {
|
||||||
ui_.checkIsTelemetryDisabled->setChecked(isDisabled);
|
ui_.checkIsTelemetryDisabled->setChecked(isDisabled);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
//****************************************************************************************************************************************************
|
||||||
|
/// \return The delay to apply before sending automatically generated events.
|
||||||
|
//****************************************************************************************************************************************************
|
||||||
|
qint32 SettingsTab::eventDelayMs() const {
|
||||||
|
return ui_.spinEventDelay->value();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
/// \return The path
|
/// \return The path
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
@ -248,7 +275,7 @@ QString SettingsTab::landingPageLink() const {
|
|||||||
/// \param[in] includeLogs Are the log included.
|
/// \param[in] includeLogs Are the log included.
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
void SettingsTab::setBugReport(QString const &osType, QString const &osVersion, QString const &emailClient, QString const &address,
|
void SettingsTab::setBugReport(QString const &osType, QString const &osVersion, QString const &emailClient, QString const &address,
|
||||||
QString const &description, bool includeLogs) const {
|
QString const &description, bool includeLogs) {
|
||||||
ui_.editOSType->setText(osType);
|
ui_.editOSType->setText(osType);
|
||||||
ui_.editOSVersion->setText(osVersion);
|
ui_.editOSVersion->setText(osVersion);
|
||||||
ui_.editEmailClient->setText(emailClient);
|
ui_.editEmailClient->setText(emailClient);
|
||||||
@ -258,36 +285,21 @@ void SettingsTab::setBugReport(QString const &osType, QString const &osVersion,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
//
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
void SettingsTab::installTLSCertificate() const {
|
|
||||||
ui_.labelLastTLSCertInstall->setText(QString("Last install: %1").arg(QDateTime::currentDateTime().toString(Qt::ISODateWithMs)));
|
|
||||||
ui_.checkTLSCertIsInstalled->setChecked(this->nextTLSCertInstallResult() == TLSCertInstallResult::Success);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
/// \param[in] folderPath The folder path.
|
/// \param[in] folderPath The folder path.
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
void SettingsTab::exportTLSCertificates(QString const &folderPath) const {
|
void SettingsTab::exportTLSCertificates(QString const &folderPath) {
|
||||||
ui_.labeLastTLSCertExport->setText(QString("%1 Export to %2").arg(QDateTime::currentDateTime().toString(Qt::ISODateWithMs),folderPath));
|
ui_.labeLastTLSCertsExport->setText(QString("%1 Export to %2")
|
||||||
|
.arg(QDateTime::currentDateTime().toString(Qt::ISODateWithMs))
|
||||||
|
.arg(folderPath));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
/// \return the state of the 'TLS Certificate is installed' check box.
|
/// \return The state of the check box.
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
bool SettingsTab::isTLSCertificateInstalled() const {
|
bool SettingsTab::nextBugReportWillSucceed() const {
|
||||||
return ui_.checkTLSCertIsInstalled->isChecked();
|
return ui_.checkNextBugReportWillSucceed->isChecked();
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
/// \return The value for the 'Next TLS cert install result'.
|
|
||||||
//****************************************************************************************************************************************************
|
|
||||||
SettingsTab::TLSCertInstallResult SettingsTab::nextTLSCertInstallResult() const {
|
|
||||||
return static_cast<TLSCertInstallResult>(ui_.comboNextTLSCertInstallResult->currentIndex());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -318,7 +330,7 @@ QString SettingsTab::hostname() const {
|
|||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
/// \return The value of the IMAP port spin box.
|
/// \return The value of the IMAP port spin box.
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
qint32 SettingsTab::imapPort() const {
|
qint32 SettingsTab::imapPort() {
|
||||||
return ui_.spinPortIMAP->value();
|
return ui_.spinPortIMAP->value();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -326,7 +338,7 @@ qint32 SettingsTab::imapPort() const {
|
|||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
/// \return The value of the SMTP port spin box.
|
/// \return The value of the SMTP port spin box.
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
qint32 SettingsTab::smtpPort() const {
|
qint32 SettingsTab::smtpPort() {
|
||||||
return ui_.spinPortSMTP->value();
|
return ui_.spinPortSMTP->value();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -337,7 +349,7 @@ qint32 SettingsTab::smtpPort() const {
|
|||||||
/// \param[in] useSSLForIMAP The IMAP connexion mode.
|
/// \param[in] useSSLForIMAP The IMAP connexion mode.
|
||||||
/// \param[in] useSSLForSMTP The IMAP connexion mode.
|
/// \param[in] useSSLForSMTP The IMAP connexion mode.
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
void SettingsTab::setMailServerSettings(qint32 imapPort, qint32 smtpPort, bool useSSLForIMAP, bool useSSLForSMTP) const {
|
void SettingsTab::setMailServerSettings(qint32 imapPort, qint32 smtpPort, bool useSSLForIMAP, bool useSSLForSMTP) {
|
||||||
ui_.spinPortIMAP->setValue(imapPort);
|
ui_.spinPortIMAP->setValue(imapPort);
|
||||||
ui_.spinPortSMTP->setValue(smtpPort);
|
ui_.spinPortSMTP->setValue(smtpPort);
|
||||||
ui_.checkUseSSLForIMAP->setChecked(useSSLForIMAP);
|
ui_.checkUseSSLForIMAP->setChecked(useSSLForIMAP);
|
||||||
@ -372,15 +384,23 @@ bool SettingsTab::isDoHEnabled() const {
|
|||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
/// \param[in] enabled The state of the 'DoH enabled' check box.
|
/// \param[in] enabled The state of the 'DoH enabled' check box.
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
void SettingsTab::setIsDoHEnabled(bool enabled) const {
|
void SettingsTab::setIsDoHEnabled(bool enabled) {
|
||||||
ui_.checkDoHEnabled->setChecked(enabled);
|
ui_.checkDoHEnabled->setChecked(enabled);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
//****************************************************************************************************************************************************
|
||||||
|
/// \return The reply for the next IsPortFree gRPC call.
|
||||||
|
//****************************************************************************************************************************************************
|
||||||
|
bool SettingsTab::isPortFree() const {
|
||||||
|
return ui_.checkIsPortFree->isChecked();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
/// \param[in] path The path of the local cache.
|
/// \param[in] path The path of the local cache.
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
void SettingsTab::setDiskCachePath(const QString &path) const {
|
void SettingsTab::setDiskCachePath(const QString &path) {
|
||||||
ui_.editDiskCachePath->setText(path);
|
ui_.editDiskCachePath->setText(path);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -393,6 +413,22 @@ QString SettingsTab::diskCachePath() const {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
//****************************************************************************************************************************************************
|
||||||
|
/// \return The value for the 'Next Cache Change Will Succeed' check box.
|
||||||
|
//****************************************************************************************************************************************************
|
||||||
|
bool SettingsTab::nextCacheChangeWillSucceed() const {
|
||||||
|
return ui_.checkNextCacheChangeWillSucceed->isChecked();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
//****************************************************************************************************************************************************
|
||||||
|
/// \return The index of the selected cache error.
|
||||||
|
//****************************************************************************************************************************************************
|
||||||
|
qint32 SettingsTab::cacheError() const {
|
||||||
|
return ui_.comboCacheError->currentIndex();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
/// \return the value for the 'Automatic Update' check.
|
/// \return the value for the 'Automatic Update' check.
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
@ -404,7 +440,7 @@ bool SettingsTab::isAutomaticUpdateOn() const {
|
|||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
/// \param[in] on The value for the 'Automatic Update' check.
|
/// \param[in] on The value for the 'Automatic Update' check.
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
void SettingsTab::setIsAutomaticUpdateOn(bool on) const {
|
void SettingsTab::setIsAutomaticUpdateOn(bool on) {
|
||||||
ui_.checkAutomaticUpdate->setChecked(on);
|
ui_.checkAutomaticUpdate->setChecked(on);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -453,23 +489,20 @@ void SettingsTab::resetUI() {
|
|||||||
ui_.editAddress->setText(QString());
|
ui_.editAddress->setText(QString());
|
||||||
ui_.editDescription->setPlainText(QString());
|
ui_.editDescription->setPlainText(QString());
|
||||||
ui_.labelIncludeLogsValue->setText(QString());
|
ui_.labelIncludeLogsValue->setText(QString());
|
||||||
|
ui_.checkNextBugReportWillSucceed->setChecked(true);
|
||||||
|
|
||||||
ui_.editHostname->setText("localhost");
|
ui_.editHostname->setText("localhost");
|
||||||
ui_.spinPortIMAP->setValue(1143);
|
ui_.spinPortIMAP->setValue(1143);
|
||||||
ui_.spinPortSMTP->setValue(1025);
|
ui_.spinPortSMTP->setValue(1025);
|
||||||
ui_.checkUseSSLForSMTP->setChecked(false);
|
ui_.checkUseSSLForSMTP->setChecked(false);
|
||||||
ui_.checkDoHEnabled->setChecked(true);
|
ui_.checkDoHEnabled->setChecked(true);
|
||||||
|
ui_.checkIsPortFree->setChecked(true);
|
||||||
|
|
||||||
QString const cacheDir = QDir(tmpDir).absoluteFilePath("cache");
|
QString const cacheDir = QDir(tmpDir).absoluteFilePath("cache");
|
||||||
QDir().mkpath(cacheDir);
|
QDir().mkpath(cacheDir);
|
||||||
ui_.editDiskCachePath->setText(QDir::toNativeSeparators(cacheDir));
|
ui_.editDiskCachePath->setText(QDir::toNativeSeparators(cacheDir));
|
||||||
|
ui_.checkNextCacheChangeWillSucceed->setChecked(true);
|
||||||
|
ui_.comboCacheError->setCurrentIndex(0);
|
||||||
|
|
||||||
ui_.checkAutomaticUpdate->setChecked(true);
|
ui_.checkAutomaticUpdate->setChecked(true);
|
||||||
|
|
||||||
ui_.checkTLSCertIsInstalled->setChecked(false);
|
|
||||||
ui_.comboNextTLSCertInstallResult->setCurrentIndex(0);
|
|
||||||
ui_.checkTLSCertExportWillSucceed->setChecked(true);
|
|
||||||
ui_.checkTLSKeyExportWillSucceed->setChecked(true);
|
|
||||||
ui_.labeLastTLSCertExport->setText("Last export: never");
|
|
||||||
ui_.labelLastTLSCertInstall->setText("Last install: never");
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -28,18 +28,11 @@
|
|||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
class SettingsTab : public QWidget {
|
class SettingsTab : public QWidget {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public: // data types.
|
|
||||||
enum class TLSCertInstallResult {
|
|
||||||
Success = 0,
|
|
||||||
Canceled = 1,
|
|
||||||
Failure = 2
|
|
||||||
}; ///< Enumeration for the result of a TLS certificate installation.
|
|
||||||
|
|
||||||
public: // member functions.
|
public: // member functions.
|
||||||
explicit SettingsTab(QWidget *parent = nullptr); ///< Default constructor.
|
explicit SettingsTab(QWidget *parent = nullptr); ///< Default constructor.
|
||||||
SettingsTab(SettingsTab const &) = delete; ///< Disabled copy-constructor.
|
SettingsTab(SettingsTab const &) = delete; ///< Disabled copy-constructor.
|
||||||
SettingsTab(SettingsTab &&) = delete; ///< Disabled assignment copy-constructor.
|
SettingsTab(SettingsTab &&) = delete; ///< Disabled assignment copy-constructor.
|
||||||
~SettingsTab() override = default; ///< Destructor.
|
~SettingsTab() = default; ///< Destructor.
|
||||||
SettingsTab &operator=(SettingsTab const &) = delete; ///< Disabled assignment operator.
|
SettingsTab &operator=(SettingsTab const &) = delete; ///< Disabled assignment operator.
|
||||||
SettingsTab &operator=(SettingsTab &&) = delete; ///< Disabled move assignment operator.
|
SettingsTab &operator=(SettingsTab &&) = delete; ///< Disabled move assignment operator.
|
||||||
|
|
||||||
@ -54,47 +47,49 @@ public: // member functions.
|
|||||||
bool isAllMailVisible() const; ///< Get the value for the 'All Mail Visible' check.
|
bool isAllMailVisible() const; ///< Get the value for the 'All Mail Visible' check.
|
||||||
bool isTelemetryDisabled() const; ///< Get the value for the 'Disable Telemetry' check box.
|
bool isTelemetryDisabled() const; ///< Get the value for the 'Disable Telemetry' check box.
|
||||||
QString colorSchemeName() const; ///< Get the value of the 'Use Dark Theme' checkbox.
|
QString colorSchemeName() const; ///< Get the value of the 'Use Dark Theme' checkbox.
|
||||||
|
qint32 eventDelayMs() const; ///< Get the delay for sending automatically generated events.
|
||||||
QString logsPath() const; ///< Get the content of the 'Logs Path' edit.
|
QString logsPath() const; ///< Get the content of the 'Logs Path' edit.
|
||||||
QString licensePath() const; ///< Get the content of the 'License Path' edit.
|
QString licensePath() const; ///< Get the content of the 'License Path' edit.
|
||||||
QString releaseNotesPageLink() const; ///< Get the content of the 'Release Notes Page Link' edit.
|
QString releaseNotesPageLink() const; ///< Get the content of the 'Release Notes Page Link' edit.
|
||||||
QString dependencyLicenseLink() const; ///< Get the content of the 'Dependency License Link' edit.
|
QString dependencyLicenseLink() const; ///< Get the content of the 'Dependency License Link' edit.
|
||||||
QString landingPageLink() const; ///< Get the content of the 'Landing Page Link' edit.
|
QString landingPageLink() const; ///< Get the content of the 'Landing Page Link' edit.
|
||||||
bool isTLSCertificateInstalled() const; ///< Get the status of the 'TLS Certificate is installed' check box.
|
bool nextBugReportWillSucceed() const; ///< Get the status of the 'Next Bug Report Will Fail' check box.
|
||||||
TLSCertInstallResult nextTLSCertInstallResult() const; ///< Get the value of the 'Next TLS Certificate install result' combo box.
|
|
||||||
bool nextTLSCertExportWillSucceed() const; ///< Get the status of the 'Next TLS Cert export will succeed' check box.
|
bool nextTLSCertExportWillSucceed() const; ///< Get the status of the 'Next TLS Cert export will succeed' check box.
|
||||||
bool nextTLSKeyExportWillSucceed() const; ///< Get the status of the 'Next TLS Key export will succeed' check box.
|
bool nextTLSKeyExportWillSucceed() const; ///< Get the status of the 'Next TLS Key export will succeed' check box.
|
||||||
QString hostname() const; ///< Get the value of the 'Hostname' edit.
|
QString hostname() const; ///< Get the value of the 'Hostname' edit.
|
||||||
qint32 imapPort() const; ///< Get the value of the IMAP port spin.
|
qint32 imapPort(); ///< Get the value of the IMAP port spin.
|
||||||
qint32 smtpPort() const; ///< Get the value of the SMTP port spin.
|
qint32 smtpPort(); ///< Get the value of the SMTP port spin.
|
||||||
bool useSSLForSMTP() const; ///< Get the value for the 'Use SSL for SMTP' check box.
|
bool useSSLForSMTP() const; ///< Get the value for the 'Use SSL for SMTP' check box.
|
||||||
bool useSSLForIMAP() const; ///< Get the value for the 'Use SSL for IMAP' check box.
|
bool useSSLForIMAP() const; ///< Get the value for the 'Use SSL for IMAP' check box.
|
||||||
bool isDoHEnabled() const; ///< Get the value for the 'DoH Enabled' check box.
|
bool isDoHEnabled() const; ///< Get the value for the 'DoH Enabled' check box.
|
||||||
|
bool isPortFree() const; ///< Get the value for the "Is Port Free" check box.
|
||||||
QString diskCachePath() const; ///< Get the value for the 'Disk Cache Path' edit.
|
QString diskCachePath() const; ///< Get the value for the 'Disk Cache Path' edit.
|
||||||
|
bool nextCacheChangeWillSucceed() const; ///< Get the value for the 'Next Cache Change will succeed' edit.
|
||||||
|
qint32 cacheError() const; ///< Return the index of the selected cache error.
|
||||||
bool isAutomaticUpdateOn() const; ///<Get the value for the 'Automatic Update' check box.
|
bool isAutomaticUpdateOn() const; ///<Get the value for the 'Automatic Update' check box.
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
void updateGUIState(); ///< Update the GUI state.
|
void updateGUIState(); ///< Update the GUI state.
|
||||||
void setIsStreaming(bool isStreaming); ///< Set the isStreamingEvents value.
|
void setIsStreaming(bool isStreaming); ///< Set the isStreamingEvents value.
|
||||||
void setClientPlatform(QString const &clientPlatform) const; ///< Set the client platform.
|
void setClientPlatform(QString const &clientPlatform); ///< Set the client platform.
|
||||||
void setIsAutostartOn(bool on) const; ///< Set the value for the 'Autostart' check box.
|
void setIsAutostartOn(bool on); ///< Set the value for the 'Autostart' check box.
|
||||||
void setIsBetaEnabled(bool enabled) const; ///< Set the value for the 'Beta Enabled' check box.
|
void setIsBetaEnabled(bool enabled); ///< Set the value for the 'Beta Enabled' check box.
|
||||||
void setIsAllMailVisible(bool visible) const; ///< Set the value for the 'All Mail Visible' check box.
|
void setIsAllMailVisible(bool visible); ///< Set the value for the 'All Mail Visible' check box.
|
||||||
void setIsTelemetryDisabled(bool isDisabled) const; ///< Set the value for the 'Disable Telemetry' check box.
|
void setIsTelemetryDisabled(bool isDisabled); ///< Set the value for the 'Disable Telemetry' check box.
|
||||||
void setColorSchemeName(QString const &name) const; ///< Set the value for the 'Use Dark Theme' check box.
|
void setColorSchemeName(QString const &name); ///< Set the value for the 'Use Dark Theme' check box.
|
||||||
void setBugReport(QString const &osType, QString const &osVersion, QString const &emailClient, QString const &address, QString const &description,
|
void setBugReport(QString const &osType, QString const &osVersion, QString const &emailClient, QString const &address, QString const &description,
|
||||||
bool includeLogs) const; ///< Set the content of the bug report box.
|
bool includeLogs); ///< Set the content of the bug report box.
|
||||||
void installTLSCertificate() const; ///< Install the TLS certificate.
|
void exportTLSCertificates(QString const &folderPath); ///< Export the TLS certificates.
|
||||||
void exportTLSCertificates(QString const &folderPath) const; ///< Export the TLS certificates.
|
void setMailServerSettings(qint32 imapPort, qint32 smtpPort, bool useSSLForIMAP, bool useSSLForSMTP); ///< Change the mail server settings.
|
||||||
void setMailServerSettings(qint32 imapPort, qint32 smtpPort, bool useSSLForIMAP, bool useSSLForSMTP) const; ///< Change the mail server settings.
|
void setIsDoHEnabled(bool enabled); ///< Set the value for the 'DoH Enabled' check box.
|
||||||
void setIsDoHEnabled(bool enabled) const; ///< Set the value for the 'DoH Enabled' check box.
|
void setDiskCachePath(QString const &path); ///< Set the value for the 'Cache On Disk Enabled' check box.
|
||||||
void setDiskCachePath(QString const &path) const; ///< Set the value for the 'Cache On Disk Enabled' check box.
|
void setIsAutomaticUpdateOn(bool on); ///< Set the value for the 'Automatic Update' check box.
|
||||||
void setIsAutomaticUpdateOn(bool on) const; ///< Set the value for the 'Automatic Update' check box.
|
|
||||||
|
|
||||||
private: // member functions.
|
private: // member functions.
|
||||||
void resetUI(); ///< Reset the widget.
|
void resetUI(); ///< Reset the widget.
|
||||||
|
|
||||||
private: // data members.
|
private: // data members.
|
||||||
Ui::SettingsTab ui_ {}; ///< The GUI for the tab
|
Ui::SettingsTab ui_; ///< The GUI for the tab
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -6,8 +6,8 @@
|
|||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>1146</width>
|
<width>1127</width>
|
||||||
<height>716</height>
|
<height>808</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
@ -18,9 +18,6 @@
|
|||||||
<layout class="QHBoxLayout" name="horizontalLayout_5">
|
<layout class="QHBoxLayout" name="horizontalLayout_5">
|
||||||
<item>
|
<item>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout">
|
<layout class="QVBoxLayout" name="verticalLayout">
|
||||||
<property name="spacing">
|
|
||||||
<number>4</number>
|
|
||||||
</property>
|
|
||||||
<item>
|
<item>
|
||||||
<widget class="QGroupBox" name="groupVersion">
|
<widget class="QGroupBox" name="groupVersion">
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
@ -106,9 +103,6 @@
|
|||||||
<string>General Settings</string>
|
<string>General Settings</string>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QGridLayout" name="gridLayout_2">
|
<layout class="QGridLayout" name="gridLayout_2">
|
||||||
<property name="verticalSpacing">
|
|
||||||
<number>4</number>
|
|
||||||
</property>
|
|
||||||
<item row="0" column="0">
|
<item row="0" column="0">
|
||||||
<widget class="QCheckBox" name="checkShowOnStartup">
|
<widget class="QCheckBox" name="checkShowOnStartup">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
@ -192,9 +186,6 @@
|
|||||||
<string>Mail</string>
|
<string>Mail</string>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout_6">
|
<layout class="QVBoxLayout" name="verticalLayout_6">
|
||||||
<property name="spacing">
|
|
||||||
<number>4</number>
|
|
||||||
</property>
|
|
||||||
<item>
|
<item>
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_6" stretch="0,0">
|
<layout class="QHBoxLayout" name="horizontalLayout_6" stretch="0,0">
|
||||||
<item>
|
<item>
|
||||||
@ -208,7 +199,7 @@
|
|||||||
<widget class="QLineEdit" name="editHostname">
|
<widget class="QLineEdit" name="editHostname">
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>0</width>
|
<width>200</width>
|
||||||
<height>0</height>
|
<height>0</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
@ -296,9 +287,6 @@
|
|||||||
<string>Paths && Links</string>
|
<string>Paths && Links</string>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QGridLayout" name="gridLayout">
|
<layout class="QGridLayout" name="gridLayout">
|
||||||
<property name="verticalSpacing">
|
|
||||||
<number>4</number>
|
|
||||||
</property>
|
|
||||||
<item row="0" column="0">
|
<item row="0" column="0">
|
||||||
<widget class="QLabel" name="labelLogsPath">
|
<widget class="QLabel" name="labelLogsPath">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
@ -382,7 +370,7 @@
|
|||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QGroupBox" name="groupCert">
|
<widget class="QGroupBox" name="groupCache_2">
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>0</width>
|
<width>0</width>
|
||||||
@ -392,84 +380,34 @@
|
|||||||
<property name="title">
|
<property name="title">
|
||||||
<string>TLS Certficates</string>
|
<string>TLS Certficates</string>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QGridLayout" name="gridLayout_4" columnstretch="1,1">
|
<layout class="QVBoxLayout" name="verticalLayout_9">
|
||||||
<property name="verticalSpacing">
|
<item>
|
||||||
<number>4</number>
|
<widget class="QLabel" name="labeLastTLSCertsExport">
|
||||||
</property>
|
|
||||||
<item row="0" column="0">
|
|
||||||
<widget class="QCheckBox" name="checkTLSCertIsInstalled">
|
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Certificate is installed</string>
|
<string>Last Export: Never</string>
|
||||||
</property>
|
|
||||||
<property name="checked">
|
|
||||||
<bool>false</bool>
|
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="0" column="1">
|
<item>
|
||||||
<widget class="QCheckBox" name="checkTLSCertExportWillSucceed">
|
<widget class="QCheckBox" name="checkTLSCertExportWillSucceed">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Certificate export will succeed</string>
|
<string>TLS certificate export will succeed</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="checked">
|
<property name="checked">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="1" column="1">
|
<item>
|
||||||
<widget class="QCheckBox" name="checkTLSKeyExportWillSucceed">
|
<widget class="QCheckBox" name="checkTLSKeyExportWillSucceed">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Key export will succeed</string>
|
<string>TLS private key export will succeed</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="checked">
|
<property name="checked">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="2" column="1">
|
|
||||||
<widget class="QLabel" name="labeLastTLSCertExport">
|
|
||||||
<property name="text">
|
|
||||||
<string>Last Export: never</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="2" column="0">
|
|
||||||
<widget class="QLabel" name="labelLastTLSCertInstall">
|
|
||||||
<property name="text">
|
|
||||||
<string>Last install: never</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="0">
|
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_14" stretch="0,1">
|
|
||||||
<item>
|
|
||||||
<widget class="QLabel" name="labelNextInstall">
|
|
||||||
<property name="text">
|
|
||||||
<string>Next install will</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QComboBox" name="comboNextTLSCertInstallResult">
|
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string>Succeed</string>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string>Be Canceled</string>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string>Fail</string>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</item>
|
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@ -502,9 +440,6 @@
|
|||||||
<string>Status</string>
|
<string>Status</string>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout_3">
|
<layout class="QVBoxLayout" name="verticalLayout_3">
|
||||||
<property name="spacing">
|
|
||||||
<number>5</number>
|
|
||||||
</property>
|
|
||||||
<item>
|
<item>
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
||||||
<item>
|
<item>
|
||||||
@ -614,8 +549,8 @@
|
|||||||
<string>Bug Report</string>
|
<string>Bug Report</string>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QGridLayout" name="gridLayout_3">
|
<layout class="QGridLayout" name="gridLayout_3">
|
||||||
<item row="1" column="1">
|
<item row="0" column="3">
|
||||||
<widget class="QLineEdit" name="editEmailClient">
|
<widget class="QLineEdit" name="editOSVersion">
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>0</width>
|
<width>0</width>
|
||||||
@ -628,37 +563,6 @@
|
|||||||
<height>0</height>
|
<height>0</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
|
||||||
<string/>
|
|
||||||
</property>
|
|
||||||
<property name="readOnly">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="0">
|
|
||||||
<widget class="QLabel" name="labelOSType">
|
|
||||||
<property name="text">
|
|
||||||
<string>OS Type</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="2">
|
|
||||||
<widget class="QLabel" name="labelAddress">
|
|
||||||
<property name="text">
|
|
||||||
<string>Address</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="0">
|
|
||||||
<widget class="QLabel" name="labelEmailClient">
|
|
||||||
<property name="text">
|
|
||||||
<string>Email Cient</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="2" column="1" colspan="3">
|
|
||||||
<widget class="QPlainTextEdit" name="editDescription">
|
|
||||||
<property name="readOnly">
|
<property name="readOnly">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
</property>
|
</property>
|
||||||
@ -677,6 +581,13 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item row="0" column="0">
|
||||||
|
<widget class="QLabel" name="labelOSType">
|
||||||
|
<property name="text">
|
||||||
|
<string>OS Type</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
<item row="3" column="0">
|
<item row="3" column="0">
|
||||||
<widget class="QLabel" name="labelIncludeLogs">
|
<widget class="QLabel" name="labelIncludeLogs">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
@ -684,18 +595,22 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="2" column="0">
|
<item row="1" column="2">
|
||||||
<widget class="QLabel" name="labelDescription">
|
<widget class="QLabel" name="labelAddress">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Description</string>
|
<string>Address</string>
|
||||||
</property>
|
|
||||||
<property name="alignment">
|
|
||||||
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
|
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="0" column="3">
|
<item row="0" column="2">
|
||||||
<widget class="QLineEdit" name="editOSVersion">
|
<widget class="QLabel" name="labelOSVersion">
|
||||||
|
<property name="text">
|
||||||
|
<string>OS Version</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="1">
|
||||||
|
<widget class="QLineEdit" name="editOSType">
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>0</width>
|
<width>0</width>
|
||||||
@ -720,29 +635,251 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="0" column="1">
|
<item row="2" column="0">
|
||||||
<widget class="QLineEdit" name="editOSType">
|
<widget class="QLabel" name="labelDescription">
|
||||||
|
<property name="text">
|
||||||
|
<string>Description</string>
|
||||||
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="1">
|
||||||
|
<widget class="QLineEdit" name="editEmailClient">
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>0</width>
|
<width>0</width>
|
||||||
<height>0</height>
|
<height>0</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
<property name="baseSize">
|
<property name="text">
|
||||||
<size>
|
<string/>
|
||||||
<width>250</width>
|
|
||||||
<height>0</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
</property>
|
||||||
<property name="readOnly">
|
<property name="readOnly">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="0" column="2">
|
<item row="1" column="0">
|
||||||
<widget class="QLabel" name="labelOSVersion">
|
<widget class="QLabel" name="labelEmailClient">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>OS Version</string>
|
<string>Email Cient</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="2" column="1" colspan="4">
|
||||||
|
<widget class="QPlainTextEdit" name="editDescription">
|
||||||
|
<property name="readOnly">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QGroupBox" name="groupApp">
|
||||||
|
<property name="minimumSize">
|
||||||
|
<size>
|
||||||
|
<width>0</width>
|
||||||
|
<height>0</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="title">
|
||||||
|
<string>Events && Errors</string>
|
||||||
|
</property>
|
||||||
|
<layout class="QVBoxLayout" name="verticalLayout_8">
|
||||||
|
<item>
|
||||||
|
<layout class="QHBoxLayout" name="horizontalLayout_11">
|
||||||
|
<item>
|
||||||
|
<widget class="QLabel" name="labelEventDelay">
|
||||||
|
<property name="toolTip">
|
||||||
|
<string>Delay applied before sending automatically generated events</string>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>Delay for asynchronous events</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QSpinBox" name="spinEventDelay">
|
||||||
|
<property name="suffix">
|
||||||
|
<string> ms</string>
|
||||||
|
</property>
|
||||||
|
<property name="maximum">
|
||||||
|
<number>3600000</number>
|
||||||
|
</property>
|
||||||
|
<property name="singleStep">
|
||||||
|
<number>100</number>
|
||||||
|
</property>
|
||||||
|
<property name="value">
|
||||||
|
<number>1000</number>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<spacer name="horizontalSpacer_5">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Horizontal</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeHint" stdset="0">
|
||||||
|
<size>
|
||||||
|
<width>40</width>
|
||||||
|
<height>1</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</spacer>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<layout class="QHBoxLayout" name="horizontalLayout_9">
|
||||||
|
<item>
|
||||||
|
<widget class="QPushButton" name="buttonInternetOff">
|
||||||
|
<property name="text">
|
||||||
|
<string>Internet Off</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QPushButton" name="buttonInternetOn">
|
||||||
|
<property name="text">
|
||||||
|
<string>Internet On</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QPushButton" name="buttonShowMainWindow">
|
||||||
|
<property name="text">
|
||||||
|
<string>Show Main Window</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QPushButton" name="buttonAPICertIssue">
|
||||||
|
<property name="text">
|
||||||
|
<string>API cert. Issue</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<layout class="QHBoxLayout" name="horizontalLayout_13">
|
||||||
|
<item>
|
||||||
|
<widget class="QPushButton" name="buttonDiskCacheUnavailable">
|
||||||
|
<property name="text">
|
||||||
|
<string>Disk Cache Unavailable</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QPushButton" name="buttonDiskFull">
|
||||||
|
<property name="text">
|
||||||
|
<string>Disk Full</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<spacer name="horizontalSpacer_2">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Horizontal</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeHint" stdset="0">
|
||||||
|
<size>
|
||||||
|
<width>40</width>
|
||||||
|
<height>1</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</spacer>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<layout class="QHBoxLayout" name="horizontalLayout_12">
|
||||||
|
<item>
|
||||||
|
<widget class="QPushButton" name="buttonNoActiveKeyForRecipient">
|
||||||
|
<property name="text">
|
||||||
|
<string>No Active Key For Recipient</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QLineEdit" name="editNoActiveKeyForRecipient">
|
||||||
|
<property name="text">
|
||||||
|
<string>dummy.user@proton.me</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QCheckBox" name="checkIsPortFree">
|
||||||
|
<property name="text">
|
||||||
|
<string>Reply true to the next 'Is Port Free' request.</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<layout class="QHBoxLayout" name="horizontalLayout_8">
|
||||||
|
<property name="leftMargin">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
<property name="topMargin">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
<property name="rightMargin">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
<property name="bottomMargin">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
<item>
|
||||||
|
<widget class="QCheckBox" name="checkNextCacheChangeWillSucceed">
|
||||||
|
<property name="text">
|
||||||
|
<string>Next Cache Change will succeed</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<spacer name="horizontalSpacer_6">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Horizontal</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeHint" stdset="0">
|
||||||
|
<size>
|
||||||
|
<width>40</width>
|
||||||
|
<height>1</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</spacer>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QComboBox" name="comboCacheError">
|
||||||
|
<item>
|
||||||
|
<property name="text">
|
||||||
|
<string>Disk Cache Unavailable</string>
|
||||||
|
</property>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<property name="text">
|
||||||
|
<string>Can't Move Disk Cache</string>
|
||||||
|
</property>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<property name="text">
|
||||||
|
<string>Disk Full</string>
|
||||||
|
</property>
|
||||||
|
</item>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QCheckBox" name="checkNextBugReportWillSucceed">
|
||||||
|
<property name="text">
|
||||||
|
<string>Next Bug Report Will Succeed</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@ -772,8 +909,19 @@
|
|||||||
<tabstop>editDependencyLicenseLink</tabstop>
|
<tabstop>editDependencyLicenseLink</tabstop>
|
||||||
<tabstop>editLandingPageLink</tabstop>
|
<tabstop>editLandingPageLink</tabstop>
|
||||||
<tabstop>editDiskCachePath</tabstop>
|
<tabstop>editDiskCachePath</tabstop>
|
||||||
|
<tabstop>editOSType</tabstop>
|
||||||
<tabstop>editOSVersion</tabstop>
|
<tabstop>editOSVersion</tabstop>
|
||||||
<tabstop>editEmailClient</tabstop>
|
<tabstop>editEmailClient</tabstop>
|
||||||
|
<tabstop>editAddress</tabstop>
|
||||||
|
<tabstop>editDescription</tabstop>
|
||||||
|
<tabstop>spinEventDelay</tabstop>
|
||||||
|
<tabstop>buttonInternetOff</tabstop>
|
||||||
|
<tabstop>buttonInternetOn</tabstop>
|
||||||
|
<tabstop>buttonShowMainWindow</tabstop>
|
||||||
|
<tabstop>checkIsPortFree</tabstop>
|
||||||
|
<tabstop>checkNextCacheChangeWillSucceed</tabstop>
|
||||||
|
<tabstop>comboCacheError</tabstop>
|
||||||
|
<tabstop>checkNextBugReportWillSucceed</tabstop>
|
||||||
</tabstops>
|
</tabstops>
|
||||||
<resources/>
|
<resources/>
|
||||||
<connections/>
|
<connections/>
|
||||||
|
|||||||
@ -58,7 +58,7 @@ UsersTab::UsersTab(QWidget *parent)
|
|||||||
connect(ui_.checkSync, &QCheckBox::toggled, this, &UsersTab::onCheckSyncToggled);
|
connect(ui_.checkSync, &QCheckBox::toggled, this, &UsersTab::onCheckSyncToggled);
|
||||||
connect(ui_.sliderSync, &QSlider::valueChanged, this, &UsersTab::onSliderSyncValueChanged);
|
connect(ui_.sliderSync, &QSlider::valueChanged, this, &UsersTab::onSliderSyncValueChanged);
|
||||||
|
|
||||||
users_.append(defaultUser());
|
users_.append(randomUser());
|
||||||
|
|
||||||
this->updateGUIState();
|
this->updateGUIState();
|
||||||
}
|
}
|
||||||
@ -85,7 +85,7 @@ void UsersTab::onAddUserButton() {
|
|||||||
//
|
//
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
void UsersTab::onEditUserButton() {
|
void UsersTab::onEditUserButton() {
|
||||||
const int index = selectedIndex();
|
int index = selectedIndex();
|
||||||
if ((index < 0) || (index >= users_.userCount())) {
|
if ((index < 0) || (index >= users_.userCount())) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -110,7 +110,7 @@ void UsersTab::onEditUserButton() {
|
|||||||
//
|
//
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
void UsersTab::onRemoveUserButton() {
|
void UsersTab::onRemoveUserButton() {
|
||||||
const int index = selectedIndex();
|
int index = selectedIndex();
|
||||||
if ((index < 0) || (index >= users_.userCount())) {
|
if ((index < 0) || (index >= users_.userCount())) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -127,7 +127,7 @@ void UsersTab::onRemoveUserButton() {
|
|||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
//
|
//
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
void UsersTab::onSelectionChanged(QItemSelection const&, QItemSelection const&) {
|
void UsersTab::onSelectionChanged(QItemSelection, QItemSelection) {
|
||||||
this->updateGUIState();
|
this->updateGUIState();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -137,6 +137,7 @@ void UsersTab::onSelectionChanged(QItemSelection const&, QItemSelection const&)
|
|||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
void UsersTab::onSendUserBadEvent() {
|
void UsersTab::onSendUserBadEvent() {
|
||||||
SPUser const user = selectedUser();
|
SPUser const user = selectedUser();
|
||||||
|
int const index = this->selectedIndex();
|
||||||
|
|
||||||
if (!user) {
|
if (!user) {
|
||||||
app().log().error(QString("%1 failed. Unkown user.").arg(__FUNCTION__));
|
app().log().error(QString("%1 failed. Unkown user.").arg(__FUNCTION__));
|
||||||
@ -174,8 +175,8 @@ void UsersTab::onSendUsedBytesChangedEvent() {
|
|||||||
app().log().error(QString("%1 failed. User is not connected").arg(__FUNCTION__));
|
app().log().error(QString("%1 failed. User is not connected").arg(__FUNCTION__));
|
||||||
}
|
}
|
||||||
|
|
||||||
auto const usedBytes = static_cast<qint64>(ui_.spinUsedBytes->value());
|
qint64 const usedBytes = qint64(ui_.spinUsedBytes->value());
|
||||||
user->setUsedBytes(static_cast<float>(usedBytes));
|
user->setUsedBytes(usedBytes);
|
||||||
users_.touch(index);
|
users_.touch(index);
|
||||||
|
|
||||||
GRPCService &grpc = app().grpc();
|
GRPCService &grpc = app().grpc();
|
||||||
@ -223,10 +224,9 @@ void UsersTab::updateGUIState() {
|
|||||||
QSignalBlocker b(ui_.checkSync);
|
QSignalBlocker b(ui_.checkSync);
|
||||||
bool const syncing = user && user->isSyncing();
|
bool const syncing = user && user->isSyncing();
|
||||||
ui_.checkSync->setChecked(syncing);
|
ui_.checkSync->setChecked(syncing);
|
||||||
// ReSharper disable once CppDFAUnusedValue
|
|
||||||
b = QSignalBlocker(ui_.sliderSync);
|
b = QSignalBlocker(ui_.sliderSync);
|
||||||
ui_.sliderSync->setEnabled(syncing);
|
ui_.sliderSync->setEnabled(syncing);
|
||||||
qint32 const progressPercent = syncing ? static_cast<qint32>(user->syncProgress() * 100.0f) : 0;
|
qint32 const progressPercent = syncing ? qint32(user->syncProgress() * 100.0f) : 0;
|
||||||
ui_.sliderSync->setValue(progressPercent);
|
ui_.sliderSync->setValue(progressPercent);
|
||||||
ui_.labelSync->setText(syncing ? QString("%1%").arg(progressPercent) : "" );
|
ui_.labelSync->setText(syncing ? QString("%1%").arg(progressPercent) : "" );
|
||||||
}
|
}
|
||||||
@ -272,8 +272,8 @@ bridgepp::SPUser UsersTab::userWithID(QString const &userID) {
|
|||||||
/// \return The user with the given username.
|
/// \return The user with the given username.
|
||||||
/// \return A null pointer if the user is not in the list.
|
/// \return A null pointer if the user is not in the list.
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
bridgepp::SPUser UsersTab::userWithUsernameOrEmail(QString const &username) {
|
bridgepp::SPUser UsersTab::userWithUsername(QString const &username) {
|
||||||
return users_.userWithUsernameOrEmail(username);
|
return users_.userWithUsername(username);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -418,7 +418,7 @@ void UsersTab::processBadEventUserFeedback(QString const &userID, bool doResync)
|
|||||||
return; // we do not do any form of emulation for resync.
|
return; // we do not do any form of emulation for resync.
|
||||||
}
|
}
|
||||||
|
|
||||||
SPUser const user = users_.userWithID(userID);
|
SPUser user = users_.userWithID(userID);
|
||||||
if (!user) {
|
if (!user) {
|
||||||
app().log().error(QString("%1(): could not find user with id %1.").arg(__func__, userID));
|
app().log().error(QString("%1(): could not find user with id %1.").arg(__func__, userID));
|
||||||
}
|
}
|
||||||
@ -464,12 +464,12 @@ void UsersTab::onCheckSyncToggled(bool checked) {
|
|||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
void UsersTab::onSliderSyncValueChanged(int value) {
|
void UsersTab::onSliderSyncValueChanged(int value) {
|
||||||
SPUser const user = this->selectedUser();
|
SPUser const user = this->selectedUser();
|
||||||
if ((!user) || (!user->isSyncing()) || user->syncProgress() == static_cast<float>(value)) {
|
if ((!user) || (!user->isSyncing()) || user->syncProgress() == value) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
double const progress = value / 100.0;
|
double const progress = value / 100.0;
|
||||||
user->setSyncProgress(static_cast<float>(progress));
|
user->setSyncProgress(progress);
|
||||||
app().grpc().sendEvent(newSyncProgressEvent(user->id(), progress, 1, 1)); // we do not simulate elapsed & remaining.
|
app().grpc().sendEvent(newSyncProgressEvent(user->id(), progress, 1, 1)); // we do not simulate elapsed & remaining.
|
||||||
this->updateGUIState();
|
this->updateGUIState();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -38,7 +38,7 @@ public: // member functions.
|
|||||||
UsersTab &operator=(UsersTab &&) = delete; ///< Disabled move assignment operator.
|
UsersTab &operator=(UsersTab &&) = delete; ///< Disabled move assignment operator.
|
||||||
UserTable &userTable(); ///< Returns a reference to the user table.
|
UserTable &userTable(); ///< Returns a reference to the user table.
|
||||||
bridgepp::SPUser userWithID(QString const &userID); ///< Get the user with the given ID.
|
bridgepp::SPUser userWithID(QString const &userID); ///< Get the user with the given ID.
|
||||||
bridgepp::SPUser userWithUsernameOrEmail(QString const &username); ///< Get the user with the given username.
|
bridgepp::SPUser userWithUsername(QString const &username); ///< Get the user with the given username.
|
||||||
bool nextUserUsernamePasswordError() const; ///< Check if next user login should trigger a username/password error.
|
bool nextUserUsernamePasswordError() const; ///< Check if next user login should trigger a username/password error.
|
||||||
bool nextUserFreeUserError() const; ///< Check if next user login should trigger a Free user error.
|
bool nextUserFreeUserError() const; ///< Check if next user login should trigger a Free user error.
|
||||||
bool nextUserTFARequired() const; ///< Check if next user login should requires 2FA.
|
bool nextUserTFARequired() const; ///< Check if next user login should requires 2FA.
|
||||||
@ -53,14 +53,14 @@ public slots:
|
|||||||
void setUserSplitMode(QString const &userID, bool makeItActive); ///< Slot for the split mode.
|
void setUserSplitMode(QString const &userID, bool makeItActive); ///< Slot for the split mode.
|
||||||
void logoutUser(QString const &userID); ///< slot for the logging out of a user.
|
void logoutUser(QString const &userID); ///< slot for the logging out of a user.
|
||||||
void removeUser(QString const &userID); ///< Slot for the removal of a user.
|
void removeUser(QString const &userID); ///< Slot for the removal of a user.
|
||||||
static void configureUserAppleMail(QString const &userID, QString const &address); ///< Slot for the configuration of Apple mail.
|
void configureUserAppleMail(QString const &userID, QString const &address); ///< Slot for the configuration of Apple mail.
|
||||||
void processBadEventUserFeedback(QString const& userID, bool doResync); ///< Slot for the reception of a bad event user feedback.
|
void processBadEventUserFeedback(QString const& userID, bool doResync); ///< Slot for the reception of a bad event user feedback.
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void onAddUserButton(); ///< Add a user to the user list.
|
void onAddUserButton(); ///< Add a user to the user list.
|
||||||
void onEditUserButton(); ///< Edit the currently selected user.
|
void onEditUserButton(); ///< Edit the currently selected user.
|
||||||
void onRemoveUserButton(); ///< Remove the currently selected user.
|
void onRemoveUserButton(); ///< Remove the currently selected user.
|
||||||
void onSelectionChanged(QItemSelection const&, QItemSelection const&); ///< Slot for the change of the selection.
|
void onSelectionChanged(QItemSelection, QItemSelection); ///< Slot for the change of the selection.
|
||||||
void onSendUserBadEvent(); ///< Slot for the 'Send Bad Event Error' button.
|
void onSendUserBadEvent(); ///< Slot for the 'Send Bad Event Error' button.
|
||||||
void onSendUsedBytesChangedEvent(); ///< Slot for the 'Send Used Bytes Changed Event' button.
|
void onSendUsedBytesChangedEvent(); ///< Slot for the 'Send Used Bytes Changed Event' button.
|
||||||
void onSendIMAPLoginFailedEvent(); ///< Slot for the 'Send IMAP Login failure Event' button.
|
void onSendIMAPLoginFailedEvent(); ///< Slot for the 'Send IMAP Login failure Event' button.
|
||||||
|
|||||||
@ -26,7 +26,7 @@ using namespace bridgepp;
|
|||||||
/// \param[in] user The user.
|
/// \param[in] user The user.
|
||||||
/// \param[in] parent The parent widget of the dialog.
|
/// \param[in] parent The parent widget of the dialog.
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
UserDialog::UserDialog(const bridgepp::SPUser &user, QWidget *parent)
|
UserDialog::UserDialog(bridgepp::SPUser &user, QWidget *parent)
|
||||||
: QDialog(parent)
|
: QDialog(parent)
|
||||||
, user_(user) {
|
, user_(user) {
|
||||||
ui_.setupUi(this);
|
ui_.setupUi(this);
|
||||||
@ -57,8 +57,8 @@ void UserDialog::onOK() {
|
|||||||
user_->setAvatarText(ui_.editAvatarText->text());
|
user_->setAvatarText(ui_.editAvatarText->text());
|
||||||
user_->setState(this->state());
|
user_->setState(this->state());
|
||||||
user_->setSplitMode(ui_.checkSplitMode->isChecked());
|
user_->setSplitMode(ui_.checkSplitMode->isChecked());
|
||||||
user_->setUsedBytes(static_cast<float>(ui_.spinUsedBytes->value()));
|
user_->setUsedBytes(float(ui_.spinUsedBytes->value()));
|
||||||
user_->setTotalBytes(static_cast<float>(ui_.spinTotalBytes->value()));
|
user_->setTotalBytes(float(ui_.spinTotalBytes->value()));
|
||||||
|
|
||||||
this->accept();
|
this->accept();
|
||||||
}
|
}
|
||||||
@ -67,14 +67,14 @@ void UserDialog::onOK() {
|
|||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
/// \return The user state that is currently selected in the dialog.
|
/// \return The user state that is currently selected in the dialog.
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
UserState UserDialog::state() const {
|
UserState UserDialog::state() {
|
||||||
return static_cast<UserState>(ui_.comboState->currentIndex());
|
return UserState(ui_.comboState->currentIndex());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
/// \param[in] state The user state to select in the dialog.
|
/// \param[in] state The user state to select in the dialog.
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
void UserDialog::setState(UserState state) const {
|
void UserDialog::setState(UserState state) {
|
||||||
ui_.comboState->setCurrentIndex(static_cast<qint32>(state));
|
ui_.comboState->setCurrentIndex(qint32(state));
|
||||||
}
|
}
|
||||||
|
|||||||
@ -30,7 +30,7 @@
|
|||||||
class UserDialog : public QDialog {
|
class UserDialog : public QDialog {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public: // member functions.
|
public: // member functions.
|
||||||
UserDialog(const bridgepp::SPUser &user, QWidget *parent); ///< Default constructor.
|
UserDialog(bridgepp::SPUser &user, QWidget *parent); ///< Default constructor.
|
||||||
UserDialog(UserDialog const &) = delete; ///< Disabled copy-constructor.
|
UserDialog(UserDialog const &) = delete; ///< Disabled copy-constructor.
|
||||||
UserDialog(UserDialog &&) = delete; ///< Disabled assignment copy-constructor.
|
UserDialog(UserDialog &&) = delete; ///< Disabled assignment copy-constructor.
|
||||||
~UserDialog() override = default; ///< Destructor.
|
~UserDialog() override = default; ///< Destructor.
|
||||||
@ -38,8 +38,8 @@ public: // member functions.
|
|||||||
UserDialog &operator=(UserDialog &&) = delete; ///< Disabled move assignment operator.
|
UserDialog &operator=(UserDialog &&) = delete; ///< Disabled move assignment operator.
|
||||||
|
|
||||||
private: // member functions
|
private: // member functions
|
||||||
bridgepp::UserState state() const; ///< Get the user state selected in the dialog.
|
bridgepp::UserState state(); ///< Get the user state selected in the dialog.
|
||||||
void setState(bridgepp::UserState state) const; ///< Set the user state selected in the dialog
|
void setState(bridgepp::UserState state); ///< Set the user state selected in the dialog
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void onOK(); ///< Slot for the OK button.
|
void onOK(); ///< Slot for the OK button.
|
||||||
|
|||||||
@ -35,7 +35,7 @@ UserTable::UserTable(QObject *parent)
|
|||||||
/// \return The number of rows in the table.
|
/// \return The number of rows in the table.
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
int UserTable::rowCount(QModelIndex const &) const {
|
int UserTable::rowCount(QModelIndex const &) const {
|
||||||
return static_cast<int>(users_.size());
|
return users_.size();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -111,7 +111,7 @@ QVariant UserTable::headerData(int section, Qt::Orientation orientation, int rol
|
|||||||
/// \param[in] user The user to add.
|
/// \param[in] user The user to add.
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
void UserTable::append(SPUser const &user) {
|
void UserTable::append(SPUser const &user) {
|
||||||
qint32 const count = static_cast<int>(users_.size());
|
qint32 const count = users_.size();
|
||||||
this->beginInsertRows(QModelIndex(), count, count);
|
this->beginInsertRows(QModelIndex(), count, count);
|
||||||
users_.append(user);
|
users_.append(user);
|
||||||
this->endInsertRows();
|
this->endInsertRows();
|
||||||
@ -122,7 +122,7 @@ void UserTable::append(SPUser const &user) {
|
|||||||
/// \return The number of users in the table.
|
/// \return The number of users in the table.
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
qint32 UserTable::userCount() const {
|
qint32 UserTable::userCount() const {
|
||||||
return static_cast<qint32>(users_.count());
|
return users_.count();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -141,7 +141,7 @@ bridgepp::SPUser UserTable::userAtIndex(qint32 index) {
|
|||||||
/// \return A null pointer if the user is not in the list.
|
/// \return A null pointer if the user is not in the list.
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
bridgepp::SPUser UserTable::userWithID(QString const &userID) {
|
bridgepp::SPUser UserTable::userWithID(QString const &userID) {
|
||||||
QList<SPUser>::const_iterator const it = std::find_if(users_.constBegin(), users_.constEnd(), [&userID](SPUser const &user) -> bool {
|
QList<SPUser>::const_iterator it = std::find_if(users_.constBegin(), users_.constEnd(), [&userID](SPUser const &user) -> bool {
|
||||||
return user->id() == userID;
|
return user->id() == userID;
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -150,16 +150,13 @@ bridgepp::SPUser UserTable::userWithID(QString const &userID) {
|
|||||||
|
|
||||||
|
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
/// \param[in] username The username, or any email address attached to the account.
|
/// \param[in] username The username.
|
||||||
/// \return The user with the given username.
|
/// \return The user with the given username.
|
||||||
/// \return A null pointer if the user is not in the list.
|
/// \return A null pointer if the user is not in the list.
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
bridgepp::SPUser UserTable::userWithUsernameOrEmail(QString const &username) {
|
bridgepp::SPUser UserTable::userWithUsername(QString const &username) {
|
||||||
QList<SPUser>::const_iterator const it = std::find_if(users_.constBegin(), users_.constEnd(), [&username](SPUser const &user) -> bool {
|
QList<SPUser>::const_iterator it = std::find_if(users_.constBegin(), users_.constEnd(), [&username](SPUser const &user) -> bool {
|
||||||
if (user->username().compare(username, Qt::CaseInsensitive) == 0) {
|
return user->username() == username;
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return user->addresses().contains(username, Qt::CaseInsensitive);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
return it == users_.end() ? nullptr : *it;
|
return it == users_.end() ? nullptr : *it;
|
||||||
@ -172,7 +169,7 @@ bridgepp::SPUser UserTable::userWithUsernameOrEmail(QString const &username) {
|
|||||||
/// \return -1 if the user could not be found.
|
/// \return -1 if the user could not be found.
|
||||||
//****************************************************************************************************************************************************
|
//****************************************************************************************************************************************************
|
||||||
qint32 UserTable::indexOfUser(QString const &userID) {
|
qint32 UserTable::indexOfUser(QString const &userID) {
|
||||||
QList<SPUser>::const_iterator const it = std::find_if(users_.constBegin(), users_.constEnd(), [&userID](SPUser const &user) -> bool {
|
QList<SPUser>::const_iterator it = std::find_if(users_.constBegin(), users_.constEnd(), [&userID](SPUser const &user) -> bool {
|
||||||
return user->id() == userID;
|
return user->id() == userID;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user