reflect 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8195355dc7c3a4cc55fb41608d89c917f613ad7d
-  data.tar.gz: 40ffa0b99ac7b34ae6e74310ceb7441188d76256
+  metadata.gz: c19959d955848ed6dba916e9322a5836a1504a1f
+  data.tar.gz: 03ecdcd55ec0bcb6a7ad7f01e9a05c5a69c054f0
 SHA512:
-  metadata.gz: 9cd4a2ae7c8e72e656e307fc95e0a8ed604036c99d7d2685866760adbb26038949a21d160c65c5701f760d82126d0de0bf82349bf3ef0e740bcfd467920645c7
-  data.tar.gz: aedb80cdd4c7f38ab93fa4272b73cddc21cff62e97b4ebcc4d63cf3e67a78275193adf2370a5194140715b2cf6b9332722a738fb8ffb6f2c8403625da67a3eaa
+  metadata.gz: b801cbd8173de872767de212cea59f3b127e0b355f6497976da0149a3bc3be5bbe41b5e4edac2b8449883c9f9bd5daa61e8b2f0f3008d0a4b8eb1f6a8226b72e
+  data.tar.gz: fa0ff3ade3b04900bd7b2dcdaed532866a64e4b5751253f462c0d484e03b80a1ca4c7f19ebbc394509c4aaabc259c715d2da8568eb1fda88943615187c4faa4c

data/lib/reflect.rb

@@ -1,51 +1,5 @@
 $:.unshift(File.expand_path("../", __FILE__))
 
-require 'openssl'
-require 'base64'
-
 require 'reflect/parameter'
-require 'reflect/request_error'
-require 'reflect/client'
-
-module Reflect
-  def self._format_error_message(resp)
-    "An error occured with the request. Status: #{resp.response.code} Error: #{_extract_error_message(resp)}"
-  end
-
-  def self._extract_error_message(resp)
-    begin
-      json = JSON.parse(resp.body)
-      json["error"]
-    rescue JSON::ParserError
-      # TODO: Report this?
-      ""
-    end
-  end
-
-  def self.logger=(logger)
-    @logger = logger
-  end
-
-  def self.logger
-    @logger ||= Logger.new("/dev/null")
-  end
-
-  def self.generate_token(secret_key, parameters=[])
-    data = parameters.map do |param|
-      is_arr = param.value.is_a? Array
-
-      val = if !is_arr then param.value.to_s else '' end
-      vals = if is_arr then param.value.map(&:to_s).sort else [] end
-
-      JSON.generate([param.field, param.op, val, vals])
-    end
-
-    digest = OpenSSL::Digest.new('sha256')
-    hmac = OpenSSL::HMAC.new(secret_key, digest)
-      .update("V2\n")
-      .update(data.sort.join("\n"))
-      .digest
-
-    "=2=#{Base64.encode64(hmac).strip}"
-  end
-end
+require 'reflect/token'
+require 'reflect/version'

data/lib/reflect/parameter.rb

@@ -9,5 +9,12 @@ module Reflect
       @op = op
       @value = value
     end
+
+    def to_json(*a)
+      h = { field: field, op: op }
+      h[value.is_a?(Array) ? 'any' : 'value'] = value
+
+      h.to_json(*a)
+    end
   end
 end

data/lib/reflect/token.rb

@@ -0,0 +1,80 @@
+require 'json'
+require 'jwe'
+
+module Reflect
+
+  class ProjectTokenBuilder
+    VIEW_IDENTIFIERS_CLAIM_NAME = 'http://reflect.io/s/v3/vid'
+    PARAMETERS_CLAIM_NAME = 'http://reflect.io/s/v3/p'
+    ATTRIBUTES_CLAIM_NAME = 'http://reflect.io/s/v3/a'
+
+    def initialize(access_key)
+      @access_key = access_key
+
+      @expiration = nil
+      @view_identifiers = []
+      @parameters = []
+      @attributes = {}
+    end
+
+    def expiration(expiration)
+      @expiration = expiration.to_i
+      self
+    end
+
+    def add_view_identifier(id)
+      @view_identifiers << id
+      self
+    end
+
+    def add_parameter(parameter)
+      @parameters << parameter
+      self
+    end
+
+    def set_attribute(name, value)
+      @attributes[name] = value
+      self
+    end
+
+    def build(secret_key)
+      key_bytes = secret_key.scan(/[0-9a-f]{4}/).map { |x| x.to_i(16) }
+      key = key_bytes.pack('n*')
+
+      now = Time.now.to_i
+
+      payload = {
+        :iat => now,
+        :nbf => now,
+      }
+
+      payload[:exp] = @expiration unless @expiration.nil?
+
+      payload[VIEW_IDENTIFIERS_CLAIM_NAME] = @view_identifiers unless @view_identifiers.empty?
+      payload[PARAMETERS_CLAIM_NAME] = @parameters unless @parameters.empty?
+      payload[ATTRIBUTES_CLAIM_NAME] = @attributes unless @attributes.empty?
+
+      # The default JWE encryption mechanism doesn't let us specify the
+      # additional header fields we need, so let's do it by hand.
+      header = {
+        alg: 'dir',
+        enc: 'A128GCM',
+        zip: 'DEF',
+        cty: 'JWT',
+        kid: @access_key,
+      }
+
+      zipped_payload = JWE::Zip.for(header[:zip]).new.send(:compress, JSON.generate(payload))
+      json_header = JSON.generate(header)
+
+      cipher = JWE::Enc.for(header[:enc]).new
+      cipher.cek = key
+
+      bin = cipher.encrypt(zipped_payload, JWE::Base64.jwe_encode(json_header))
+      encrypted_cek = JWE::Alg.for(header[:alg]).new(key).encrypt(cipher.cek)
+
+      JWE::Serialization::Compact.encode(json_header, encrypted_cek, cipher.iv, bin, cipher.tag)
+    end
+  end
+
+end

data/lib/reflect/version.rb

@@ -1,3 +1,3 @@
 module Reflect
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/reflect.gemspec

@@ -19,23 +19,11 @@ Gem::Specification.new do |s|
   s.rubygems_version = "1.8.24"
   s.summary = "Reflect.io API Ruby client"
 
-  if s.respond_to? :specification_version then
+  if s.respond_to? :specification_version
     s.specification_version = 3
+  end
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<httparty>, [">= 0"])
-      s.add_development_dependency('rake', '~> 10.1.0')
-      s.add_development_dependency('minitest', '~> 5.3')
-    else
-      s.add_dependency(%q<httparty>, [">= 0"])
-      s.add_development_dependency('rake', '~> 10.1.0')
-      s.add_development_dependency('minitest', '~> 5.3')
-    end
-  else
-    s.add_dependency(%q<httparty>, [">= 0"])
-    s.add_development_dependency('rake', '~> 10.1.0')
-    s.add_development_dependency('minitest', '~> 5.3')
+  if s.respond_to? :add_runtime_dependency
+    s.add_runtime_dependency 'jwe', '~> 0.3', '>= 0.3.0'
   end
 end
-
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reflect
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Brad Heller
@@ -11,47 +11,25 @@ cert_chain: []
 date: 2015-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: jwe
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 10.1.0
-  type: :development
+        version: 0.3.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.1.0
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: '0.3'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: 0.3.0
 description: Ruby client for Reflect.io
 email: brad@reflect.io
 executables: []
@@ -59,9 +37,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/reflect.rb
-- lib/reflect/client.rb
 - lib/reflect/parameter.rb
-- lib/reflect/request_error.rb
+- lib/reflect/token.rb
 - lib/reflect/version.rb
 - reflect.gemspec
 homepage: http://github.com/reflect/reflect-rb
@@ -83,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 3
 summary: Reflect.io API Ruby client

data/lib/reflect/client.rb

@@ -1,61 +0,0 @@
-require 'uri'
-require 'json'
-require 'httparty'
-require 'reflect/version'
-
-module Reflect
-  class Client
-    include HTTParty
-
-    base_uri 'https://api.reflect.io'
-
-    def initialize(token)
-      @token = token
-    end
-
-    def get(path)
-      self.class.get(URI.encode(path), options)
-    end
-
-    def post(path, content)
-      self.class.post(URI.encode(path), options(body: dump(content)))
-    end
-
-    def put(path, content)
-      self.class.put(URI.encode(path), options(body: dump(content)))
-    end
-
-    def delete(path)
-      logger.debug { "[reflect] Sending DELETE #{URI.encode(path)}" }
-      self.class.delete(URI.encode(path), options)
-    end
-
-    def patch(path, content, headers={})
-      opts = options(body: dump(content))
-      opts[:headers].merge!(headers) unless headers.empty?
-      self.class.patch(path, opts)
-    end
-
-    private
-
-    def options(opts={})
-      defaults = {
-        basic_auth: { username: '', password: @token },
-        headers: {
-          "User-Agent" => "Reflect Ruby API client v#{Reflect::VERSION}",
-          "Content-Type" => "application/json"
-        }
-      }
-
-      opts.merge(defaults)
-    end
-
-    def dump(obj)
-      JSON.dump(obj)
-    end
-
-    def logger
-      Reflect.logger
-    end
-  end
-end

data/lib/reflect/request_error.rb

@@ -1,4 +0,0 @@
-module Reflect
-  class RequestError < StandardError
-  end
-end