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

50 Commits

Author SHA1 Message Date
AJ Bahnken
15dfcfafcb Vendoring update (#472)
It's been around 9 months since our last vendor update. This is also
needed for some new features being worked on for sops workspace.

Additionally, this PR regenerates the kms mocks.
2019-06-06 17:40:34 +00:00
Mark Kelly
068cb5a805 AWS Profiles - use credentials only if not null 2019-01-25 12:53:34 +00:00
Mark Kelly
ac5ca1f05c AWS Profiles 2019-01-25 12:42:41 +00:00
Adrian Utrilla
9a56f8055e Revert "AWS Profile" 2019-01-24 16:50:41 +01:00
mark kelly
eb7b22a4a0 Merge branch 'master' into master 2019-01-14 10:44:55 +00:00
Mark Kelly
30e1380e8a keysource.go review changes 2019-01-14 10:28:33 +00:00
Mark Kelly
7605dd76b1 Added aws_profile
* Decrypt
* Command Line
* Master Key
* Encrypt
* .sops.yaml
2019-01-11 17:11:43 +00:00
Daren Desjardins
532c36eebc Support referencing AWS KMS keys by aliases
- addresses issue #381
2019-01-10 14:42:10 -08:00
Adrian Utrilla
9d6a8d0e21 Default to Warn log level unless verbose flag is passed 2018-03-07 17:18:45 +01:00
Adrian Utrilla
bd846afea9 Add new logging to GCP KMS 2017-09-25 10:05:40 -07:00
Adrian Utrilla
20046c1b48 Merge branch 'master' into logging 2017-09-16 17:59:00 -07:00
Adrian Utrilla
08a4c7e657 Add documentation to all main packages 2017-09-12 20:01:12 -07:00
Adrian Utrilla
d457e85bad Allow configuring shamir threshold from config file 2017-09-12 13:53:21 -07:00
Adrian Utrilla
93570b20d7 Fix golint errors 2017-09-12 09:59:23 -07:00
Adrian Utrilla
55c7174713 Use logrus features for better logging 2017-09-07 10:49:27 -07:00
Adrian Utrilla
17d5d6b65c Move all loggers to logrus 2017-09-06 17:36:39 -07:00
Adrian Utrilla
1b09444742 Use log.Print instead of fmt.Print everywhere 2017-08-29 12:15:25 -07:00
Adrian Utrilla
dae5c6ce6f Add logging to KMS key operations 2017-08-25 09:59:58 -07:00
Adrian Utrilla
44b26690c2 Merge remote-tracking branch 'origin/shamir' into remote-keys-shamir
Shamir tests do not pass due to KeyService not knowing about the fake
MasterKey used by the tests
2017-08-22 15:39:24 -07:00
Adrian Utrilla
10dd9b5441 Use KeyService for all encrypt and decrypt operations 2017-08-17 11:32:04 -07:00
Adrian Utrilla
ada1461d2f Remove unused capture groups from KMS ARN parsing 2017-08-15 11:49:14 -07:00
Greg Lee Coleman
6c8809285f change: loosen arn partition check
changes `createSession` arn string match
to allow `aws`, `aws-cn`, and `aws-us-gov`
2017-08-15 18:37:29 +00:00
Julien Vehent
b7c1929c8e Vendoring update, release 2.0.9 2017-05-01 18:37:35 -04:00
Adrian Utrilla
62ad4b400e Print new line after warnings 2017-03-22 19:17:07 +01:00
Andy Freeland
bd63010d67 Check type casts and add tests 2017-03-22 10:26:22 -07:00
Andy Freeland
89e75471cc Fix KMS encryption context for backwards compatibility with SOPS 1.x
In SOPS 1.x, KMS encryption context was stored as a JSON object, but
SOPS 2.0 stored it as a comma-separated list of key/value pairs:

```
$ jq '.sops.kms | .[].context' encrypted-python
{
  "a": "b",
  "c": "d"
}
> jq '.sops.kms | .[].context' encrypted-go
"a:b,c:d"
```

The two outputs are incompatible with each other and caused a stack
trace when reading files encrypted with SOPS 1.x.

This patch restores read and output compatibility with SOPS 1.x.

Fixes #190.
2017-03-22 09:59:51 -07:00
Aaron Meihm
e48303b4f1 update createSession to use standard token provider 2017-03-06 14:16:21 -06:00
Adrian Utrilla
454d21d87f Update mocks 2017-02-22 12:26:02 +01:00
Alvaro Gutierrez Perez
1007ed145b Modify TestKeyToMap to test the sorting of context keys 2016-11-06 02:47:52 +01:00
Alvaro Gutierrez Perez
9868a093a9 Sort outContext array alphabetically before joining it in a string 2016-11-06 02:47:00 +01:00
Julien Vehent [:ulfr]
520eab6b9a Fix bug when KMS ARN are in multiple regions (#149)
* Don't reuse KMS service between master keys

* Improve error handling in cmd

* Fix KMS service initialization issue with mocking
2016-11-01 14:15:20 +01:00
Adrian Utrilla
c6fece7318 Added tests 2016-10-31 17:28:59 +01:00
Adrian Utrilla
3fa7cc43f1 Add KMS encryption context support
Fixes #93
2016-10-31 16:56:14 +01:00
Jeremiah Orem
76f4ae8db0 return lists of pointers to avoid repackaging 2016-10-28 10:04:18 -07:00
Julien Vehent [:ulfr]
d9b69e7dfa Merge pull request #133 from mozilla/imports
Added go.mozilla.org imports
2016-10-27 13:42:38 -04:00
Adrian Utrilla
271753eabd Recreated mocks for newest AWS SDK, fixed yaml import 2016-10-27 19:13:01 +02:00
Adrian Utrilla
71d4a3cfd2 Added go.mozilla.org imports
Fixes #122
2016-10-27 18:09:19 +02:00
Adrian Utrilla
4e4abff176 Mocked KMS Encrypt and Decrypt methods 2016-08-25 13:06:51 -07:00
Adrian Utrilla
49a3ef3e3c Added Makefile 2016-08-24 12:37:18 -07:00
Adrian Utrilla
c9d63a838e Fixed golint issues 2016-08-24 10:29:28 -07:00
Adrian Utrilla
9ffe1c4908 Renamed GPGMasterKey and KMSMasterKey to MasterKey 2016-08-23 13:28:56 -07:00
Adrian Utrilla
e4c57636d2 Use UTC instead of local timezone 2016-08-23 12:57:13 -07:00
Adrian Utrilla
762c5cd559 Use time.RFC3339 instead of custom format 2016-08-23 12:54:13 -07:00
Adrian Utrilla
e885735260 aes decryptor now takes []byte keys 2016-08-23 12:49:18 -07:00
Adrian Utrilla
c522a7e93f Added ability to add and remove keys from files 2016-08-22 17:47:37 -07:00
Adrian Utrilla
0679be3598 Implemented unencrypted suffix
Move keysource tests to their respective packages
2016-08-22 14:22:04 -07:00
Adrian Utrilla
15b9c0ea5e Compare time durations directly without converting to numbers 2016-08-19 15:38:33 -07:00
Adrian Utrilla
0fbba59163 Added YAML encryption 2016-08-18 15:49:27 -07:00
Adrian Utrilla
3997384272 Set key creation date to current date 2016-08-17 15:24:22 -07:00
Adrian Utrilla
791cd693c2 Refactored PGP and KMS into their own packages 2016-08-11 11:44:00 -07:00