ruby-common 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0dd03746b475edbc264058f3faaa16831625260421dc077dd90443c43f23237e
-  data.tar.gz: 94104a902329dcf94ef5d1267716a5c10a69bee660c4182f76d559a2f42227bb
+  metadata.gz: c24b995c7cd6e05a8042d2ec467a879fb5a68ddd189ea6f0fc1e06d7426dc657
+  data.tar.gz: 2e73a5b4eeabba4389a4bd4b72dd9c3abeecc077b91319dae8d0d6b739843f00
 SHA512:
-  metadata.gz: 66c026586ab134fa73bfeb96154970fea8bac2471e8a4dc5a3f6099e1a71f51c9282f84cfe251d0eb7c1ee2211008dbe9ab98ebdc346fb007a253de535fb5971
-  data.tar.gz: '09cdc1c043e63cbb912d6bac89721c0bc280adb44649825f3925e586187748657902dec2a936ced13690ebf293d8c6cda6523cbfa27b319e1aca24be4e529c78'
+  metadata.gz: c3fc46151099072d1a66919932685c648725234332aa5c0877dc5a4ad116c18f50b388f5b60d3dd5c1e88594c2d90818f49123256bd0ce94447863b35da09b10
+  data.tar.gz: 46cbef1d26d40ce445c478822e453d27e33662769b1bb6e87c420c141ab4e8dffb35a21b297a890b8e69430675ea99f32abb1ce42a1c07aae0abff2423ed2752

data/lib/ruby-common/common/Utils.rb

@@ -11,6 +11,10 @@ class SignatureVerifierUtils
     return Base64.decode64(key)
   end
 
+  def self.base64_encode(key)
+    return Base64.encode64(key)
+  end
+
   def self.encode(key, data)
     begin
       hmac = OpenSSL::HMAC.new(key, 'sha256')
@@ -19,4 +23,11 @@ class SignatureVerifierUtils
       raise SignatureParseError, "Error encode data"
     end
   end
+
+  def self.pad_start(input_string, length, char)
+    return input_string if input_string.length >= length
+  
+    padding = char.to_s * (length - input_string.length)
+    padding + input_string
+  end
 end

data/lib/ruby-common/v4/Signature4VerifierService.rb

@@ -118,7 +118,7 @@ class Signature4VerifierService
 
     def parse3(signature)
       sign_decoded = SignatureVerifierUtils.base64_decode(signature)
-      unpack_result = PhpUnpack.unpack('Cversion/NrequestTime/NsignatureTime/CmasterSignType/nmasterTokenLength', sign_buffer)
+      unpack_result = PhpUnpack.unpack('Cversion/NrequestTime/NsignatureTime/CmasterSignType/nmasterTokenLength', sign_decoded)
 
       version = unpack_result['version']
       raise VersionError, 'Invalid signature version' if version != 3
@@ -127,13 +127,12 @@ class Signature4VerifierService
       raise SignatureParseError, 'invalid timestamp (future time)' if timestamp > (Time.now.to_i)
 
       master_token_length = unpack_result['masterTokenLength']
-      #TODO CO TO KURWA JEST ZA METODA?
-      master_token = get_bytes_and_advance_position(sign_decoded, master_token_length)
+      master_token = sign_decoded.slice!(0, master_token_length)
       unpack_result['masterToken'] = master_token
 
       customer_data = PhpUnpack.unpack('CcustomerSignType/ncustomerTokenLength', sign_buffer)
       customer_token_length = customer_data['customerTokenLength']
-      customer_token = get_bytes_and_advance_position(sign_decoded, customer_token_length)
+      customer_token = sign_decoded.slice!(0, customer_token_length)
       customer_data['customerToken'] = customer_token
 
       unpack_result.merge!(customer_data)
@@ -154,7 +153,7 @@ class Signature4VerifierService
 
         raise SignatureParseError, 'premature end of signature 0x01' if header.empty? || !header.key?('fieldId')
 
-        field = FIELD_IDS[header['fieldId'].first]
+        field = field_type_def(header['fieldId'].first, i)
         v = {}
 
         case field&.type
@@ -199,5 +198,18 @@ class Signature4VerifierService
     def get_base(verdict, request_time, signature_time, ip_address, user_agent)
       [verdict, request_time, signature_time, ip_address, user_agent].join("\n")
     end
+      
+    private def field_type_def(field_id, i)
+      if FIELD_IDS[field_id]
+        return FIELD_IDS[field_id]
+      end
+      
+      result_type = FIELD_IDS[field_id & 0xC0].type
+    
+      i_str = SignatureVerifierUtils.pad_start(i.to_s, 2, '0')
+      result_name = result_type + i_str
+    
+      Field.new(result_name, result_type)
+    end    
   end
 end

data/lib/ruby-common/version.rb

@@ -2,6 +2,6 @@
 
 module Ruby
   module Common
-    VERSION = "1.0.2"
+    VERSION = "1.0.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-common
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Adrian Parzych
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-11-05 00:00:00.000000000 Z
+date: 2025-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbnacl
@@ -62,7 +62,6 @@ files:
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.md
 - README.md
 - Rakefile

data/Gemfile.lock

@@ -1,34 +0,0 @@
-PATH
-  remote: .
-  specs:
-    ruby-common (0.1.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    diff-lcs (1.5.1)
-    rake (13.2.1)
-    rspec (3.13.0)
-      rspec-core (~> 3.13.0)
-      rspec-expectations (~> 3.13.0)
-      rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.0)
-      rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-support (3.13.1)
-
-PLATFORMS
-  x86_64-linux
-
-DEPENDENCIES
-  rake (~> 13.0)
-  rspec
-  ruby-common!
-
-BUNDLED WITH
-   2.3.5