getsops/sops
1
0
Fork 0
mirror of https://github.com/getsops/sops.git synced 2026-02-05 12:45:21 +01:00
Code Issues Activity
928 Commits 6 Branches 42 Tags
611dc62a6465d3efeeed00aad26db24b4a50d95a
Commit Graph

928 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adrian Utrilla
611dc62a64 Merge pull request #458 from tariq1890/go_112 
use golang 1.12 for building sops
 2019-05-21 08:30:18 +02:00
Tariq Ibrahim
0bca3f96fc use golang 1.12 for building sops 2019-05-20 23:24:43 -07:00
AJ Bahnken
b3a11d3bfc Changes to travis config and docs for using develop (#462) 
* Fixes integration tests in travis to not run on PR's (they will now
run on merges into `develop` and `master`)
* Change README.rst and CONTRIBUTING.md to reflect the use of `develop`
as the primary development branch
 2019-05-16 21:29:16 +00:00
Adrian Utrilla
2edae1d817 Release 3.3.0 3.3.0 2019-04-18 13:01:55 +02:00
Adrian Utrilla
8f804bce1c Merge pull request #448 from mozilla/dev/fix-aws-kms-enc-ctx 
KMS Encryption Context bug fix, autofix, and additional testing
 2019-04-18 12:33:02 +02:00
Adrian Utrilla
fd74caf80a Merge branch 'master' into dev/fix-aws-kms-enc-ctx 2019-04-18 12:23:22 +02:00
Adrian Utrilla
8c4549b72f Merge pull request #453 from mozilla/ajvb/skip-kms-tests-on-prs 
Only run kms functional tests within mozilla/sops
 2019-04-18 12:22:57 +02:00
Adrian Utrilla
78de36b23a Merge pull request #457 from mozilla/ajvb/upgrade-dockerfile-to-go-1-11 
Upgrade to golang:1.11 in Dockerfile
 2019-04-18 12:22:09 +02:00
AJ Bahnken
7a174579a3 Upgrade Dockerfile from to golang:1.11 2019-04-17 13:20:28 -07:00
Adrian Utrilla
3d71ab889c Merge branch 'master' into dev/fix-aws-kms-enc-ctx 2019-04-17 21:58:57 +02:00
AJ Bahnken
ba3c378fb0 small typo in travis ci config 2019-03-29 10:52:44 -07:00
AJ Bahnken
f000986f20 Only run kms functional tests within mozilla/sops 
Instead of exiting early, only run the kms tests within the context of
mozilla/sops (and not from forks).
 2019-03-29 10:42:01 -07:00
Adrian Utrilla
a6a0d81336 Create CODE_OF_CONDUCT.md 
Fixes https://github.com/mozilla/sops/issues/452
 2019-03-29 18:09:19 +01:00
AJ Bahnken
23fb078e05 Autofix AWS KMS encryption context bug (#445) 
* kms encryption ctx auto fix

Code to do the migration is still rough and needs clean up and further
testing.

* Added some further polish to enc ctx fix code path

* Attempt to decrypt using other keys before trying enc ctx variations

* just re-encrypt datakey instead of all of the values

* Move KMS enc ctx fix code to new function

* Fix RetrieveLatestVersionFromUpstream with pkg move

* Fixes from code review

* Include err in message displayed to user

* Remove duplicate file.Close() calls in Fix kms func

* move file.Close() to defer
 2019-03-21 10:55:51 -07:00
jpsrn
f2e48b1a2c Fix KMS encryption context handling (#435) 
* Fix KMS encryption context handling

The code copying encryption context value strings to a map
containing string pointers was incorrectly getting a pointer to a
string variable which is being re-used by the for loop, causing
all keys to point to the same value string.

* Extract helper method for KmsKey to KMS MasterKey conversion

* Add test for kmsKeyToMasterKey helper function
 2019-03-21 10:08:37 -07:00
AJ Bahnken
51503b5177 Initial set of AWS KMS tests (#444) 
* Initial set of AWS KMS tests

* rename temp file in kms test

* Skip AWS KMS functional tests if env var is unset
 2019-03-21 09:43:36 -07:00
Julien Vehent [:ulfr]
c3c3b7c76d Update README.rst 2019-03-13 18:37:43 -04:00
Julien Vehent [:ulfr]
fde9400161 Update README.rst 2019-03-13 18:36:53 -04:00
Julien Vehent [:ulfr]
e37f109227 Update README.rst 2019-03-13 18:35:49 -04:00
Julien Vehent [:ulfr]
f7b8671909 Update README.rst 2019-03-13 18:35:30 -04:00
Adrian Utrilla
ae93caf2c6 Merge pull request #440 from rabadin/add-gpg-keyserver-env-var 
Add support for custom GPG key servers
 2019-03-12 17:16:54 +01:00
rabadin
bca9526566 Rewiew fix: update documentation 2019-03-12 13:57:12 +01:00
rabadin
410a687a35 Add support for custom GPG key servers 
Add support for the SOPS_GPG_KEYSERVER environment variable to
override the default GPG key server (gpg.mozilla.org).
 2019-03-12 12:17:33 +01:00
Julien Vehent [:ulfr]
c968ce2e3b Merge pull request #433 from mozilla/jvehent-patch-1 
Update README.rst
 2019-03-04 11:14:16 -05:00
Julien Vehent [:ulfr]
3664649ec8 Update README.rst 2019-03-02 07:58:26 -05:00
Adrian Utrilla
e908da7097 Merge pull request #421 from mozilla/consolidate-example-trees 
Consolidate example trees
 2019-02-27 22:17:03 +01:00
Adrian Utrilla
2712e3770f Merge branch 'master' into consolidate-example-trees 2019-02-27 22:03:21 +01:00
Adrian Utrilla
0f197e5e5a Merge pull request #420 from mozilla/dotenv-comment-support 
Add comment support to dotenv store
 2019-02-27 22:00:46 +01:00
Adrian Utrilla
5b420d9280 Merge branch 'master' into consolidate-example-trees 2019-02-27 21:51:19 +01:00
Adrian Utrilla
c262b5ab3b Merge branch 'master' into dotenv-comment-support 2019-02-27 21:49:56 +01:00
Adrian Utrilla
8cbb1dcf86 Merge pull request #431 from jkroepke/patch-1 
Add vi to known editors
 2019-02-27 21:20:21 +01:00
Jan-Otto Kröpke
134d63ee39 Add vi to known editors 
By default on alpine there is just vi (busybox compat).
 2019-02-27 20:22:43 +01:00
Adrian Utrilla
160b25f6dc Merge pull request #430 from sergey-shambir/fix-no-vim-panic 
Fixed panic when nano available, but vim is not installed
 2019-02-26 14:01:34 +01:00
Adrian Utrilla
5dfa5348ef Update cmd/sops/edit.go 
Co-Authored-By: sergey-shambir <sergey.shambir.auto@gmail.com>
 2019-02-26 15:36:30 +03:00
Adrian Utrilla
be7561dec2 Update error message when editor not found 
Co-Authored-By: sergey-shambir <sergey.shambir.auto@gmail.com>
 2019-02-26 15:28:30 +03:00
Sergey Shambir
fd130957e6 Fixed panic when nano available, but vim is not installed 
Command `which vim nano` returns 1 when only nano editor is installed
The solutions is to use exec.LookPath
 2019-02-26 15:08:15 +03:00
Adrian Utrilla
a2d0328e35 Merge pull request #423 from marky-mark/master 
AWS Profile fix
 2019-01-28 09:49:20 +01: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
988e49994d Merge pull request #422 from mozilla/revert-416-master 
Revert "AWS Profile"
 2019-01-24 17:00:43 +01:00
Adrian Utrilla
9a56f8055e Revert "AWS Profile" 2019-01-24 16:50:41 +01:00
Adrian Utrilla
d77ae5b1be Add comment support to dotenv store 2019-01-23 11:07:05 +01:00
Adrian Utrilla
bbf17b3d84 Consolidate example trees 2019-01-23 10:54:27 +01:00
Adrian Utrilla
3383f2dc95 Merge pull request #416 from marky-mark/master 
AWS Profile
 2019-01-14 13:02:26 +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
ada410bc49 main.go review update 2019-01-14 10:26:26 +00:00
Mark Kelly
cc3fec53a2 README update 2019-01-14 10:22:16 +00:00
Mark Kelly
6fa25e7ccb Merge branch 'master' of https://github.com/marky-mark/sops 2019-01-11 17:13:17 +00:00
Mark Kelly
7605dd76b1 Added aws_profile 
* Decrypt
* Command Line
* Master Key
* Encrypt
* .sops.yaml
 2019-01-11 17:11:43 +00:00