1 files changed, 20 insertions, 8 deletions
diff --git a/lib/gitlab/email/handler/create_issue_handler.rb b/lib/gitlab/email/handler/create_issue_handler.rb
index 69982efbbe6..78a3a9489ac 100644
--- a/lib/gitlab/email/handler/create_issue_handler.rb
+++ b/lib/gitlab/email/handler/create_issue_handler.rb
@@ -2,21 +2,33 @@
 
 require 'gitlab/email/handler/base_handler'
 
+# handles issue creation emails with these formats:
+#   incoming+gitlab-org-gitlab-ce-20-Author_Token12345678-issue@incoming.gitlab.com
+#   incoming+gitlab-org/gitlab-ce+Author_Token12345678@incoming.gitlab.com (legacy)
 module Gitlab
   module Email
     module Handler
       class CreateIssueHandler < BaseHandler
         include ReplyProcessing
-        attr_reader :project_path, :incoming_email_token
+
+        HANDLER_REGEX        = /\A#{HANDLER_ACTION_BASE_REGEX}-(?<incoming_email_token>.+)-issue\z/.freeze
+        HANDLER_REGEX_LEGACY = /\A(?<project_path>[^\+]*)\+(?<incoming_email_token>.*)\z/.freeze
 
         def initialize(mail, mail_key)
           super(mail, mail_key)
-          @project_path, @incoming_email_token =
-            mail_key && mail_key.split('+', 2)
+
+          if !mail_key&.include?('/') && (matched = HANDLER_REGEX.match(mail_key.to_s))
+            @project_slug         = matched[:project_slug]
+            @project_id           = matched[:project_id]&.to_i
+            @incoming_email_token = matched[:incoming_email_token]
+          elsif matched = HANDLER_REGEX_LEGACY.match(mail_key.to_s)
+            @project_path         = matched[:project_path]
+            @incoming_email_token = matched[:incoming_email_token]
+          end
         end
 
         def can_handle?
-          !incoming_email_token.nil? && !incoming_email_token.include?("+") && !mail_key.include?(Gitlab::IncomingEmail::UNSUBSCRIBE_SUFFIX)
+          incoming_email_token && (project_id || can_handle_legacy_format?)
         end
 
         def execute
@@ -36,10 +48,6 @@ module Gitlab
         end
         # rubocop: enable CodeReuse/ActiveRecord
 
-        def project
-          @project ||= Project.find_by_full_path(project_path)
-        end
-
         private
 
         def create_issue
@@ -50,6 +58,10 @@ module Gitlab
             description: message_including_reply
           ).execute
         end
+
+        def can_handle_legacy_format?
+          project_path && !incoming_email_token.include?('+') && !mail_key.include?(Gitlab::IncomingEmail::UNSUBSCRIBE_SUFFIX_LEGACY)
+        end
       end
     end
   end