Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42

4 files changed, 239 insertions, 6 deletions

diff --git a/spec/controllers/groups/dependency_proxies_controller_spec.rb b/spec/controllers/groups/dependency_proxies_controller_spec.rb
new file mode 100644
index 00000000000..35bd7d47aed
--- /dev/null
+++ b/spec/controllers/groups/dependency_proxies_controller_spec.rb
@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Groups::DependencyProxiesController do
+  let(:group) { create(:group) }
+  let(:user)  { create(:user) }
+
+  before do
+    group.add_owner(user)
+    sign_in(user)
+  end
+
+  describe 'GET #show' do
+    context 'feature enabled' do
+      before do
+        enable_dependency_proxy
+      end
+
+      it 'returns 200 and renders the view' do
+        get :show, params: { group_id: group.to_param }
+
+        expect(response).to have_gitlab_http_status(:ok)
+        expect(response).to render_template('groups/dependency_proxies/show')
+      end
+    end
+
+    it 'returns 404 when feature is disabled' do
+      disable_dependency_proxy
+
+      get :show, params: { group_id: group.to_param }
+
+      expect(response).to have_gitlab_http_status(:not_found)
+    end
+  end
+
+  describe 'PUT #update' do
+    context 'feature enabled' do
+      before do
+        enable_dependency_proxy
+      end
+
+      it 'redirects back to show page' do
+        put :update, params: update_params
+
+        expect(response).to have_gitlab_http_status(:found)
+      end
+    end
+
+    it 'returns 404 when feature is disabled' do
+      put :update, params: update_params
+
+      expect(response).to have_gitlab_http_status(:not_found)
+    end
+
+    def update_params
+      {
+        group_id: group.to_param,
+        dependency_proxy_group_setting: { enabled: true }
+      }
+    end
+  end
+
+  def enable_dependency_proxy
+    stub_config(dependency_proxy: { enabled: true })
+
+    group.create_dependency_proxy_setting!(enabled: true)
+  end
+
+  def disable_dependency_proxy
+    group.create_dependency_proxy_setting!(enabled: false)
+  end
+end
diff --git a/spec/controllers/groups/dependency_proxy_for_containers_controller_spec.rb b/spec/controllers/groups/dependency_proxy_for_containers_controller_spec.rb
new file mode 100644
index 00000000000..615b56ff22f
--- /dev/null
+++ b/spec/controllers/groups/dependency_proxy_for_containers_controller_spec.rb
@@ -0,0 +1,161 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Groups::DependencyProxyForContainersController do
+  let(:group) { create(:group) }
+  let(:token_response) { { status: :success, token: 'abcd1234' } }
+
+  shared_examples 'not found when disabled' do
+    context 'feature disabled' do
+      before do
+        disable_dependency_proxy
+      end
+
+      it 'returns 404' do
+        subject
+
+        expect(response).to have_gitlab_http_status(:not_found)
+      end
+    end
+  end
+
+  before do
+    allow(Gitlab.config.dependency_proxy)
+      .to receive(:enabled).and_return(true)
+
+    allow_next_instance_of(DependencyProxy::RequestTokenService) do |instance|
+      allow(instance).to receive(:execute).and_return(token_response)
+    end
+  end
+
+  describe 'GET #manifest' do
+    let(:manifest) { { foo: 'bar' }.to_json }
+    let(:pull_response) { { status: :success, manifest: manifest } }
+
+    before do
+      allow_next_instance_of(DependencyProxy::PullManifestService) do |instance|
+        allow(instance).to receive(:execute).and_return(pull_response)
+      end
+    end
+
+    subject { get_manifest }
+
+    context 'feature enabled' do
+      before do
+        enable_dependency_proxy
+      end
+
+      context 'remote token request fails' do
+        let(:token_response) do
+          {
+            status: :error,
+            http_status: 503,
+            message: 'Service Unavailable'
+          }
+        end
+
+        it 'proxies status from the remote token request' do
+          subject
+
+          expect(response).to have_gitlab_http_status(:service_unavailable)
+          expect(response.body).to eq('Service Unavailable')
+        end
+      end
+
+      context 'remote manifest request fails' do
+        let(:pull_response) do
+          {
+            status: :error,
+            http_status: 400,
+            message: ''
+          }
+        end
+
+        it 'proxies status from the remote manifest request' do
+          subject
+
+          expect(response).to have_gitlab_http_status(:bad_request)
+          expect(response.body).to be_empty
+        end
+      end
+
+      it 'returns 200 with manifest file' do
+        subject
+
+        expect(response).to have_gitlab_http_status(:ok)
+        expect(response.body).to eq(manifest)
+      end
+    end
+
+    it_behaves_like 'not found when disabled'
+
+    def get_manifest
+      get :manifest, params: { group_id: group.to_param, image: 'alpine', tag: '3.9.2' }
+    end
+  end
+
+  describe 'GET #blob' do
+    let(:blob) { create(:dependency_proxy_blob) }
+    let(:blob_sha) { blob.file_name.sub('.gz', '') }
+    let(:blob_response) { { status: :success, blob: blob } }
+
+    before do
+      allow_next_instance_of(DependencyProxy::FindOrCreateBlobService) do |instance|
+        allow(instance).to receive(:execute).and_return(blob_response)
+      end
+    end
+
+    subject { get_blob }
+
+    context 'feature enabled' do
+      before do
+        enable_dependency_proxy
+      end
+
+      context 'remote blob request fails' do
+        let(:blob_response) do
+          {
+            status: :error,
+            http_status: 400,
+            message: ''
+          }
+        end
+
+        it 'proxies status from the remote blob request' do
+          subject
+
+          expect(response).to have_gitlab_http_status(:bad_request)
+          expect(response.body).to be_empty
+        end
+      end
+
+      it 'sends a file' do
+        expect(controller).to receive(:send_file).with(blob.file.path, {})
+
+        subject
+      end
+
+      it 'returns Content-Disposition: attachment' do
+        subject
+
+        expect(response).to have_gitlab_http_status(:ok)
+        expect(response.headers['Content-Disposition']).to match(/^attachment/)
+      end
+    end
+
+    it_behaves_like 'not found when disabled'
+
+    def get_blob
+      get :blob, params: { group_id: group.to_param, image: 'alpine', sha: blob_sha }
+    end
+  end
+
+  def enable_dependency_proxy
+    group.create_dependency_proxy_setting!(enabled: true)
+  end
+
+  def disable_dependency_proxy
+    group.create_dependency_proxy_setting!(enabled: false)
+  end
+end
diff --git a/spec/controllers/groups/registry/repositories_controller_spec.rb b/spec/controllers/groups/registry/repositories_controller_spec.rb
index ae982b02a4f..70125087f30 100644
--- a/spec/controllers/groups/registry/repositories_controller_spec.rb
+++ b/spec/controllers/groups/registry/repositories_controller_spec.rb
@@ -64,12 +64,11 @@ RSpec.describe Groups::Registry::RepositoriesController do
       context 'html format' do
         let(:format) { :html }
 
-        it 'show index page' do
-          expect(Gitlab::Tracking).not_to receive(:event)
-
+        it 'show index page', :snowplow do
           subject
 
           expect(response).to have_gitlab_http_status(:ok)
+          expect_no_snowplow_event
         end
       end
 
diff --git a/spec/controllers/groups/settings/integrations_controller_spec.rb b/spec/controllers/groups/settings/integrations_controller_spec.rb
index cdcdfde175f..beb2ad3afec 100644
--- a/spec/controllers/groups/settings/integrations_controller_spec.rb
+++ b/spec/controllers/groups/settings/integrations_controller_spec.rb
@@ -46,7 +46,7 @@ RSpec.describe Groups::Settings::IntegrationsController do
   describe '#edit' do
     context 'when user is not owner' do
       it 'renders not_found' do
-        get :edit, params: { group_id: group, id: Service.available_services_names.sample }
+        get :edit, params: { group_id: group, id: Service.available_services_names(include_project_specific: false).sample }
 
         expect(response).to have_gitlab_http_status(:not_found)
       end
@@ -61,13 +61,13 @@ RSpec.describe Groups::Settings::IntegrationsController do
         it 'returns not_found' do
           stub_feature_flags(group_level_integrations: false)
 
-          get :edit, params: { group_id: group, id: Service.available_services_names.sample }
+          get :edit, params: { group_id: group, id: Service.available_services_names(include_project_specific: false).sample }
 
           expect(response).to have_gitlab_http_status(:not_found)
         end
       end
 
-      Service.available_services_names.each do |integration_name|
+      Service.available_services_names(include_project_specific: false).each do |integration_name|
         context "#{integration_name}" do
           it 'successfully displays the template' do
             get :edit, params: { group_id: group, id: integration_name }