relishable 0.6 → 0.7

data/Gemfile.lock

@@ -1,14 +1,17 @@
 PATH
   remote: .
   specs:
-    relishable (0.5)
-      fog
+    relishable (0.7)
+      fernet (~> 1.4)
+      fog (~> 1.6)
 
 GEM
   remote: http://rubygems.org/
   specs:
     builder (3.1.3)
     excon (0.16.4)
+    fernet (1.4)
+      yajl-ruby
     fog (1.6.0)
       builder
       excon (~> 0.14)
@@ -29,6 +32,7 @@ GEM
       jruby-pageant (>= 1.1.1)
     nokogiri (1.5.5)
     ruby-hmac (0.4.0)
+    yajl-ruby (1.1.0)
 
 PLATFORMS
   ruby

data/lib/relish/dynamo_helper.rb

@@ -0,0 +1,63 @@
+require "fog"
+
+class Relish
+  class DynamoHelper
+
+    def initialize(aws_access_key, aws_secret_key, table_name)
+      @aws_access_key = aws_access_key
+      @aws_secret_key = aws_secret_key
+      @table_name = table_name
+    end
+
+    def db
+      @db ||= Fog::AWS::DynamoDB.new(:aws_access_key_id => @aws_access_key, :aws_secret_access_key => @aws_secret_key)
+    end
+
+    def query_current_version(id)
+      response = db.query(@table_name, {:S => id}, :ConsistentRead => true, :Limit => 1, :ScanIndexForward => false)
+      if response.status != 200
+        raise('status: #{response.status}')
+      end
+      if response.body['Count'] == 1
+        response.body['Items'].first
+      end
+    end
+
+    def put_current_version(item)
+      response = db.put_item(@table_name, item, {:Expected => {:id => {:Exists => false}, :version => {:Exists => false}}})
+      if response.status != 200
+        raise('status: #{response.status}')
+      end
+    end
+
+    def get_version(id, version)
+      response = db.get_item(@table_name, {:HashKeyElement => {:S => id}, :RangeKeyElement => {:N => version}})
+      if response.status != 200
+        raise('status: #{response.status}')
+      end
+      response.body['Item']
+    end
+
+    def put_version(id, version, item)
+      response = db.put_item(@table_name, item, {:Expected => {:id => {:Value => {:S => id}}, :version => {:Value => {:N => version}}}})
+      if response.status != 200
+        raise('status: #{response.status}')
+      end
+    end
+
+    def put(item)
+      response = db.put_item(@table_name, item)
+      if response.status != 200
+        raise('status: #{response.status}')
+      end
+    end
+
+    def query(id, consistent, limit)
+      response = db.query(@table_name, {:S => id}, :ConsistentRead => consistent, :Limit => limit, :ScanIndexForward => false)
+      if response.status != 200
+        raise('status: #{response.status}')
+      end
+      response.body['Items']
+    end
+  end
+end

data/lib/relish/encryption_helper.rb

@@ -0,0 +1,57 @@
+require "fernet"
+require "openssl"
+
+class RelishDecryptionFailed < RuntimeError; end
+
+class Relish
+  class EncryptionHelper
+
+    def initialize(static_secret, secrets)
+      @static_secret = static_secret
+      @secrets = secrets
+    end
+
+    def hmac_secrets
+      @hmac_secrets ||= @secrets.map do |secret|
+        OpenSSL::HMAC.hexdigest('sha256', @static_secret, secret)
+      end
+    end
+
+    def encrypt_env(env)
+      encrypt_key_with_secret("env", env, hmac_secrets.first)
+    end
+
+    def decrypt_env(encrypted_token)
+      hmac_secrets.each_with_index do |secret, i|
+        success, env = try_decrypt(secret, encrypted_token, "env")
+        if success
+          return env
+        end
+      end
+      raise RelishDecryptionFailed
+    end
+
+    def try_decrypt(secret, encrypted_token, hash_key)
+      decrypt_key(secret, encrypted_token, hash_key)
+    rescue OpenSSL::Cipher::CipherError => e
+      return false, {}
+    end
+
+    protected
+
+    def decrypt_key(secret, encrypted_token, hash_key)
+      verifier = Fernet.verifier(secret, encrypted_token)
+      verifier.enforce_ttl = false
+      unless verifier.valid?
+        return false, {}
+      end
+      [true, verifier.data[hash_key]]
+    end
+
+    def encrypt_key_with_secret(hash_key, value, secret)
+      Fernet.generate(secret) do |gen|
+        gen.data = {hash_key => value}
+      end
+    end
+  end
+end

data/lib/relish/release.rb

@@ -0,0 +1,25 @@
+class Relish
+  class Release
+
+    attr_accessor :item
+
+    def self.schema(attrs)
+      attrs.each do |attr, type|
+        class_eval "def #{attr}; @item['#{attr}']['#{type}'] if @item.key? '#{attr}' end", __FILE__, __LINE__
+        class_eval "def #{attr}= value; @item['#{attr}'] = {'#{type}' => value} end", __FILE__, __LINE__
+      end
+    end
+
+    schema :id             => :S,
+           :version        => :N,
+           :descr          => :S,
+           :user_id        => :N,
+           :slug_id        => :S,
+           :slug_version   => :N,
+           :stack          => :S,
+           :language_pack  => :S,
+           :env            => :S,
+           :pstable        => :S,
+           :addons         => :S
+  end
+end

data/lib/relish.rb

@@ -1,103 +1,28 @@
-require "fog"
+require "relish/dynamo_helper"
+require "relish/release"
+require "relish/encryption_helper"
 
 class Relish
 
-  attr_accessor :item
-
-  def self.conf(*attrs)
-    attrs.each do |attr|
-      instance_eval "def #{attr}; @#{attr} end", __FILE__, __LINE__
-      instance_eval "def #{attr}= value; @#{attr} = value end", __FILE__, __LINE__
-    end
-  end
-
-  conf :aws_access_key, :aws_secret_key, :table_name
-
-  def self.schema(attrs)
-    attrs.each do |attr, type|
-      class_eval "def #{attr}; @item['#{attr}']['#{type}'] if @item.key? '#{attr}' end", __FILE__, __LINE__
-      class_eval "def #{attr}= value; @item['#{attr}'] = {'#{type}' => value} end", __FILE__, __LINE__
-    end
-  end
-
-  schema :id             => :S,
-         :version        => :N,
-         :descr          => :S,
-         :user_id        => :N,
-         :slug_id        => :S,
-         :slug_version   => :N,
-         :stack          => :S,
-         :language_pack  => :S,
-         :env_json       => :S,
-         :pstable_json   => :S,
-         :addons_json    => :S
-
-  def self.db
-    @db ||= Fog::AWS::DynamoDB.new(:aws_access_key_id => aws_access_key, :aws_secret_access_key => aws_secret_key)
-  end
-
-  def self.db_query_current_version(id)
-    response = db.query(table_name, {:S => id}, :ConsistentRead => true, :Limit => 1, :ScanIndexForward => false)
-    if response.status != 200
-      raise('status: #{response.status}')
-    end
-    if response.body['Count'] == 1
-      response.body['Items'].first
-    end
-  end
-
-  def self.db_put_current_version(item)
-    response = db.put_item(table_name, item, {:Expected => {:id => {:Exists => false}, :version => {:Exists => false}}})
-    if response.status != 200
-      raise('status: #{response.status}')
-    end
-  end
-
-  def self.db_get_version(id, version)
-    response = db.get_item(table_name, {:HashKeyElement => {:S => id}, :RangeKeyElement => {:N => version}})
-    if response.status != 200
-      raise('status: #{response.status}')
-    end
-    response.body['Item']
-  end
-
-  def self.db_put_version(id, version, item)
-    response = db.put_item(table_name, item, {:Expected => {:id => {:Value => {:S => id}}, :version => {:Value => {:N => version}}}})
-    if response.status != 200
-      raise('status: #{response.status}')
-    end
-  end
-
-  def self.db_put(item)
-    response = db.put_item(table_name, item)
-    if response.status != 200
-      raise('status: #{response.status}')
-    end
-  end
-
-  def self.db_query(id, limit)
-    response = db.query(table_name, {:S => id}, :ConsistentRead => true, :Limit => limit, :ScanIndexForward => false)
-    if response.status != 200
-      raise('status: #{response.status}')
-    end
-    response.body['Items']
+  def initialize(*args)
+    @db = DynamoHelper.new(*args)
   end
 
-  def self.copy(id, version, data)
-    release = new
+  def copy(id, version, data)
+    release = Release.new
     release.item = {}
     release.id = id
     release.version = version
     data.each do |k, v|
       release.send("#{k}=", v.to_s) unless v.nil?
     end
-    db_put(release.item)
+    @db.put(release.item)
     release
   end
 
-  def self.create(id, data)
-    item = db_query_current_version(id)
-    release = new
+  def create(id, data)
+    item = @db.query_current_version(id)
+    release = Release.new
     if item.nil?
       release.item = {}
       release.id = id
@@ -109,46 +34,46 @@ class Relish
     data.each do |k, v|
       release.send("#{k}=", v.to_s) unless v.nil?
     end
-    db_put_current_version(release.item)
+    @db.put_current_version(release.item)
     release
   end
 
-  def self.current(id)
-    item = db_query_current_version(id)
+  def current(id)
+    item = @db.query_current_version(id)
     unless item.nil?
-      release = new
+      release = Release.new
       release.item = item
       release
     end
   end
 
-  def self.read(id, version)
-    item = db_get_version(id, version)
+  def read(id, version)
+    item = @db.get_version(id, version)
     unless item.nil?
-      release = new
+      release = Release.new
       release.item = item
       release
     end
   end
 
-  def self.dump(id, limit=nil)
-    items = db_query(id, limit)
+  def dump(id, consistent=nil, limit=nil)
+    items = @db.query(id, limit)
     items.map do |item|
-      release = new
+      release = Release.new
       release.item = item
       release
     end
   end
 
-  def self.update(id, version, data)
-    item = db_get_version(id, version)
+  def update(id, version, data)
+    item = @db.get_version(id, version)
     unless item.nil?
-      release = new
+      release = Release.new
       release.item = item
       data.each do |k, v|
         release.send("#{k}=", v.to_s) unless v.nil?
       end
-      db_put_version(id, version, release.item)
+      @db.put_version(id, version, release.item)
       release
     end
   end

metadata

@@ -1,11 +1,12 @@
 --- !ruby/object:Gem::Specification
 name: relishable
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: '0.7'
   prerelease: 
 platform: ruby
 authors:
 - Mark Fine
+- Blake Gentry
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -16,23 +17,42 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: fernet
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.4'
 description: Release manager.
 email: mark.fine@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/relish/dynamo_helper.rb
+- lib/relish/encryption_helper.rb
+- lib/relish/release.rb
 - lib/relish.rb
 - Gemfile
 - Gemfile.lock