diff --git a/README.md b/README.md index 37fcbae2..941aecdc 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ to start Bridge on startup is enabled by default. When the main window is closed, Bridge will continue to run in the background. -More details [on the public website](https://protonmail.com/bridge). +More details [on the public website](https://proton.me/mail/bridge). ## Launchers Launchers are binaries used to run the Proton Mail Bridge or Import-Export apps. diff --git a/internal/imap/server.go b/internal/imap/server.go index a52ad625..c41cec74 100644 --- a/internal/imap/server.go +++ b/internal/imap/server.go @@ -89,7 +89,7 @@ func newGoIMAPServer(tls *tls.Config, backend backend.Backend, address string, u serverID := imapid.ID{ imapid.FieldName: "Proton Mail Bridge", imapid.FieldVendor: "Proton AG", - imapid.FieldSupportURL: "https://protonmail.com/support", + imapid.FieldSupportURL: "https://proton.me/support/mail", } server.EnableAuth(sasl.Login, func(conn imapserver.Conn) sasl.Server { diff --git a/internal/updater/host_default.go b/internal/updater/host_default.go index 8634f537..5f62789a 100644 --- a/internal/updater/host_default.go +++ b/internal/updater/host_default.go @@ -20,4 +20,4 @@ package updater -const Host = "https://protonmail.com/download" +const Host = "https://proton.me/download" diff --git a/internal/updater/version.go b/internal/updater/version.go index 0cdfb906..adf1b1df 100644 --- a/internal/updater/version.go +++ b/internal/updater/version.go @@ -38,7 +38,7 @@ type VersionInfo struct { // Installers are the locations of installer files (for manual installation). Installers []string - // LandingPage is the address of the app landing page on protonmail.com. + // LandingPage is the address of the app landing page on proton.me LandingPage string // ReleaseNotesPage is the address of the page containing the release notes. @@ -54,26 +54,26 @@ type VersionInfo struct { // { // "stable": { // "Version": "2.3.4", -// "Package": "https://protonmail.com/.../bridge_2.3.4_linux.tgz", +// "Package": "https://proton.me/.../bridge_2.3.4_linux.tgz", // "Installers": [ -// "https://protonmail.com/.../something.deb", -// "https://protonmail.com/.../something.rpm", -// "https://protonmail.com/.../PKGBUILD" +// "https://proton.me/.../something.deb", +// "https://proton.me/.../something.rpm", +// "https://proton.me/.../PKGBUILD" // ], -// "LandingPage": "https://protonmail.com/bridge", -// "ReleaseNotesPage": "https://protonmail.com/.../release_notes.html", +// "LandingPage": "https://proton.me/mail/bridge#download", +// "ReleaseNotesPage": "https://proton.me/download/{ie,bridge}/{stable,early}_releases.html", // "RolloutProportion": 0.5 // }, // "early": { // "Version": "2.4.0", -// "Package": "https://protonmail.com/.../bridge_2.4.0_linux.tgz", +// "Package": "https://proton.me/.../bridge_2.4.0_linux.tgz", // "Installers": [ -// "https://protonmail.com/.../something.deb", -// "https://protonmail.com/.../something.rpm", -// "https://protonmail.com/.../PKGBUILD" +// "https://proton.me/.../something.deb", +// "https://proton.me/.../something.rpm", +// "https://proton.me/.../PKGBUILD" // ], -// "LandingPage": "https://protonmail.com/bridge", -// "ReleaseNotesPage": "https://protonmail.com/.../release_notes.html", +// "LandingPage": "https://proton.me/mail/bridge#download", +// "ReleaseNotesPage": "https://proton.me/download/{ie,bridge}/{stable,early}_releases.html", // "RolloutProportion": 0.5 // }, // "...": { @@ -84,8 +84,8 @@ type VersionMap map[string]VersionInfo // getVersionFileURL returns the URL of the version file. // For example: -// - https://protonmail.com/download/bridge/version_linux.json -// - https://protonmail.com/download/ie/version_linux.json +// - https://proton.me/download/bridge/version_linux.json +// - https://proton.me/download/ie/version_linux.json func (u *Updater) getVersionFileURL() string { return fmt.Sprintf("%v/%v/version_%v.json", Host, u.updateURLName, u.platform) } diff --git a/pkg/pmapi/dialer_pinning.go b/pkg/pmapi/dialer_pinning.go index 91e1ef12..9daa5306 100644 --- a/pkg/pmapi/dialer_pinning.go +++ b/pkg/pmapi/dialer_pinning.go @@ -33,10 +33,16 @@ var TrustedAPIPins = []string{ //nolint:gochecknoglobals `pin-sha256="AfMENBVvOS8MnISprtvyPsjKlPooqh8nMB/pvCrpJpw="`, // cold backup // protonmail.com + // \todo remove when sure no one is using it. `pin-sha256="8joiNBdqaYiQpKskgtkJsqRxF7zN0C0aqfi8DacknnI="`, // current `pin-sha256="JMI8yrbc6jB1FYGyyWRLFTmDNgIszrNEMGlgy972e7w="`, // hot backup `pin-sha256="Iu44zU84EOCZ9vx/vz67/MRVrxF1IO4i4NIa8ETwiIY="`, // cold backup + // proton.me + `pin-sha256="CT56BhOTmj5ZIPgb/xD5mH8rY3BLo/MlhP7oPyJUEDo="`, // current + `pin-sha256="35Dx28/uzN3LeltkCBQ8RHK0tlNSa2kCpCRGNp34Gxc="`, // hot backup + `pin-sha256="qYIukVc63DEITct8sFT7ebIq5qsWmuscaIKeJx+5J5A="`, // col backup + // proxies `pin-sha256="EU6TS9MO0L/GsDHvVc9D5fChYLNy5JdGYpJw0ccgetM="`, // main `pin-sha256="iKPIHPnDNqdkvOnTClQ8zQAIKG0XavaPkcEo0LBAABA="`, // backup 1 diff --git a/utils/release_notes.sh b/utils/release_notes.sh index 832a07f2..c0abc653 100755 --- a/utils/release_notes.sh +++ b/utils/release_notes.sh @@ -19,7 +19,7 @@ # Generate HTML release notes -# hosted at https://protonmail.com/download/{ie,bridge}/{stable,early}_releases.html +# hosted at https://proton.me/download/{ie,bridge}/{stable,early}_releases.html INFILE=$1 OUTFILE=${INFILE//.md/.html}