Merge branch 'revert-7bad7451' into '17-2-stable-ee'

Revert "Merge branch 'security-psk-fix-external-wiki-integration-dos-17-2' into '17-2-stable-ee'"

See merge request https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4454



Merged-by: Mayra Cabrera <mcabrera@gitlab.com>
Approved-by: Mayra Cabrera <mcabrera@gitlab.com>
Co-authored-by: John T Skarbek <jtslear@gmail.com>

app/models/integrations/external_wiki.rb

@@ -41,9 +41,8 @@ def sections
     end
     def execute(_data)
-      response = Gitlab::HTTP.head(properties['external_wiki_url'], verify: true)
-
-      true if response.code == 200
+      response = Gitlab::HTTP.get(properties['external_wiki_url'], verify: true)
+      response.body if response.code == 200
     rescue StandardError
       nil
     end

spec/models/integrations/external_wiki_spec.rb

@@ -34,7 +34,7 @@
     context 'the URL is not reachable' do
       before do
-        WebMock.stub_request(:head, url).to_return(status: 404)
+        WebMock.stub_request(:get, url).to_return(status: 404, body: 'not a page')
       end
       it 'is not successful' do
@@ -44,7 +44,7 @@
     context 'the URL is reachable' do
       before do
-        WebMock.stub_request(:head, url).to_return(status: 200)
+        WebMock.stub_request(:get, url).to_return(status: 200, body: 'foo')
       end
       it 'is successful' do