Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42

4 files changed, 101 insertions, 9 deletions

diff --git a/app/services/pages_domains/create_acme_order_service.rb b/app/services/pages_domains/create_acme_order_service.rb
index e289a78091b..c600f497fa5 100644
--- a/app/services/pages_domains/create_acme_order_service.rb
+++ b/app/services/pages_domains/create_acme_order_service.rb
@@ -2,9 +2,6 @@
 
 module PagesDomains
   class CreateAcmeOrderService
-    # elliptic curve algorithm to generate the private key
-    ECDSA_CURVE = "prime256v1"
-
     attr_reader :pages_domain
 
     def initialize(pages_domain)
@@ -17,12 +14,7 @@ module PagesDomains
 
       challenge = order.new_challenge
 
-      private_key = if Feature.enabled?(:pages_lets_encrypt_ecdsa, pages_domain.project)
-                      OpenSSL::PKey::EC.generate(ECDSA_CURVE)
-                    else
-                      OpenSSL::PKey::RSA.new(4096)
-                    end
-
+      private_key = OpenSSL::PKey::RSA.new(4096)
       saved_order = pages_domain.acme_orders.create!(
         url: order.url,
         expires_at: order.expires,
diff --git a/app/services/pages_domains/create_service.rb b/app/services/pages_domains/create_service.rb
new file mode 100644
index 00000000000..1f771ca3a05
--- /dev/null
+++ b/app/services/pages_domains/create_service.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module PagesDomains
+  class CreateService < BaseService
+    def execute
+      return unless authorized?
+
+      domain = project.pages_domains.create(params)
+
+      publish_event(domain) if domain.persisted?
+
+      domain
+    end
+
+    private
+
+    def authorized?
+      current_user.can?(:update_pages, project)
+    end
+
+    def publish_event(domain)
+      event = PagesDomainCreatedEvent.new(
+        data: {
+          project_id: project.id,
+          namespace_id: project.namespace_id,
+          root_namespace_id: project.root_namespace.id,
+          domain: domain.domain
+        }
+      )
+
+      Gitlab::EventStore.publish(event)
+    end
+  end
+end
diff --git a/app/services/pages_domains/delete_service.rb b/app/services/pages_domains/delete_service.rb
new file mode 100644
index 00000000000..af69e1845a9
--- /dev/null
+++ b/app/services/pages_domains/delete_service.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module PagesDomains
+  class DeleteService < BaseService
+    def execute(domain)
+      return unless authorized?
+
+      domain.destroy
+
+      publish_event(domain)
+    end
+
+    private
+
+    def authorized?
+      current_user.can?(:update_pages, project)
+    end
+
+    def publish_event(domain)
+      event = PagesDomainDeletedEvent.new(
+        data: {
+          project_id: project.id,
+          namespace_id: project.namespace_id,
+          root_namespace_id: project.root_namespace.id,
+          domain: domain.domain
+        }
+      )
+
+      Gitlab::EventStore.publish(event)
+    end
+  end
+end
diff --git a/app/services/pages_domains/update_service.rb b/app/services/pages_domains/update_service.rb
new file mode 100644
index 00000000000..b038aaa95b6
--- /dev/null
+++ b/app/services/pages_domains/update_service.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module PagesDomains
+  class UpdateService < BaseService
+    def execute(domain)
+      return unless authorized?
+
+      return false unless domain.update(params)
+
+      publish_event(domain)
+
+      true
+    end
+
+    private
+
+    def authorized?
+      current_user.can?(:update_pages, project)
+    end
+
+    def publish_event(domain)
+      event = PagesDomainUpdatedEvent.new(
+        data: {
+          project_id: project.id,
+          namespace_id: project.namespace_id,
+          root_namespace_id: project.root_namespace.id,
+          domain: domain.domain
+        }
+      )
+
+      Gitlab::EventStore.publish(event)
+    end
+  end
+end