forked from cybrespace/mastodon
Remove XML version of Webfinger and remove links to Atom feeds (#11460)
Fix #11453
This commit is contained in:
parent
706a48ee1f
commit
8b9d0a0533
|
@ -9,17 +9,8 @@ module WellKnown
|
||||||
def show
|
def show
|
||||||
@account = Account.find_local!(username_from_resource)
|
@account = Account.find_local!(username_from_resource)
|
||||||
|
|
||||||
respond_to do |format|
|
|
||||||
format.any(:json, :html) do
|
|
||||||
render json: @account, serializer: WebfingerSerializer, content_type: 'application/jrd+json'
|
|
||||||
end
|
|
||||||
|
|
||||||
format.xml do
|
|
||||||
render content_type: 'application/xrd+xml'
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
expires_in 3.days, public: true
|
expires_in 3.days, public: true
|
||||||
|
render json: @account, serializer: WebfingerSerializer, content_type: 'application/jrd+json'
|
||||||
rescue ActiveRecord::RecordNotFound
|
rescue ActiveRecord::RecordNotFound
|
||||||
head 404
|
head 404
|
||||||
end
|
end
|
||||||
|
|
|
@ -26,7 +26,6 @@ class WebfingerSerializer < ActiveModel::Serializer
|
||||||
else
|
else
|
||||||
[
|
[
|
||||||
{ rel: 'http://webfinger.net/rel/profile-page', type: 'text/html', href: short_account_url(object) },
|
{ 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: 'self', type: 'application/activity+json', href: account_url(object) },
|
||||||
{ rel: 'http://ostatus.org/schema/1.0/subscribe', template: "#{authorize_interaction_url}?uri={uri}" },
|
{ rel: 'http://ostatus.org/schema/1.0/subscribe', template: "#{authorize_interaction_url}?uri={uri}" },
|
||||||
]
|
]
|
||||||
|
|
|
@ -7,7 +7,6 @@
|
||||||
- if @account.user&.setting_noindex
|
- if @account.user&.setting_noindex
|
||||||
%meta{ name: 'robots', content: 'noindex, noarchive' }/
|
%meta{ name: 'robots', content: 'noindex, noarchive' }/
|
||||||
|
|
||||||
%link{ rel: 'alternate', type: 'application/atom+xml', href: account_url(@account, format: 'atom') }/
|
|
||||||
%link{ rel: 'alternate', type: 'application/rss+xml', href: account_url(@account, format: 'rss') }/
|
%link{ rel: 'alternate', type: 'application/rss+xml', href: account_url(@account, format: 'rss') }/
|
||||||
%link{ rel: 'alternate', type: 'application/activity+json', href: ActivityPub::TagManager.instance.uri_for(@account) }/
|
%link{ rel: 'alternate', type: 'application/activity+json', href: ActivityPub::TagManager.instance.uri_for(@account) }/
|
||||||
|
|
||||||
|
|
|
@ -1,51 +0,0 @@
|
||||||
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)
|
|
||||||
|
|
||||||
if @account.instance_actor?
|
|
||||||
xrd << (Ox::Element.new('Alias') << instance_actor_url)
|
|
||||||
|
|
||||||
xrd << Ox::Element.new('Link').tap do |link|
|
|
||||||
link['rel'] = 'http://webfinger.net/rel/profile-page'
|
|
||||||
link['type'] = 'text/html'
|
|
||||||
link['href'] = about_more_url(instance_actor: true)
|
|
||||||
end
|
|
||||||
|
|
||||||
xrd << Ox::Element.new('Link').tap do |link|
|
|
||||||
link['rel'] = 'self'
|
|
||||||
link['type'] = 'application/activity+json'
|
|
||||||
link['href'] = instance_actor_url
|
|
||||||
end
|
|
||||||
else
|
|
||||||
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'] = 'http://ostatus.org/schema/1.0/subscribe'
|
|
||||||
link['template'] = "#{authorize_interaction_url}?acct={uri}"
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
('<?xml version="1.0" encoding="UTF-8"?>' + Ox.dump(doc, effort: :tolerant)).force_encoding('UTF-8')
|
|
|
@ -56,17 +56,6 @@ PEM
|
||||||
expect(json[:aliases]).to include('https://cb6e6126.ngrok.io/@alice', 'https://cb6e6126.ngrok.io/users/alice')
|
expect(json[:aliases]).to include('https://cb6e6126.ngrok.io/@alice', 'https://cb6e6126.ngrok.io/users/alice')
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns JSON when account can be found' do
|
|
||||||
get :show, params: { resource: alice.to_webfinger_s }, format: :xml
|
|
||||||
|
|
||||||
xml = Nokogiri::XML(response.body)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(200)
|
|
||||||
expect(response.content_type).to eq 'application/xrd+xml'
|
|
||||||
expect(xml.at_xpath('//xmlns:Subject').content).to eq 'acct:alice@cb6e6126.ngrok.io'
|
|
||||||
expect(xml.xpath('//xmlns:Alias').map(&:content)).to include('https://cb6e6126.ngrok.io/@alice', 'https://cb6e6126.ngrok.io/users/alice')
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns http not found when account cannot be found' do
|
it 'returns http not found when account cannot be found' do
|
||||||
get :show, params: { resource: 'acct:not@existing.com' }, format: :json
|
get :show, params: { resource: 'acct:not@existing.com' }, format: :json
|
||||||
|
|
||||||
|
|
|
@ -12,23 +12,6 @@ describe 'The webfinger route' do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'asking for xml format' do
|
|
||||||
it 'returns an xml response for xml format' do
|
|
||||||
get webfinger_url(resource: alice.to_webfinger_s, format: :xml)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(200)
|
|
||||||
expect(response.content_type).to eq 'application/xrd+xml'
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns an xml response for xml accept header' do
|
|
||||||
headers = { 'HTTP_ACCEPT' => 'application/xrd+xml' }
|
|
||||||
get webfinger_url(resource: alice.to_webfinger_s), headers: headers
|
|
||||||
|
|
||||||
expect(response).to have_http_status(200)
|
|
||||||
expect(response.content_type).to eq 'application/xrd+xml'
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe 'asking for json format' do
|
describe 'asking for json format' do
|
||||||
it 'returns a json response for json format' do
|
it 'returns a json response for json format' do
|
||||||
get webfinger_url(resource: alice.to_webfinger_s, format: :json)
|
get webfinger_url(resource: alice.to_webfinger_s, format: :json)
|
||||||
|
|
Loading…
Reference in New Issue