1
0
mirror of https://github.com/getsops/sops.git synced 2026-02-05 12:45:21 +01:00
Commit Graph

1105 Commits

Author SHA1 Message Date
AJ Bahnken
f3b6d4a9a2 set SOPS_AGE_KEY_FILE in travis config 2020-09-24 10:54:28 -07:00
AJ Bahnken
1ddbbb08f8 Adding an age encrypt/decrypt functional test 2020-09-24 10:52:44 -07:00
AJ Bahnken
682bff430a Merge pull request #688 from jimmycuadra/age
Add support for age.
2020-09-23 11:42:39 -07:00
AJ Bahnken
799f39c33d Merge pull request #733 from ninacfgarcia/patch-1
Update README.rst
2020-09-22 10:22:44 -07:00
Jimmy Cuadra
e9acafced7 Update to age 1.0.0-beta5. 2020-09-21 13:00:36 -07:00
Cole Mickens
8f6271f5c8 age: MasterKeysFromRecipients: gracefully handle empty string 2020-09-21 12:48:16 -07:00
Cole Mickens
50a89c8293 age: .sops.yaml support 2020-09-21 12:48:16 -07:00
Jimmy Cuadra
6068838aa3 Update go.mod/go.sum. 2020-09-21 12:48:14 -07:00
Jimmy Cuadra
1dbea5d6be Fix whitespace errors. 2020-09-21 12:47:15 -07:00
Jimmy Cuadra
6a6a9363da Use more concise style for constructing map. 2020-09-21 12:47:15 -07:00
Jimmy Cuadra
a66a0a8429 Reorder README sections and fix RST link. 2020-09-21 12:47:15 -07:00
Jimmy Cuadra
ade5692dcc Document age usage. 2020-09-21 12:47:15 -07:00
Jimmy Cuadra
7f7ecbc18e Try decrypting with all possible keys in the keyfile. 2020-09-21 12:47:15 -07:00
Jimmy Cuadra
617db437de Use a single keys.txt file for age private keys. 2020-09-21 12:47:15 -07:00
Jimmy Cuadra
5c171c800c Don't swallow potential errors from os.Stat. 2020-09-21 12:47:15 -07:00
Jimmy Cuadra
d9b196c87c Determine age package path using current file rather than pwd. 2020-09-21 12:47:15 -07:00
Jimmy Cuadra
2741ab530a Use user config dir instead of home dir as the root for age keys. 2020-09-21 12:47:15 -07:00
Jimmy Cuadra
9e4cbc93cf Allow age key dir to be set with SOPS_AGE_KEY_DIR and add tests. 2020-09-21 12:47:15 -07:00
Jimmy Cuadra
9ca46d0d96 Use idiomatic style for assignment and error handling.
Co-authored-by: Jörg Thalheim <Mic92@users.noreply.github.com>
2020-09-21 12:47:15 -07:00
Jimmy Cuadra
e8d00046e1 Add support for age. 2020-09-21 12:47:13 -07:00
AJ Bahnken
334be56818 Merge branch 'master' into develop 2020-09-14 09:39:33 -07:00
AJ Bahnken
dc66e9f995 Merge pull request #735 from mozilla/prep-for-3.6.1
Prep for 3.6.1 release
2020-09-14 09:36:12 -07:00
AJ Bahnken
225ac82d3f Bump version and add changelog for 3.6.1 2020-09-09 10:18:53 -07:00
Nina Garcia
cba61b6444 Update README.rst
Edit: unencrypted prefix -> unencrypted suffix
2020-09-08 13:07:58 -07:00
AJ Bahnken
1927e18b52 Merge pull request #732 from mozilla/ajvb/gpg-key-fetching
Switch gpg.mozilla.org out for keys.openpgp.org
2020-09-02 13:06:11 -07:00
AJ Bahnken
8a09f056de Switch gpg.mozilla.org out for keys.openpgp.org 2020-09-02 11:45:01 -07:00
AJ Bahnken
bdd23ef855 Merge pull request #731 from mozilla/ajvb/fix-tests
Fix vault tests
2020-09-02 11:16:09 -07:00
AJ Bahnken
0ed7e370ac Fix vault tests 2020-09-02 10:52:20 -07:00
Rene Hernandez
8aca3cb790 Add support for --unencrypted-regex (#715)
* Add support for --unencrypted-regex

* Fix grammar mistake

* Add gofmt'd files
2020-09-02 19:15:50 +02:00
Scott Crooks
4bd640e594 chore(gomod): Bumping AWS SDK version (#714) 2020-08-06 16:47:15 +02:00
lbonanomi
f78682c6c0 Support --input-type for exec-file (#699)
* Update main.go

* Update main.go

* Update cmd/sops/main.go

Co-authored-by: Adrian Utrilla <adrianutrilla@gmail.com>

Co-authored-by: Adrian Utrilla <adrianutrilla@gmail.com>
2020-07-28 19:02:02 +02:00
Adrian Utrilla
5d32d9a3ee Revert "Add standard newline/quoting behavior to dotenv store (#622)" (#706)
This reverts commit 4507019a33.
2020-07-27 22:20:37 +02:00
AJ Bahnken
5f7d324046 Merge pull request #693 from mozilla/develop
v3.6.0 RC (develop -> master)
v3.6.0
2020-07-15 15:09:14 -07:00
AJ Bahnken
6b9e168ec7 Update CHANGELOG for additional code for 3.6 2020-07-14 13:38:33 -07:00
lbonanomi
09d511f69f Close tmpfile after writing (#685)
* Close tmpfile after writing

Windows will not allow for deletion of a file with an open handle, 
close tmpfile after writing to prevent unencrypted tmpfiles out-living
the execution

* Update cmd/sops/edit.go

Co-authored-by: Adrian Utrilla <adrianutrilla@gmail.com>

* defer edited file close

Co-authored-by: Adrian Utrilla <adrianutrilla@gmail.com>
2020-07-14 21:25:59 +02:00
Dr. Uwe Daub
4f06780ab2 Fix endless loop in x/crypto/openpgp func ReadMessage (#690)
* Fix tests

* Fix endless loop in x/crypto/openpgp func ReadMessage

This fixes https://github.com/mozilla/sops/issues/665
See also https://github.com/golang/go/issues/28786

In some strange situations it can happen, that openpgp.ReadMessage()
runs into a endless loop. This seems to be triggered by a slightly
inconsistency in key settings.
It happened to me, but I wasn't able to reproduce it with a fresh key.
A proposed solution from the x/crypto community was, to break this loop
in the callback passphrasePrompt.

* Revert "Fix tests"

This reverts commit 285f4dc8a1.

* Improve error description

https://github.com/mozilla/sops/pull/690#discussion_r451630193
2020-07-14 21:25:06 +02:00
AJ Bahnken
260ca36ef1 Update CHANGLOG and version for 3.6.0 2020-07-14 10:33:36 -07:00
AJ Bahnken
7ae19681ee Merge pull request #680 from gl-ahiggins/develop
AWS Profile not correctly resolving .aws/config file - #679
2020-06-18 12:08:08 -07:00
AJ Bahnken
f3c5d806bf Merge pull request #682 from mhyllander/updatekeys-abspath
updatekeys: Make file path absolute
2020-06-17 10:56:09 -07:00
Magnus Hyllander
63b22a2f2a updatekeys: Make file path absolute
"sops updatekeys" is not working the same as when encrypting a file. The
reason is that for "sops --encrypt", the file path is made absolute before
it is compared with the path_regex in the config file. This is not done for
"sops updatekeys", therefore it does not match the correct entry in the
config file when updating keys.
2020-06-17 13:49:28 +02:00
Alex Higgins
bc1567be9d Fixed aws config file issue 2020-06-10 17:21:53 -04:00
0xflotus
94b5021c87 (docs): fixed small typo error (#670) 2020-05-28 00:51:32 +02:00
TuhinNair
a7b6c5577f Fix #671: updatekeys checks for config file flag (#672)
* update 'updatekeys' subcommand to use config (if exists) from commandline

* Fix #671: `updatekeys` checks for config file flag

The 'updatekeys' subcommand did not check for the config flag
in the command line. Add that check and if found use it to set configPath.

* Fix #671: `updatekeys` checks for config file flag

The 'updatekeys' subcommand did not check for the config global string flag.
 Add that check and if found use it to set configPath.

* Fix #671: `updatekeys` checks for config file flag

The 'updatekeys' subcommand did not check for the config global string flag.
Add that check and if found use it to set configPath.

 Edit: Remove mistake file addition

* Update cmd/sops/main.go

Co-authored-by: Adrian Utrilla <adrianutrilla@gmail.com>
2020-05-08 21:25:23 +02:00
Martin Litvaj
99adfaed0b Rename LoadForFile to LoadCreationRuleForFile (#663) 2020-05-04 22:58:45 +02:00
Vaibhav Kaushik
e4abd871c7 Add HashiCorp Vault support (#655)
* feat: initial adding of vualt transit backend to sops
initial work on integration
feat(vault): added cli coomands working for vualt"

fix(vault): fixed config with correct tests

fix(vault): added vault to keygroup and to keyservice server

fixed metadata load

* feat(docs): added docs in README.md and in command help

fix(doc): fix rst formatting"

fix(doc): fix rst formatting

* fix(vault): addressed typos and fixes from autrilla

feat(cli): moved vault to hc-vault naming

* fix(test): typo while rebasing

* fix typos and imporve error messages for vault kms

* rename package from vault to hcvault

* refactor vault keysource url validation

* add negative test cases  for vault keysource

* add hc vault transit config option via objects
additional to URIs

* remove vault_example.yml

* streamline key name to snake case

* rename `BackendPath` to `EnginePath` for hc vault

* correction in hc-vault-transit commands

Signed-off-by: vnzongzna <github@vaibhavk.in>

* resolving conflict

Signed-off-by: vnzongzna <github@vaibhavk.in>

* Apply suggestions from code review

Co-Authored-By: Adrian Utrilla <adrianutrilla@gmail.com>

* allowing only hc_vault_transit_uri as input

Co-Authored-By: gitirabassi
Co-Authored-By: ldue
Signed-off-by: vnzongzna <github@vaibhavk.in>

Co-authored-by: gitirabassi <giacomo@tirabassi.eu>
Co-authored-by: ldue <larsduennwald@gmail.com>
Co-authored-by: Vaibhav Kaushik <vaibhavkaushik@vaibhavka-ltm1.internal.salesforce.com>
Co-authored-by: Adrian Utrilla <adrianutrilla@gmail.com>
2020-05-04 21:27:51 +02:00
Martin Litvaj
8f93ee37a7 #664 remove outdated contact info (#668) 2020-04-28 21:56:05 +02:00
Martin Litvaj
89d77b2082 Fix #611 - Dont break when config file exists but CreationRules are empty (#662) 2020-04-24 23:54:06 +02:00
AJ Bahnken
8b14d4e86f Merge pull request #651 from max-sixty/patch-1
Readme tweak
2020-04-15 17:37:17 -07:00
AJ Bahnken
45b67e7db1 Merge pull request #649 from mozilla/jvehent-patch-3
Update container to go 1.14
2020-04-15 17:36:35 -07:00
Maximilian Roos
1f37a83366 Readme small tweak
Reference `run` python3 function
Use rst ticks
2020-04-12 17:47:18 -04:00