yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

GODT-1260: Renaming

Browse Source 
* Renaming GUI, CLI, no-impact config.
* License header and documentation rebranding.
* Rename app title and vendor. Impact: manual install
* Migrating mac keychain and launch on startup.
* Fix linter and linter renaming
This commit is contained in:
Jakub
2022-04-05 15:50:21 +02:00
parent e353dc554d
commit f3c69faf8b
542 changed files with 3220 additions and 2981 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/keychain/helper_darwin.go
View File

@ -1,19 +1,19 @@
// Copyright (c) 2022 Proton Technologies AG
// Copyright (c) 2022 Proton AG
//
// This file is part of ProtonMail Bridge.
// This file is part of Proton Mail Bridge.
//
// ProtonMail Bridge is free software: you can redistribute it and/or modify
// 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.
//
// ProtonMail Bridge is distributed in the hope that it will be useful,
// 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 ProtonMail Bridge. If not, see <https://www.gnu.org/licenses/>.
// along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
package keychain
@ -24,13 +24,14 @@ import (
"github.com/docker/docker-credential-helpers/credentials"
"github.com/keybase/go-keychain"
"github.com/sirupsen/logrus"
)
const (
MacOSKeychain = "macos-keychain"
)
func init() { // nolint[noinit]
func init() { //nolint:gochecknoinits
Helpers = make(map[string]helperConstructor)
// MacOS always provides a keychain.
@ -106,12 +107,15 @@ func (h *macOSHelper) Get(secretURL string) (string, string, error) {
return "", "", err
}
l := logrus.WithField("pkg", "keychain/darwin").WithField("h.url", h.url).WithField("userID", userID)
query := newQuery(hostURL, userID)
query.SetMatchLimit(keychain.MatchLimitOne)
query.SetReturnData(true)
results, err := keychain.QueryItem(query)
if err != nil {
l.WithError(err).Error("Querry item failed")
return "", "", parseError(err)
}
@ -129,8 +133,11 @@ func (h *macOSHelper) Get(secretURL string) (string, string, error) {
func (h *macOSHelper) List() (map[string]string, error) {
userIDByURL := make(map[string]string)
l := logrus.WithField("pkg", "keychain/darwin").WithField("h.url", h.url)
userIDs, err := keychain.GetGenericPasswordAccounts(h.url)
if err != nil {
l.WithError(err).Warn("Get generic password accounts failed")
return nil, parseError(err)
}