Extract ProtectedRef Concern

4 files changed, 51 insertions, 62 deletions

diff --git a/app/models/concerns/protected_ref.rb b/app/models/concerns/protected_ref.rb
new file mode 100644
index 00000000000..77d7b597534
--- /dev/null
+++ b/app/models/concerns/protected_ref.rb
@@ -0,0 +1,47 @@
+module ProtectedRef
+  extend ActiveSupport::Concern
+
+  included do
+    belongs_to :project
+    validates :name, presence: true
+    validates :project, presence: true
+
+    def self.matching_refs_accesible_to(ref, user, action: :push)
+      access_levels_for_ref(ref, action).any? do |access_level|
+        access_level.check_access(user)
+      end
+    end
+
+    def self.access_levels_for_ref(ref, action: :push)
+      self.matching(ref).map(&:"@#{action}_access_levels").flatten
+    end
+
+    private
+
+    def self.matching(ref_name, protected_refs: nil)
+      ProtectedRefMatcher.matching(self, ref_name, protected_refs: protected_refs)
+    end
+  end
+
+  def commit
+    project.commit(self.name)
+  end
+
+  def matching(refs)
+    ref_matcher.matching(refs)
+  end
+
+  def matches?(refs)
+    ref_matcher.matches?(refs)
+  end
+
+  def wildcard?
+    ref_matcher.wildcard?
+  end
+
+  private
+
+  def ref_matcher
+    @ref_matcher ||= ProtectedRefMatcher.new(self)
+  end
+end
diff --git a/app/models/project.rb b/app/models/project.rb
index 7681da36335..970de324a5b 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -898,14 +898,14 @@ class Project < ActiveRecord::Base
     return true if empty_repo? && default_branch_protected?
 
     @protected_branches ||= self.protected_branches.to_a
-    ProtectedBranch.matching(branch_name, protected_branches: @protected_branches).present?
+    ProtectedBranch.matching(branch_name, protected_refs: @protected_branches).present?
   end
 
   #TODO: Move elsewhere
   def protected_tag?(tag_name)
     #TODO: Check if memoization necessary, find way to have it work elsewhere
     @protected_tags ||= self.protected_tags.to_a
-    ProtectedTag.matching(tag_name, protected_tags: @protected_tags).present?
+    ProtectedTag.matching(tag_name, protected_refs: @protected_tags).present?
   end
 
   def user_can_push_to_empty_repo?(user)
diff --git a/app/models/protected_branch.rb b/app/models/protected_branch.rb
index 7681d5b5112..a0dbcf80c3d 100644
--- a/app/models/protected_branch.rb
+++ b/app/models/protected_branch.rb
@@ -1,9 +1,6 @@
 class ProtectedBranch < ActiveRecord::Base
   include Gitlab::ShellAdapter
-
-  belongs_to :project
-  validates :name, presence: true
-  validates :project, presence: true
+  include ProtectedRef
 
   has_many :merge_access_levels, dependent: :destroy
   has_many :push_access_levels, dependent: :destroy
@@ -13,30 +10,4 @@ class ProtectedBranch < ActiveRecord::Base
 
   accepts_nested_attributes_for :push_access_levels
   accepts_nested_attributes_for :merge_access_levels
-
-  def commit
-    project.commit(self.name)
-  end
-
-  def self.matching(branch_name, protected_branches: nil)
-    ProtectedRefMatcher.matching(ProtectedBranch, branch_name, protected_refs: protected_branches)
-  end
-
-  def matching(branches)
-    ref_matcher.matching(branches)
-  end
-
-  def matches?(branch_name)
-    ref_matcher.matches?(branch_name)
-  end
-
-  def wildcard?
-    ref_matcher.wildcard?
-  end
-
-  private
-
-  def ref_matcher
-    @ref_matcher ||= ProtectedRefMatcher.new(self)
-  end
 end
diff --git a/app/models/protected_tag.rb b/app/models/protected_tag.rb
index d307549aa49..301fe2092e9 100644
--- a/app/models/protected_tag.rb
+++ b/app/models/protected_tag.rb
@@ -1,39 +1,10 @@
 class ProtectedTag < ActiveRecord::Base
   include Gitlab::ShellAdapter
-
-  belongs_to :project
-  validates :name, presence: true
-  validates :project, presence: true
+  include ProtectedRef
 
   has_many :push_access_levels, dependent: :destroy
 
   validates :push_access_levels, length: { is: 1, message: "are restricted to a single instance per protected tag." }
 
   accepts_nested_attributes_for :push_access_levels
-
-  def commit
-    project.commit(self.name)
-  end
-
-  def self.matching(tag_name, protected_tags: nil)
-    ProtectedRefMatcher.matching(ProtectedTag, tag_name, protected_refs: protected_tags)
-  end
-
-  def matching(branches)
-    ref_matcher.matching(branches)
-  end
-
-  def matches?(tag_name)
-    ref_matcher.matches?(tag_name)
-  end
-
-  def wildcard?
-    ref_matcher.wildcard?
-  end
-
-  private
-
-  def ref_matcher
-    @ref_matcher ||= ProtectedRefMatcher.new(self)
-  end
 end