linzer 0.7.9.beta3 → 0.8.0.beta1

data/lib/linzer/signer.rb

@@ -68,16 +68,31 @@ module Linzer
       #     tag: "my-app"
       #   )
       def sign(key, message, components, options = {})
-        serialized_components = FieldId.serialize_components(Array(components))
-        validate key, message, serialized_components
+        serialized_components, field_ids =
+          FieldId.serialize_components_with_field_ids(Array(components))
+        validate key, message, serialized_components, field_ids: field_ids
+
+        # Reuse the already-parsed items from field_ids
+        parsed_items = field_ids.map(&:item)
 
         parameters = populate_parameters(key, options)
-        signature_base = signature_base(message, serialized_components, parameters)
+        signature_base = signature_base(message, serialized_components, parameters,
+                                        field_ids: field_ids)
 
-        signature = key.sign(signature_base)
+        raw_signature = key.sign(signature_base)
         label = options[:label] || DEFAULT_LABEL
 
-        Linzer::Signature.build(serialize(signature, serialized_components, parameters, label))
+        # Build the signature directly, bypassing the serialize -> parse round-trip
+        headers = serialize(raw_signature, serialized_components, parameters, label)
+
+        Linzer::Signature.from_components(
+          components:    serialized_components,
+          raw_signature: raw_signature,
+          label:         label,
+          parameters:    parameters,
+          parsed_items:  parsed_items,
+          headers:       headers
+        )
       end
 
       # Returns the default signature label.
@@ -91,19 +106,22 @@ module Linzer
 
       # Validates signing inputs.
       # @raise [SigningError] If any input is invalid
-      def validate(key, message, components)
+      def validate(key, message, components, field_ids: nil)
         msg = "Message cannot be signed with null %s"
         raise SigningError, msg % "value"     if message.nil?
         raise SigningError, msg % "key"       if key.nil?
         raise SigningError, msg % "component" if components.nil?
 
         begin
-          validate_components message, components
+          validate_components message, components, field_ids: field_ids
         rescue Error => ex
           raise SigningError, ex.message, cause: ex
         end
       end
 
+      RESERVED_OPTIONS = %i[created keyid label].freeze
+      private_constant :RESERVED_OPTIONS
+
       # Builds the signature parameters hash from options and key.
       # @return [Hash] The populated parameters
       def populate_parameters(key, options)
@@ -114,22 +132,25 @@ module Linzer
         key_id = options[:keyid] || (key.key_id if key.respond_to?(:key_id))
         parameters[:keyid] = key_id             unless key_id.nil?
 
-        (options.keys - %i[created keyid label]).each { |k| parameters[k] = options[k] }
+        options.each { |k, v| parameters[k] = v unless RESERVED_OPTIONS.include?(k) }
 
         parameters
       end
 
       # Serializes the signature into HTTP header format.
+      #
+      # Uses direct string building instead of Starry.serialize to avoid
+      # the overhead of generic structured field serialization.
+      #
       # @return [Hash] Hash with "signature" and "signature-input" keys
       def serialize(signature, components, parameters, label)
+        sig_b64 = Base64.strict_encode64(signature)
+        input_params = HTTP::StructuredField.serialize_parameters(parameters)
+        components_str = components.join(" ")
+
         {
-          "signature" => Starry.serialize({label => signature}),
-          "signature-input" =>
-            Starry.serialize(label =>
-              Starry::InnerList.new(
-                components.map { |c| Starry.parse_item(c) },
-                parameters
-              ))
+          "signature"       => "#{label}=:#{sig_b64}:",
+          "signature-input" => "#{label}=(#{components_str})#{input_params}"
         }
       end
     end

data/lib/linzer/verifier.rb

@@ -59,7 +59,12 @@ module Linzer
         parameters = signature.parameters
         serialized_components = signature.serialized_components
 
-        signature_base = signature_base(message, serialized_components, parameters)
+        # Build fresh field_ids for signature_base (validate already
+        # consumed its own set, which may have been mutated by adapters).
+        field_ids = signature.field_ids
+
+        signature_base = signature_base(message, serialized_components, parameters,
+                                        field_ids: field_ids)
 
         verify_or_fail key, signature.value, signature_base
       end
@@ -78,10 +83,11 @@ module Linzer
         end
 
         raise VerifyError, "Signature raw value to cannot be null" if signature.value.nil?
-        raise VerifyError, "Components cannot be null"             if signature.components.nil?
+        raise VerifyError, "Components cannot be null"             if signature.serialized_components.nil?
 
         begin
-          validate_components message, signature.serialized_components
+          validate_components message, signature.serialized_components,
+                             field_ids: signature.field_ids
         rescue Error => ex
           raise VerifyError, ex.message, cause: ex
         end

data/lib/linzer/version.rb

@@ -3,5 +3,5 @@
 module Linzer
   # Current version of the Linzer gem.
   # @return [String]
-  VERSION = "0.7.9.beta3"
+  VERSION = "0.8.0.beta1"
 end

data/lib/linzer.rb

@@ -2,9 +2,7 @@
 
 require "starry"
 require "openssl"
-require "rack"
 require "uri"
-require "stringio"
 require "net/http"
 
 require_relative "linzer/version"
@@ -27,6 +25,7 @@ require_relative "linzer/key/helper"
 require_relative "linzer/signer"
 require_relative "linzer/verifier"
 require_relative "linzer/http"
+require_relative "linzer/http/structured_field"
 
 # Linzer is a Ruby library for HTTP Message Signatures as defined in RFC 9421.
 #
@@ -158,5 +157,3 @@ module Linzer
   # Used for serializing and deserializing component identifiers.
   FieldId = Message::Field::Identifier
 end
-
-require_relative "rack/auth/signature"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linzer
 version: !ruby/object:Gem::Version
-  version: 0.7.9.beta3
+  version: 0.8.0.beta1
 platform: ruby
 authors:
 - Miguel Landaeta
@@ -23,26 +23,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: uri
   requirement: !ruby/object:Gem::Requirement
@@ -63,46 +43,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.2
-- !ruby/object:Gem::Dependency
-  name: stringio
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.1.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.1.2
-- !ruby/object:Gem::Dependency
-  name: logger
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: forwardable
   requirement: !ruby/object:Gem::Requirement
@@ -176,6 +116,10 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- benchmarks/profile_sign_ed25519.rb
+- benchmarks/profile_verify_ed25519.rb
+- benchmarks/sign.rb
+- benchmarks/verify.rb
 - examples/sinatra/Gemfile
 - examples/sinatra/config.ru
 - examples/sinatra/http-signatures.yml
@@ -195,6 +139,7 @@ files:
 - lib/linzer/http.rb
 - lib/linzer/http/bootstrap.rb
 - lib/linzer/http/signature_feature.rb
+- lib/linzer/http/structured_field.rb
 - lib/linzer/jws.rb
 - lib/linzer/key.rb
 - lib/linzer/key/helper.rb
@@ -217,6 +162,7 @@ files:
 - lib/linzer/message/field/parser.rb
 - lib/linzer/message/wrapper.rb
 - lib/linzer/options.rb
+- lib/linzer/rack.rb
 - lib/linzer/rsa.rb
 - lib/linzer/rsa_pss.rb
 - lib/linzer/signature.rb