Julien Vehent
9d4ea13f37
Updated changelog for 3.0.1
2018-01-18 17:32:11 -05:00
Julien Vehent [:ulfr]
0b5a12fd55
Merge pull request #287 from snebel29/improvement/readme-minor-improvements
...
Improvement/readme minor improvements
2018-01-18 17:13:31 -05:00
Julien Vehent [:ulfr]
64c8236e4d
Merge branch 'master' into improvement/readme-minor-improvements
2018-01-18 17:05:06 -05:00
Julien Vehent [:ulfr]
c7cbf7dca1
Merge pull request #286 from mozilla/set-extract-readme-fix
...
Update --set and --extract examples
2018-01-16 13:57:42 -05:00
snebel29
2f12bfd3c9
Improve KMS GCP examples to make it easier for first timers
2018-01-16 16:02:48 +00:00
snebel29
8e3ce41591
Add encryption flag to the encryption example
2018-01-16 14:53:51 +00:00
snebel29
9f68cf00f0
Format gcloud auth login block command correctly
2018-01-16 14:53:14 +00:00
snebel29
9adc47c915
Add GCP KMS to the list of valid key management services
2018-01-16 14:50:43 +00:00
Adrian Utrilla
6948d7e676
Update --set and --extract examples
...
The examples for --set and --extract were based on the Python version, and the command line handling has changed slightly for the Go version.
2018-01-16 08:48:39 +01:00
Adrian Utrilla
6db00d4219
Merge pull request #283 from 0xmohit/issue-235
...
Don't consider io.EOF returned by Decoder.Token as error
2018-01-14 22:49:13 +01:00
Mohit Agarwal
591d5c4154
Don't consider io.EOF returned by Decoder.Token as error
...
[`Decoder.Token`](https://golang.org/pkg/encoding/json/#Decoder.Token )
returns nil, io.EOF at the input stream.
This caused the output json to have no "data" key for an input
containing a number:
```
{
"sops": {
"kms": null,
"gcp_kms": null,
"lastmodified": "2018-01-14T14:51:51Z",
"mac": "ENC[AES256_GCM,data:miI91EH0VGqTY9DuJweV61++dq1LmdBwbU/tkaznCeVo2H7z0vws0FdDJiKUiyCwd+PYkpklinVyGWzxDjgR1yWch+9uU4zFkwSiNwLTdQRitYE9Kwxd37E7+AFmJtZIfIdUZsx/gFP4YZ4Pn2cgVK6n9sNRyaGhR4PyCp7TXT4=,iv:XnyghTNLba1edrVYk8sum38pe736T3L5yGJMmBocDyE=,tag:b3z730u8+hPiNxmg8REFHg==,type:str]",
"pgp": [
{
"created_at": "2018-01-14T14:51:51Z",
"enc": "-----BEGIN PGP MESSAGE-----\n\nwcFMA90gOM45xlRNARAAj8AtDWZakRBpMmqRH3z6F+hIkyt2xpP911MAHpU1e4ma\nNZfUcKJybg2XFbAj40uDSEE1o1+hebU18nzYVwVUiDKBGN5f3rSgAIgtcK8u9JT2\nhRPndP7wkFK1t1+n3ne40ZotdqYefCLjHUalmS8Ka5wYDXGD9fOR3zBoaJ1VFWYu\nZyOltpqK76AFZ8dJkBBXcZCKfmZ2h2C9/tfSq5Hjibzddd/zit09zXsyHE6McFJU\n3YPGmGQ/kE+/1vkELIF3suGy7yB3Um0cRCEVnHoZJkE+lRZtxKKJ91oKLOfwJkoT\nOAHmeRJxDE45eae/wbWS4KHUFJ2IvfnUuaNCVrnYyzRP05wFxAuZI7XcV3ckVfaM\nBW2GkAUESfY9zYkTm/lOpUhAjEpqzjG+lSCt9VdHMMqOl8N4z6U5qzznm1ZL4Wf9\nbEV0zRc5XECmM6yjx7KHA8ivjdgxpKY9HgBI5ZkfjgoORfOaZaiVdteRmEOQM3yS\nWN+QTt4dkcfsqdpmYyHbCatgV9rsZdcIHS1kZ4EK7HMKzwR9+caRFA+o3NOm0hyx\nbNnMldVFr771KFoneau13A5HdZGdZRO7qMfpVZjdDQ8dFR1xtAimeoSGqIv5rcT3\n8UzrnNuSkHlPZHNgBloV5DoFLtWzd9VZCOl1KyLQLsSqQgbi1mbZlAQWfdWbwqHS\n4AHk3ef1I8MjQxVJFD4jSgC80OHzIeBK4C/heu/gfuKjuYWI4MLlPiuN6e+yoFT+\nR75GX1GgqTWP52gwxstEibTQ7n9zl6/gUeQ1/T+QOFDfajpawb8+xxyx4kjOzPnh\nU4MA\n=VSfw\n-----END PGP MESSAGE-----",
"fp": "C8F69F5F7059C32B3328DFE48BE9D15D0B0D06EB"
}
],
"unencrypted_suffix": "_unencrypted",
"version": "3.0.0"
}
}
```
After the change:
```
{
"data": "ENC[AES256_GCM,data:PVw=,iv:cCDbWu1jdYkCIUcF/BtZGBs6mSWtdTI5ZF/A/i7RxIY=,tag:sFtal0nSo2koPDxnaKxLgA==,type:str]",
"sops": {
"kms": null,
"gcp_kms": null,
"lastmodified": "2018-01-14T14:52:38Z",
"mac": "ENC[AES256_GCM,data:BOyvRlaMKIGRcNOnmBGnN/Qz7i/l6Lhl5lx1OJ1VMb6nhuKkhCySktGVYOElUTgLc3CDKLfELNKiID2i6HKAkSAWQyYC1tIPAQTcBtnVd2Pt7Adzz8i8JFzWT+sc5rKLCOljnXwcXsxbmhrWwfQFj57wVWkvZTRNLfNZkcMnykw=,iv:JxCILR1qxAk391tTmLf/hXlr1L/JQWqhLbFHYR04HjI=,tag:0LSWWPWEBeK1Gm2mi4UBNA==,type:str]",
"pgp": [
{
"created_at": "2018-01-14T14:52:38Z",
"enc": "-----BEGIN PGP MESSAGE-----\n\nwcFMA90gOM45xlRNARAAR+FmJBwY4gnpUUZSwWRrwJ+PLhBzVXoIfZ2zqhk+gkvl\nGZyi62mCM5ZVoVPf8Pw+a9cQi+IzJHgKEOT/6PIp1chw7DhnoGbFJExcE3inniou\nlLo2pFTRH5jTvCE3yIIR/l1b9VMrtnOcZuYx9SobLjIv4wKtY1gMkbmrG2IDLmMT\n9QYM/MT/aCcUA/u6bYz8+ZjAS7NUEifji/SkZkYlL1tdCEdiHU/Cl4gScOhqcIsK\nGWGa+1jnxnYOmYq3FDMb90RSPgU8xkzl9EQIInF2t4K3Zj7E+9J93Y7N2udpNGah\nebPwxS4VTCLl1p69q9+nhO8rn9ySjeTjIoJwPoNDzWVowQEmUPZCTz+A28RKi02l\nGsuYxCzD5aF8cRhZbLk882fCAo77U9TiYYa00cq8kTqnCpZmtp3BevrdWTswJwin\n/TID0DOflahzj7iUP8MAVI2nzGosmCWEFiVONWq2l2z7ND78Y65G/d5hM3zv71U/\n1z0B8zzxZSbFFTV2YjADwWdizpeXJFJuVdynCQdPxt8qfNZVXcQfIHmYwh4M3k3U\nv5yV491mwCPNAJAoBaNJoKLnXx3ae4Aic4s2sF3V+AKK6rNiWtuAWsyjuwzmTse2\ntQisNTez5m+6r5seC7YvC2i9Vb2DNzqYn4M/13tHjxpPrNxdCGNneM1FKG8a03nS\n4AHk5BBSjhL9oc/o7zf8AsoFdeE2A+BR4KnhNXbg2eJlJCnO4IvlzVv3wYVwmh5W\nfyHqIQAX3ICb43o6Vo2/AGANvM5BdA3gX+ToyYFHsSMttWLz4zAUJWe04pRx0/rh\n73EA\n=0ON2\n-----END PGP MESSAGE-----",
"fp": "C8F69F5F7059C32B3328DFE48BE9D15D0B0D06EB"
}
],
"unencrypted_suffix": "_unencrypted",
"version": "3.0.0"
}
}
```
Fixes #235
2018-01-14 20:41:37 +05:30
Adrian Utrilla
cf8f3158cc
Merge pull request #279 from azhi/fix-incompatibility-between-openpgp-and-gpg
...
add IsBinary: true to FileHints when encoding with crypto/openpgp
2017-11-27 23:48:59 +01:00
azhi
4efe53ff42
add IsBinary: true to FileHints when encoding with crypto/openpgp
...
since we encode binary data this is generally a good idea
this commit fixes #278 - now both crypto/openpgp and gpg work in a binary
mode, and we can safely use both interchangeably
(e.g. encrypt with crypto/openpgp, and then decrypt with gpg)
2017-11-28 01:17:44 +03:00
Adrian Utrilla
2fe6074a35
Merge pull request #277 from softonic/fix-readme
...
Fix gpg import statement
2017-11-20 11:23:31 +01:00
Marc Villacorta
d0496a195b
Fix gpg import statement
2017-11-20 11:01:57 +01:00
Adrian Utrilla
801f5e95d3
Merge pull request #276 from while1malloc0/fix-null-pointer-error-in-config-loading
...
Don't dereference a null pointer if the config file is empty
2017-10-30 16:16:16 +01:00
Adrian Utrilla
fb5f37f2be
Merge branch 'master' into fix-null-pointer-error-in-config-loading
2017-10-30 15:16:34 +01:00
John Turner
102c9e31f0
Update error message based on feedback
2017-10-30 10:09:25 -04:00
John Turner
84f1042988
Don't assert against error message
2017-10-30 10:08:48 -04:00
Julien Vehent [:ulfr]
69b56f78d3
Merge pull request #275 from while1malloc0/fix-help-text-typo
...
Fix typo in help text for unencrypted-suffix
2017-10-30 09:56:55 -04:00
Julien Vehent [:ulfr]
01961a88c1
Merge branch 'master' into fix-help-text-typo
2017-10-30 09:48:44 -04:00
Julien Vehent [:ulfr]
5c19133fd5
Merge pull request #274 from philipcristiano/master
...
readme: Fix typo
2017-10-30 09:47:00 -04:00
John Turner
77e90bb7c2
Don't dereference a null pointer if the config file is empty
2017-10-27 22:24:14 -04:00
John Turner
c678ede470
Fix typo in help text
2017-10-27 21:02:35 -04:00
Adrian Utrilla
48bdbf356e
Update README.rst
2017-10-25 19:49:35 +02:00
Philip Cristiano
4a792cd1fc
readme: Fix typo
2017-10-25 13:42:24 -04:00
Julien Vehent [:ulfr]
a01b061a27
Merge pull request #272 from autrilla/fix-encryption-context
...
Fix use of unintialized maps in key service
2017-10-20 09:49:39 -04:00
Adrian Utrilla
99aff169be
Fix use of unintialized maps
2017-10-20 15:26:37 +02:00
Julien Vehent
71a9c19b1e
Fix deploy_dockerhub path in circle config
2017-10-19 15:58:37 -04:00
Julien Vehent
8679fa8819
Fix permissions on deploy_dockerhub.sh
2017-10-19 15:39:40 -04:00
Julien Vehent [:ulfr]
ae73d099a0
Merge pull request #267 from autrilla/dockerfile
...
Update dockerfile to include AWS cli
2017-10-19 15:33:40 -04:00
Julien Vehent [:ulfr]
f9ab0e1822
Merge branch 'master' into dockerfile
2017-10-19 15:24:16 -04:00
Julien Vehent [:ulfr]
ee1cee1bc2
Merge pull request #269 from mozilla/circleci-fixes
...
Use go.mozilla.org package name in CircleCI config
2017-10-19 15:22:49 -04:00
Julien Vehent [:ulfr]
b5a5845c17
Merge branch 'master' into dockerfile
2017-10-19 15:21:31 -04:00
Adrian Utrilla
8fcdb2c9da
Remove make step as SOPS is built inside the container
2017-10-13 14:03:18 -07:00
Adrian Utrilla
3cfa8f00d0
Update dockerfile to include AWS cli
2017-10-13 14:03:12 -07:00
Adrian Utrilla
c87a4c8384
Use go.mozilla.org package name in CircleCI config
2017-10-13 10:12:10 -07:00
Adrian Utrilla
cd300930de
Merge pull request #268 from mozilla/circleci
...
Circleci
2017-10-12 15:04:53 -07:00
Julien Vehent
e5cb89c6a3
add circleci config to build docker containers
2017-10-12 16:47:26 -04:00
Adrian Utrilla
229375b233
Update dockerfile to include AWS cli
2017-10-12 11:40:20 -07:00
Julien Vehent
cb2340c150
Merge branch 'master' of github.com:mozilla/sops
2017-10-10 16:10:51 -04:00
Julien Vehent [:ulfr]
04420860c4
Merge pull request #250 from mozilla/sops3
...
Sops3
2017-10-10 16:10:17 -04:00
Julien Vehent [:ulfr]
1ca4fa23d4
Merge branch 'master' into sops3
2017-10-10 13:36:33 -04:00
Adrian Utrilla
f6fe0fe4d5
Merge pull request #265 from autrilla/pretty-errors
...
Improve error message for retrieving data key
2017-10-10 10:17:07 -07:00
Adrian Utrilla
9812314434
Merge branch 'master' into pretty-errors
2017-10-10 10:03:50 -07:00
Adrian Utrilla
0236ea865c
Update CHANGELOG.rst
2017-10-10 09:58:33 -07:00
Adrian Utrilla
b6c7baa437
Vendor dependencies
2017-10-10 09:52:53 -07:00
Adrian Utrilla
c69a3d4af5
Merge branch 'pretty-errors' of github.com:autrilla/sops into pretty-errors
2017-10-10 09:49:04 -07:00
Adrian Utrilla
500e11110c
Merge pull request #264 from autrilla/retrieve-gpg-keys
...
Support retrieving PGP keys from keyservers
2017-10-10 09:48:31 -07:00
Adrian Utrilla
e023490c82
Fix typo and clarify ignored errors
2017-10-10 09:48:00 -07:00
