ruby-common 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1867d71bf477504bc416b609b4946cb8649c66c2275af55e0b48405725a63a1d
-  data.tar.gz: 776d4d89745f3f320f5d6782b61f26a3e014f4b7299421108ba006a4e0e0ba48
+  metadata.gz: 84bf79c0a169246ff83fbe15486b281b34b54976009fb2dd0d1d06dd22092140
+  data.tar.gz: 31e74cde29d8600b41fae7be4e4579cf2e890b86ab61caf88a3332c2e1eade37
 SHA512:
-  metadata.gz: e8930f0f149f2858dad02f711c39a13d1359372a948618b66d18c3c8d6f29161517e514e60301539d0834484665f459ad76792b47342820fe13d323c0d361d41
-  data.tar.gz: f68578899379320384f0bc0b48a11581b668445963d99b969556e20bd6fb20a1511937d380fb3b585901115d9d6195617ba628cc093093dcfda59450ef62dbaf
+  metadata.gz: 7ede2c14c0687abd4447a015bdb53caeab2b461f68fb78a0153372f9edb02b37bc08c79f3d7f6309766d10a73f49f33ead48ddd65d5e8bca0dda0bf9b0c24247
+  data.tar.gz: 055e888365e655e077fd82f11e88eb35a696e471709b15f499e9e0c72cc386e276f1eac58ef177715538d16928bf093263b80a753d1ddd4039832160a41b179b

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

@@ -113,6 +113,10 @@ class Signature4VerifierService
     raise StructParseError, 'no verdict'
   end
 
+  def self.parse_4(signature)
+    return parse4(signature)
+  end
+
   class << self
     private
 
@@ -127,7 +131,6 @@ 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)
       unpack_result['masterToken'] = master_token
 
@@ -154,7 +157,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 +202,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/v5/Signature5VerificationResult.rb

@@ -65,8 +65,6 @@ class Signature5VerificationResult
   attr_accessor :request_time
   # Signature time
   attr_accessor :signature_time
-  # Signature time
-  attr_accessor :h_signature_time
   # Token
   attr_accessor :token
   # Other, which has not been mapped to a field, or getting error during parsing
@@ -105,8 +103,7 @@ class Signature5VerificationResult
     @incognito = hash.delete('incognito')
     @sub_id = hash.delete('sub_id')
     @request_time = hash.delete('requestTime')&.to_i
-    @h_signature_time = hash.delete('HsignatureTime')
-    @signature_time = hash.delete('signatureTime')
+    @signature_time = hash.delete('signatureTime')&.to_i
     @token = hash.delete('token')
     @additional_data = hash
   end
@@ -146,7 +143,6 @@ class Signature5VerificationResult
       Subscriber ID: #{@sub_id}
       Request Time: #{@request_time}
       Signature Time: #{@signature_time}
-      H Signature Time: #{@h_signature_time}
       Token: #{@token}
       Additional Data: #{@additional_data}
     STRING

data/lib/ruby-common/v5/StructUnpacker.rb

@@ -63,6 +63,7 @@ class StructUnpacker
     def rfc3986_unpack(data)
       begin
         query_string = data.to_s
+        query_string.slice!(0) if query_string.start_with?("H")
         decoded = decode_url(query_string)
         pairs = decoded.split('&')
         result = {}

data/lib/ruby-common/version.rb

@@ -2,6 +2,6 @@
 
 module Ruby
   module Common
-    VERSION = "1.0.1"
+    VERSION = "1.0.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-common
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.3
 platform: ruby
 authors:
 - Adrian Parzych
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-10-29 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