Update to linzer 0.7 (#34765)

app/lib/fasp/request.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class Fasp::Request
+  COVERED_COMPONENTS = %w(@method @target-uri content-digest).freeze
+
   def initialize(provider)
     @provider = provider
   end
@@ -23,55 +25,36 @@ class Fasp::Request
     url = @provider.url(path)
     body = body.present? ? body.to_json : ''
     headers = request_headers(verb, url, body)
-    response = HTTP.headers(headers).send(verb, url, body:)
+    key = Linzer.new_ed25519_key(@provider.server_private_key_pem, @provider.remote_identifier)
+    response = HTTP
+               .headers(headers)
+               .use(http_signature: { key:, covered_components: COVERED_COMPONENTS })
+               .send(verb, url, body:)
+
     validate!(response)
 
     response.parse if response.body.present?
   end
 
-  def request_headers(verb, url, body = '')
-    result = {
+  def request_headers(_verb, _url, body = '')
+    {
       'accept' => 'application/json',
       'content-type' => 'application/json',
       'content-digest' => content_digest(body),
     }
-    result.merge(signature_headers(verb, url, result))
   end
 
   def content_digest(body)
     "sha-256=:#{OpenSSL::Digest.base64digest('sha256', body || '')}:"
   end
 
-  def signature_headers(verb, url, headers)
-    linzer_request = Linzer.new_request(verb, url, {}, headers)
-    message = Linzer::Message.new(linzer_request)
-    key = Linzer.new_ed25519_key(@provider.server_private_key_pem, @provider.remote_identifier)
-    signature = Linzer.sign(key, message, %w(@method @target-uri content-digest))
-    Linzer::Signer.send(:populate_parameters, key, {})
-
-    signature.to_h
-  end
-
   def validate!(response)
     content_digest_header = response.headers['content-digest']
     raise Mastodon::SignatureVerificationError, 'content-digest missing' if content_digest_header.blank?
     raise Mastodon::SignatureVerificationError, 'content-digest does not match' if content_digest_header != content_digest(response.body)
+    raise Mastodon::SignatureVerificationError, 'signature-input is missing' if response.headers['signature-input'].blank?
 
-    signature_input = response.headers['signature-input']&.encode('UTF-8')
-    raise Mastodon::SignatureVerificationError, 'signature-input is missing' if signature_input.blank?
-
-    linzer_response = Linzer.new_response(
-      response.body,
-      response.status,
-      {
-        'content-digest' => content_digest_header,
-        'signature-input' => signature_input,
-        'signature' => response.headers['signature'],
-      }
-    )
-    message = Linzer::Message.new(linzer_response)
     key = Linzer.new_ed25519_public_key(@provider.provider_public_key_pem)
-    signature = Linzer::Signature.build(message.headers)
-    Linzer.verify(key, message, signature)
+    Linzer.verify!(response, key:)
   end
 end