Add latest changes from gitlab-org/gitlab@14-9-stable-eev14.9.0-rc42

1 files changed, 60 insertions, 0 deletions

diff --git a/app/services/ci/runners/register_runner_service.rb b/app/services/ci/runners/register_runner_service.rb
new file mode 100644
index 00000000000..7978d094d9b
--- /dev/null
+++ b/app/services/ci/runners/register_runner_service.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module Ci
+  module Runners
+    class RegisterRunnerService
+      def execute(registration_token, attributes)
+        runner_type_attrs = extract_runner_type_attrs(registration_token)
+
+        return unless runner_type_attrs
+
+        ::Ci::Runner.create(attributes.merge(runner_type_attrs))
+      end
+
+      private
+
+      def extract_runner_type_attrs(registration_token)
+        @attrs_from_token ||= check_token(registration_token)
+
+        return unless @attrs_from_token
+
+        attrs = @attrs_from_token.clone
+        case attrs[:runner_type]
+        when :project_type
+          attrs[:projects] = [attrs.delete(:scope)]
+        when :group_type
+          attrs[:groups] = [attrs.delete(:scope)]
+        end
+
+        attrs
+      end
+
+      def check_token(registration_token)
+        if runner_registration_token_valid?(registration_token)
+          # Create shared runner. Requires admin access
+          { runner_type: :instance_type }
+        elsif runner_registrar_valid?('project') && project = ::Project.find_by_runners_token(registration_token)
+          # Create a specific runner for the project
+          { runner_type: :project_type, scope: project }
+        elsif runner_registrar_valid?('group') && group = ::Group.find_by_runners_token(registration_token)
+          # Create a specific runner for the group
+          { runner_type: :group_type, scope: group }
+        end
+      end
+
+      def runner_registration_token_valid?(registration_token)
+        ActiveSupport::SecurityUtils.secure_compare(registration_token, Gitlab::CurrentSettings.runners_registration_token)
+      end
+
+      def runner_registrar_valid?(type)
+        Feature.disabled?(:runner_registration_control, default_enabled: :yaml) || Gitlab::CurrentSettings.valid_runner_registrars.include?(type)
+      end
+
+      def token_scope
+        @attrs_from_token[:scope]
+      end
+    end
+  end
+end
+
+Ci::Runners::RegisterRunnerService.prepend_mod