saro-dat 4.0.0 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1981b6c7f0f207f6388f95f4cafaee56a44c49209b0961567f8f37dc3cb2187
-  data.tar.gz: 0e96927af41f3fb6c387a5ffceec5065f8ff6d2e723b8ed6dce41068e7c523fd
+  metadata.gz: 1bc8964419d2aa39030dbec0e990d8a22d1fa29a8f8eec15235f69e70fa81054
+  data.tar.gz: e2fb45d1bbb981ea6745fab4661db4f1db41063fe73bc147cd33276c60e4a0fa
 SHA512:
-  metadata.gz: c4c8b7d3730883f2056841f0018ae4783223ffe417c35861a62ae56d6f0010a5b3d9687adbd6aeb7a87f358d9182af396df007313a493e0073681b4e4b474d72
-  data.tar.gz: 7af21459544e31f18c9edcae209fcb3181cdc40d6609e80b65ff8c4b002502c1687e7631e4ae2cd224d01a017447ee421a5ee754602e11d95f4616a792c06169
+  metadata.gz: c306baa43850bc77ebd33a2c1717f1aaac63ca0c98b538da28cb8ca064e0ed475b0c2e866fee5b47700a49009c085621c5b21f1b989041028e0a481112092590
+  data.tar.gz: c75ede02ecff59c9e18a85116247eb3bae95c594940f8fedec457434a8f9c9dc9690667d1be103cb4abf03b18c483997a9f0fe4b6adbbb3f3e19c644ad9e66e2

data/.idea/saro-dat.iml

@@ -14,7 +14,8 @@
     <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.6, 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" />
     <orderEntry type="library" scope="PROVIDED" name="parallel (v2.1.0, rbenv: 4.0.5) [gem]" level="application" />

data/PUBLISH.md

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

data/README.md

@@ -4,9 +4,9 @@
 
 ### [DAT Run Online](https://dat.saro.me)
 
-### [What is DAT](https://dat.saro.me/--/intro)
+### [What is DAT](https://dat.saro.me/intro)
 
-### [Example](https://dat.saro.me/--/libs/gems-saro-dat)
+### [Example](https://dat.saro.me/libs/gems-saro-dat)
 
 ## Support algorithm
 ### Signature

data/lib/saro/dat/dat_certificate.rb

@@ -7,33 +7,33 @@ require_relative 'util'
 module Saro
   module Dat
     class DatCertificate
-      attr_reader :cid, :signature_key, :crypto_key, :dat_issue_begin, :dat_issue_end, :dat_ttl
+      attr_reader :cid, :signature_key, :crypto_key, :dat_issuance_start_seconds, :dat_issuance_end_seconds, :dat_ttl_seconds
 
-      def initialize(cid, issued_at, issuance_duration, dat_ttl, signature_key, crypto_key)
+      def initialize(cid, dat_issuance_start_seconds, dat_issuance_duration_seconds, dat_ttl_seconds, signature_key, crypto_key)
         @cid = cid
-        @dat_issue_begin = issued_at
-        @dat_issue_end = issued_at + issuance_duration
-        @dat_ttl = dat_ttl
+        @dat_issuance_start_seconds = dat_issuance_start_seconds
+        @dat_issuance_end_seconds = dat_issuance_start_seconds + dat_issuance_duration_seconds
+        @dat_ttl_seconds = dat_ttl_seconds
         @signature_key = signature_key
         @crypto_key = crypto_key
       end
 
       def exports(verify_only = false)
         cid_hex = @cid.to_s(16)
-        issued_at = @dat_issue_begin.to_s
-        issuance_duration = (@dat_issue_end - @dat_issue_begin).to_s
-        ttl = @dat_ttl.to_s
-        sig_alg = @signature_key.algorithm
-        cry_alg = @crypto_key.algorithm
-        sig_key = @signature_key.exports(verify_only)
-        cry_key = @crypto_key.exports
+        dat_issuance_start_seconds = @dat_issuance_start_seconds.to_s
+        dat_issuance_duration_seconds = (@dat_issuance_end_seconds - @dat_issuance_start_seconds).to_s
+        dat_ttl_seconds = @dat_ttl_seconds.to_s
+        signature_algorithm = @signature_key.algorithm
+        crypto_algorithm = @crypto_key.algorithm
+        signature_key = @signature_key.exports(verify_only)
+        crypto_key = @crypto_key.exports
 
-        "#{cid_hex}.#{issued_at}.#{issuance_duration}.#{ttl}.#{sig_alg}.#{cry_alg}.#{sig_key}.#{cry_key}"
+        "#{cid_hex}.#{dat_issuance_start_seconds}.#{dat_issuance_duration_seconds}.#{dat_ttl_seconds}.#{signature_algorithm}.#{crypto_algorithm}.#{signature_key}.#{crypto_key}"
       end
 
-      def self.generate(cid, issued_at, issuance_duration, dat_ttl, signature_algorithm, crypto_algorithm)
+      def self.generate(cid, dat_issuance_start_seconds, dat_issuance_duration_seconds, dat_ttl_seconds, signature_algorithm, crypto_algorithm)
         new(
-          cid, issued_at, issuance_duration, dat_ttl,
+          cid, dat_issuance_start_seconds, dat_issuance_duration_seconds, dat_ttl_seconds,
           Saro::Dat::DatSignature.generate(signature_algorithm),
           Saro::Dat::DatCrypto.generate(crypto_algorithm)
         )
@@ -44,24 +44,24 @@ module Saro
         raise ArgumentError, "Invalid Certificate format" if parts.length != 8
 
         cid = parts[0].to_i(16)
-        issued_at = parts[1].to_i
-        issuance_duration = parts[2].to_i
-        ttl = parts[3].to_i
-        sig_algo = parts[4]
-        cry_algo = parts[5]
-        signature_key = Saro::Dat::DatSignature.imports(sig_algo, parts[6])
-        crypto_key = Saro::Dat::DatCrypto.imports(cry_algo, parts[7])
+        dat_issuance_start_seconds = parts[1].to_i
+        dat_issuance_duration_seconds = parts[2].to_i
+        dat_ttl_seconds = parts[3].to_i
+        signature_algorithm = parts[4]
+        crypto_algorithm = parts[5]
+        signature_key = Saro::Dat::DatSignature.imports(signature_algorithm, parts[6])
+        crypto_key = Saro::Dat::DatCrypto.imports(crypto_algorithm, parts[7])
 
-        new(cid, issued_at, issuance_duration, ttl, signature_key, crypto_key)
+        new(cid, dat_issuance_start_seconds, dat_issuance_duration_seconds, dat_ttl_seconds, signature_key, crypto_key)
       end
 
       def issuable
         now = Time.now.to_i
-        signable && @dat_issue_begin <= now && now <= @dat_issue_end
+        signable && @dat_issuance_start_seconds <= now && now <= @dat_issuance_end_seconds
       end
 
       def expired
-        Time.now.to_i > (@dat_issue_end + @dat_ttl)
+        Time.now.to_i > (@dat_issuance_end_seconds + @dat_ttl_seconds)
       end
 
       def signable
@@ -72,6 +72,10 @@ module Saro
         @signature_key.pair
       end
 
+      def support_verify_only
+        @signature_key.support_verify_only
+      end
+
       # For Ruby conventions
       alias_method :issuable?, :issuable
       alias_method :expired?, :expired

data/lib/saro/dat/dat_manager.rb

@@ -17,9 +17,10 @@ module Saro
       end
 
       def import_certificates(input_certs, clear: false)
+        renew_count = 0
         @lock.with_write_lock do
           certificates = clear ? [] : @certificates.dup
-          
+
           before_cids = Set.new(certificates.map(&:cid))
           seen_cids = Set.new
 
@@ -30,9 +31,10 @@ module Saro
             next if before_cids.include?(cert.cid)
             
             certificates << cert
+            renew_count += 1
           end
 
-          certificates.sort_by!(&:dat_issue_end)
+          certificates.sort_by!(&:dat_issuance_end_seconds)
           
           # Find latest issuable certificate as issuer
           issuer = certificates.reverse_each.find(&:issuable)
@@ -40,6 +42,7 @@ module Saro
           @issuer = issuer
           @certificates = certificates
         end
+        renew_count
       end
 
       def imports(format_str, clear: false)
@@ -82,7 +85,7 @@ module Saro
 
       def self._issue(cert, plain, secure)
         now = Time.now.to_i
-        expire = now + cert.dat_ttl
+        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)

data/lib/saro/dat/signature.rb

@@ -114,6 +114,10 @@ module Saro
       end
 
       def exports(verify_only = false)
+        if verify_only && !support_verify_only
+          raise ArgumentError, "#{config[:name]} does not supported verifying only key"
+        end
+
         if @config[:name] == "HMAC"
           Saro::Dat::Util.encode_base64_url_str(@verifying_key)
         else
@@ -182,6 +186,10 @@ module Saro
         @config[:name] == "ECDSA"
       end
 
+      def support_verify_only
+        @config[:name] == "ECDSA"
+      end
+
       private
 
       def der_to_raw_signature(signature_der)

data/lib/saro-dat.rb

@@ -6,6 +6,7 @@ require_relative 'saro/dat/signature'
 require_relative 'saro/dat/dat_certificate'
 require_relative 'saro/dat/dat'
 require_relative 'saro/dat/dat_manager'
+require_relative 'saro/dat/cms_manager'
 
 module Saro
   module Dat

data/saro-dat.gemspec

@@ -2,13 +2,13 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "saro-dat"
-  spec.version       = "4.0.0"
+  spec.version       = "4.3.0"
   spec.authors       = ["marker"]
   spec.email         = ["j@saro.me"]
 
   spec.summary       = "DAT (Data Access Token) Ruby implementation"
   spec.description   = "Ported from Python dat library"
-  spec.homepage      = "https://dat.saro.me/--/libs/gems-saro-dat"
+  spec.homepage      = "https://dat.saro.me/libs/gems-saro-dat"
   spec.license       = "MIT"
   spec.required_ruby_version = ">= 2.7.0"
 
@@ -30,6 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "concurrent-ruby", "~> 1.3.6"
   spec.add_dependency "openssl", "~> 4.0.2"
   spec.add_dependency "base64"
+  spec.add_dependency "logger"
 
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "benchmark"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: saro-dat
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.3.0
 platform: ruby
 authors:
 - marker
@@ -51,6 +51,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: logger
+  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: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -117,11 +131,11 @@ files:
 - lib/saro/dat/signature.rb
 - lib/saro/dat/util.rb
 - saro-dat.gemspec
-homepage: https://dat.saro.me/--/libs/gems-saro-dat
+homepage: https://dat.saro.me/libs/gems-saro-dat
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://dat.saro.me/--/libs/gems-saro-dat
+  homepage_uri: https://dat.saro.me/libs/gems-saro-dat
   source_code_uri: https://github.com/saro-lab/dat-ruby
   changelog_uri: https://github.com/saro-lab/dat-ruby/blob/main/CHANGELOG.md
   keywords: dat, distributed, access, token, web, session, security, authentication