Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add more locations to check for default store path #108

Closed
wants to merge 1 commit into from
Closed

Add more locations to check for default store path #108

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109 changes: 69 additions & 40 deletions request/configure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@ package request

import (
"encoding/json"
"errors"
"io/ioutil"
"os"
"os/user"
"path/filepath"

"github.com/browserpass/browserpass-native/errors"
bpErrors "github.com/browserpass/browserpass-native/errors"
"github.com/browserpass/browserpass-native/response"
log "github.com/sirupsen/logrus"
)
Expand All @@ -24,12 +25,12 @@ func configure(request *request) {
request.Settings.GpgPath, err,
)
response.SendErrorAndExit(
errors.CodeInvalidGpgPath,
&map[errors.Field]string{
errors.FieldMessage: "The provided gpg binary path is invalid",
errors.FieldAction: "configure",
errors.FieldError: err.Error(),
errors.FieldGpgPath: request.Settings.GpgPath,
bpErrors.CodeInvalidGpgPath,
&map[bpErrors.Field]string{
bpErrors.FieldMessage: "The provided gpg binary path is invalid",
bpErrors.FieldAction: "configure",
bpErrors.FieldError: err.Error(),
bpErrors.FieldGpgPath: request.Settings.GpgPath,
},
)
}
Expand All @@ -45,14 +46,14 @@ func configure(request *request) {
store, err,
)
response.SendErrorAndExit(
errors.CodeInaccessiblePasswordStore,
&map[errors.Field]string{
errors.FieldMessage: "The password store is not accessible",
errors.FieldAction: "configure",
errors.FieldError: err.Error(),
errors.FieldStoreID: store.ID,
errors.FieldStoreName: store.Name,
errors.FieldStorePath: store.Path,
bpErrors.CodeInaccessiblePasswordStore,
&map[bpErrors.Field]string{
bpErrors.FieldMessage: "The password store is not accessible",
bpErrors.FieldAction: "configure",
bpErrors.FieldError: err.Error(),
bpErrors.FieldStoreID: store.ID,
bpErrors.FieldStoreName: store.Name,
bpErrors.FieldStorePath: store.Path,
},
)
}
Expand All @@ -70,14 +71,14 @@ func configure(request *request) {
store, err,
)
response.SendErrorAndExit(
errors.CodeUnreadablePasswordStoreDefaultSettings,
&map[errors.Field]string{
errors.FieldMessage: "Unable to read .browserpass.json of the password store",
errors.FieldAction: "configure",
errors.FieldError: err.Error(),
errors.FieldStoreID: store.ID,
errors.FieldStoreName: store.Name,
errors.FieldStorePath: store.Path,
bpErrors.CodeUnreadablePasswordStoreDefaultSettings,
&map[bpErrors.Field]string{
bpErrors.FieldMessage: "Unable to read .browserpass.json of the password store",
bpErrors.FieldAction: "configure",
bpErrors.FieldError: err.Error(),
bpErrors.FieldStoreID: store.ID,
bpErrors.FieldStoreName: store.Name,
bpErrors.FieldStorePath: store.Path,
},
)
}
Expand All @@ -91,11 +92,11 @@ func configure(request *request) {
if err != nil {
log.Error("Unable to determine the location of the default password store: ", err)
response.SendErrorAndExit(
errors.CodeUnknownDefaultPasswordStoreLocation,
&map[errors.Field]string{
errors.FieldMessage: "Unable to determine the location of the default password store",
errors.FieldAction: "configure",
errors.FieldError: err.Error(),
bpErrors.CodeUnknownDefaultPasswordStoreLocation,
&map[bpErrors.Field]string{
bpErrors.FieldMessage: "Unable to determine the location of the default password store",
bpErrors.FieldAction: "configure",
bpErrors.FieldError: err.Error(),
},
)
} else {
Expand All @@ -106,12 +107,12 @@ func configure(request *request) {
possibleDefaultStorePath, err,
)
response.SendErrorAndExit(
errors.CodeInaccessibleDefaultPasswordStore,
&map[errors.Field]string{
errors.FieldMessage: "The default password store is not accessible",
errors.FieldAction: "configure",
errors.FieldError: err.Error(),
errors.FieldStorePath: possibleDefaultStorePath,
bpErrors.CodeInaccessibleDefaultPasswordStore,
&map[bpErrors.Field]string{
bpErrors.FieldMessage: "The default password store is not accessible",
bpErrors.FieldAction: "configure",
bpErrors.FieldError: err.Error(),
bpErrors.FieldStorePath: possibleDefaultStorePath,
},
)
}
Expand All @@ -128,12 +129,12 @@ func configure(request *request) {
responseData.DefaultStore.Path, err,
)
response.SendErrorAndExit(
errors.CodeUnreadableDefaultPasswordStoreDefaultSettings,
&map[errors.Field]string{
errors.FieldMessage: "Unable to read .browserpass.json of the default password store",
errors.FieldAction: "configure",
errors.FieldError: err.Error(),
errors.FieldStorePath: responseData.DefaultStore.Path,
bpErrors.CodeUnreadableDefaultPasswordStoreDefaultSettings,
&map[bpErrors.Field]string{
bpErrors.FieldMessage: "Unable to read .browserpass.json of the default password store",
bpErrors.FieldAction: "configure",
bpErrors.FieldError: err.Error(),
bpErrors.FieldStorePath: responseData.DefaultStore.Path,
},
)
}
Expand All @@ -148,6 +149,34 @@ func getDefaultPasswordStorePath() (string, error) {
return path, nil
}

path = os.Getenv("GOPASS_HOMEDIR")
if path != "" {
return path, nil
}

homeDir := os.Getenv("HOME")
if homeDir != "" {
path = filepath.Join(homeDir, ".password-store")
if _, err := os.Stat(path); errors.Is(err, os.ErrExist) {
return path, nil
}
}

xdgDataHomeDir := os.Getenv("XDG_DATA_HOME")
if xdgDataHomeDir != "" {
path = filepath.Join(xdgDataHomeDir, "gopass", "stores", "root")
if _, err := os.Stat(path); errors.Is(err, os.ErrExist) {
return path, nil
}
}

if homeDir != "" {
path = filepath.Join(homeDir, ".local", "share", "gopass", "stores", "root")
if _, err := os.Stat(path); errors.Is(err, os.ErrExist) {
return path, nil
}
}

usr, err := user.Current()
if err != nil {
return "", err
Expand Down