atproto_auth 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b5a970c60c05fb183389ef64b1fbd38bfdfc1e2cda615189e0c0e74362f6097
-  data.tar.gz: a841c5f2eebcb6aaf093566e2abda9d0e53cd2e298d0ce20d308e96aa51bdbbf
+  metadata.gz: 1543cc3c9cf5c099a76a62e75990217400930bfd00f8fa19b53b4bef9c035940
+  data.tar.gz: 294daf80d312117a27d7bcfda8fdb1e48865793736aa3a491bf13f61f73caeaa
 SHA512:
-  metadata.gz: 663b4810b6e888ac345a2d3a67eb8d506a2bd41257c318a7d61978172078a69b1b084f13fee6d0a42f0c982b85c46922a6c4b2b8134f8a84d88b07a36a6ce697
-  data.tar.gz: 0e3c7cd954d9a8a7803c2aba41f12d45d3ecf877b7c130ee732f844d75cb352fabb9bf88173006610962604eff8752baf966939be5aa0263d09e808a97b35328
+  metadata.gz: 1f58e87d6dddab0421cc3637c166d84468f3b863004e6e22f377a200bb149b4bf51db8bf6b4d5d15161a897bcdee15801352932f7d457b57a53142dc4da42296
+  data.tar.gz: 21ce4544366475e39cce0bc0e52596fbfd9278b32a18c8b30193330f3b9946177c06450c3ddda93d3136bd386e9496279834821b7fec45be5f8c369e015f6ed7

data/CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.2.1] - 2024-12-11
+### Added
+- Added support for did:web users
+
 ## [0.2.1] - 2024-12-11
 ### Fixed
 - Fixed a bug with access token hash generation

data/examples/confidential_client/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    atproto_auth (0.2.1)
+    atproto_auth (0.2.2)
       jose (~> 1.2)
       jwt (~> 2.9)
       redis (~> 5.3)

data/lib/atproto_auth/identity/did.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require "resolv"
+
+module AtprotoAuth
+  module Identity
+    # Validates decentralized identifiers (DIDs)
+    class DID
+      PREFIXES = ["did:plc:", "did:web:"].freeze
+
+      def initialize(did)
+        @did = did
+      end
+
+      def validate!
+        return if PREFIXES.any? { |prefix| @did.start_with?(prefix) }
+
+        raise Error, "Invalid DID format (must be one of #{PREFIXES.join(", ")}): #{@did}"
+      end
+
+      def to_s
+        @did
+      end
+    end
+  end
+end

data/lib/atproto_auth/identity/document.rb

@@ -68,16 +68,10 @@ module AtprotoAuth
         raise DocumentError, "Document must be a Hash" unless data.is_a?(Hash)
         raise DocumentError, "Document must have id" unless data["id"]
 
-        validate_did!(data["id"])
+        DID.new(data["id"]).validate!
         validate_services!(data["service"])
       end
 
-      def validate_did!(did)
-        return if did.start_with?("did:plc:")
-
-        raise DocumentError, "Invalid DID format (must be did:plc:): #{did}"
-      end
-
       def validate_services!(services)
         return if services.nil?
         raise DocumentError, "services must be an array" unless services.is_a?(Array)

data/lib/atproto_auth/identity/resolver.rb

@@ -39,7 +39,7 @@ module AtprotoAuth
       # @return [Hash] Resolution result with :did, :document, and :pds keys
       # @raise [ResolutionError] if resolution fails
       def get_did_info(did)
-        validate_did!(did)
+        DID.new(did).validate!
 
         # Fetch and parse DID document
         doc_data = fetch_did_document(did)
@@ -108,12 +108,6 @@ module AtprotoAuth
         raise ResolutionError, "Invalid handle format: #{handle}"
       end
 
-      def validate_did!(did)
-        return if did.start_with?(DID_PLC_PREFIX)
-
-        raise ResolutionError, "Invalid DID format (must be did:plc:): #{did}"
-      end
-
       def normalize_handle(handle)
         normalized = handle.start_with?("@") ? handle[1..] : handle
         normalized.downcase
@@ -178,17 +172,52 @@ module AtprotoAuth
         response = AtprotoAuth.configuration.http_client.get(uri.to_s)
         did = response[:body].strip
 
-        validate_did!(did)
+        DID.new(did).validate!
         get_did_info(did)
       end
 
       def fetch_did_document(did)
-        # Fetch document from PLC directory
+        if did.start_with?("did:web:")
+          fetch_web_did_document(did)
+        else
+          fetch_plc_did_document(did)
+        end
+      end
+
+      def fetch_plc_did_document(did)
         uri = URI.join(@plc_directory, "/#{did}")
         response = AtprotoAuth.configuration.http_client.get(uri.to_s)
         JSON.parse(response[:body])
       end
 
+      def fetch_web_did_document(did)
+        # Strip off the "did:web:" prefix
+        identifier = did.delete_prefix("did:web:")
+
+        # Convert colons to slashes for path components
+        # But we need to handle any percent-encoded colons in the domain portion first
+        parts = identifier.split(":", 2) # Split on first colon to separate domain from path
+        domain = parts[0]
+        path = parts[1]
+
+        # Construct the URL
+        url = if path
+                # Replace remaining colons with slashes and append did.json
+                path_with_slashes = path.tr(":", "/")
+                "https://#{domain}/#{path_with_slashes}/did.json"
+              else
+                # No path - use .well-known location
+                "https://#{domain}/.well-known/did.json"
+              end
+
+        begin
+          response = AtprotoAuth.configuration.http_client.get(url)
+          JSON.parse(response[:body])
+        rescue StandardError => e
+          raise ResolutionError, "Failed to fetch did:web document: #{e.message}"
+        end
+      end
+
       def validate_pds_url!(url)
         uri = URI(url)
         return if uri.is_a?(URI::HTTPS)

data/lib/atproto_auth/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AtprotoAuth
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/atproto_auth.rb

@@ -33,6 +33,7 @@ require "atproto_auth/state/session"
 require "atproto_auth/state/session_manager"
 
 require "atproto_auth/identity"
+require "atproto_auth/identity/did"
 require "atproto_auth/identity/document"
 require "atproto_auth/identity/resolver"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atproto_auth
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Josh Huckabee
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-11 00:00:00.000000000 Z
+date: 2024-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jose
@@ -92,6 +92,7 @@ files:
 - lib/atproto_auth/errors.rb
 - lib/atproto_auth/http_client.rb
 - lib/atproto_auth/identity.rb
+- lib/atproto_auth/identity/did.rb
 - lib/atproto_auth/identity/document.rb
 - lib/atproto_auth/identity/resolver.rb
 - lib/atproto_auth/par.rb