ssssh 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23eb7b25078c4af4d14c7ef59c3366e40eae5d99
-  data.tar.gz: 050e566380878c09ce4a2a74f6e1c83fc9068ecb
+  metadata.gz: 80a20e0a46cd709e4d011fa309c4bb6bd8b232b8
+  data.tar.gz: f3a9089a203a7a507481f581783391493f84d220
 SHA512:
-  metadata.gz: c19b31c112c0ad59272113e256c3ceca76ab8de5e25b72aee39ad96ce5c60df6f9989e0a9ef5a6e2259243d3d3a2b6fda358607e04aac0c0e04c45af48f05d0b
-  data.tar.gz: 6bf22c5db5886e9dad3afa23d98c4b69b8ca5b67268ac7b18a4efa4d61b0db893fbbee18ee82c732add8bd699208e60cf915b898e427fb891b29df7e2b3db020
+  metadata.gz: 90dbafdea7eee03f7b40135ef075a0736ae8d51a4f37fb25bd769f14a4e8ed6366823c4dd12958f509b852b0d085c2c5c4c17a2dd3b84f04896aef7920455ead
+  data.tar.gz: 8c7a205d4cbc5462a744377f2d555877f61f601da3524874efd0019b6e6f234bd74163687932c4e2ef27237d97867a969ccdf23086703d6e8f7fe50a99f1c1d2

data/README.md

@@ -26,3 +26,9 @@ If you'd rather install a Python interpreter than a Ruby one, secrets may also b
 
     base64 -d < secrets.encrypted > /tmp/secrets.bin
     aws kms decrypt --ciphertext-blob fileb:///tmp/secrets.bin --output text --query Plaintext | base64 -d > secrets.txt
+
+## Changes
+
+### 1.2.0 (2015-04-27)
+
+* Add support for encryption contexts (`--context` option).

data/bin/ssssh

@@ -10,6 +10,10 @@ require "ssssh/version"
 
 Clamp do
 
+  option ["-C", "--context"], "KEY=VALUE",
+         "add to encryption context\n  (may be specified multiple times)",
+         :multivalued => true
+
   option ["--region"], "REGION", "AWS region",
          :environment_variable => "AWS_REGION", :required => true
   option "--access-key", "KEY", "AWS access key",
@@ -107,15 +111,36 @@ Clamp do
     signal_error(e.message, :status => 9)
   end
 
+  def encryption_context
+    @encryption_context ||= {}
+  end
+
+  def append_to_context_list(context_string)
+    key, value = context_string.split('=')
+    if value.nil?
+      raise ArgumentError, "KEY=VALUE expected"
+    end
+    encryption_context[key] = value
+  end
+
   def encrypt(plaintext, key_id)
     with_kms do |kms|
-      kms.encrypt(:key_id => key_id, :plaintext => plaintext).ciphertext_blob
+      encryption_params = {
+        :key_id => key_id,
+        :plaintext => plaintext,
+        :encryption_context => encryption_context
+      }
+      kms.encrypt(encryption_params).ciphertext_blob
     end
   end
 
   def decrypt(ciphertext)
     with_kms do |kms|
-      kms.decrypt(:ciphertext_blob => ciphertext).plaintext
+      decryption_params = {
+        :ciphertext_blob => ciphertext,
+        :encryption_context => encryption_context
+      }
+      kms.decrypt(decryption_params).plaintext
     end
   end
 

data/lib/ssssh/version.rb

@@ -1,3 +1,3 @@
 module Ssssh
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ssssh
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Mike Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-11 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core