fedipub 0.9.0 → 0.11.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/README.md +7 -1
- data/app/controllers/concerns/fedipub/rails/server/render_collections.rb +21 -0
- data/app/controllers/fedipub/rails/client/activities_controller.rb +29 -0
- data/app/controllers/fedipub/rails/client/actors_controller.rb +56 -0
- data/app/controllers/fedipub/rails/client/followings_controller.rb +105 -0
- data/app/controllers/fedipub/rails/client_controller.rb +11 -0
- data/app/controllers/fedipub/rails/server/activities_controller.rb +80 -0
- data/app/controllers/fedipub/rails/server/actors_controller.rb +52 -0
- data/app/controllers/fedipub/rails/server/approval_stamps_controller.rb +15 -0
- data/app/controllers/fedipub/rails/server/followings_controller.rb +21 -0
- data/app/controllers/fedipub/rails/server/nodeinfo_controller.rb +30 -0
- data/app/controllers/fedipub/rails/server/published_controller.rb +32 -0
- data/app/controllers/fedipub/rails/server/web_finger_controller.rb +46 -0
- data/app/controllers/fedipub/rails/server_controller.rb +48 -0
- data/app/helpers/fedipub/rails/server_helper.rb +16 -0
- data/app/jobs/fedipub/application_job.rb +1 -1
- data/app/models/concerns/fedipub/actor_entity.rb +1 -125
- data/app/models/concerns/fedipub/data_entity.rb +5 -105
- data/app/models/fedipub/activity.rb +1 -0
- data/app/models/fedipub/actor.rb +28 -22
- data/app/models/fedipub/approval_stamp.rb +38 -0
- data/app/models/fedipub/host.rb +2 -2
- data/app/policies/fedipub/server/approval_stamp_policy.rb +9 -0
- data/app/views/fedipub/rails/client/activities/_index.json.jbuilder +1 -0
- data/app/views/fedipub/rails/client/activities/feed.json.jbuilder +1 -0
- data/app/views/fedipub/rails/client/activities/index.json.jbuilder +1 -0
- data/app/views/fedipub/{client → rails/client}/actors/_actor.json.jbuilder +1 -0
- data/app/views/fedipub/rails/client/actors/index.json.jbuilder +1 -0
- data/app/views/fedipub/{client → rails/client}/actors/show.html.erb +10 -5
- data/app/views/fedipub/rails/client/actors/show.json.jbuilder +1 -0
- data/app/views/fedipub/rails/client/followings/index.json.jbuilder +1 -0
- data/app/views/fedipub/rails/client/followings/show.json.jbuilder +1 -0
- data/app/views/fedipub/{server → rails/server}/activities/_activity.activitypub.jbuilder +2 -2
- data/app/views/fedipub/rails/server/activities/show.activitypub.jbuilder +1 -0
- data/app/views/fedipub/{server → rails/server}/actors/_actor.activitypub.jbuilder +14 -7
- data/app/views/fedipub/{server → rails/server}/actors/_tombstone.activitypub.jbuilder +1 -1
- data/app/views/fedipub/rails/server/actors/show.activitypub.jbuilder +5 -0
- data/app/views/fedipub/rails/server/approval_stamps/show.activitypub.jbuilder +8 -0
- data/app/views/fedipub/{server → rails/server}/followings/_following.activitypub.jbuilder +1 -1
- data/app/views/fedipub/rails/server/followings/show.activitypub.jbuilder +1 -0
- data/app/views/fedipub/rails/server/nodeinfo/index.nodeinfo.jbuilder +10 -0
- data/app/views/fedipub/rails/server/published/_publishable.activitypub.jbuilder +20 -0
- data/app/views/fedipub/{server → rails/server}/published/_tombstone.activitypub.jbuilder +1 -1
- data/app/views/fedipub/rails/server/published/show.activitypub.jbuilder +5 -0
- data/app/views/fedipub/{server → rails/server}/shared/ordered_collection.activitypub.jbuilder +1 -1
- data/app/views/fedipub/{server → rails/server}/shared/ordered_collection_page.activitypub.jbuilder +1 -1
- data/app/views/fedipub/{server → rails/server}/web_finger/find.jrd.jbuilder +11 -3
- data/config/initializers/logger.rb +2 -0
- data/config/initializers/miscellany.rb +21 -0
- data/config/initializers/security_vocab.rb +1 -0
- data/config/routes.rb +8 -7
- data/db/migrate/20260922155524_create_fedipub_approval_stamps.rb +12 -0
- data/db/migrate/20260924090802_add_shared_inbox_url_to_fedipub_actors.rb +5 -0
- data/lib/fedipub/activity_handlers/accept_follow_handler.rb +17 -0
- data/lib/fedipub/activity_handlers/delete_handler.rb +13 -0
- data/lib/fedipub/activity_handlers/follow_handler.rb +13 -0
- data/lib/fedipub/activity_handlers/quote_request_handler.rb +33 -0
- data/lib/fedipub/activity_handlers/undo_delete_handler.rb +15 -0
- data/lib/fedipub/activity_handlers/undo_follow_handler.rb +16 -0
- data/lib/fedipub/concerns/announceable.rb +23 -0
- data/lib/fedipub/concerns/application_actor.rb +30 -0
- data/lib/fedipub/concerns/generic_actor_entity.rb +135 -0
- data/lib/fedipub/concerns/generic_data_entity.rb +112 -0
- data/lib/fedipub/concerns/handles_delete_requests.rb +42 -0
- data/lib/fedipub/concerns/has_interaction_policy.rb +85 -0
- data/lib/fedipub/concerns/likeable.rb +34 -0
- data/lib/fedipub/concerns/quote_request.rb +42 -0
- data/lib/fedipub/data_transformer/note.rb +3 -2
- data/lib/fedipub/errors.rb +10 -0
- data/lib/fedipub/features.rb +13 -0
- data/lib/fedipub/logger.rb +42 -0
- data/lib/fedipub/utils/context.rb +30 -5
- data/lib/fedipub/utils/host.rb +1 -1
- data/lib/fedipub/utils/json_request.rb +63 -17
- data/lib/fedipub/utils/object.rb +1 -1
- data/lib/fedipub/version.rb +1 -1
- data/lib/fedipub.rb +14 -1
- data/lib/fediverse/collection.rb +1 -5
- data/lib/fediverse/inbox.rb +16 -51
- data/lib/fediverse/node_info.rb +2 -5
- data/lib/fediverse/notifier.rb +12 -39
- data/lib/fediverse/signature/draft_cavage12.rb +109 -0
- data/lib/fediverse/signature/rfc9421.rb +69 -0
- data/lib/fediverse/signature.rb +14 -39
- data/lib/fediverse/webfinger.rb +19 -18
- data/lib/generators/fedipub/copy_client_policies/USAGE +1 -1
- data/lib/generators/fedipub/copy_client_policies/copy_client_policies_generator.rb +2 -2
- data/lib/generators/fedipub/copy_client_views/USAGE +1 -1
- data/lib/generators/fedipub/copy_client_views/copy_client_views_generator.rb +2 -2
- data/lib/generators/fedipub/copy_factories/copy_factories_generator.rb +2 -2
- data/lib/generators/fedipub/install/install_generator.rb +3 -3
- metadata +109 -61
- data/app/assets/config/fedipub_manifest.js +0 -1
- data/app/assets/stylesheets/fedipub/application.css +0 -15
- data/app/controllers/concerns/fedipub/server/render_collections.rb +0 -19
- data/app/controllers/fedipub/client/activities_controller.rb +0 -27
- data/app/controllers/fedipub/client/actors_controller.rb +0 -54
- data/app/controllers/fedipub/client/followings_controller.rb +0 -103
- data/app/controllers/fedipub/client_controller.rb +0 -9
- data/app/controllers/fedipub/server/activities_controller.rb +0 -78
- data/app/controllers/fedipub/server/actors_controller.rb +0 -50
- data/app/controllers/fedipub/server/followings_controller.rb +0 -19
- data/app/controllers/fedipub/server/nodeinfo_controller.rb +0 -28
- data/app/controllers/fedipub/server/published_controller.rb +0 -30
- data/app/controllers/fedipub/server/web_finger_controller.rb +0 -45
- data/app/controllers/fedipub/server_controller.rb +0 -37
- data/app/helpers/fedipub/server_helper.rb +0 -18
- data/app/mailers/fedipub/application_mailer.rb +0 -6
- data/app/models/concerns/fedipub/announceable.rb +0 -18
- data/app/models/concerns/fedipub/handles_delete_requests.rb +0 -36
- data/app/models/concerns/fedipub/likeable.rb +0 -29
- data/app/views/fedipub/client/activities/_index.json.jbuilder +0 -1
- data/app/views/fedipub/client/activities/feed.json.jbuilder +0 -1
- data/app/views/fedipub/client/activities/index.json.jbuilder +0 -1
- data/app/views/fedipub/client/actors/index.json.jbuilder +0 -1
- data/app/views/fedipub/client/actors/show.json.jbuilder +0 -1
- data/app/views/fedipub/client/followings/index.json.jbuilder +0 -1
- data/app/views/fedipub/client/followings/show.json.jbuilder +0 -1
- data/app/views/fedipub/server/activities/show.activitypub.jbuilder +0 -1
- data/app/views/fedipub/server/actors/show.activitypub.jbuilder +0 -5
- data/app/views/fedipub/server/followings/show.activitypub.jbuilder +0 -1
- data/app/views/fedipub/server/nodeinfo/index.nodeinfo.jbuilder +0 -6
- data/app/views/fedipub/server/published/_publishable.activitypub.jbuilder +0 -11
- data/app/views/fedipub/server/published/show.activitypub.jbuilder +0 -5
- data/app/views/users/show.html.erb +0 -4
- /data/app/views/fedipub/{client → rails/client}/activities/_activity.html.erb +0 -0
- /data/app/views/fedipub/{client → rails/client}/activities/_activity.json.jbuilder +0 -0
- /data/app/views/fedipub/{client → rails/client}/activities/feed.html.erb +0 -0
- /data/app/views/fedipub/{client → rails/client}/activities/index.html.erb +0 -0
- /data/app/views/fedipub/{client → rails/client}/actors/_lookup_form.html.erb +0 -0
- /data/app/views/fedipub/{client → rails/client}/actors/gone.html.erb +0 -0
- /data/app/views/fedipub/{client → rails/client}/actors/index.html.erb +0 -0
- /data/app/views/fedipub/{client → rails/client}/common/_client_links.html.erb +0 -0
- /data/app/views/fedipub/{client → rails/client}/followings/_follow.html.erb +0 -0
- /data/app/views/fedipub/{client → rails/client}/followings/_follow_actions.html.erb +0 -0
- /data/app/views/fedipub/{client → rails/client}/followings/_follower.html.erb +0 -0
- /data/app/views/fedipub/{client → rails/client}/followings/_following.json.jbuilder +0 -0
- /data/app/views/fedipub/{client → rails/client}/followings/_form.html.erb +0 -0
- /data/app/views/fedipub/{client → rails/client}/followings/index.html.erb +0 -0
- /data/app/views/fedipub/{client → rails/client}/followings/show.html.erb +0 -0
- /data/app/views/fedipub/{server → rails/server}/nodeinfo/show.nodeinfo.jbuilder +0 -0
- /data/app/views/fedipub/{server → rails/server}/web_finger/host_meta.xrd.erb +0 -0
data/lib/fediverse/notifier.rb
CHANGED
|
@@ -9,18 +9,23 @@ module Fediverse
|
|
|
9
9
|
def post_to_inboxes(activity)
|
|
10
10
|
# Get the list of actors we need to send the activity to
|
|
11
11
|
inboxes = inboxes_for(activity)
|
|
12
|
-
|
|
12
|
+
Fedipub.logger.debug('Nobody to notice') && return if inboxes.none?
|
|
13
13
|
|
|
14
14
|
# Deliver to each inbox
|
|
15
15
|
message = payload(activity)
|
|
16
16
|
inboxes.each do |url|
|
|
17
|
-
|
|
17
|
+
Fedipub.logger.debug { "Sending activity ##{activity.id} to inbox at #{url}" }
|
|
18
18
|
post_to_inbox(inbox_url: url, message: message, from: activity.actor)
|
|
19
19
|
end
|
|
20
20
|
end
|
|
21
21
|
|
|
22
22
|
private
|
|
23
23
|
|
|
24
|
+
# Overridden by Fedipub::Moderation for filtering
|
|
25
|
+
def post_to_inbox(inbox_url:, message:, from: nil)
|
|
26
|
+
Fedipub::Utils::JsonRequest.post(url: inbox_url, message: message, from: from)
|
|
27
|
+
end
|
|
28
|
+
|
|
24
29
|
# Determines the list of inboxes that the activity should be delivered to
|
|
25
30
|
#
|
|
26
31
|
# @return [Array<Fedipub::Actor>]
|
|
@@ -29,10 +34,10 @@ module Fediverse
|
|
|
29
34
|
|
|
30
35
|
[activity.to, activity.cc].flatten.compact.reject { |x| x == Fediverse::Collection::PUBLIC }.map do |url|
|
|
31
36
|
actor = Fedipub::Actor.find_or_create_by_federation_url(url)
|
|
32
|
-
|
|
37
|
+
actor.preferred_inbox_url
|
|
33
38
|
rescue ActiveRecord::RecordNotFound, ActiveRecord::RecordInvalid
|
|
34
|
-
collection_to_actors(url).map(&:
|
|
35
|
-
end.flatten.compact
|
|
39
|
+
collection_to_actors(url).map(&:preferred_inbox_url)
|
|
40
|
+
end.flatten.compact.uniq
|
|
36
41
|
end
|
|
37
42
|
|
|
38
43
|
def collection_to_actors(url)
|
|
@@ -47,44 +52,12 @@ module Fediverse
|
|
|
47
52
|
end
|
|
48
53
|
|
|
49
54
|
def payload(activity)
|
|
50
|
-
Fedipub::ServerController.renderer.new.render(
|
|
51
|
-
template: 'fedipub/server/activities/show',
|
|
55
|
+
Fedipub::Rails::ServerController.renderer.new.render(
|
|
56
|
+
template: 'fedipub/rails/server/activities/show',
|
|
52
57
|
assigns: { activity: activity },
|
|
53
58
|
format: :json
|
|
54
59
|
)
|
|
55
60
|
end
|
|
56
|
-
|
|
57
|
-
def post_to_inbox(inbox_url:, message:, from: nil)
|
|
58
|
-
conn = Faraday.default_connection
|
|
59
|
-
conn.builder.build_response(
|
|
60
|
-
conn,
|
|
61
|
-
signed_request(url: inbox_url, message: message, from: from)
|
|
62
|
-
)
|
|
63
|
-
end
|
|
64
|
-
|
|
65
|
-
def signed_request(url:, message:, from:)
|
|
66
|
-
req = request(url: url, message: message)
|
|
67
|
-
req.headers['Signature'] = Fediverse::Signature.sign(sender: from, request: req) if from
|
|
68
|
-
req
|
|
69
|
-
end
|
|
70
|
-
|
|
71
|
-
def request(url:, message:) # rubocop:todo Metrics/AbcSize
|
|
72
|
-
Faraday.default_connection.build_request(:post) do |req|
|
|
73
|
-
req.url url
|
|
74
|
-
req.body = message
|
|
75
|
-
req.headers['Content-Type'] = Mime[:activitypub].to_s
|
|
76
|
-
req.headers['Accept'] = Mime[:activitypub].to_s
|
|
77
|
-
req.headers['Host'] = URI.parse(url).host
|
|
78
|
-
req.headers['Date'] = Time.now.utc.httpdate
|
|
79
|
-
req.headers['Digest'] = digest(message)
|
|
80
|
-
end
|
|
81
|
-
end
|
|
82
|
-
|
|
83
|
-
def digest(message)
|
|
84
|
-
"SHA-256=#{Base64.strict_encode64(
|
|
85
|
-
OpenSSL::Digest.new('SHA256').digest(message)
|
|
86
|
-
)}"
|
|
87
|
-
end
|
|
88
61
|
end
|
|
89
62
|
end
|
|
90
63
|
end
|
|
@@ -0,0 +1,109 @@
|
|
|
1
|
+
require 'fediverse/signature'
|
|
2
|
+
|
|
3
|
+
module Fediverse
|
|
4
|
+
module Signature
|
|
5
|
+
class DraftCavage12
|
|
6
|
+
class << self
|
|
7
|
+
def sign(sender:, request:)
|
|
8
|
+
request = set_headers(request)
|
|
9
|
+
|
|
10
|
+
parts = {
|
|
11
|
+
keyId: sender.key_id,
|
|
12
|
+
headers: signature_headers(request).join(' '),
|
|
13
|
+
signature: signature(sender: sender, request: request),
|
|
14
|
+
}
|
|
15
|
+
request.headers['Signature'] = parts.map { |k, v| "#{k}=\"#{v}\"" }.join(',')
|
|
16
|
+
request
|
|
17
|
+
end
|
|
18
|
+
|
|
19
|
+
def verify!(request:)
|
|
20
|
+
# Do we have a signature to verify?
|
|
21
|
+
return false unless request.headers.key?('Signature')
|
|
22
|
+
|
|
23
|
+
# Have we got what we need?
|
|
24
|
+
components = signature_components(request)
|
|
25
|
+
raise Fedipub::Errors::BadSignature, 'Malformed signature' unless components['signature'] && components['headers']
|
|
26
|
+
|
|
27
|
+
# Find the sender
|
|
28
|
+
sender = find_sender_by_key_id(components['keyId'])
|
|
29
|
+
raise Fedipub::Errors::BadSignature, "Couldn't find sender" unless sender
|
|
30
|
+
|
|
31
|
+
# Build the expected payload
|
|
32
|
+
comparison_string = signature_payload(request: request, headers: components['headers'])
|
|
33
|
+
|
|
34
|
+
# Verify the payload against the signature
|
|
35
|
+
result = do_verification(components['signature'], sender, comparison_string)
|
|
36
|
+
raise Fedipub::Errors::BadSignature unless result
|
|
37
|
+
|
|
38
|
+
result
|
|
39
|
+
end
|
|
40
|
+
|
|
41
|
+
private
|
|
42
|
+
|
|
43
|
+
def do_verification(signature, sender, comparison_string)
|
|
44
|
+
signature = Base64.decode64(signature)
|
|
45
|
+
key = OpenSSL::PKey::RSA.new(sender.public_key)
|
|
46
|
+
key.verify(OpenSSL::Digest.new('SHA256'), signature, comparison_string)
|
|
47
|
+
end
|
|
48
|
+
|
|
49
|
+
def find_sender_by_key_id(key_id)
|
|
50
|
+
return unless key_id
|
|
51
|
+
|
|
52
|
+
Fedipub::Actor.find_or_create_by_federation_url(
|
|
53
|
+
key_id.split('#', 2).first
|
|
54
|
+
)
|
|
55
|
+
end
|
|
56
|
+
|
|
57
|
+
def set_headers(request) # rubocop:disable Naming/AccessorMethodName
|
|
58
|
+
request.headers['Digest'] = digest(request.body) if request.body
|
|
59
|
+
request.headers['Host'] = URI.parse(request.path).host
|
|
60
|
+
request.headers['Date'] = Time.now.utc.httpdate
|
|
61
|
+
request
|
|
62
|
+
end
|
|
63
|
+
|
|
64
|
+
def signature_components(request)
|
|
65
|
+
request.headers['Signature'].split(',').to_h do |pair|
|
|
66
|
+
/\A(?<key>\w+)="(?<value>.*)"\z/ =~ pair
|
|
67
|
+
[key, value]
|
|
68
|
+
end
|
|
69
|
+
end
|
|
70
|
+
|
|
71
|
+
def digest(message)
|
|
72
|
+
"SHA-256=#{Base64.strict_encode64(
|
|
73
|
+
OpenSSL::Digest.new('SHA256').digest(message)
|
|
74
|
+
)}"
|
|
75
|
+
end
|
|
76
|
+
|
|
77
|
+
def signature_payload(request:, headers: signature_headers(request))
|
|
78
|
+
headers = headers.split if headers.is_a?(String)
|
|
79
|
+
headers.map do |header|
|
|
80
|
+
case header
|
|
81
|
+
when '(request-target)'
|
|
82
|
+
"(request-target): #{(request.try(:http_method) || request.try(:method)).downcase} #{URI.parse(request.path).path}"
|
|
83
|
+
else
|
|
84
|
+
"#{header}: #{request.headers[header.capitalize]}"
|
|
85
|
+
end
|
|
86
|
+
end.join("\n")
|
|
87
|
+
end
|
|
88
|
+
|
|
89
|
+
def signature_headers(request)
|
|
90
|
+
if request.body
|
|
91
|
+
%w[(request-target) host date digest]
|
|
92
|
+
else
|
|
93
|
+
%w[(request-target) host date]
|
|
94
|
+
end
|
|
95
|
+
end
|
|
96
|
+
|
|
97
|
+
def signature(sender:, request:)
|
|
98
|
+
private_key = OpenSSL::PKey::RSA.new sender.private_key, ::Rails.application.credentials.secret_key_base
|
|
99
|
+
Base64.strict_encode64(
|
|
100
|
+
private_key.sign(
|
|
101
|
+
OpenSSL::Digest.new('SHA256'),
|
|
102
|
+
signature_payload(request: request)
|
|
103
|
+
)
|
|
104
|
+
)
|
|
105
|
+
end
|
|
106
|
+
end
|
|
107
|
+
end
|
|
108
|
+
end
|
|
109
|
+
end
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
require 'linzer'
|
|
2
|
+
require 'linzer/faraday'
|
|
3
|
+
require 'linzer/rack'
|
|
4
|
+
|
|
5
|
+
Linzer::Message.register_adapter ActionDispatch::Request, Linzer::Message::Adapter::Rack::Request
|
|
6
|
+
|
|
7
|
+
module Fediverse
|
|
8
|
+
module Signature
|
|
9
|
+
class Rfc9421
|
|
10
|
+
class << self
|
|
11
|
+
def sign(sender:, request:)
|
|
12
|
+
request.headers['Content-Digest'] = digest(request.body) if request.body
|
|
13
|
+
Linzer.sign!(
|
|
14
|
+
request,
|
|
15
|
+
key: linzer_private_key(sender),
|
|
16
|
+
components: components(request),
|
|
17
|
+
params: {
|
|
18
|
+
created: Time.now.to_i,
|
|
19
|
+
alg: 'rsa-v1_5-sha256',
|
|
20
|
+
}
|
|
21
|
+
)
|
|
22
|
+
request
|
|
23
|
+
end
|
|
24
|
+
|
|
25
|
+
def verify!(request:)
|
|
26
|
+
# Do we have a signature to verify?
|
|
27
|
+
return false if !request.headers.key?('Signature-Input') || !request.headers.key?('Signature')
|
|
28
|
+
|
|
29
|
+
# Verify the signature
|
|
30
|
+
Linzer.verify!(request) do |key_id|
|
|
31
|
+
sender = Fedipub::Actor.find_or_create_by_federation_url(key_id.split('#', 2).first)
|
|
32
|
+
raise Fedipub::Errors::BadSignature if sender.nil?
|
|
33
|
+
|
|
34
|
+
linzer_public_key(sender)
|
|
35
|
+
end
|
|
36
|
+
rescue Linzer::Error
|
|
37
|
+
raise Fedipub::Errors::BadSignature
|
|
38
|
+
end
|
|
39
|
+
|
|
40
|
+
private
|
|
41
|
+
|
|
42
|
+
# Converts key to right structure for Linzer to use
|
|
43
|
+
def linzer_private_key(sender)
|
|
44
|
+
private_key = OpenSSL::PKey::RSA.new sender.private_key, ::Rails.application.credentials.secret_key_base
|
|
45
|
+
Linzer.new_rsa_v1_5_sha256_key(private_key.to_pem, sender.key_id)
|
|
46
|
+
end
|
|
47
|
+
|
|
48
|
+
def linzer_public_key(sender)
|
|
49
|
+
public_key = OpenSSL::PKey::RSA.new(sender.public_key)
|
|
50
|
+
Linzer.new_rsa_v1_5_sha256_key(public_key.to_pem, sender.key_id)
|
|
51
|
+
end
|
|
52
|
+
|
|
53
|
+
def components(request)
|
|
54
|
+
if request.body
|
|
55
|
+
%w[@method @target-uri content-digest]
|
|
56
|
+
else
|
|
57
|
+
%w[@method @target-uri]
|
|
58
|
+
end
|
|
59
|
+
end
|
|
60
|
+
|
|
61
|
+
def digest(message)
|
|
62
|
+
"sha-256=:#{Base64.strict_encode64(
|
|
63
|
+
OpenSSL::Digest.new('SHA256').digest(message)
|
|
64
|
+
)}:"
|
|
65
|
+
end
|
|
66
|
+
end
|
|
67
|
+
end
|
|
68
|
+
end
|
|
69
|
+
end
|
data/lib/fediverse/signature.rb
CHANGED
|
@@ -1,49 +1,24 @@
|
|
|
1
1
|
module Fediverse
|
|
2
|
-
|
|
2
|
+
module Signature
|
|
3
3
|
class << self
|
|
4
|
-
def sign(sender:, request:)
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
OpenSSL::Digest.new('SHA256'), signature_payload(request: request, headers: headers)
|
|
10
|
-
)
|
|
11
|
-
)
|
|
12
|
-
{
|
|
13
|
-
keyId: sender.key_id,
|
|
14
|
-
headers: headers,
|
|
15
|
-
signature: sig,
|
|
16
|
-
}.map { |k, v| "#{k}=\"#{v}\"" }.join(',')
|
|
17
|
-
end
|
|
18
|
-
|
|
19
|
-
def verify(sender:, request:)
|
|
20
|
-
raise 'Unsigned headers' unless request.headers['Signature']
|
|
21
|
-
|
|
22
|
-
signature_header = request.headers['Signature'].split(',').to_h do |pair|
|
|
23
|
-
/\A(?<key>\w+)="(?<value>.*)"\z/ =~ pair
|
|
24
|
-
[key, value]
|
|
4
|
+
def sign(sender:, request:, legacy_signature: false)
|
|
5
|
+
if legacy_signature
|
|
6
|
+
Fediverse::Signature::DraftCavage12.sign(sender: sender, request: request)
|
|
7
|
+
else
|
|
8
|
+
Fediverse::Signature::Rfc9421.sign(sender: sender, request: request)
|
|
25
9
|
end
|
|
26
|
-
|
|
27
|
-
headers = signature_header['headers']
|
|
28
|
-
signature = Base64.decode64(signature_header['signature'])
|
|
29
|
-
key = OpenSSL::PKey::RSA.new(sender.public_key)
|
|
30
|
-
|
|
31
|
-
comparison_string = signature_payload(request: request, headers: headers)
|
|
32
|
-
|
|
33
|
-
key.verify(OpenSSL::Digest.new('SHA256'), signature, comparison_string)
|
|
34
10
|
end
|
|
35
11
|
|
|
36
|
-
|
|
12
|
+
def verify!(request:, require_signature: false) # rubocop:disable Naming/PredicateMethod
|
|
13
|
+
success = Fediverse::Signature::Rfc9421.verify!(request: request) ||
|
|
14
|
+
Fediverse::Signature::DraftCavage12.verify!(request: request)
|
|
15
|
+
raise(Fedipub::Errors::BadSignature) if require_signature && !success
|
|
37
16
|
|
|
38
|
-
|
|
39
|
-
headers.split.map do |signed_header_name|
|
|
40
|
-
if signed_header_name == '(request-target)'
|
|
41
|
-
"(request-target): #{request.http_method} #{URI.parse(request.path).path}"
|
|
42
|
-
else
|
|
43
|
-
"#{signed_header_name}: #{request.headers[signed_header_name.capitalize]}"
|
|
44
|
-
end
|
|
45
|
-
end.join("\n")
|
|
17
|
+
true
|
|
46
18
|
end
|
|
47
19
|
end
|
|
48
20
|
end
|
|
49
21
|
end
|
|
22
|
+
|
|
23
|
+
require 'fediverse/signature/draft_cavage12'
|
|
24
|
+
require 'fediverse/signature/rfc9421'
|
data/lib/fediverse/webfinger.rb
CHANGED
|
@@ -100,38 +100,39 @@ module Fediverse
|
|
|
100
100
|
# Builds a +Fedipub::Actor+ from a Webfinger response
|
|
101
101
|
# @param data [Hash] Webfinger response
|
|
102
102
|
# @return [Fedipub::Actor]
|
|
103
|
-
def webfinger_to_actor(data) # rubocop:disable Metrics/MethodLength
|
|
103
|
+
def webfinger_to_actor(data) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
|
|
104
104
|
data = data.clone
|
|
105
105
|
id = data.delete('id')
|
|
106
|
-
Fedipub::Actor.new federated_url:
|
|
107
|
-
username:
|
|
108
|
-
actor_type:
|
|
109
|
-
name:
|
|
110
|
-
server:
|
|
111
|
-
inbox_url:
|
|
112
|
-
outbox_url:
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
106
|
+
Fedipub::Actor.new federated_url: id,
|
|
107
|
+
username: data.delete('preferredUsername'),
|
|
108
|
+
actor_type: data.delete('type'),
|
|
109
|
+
name: data.delete('name'),
|
|
110
|
+
server: server_and_port(id),
|
|
111
|
+
inbox_url: data.delete('inbox'),
|
|
112
|
+
outbox_url: data.delete('outbox'),
|
|
113
|
+
shared_inbox_url: data.delete('endpoints')&.dig('sharedInbox'),
|
|
114
|
+
followers_url: data.delete('followers'),
|
|
115
|
+
followings_url: data.delete('following'),
|
|
116
|
+
profile_url: data.delete('url'),
|
|
117
|
+
public_key: data.delete('publicKey')&.dig('publicKeyPem'),
|
|
118
|
+
extensions: data.except('@context')
|
|
118
119
|
end
|
|
119
120
|
|
|
120
121
|
# Makes a simple GET request and returns a +Hash+ from the parsed body
|
|
121
122
|
# @return [Hash]
|
|
122
123
|
# @raise [ActiveRecord::RecordNotFound] when the response is invalid
|
|
123
124
|
def get_json(url, params = {})
|
|
124
|
-
Fedipub::Utils::JsonRequest.get_json(url, params: params,
|
|
125
|
-
rescue Fedipub::
|
|
126
|
-
|
|
125
|
+
Fedipub::Utils::JsonRequest.get_json(url, params: params, headers: { accept: 'application/json' })
|
|
126
|
+
rescue Fedipub::Errors::UnhandledResponseStatus => e
|
|
127
|
+
Fedipub.logger.debug { e.message }
|
|
127
128
|
|
|
128
129
|
raise ActiveRecord::RecordNotFound
|
|
129
130
|
rescue Faraday::ConnectionFailed
|
|
130
|
-
|
|
131
|
+
Fedipub.logger.debug { "Failed to reach server for GET #{url}" }
|
|
131
132
|
|
|
132
133
|
raise ActiveRecord::RecordNotFound
|
|
133
134
|
rescue JSON::ParserError
|
|
134
|
-
|
|
135
|
+
Fedipub.logger.debug { "Invalid JSON response for GET #{url}" }
|
|
135
136
|
|
|
136
137
|
raise ActiveRecord::RecordNotFound
|
|
137
138
|
end
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
module Fedipub
|
|
2
|
-
class CopyClientPoliciesGenerator < Rails::Generators::Base
|
|
2
|
+
class CopyClientPoliciesGenerator < ::Rails::Generators::Base
|
|
3
3
|
source_root File.expand_path('../../../../app/policies/fedipub', __dir__)
|
|
4
4
|
|
|
5
5
|
def copy_policies
|
|
6
|
-
directory 'client', Rails.root.join('app', 'policies', 'fedipub', 'client')
|
|
6
|
+
directory 'client', ::Rails.root.join('app', 'policies', 'fedipub', 'client')
|
|
7
7
|
end
|
|
8
8
|
end
|
|
9
9
|
end
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
module Fedipub
|
|
2
|
-
class CopyClientViewsGenerator < Rails::Generators::Base
|
|
2
|
+
class CopyClientViewsGenerator < ::Rails::Generators::Base
|
|
3
3
|
source_root File.expand_path('../../../../app/views', __dir__)
|
|
4
4
|
|
|
5
5
|
def copy_views
|
|
6
|
-
directory 'fedipub/client', Rails.root.join('app', 'views', 'fedipub', 'client')
|
|
6
|
+
directory 'fedipub/rails/client', ::Rails.root.join('app', 'views', 'fedipub', 'rails', 'client')
|
|
7
7
|
end
|
|
8
8
|
end
|
|
9
9
|
end
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
module Fedipub
|
|
2
|
-
class CopyFactoriesGenerator < Rails::Generators::Base
|
|
2
|
+
class CopyFactoriesGenerator < ::Rails::Generators::Base
|
|
3
3
|
SOURCE_DIRECTORY = File.expand_path('../../../../spec/factories/fedipub', __dir__)
|
|
4
4
|
FACTORY_DEFINITION_REGEX = /(FactoryBot.define do\n\s+factory) :(\w+),/
|
|
5
5
|
|
|
@@ -12,7 +12,7 @@ module Fedipub
|
|
|
12
12
|
end
|
|
13
13
|
|
|
14
14
|
def copy_factories
|
|
15
|
-
dest = Rails.root.join('spec', 'factories')
|
|
15
|
+
dest = ::Rails.root.join('spec', 'factories')
|
|
16
16
|
|
|
17
17
|
Dir.entries(SOURCE_DIRECTORY).each do |node|
|
|
18
18
|
source_path = File.join(SOURCE_DIRECTORY, node)
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
module Fedipub
|
|
2
|
-
class InstallGenerator < Rails::Generators::Base
|
|
2
|
+
class InstallGenerator < ::Rails::Generators::Base
|
|
3
3
|
source_root File.expand_path('templates', __dir__)
|
|
4
4
|
|
|
5
5
|
def copy_files
|
|
6
|
-
copy_file 'fedipub.yml', Rails.root.join('config', 'fedipub.yml')
|
|
7
|
-
copy_file 'fedipub.rb', Rails.root.join('config', 'initializers', 'fedipub.rb')
|
|
6
|
+
copy_file 'fedipub.yml', ::Rails.root.join('config', 'fedipub.yml')
|
|
7
|
+
copy_file 'fedipub.rb', ::Rails.root.join('config', 'initializers', 'fedipub.rb')
|
|
8
8
|
end
|
|
9
9
|
end
|
|
10
10
|
end
|