about summary refs log tree commit diff
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-07-10 17:10:43 +0200
committerEugen Rochko <eugen@zeonfederated.com>2019-07-10 17:10:43 +0200
commitd04c584159fdad36d7713718c4ba0b3b42cd27a9 (patch)
treefda661d3dbb070da986f1385b0d30df97cc30b82
parent85eb418e1f9ae40ce5fbdc837a354444eec94655 (diff)
Drop magic-public-key from webfinger replies as it's only used for OStatus (#11280)
-rw-r--r--app/serializers/webfinger_serializer.rb1
-rw-r--r--app/views/well_known/webfinger/show.xml.ruby5
2 files changed, 0 insertions, 6 deletions
diff --git a/app/serializers/webfinger_serializer.rb b/app/serializers/webfinger_serializer.rb
index 4220f697e..f4af21551 100644
--- a/app/serializers/webfinger_serializer.rb
+++ b/app/serializers/webfinger_serializer.rb
@@ -18,7 +18,6 @@ class WebfingerSerializer < ActiveModel::Serializer
       { rel: 'http://webfinger.net/rel/profile-page', type: 'text/html', href: short_account_url(object) },
       { rel: 'http://schemas.google.com/g/2010#updates-from', type: 'application/atom+xml', href: account_url(object, format: 'atom') },
       { rel: 'self', type: 'application/activity+json', href: account_url(object) },
-      { rel: 'magic-public-key', href: "data:application/magic-public-key,#{object.magic_key}" },
       { rel: 'http://ostatus.org/schema/1.0/subscribe', template: "#{authorize_interaction_url}?uri={uri}" },
     ]
   end
diff --git a/app/views/well_known/webfinger/show.xml.ruby b/app/views/well_known/webfinger/show.xml.ruby
index c82cdb7b3..ae80df9d2 100644
--- a/app/views/well_known/webfinger/show.xml.ruby
+++ b/app/views/well_known/webfinger/show.xml.ruby
@@ -26,11 +26,6 @@ doc << Ox::Element.new('XRD').tap do |xrd|
   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_interaction_url}?acct={uri}"
   end