idcf-faraday_middleware 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 274199f523769c56e273e171ac12dd2fc6c3a1d3
-  data.tar.gz: 43e5945820d09be8cf39ad6d5da27b5f703cc5c4
+  metadata.gz: 7b42000179d2f5df6fdd51e6827fb30e8d479b9d
+  data.tar.gz: 3a8aa4e79e8c585fef31536417fe2e482059bbc2
 SHA512:
-  metadata.gz: 66fddb0a09bc01e956f7333e33ffb8272ff4448d2bc6883d167b43af7d37004efbfd4d6ce761362c78e0b1b37e01e15d63e161939b06dc7eaa521b322f816056
-  data.tar.gz: 52145a770b275dcef3da51c2aaa04c1b5b6d40f23ab9ff46e06fedaeaeb6241b13d456c4a9634d466aa95c974af010f3d677326ca9f42f99aca1633cd59a0cfb
+  metadata.gz: 2cb0ddb8779f8ae3c59b9c0eaca07d758bf0e12c1dc26af2b758c825bb212b776dd15cc8046380f351bbb9b17b6c454ccde7d37c0395f9a2f6c1db0878226b58
+  data.tar.gz: 03b00fedfc9bbf1dfb28d8db511a91a5bc7861797148ab7d0d8fc8555f8643532674f29459340f183f1324ca0204689cf30da67f4befe7f3f6d2dfe2564b526e

data/.codeclimate.yml

@@ -15,3 +15,4 @@ ratings:
 exclude_paths:
 - spec/
 - 'vendor/**/*'
+- .idea

data/README.md

@@ -27,8 +27,6 @@ Or install it yourself as:
 ### Computing
 
 ```ruby
-require 'faraday'
-require 'faraday_middleware'
 require 'idcf/faraday_middleware'
 
 Faraday::Request.register_middleware(
@@ -37,10 +35,11 @@ Faraday::Request.register_middleware(
 
 @connection ||=
   Faraday.new(url: 'https://compute.jp-east.idcfcloud.com/') do |faraday|
-    faraday.request :json
+    faraday.request :url_encoded
     faraday.request :signature, api_key: api_key, secret_key: secret_key
     faraday.response :json
     faraday.adapter Faraday.default_adapter
+    faraday.options.params_encoder = Faraday::FlatParamsEncoder
   end
 @connection.get '/client/api?command=listZones'
 ```
@@ -48,8 +47,6 @@ Faraday::Request.register_middleware(
 ## ILB
 
 ```ruby
-require 'faraday'
-require 'faraday_middleware'
 require 'idcf/faraday_middleware'
 
 Faraday::Request.register_middleware(
@@ -69,8 +66,6 @@ Faraday::Request.register_middleware(
 ## DNS
 
 ```ruby
-require 'faraday'
-require 'faraday_middleware'
 require 'idcf/faraday_middleware'
 
 Faraday::Request.register_middleware(
@@ -90,8 +85,6 @@ Faraday::Request.register_middleware(
 ### Billing
 
 ```ruby
-require 'faraday'
-require 'faraday_middleware'
 require 'idcf/faraday_middleware'
 
 Faraday::Request.register_middleware(
@@ -111,8 +104,6 @@ Faraday::Request.register_middleware(
 ### Content Cache
 
 ```ruby
-require 'faraday'
-require 'faraday_middleware'
 require 'idcf/faraday_middleware'
 
 Faraday::Request.register_middleware(

data/idcf-faraday_middleware.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'activesupport', '>= 4.2'
   spec.add_runtime_dependency 'activemodel', '>= 4.2'
   spec.add_runtime_dependency 'faraday'
+  spec.add_runtime_dependency 'faraday_middleware'
 
   spec.add_development_dependency 'bundler', '~> 1.14'
   spec.add_development_dependency 'yard'
@@ -32,7 +33,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'awesome_print'
-  spec.add_development_dependency 'faraday_middleware'
 
   spec.required_ruby_version = '>= 1.9.3'
 end

data/lib/idcf/faraday_middleware.rb

@@ -1,5 +1,6 @@
 require 'base64'
 require 'faraday'
+require 'faraday_middleware'
 require 'active_support'
 require 'active_support/core_ext/class/attribute'
 require 'active_support/dependencies/autoload'

data/lib/idcf/faraday_middleware/computing_signature.rb

@@ -16,45 +16,70 @@ module Idcf
       def call(env)
         raise InvalidKeys, errors.messages.to_s if invalid?
 
-        query = env.url.query
-        query = add_query_param query, 'apikey',    api_key
-        query = add_query_param query, 'response',  'json'
-        query = add_query_param query, 'signature', signature(env)
-        env.url.query = query
-
+        if env.body.nil?
+          env.url.query = make_get_params(env)
+        else
+          env.body = make_params_body(env)
+        end
         @app.call env
       end
 
       private
 
+      def make_params_body(env)
+        params = URI.decode_www_form(env.url.query)
+        params.concat(URI.decode_www_form(env.body))
+        params << ['apikey', api_key]
+        params << %w(response json)
+        params << ['signature', signature(URI.encode_www_form(params))]
+        URI.encode_www_form(params)
+      end
+
+      def make_get_params(env)
+        query = env.url.query
+        query = add_query_param query, 'apikey', api_key
+        query = add_query_param query, 'response', 'json'
+        add_query_param query, 'signature', signature(query)
+      end
+
       def add_query_param(query, key, value)
         query = query.to_s
         query << '&' unless query.empty?
         query << "#{Faraday::Utils.escape key}=#{Faraday::Utils.escape value}"
       end
 
-      def signature(env)
+      def signature(query)
         Base64.strict_encode64(
           OpenSSL::HMAC.digest(
             OpenSSL::Digest::SHA1.new,
             secret_key,
-            signature_seed(env)
+            signature_seed(query)
           )
         )
       end
 
-      def signature_seed(env)
-        query = env.url.query&.downcase
+      def signature_seed(query)
         raise InvalidParameter, 'Must be set command=...' if query.nil?
-        query = URI.decode_www_form(query)
+        query = URI.decode_www_form(query.downcase)
         command_check query
-        query.sort! { |x, y| x[0] <=> y [0] }
-        URI.encode_www_form(query).gsub('+', '%20').downcase
+        query = query.sort do |x, y|
+          x[0] <=> y[0]
+        end
+        signeture_seed_part_decode(URI.encode_www_form(query)).downcase
+      end
+
+      def signeture_seed_part_decode(query)
+        PARTIALLY_DECODE.each do |list|
+          query = query.gsub(*list)
+        end
+        query
       end
 
       def command_check(query)
-        raise InvalidParameter, 'Must be set command=...' if
-          query.find { |x| x[0] == 'command' && x[1].present? }.nil?
+        list = query.find do |x|
+          x[0] == 'command' && x[1].present?
+        end
+        raise InvalidParameter, 'Must be set command=...' if list.nil?
       end
     end
   end

data/lib/idcf/faraday_middleware/configuration.rb

@@ -8,6 +8,12 @@ module Idcf
       EXPIRES          = 'Expired'.freeze
       SIGNATURE        = 'Signature'.freeze
       SIGNATURE_TTL    = 600
+      PARTIALLY_DECODE = [
+        %w(+ %20),
+        %w(%2A *),
+        %w(%5B [),
+        %w(%5D ])
+      ].freeze
     end
   end
 end

data/lib/idcf/faraday_middleware/version.rb

@@ -1,5 +1,5 @@
 module Idcf
   module FaradayMiddleware
-    VERSION = '0.0.1'.freeze
+    VERSION = '0.0.2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: idcf-faraday_middleware
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - IDC Frontier Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-31 00:00:00.000000000 Z
+date: 2017-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -150,20 +164,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: faraday_middleware
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 
 email: 
 executables: []