async-matrix 2.1.0 → 3.0.1

data/lib/protocol/matrix/signing.rb

@@ -0,0 +1,278 @@
+# frozen_string_literal: true
+
+# Released under the Apache License, Version 2.0.
+# Copyright, 2026, by General Intelligence Systems.
+
+require_relative "canonical_json"
+require_relative "error"
+
+module Protocol
+  module Matrix
+    # Signing JSON, per https://spec.matrix.org/latest/appendices/#signing-json
+    #
+    # The procedure, in full:
+    #
+    #   1. remove `signatures` and `unsigned`
+    #   2. encode what is left as canonical JSON
+    #   3. sign those bytes with ed25519
+    #   4. encode the signature as UNPADDED base64
+    #   5. store it under signatures[entity]["<algorithm>:<key_id>"]
+    #
+    # THE KEY MATERIAL IS INJECTED. `signer` is anything answering
+    # `sign(String) -> base64`, and `verifier` anything answering
+    # `verify_signature(key, message, signature) -> bool` — which is the shape
+    # the native E2EE module already exposes. So this file implements the
+    # procedure and holds no keys, which is what lets it sit in the protocol
+    # layer and be tested without cryptography.
+    module Signing
+      ED25519 = "ed25519"
+
+      class Error < Protocol::Matrix::Error; end
+
+      # No signature from the entity and key we were told to check.
+      class MissingSignatureError < Error; end
+
+      # "{algorithm}:{key_id}" — for a device key the key_id is the device id.
+      def self.key_id(name, algorithm: ED25519)
+        "#{algorithm}:#{name}"
+      end
+
+      # Sign +object+ as +user_id+ with +key_id+.
+      #
+      # @returns [Hash] a copy of +object+ with the signature added. EXISTING
+      #   SIGNATURES ARE PRESERVED: a device-keys object legitimately carries
+      #   several (our device key, our self-signing key, another user's
+      #   attestation), and replacing the map rather than merging into it would
+      #   silently discard them.
+      def self.sign(object, signer:, user_id:, key_id:)
+        signature = sign_bytes(CanonicalJson.signable_bytes(object), signer: signer)
+        existing = object["signatures"] || object[:signatures] || {}
+        mine = existing[user_id] || {}
+
+        object.merge(
+          "signatures" => existing.merge(user_id => mine.merge(key_id => signature)),
+        )
+      end
+
+      # Sign the given bytes, returning unpadded base64.
+      #
+      # PADDING IS STRIPPED HERE rather than assumed absent. The spec requires
+      # unpadded base64, and whether a given primitive emits padding is its own
+      # business; a stray "=" would make every signature we produce fail
+      # verification everywhere, which is an expensive thing to discover
+      # remotely.
+      def self.sign_bytes(message, signer:)
+        signer.sign(message).delete_suffix("==").delete_suffix("=")
+      end
+
+      # Is +object+ correctly signed by +user_id+ with +key_id+?
+      #
+      # @parameter key [String] the public ed25519 key to verify against.
+      # @parameter verifier [Object] answers
+      #   `verify_signature(key, message, signature) -> bool`.
+      # @raises [MissingSignatureError] when there is no such signature to check
+      #   — distinct from a signature that is present and wrong, because the two
+      #   mean different things about the sender.
+      def self.verify(object, key:, verifier:, user_id:, key_id:)
+        signature = signature_for(object, user_id: user_id, key_id: key_id)
+
+        if signature.nil?
+          raise MissingSignatureError, "no #{key_id} signature from #{user_id}"
+        end
+
+        verifier.verify_signature(key, CanonicalJson.signable_bytes(object), signature)
+      end
+
+      # The signature +user_id+ made with +key_id+, or nil.
+      def self.signature_for(object, user_id:, key_id:)
+        signatures = object["signatures"] || object[:signatures] || {}
+        (signatures[user_id] || {})[key_id]
+      end
+
+      def self.signed_by?(object, user_id:, key_id:)
+        !signature_for(object, user_id: user_id, key_id: key_id).nil?
+      end
+    end
+  end
+end
+
+__END__
+  describe "Protocol::Matrix::Signing" do
+    # A signer that records what it was asked to sign, so a spec can assert on
+    # the exact bytes the signature covers.
+    def recording_signer(signature = "SIGNATURE")
+      signer = Object.new
+      signed = []
+      signer.define_singleton_method(:signed) { signed }
+      signer.define_singleton_method(:sign) do |message|
+        signed << message
+        signature
+      end
+      signer
+    end
+
+    def verifier(result = true)
+      verifier = Object.new
+      calls = []
+      verifier.define_singleton_method(:calls) { calls }
+      verifier.define_singleton_method(:verify_signature) do |key, message, signature|
+        calls << [key, message, signature]
+        result
+      end
+      verifier
+    end
+
+    it "builds a key identifier" do
+      Protocol::Matrix::Signing.key_id("JLAFKJWSCS").should == "ed25519:JLAFKJWSCS"
+      Protocol::Matrix::Signing.key_id("1", algorithm: "ed25519").should == "ed25519:1"
+    end
+
+    it "stores the signature under entity and key identifier" do
+      signed = Protocol::Matrix::Signing.sign(
+        {"a" => 1},
+        signer: recording_signer,
+        user_id: "@alice:example.com",
+        key_id: "ed25519:DEV",
+      )
+
+      signed["signatures"].should == {"@alice:example.com" => {"ed25519:DEV" => "SIGNATURE"}}
+    end
+
+    # The signature covers canonical JSON of the object MINUS signatures and
+    # unsigned.
+    it "signs the canonical form, excluding signatures and unsigned" do
+      signer = recording_signer
+      Protocol::Matrix::Signing.sign(
+        {"b" => 2, "a" => 1, "unsigned" => {"age" => 1}},
+        signer: signer,
+        user_id: "@alice:example.com",
+        key_id: "ed25519:DEV",
+      )
+
+      signer.signed.should == ['{"a":1,"b":2}']
+    end
+
+    # A device-keys object legitimately carries several signatures; replacing the
+    # map rather than merging into it would discard them.
+    it "preserves signatures already present" do
+      object = {
+        "a" => 1,
+        "signatures" => {
+          "@bob:example.com" => {"ed25519:OTHER" => "theirs"},
+          "@alice:example.com" => {"ed25519:SSK" => "self-signing"},
+        },
+      }
+      signed = Protocol::Matrix::Signing.sign(
+        object,
+        signer: recording_signer,
+        user_id: "@alice:example.com",
+        key_id: "ed25519:DEV",
+      )
+
+      signed["signatures"]["@bob:example.com"].should == {"ed25519:OTHER" => "theirs"}
+      signed["signatures"]["@alice:example.com"].should == {
+        "ed25519:SSK" => "self-signing", "ed25519:DEV" => "SIGNATURE",
+      }
+    end
+
+    it "returns a copy rather than mutating its argument" do
+      object = {"a" => 1}
+      Protocol::Matrix::Signing.sign(
+        object,
+        signer: recording_signer,
+        user_id: "@alice:example.com",
+        key_id: "ed25519:DEV",
+      )
+
+      object.key?("signatures").should == false
+    end
+
+    # The spec requires UNPADDED base64. Whether a primitive emits padding is its
+    # own business; a stray "=" would fail verification everywhere.
+    it "strips base64 padding from whatever the signer returns" do
+      Protocol::Matrix::Signing.sign_bytes("msg", signer: recording_signer("abc=")).should == "abc"
+      Protocol::Matrix::Signing.sign_bytes("msg", signer: recording_signer("abc==")).should == "abc"
+      Protocol::Matrix::Signing.sign_bytes("msg", signer: recording_signer("abc")).should == "abc"
+    end
+
+    # ── Verifying ─────────────────────────────────────────────────────────────
+
+    it "verifies against the same bytes it would have signed" do
+      check = verifier
+      object = {
+        "b" => 2,
+        "a" => 1,
+        "signatures" => {"@alice:example.com" => {"ed25519:DEV" => "SIG"}},
+      }
+
+      Protocol::Matrix::Signing.verify(
+        object,
+        key: "PUBKEY",
+        verifier: check,
+        user_id: "@alice:example.com",
+        key_id: "ed25519:DEV",
+      ).should == true
+
+      check.calls.should == [["PUBKEY", '{"a":1,"b":2}', "SIG"]]
+    end
+
+    it "reports a signature that does not verify" do
+      Protocol::Matrix::Signing.verify(
+        {"a" => 1, "signatures" => {"@alice:example.com" => {"ed25519:DEV" => "SIG"}}},
+        key: "PUBKEY",
+        verifier: verifier(false),
+        user_id: "@alice:example.com",
+        key_id: "ed25519:DEV",
+      ).should == false
+    end
+
+    # "A signature that is absent" and "a signature that is wrong" say different
+    # things about the sender, so they are not the same answer.
+    it "distinguishes a missing signature from a bad one" do
+      lambda {
+        Protocol::Matrix::Signing.verify(
+          {"a" => 1},
+          key: "PUBKEY",
+          verifier: verifier,
+          user_id: "@alice:example.com",
+          key_id: "ed25519:DEV",
+        )
+      }.should.raise(Protocol::Matrix::Signing::MissingSignatureError)
+    end
+
+    it "treats a signature from a different key as missing" do
+      lambda {
+        Protocol::Matrix::Signing.verify(
+          {"signatures" => {"@alice:example.com" => {"ed25519:OTHER" => "SIG"}}},
+          key: "PUBKEY",
+          verifier: verifier,
+          user_id: "@alice:example.com",
+          key_id: "ed25519:DEV",
+        )
+      }.should.raise(Protocol::Matrix::Signing::MissingSignatureError)
+    end
+
+    it "finds a signature, or reports its absence" do
+      object = {"signatures" => {"@alice:example.com" => {"ed25519:DEV" => "SIG"}}}
+
+      Protocol::Matrix::Signing.signature_for(object, user_id: "@alice:example.com", key_id: "ed25519:DEV")
+        .should == "SIG"
+      Protocol::Matrix::Signing.signed_by?(object, user_id: "@alice:example.com", key_id: "ed25519:DEV")
+        .should == true
+      Protocol::Matrix::Signing.signed_by?(object, user_id: "@bob:example.com", key_id: "ed25519:DEV")
+        .should == false
+    end
+
+    # A signature survives a round trip through canonical JSON regardless of the
+    # order the object was built in -- which is the entire purpose of the
+    # canonical encoding.
+    it "signs two differently ordered objects identically" do
+      first = recording_signer
+      second = recording_signer
+
+      Protocol::Matrix::Signing.sign({"a" => 1, "b" => 2}, signer: first, user_id: "@a:b", key_id: "ed25519:D")
+      Protocol::Matrix::Signing.sign({"b" => 2, "a" => 1}, signer: second, user_id: "@a:b", key_id: "ed25519:D")
+
+      first.signed.should == second.signed
+    end
+  end

data/lib/protocol/matrix.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+# Released under the Apache License, Version 2.0.
+# Copyright, 2026, by General Intelligence Systems.
+
+# The Matrix protocol layer: message formats, event schemas, and the rules for
+# reading them. No HTTP, no sockets, no storage.
+#
+# The split follows the Socketry convention that `protocol-http` and
+# `protocol-grpc` set: a protocol library owns the FORMAT and the state machine
+# over it, and the `async-*` library binds that to IO. So an Event, a Content, an
+# EncryptedMessage and the schemas that validate them live here, and the Client
+# that fetches them lives in Async::Matrix.
+#
+# Practically, that means everything under this namespace can be unit tested
+# with a Hash and no network, no homeserver, and — for EncryptedMessage — no
+# crypto either.
+module Protocol
+  module Matrix
+  end
+end
+
+Dir.glob("#{__dir__}/matrix/**/*.rb").sort.each do |path|
+  require path
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: async-matrix
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Nathan Kidd
@@ -15,84 +15,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.39'
+        version: '2.46'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.39'
+        version: '2.46'
 - !ruby/object:Gem::Dependency
   name: async-http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.95'
+        version: '0.105'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.95'
-- !ruby/object:Gem::Dependency
-  name: async-websocket
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.30'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.30'
-- !ruby/object:Gem::Dependency
-  name: grape
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '0.105'
 - !ruby/object:Gem::Dependency
   name: json_schemer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: sequel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: string_builder
   requirement: !ruby/object:Gem::Requirement
@@ -135,20 +93,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: falcon
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.55'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.55'
 - !ruby/object:Gem::Dependency
   name: logger
   requirement: !ruby/object:Gem::Requirement
@@ -163,50 +107,37 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: lefthook
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
 description: Async-native Matrix protocol primitives built on the Socketry async ecosystem.
-  Provides well-known discovery, event notification, and application service models.
+  Provides a Client-Server API client, schema-validated events, media and end-to-end
+  encryption.
 email:
 - nathankidd@hey.com
 executables: []
@@ -517,75 +448,51 @@ files:
 - ext/async_matrix_e2ee/Cargo.toml
 - ext/async_matrix_e2ee/extconf.rb
 - ext/async_matrix_e2ee/src/lib.rs
-- lib/async/discord.rb
-- lib/async/discord/api.rb
-- lib/async/discord/api/path_tree.rb
-- lib/async/discord/client.rb
-- lib/async/discord/error.rb
-- lib/async/discord/gateway.rb
 - lib/async/matrix.rb
 - lib/async/matrix/api.rb
 - lib/async/matrix/api/chain.rb
 - lib/async/matrix/api/concat.rb
 - lib/async/matrix/api/path_tree.rb
-- lib/async/matrix/application_service/bot.rb
-- lib/async/matrix/application_service/config.rb
-- lib/async/matrix/application_service/config/schema/analytics.json
-- lib/async/matrix/application_service/config/schema/appservice.json
-- lib/async/matrix/application_service/config/schema/backfill.json
-- lib/async/matrix/application_service/config/schema/bridge.json
-- lib/async/matrix/application_service/config/schema/config.json
-- lib/async/matrix/application_service/config/schema/database.json
-- lib/async/matrix/application_service/config/schema/direct_media.json
-- lib/async/matrix/application_service/config/schema/double_puppet.json
-- lib/async/matrix/application_service/config/schema/encryption.json
-- lib/async/matrix/application_service/config/schema/homeserver.json
-- lib/async/matrix/application_service/config/schema/logging.json
-- lib/async/matrix/application_service/config/schema/management_room_texts.json
-- lib/async/matrix/application_service/config/schema/matrix.json
-- lib/async/matrix/application_service/config/schema/permissions.json
-- lib/async/matrix/application_service/config/schema/provisioning.json
-- lib/async/matrix/application_service/config/schema/public_media.json
-- lib/async/matrix/application_service/config/schema/relay.json
-- lib/async/matrix/application_service/config/vivify.rb
-- lib/async/matrix/application_service/dispatcher.rb
-- lib/async/matrix/application_service/error_response.rb
-- lib/async/matrix/application_service/event.rb
-- lib/async/matrix/application_service/server.rb
-- lib/async/matrix/application_service/transaction.rb
-- lib/async/matrix/application_service/transaction_handler.rb
-- lib/async/matrix/application_service/transaction_store.rb
-- lib/async/matrix/bridge/discord/db.rb
-- lib/async/matrix/bridge/discord/db/connection.rb
-- lib/async/matrix/bridge/discord/db/file.rb
-- lib/async/matrix/bridge/discord/db/guild.rb
-- lib/async/matrix/bridge/discord/db/message.rb
-- lib/async/matrix/bridge/discord/db/migrations/001_create_users.rb
-- lib/async/matrix/bridge/discord/db/migrations/002_create_guilds.rb
-- lib/async/matrix/bridge/discord/db/migrations/003_create_portals.rb
-- lib/async/matrix/bridge/discord/db/migrations/004_create_puppets.rb
-- lib/async/matrix/bridge/discord/db/migrations/005_create_messages.rb
-- lib/async/matrix/bridge/discord/db/migrations/006_create_reactions.rb
-- lib/async/matrix/bridge/discord/db/migrations/007_create_files.rb
-- lib/async/matrix/bridge/discord/db/portal.rb
-- lib/async/matrix/bridge/discord/db/puppet.rb
-- lib/async/matrix/bridge/discord/db/reaction.rb
-- lib/async/matrix/bridge/discord/db/schema.rb
-- lib/async/matrix/bridge/discord/db/user.rb
+- lib/async/matrix/app_service_client.rb
+- lib/async/matrix/auth_error.rb
+- lib/async/matrix/bad_json_error.rb
 - lib/async/matrix/client.rb
+- lib/async/matrix/client/encryption.rb
+- lib/async/matrix/client/rooms.rb
+- lib/async/matrix/client/sync.rb
+- lib/async/matrix/config.rb
+- lib/async/matrix/config/vivify.rb
 - lib/async/matrix/connection.rb
+- lib/async/matrix/device_store.rb
 - lib/async/matrix/double_puppet_client.rb
 - lib/async/matrix/e2ee.rb
+- lib/async/matrix/e2ee/pickle_key.rb
 - lib/async/matrix/endpoint.rb
 - lib/async/matrix/error.rb
+- lib/async/matrix/error_response.rb
+- lib/async/matrix/homeserver_error.rb
+- lib/async/matrix/invalid_endpoint_error.rb
 - lib/async/matrix/media_client.rb
+- lib/async/matrix/not_found_error.rb
 - lib/async/matrix/notifier.rb
-- lib/async/matrix/schema.rb
-- lib/async/matrix/schema/registry.rb
-- lib/async/matrix/schema/validation_error.rb
+- lib/async/matrix/response_too_large_error.rb
 - lib/async/matrix/server.rb
 - lib/async/matrix/stream.rb
 - lib/async/matrix/version.rb
+- lib/protocol/matrix.rb
+- lib/protocol/matrix/canonical_json.rb
+- lib/protocol/matrix/content.rb
+- lib/protocol/matrix/encrypted_message.rb
+- lib/protocol/matrix/error.rb
+- lib/protocol/matrix/event.rb
+- lib/protocol/matrix/key_backup.rb
+- lib/protocol/matrix/keys.rb
+- lib/protocol/matrix/message_batch.rb
+- lib/protocol/matrix/schema.rb
+- lib/protocol/matrix/schema/registry.rb
+- lib/protocol/matrix/schema/validation_error.rb
+- lib/protocol/matrix/secret_storage.rb
+- lib/protocol/matrix/signing.rb
 homepage: https://github.com/general-intelligence-systems/async-matrix
 licenses:
 - Apache-2.0