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.

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

v3.7.0 - develop -> master #838

Merged
merged 48 commits into from
Mar 24, 2021
Merged
Changes from 1 commit
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
cba61b6
Update README.rst
ninacfgarcia Sep 8, 2020
e8d0004
Add support for age.
jimmycuadra Jul 4, 2020
9ca46d0
Use idiomatic style for assignment and error handling.
jimmycuadra Jul 11, 2020
9e4cbc9
Allow age key dir to be set with SOPS_AGE_KEY_DIR and add tests.
jimmycuadra Jul 18, 2020
2741ab5
Use user config dir instead of home dir as the root for age keys.
jimmycuadra Jul 27, 2020
d9b196c
Determine age package path using current file rather than pwd.
jimmycuadra Jul 28, 2020
5c171c8
Don't swallow potential errors from os.Stat.
jimmycuadra Jul 28, 2020
617db43
Use a single keys.txt file for age private keys.
jimmycuadra Aug 3, 2020
7f7ecbc
Try decrypting with all possible keys in the keyfile.
jimmycuadra Aug 3, 2020
ade5692
Document age usage.
jimmycuadra Aug 3, 2020
a66a0a8
Reorder README sections and fix RST link.
jimmycuadra Aug 3, 2020
6a6a936
Use more concise style for constructing map.
jimmycuadra Aug 9, 2020
1dbea5d
Fix whitespace errors.
jimmycuadra Aug 9, 2020
6068838
Update go.mod/go.sum.
jimmycuadra Aug 9, 2020
50a89c8
age: .sops.yaml support
colemickens Aug 7, 2020
8f6271f
age: MasterKeysFromRecipients: gracefully handle empty string
colemickens Aug 16, 2020
e9acafc
Update to age 1.0.0-beta5.
jimmycuadra Sep 21, 2020
799f39c
Merge pull request #733 from ninacfgarcia/patch-1
ajvb Sep 22, 2020
682bff4
Merge pull request #688 from jimmycuadra/age
ajvb Sep 23, 2020
8acbe73
typo fix for deprecation warning in getKeyFromKeyServer
ajvb Sep 24, 2020
13d64c9
Bump YAML library version, and add test for YAML library. (#754)
felixfontein Oct 7, 2020
b1d253e
Do not discard comments at beginning of YAML documents (#757)
felixfontein Oct 7, 2020
d8a6428
Fixing a small typo (#759)
Oct 20, 2020
886c1ee
Returning stderr when gpg encrypt fails (#762)
udayruddarraju Oct 29, 2020
85d1216
Correct markdown link in README.rst to a rst link
SKalt Nov 12, 2020
84c8fdc
Move to github actions
autrilla Dec 29, 2020
b3c0ee9
Merge pull request #792 from autrilla/develop
ajvb Jan 6, 2021
88b0565
Remove dead code that fails compiling (#774).
felixfontein Dec 29, 2020
47cf265
Forgot to remove no longer used import.
felixfontein Dec 30, 2020
157e633
Use rustup directly instead of actions-rs
autrilla Jan 6, 2021
a115ce4
Also run unit tests in Github actions
autrilla Jan 7, 2021
779ea58
Merge pull request #796 from autrilla/develop
ajvb Jan 7, 2021
1049773
Merge pull request #793 from felixfontein/remove-dead-broken-code
ajvb Jan 9, 2021
49c2514
add filename to exec-file (#761)
cgroschupp Feb 9, 2021
0f2ebcf
added wrap verb to outputs (#817)
mkatychev Feb 17, 2021
5d1376d
Use age/armor for encrypted data key (#819)
tullo Feb 21, 2021
24636e4
Make sure that binary is built from current checkout, and not from ma…
felixfontein Feb 21, 2021
e2d6d0f
Use yaml.v3 instead of modified yaml.v2 for handling YAML files (#791)
felixfontein Feb 21, 2021
fbc87ae
Update aws-sdk-go to version v1.37.18 (#823)
DavidJacob Feb 25, 2021
f37e612
Fix broken sops config anchor in README
stealthybox Feb 28, 2021
79d5dac
feat: Support more complicated path_regexp (issues/826) (#829)
bcolucci Mar 10, 2021
dd7ce3d
Match file path relative to config file's directory (#827)
paulolieuthier Mar 10, 2021
c178f89
Revert "Match file path relative to config file's directory (#827)"
autrilla Mar 10, 2021
b5e0ffa
Merge pull request #832 from mozilla/revert-827-fix-rule-relative-fil…
ajvb Mar 24, 2021
43eafac
Merge pull request #825 from stealthybox/readme-fixanchor
ajvb Mar 24, 2021
53c5373
Merge pull request #771 from SKalt/patch-1
ajvb Mar 24, 2021
cb4229f
Prep for v3.7.0
ajvb Mar 24, 2021
e807690
Small changelog fix for v3.7
ajvb Mar 24, 2021
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
Prev Previous commit
Next Next commit
Use user config dir instead of home dir as the root for age keys.
  • Loading branch information
jimmycuadra committed Sep 21, 2020
commit 2741ab530a7033c02eaa2b88f60c23d2bea92cde
6 changes: 3 additions & 3 deletions age/keysource.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,13 @@ func (key *MasterKey) Decrypt() ([]byte, error) {
ageKeyDir, ok := os.LookupEnv("SOPS_AGE_KEY_DIR")

if !ok {
userHomeDir, err := os.UserHomeDir()
userConfigDir, err := os.UserConfigDir()

if err != nil {
return nil, fmt.Errorf("home directory could not be determined: %v", err)
return nil, fmt.Errorf("user config directory could not be determined: %v", err)
}

ageKeyDir = filepath.Join(userHomeDir, ".sops", "age")
ageKeyDir = filepath.Join(userConfigDir, ".sops", "age")
}

path := filepath.Join(ageKeyDir, fmt.Sprintf("%s.key", key.Recipient))
Expand Down