Serialize webfinger XML with Ox instead of Nokogiri (#7319)

25ms -> 0.5ms

app/views/well_known/host_meta/show.xml.ruby

@@ -1,5 +1,13 @@
-Nokogiri::XML::Builder.new do |xml|
+doc = Ox::Document.new(version: '1.0')
-  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::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')

app/views/well_known/webfinger/show.xml.ruby

@@ -1,13 +1,44 @@
-Nokogiri::XML::Builder.new do |xml|
+doc = Ox::Document.new(version: '1.0')
-  xml.XRD(xmlns: 'http://docs.oasis-open.org/ns/xri/xrd-1.0') do
+
-    xml.Subject @account.to_webfinger_s
+doc << Ox::Element.new('XRD').tap do |xrd|
-    xml.Alias short_account_url(@account)
+  xrd['xmlns'] = 'http://docs.oasis-open.org/ns/xri/xrd-1.0'
-    xml.Alias account_url(@account)
+
-    xml.Link(rel: 'http://webfinger.net/rel/profile-page', type: 'text/html', href: short_account_url(@account))
+  xrd << (Ox::Element.new('Subject') << @account.to_webfinger_s)
-    xml.Link(rel: 'http://schemas.google.com/g/2010#updates-from', type: 'application/atom+xml', href: account_url(@account, format: 'atom'))
+  xrd << (Ox::Element.new('Alias') << short_account_url(@account))
-    xml.Link(rel: 'self', type: 'application/activity+json', href: account_url(@account))
+  xrd << (Ox::Element.new('Alias') << 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}")
+  xrd << Ox::Element.new('Link').tap do |link|
-    xml.Link(rel: 'http://ostatus.org/schema/1.0/subscribe', template: "#{authorize_follow_url}?acct={uri}")
+    link['rel']      = 'http://webfinger.net/rel/profile-page'
-  end
+    link['type']     = 'text/html'
-end.to_xml
+    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')

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>