Граф коммитов

146 Коммитов

Автор SHA1 Сообщение Дата
Julien Vehent [:ulfr] 01e294c729 Merge pull request #51 from twolfson/dev/per.file.example.sqwished
Added per-file example
2016-03-02 15:06:00 -05:00
Todd Wolfson 444ff57400 Added per-file example 2016-03-02 11:57:32 -06:00
Julien Vehent [:ulfr] ad4361544d Merge pull request #50 from twolfson/dev/add.examples.sqwished
Added all-in-one example
2016-03-02 08:30:45 -05:00
Todd Wolfson e3a4dd96fb Added all-in-one example 2016-02-24 22:02:22 -06:00
Julien Vehent 7cb2f51b0d release 1.7 2016-02-24 15:13:03 -05:00
Julien Vehent [:ulfr] b1559a1978 Merge pull request #56 from mozilla/hidewarnings
Hide warning about unavailable keys if at least one succeeds
2016-02-24 14:54:59 -05:00
Julien Vehent d42fa52cae seriously, flake8.... 2016-02-24 14:48:21 -05:00
Julien Vehent 38e4807175 Hide warning about unavailable keys if at least one succeeds 2016-02-24 14:41:23 -05:00
Julien Vehent [:ulfr] f22a8714c1 Add :digi to list of authors 2016-02-22 10:20:07 -05:00
Julien Vehent [:ulfr] 4c638ad39f Merge pull request #54 from bhourigan/pr54
Output format mismatch between format of write_file() and the regex in load_file_into_tree()
2016-02-22 09:06:57 -05:00
Julien Vehent [:ulfr] 23e300eac3 Merge pull request #55 from bhourigan/pr55
sops --input-type load exception allows tree to be initialized as list, not OrderedDict
2016-02-22 09:06:39 -05:00
Brian Hourigan f6e635bcba Explicitly initializing tree to OrderedDict() 2016-02-22 08:28:57 -05:00
Brian Hourigan 31cf35a9da Adding \n in output stream to address mismatch between non yaml/json input regex and output 2016-02-22 08:24:45 -05:00
Julien Vehent bfee1422b3 Doc update for unencrypted fields 2016-02-11 09:11:09 -05:00
Julien Vehent [:ulfr] 10c6380236 Merge pull request #47 from twolfson/dev/test.unencrypted.sqwished
Added support for unencrypted values and branches
2016-02-11 08:57:13 -05:00
Todd Wolfson 9ed5f25422 Added support for unencrypted values and branches 2016-02-10 22:02:50 -06:00
Julien Vehent [:ulfr] ba1e418ba1 Merge pull request #46 from mozilla/1.6
don't encrypt empty values, fixes #42
2016-02-03 13:55:25 -05:00
Julien Vehent 6a132e9a0d add an empty value to example.json 2016-02-03 13:47:19 -05:00
Julien Vehent 9bebe48e04 Use text mode to validate json/yaml syntax 2016-02-03 13:46:55 -05:00
Julien Vehent 96b4bc34b8 don't encrypt empty values, fixes #42 2016-02-03 13:22:33 -05:00
Julien Vehent [:ulfr] 9cb5db862f Merge pull request #45 from bhourigan/master
Adding -v/--version to address https://github.com/mozilla/sops/issues/43
2016-02-03 12:46:36 -05:00
Julien Vehent [:ulfr] 371366718a Improve documentation on file types, fixes #44 2016-02-03 12:28:01 -05:00
Brian Hourigan 72c5dd1911 Adding -v/--version to address https://github.com/mozilla/sops/issues/43 2016-02-03 12:22:19 -05:00
Julien Vehent [:ulfr] 418b286b5e Merge pull request #41 from mozilla/1.4
1.4
2016-02-02 17:19:54 -05:00
Julien Vehent 4dd651c410 Fix flake8 2016-02-02 17:16:13 -05:00
Julien Vehent a04df6d0fb push v1.4 2016-02-02 17:09:38 -05:00
Julien Vehent ce0cc10369 Explicitely declare sys.stdout when writing to stdout, fixes #37 2016-02-02 17:09:38 -05:00
Julien Vehent 0494bc4191 Document openssl header workaround for El Capitan (thanks michal`) 2016-01-23 10:07:04 -05:00
Julien Vehent 0bd85bcf9d Merge branch 'master' of github.com:mozilla/sops 2016-01-05 18:43:34 -05:00
Julien Vehent b96e0a98e4 Detect failure to load yaml or json file, fixes #36 2016-01-05 18:37:10 -05:00
Julien Vehent [:ulfr] 194cb8c2c4 Merge pull request #35 from ckolos/master
update list of files needed for correct installation
2015-12-10 23:03:44 -05:00
Chris Kolosiwsky 47bf80aafb update list of files needed for correct installation 2015-12-10 15:32:16 -06:00
Julien Vehent [:ulfr] 7ad4e87717 Merge pull request #34 from mozilla/tmphash
Fix modification detection in editor mode to use checksums rather than timestamps
2015-12-10 15:52:52 -05:00
Julien Vehent f9d1ae8078 Release 1.2 2015-12-10 15:46:10 -05:00
Julien Vehent aa46d3c7bd Fix modification detection in editor mode to use checksums rather than timestamps 2015-12-10 15:46:10 -05:00
Julien Vehent [:ulfr] b129d3175a Merge pull request #33 from kindlyops/readme-typo
Fix typo of env variable name in README
2015-12-09 11:09:34 -05:00
Elliot Murphy 38feb8604f Fix typo of env variable name in README 2015-12-02 15:40:22 -05:00
Julien Vehent 255eed294d Fix bad handling of kms/pgp add/rm on creations of new files 2015-11-30 09:26:56 -05:00
Julien Vehent 0e29e56c29 Note on backward compatibility for 1.0 2015-11-28 08:23:59 -05:00
Julien Vehent d39e9dfbf2 Merge pull request #30 from mozilla/1.0
1.0
2015-11-28 08:16:57 -05:00
Julien Vehent 8f500d3d20 Use travis-ci container infra 2015-11-25 10:06:39 -05:00
Julien Vehent df0d44937f Fix issue in key rotation of binary files 2015-11-25 10:06:27 -05:00
Julien Vehent 8249924294 Update examples 2015-11-25 09:40:37 -05:00
Julien Vehent bfc31e29a9 Inform user that a data key older than 6 months should be rotated 2015-11-25 08:58:56 -05:00
Julien Vehent 9a388912f9 Make data key rotation with `-r` a separate mode
This patch changes the behavior of `-r` to make it behave like the
encrypt, decrypt or editing mode: it is now a full roundtrip over an
existing encrypted file that decrypts, creates a new data key, encrypts
and encrypts the data key with all master keys. This new mode makes it a
lot easier to rotate data keys without having to edit files.
2015-11-25 08:28:44 -05:00
Julien Vehent a065ebbac4 Fix setup.py for python3.5, fixes #29 2015-11-25 08:28:44 -05:00
Julien Vehent df16173611 Support adding & removing master keys, fixes #26 2015-11-25 08:28:44 -05:00
Julien Vehent abde6d26b7 Check for latest version on pypi, fixes #31 2015-11-25 08:28:44 -05:00
Julien Vehent 9cb14037f7 Fix editing of binary files in -s mode, fixes #28 2015-11-23 12:14:26 -05:00
Julien Vehent dc4541ca02 on syntax error, continue to editor directly. fixes #27 2015-11-23 10:14:42 -05:00