Add integration specs for EE version. Raise an error when htto request fails.

ee/lib/gitlab/ci/trace/http_io.rb

@@ -7,6 +7,7 @@ module Gitlab
       class HttpIO
         BUFFER_SIZE = 128.kilobytes
 
+        InvalidURLError = Class.new(StandardError)
         FailedToGetChunkError = Class.new(StandardError)
 
         attr_reader :uri, :size
@@ -16,6 +17,8 @@ module Gitlab
         alias_method :pos, :tell
 
         def initialize(url, size)
+          raise InvalidURLError unless ::Gitlab::UrlSanitizer.valid?(url)
+
           @uri = URI(url)
           @size = size
           @tell = 0
@@ -82,8 +85,6 @@ module Gitlab
           out = out[0, length] if length && out.length > length
 
           out
-        rescue FailedToGetChunkError
-          nil
         end
 
         def readline
@@ -104,8 +105,6 @@ module Gitlab
           end
 
           out
-        rescue FailedToGetChunkError
-          nil
         end
 
         def write(data)

spec/ee/spec/controllers/ee/projects/jobs_controller_spec.rb

@@ -2,10 +2,55 @@ require 'spec_helper'
 
 describe Projects::JobsController do
   include ApiHelpers
+  include HttpIOHelpers
 
   let(:project) { create(:project, :public) }
   let(:pipeline) { create(:ci_pipeline, project: project) }
 
+  describe 'GET trace.json' do
+    context 'when trace artifact is in ObjectStorage' do
+      let!(:job) { create(:ci_build, :success, :trace_artifact, pipeline: pipeline) }
+
+      before do
+        allow_any_instance_of(JobArtifactUploader).to receive(:file_storage?) { false }
+        allow_any_instance_of(JobArtifactUploader).to receive(:url) { remote_trace_url }
+        allow_any_instance_of(JobArtifactUploader).to receive(:size) { remote_trace_size }
+      end
+
+      context 'when there are no network issues' do
+        before do
+          stub_remote_trace_ok
+
+          get_trace
+        end
+
+        it 'returns a trace' do
+          expect(response).to have_gitlab_http_status(:ok)
+          expect(json_response['id']).to eq job.id
+          expect(json_response['status']).to eq job.status
+          expect(json_response['html']).to eq(job.trace.html)
+        end
+      end
+
+      context 'when there is a network issue' do
+        before do
+          stub_remote_trace_ng
+        end
+
+        it 'returns a trace' do
+          expect { get_trace }.to raise_error(Gitlab::Ci::Trace::HttpIO::FailedToGetChunkError)
+        end
+      end
+    end
+
+    def get_trace
+      get :trace, namespace_id: project.namespace,
+                  project_id: project,
+                  id: job.id,
+                  format: :json
+    end
+  end
+
   describe 'GET raw' do
     subject do
       post :raw, namespace_id: project.namespace,

spec/requests/api/jobs_spec.rb

 require 'spec_helper'
 
 describe API::Jobs do
+  include HttpIOHelpers
+
   set(:project) do
     create(:project, :repository, public_builds: false)
   end
@@ -451,6 +453,22 @@ describe API::Jobs do
     end
 
     context 'authorized user' do
+      context 'when trace is in ObjectStorage' do
+        let!(:job) { create(:ci_build, :trace_artifact, pipeline: pipeline) }
+
+        before do
+          stub_remote_trace_ok
+          allow_any_instance_of(JobArtifactUploader).to receive(:file_storage?) { false }
+          allow_any_instance_of(JobArtifactUploader).to receive(:url) { remote_trace_url }
+          allow_any_instance_of(JobArtifactUploader).to receive(:size) { remote_trace_size }
+        end
+
+        it 'returns specific job trace' do
+          expect(response).to have_gitlab_http_status(200)
+          expect(response.body).to eq(job.trace.raw)
+        end
+      end
+
       context 'when trace is artifact' do
         let(:job) { create(:ci_build, :trace_artifact, pipeline: pipeline) }