Refactor ProtectedRefMatcher to be more generic

1 files changed, 2 insertions, 26 deletions

diff --git a/app/models/hooks/active_hook_filter.rb b/app/models/hooks/active_hook_filter.rb
index 611af971163..ea046bea368 100644
--- a/app/models/hooks/active_hook_filter.rb
+++ b/app/models/hooks/active_hook_filter.rb
@@ -1,6 +1,7 @@
 class ActiveHookFilter
   def initialize(hook)
     @hook = hook
+    @push_events_filter_matcher = RefMatcher.new(@hook.push_events_branch_filter)
   end
 
   def matches?(hooks_scope, data)
@@ -8,31 +9,6 @@ class ActiveHookFilter
     return true if @hook.push_events_branch_filter.blank?
 
     branch_name = Gitlab::Git.branch_name(data[:ref])
-    exact_match?(branch_name) || wildcard_match?(branch_name)
-  end
-
-  private
-
-  def exact_match?(branch_name)
-    @hook.push_events_branch_filter == branch_name
-  end
-
-  def wildcard_match?(branch_name)
-    return false unless wildcard?
-
-    wildcard_regex === branch_name
-  end
-
-  def wildcard_regex
-    @wildcard_regex ||= begin
-      name = @hook.push_events_branch_filter.gsub('*', 'STAR_DONT_ESCAPE')
-      quoted_name = Regexp.quote(name)
-      regex_string = quoted_name.gsub('STAR_DONT_ESCAPE', '.*?')
-      /\A#{regex_string}\z/
-    end
-  end
-
-  def wildcard?
-    @hook.push_events_branch_filter && @hook.push_events_branch_filter.include?('*')
+    @push_events_filter_matcher.matches?(branch_name)
   end
 end