linzer 0.8.0.beta1 → 0.8.0.beta2

data/lib/linzer/signature.rb

@@ -150,11 +150,11 @@ module Linzer
     def to_h
       return @headers if @headers
 
-      items = @parsed_items || serialized_components.map { |c| Starry.parse_item(c) }
+      items = @parsed_items || serialized_components.map { |c| HTTP::StructuredField.parse_item(c) }
       {
-        "signature"       => Starry.serialize({label => value}),
-        "signature-input" => Starry.serialize({
-          label => Starry::InnerList.new(items, parameters)
+        "signature"       => HTTP::StructuredField.serialize({label => value}),
+        "signature-input" => HTTP::StructuredField.serialize({
+          label => HTTP::StructuredField::InnerList.new(items, parameters)
         })
       }
     end
@@ -168,7 +168,7 @@ module Linzer
           # Clone items that have parameters since the adapter's retrieve
           # method may mutate parameters (e.g., deleting "req").
           unless item.parameters.empty?
-            item = Starry::Item.new(item.value, item.parameters.dup)
+            item = HTTP::StructuredField::Item.new(item.value, item.parameters.dup)
           end
           Message::Field::FastIdentifier.new(serialized, item)
         end
@@ -234,9 +234,14 @@ module Linzer
       def build(headers, options = {})
         basic_validate headers
         headers.transform_keys!(&:downcase)
+        headers.transform_values! { |v| v.encode(Encoding::ASCII) }
         validate headers
 
-        input = parse_structured_field(headers, "signature-input")
+        input = HTTP::StructuredField.parse_dictionary(
+          headers["signature-input"],
+          field_name: "signature-input"
+        )
+
         reject_multiple_signatures if input.size > 1 && options[:label].nil?
         label = options[:label] || input.keys.first
 
@@ -316,51 +321,36 @@ module Linzer
         end
 
         # Label not found via fast path — fall back to Starry
-        signature = parse_structured_dictionary(
-          value.encode(Encoding::US_ASCII), "signature"
+        signature = HTTP::StructuredField.parse_dictionary(
+          value.encode(Encoding::US_ASCII),
+          field_name: "signature"
         )
         fail_with_signature_not_found label unless signature.key?(label)
         signature[label].value.force_encoding(Encoding::ASCII_8BIT)
       rescue ArgumentError
         # Base64 decode failed — fall back to Starry
-        signature = parse_structured_dictionary(
-          value.encode(Encoding::US_ASCII), "signature"
-        )
+        signature = HTTP::StructuredField.parse_dictionary(
+          value.encode(Encoding::US_ASCII),
+          field_name: "signature")
         fail_with_signature_not_found label unless signature.key?(label)
         signature[label].value.force_encoding(Encoding::ASCII_8BIT)
       end
 
-      # Serializes parsed Starry items to their string representations
-      # without going through the generic Starry.serialize_item path.
+      # Serializes parsed structured field items to their RFC 8941
+      # string representations.
       #
-      # For simple items (no parameters): builds '"value"' directly.
-      # For items with parameters: falls back to Starry.serialize_item.
+      # Serialization is delegated to `Starry.serialize_item` to ensure
+      # consistent RFC-compliant formatting of structured field items and
+      # parameters.
+      #
+      # @param items [Array<Starry::Item>]
+      #   Parsed structured field items.
+      #
+      # @return [Array<String>]
+      #   The serialized structured field item representations.
       #
-      # @param items [Array<Starry::Item>] parsed items from signature-input
-      # @return [Array<String>] serialized component identifiers
       def serialize_parsed_items(items)
-        items.map do |item|
-          if item.parameters.empty?
-            "\"#{item.value}\""
-          else
-            Starry.serialize_item(item)
-          end
-        end
-      end
-
-      def parse_structured_dictionary(str, field_name = nil)
-        Starry.parse_dictionary(str)
-      rescue Starry::ParseError => _
-        raise Error.new "Cannot parse \"#{field_name}\" field. Bailing out!"
-      end
-
-      # Parses a structured field value as a dictionary.
-      # @see https://datatracker.ietf.org/doc/html/rfc8941 RFC 8941
-      def parse_structured_field(hsh, field_name)
-        # Serialized Structured Field values for HTTP are ASCII strings.
-        # See: RFC 8941 (https://datatracker.ietf.org/doc/html/rfc8941)
-        value = hsh[field_name].encode(Encoding::US_ASCII)
-        parse_structured_dictionary(value, field_name)
+        items.map { |item| HTTP::StructuredField.serialize_item(item) }
       end
     end
   end

data/lib/linzer/version.rb

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

data/lib/linzer.rb

@@ -6,12 +6,17 @@ require "uri"
 require "net/http"
 
 require_relative "linzer/version"
+require_relative "linzer/http"
+require_relative "linzer/http/structured_field"
 require_relative "linzer/common"
+require_relative "linzer/signature/context"
+require_relative "linzer/signature/profile"
 require_relative "linzer/helper"
 require_relative "linzer/options"
 require_relative "linzer/message"
 require_relative "linzer/message/adapter"
 require_relative "linzer/message/wrapper"
+require_relative "linzer/message/overlay"
 require_relative "linzer/message/field"
 require_relative "linzer/message/field/parser"
 require_relative "linzer/signature"
@@ -24,8 +29,6 @@ require_relative "linzer/ecdsa"
 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.
 #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linzer
 version: !ruby/object:Gem::Version
-  version: 0.8.0.beta1
+  version: 0.8.0.beta2
 platform: ruby
 authors:
 - Miguel Landaeta
@@ -160,12 +160,18 @@ files:
 - lib/linzer/message/adapter/rack/response.rb
 - lib/linzer/message/field.rb
 - lib/linzer/message/field/parser.rb
+- lib/linzer/message/overlay.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
+- lib/linzer/signature/context.rb
+- lib/linzer/signature/profile.rb
+- lib/linzer/signature/profile/base.rb
+- lib/linzer/signature/profile/example.rb
+- lib/linzer/signature/profile/web_bot_auth.rb
 - lib/linzer/signer.rb
 - lib/linzer/verifier.rb
 - lib/linzer/version.rb