Skip to content

Add addressable uri parser for activity pub object #191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arte7 merged 6 commits into from
Aug 11, 2026
Merged

Add addressable uri parser for activity pub object #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
46d5dda
add addressable and spec
arte7 Aug 7, 2026
9463af9
add idnx gem
arte7 Aug 7, 2026
826cb2f
fix stub
arte7 Aug 7, 2026
ed16bab
move gems to .gemspec
arte7 Aug 10, 2026
03371b3
add addressable for parsing in sign headers
arte7 Aug 10, 2026
2e84826
add method for parsed_uri
arte7 Aug 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 20 additions & 22 deletions fasp_base/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@ PATH
remote: .
specs:
fasp_base (0.1.0)
addressable
bcrypt
httpx
idnx
linzer (>= 0.7.7)
openssl
rails (>= 8.0.0)
Expand Down Expand Up @@ -106,6 +108,16 @@ GEM
drb (2.2.3)
erb (6.0.1)
erubi (1.13.1)
ffi (1.17.4-aarch64-linux-gnu)
ffi (1.17.4-aarch64-linux-musl)
ffi (1.17.4-arm-linux-gnu)
ffi (1.17.4-arm-linux-musl)
ffi (1.17.4-arm64-darwin)
ffi (1.17.4-x86-linux-gnu)
ffi (1.17.4-x86-linux-musl)
ffi (1.17.4-x86_64-darwin)
ffi (1.17.4-x86_64-linux-gnu)
ffi (1.17.4-x86_64-linux-musl)
forwardable (1.4.0)
globalid (1.3.0)
activesupport (>= 6.1)
Expand All @@ -115,6 +127,8 @@ GEM
http-2 (>= 1.2.0)
i18n (1.14.7)
concurrent-ruby (~> 1.0)
idnx (0.1.1)
ffi (~> 1.12)
io-console (0.8.2)
irb (1.16.0)
pp (>= 0.6.0)
Expand Down Expand Up @@ -144,7 +158,7 @@ GEM
marcel (1.1.0)
mini_mime (1.1.5)
mini_portile2 (2.8.9)
minitest (5.26.0)
minitest (5.27.0)
net-http (0.9.1)
uri (>= 0.11.1)
net-imap (0.5.12)
Expand All @@ -160,22 +174,6 @@ GEM
nokogiri (1.18.10)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.18.10-aarch64-linux-gnu)
racc (~> 1.4)
nokogiri (1.18.10-aarch64-linux-musl)
racc (~> 1.4)
nokogiri (1.18.10-arm-linux-gnu)
racc (~> 1.4)
nokogiri (1.18.10-arm-linux-musl)
racc (~> 1.4)
nokogiri (1.18.10-arm64-darwin)
racc (~> 1.4)
nokogiri (1.18.10-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.18.10-x86_64-linux-gnu)
racc (~> 1.4)
nokogiri (1.18.10-x86_64-linux-musl)
racc (~> 1.4)
openssl (4.0.2)
parallel (1.27.0)
parser (3.3.8.0)
Expand Down Expand Up @@ -244,15 +242,15 @@ GEM
reline (0.6.3)
io-console (~> 0.5)
rexml (3.4.4)
rubocop (1.78.0)
rubocop (1.80.2)
json (~> 2.3)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.1.0)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 2.9.3, < 3.0)
rubocop-ast (>= 1.45.1, < 2.0)
rubocop-ast (>= 1.46.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.46.0)
Expand Down Expand Up @@ -292,9 +290,9 @@ GEM
tsort (0.2.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (3.1.4)
unicode-emoji (~> 4.0, >= 4.0.4)
unicode-emoji (4.0.4)
unicode-display_width (3.2.0)
unicode-emoji (~> 4.1)
unicode-emoji (4.2.0)
uri (1.1.1)
useragent (0.16.11)
webmock (3.26.1)
Expand Down
2 changes: 2 additions & 0 deletions fasp_base/fasp_base.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ Gem::Specification.new do |spec|
spec.add_dependency "httpx"
spec.add_dependency "linzer", ">= 0.7.7"
spec.add_dependency "openssl"
spec.add_dependency "addressable"
spec.add_dependency "idnx"

spec.add_development_dependency "webmock"
end
46 changes: 18 additions & 28 deletions fasp_data_sharing/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@ PATH
remote: ../fasp_base
specs:
fasp_base (0.1.0)
addressable
bcrypt
httpx
idnx
linzer (>= 0.7.7)
openssl
rails (>= 8.0.0)
Expand Down Expand Up @@ -113,6 +115,16 @@ GEM
drb (2.2.3)
erb (5.1.3)
erubi (1.13.1)
ffi (1.17.4-aarch64-linux-gnu)
ffi (1.17.4-aarch64-linux-musl)
ffi (1.17.4-arm-linux-gnu)
ffi (1.17.4-arm-linux-musl)
ffi (1.17.4-arm64-darwin)
ffi (1.17.4-x86-linux-gnu)
ffi (1.17.4-x86-linux-musl)
ffi (1.17.4-x86_64-darwin)
ffi (1.17.4-x86_64-linux-gnu)
ffi (1.17.4-x86_64-linux-musl)
forwardable (1.3.3)
globalid (1.3.0)
activesupport (>= 6.1)
Expand All @@ -122,6 +134,8 @@ GEM
http-2 (>= 1.0.0)
i18n (1.14.7)
concurrent-ruby (~> 1.0)
idnx (0.1.1)
ffi (~> 1.12)
io-console (0.8.1)
irb (1.15.3)
pp (>= 0.6.0)
Expand Down Expand Up @@ -153,7 +167,7 @@ GEM
marcel (1.1.0)
mini_mime (1.1.5)
mini_portile2 (2.8.9)
minitest (5.26.0)
minitest (5.27.0)
net-http (0.6.0)
uri
net-imap (0.5.12)
Expand All @@ -169,22 +183,6 @@ GEM
nokogiri (1.18.10)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.18.10-aarch64-linux-gnu)
racc (~> 1.4)
nokogiri (1.18.10-aarch64-linux-musl)
racc (~> 1.4)
nokogiri (1.18.10-arm-linux-gnu)
racc (~> 1.4)
nokogiri (1.18.10-arm-linux-musl)
racc (~> 1.4)
nokogiri (1.18.10-arm64-darwin)
racc (~> 1.4)
nokogiri (1.18.10-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.18.10-x86_64-linux-gnu)
racc (~> 1.4)
nokogiri (1.18.10-x86_64-linux-musl)
racc (~> 1.4)
openssl (3.3.2)
parallel (1.27.0)
parser (3.3.10.0)
Expand Down Expand Up @@ -283,16 +281,8 @@ GEM
rubocop-rails (>= 2.30)
ruby-progressbar (1.13.0)
securerandom (0.4.1)
sqlite3 (2.7.4-aarch64-linux-gnu)
sqlite3 (2.7.4-aarch64-linux-musl)
sqlite3 (2.7.4-arm-linux-gnu)
sqlite3 (2.7.4-arm-linux-musl)
sqlite3 (2.7.4-arm64-darwin)
sqlite3 (2.7.4-x86-linux-gnu)
sqlite3 (2.7.4-x86-linux-musl)
sqlite3 (2.7.4-x86_64-darwin)
sqlite3 (2.7.4-x86_64-linux-gnu)
sqlite3 (2.7.4-x86_64-linux-musl)
sqlite3 (2.7.4)
mini_portile2 (~> 2.8.0)
starry (0.2.0)
base64
stringio (3.1.7)
Expand All @@ -303,7 +293,7 @@ GEM
concurrent-ruby (~> 1.0)
unicode-display_width (3.2.0)
unicode-emoji (~> 4.1)
unicode-emoji (4.1.0)
unicode-emoji (4.2.0)
uri (1.1.1)
useragent (0.16.11)
webmock (3.26.1)
Expand Down
11 changes: 6 additions & 5 deletions fasp_data_sharing/app/models/fasp_data_sharing/activity_pub_object.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def signature_headers
"accept" => "application/activity+json",
"digest" => "SHA-256=#{EMPTY_DIGEST}",
"date" => Time.now.utc.httpdate,
"host" => URI(uri).host
"host" => parsed_uri.host
}
signature_header = [
"keyId=\"#{keyid}\"",
Expand All @@ -52,11 +52,8 @@ def signature_headers
end

def sign(headers)
parsed_uri = URI(uri)
target = parsed_uri.path
target << "?#{parsed_uri.query}" unless parsed_uri.query.nil?
string = [
"(request-target): get #{target}",
"(request-target): get #{parsed_uri.request_uri}",
Comment thread
oneiros marked this conversation as resolved.
"date: #{headers["date"]}",
"digest: #{headers["digest"]}",
"host: #{headers["host"]}"
Expand All @@ -72,4 +69,8 @@ def keyid
def private_key_pem
@private_key_pem ||= FaspDataSharing::Actor.instance.private_key_pem
end

def parsed_uri
@parsed_uri ||= Addressable::URI.parse(uri)
end
end
19 changes: 19 additions & 0 deletions fasp_data_sharing/test/models/fasp_data_sharing/activity_pub_object_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,24 @@ class ActivityPubObjectTest < ActiveSupport::TestCase
assert_requested(message_signatures_stub)
assert_requested(signatures_stub)
end

test "when URI contains non-ASCII characters it gets parsed and processed successfully" do
uri = "http://www.詹姆斯.com/users/\u4F11\u65E5\u8AB2\u9577"
json_object = {
"@context" => "https://www.w3.org/ns/activitystreams",
"id" => uri
}
activity_pub_object = ActivityPubObject.new(uri: uri)
message_signatures_stub = stub_request(:get, "http://www.xn--8ws00zhy3a.com/users/%E4%BC%91%E6%97%A5%E8%AA%B2%E9%95%B7")
.with { |r| r.headers["Signature-Input"].present? }
.to_return_json(
body: json_object,
headers: { "content-type" => "application/activity+json"
})

returned_json = activity_pub_object.fetch
assert_equal json_object, returned_json
assert_requested(message_signatures_stub)
end
end
end
13 changes: 7 additions & 6 deletions fasp_data_sharing/test/test_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
# Configure Rails Environment
ENV["RAILS_ENV"] = "test"

require "webmock"
require "httpx/adapters/webmock"
require "webmock/minitest"
WebMock.disable_net_connect!(
allow_localhost: true
)

require_relative "../test/dummy/config/environment"
ActiveRecord::Migrator.migrations_paths = [ File.expand_path("../test/dummy/db/migrate", __dir__) ]
ActiveRecord::Migrator.migrations_paths << File.expand_path("../db/migrate", __dir__)
Expand All @@ -14,11 +21,5 @@
ActiveSupport::TestCase.fixtures :all
end

require "webmock"
require "httpx/adapters/webmock"
require "webmock/minitest"
WebMock.disable_net_connect!(
allow_localhost: true
)

Dir[File.expand_path("support/**/*.rb", __dir__)].each { |f| require f }