treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Fix error caused by missing subject in Webfinger response (#18204)

remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
Eugen Rochko 2022-05-01 00:37:46 +02:00 committed by GitHub
parent ad084ce7db
commit 6da648227e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/lib/webfinger.rb
View File

@ -6,8 +6,13 @@ class Webfinger
class RedirectError < StandardError; end class RedirectError < StandardError; end
class Response class Response
def initialize(body) attr_reader :uri
def initialize(uri, body)
@uri = uri
@json = Oj.load(body, mode: :strict) @json = Oj.load(body, mode: :strict)
validate_response!
end end
def subject def subject
@ -23,6 +28,10 @@ class Webfinger
def links def links
@links ||= @json['links'].index_by { |link| link['rel'] } @links ||= @json['links'].index_by { |link| link['rel'] }
end end
def validate_response!
raise Webfinger::Error, "Missing subject in response for #{@uri}" if subject.blank?
end
end end
def initialize(uri) def initialize(uri)
@ -34,7 +43,7 @@ class Webfinger
end end
def perform def perform
Response.new(body_from_webfinger) Response.new(@uri, body_from_webfinger)
rescue Oj::ParseError rescue Oj::ParseError
raise Webfinger::Error, "Invalid JSON in response for #{@uri}" raise Webfinger::Error, "Invalid JSON in response for #{@uri}"
rescue Addressable::URI::InvalidURIError rescue Addressable::URI::InvalidURIError