jekyll-activity-pub 0.1.0rc13 → 0.1.0rc15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c1484d32011db73dd1d0db605244a6ac077f0820aa4ef0b2c78111a210f0c04
-  data.tar.gz: 17841d449364d36b5b8a78377234b0215aa09951797776c51a8fd4835142c758
+  metadata.gz: 85320eb7b8fa252e8e66bb733d4ab51478b379f4ebd6211c0fbc6387f425cffc
+  data.tar.gz: 122b5349c06408910f743f255112df2acc3318cc0ede289ea5811a030fda3b65
 SHA512:
-  metadata.gz: 1ec20c6425542d0b83a2e995dcf38e3d9196728fcb5358e782ee66f23ba26aa625ab1523bd9235eebb2684cc1548912f9dd3a24ceac6ec30660fd0664969fac2
-  data.tar.gz: 8ec390af344d3e4f7558119a00e153c194029206af5c6b431282f2af1d73de22eeeafa6001757ebd368a8d0c5433753df7e09a8596de75b03915a1fca9a0cf2f
+  metadata.gz: a2111ddfe7cf26d72088b000014c6ac690a731235c392e9d2cb86a7831913a53d1e27a6a6920c599a52218f275eaf29f473dc37b03b561bbc8abe64d0ddafb6c
+  data.tar.gz: 5ec690882fbc64d533a1f02741252215e71b9a156d7697228afa5b71bbd927d4bda149d3724f88ca598bd9e58530c21f350ae5c59694e1e1a9cb0256c505be32

data/lib/jekyll/activity_pub/notifier.rb

@@ -53,14 +53,20 @@ module Jekyll
           @@site
         end
 
+        def url
+          config['url'].tap do |u|
+            abort_if_missing('activity_pub.url', u, '_config.yml')
+          end
+        end
+
         # @return [String]
         def followers_url
-          "#{config['url']}/v1/#{actor}/followers"
+          "#{url}/v1/#{actor}/followers"
         end
 
         # @return [String]
         def following_url
-          "#{config['url']}/v1/#{actor}/following"
+          "#{url}/v1/#{actor}/following"
         end
 
         # Save the public key URL for later
@@ -70,11 +76,13 @@ module Jekyll
           data['public_key_url'] = url
         end
 
-        # Public key URL
+        # Public key URL, raises error if missing
         #
-        # @return [String,nil]
+        # @return [String]
         def public_key_url
-          data['public_key_url']
+          data['public_key_url'].tap do |pk|
+            abort_if_missing('public_key_url', pk)
+          end
         end
 
         def actor=(actor)
@@ -82,7 +90,9 @@ module Jekyll
         end
 
         def actor
-          data['actor']
+          data['actor'].tap do |a|
+            abort_if_missing('actor', a)
+          end
         end
 
         def actor_url=(url)
@@ -90,7 +100,9 @@ module Jekyll
         end
 
         def actor_url
-          data['actor_url']
+          data['actor_url'].tap do |au|
+            abort_if_missing('actor_url', au)
+          end
         end
 
         # Send notifications
@@ -104,10 +116,10 @@ module Jekyll
 
           unless response.ok?
             raise NotificationError,
-                  "Could't fetch public key (#{response.code}: #{response.message})"
+                  "Could't fetch public key (#{response.code}: #{response.message}). It needs to be available at #{public_key_url} before notifications can work, because it's used for signature verification."
           end
 
-          unless client.private_key.compare? OpenSSL::PKey::RSA.new(response.body)
+          unless client.private_key.compare? OpenSSL::PKey::RSA.new(response.parsed_response.dig('publicKey', 'publicKeyPem'))
             raise NotificationError, "Public key at #{public_key_url} differs from local version"
           end
 
@@ -148,6 +160,8 @@ module Jekyll
 
           # Store everything for later
           save
+        rescue NotificationError => e
+          Jekyll.logger.abort_with 'ActivityPub:', e.message
         end
 
         # Return data
@@ -274,7 +288,9 @@ module Jekyll
         #
         # @return [String, nil]
         def private_key_path
-          @@private_key_path ||= site.config['activity_pub_private_key']
+          @@private_key_path ||= site.config['activity_pub_private_key'].tap do |pk|
+            abort_if_missing '--key', pk, 'notify command'
+          end
         end
 
         # Returns the private key
@@ -283,8 +299,7 @@ module Jekyll
         def private_key
           @@private_key ||= File.read private_key_path
         rescue StandardError
-          Jekyll.logger.warn 'ActivityPub:', 'There\'s an issue with your private key'
-          raise
+          Jekyll.logger.abort_with 'ActivityPub:', 'There\'s an issue with your private key'
         end
 
         # @return [Hash]
@@ -295,7 +310,7 @@ module Jekyll
         def client
           @@client ||= DistributedPress::V1::Social::Client.new(
             private_key_pem: private_key,
-            url: config['url'],
+            url: url,
             public_key_url: public_key_url,
             logger: Jekyll.logger
           )
@@ -361,6 +376,12 @@ module Jekyll
               PseudoObject.new(url: rel, site: site, relative_path: rel, data: data)
             end
         end
+
+        def abort_if_missing(key_name, value, file = '_data/activity_pub.yml')
+          return unless value.nil? || value.empty?
+
+          Jekyll.logger.abort_with 'ActivityPub:', "Missing #{key_name} in #{file}"
+        end
       end
     end
   end

data/lib/jekyll/activity_pub/public_key.rb

@@ -27,14 +27,14 @@ module Jekyll
 
         actor.data['publicKey'] = self
 
-        Notifier.public_key_url = absolute_url(url)
+        Notifier.public_key_url = data['id']
 
         trigger_hooks :post_init
       end
 
       def read_yaml(*)
         self.data = {
-          'id' => absolute_url(url),
+          'id' => "#{absolute_url(@actor.url)}#main-key",
           'owner' => absolute_url(@actor.url),
           'publicKeyPem' => @public_key.public_to_pem
         }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-activity-pub
 version: !ruby/object:Gem::Version
-  version: 0.1.0rc13
+  version: 0.1.0rc15
 platform: ruby
 authors:
 - Sutty
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-05 00:00:00.000000000 Z
+date: 2023-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: distributed-press-api-client
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0rc3
+        version: 0.3.0rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0rc3
+        version: 0.3.0rc4
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
@@ -143,7 +143,7 @@ files:
 - lib/jekyll/activity_pub.rb
 - lib/jekyll/activity_pub/activity.rb
 - lib/jekyll/activity_pub/actor.rb
-- lib/jekyll/activity_pub/cache.rb
+- lib/jekyll/activity_pub/cache.rb~
 - lib/jekyll/activity_pub/commands.rb
 - lib/jekyll/activity_pub/create.rb
 - lib/jekyll/activity_pub/delete.rb
@@ -158,7 +158,7 @@ files:
 - lib/jekyll/activity_pub/outbox.rb
 - lib/jekyll/activity_pub/property_value.rb
 - lib/jekyll/activity_pub/public_key.rb
-- lib/jekyll/activity_pub/tomsbtone.rb
+- lib/jekyll/activity_pub/tomsbtone.rb~
 - lib/jekyll/activity_pub/update.rb
 - lib/jekyll/activity_pub/webfinger.rb
 - lib/jekyll/command_extension.rb