Merge branch 'investigate-dast-http-request-issue' into 'master'

Cut redundant validate! call from DAST service

See merge request gitlab-org/gitlab!47005

ee/app/services/dast_site_validations/validate_service.rb

@@ -33,8 +33,7 @@ module DastSiteValidations
     end
 
     def make_http_request!
-      uri, _ = Gitlab::UrlBlocker.validate!(dast_site_validation.validation_url)
-      Gitlab::HTTP.get(uri)
+      Gitlab::HTTP.get(dast_site_validation.validation_url)
     end
 
     def token_found?(response)

ee/spec/services/dast_site_validations/validate_service_spec.rb

@@ -40,11 +40,12 @@ RSpec.describe DastSiteValidations::ValidateService do
       end
 
       it 'validates the url before making an http request' do
-        uri = double('uri')
+        uri = URI(dast_site_validation.validation_url)
+        opt = hash_including(allow_local_network: false, allow_localhost: false, dns_rebind_protection: true)
 
         aggregate_failures do
-          expect(Gitlab::UrlBlocker).to receive(:validate!).and_return([uri, nil])
-          expect(Gitlab::HTTP).to receive(:get).with(uri).and_return(double('response', body: token))
+          expect(Gitlab::UrlBlocker).to receive(:validate!).with(uri, opt).and_call_original
+          expect(Gitlab::HTTP).to receive(:get).with(dast_site_validation.validation_url).and_call_original
         end
 
         subject