Cover WellKnown::WebfingerController more (#3385)
This commit is contained in:
		
							parent
							
								
									7b473d7514
								
							
						
					
					
						commit
						fd328cf6e8
					
				
					 1 changed files with 60 additions and 3 deletions
				
			
		|  | @ -4,7 +4,40 @@ describe WellKnown::WebfingerController, type: :controller do | |||
|   render_views | ||||
| 
 | ||||
|   describe 'GET #show' do | ||||
|     let(:alice) { Fabricate(:account, username: 'alice') } | ||||
|     let(:alice) do | ||||
|       Fabricate(:account, username: 'alice') | ||||
|     end | ||||
| 
 | ||||
|     before do | ||||
|       alice.private_key = <<PEM | ||||
| -----BEGIN RSA PRIVATE KEY----- | ||||
| MIICXQIBAAKBgQDHgPoPJlrfMZrVcuF39UbVssa8r4ObLP3dYl9Y17Mgp5K4mSYD | ||||
| R/Y2ag58tSi6ar2zM3Ze3QYsNfTq0NqN1g89eAu0MbSjWqpOsgntRPJiFuj3hai2 | ||||
| X2Im8TBrkiM/UyfTRgn8q8WvMoKbXk8Lu6nqv420eyqhhLxfUoCpxuem1QIDAQAB | ||||
| AoGBAIKsOh2eM7spVI8mdgQKheEG/iEsnPkQ2R8ehfE9JzjmSbXbqghQJDaz9NU+ | ||||
| G3Uu4R31QT0VbCudE9SSA/UPFl82GeQG4QLjrSE+PSjSkuslgSXelJHfAJ+ycGax | ||||
| ajtPyiQD0e4c2loagHNHPjqK9OhHx9mFnZWmoagjlZ+mQGEpAkEA8GtqfS65IaRQ | ||||
| uVhMzpp25rF1RWOwaaa+vBPkd7pGdJEQGFWkaR/a9UkU+2C4ZxGBkJDP9FApKVQI | ||||
| RANEwN3/hwJBANRuw5+es6BgBv4PD387IJvuruW2oUtYP+Lb2Z5k77J13hZTr0db | ||||
| Oo9j1UbbR0/4g+vAcsDl4JD9c/9LrGYEpcMCQBon9Yvs+2M3lziy7JhFoc3zXIjS | ||||
| Ea1M4M9hcqe78lJYPeIH3z04o/+vlcLLgQRlmSz7NESmO/QtGkEcAezhuh0CQHji | ||||
| pzO4LeO/gXslut3eGcpiYuiZquOjToecMBRwv+5AIKd367Che4uJdh6iPcyGURvh | ||||
| IewfZFFdyZqnx20ui90CQQC1W2rK5Y30wAunOtSLVA30TLK/tKrTppMC3corjKlB | ||||
| FTX8IvYBNTbpEttc1VCf/0ccnNpfb0CrFNSPWxRj7t7D | ||||
| -----END RSA PRIVATE KEY----- | ||||
| PEM | ||||
| 
 | ||||
|       alice.public_key = <<PEM | ||||
| -----BEGIN PUBLIC KEY----- | ||||
| MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDHgPoPJlrfMZrVcuF39UbVssa8 | ||||
| r4ObLP3dYl9Y17Mgp5K4mSYDR/Y2ag58tSi6ar2zM3Ze3QYsNfTq0NqN1g89eAu0 | ||||
| MbSjWqpOsgntRPJiFuj3hai2X2Im8TBrkiM/UyfTRgn8q8WvMoKbXk8Lu6nqv420 | ||||
| eyqhhLxfUoCpxuem1QIDAQAB | ||||
| -----END PUBLIC KEY----- | ||||
| PEM | ||||
| 
 | ||||
|       alice.save! | ||||
|     end | ||||
| 
 | ||||
|     around(:each) do |example| | ||||
|       before = Rails.configuration.x.alternate_domains | ||||
|  | @ -12,10 +45,32 @@ describe WellKnown::WebfingerController, type: :controller do | |||
|       Rails.configuration.x.alternate_domains = before | ||||
|     end | ||||
| 
 | ||||
|     it 'returns http success when account can be found' do | ||||
|     it 'returns JSON when account can be found' do | ||||
|       get :show, params: { resource: alice.to_webfinger_s }, format: :json | ||||
| 
 | ||||
|       expect(response).to have_http_status(:success) | ||||
|       expect(response.content_type).to eq 'application/jrd+json' | ||||
|       expect(response.body).to eq "{\"subject\":\"acct:alice@cb6e6126.ngrok.io\",\"aliases\":[\"https://cb6e6126.ngrok.io/@alice\",\"https://cb6e6126.ngrok.io/users/alice\"],\"links\":[{\"rel\":\"http://webfinger.net/rel/profile-page\",\"type\":\"text/html\",\"href\":\"https://cb6e6126.ngrok.io/@alice\"},{\"rel\":\"http://schemas.google.com/g/2010#updates-from\",\"type\":\"application/atom+xml\",\"href\":\"http://test.host/users/alice.atom\"},{\"rel\":\"self\",\"type\":\"application/activity+json\",\"href\":\"https://cb6e6126.ngrok.io/@alice\"},{\"rel\":\"salmon\",\"href\":\"#{api_salmon_url(alice.id)}\"},{\"rel\":\"magic-public-key\",\"href\":\"data:application/magic-public-key,RSA.x4D6DyZa3zGa1XLhd_VG1bLGvK-Dmyz93WJfWNezIKeSuJkmA0f2NmoOfLUoumq9szN2Xt0GLDX06tDajdYPPXgLtDG0o1qqTrIJ7UTyYhbo94Wotl9iJvEwa5IjP1Mn00YJ_KvFrzKCm15PC7up6r-NtHsqoYS8X1KAqcbnptU=.AQAB\"},{\"rel\":\"http://ostatus.org/schema/1.0/subscribe\",\"template\":\"http://test.host/authorize_follow?acct={uri}\"}]}" | ||||
|     end | ||||
| 
 | ||||
|     it 'returns JSON when account can be found' do | ||||
|       get :show, params: { resource: alice.to_webfinger_s }, format: :xml | ||||
| 
 | ||||
|       expect(response).to have_http_status(:success) | ||||
|       expect(response.content_type).to eq 'application/xrd+xml' | ||||
|       expect(response.body).to eq <<"XML" | ||||
| <?xml version="1.0"?> | ||||
| <XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0"> | ||||
|   <Subject>acct:alice@cb6e6126.ngrok.io</Subject> | ||||
|   <Alias>https://cb6e6126.ngrok.io/@alice</Alias> | ||||
|   <Alias>https://cb6e6126.ngrok.io/users/alice</Alias> | ||||
|   <Link rel="http://webfinger.net/rel/profile-page" type="text/html" href="https://cb6e6126.ngrok.io/@alice"/> | ||||
|   <Link rel="http://schemas.google.com/g/2010#updates-from" type="application/atom+xml" href="http://test.host/users/alice.atom"/> | ||||
|   <Link rel="salmon" href="#{api_salmon_url(alice.id)}"/> | ||||
|   <Link rel="magic-public-key" href="data:application/magic-public-key,RSA.x4D6DyZa3zGa1XLhd_VG1bLGvK-Dmyz93WJfWNezIKeSuJkmA0f2NmoOfLUoumq9szN2Xt0GLDX06tDajdYPPXgLtDG0o1qqTrIJ7UTyYhbo94Wotl9iJvEwa5IjP1Mn00YJ_KvFrzKCm15PC7up6r-NtHsqoYS8X1KAqcbnptU=.AQAB"/> | ||||
|   <Link rel="http://ostatus.org/schema/1.0/subscribe" template="http://test.host/authorize_follow?acct={uri}"/> | ||||
| </XRD> | ||||
| XML | ||||
|     end | ||||
| 
 | ||||
|     it 'returns http not found when account cannot be found' do | ||||
|  | @ -24,13 +79,15 @@ describe WellKnown::WebfingerController, type: :controller do | |||
|       expect(response).to have_http_status(:not_found) | ||||
|     end | ||||
| 
 | ||||
|     it 'returns http success when account can be found with alternate domains' do | ||||
|     it 'returns JSON when account can be found with alternate domains' do | ||||
|       Rails.configuration.x.alternate_domains = ["foo.org"] | ||||
|       username, domain = alice.to_webfinger_s.split("@") | ||||
| 
 | ||||
|       get :show, params: { resource: "#{username}@foo.org" }, format: :json | ||||
| 
 | ||||
|       expect(response).to have_http_status(:success) | ||||
|       expect(response.content_type).to eq 'application/jrd+json' | ||||
|       expect(response.body).to eq "{\"subject\":\"acct:alice@cb6e6126.ngrok.io\",\"aliases\":[\"https://cb6e6126.ngrok.io/@alice\",\"https://cb6e6126.ngrok.io/users/alice\"],\"links\":[{\"rel\":\"http://webfinger.net/rel/profile-page\",\"type\":\"text/html\",\"href\":\"https://cb6e6126.ngrok.io/@alice\"},{\"rel\":\"http://schemas.google.com/g/2010#updates-from\",\"type\":\"application/atom+xml\",\"href\":\"http://test.host/users/alice.atom\"},{\"rel\":\"self\",\"type\":\"application/activity+json\",\"href\":\"https://cb6e6126.ngrok.io/@alice\"},{\"rel\":\"salmon\",\"href\":\"#{api_salmon_url(alice.id)}\"},{\"rel\":\"magic-public-key\",\"href\":\"data:application/magic-public-key,RSA.x4D6DyZa3zGa1XLhd_VG1bLGvK-Dmyz93WJfWNezIKeSuJkmA0f2NmoOfLUoumq9szN2Xt0GLDX06tDajdYPPXgLtDG0o1qqTrIJ7UTyYhbo94Wotl9iJvEwa5IjP1Mn00YJ_KvFrzKCm15PC7up6r-NtHsqoYS8X1KAqcbnptU=.AQAB\"},{\"rel\":\"http://ostatus.org/schema/1.0/subscribe\",\"template\":\"http://test.host/authorize_follow?acct={uri}\"}]}" | ||||
|     end | ||||
| 
 | ||||
|     it 'returns http not found when account can not be found with alternate domains' do | ||||
|  |  | |||
		Reference in a new issue