From 4f795ed823776912e8e9d6d4eb33c345ad2b56b9 Mon Sep 17 00:00:00 2001
From: Mark Chao <mchao@gitlab.com>
Date: Wed, 4 Jul 2018 17:52:58 +0800
Subject: Backport from EE !5954

Allow Labels::FindOrCreateService to find ancestor group labels
Add authentication check on API endpoint
Update flayignore
---
 .flayignore                                         |  9 +++++++++
 app/services/labels/find_or_create_service.rb       |  8 +++++++-
 lib/api/boards.rb                                   |  1 +
 spec/services/labels/find_or_create_service_spec.rb | 20 ++++++++++++++++++++
 4 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/.flayignore b/.flayignore
index 3e5063674ff..4b6f7ba693a 100644
--- a/.flayignore
+++ b/.flayignore
@@ -1,11 +1,18 @@
 *.erb
 lib/gitlab/sanitizers/svg/whitelist.rb
 lib/gitlab/diff/position_tracer.rb
+app/controllers/projects/approver_groups_controller.rb
+app/controllers/projects/approvers_controller.rb
+app/controllers/projects/protected_branches/merge_access_levels_controller.rb
+app/controllers/projects/protected_branches/push_access_levels_controller.rb
+app/controllers/projects/protected_tags/create_access_levels_controller.rb
 app/policies/project_policy.rb
 app/models/concerns/relative_positioning.rb
 app/workers/stuck_merge_jobs_worker.rb
 lib/gitlab/redis/*.rb
 lib/gitlab/gitaly_client/operation_service.rb
+app/models/project_services/packagist_service.rb
+lib/gitlab/background_migration/normalize_ldap_extern_uids_range.rb
 lib/gitlab/background_migration/*
 app/models/project_services/kubernetes_service.rb
 lib/gitlab/workhorse.rb
@@ -19,6 +26,8 @@ ee/db/**/*
 ee/app/serializers/ee/merge_request_widget_entity.rb
 ee/lib/api/epics.rb
 ee/lib/api/geo_nodes.rb
+ee/lib/ee/api/group_boards.rb
+ee/lib/ee/api/boards.rb
 ee/lib/ee/gitlab/ldap/sync/admin_users.rb
 ee/app/workers/geo/file_download_dispatch_worker/job_artifact_job_finder.rb
 ee/app/workers/geo/file_download_dispatch_worker/lfs_object_job_finder.rb
diff --git a/app/services/labels/find_or_create_service.rb b/app/services/labels/find_or_create_service.rb
index 079f611b3f3..a72da3c637f 100644
--- a/app/services/labels/find_or_create_service.rb
+++ b/app/services/labels/find_or_create_service.rb
@@ -20,6 +20,7 @@ module Labels
       @available_labels ||= LabelsFinder.new(
         current_user,
         "#{parent_type}_id".to_sym => parent.id,
+        include_ancestor_groups: include_ancestor_groups?,
         only_group_labels: parent_is_group?
       ).execute(skip_authorization: skip_authorization)
     end
@@ -30,7 +31,8 @@ module Labels
       new_label = available_labels.find_by(title: title)
 
       if new_label.nil? && (skip_authorization || Ability.allowed?(current_user, :admin_label, parent))
-        new_label = Labels::CreateService.new(params).execute(parent_type.to_sym => parent)
+        create_params = params.except(:include_ancestor_groups)
+        new_label = Labels::CreateService.new(create_params).execute(parent_type.to_sym => parent)
       end
 
       new_label
@@ -47,5 +49,9 @@ module Labels
     def parent_is_group?
       parent_type == "group"
     end
+
+    def include_ancestor_groups?
+      params[:include_ancestor_groups] == true
+    end
   end
 end
diff --git a/lib/api/boards.rb b/lib/api/boards.rb
index 6c706b2b4e1..086d39d5070 100644
--- a/lib/api/boards.rb
+++ b/lib/api/boards.rb
@@ -33,6 +33,7 @@ module API
           success Entities::Board
         end
         get '/:board_id' do
+          authorize!(:read_board, user_project)
           present board, with: Entities::Board
         end
       end
diff --git a/spec/services/labels/find_or_create_service_spec.rb b/spec/services/labels/find_or_create_service_spec.rb
index 68d5660445a..97ba2742392 100644
--- a/spec/services/labels/find_or_create_service_spec.rb
+++ b/spec/services/labels/find_or_create_service_spec.rb
@@ -44,6 +44,26 @@ describe Labels::FindOrCreateService do
             expect(service.execute).to eq project_label
           end
         end
+
+        context 'when include_ancestor_groups is true' do
+          let(:group)   { create(:group, :nested) }
+          let(:params) do
+            {
+              title: 'Audit',
+              include_ancestor_groups: true
+            }
+          end
+
+          it 'returns the ancestor group labels' do
+            group_label = create(:group_label, group: group.parent, title: 'Audit')
+
+            expect(service.execute).to eq group_label
+          end
+
+          it 'creates new labels if labels are not found' do
+            expect { service.execute }.to change(project.labels, :count).by(1)
+          end
+        end
       end
 
       context 'when finding labels on group level' do
-- 
cgit v1.2.1