saro-dat 4.3.2 → 4.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0776a19c84f8d1791b89c6cc989077bda261fa7208444838f0486365e0af0287
-  data.tar.gz: 84d8a9286f34e501de1521184e3f6ddc12d05df401174d87e29ab20454cec604
+  metadata.gz: 634a367ca133f87bdf4e936c4bb608734530198a979fd430fb9d5f6b6df391b5
+  data.tar.gz: 5e4b3e2d9be43345f9c276a6b630524f422762d5c345cfd4906b9e1a31d9cdd0
 SHA512:
-  metadata.gz: b1b7592c0cfbc97a80aa987caa9dd4eff7294eb3c7105e10e69f057955ea854f27f8cf59b544316f3991fef2ce91634c889f6c91a9258d4a67f3a6310ad9d445
-  data.tar.gz: ae289f220cd1421f033811e2df11c2a4333e3af067a5dd53af56f0998f4bad0e984592d1f9447253827729a4b9b245439b0707cf872f99840e21c13bf320b589
+  metadata.gz: a8ba6fc31fd745ecf6afe9bd79995d2fb622df640c90848911399ce6499b4c1cdb88cb28c391be299dd4291f39649d7f943d8ebb5c5e3df4821935006b5987e9
+  data.tar.gz: 64305c24d612dd667fb82b8be00c0d78642d66373715220b25052cfc9ac1f86b5570ab8e72fe512ace86bb0cf8d8a9a5019f072af5c3a73a4cac801b39e6e541

data/.idea/saro-dat.iml

@@ -14,7 +14,6 @@
     <orderEntry type="library" scope="PROVIDED" name="base64 (v0.3.0, rbenv: 4.0.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="benchmark (v0.5.0, rbenv: 4.0.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="bundler (v4.0.12, rbenv: 4.0.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="concurrent-ruby (v1.3.7, rbenv: 4.0.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="logger (v1.7.0, rbenv: 4.0.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="minitest (v5.27.0, rbenv: 4.0.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="openssl (v4.0.2, rbenv: 4.0.5) [gem]" level="application" />

data/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

data/PUBLISH.md

@@ -9,7 +9,7 @@ bundle install
 ```
 gem build saro-dat.gemspec
 gem signin
-gem push saro-dat-4.3.2.gem
+gem push saro-dat-4.3.3.gem
 ```
 
 ## install

data/README.md

@@ -1,12 +1,20 @@
 # DAT - Distributed Access Token
 
-## Document
+### Document
+- [DAT Run Online](https://dat.saro.me)
+- [What is DAT](https://dat.saro.me/intro)
+- [Example](https://dat.saro.me/libs/gems-saro-dat)
 
-### [DAT Run Online](https://dat.saro.me)
-
-### [What is DAT](https://dat.saro.me/intro)
-
-### [Example](https://dat.saro.me/libs/gems-saro-dat)
+### Support Platform
+- [Rust](https://github.com/saro-lab/dat-rust)
+- [Java, Kotlin](https://github.com/saro-lab/dat-maven)
+- [Javascript, Typescript](https://github.com/saro-lab/dat-npm)
+- [C#](https://github.com/saro-lab/dat-nuget)
+- [Python](https://github.com/saro-lab/dat-pypi)
+- [Go](https://github.com/saro-lab/dat-go)
+- [Ruby](https://github.com/saro-lab/dat-ruby)
+- [C/C++ (Vcpkg)](https://github.com/saro-lab/dat-vcpkg)
+- [Cert(key) Server (Docker)](https://github.com/saro-lab/dat-cms)
 
 ## Support algorithm
 ### Signature
@@ -32,60 +40,59 @@
 - mac mini m4 2024 basic (10 core)
 - [test_bench.rb](test/test_bench.rb)
 ```
-Testing started at ...
 Performance Test (Plain, Secure)
-Plain: CcMjua0RA8I27be6W2lYMBmk5OcPrV8mu3ybrVwBOB2pEPbtfrvH0h0Z0VBhG1ID4zu51sDKxZZGFoku9TzrcPJLbb0ObRiF3NIF
-Secure: EEYEOjriFkidJ8lKpYPkt1fwS01sZuJ7ysgCWd7XyarZfP6yrxkR9rciiJSUpuPZlBt0moFlKb0n2ZDivhvxLNjmO1eT8KjzhLlA
+Plain: fCFP97qkmv2cGlQ3GVUpcj6th1TBPNxAoLGiN7XC3XlnQdN1xs4U6qZOYkfkPYcqbXSHCIabTzH8kFI9uY062mqKhjXmy4D8Os4B
+Secure: 9wNnNCLvhuAfgvbcjNLXdKY9qXTqhIHBhgc62B7EgeH7fcDWOmJyah8zH0XcZhmgiDPJw4zTay7ArYosxR9NObjN0YWtKjQDrFme
 
 --- Multi-Thread ---
-HMAC-SHA256-MFS IV-AES128-GCM Issue * 10000 : 141ms
-HMAC-SHA256-MFS IV-AES128-GCM Parse * 10000 : 148ms
-HMAC-SHA256-MFS IV-AES256-GCM Issue * 10000 : 126ms
-HMAC-SHA256-MFS IV-AES256-GCM Parse * 10000 : 161ms
-HMAC-SHA384-MFS IV-AES128-GCM Issue * 10000 : 162ms
-HMAC-SHA384-MFS IV-AES128-GCM Parse * 10000 : 155ms
-HMAC-SHA384-MFS IV-AES256-GCM Issue * 10000 : 126ms
-HMAC-SHA384-MFS IV-AES256-GCM Parse * 10000 : 146ms
-HMAC-SHA512-MFS IV-AES128-GCM Issue * 10000 : 124ms
-HMAC-SHA512-MFS IV-AES128-GCM Parse * 10000 : 132ms
-HMAC-SHA512-MFS IV-AES256-GCM Issue * 10000 : 128ms
-HMAC-SHA512-MFS IV-AES256-GCM Parse * 10000 : 149ms
-ECDSA-P256 IV-AES128-GCM Issue * 10000 : 171ms
-ECDSA-P256 IV-AES128-GCM Parse * 10000 : 188ms
-ECDSA-P256 IV-AES256-GCM Issue * 10000 : 158ms
-ECDSA-P256 IV-AES256-GCM Parse * 10000 : 188ms
-ECDSA-P384 IV-AES128-GCM Issue * 10000 : 260ms
-ECDSA-P384 IV-AES128-GCM Parse * 10000 : 422ms
-ECDSA-P384 IV-AES256-GCM Issue * 10000 : 259ms
-ECDSA-P384 IV-AES256-GCM Parse * 10000 : 415ms
-ECDSA-P521 IV-AES128-GCM Issue * 10000 : 307ms
-ECDSA-P521 IV-AES128-GCM Parse * 10000 : 475ms
-ECDSA-P521 IV-AES256-GCM Issue * 10000 : 311ms
-ECDSA-P521 IV-AES256-GCM Parse * 10000 : 481ms
+HMAC-SHA256-MFS IV-AES128-GCM Issue * 10000 : 150ms
+HMAC-SHA256-MFS IV-AES128-GCM Parse * 10000 : 152ms
+HMAC-SHA256-MFS IV-AES256-GCM Issue * 10000 : 138ms
+HMAC-SHA256-MFS IV-AES256-GCM Parse * 10000 : 162ms
+HMAC-SHA384-MFS IV-AES128-GCM Issue * 10000 : 130ms
+HMAC-SHA384-MFS IV-AES128-GCM Parse * 10000 : 145ms
+HMAC-SHA384-MFS IV-AES256-GCM Issue * 10000 : 132ms
+HMAC-SHA384-MFS IV-AES256-GCM Parse * 10000 : 165ms
+HMAC-SHA512-MFS IV-AES128-GCM Issue * 10000 : 130ms
+HMAC-SHA512-MFS IV-AES128-GCM Parse * 10000 : 149ms
+HMAC-SHA512-MFS IV-AES256-GCM Issue * 10000 : 130ms
+HMAC-SHA512-MFS IV-AES256-GCM Parse * 10000 : 150ms
+ECDSA-P256 IV-AES128-GCM Issue * 10000 : 170ms
+ECDSA-P256 IV-AES128-GCM Parse * 10000 : 189ms
+ECDSA-P256 IV-AES256-GCM Issue * 10000 : 155ms
+ECDSA-P256 IV-AES256-GCM Parse * 10000 : 194ms
+ECDSA-P384 IV-AES128-GCM Issue * 10000 : 339ms
+ECDSA-P384 IV-AES128-GCM Parse * 10000 : 441ms
+ECDSA-P384 IV-AES256-GCM Issue * 10000 : 320ms
+ECDSA-P384 IV-AES256-GCM Parse * 10000 : 490ms
+ECDSA-P521 IV-AES128-GCM Issue * 10000 : 352ms
+ECDSA-P521 IV-AES128-GCM Parse * 10000 : 554ms
+ECDSA-P521 IV-AES256-GCM Issue * 10000 : 374ms
+ECDSA-P521 IV-AES256-GCM Parse * 10000 : 529ms
 
 --- Single-Thread ---
 HMAC-SHA256-MFS IV-AES128-GCM Issue * 10000 : 64ms
-HMAC-SHA256-MFS IV-AES128-GCM Parse * 10000 : 65ms
-HMAC-SHA256-MFS IV-AES256-GCM Issue * 10000 : 60ms
-HMAC-SHA256-MFS IV-AES256-GCM Parse * 10000 : 68ms
-HMAC-SHA384-MFS IV-AES128-GCM Issue * 10000 : 66ms
-HMAC-SHA384-MFS IV-AES128-GCM Parse * 10000 : 83ms
-HMAC-SHA384-MFS IV-AES256-GCM Issue * 10000 : 64ms
-HMAC-SHA384-MFS IV-AES256-GCM Parse * 10000 : 67ms
-HMAC-SHA512-MFS IV-AES128-GCM Issue * 10000 : 62ms
-HMAC-SHA512-MFS IV-AES128-GCM Parse * 10000 : 67ms
-HMAC-SHA512-MFS IV-AES256-GCM Issue * 10000 : 66ms
-HMAC-SHA512-MFS IV-AES256-GCM Parse * 10000 : 68ms
-ECDSA-P256 IV-AES128-GCM Issue * 10000 : 192ms
-ECDSA-P256 IV-AES128-GCM Parse * 10000 : 403ms
-ECDSA-P256 IV-AES256-GCM Issue * 10000 : 188ms
-ECDSA-P256 IV-AES256-GCM Parse * 10000 : 404ms
-ECDSA-P384 IV-AES128-GCM Issue * 10000 : 1049ms
-ECDSA-P384 IV-AES128-GCM Parse * 10000 : 2157ms
-ECDSA-P384 IV-AES256-GCM Issue * 10000 : 1060ms
-ECDSA-P384 IV-AES256-GCM Parse * 10000 : 2155ms
-ECDSA-P521 IV-AES128-GCM Issue * 10000 : 1374ms
-ECDSA-P521 IV-AES128-GCM Parse * 10000 : 2428ms
-ECDSA-P521 IV-AES256-GCM Issue * 10000 : 1368ms
-ECDSA-P521 IV-AES256-GCM Parse * 10000 : 2417ms
+HMAC-SHA256-MFS IV-AES128-GCM Parse * 10000 : 60ms
+HMAC-SHA256-MFS IV-AES256-GCM Issue * 10000 : 58ms
+HMAC-SHA256-MFS IV-AES256-GCM Parse * 10000 : 66ms
+HMAC-SHA384-MFS IV-AES128-GCM Issue * 10000 : 62ms
+HMAC-SHA384-MFS IV-AES128-GCM Parse * 10000 : 61ms
+HMAC-SHA384-MFS IV-AES256-GCM Issue * 10000 : 66ms
+HMAC-SHA384-MFS IV-AES256-GCM Parse * 10000 : 73ms
+HMAC-SHA512-MFS IV-AES128-GCM Issue * 10000 : 58ms
+HMAC-SHA512-MFS IV-AES128-GCM Parse * 10000 : 63ms
+HMAC-SHA512-MFS IV-AES256-GCM Issue * 10000 : 60ms
+HMAC-SHA512-MFS IV-AES256-GCM Parse * 10000 : 67ms
+ECDSA-P256 IV-AES128-GCM Issue * 10000 : 177ms
+ECDSA-P256 IV-AES128-GCM Parse * 10000 : 392ms
+ECDSA-P256 IV-AES256-GCM Issue * 10000 : 172ms
+ECDSA-P256 IV-AES256-GCM Parse * 10000 : 394ms
+ECDSA-P384 IV-AES128-GCM Issue * 10000 : 1055ms
+ECDSA-P384 IV-AES128-GCM Parse * 10000 : 2155ms
+ECDSA-P384 IV-AES256-GCM Issue * 10000 : 1039ms
+ECDSA-P384 IV-AES256-GCM Parse * 10000 : 2160ms
+ECDSA-P521 IV-AES128-GCM Issue * 10000 : 1358ms
+ECDSA-P521 IV-AES128-GCM Parse * 10000 : 2390ms
+ECDSA-P521 IV-AES256-GCM Issue * 10000 : 1381ms
+ECDSA-P521 IV-AES256-GCM Parse * 10000 : 2398ms
 ```

data/lib/saro/dat/crypto.rb

@@ -51,7 +51,9 @@ module Saro
       end
 
       def encrypt(data)
-        data = data.encode('utf-8') if data.is_a?(String) && data.encoding != Encoding::BINARY
+        if data.is_a?(String) && data.encoding != Encoding::BINARY && data.encoding != Encoding::UTF_8
+          data = data.encode('utf-8')
+        end
         return "".b if data.nil? || data.empty?
 
         cipher = OpenSSL::Cipher.new(@config[:name])

data/lib/saro/dat/dat.rb

@@ -46,8 +46,9 @@ module Saro
       alias_method :expired?, :expired
 
       def body_string
-        return "" unless @dat.include?('.')
-        @dat.rpartition('.').first
+        idx = @dat.rindex('.')
+        return "" unless idx
+        @dat[0, idx]
       end
     end
 

data/lib/saro/dat/dat_manager.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'concurrent-ruby'
 require 'set'
 require_relative 'dat_certificate'
 require_relative 'dat'
@@ -10,16 +9,23 @@ require_relative 'util'
 module Saro
   module Dat
     class DatManager
+      # Immutable snapshot of the manager state.
+      # Readers access it lock-free via a single ivar read (atomic reference swap);
+      # writers rebuild a new frozen snapshot under @write_lock.
+      State = Struct.new(:issuer, :certificates, :by_cid)
+
+      EMPTY_STATE = State.new(nil, [].freeze, {}.freeze).freeze
+      private_constant :EMPTY_STATE
+
       def initialize
-        @issuer = nil
-        @certificates = []
-        @lock = Concurrent::ReadWriteLock.new
+        @state = EMPTY_STATE
+        @write_lock = Mutex.new
       end
 
       def import_certificates(input_certs, clear: false)
         renew_count = 0
-        @lock.with_write_lock do
-          certificates = clear ? [] : @certificates.dup
+        @write_lock.synchronize do
+          certificates = clear ? [] : @state.certificates.dup
 
           before_cids = Set.new(certificates.map(&:cid))
           seen_cids = Set.new
@@ -29,18 +35,20 @@ module Saro
             seen_cids.add(cert.cid)
             next if cert.expired
             next if before_cids.include?(cert.cid)
-            
+
             certificates << cert
             renew_count += 1
           end
 
           certificates.sort_by!(&:dat_issuance_end_seconds)
-          
+
           # Find latest issuable certificate as issuer
           issuer = certificates.reverse_each.find(&:issuable)
 
-          @issuer = issuer
-          @certificates = certificates
+          by_cid = {}
+          certificates.each { |cert| by_cid[cert.cid] = cert }
+
+          @state = State.new(issuer, certificates.freeze, by_cid.freeze).freeze
         end
         renew_count
       end
@@ -56,15 +64,13 @@ module Saro
       end
 
       def exports(verify_only = false)
-        @lock.with_read_lock do
-          @certificates.map { |cert| cert.exports(verify_only) }.join("\n")
-        end
+        @state.certificates.map { |cert| cert.exports(verify_only) }.join("\n")
       end
 
       def issue(plain, secure)
-        issuer = @lock.with_read_lock { @issuer }
+        issuer = @state.issuer
         raise RuntimeError, "Invalid DAT: Signing Key Does Not Exist" unless issuer
-        
+
         self.class._issue(issuer, plain, secure)
       end
 
@@ -72,12 +78,10 @@ module Saro
         dat = Saro::Dat::Dat.from_value(dat_input)
         raise ArgumentError, "Invalid DAT: Format" unless dat.format
 
-        certificate = @lock.with_read_lock do
-          @certificates.find { |c| c.cid == dat.cid }
-        end
-        
+        certificate = @state.by_cid[dat.cid]
+
         raise ArgumentError, "Invalid DAT: CID(Certificate ID) Not Found" unless certificate
-        
+
         self.class._parse(certificate, dat)
       end
 
@@ -88,8 +92,7 @@ module Saro
         expire = now + cert.dat_ttl_seconds
         cid_hex = cert.cid.to_s(16)
 
-        plain_bytes = plain.is_a?(String) ? plain.encode('utf-8') : (plain || "".b)
-        plain_b64 = Saro::Dat::Util.encode_base64_url_str(plain_bytes)
+        plain_b64 = Saro::Dat::Util.encode_base64_url_str(plain)
 
         encrypted_secure = cert.crypto_key.encrypt(secure)
         secure_b64 = Saro::Dat::Util.encode_base64_url_str(encrypted_secure)

data/lib/saro/dat/signature.rb

@@ -137,20 +137,19 @@ module Saro
 
       def sign(body)
         raise ArgumentError, "Signature key is not supported - verifying only key" unless @signing_key
-        body = body.encode('utf-8') if body.is_a?(String) && body.encoding != Encoding::BINARY
+        body = normalize_body(body)
         raise ArgumentError, "Sign Error - body is empty" if body.nil? || body.empty?
 
         if @config[:name] == "HMAC"
           OpenSSL::HMAC.digest(@config[:hash], @signing_key, body)
         else
-          digest = OpenSSL::Digest.new(@config[:hash])
-          signature_der = @signing_key.dsa_sign_asn1(digest.digest(body))
+          signature_der = @signing_key.dsa_sign_asn1(OpenSSL::Digest.digest(@config[:hash], body))
           der_to_raw_signature(signature_der)
         end
       end
 
       def verify(body, signature)
-        body = body.encode('utf-8') if body.is_a?(String) && body.encoding != Encoding::BINARY
+        body = normalize_body(body)
         return false if body.nil? || body.empty?
 
         sig_bytes = if signature.is_a?(String) && signature.encoding != Encoding::BINARY
@@ -170,8 +169,7 @@ module Saro
         else
           begin
             der_sig = raw_to_der_signature(sig_bytes)
-            digest = OpenSSL::Digest.new(@config[:hash])
-            @verifying_key.dsa_verify_asn1(digest.digest(body), der_sig)
+            @verifying_key.dsa_verify_asn1(OpenSSL::Digest.digest(@config[:hash], body), der_sig)
           rescue StandardError
             false
           end
@@ -192,15 +190,23 @@ module Saro
 
       private
 
+      # Avoid a needless copy when the body is already UTF-8 encoded bytes.
+      def normalize_body(body)
+        return body unless body.is_a?(String)
+        enc = body.encoding
+        return body if enc == Encoding::BINARY || enc == Encoding::UTF_8
+        body.encode('utf-8')
+      end
+
       def der_to_raw_signature(signature_der)
         asn1 = OpenSSL::ASN1.decode(signature_der)
         r = asn1.value[0].value
         s = asn1.value[1].value
-        
-        size = (@verifying_key.group.degree + 7) / 8
+
+        size = @config[:private_len] # curve byte size: (group.degree + 7) / 8
         r_bytes = r.to_s(2).rjust(size, "\x00".b)
         s_bytes = s.to_s(2).rjust(size, "\x00".b)
-        
+
         r_bytes + s_bytes
       end
 

data/lib/saro/dat/util.rb

@@ -11,7 +11,8 @@ module Saro
         return "".b if s.nil?
         if s.is_a?(String)
           return "".b if s.empty?
-          s = s.encode('utf-8') unless s.encoding == Encoding::BINARY
+          enc = s.encoding
+          s = s.encode('utf-8') unless enc == Encoding::BINARY || enc == Encoding::UTF_8
         end
         Base64.urlsafe_encode64(s, padding: false).b
       end

data/saro-dat.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "saro-dat"
-  spec.version       = "4.3.2"
+  spec.version       = "4.3.3"
   spec.authors       = ["marker"]
   spec.email         = ["j@saro.me"]
 
@@ -27,7 +27,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "concurrent-ruby", "~> 1.3.6"
   spec.add_dependency "openssl", "~> 4.0.2"
   spec.add_dependency "base64"
   spec.add_dependency "logger"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: saro-dat
 version: !ruby/object:Gem::Version
-  version: 4.3.2
+  version: 4.3.3
 platform: ruby
 authors:
 - marker
@@ -9,20 +9,6 @@ bindir: exe
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: concurrent-ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: openssl
   requirement: !ruby/object:Gem::Requirement
@@ -118,6 +104,7 @@ files:
 - ".idea/.gitignore"
 - ".idea/modules.xml"
 - ".idea/saro-dat.iml"
+- ".idea/vcs.xml"
 - ".ruby-version"
 - Gemfile
 - LICENSE