komtet 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4ebe2578d70a1a07fa7250eef3cbeb55a54387d71abe970e5905e176cc0bd87
-  data.tar.gz: 906e957a0bc9c2231eec821d65d6e3358c74d34daebb6aa65f2a431145462425
+  metadata.gz: 4d3b8c9c54841bb163156cefc780422bc1a5eadbc30d89daf3ee330024ee4d60
+  data.tar.gz: 80acc8c6245af37ede5620673f4c36f08654574a3034d9cf829fbb60624a306d
 SHA512:
-  metadata.gz: aa4df6ba90e9187e0c0006e8a1f0a71041f91e908b2bb97dae6b81ec30bc6f2f59710e7713e672f82ed2b61f08be9ad68caede8cb8df98514009f3dcd10ecfd8
-  data.tar.gz: 4ac80a3ddaf62b010d98c889ff20b102f828977a9a7a326a861b52167343eed0c68514ebad953f34e057e2cd925350defe408af6254c2a1ebd7b3b9be83cc648
+  metadata.gz: 81b4b1511acf0dec54f4b6f5babe37469984f7df6c91b8928e0a196cb545a002a26acbbf68261c02c2ca498096e91952b5bee5b74d0a20c895d1e0b5a1089e00
+  data.tar.gz: 13b3adfc86e74c4a6bd8c06659efb124bd02c2648390068d372c63ca75967ca306d588dfd631e7241724459e83826ec815046ebe047ea9448f441fe3fd03ebc8

data/Gemfile.lock

@@ -1,28 +1,28 @@
 PATH
   remote: .
   specs:
-    komtet (0.0.1)
+    komtet (0.0.2)
       faraday (>= 0.15)
       faraday_middleware
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
+    crack (0.4.5)
+      rexml
     diff-lcs (1.3)
-    docile (1.3.2)
+    docile (1.4.0)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.13.1)
       faraday (>= 0.7.4, < 1.0)
-    hashdiff (1.0.0.beta1)
-    json (2.2.0)
+    hashdiff (1.0.1)
     multipart-post (2.1.1)
-    public_suffix (3.1.1)
-    rake (10.5.0)
+    public_suffix (5.0.0)
+    rake (13.0.6)
+    rexml (3.2.5)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
@@ -36,14 +36,14 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.2)
-    safe_yaml (1.0.5)
-    simplecov (0.17.0)
+    simplecov (0.21.2)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    webmock (3.6.0)
-      addressable (>= 2.3.6)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
+    webmock (3.18.1)
+      addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
 
@@ -54,10 +54,10 @@ DEPENDENCIES
   bundler (>= 1.17)
   hashdiff (>= 1.0.0.beta1)
   komtet!
-  rake (~> 10.0)
+  rake (>= 12.3.3)
   rspec
   simplecov
   webmock
 
 BUNDLED WITH
-   2.0.1
+   2.3.10

data/komtet.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "faraday_middleware"
 
   spec.add_development_dependency "bundler", ">= 1.17"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "webmock"
   spec.add_development_dependency "simplecov"

data/lib/komtet/credentials.rb

@@ -0,0 +1,65 @@
+require 'openssl'
+require 'base64'
+
+module Komtet
+
+  # relates to a task queue (a set of registrators)
+  class Credentials
+
+    attr_accessor :shop_id, :signature_key, :queue_id
+
+    def initialize(shop_id:, signature_key:, queue_id:nil)
+      # TODO: also LLC data here
+      @shop_id = shop_id
+      @signature_key = signature_key
+      @queue_id = queue_id
+    end
+
+    def self.from_hash(hash, key_pass:nil)
+      unless (decoded_signature = hash[:signature_key] || hash["signature_key"])
+        cipher = OpenSSL::Cipher.new('aes-256-cbc')
+        cipher.decrypt
+        cipher.key = key_pass
+        cipher.iv  = Base64.strict_decode64(hash[:signature_key_iv] || hash["signature_key_iv"])
+        decoded_signature = cipher.update(
+          Base64.strict_decode64(hash[:signature_key_enc] || hash["signature_key_enc"])
+          ) + cipher.final
+        unless Digest::MD5.hexdigest(decoded_signature) == (hash[:signature_key_hash] || hash["signature_key_hash"])
+          # actually there's usually OpenSSL::Cipher::CipherError, but not guaranteed
+          raise "Signature md5 does not match, probably wrong key_pass (bad decrypt)"
+        end
+      end
+
+      new(
+        shop_id: hash[:shop_id] || hash["shop_id"],
+        signature_key: decoded_signature,
+        queue_id: hash[:queue_id] || hash["queue_id"],
+      )
+    end
+
+    def to_hash(key_pass:)
+      cipher = OpenSSL::Cipher.new('aes-256-cbc')
+      cipher.encrypt
+      cipher.key = key_pass
+      signature_key_iv = Base64.strict_encode64(cipher.random_iv)
+
+      {
+        shop_id: shop_id,
+        queue_id: queue_id,
+        signature_key_iv: signature_key_iv,
+        signature_key_hash: Digest::MD5.hexdigest(signature_key), # may be unsafe, but we a guarding mostly against production data in development
+        signature_key_enc: Base64.strict_encode64(cipher.update(signature_key) + cipher.final),
+      }
+    end
+
+    def signature(http_method, full_url, body=nil)
+      OpenSSL::HMAC.hexdigest(
+          OpenSSL::Digest::MD5.new,
+          @signature_key,
+          "#{http_method.to_s.upcase}#{full_url}#{body}"
+      )
+    end
+
+  end
+
+end

data/lib/komtet/transport.rb

@@ -5,28 +5,28 @@ require 'openssl'
 module Komtet
 
   class Transport
+
+    # See https://kassa.komtet.ru/integration/api
+
+    DEFAULT_API_URL='https://kassa.komtet.ru/api/shop/v1/'
+
     # middleware for request signatures
     class RequestSignatureMiddleware < Faraday::Middleware
-      def initialize(app, shop_id, signature_key)
+      def initialize(app, credentials)
         @app = app
-        @authorization = shop_id
-        @signature_key = signature_key
+        @credentials = credentials
       end
 
       def call(env)
-        env.request_headers['Authorization'] = @authorization
-        env.request_headers['X-HMAC-Signature'] = OpenSSL::HMAC.hexdigest(
-          OpenSSL::Digest::MD5.new, @signature_key, "#{env.method.to_s.upcase}#{env.url}#{env.body}"
-        )
+        env.request_headers['Authorization'] = @credentials.shop_id
+        env.request_headers['X-HMAC-Signature'] = @credentials.signature(env.method, env.url, env.body)
         @app.call(env)
       end
     end
 
-    def initialize(api_url, shop_id, signature_key, queue_id=nil)
+    def initialize(api_url, credentials)
       @api_url = api_url
-      @authorization = shop_id
-      @signature_key = signature_key
-      @queue_id = queue_id
+      @credentials = credentials
     end
 
     def transport
@@ -34,25 +34,39 @@ module Komtet
         conn.headers['User-Agent'] = "KomtetRuby/#{Komtet::VERSION}"
         conn.headers['Accept'] = "application/json"
         conn.request(:json)
-        conn.use(RequestSignatureMiddleware, @authorization, @signature_key)
+        conn.use(RequestSignatureMiddleware, @credentials)
         conn.response :json, content_type: /\bjson$/
         conn.adapter(Faraday.default_adapter)
       end
     end
 
-    def post_task(content, queue_id=@queue_id)
+    def post_task(content, queue_id=@credentials.queue_id)
       raise ArgumentError, "queue_id is not integer" unless queue_id.is_a?(Integer)
-      res = transport.post("queues/#{queue_id}/task")
-      raise "non success: #{res.code}" unless res.success?
+      res = transport.post("queues/#{queue_id}/task", content)
+      raise "non success: #{res.status}: #{res.body}" unless res.success?
       res.body
     end
 
     def task_result(task_id)
       res = transport.get("tasks/#{task_id}")
-      raise "non success: #{res.code}" unless res.success?
+      raise "non success: #{res.status}: #{res.body}" unless res.success?
       res.body
     end
 
+    def queue_status(queue_id=@credentials.queue_id)
+      res = transport.get("queues/#{ queue_id }")
+      # {"id"=>6395, "state"=>"active"} (либо passive)
+      # либо 403 {"title"=>"Ошибка авторизации", "description"=>"Проверьте...", "code"=>"AUT00"}
+
+      if res.success?
+        return res.body["state"]
+      elsif res.status == 403
+        return 'access_denied'
+      else
+        raise "non success: #{res.status}: #{res.body}"
+      end
+    end
+
   end
 
 end

data/lib/komtet/version.rb

@@ -1,3 +1,3 @@
 module Komtet
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/komtet.rb

@@ -1,4 +1,5 @@
 require "komtet/version"
+require "komtet/credentials"
 require "komtet/transport"
 
 module Komtet

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: komtet
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Vasily Fedoseyev
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-10 00:00:00.000000000 Z
+date: 2022-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -56,16 +56,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -127,13 +127,14 @@ files:
 - bin/setup
 - komtet.gemspec
 - lib/komtet.rb
+- lib/komtet/credentials.rb
 - lib/komtet/transport.rb
 - lib/komtet/version.rb
 homepage: https://github.com/Vasfed/komtet
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -148,8 +149,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Ruby client for kassa.komtet.ru
 test_files: []