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

813 Commits

Author SHA1 Message Date
Adrian Utrilla
2a0cc64bc7 Release 3.1.0 3.1.0 2018-09-12 17:02:35 +02:00
Julien Vehent [:ulfr]
fc035f4275 Merge pull request #376 from nphmuller/patch-1
Update README.rst
2018-09-04 09:16:45 -04:00
Nick
cf44114302 Update README.rst
Gopath export did not work previously on Ubuntu 16.04
2018-09-03 14:59:42 +02:00
Adrian Utrilla
8c8d780abb Merge pull request #364 from carlpett/patch-1
Fix typo in Dockerfile
2018-06-25 16:02:39 +02:00
Calle Pettersson
9493015577 Fix typo in Dockerfile
`s/CGO_ENALBED/CGO_ENABLED/`
2018-06-25 15:41:52 +02:00
Adrian Utrilla
01f5634bc5 Merge pull request #362 from carlpett/azure-readme
Add readme for Azure
2018-06-25 10:51:51 +02:00
Calle Pettersson
2e5b18e826 Fix random name length 2018-06-25 10:37:34 +02:00
Adrian Utrilla
3c992b40c3 Merge branch 'master' into azure-readme 2018-06-22 12:18:41 +02:00
Calle Pettersson
98f687c01f Fix Azure instructions 2018-06-22 11:18:57 +02:00
Adrian Utrilla
f1b9fe36a8 Merge pull request #361 from mozilla/vendor
Update go-autorest
2018-06-21 17:52:31 +02:00
Calle Pettersson
88db2dcab6 Add Azure Service Principal help 2018-06-21 16:39:33 +02:00
Calle Pettersson
43fa5e5d65 Add readme for Azure 2018-06-21 15:32:10 +02:00
Adrian Utrilla
34c5324d34 Update go-autorest 2018-06-21 10:57:23 +02:00
Adrian Utrilla
7e7e54bc8c Merge pull request #358 from carlpett/azure-kv-support
Add support for Azure Key Vault
2018-06-18 23:12:42 -07:00
Adrian Utrilla
fa570f47b4 Vendor Azure SDK 2018-06-19 08:00:24 +02:00
Calle Pettersson
19e964ebdd Make Azure key parsing failable 2018-06-18 16:03:24 +02:00
Calle Pettersson
6ce3593448 Add Azure authentication docs 2018-06-18 10:39:10 +02:00
Calle Pettersson
9fa4f0e90e Add support for Azure Key Vault 2018-06-17 22:50:30 +02:00
AJ Bahnken
3265a66cd3 Handle escaping in original json (#357)
* Handle escaping in original json

* Replace conditional magic with proper json encoding call for key

* swap TestDecodeJSONWithEscaping with new TestEncodeJSONWithEscaping

* fix copy/paste typo
2018-06-01 12:47:27 -07:00
AJ Bahnken
5e8d1390eb Merge pull request #353 from ajvb/ajvb/enable-use-of-cgo-in-docker
Explicitly enabled cgo within Dockerfile build
2018-05-31 09:23:22 -07:00
AJ Bahnken
45c84aa759 Explicitly enabled cgo within Dockerfile build 2018-05-30 12:48:59 -07:00
Jesse Cooke
50f2a8c694 Update rotation steps to use -i (#352) 2018-05-18 19:06:19 +02:00
Adrian Utrilla
e9550cdcbd Document lack of YAML stream support (#351)
Fixes #350
2018-05-17 18:22:48 +02:00
Julien Vehent [:ulfr]
5430b63879 Merge pull request #348 from mozilla/3.0.5
release 3.0.5
3.0.5
2018-05-15 14:14:54 -04:00
Julien Vehent
85fd14ddd2 release 3.0.5 2018-05-15 14:05:40 -04:00
Adrian Utrilla
5e6aa7f3eb Fix double encryption prevention (#346)
* Fix binary file bug double encryption prevention

The `ensureNoMetadata` function was incorrectly implemented and called
LoadEncryptedFile on the InputStore and checked whether the returned error was
MetadataNotFound or not. In the case where loading the input file as an encrypted
file would fail (e.g. due to syntax errors), it would incorrectly report the file as
having a "sops" branch. When using the binary mode, it would try to load the file as
an encrypted binary file (which is expected to be JSON), which would fail, thus
triggering this error.

* Add functional test for binary file roundtrip
3.0.4
2018-05-14 19:59:07 +02:00
Adrian Utrilla
97ce8a62c9 Fix empty comments not being decrypted correctly (#344)
SOPS failed to decrypt empty comments before after they were encrypted because they
would look like:

`#ENC[AES256_GCM,data:,iv:NVQvG25goSE7xi6U/QjRNtJBwr/VfChezSptI8GFsQk=,tag:yyYIW/hiIZ1qK1GEo8vHpA==,type:comment]`

Note the empty "data" value.

SOPS would fail to decrypt those and show them to the user "encrypted" when
decrypting the file.
2018-05-08 14:09:11 -04:00
AJ Bahnken
9143db1e28 Merge pull request #343 from ajvb/ajvb/keyservice-error-message
If keyservicecmd returns an error, log it.
2018-05-07 11:18:24 -04:00
AJ Bahnken
a6c0f6e048 If keyservicecmd returns an error, log it. 2018-05-07 11:08:24 -04:00
AJ Bahnken
038001b3a3 Auditing support
* Implement auditing support

* Document auditing

* Address review comments

* Change log level for errors reading audit config

* Disable auditors during tests

* Make changes to docs suggested by @jvehent

* Code review fixes to init() in audit.go

* Implement encrypt audit event

* Include filepath in Tree created from sops/encrypt/encrypt

* Fix changes in audit.go to stay with current style

* Implement RotateEvent within rotate command

* github.com/lib/pq vendor dependencies

* Always get current user in PostgresAuditor.Handle()

* Initial CR fixes + gofmt

* gofmt

* fixed placement of audit event in rotate()

* Moved to a single table for audit events.

* Revert "Moved to a single table for audit events."

This reverts commit 7e7817e8a1.

* Remove audit tables delete protection rules

* Move to a single audit_event table with action column

* Remove unnecessary tree declaration
2018-04-22 21:21:58 +02:00
Adrian Utrilla
1ffc93dfb6 Refactor Store interface to reflect operations SOPS performs (#335)
* Refactor Store interface to reflect operations SOPS performs

Previously the Store interface tried to mimic the Marshaler and Unmarshaler
interfaces. This was a mistake, as it meant Stores had no idea whether the files they
were loading were encrypted or not.

Partially fixes #334

* Add regression test for loading plain JSON file with binary store
2018-04-20 10:13:46 +02:00
Julien Vehent [:ulfr]
970b7be2e3 Merge pull request #312 from mozilla/prevent-double-encryption
Prevent files from being encrypted twice
2018-04-19 17:30:43 -04:00
Julien Vehent [:ulfr]
887c87b80a Merge branch 'master' into prevent-double-encryption 2018-04-11 17:13:10 -04:00
Julien Vehent [:ulfr]
b8c2051836 Merge pull request #318 from mozilla/release-3.0.3
Release 3.0.3
3.0.3
2018-04-11 09:20:43 -04:00
Adrian Utrilla
dbc4022654 Merge branch 'master' into release-3.0.3 2018-04-11 14:48:31 +02:00
Adrian Utrilla
0bfa15ac25 Update changelog 2018-04-11 14:48:11 +02:00
Adrian Utrilla
37b6fff84d Introduce key service flag optionally prompting users on encryption/decryption (#322) 2018-04-11 14:46:50 +02:00
Adrian Utrilla
5a5cfaae8f Merge branch 'master' into release-3.0.3 2018-04-10 10:12:18 +02:00
dovreshef
16950d00d2 Adds unencrypted_suffix and encrypted_suffix to .sops.yaml (#325)
Add the ability to specify `unencrypted_suffix` and `encrypted_suffix` using the `.sops.yaml` config file
2018-04-09 10:50:47 +02:00
Adrian Utrilla
f5b8e2cdef Merge pull request #323 from dovreshef/added-encrypted-suffix
Added an --encrypted-suffix option
2018-04-08 17:06:32 +02:00
Dov Reshef
ed934575ee Address review comments 2018-04-08 17:53:54 +03:00
Dov Reshef
efd8521436 added the --encrypted-suffix option 2018-04-08 12:43:43 +03:00
Dov Reshef
e57c8f2c85 Fixed wrong Errorf format in message 2018-04-08 10:48:11 +03:00
Adrian Utrilla
2df6575bf2 Merge pull request #314 from devinburnette/path-regex
deprecate filename_regex in favor of path_regex
2018-04-02 17:59:30 +02:00
Devin Burnette
d3d0267f4e deprecate filename_regex in favor of path_regex 2018-04-02 11:17:45 -04:00
Julien Vehent [:ulfr]
4deb838454 Merge branch 'master' into prevent-double-encryption 2018-03-30 15:32:19 -04:00
Adrian Utrilla
4725e09e44 Update vendored dependencies 2018-03-30 21:19:35 +02:00
Adrian Utrilla
34d6b5001c Release 3.0.3 2018-03-30 21:12:10 +02:00
Adrian Utrilla
68cf5aa561 Merge pull request #317 from mozilla/extract-string
Don't yaml.MarshalValue strings on extract
2018-03-30 21:05:04 +02:00
Adrian Utrilla
f08b1f13c1 Merge branch 'extract-string' of github.com:mozilla/sops into extract-string 2018-03-30 20:54:24 +02:00