diff options
| -rw-r--r-- | app/views/well_known/host_meta/show.xml.ruby | 16 | ||||
| -rw-r--r-- | app/views/well_known/webfinger/show.xml.ruby | 57 | ||||
| -rw-r--r-- | spec/controllers/well_known/host_meta_controller_spec.rb | 2 |
3 files changed, 57 insertions, 18 deletions
diff --git a/app/views/well_known/host_meta/show.xml.ruby b/app/views/well_known/host_meta/show.xml.ruby index 07d026471..0a6bdc322 100644 --- a/app/views/well_known/host_meta/show.xml.ruby +++ b/app/views/well_known/host_meta/show.xml.ruby @@ -1,5 +1,13 @@ -Nokogiri::XML::Builder.new do |xml| - xml.XRD(xmlns: 'http://docs.oasis-open.org/ns/xri/xrd-1.0') do - xml.Link(rel: 'lrdd', type: 'application/xrd+xml', template: @webfinger_template) +doc = Ox::Document.new(version: '1.0') + +doc << Ox::Element.new('XRD').tap do |xrd| + xrd['xmlns'] = 'http://docs.oasis-open.org/ns/xri/xrd-1.0' + + xrd << Ox::Element.new('Link').tap do |link| + link['rel'] = 'lrdd' + link['type'] = 'application/xrd+xml' + link['template'] = @webfinger_template end -end.to_xml +end + +('<?xml version="1.0" encoding="UTF-8"?>' + Ox.dump(doc, effort: :tolerant)).force_encoding('UTF-8') diff --git a/app/views/well_known/webfinger/show.xml.ruby b/app/views/well_known/webfinger/show.xml.ruby index 0c7289d6a..4352a24e9 100644 --- a/app/views/well_known/webfinger/show.xml.ruby +++ b/app/views/well_known/webfinger/show.xml.ruby @@ -1,13 +1,44 @@ -Nokogiri::XML::Builder.new do |xml| - xml.XRD(xmlns: 'http://docs.oasis-open.org/ns/xri/xrd-1.0') do - xml.Subject @account.to_webfinger_s - xml.Alias short_account_url(@account) - xml.Alias account_url(@account) - xml.Link(rel: 'http://webfinger.net/rel/profile-page', type: 'text/html', href: short_account_url(@account)) - xml.Link(rel: 'http://schemas.google.com/g/2010#updates-from', type: 'application/atom+xml', href: account_url(@account, format: 'atom')) - xml.Link(rel: 'self', type: 'application/activity+json', href: account_url(@account)) - xml.Link(rel: 'salmon', href: api_salmon_url(@account.id)) - xml.Link(rel: 'magic-public-key', href: "data:application/magic-public-key,#{@account.magic_key}") - xml.Link(rel: 'http://ostatus.org/schema/1.0/subscribe', template: "#{authorize_follow_url}?acct={uri}") - end -end.to_xml +doc = Ox::Document.new(version: '1.0') + +doc << Ox::Element.new('XRD').tap do |xrd| + xrd['xmlns'] = 'http://docs.oasis-open.org/ns/xri/xrd-1.0' + + xrd << (Ox::Element.new('Subject') << @account.to_webfinger_s) + xrd << (Ox::Element.new('Alias') << short_account_url(@account)) + xrd << (Ox::Element.new('Alias') << account_url(@account)) + + xrd << Ox::Element.new('Link').tap do |link| + link['rel'] = 'http://webfinger.net/rel/profile-page' + link['type'] = 'text/html' + link['href'] = short_account_url(@account) + end + + xrd << Ox::Element.new('Link').tap do |link| + link['rel'] = 'http://schemas.google.com/g/2010#updates-from' + link['type'] = 'application/atom+xml' + link['href'] = account_url(@account, format: 'atom') + end + + xrd << Ox::Element.new('Link').tap do |link| + link['rel'] = 'self' + link['type'] = 'application/activity+json' + link['href'] = account_url(@account) + end + + xrd << Ox::Element.new('Link').tap do |link| + link['rel'] = 'salmon' + link['href'] = api_salmon_url(@account.id) + end + + xrd << Ox::Element.new('Link').tap do |link| + link['rel'] = 'magic-public-key' + link['href'] = "data:application/magic-public-key,#{@account.magic_key}" + end + + xrd << Ox::Element.new('Link').tap do |link| + link['rel'] = 'http://ostatus.org/schema/1.0/subscribe' + link['template'] = "#{authorize_follow_url}?acct={uri}" + end +end + +('<?xml version="1.0" encoding="UTF-8"?>' + Ox.dump(doc, effort: :tolerant)).force_encoding('UTF-8') diff --git a/spec/controllers/well_known/host_meta_controller_spec.rb b/spec/controllers/well_known/host_meta_controller_spec.rb index 8147e8f61..b43ae19d8 100644 --- a/spec/controllers/well_known/host_meta_controller_spec.rb +++ b/spec/controllers/well_known/host_meta_controller_spec.rb @@ -10,7 +10,7 @@ describe WellKnown::HostMetaController, type: :controller do expect(response).to have_http_status(200) expect(response.content_type).to eq 'application/xrd+xml' expect(response.body).to eq <<XML -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0"> <Link rel="lrdd" type="application/xrd+xml" template="https://cb6e6126.ngrok.io/.well-known/webfinger?resource={uri}"/> </XRD> |