From ee1119208c613b9ded7ebfb2a5a7b8bd5a5ef008 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 1 Mar 2021 18:39:47 +0100
Subject: [PATCH] Add `POST /api/v1/emails/confirmations` to REST API (#15816)
Only available to the application the user originally signed-up with
---
.../api/v1/emails/confirmations_controller.rb | 17 +++++++++++++++++
config/initializers/rack_attack.rb | 8 ++++++--
config/routes.rb | 4 ++++
3 files changed, 27 insertions(+), 2 deletions(-)
create mode 100644 app/controllers/api/v1/emails/confirmations_controller.rb
diff --git a/app/controllers/api/v1/emails/confirmations_controller.rb b/app/controllers/api/v1/emails/confirmations_controller.rb
new file mode 100644
index 0000000000..03ab5de8c6
--- /dev/null
+++ b/app/controllers/api/v1/emails/confirmations_controller.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class Api::V1::Emails::ConfirmationsController < Api::BaseController
+ before_action :doorkeeper_authorize!
+ before_action :require_user_owned_by_application!
+
+ def create
+ current_user.resend_confirmation_instructions if current_user.unconfirmed_email.present?
+ render_empty
+ end
+
+ private
+
+ def require_user_owned_by_application!
+ render json: { error: 'This method is only available to the application the user originally signed-up with' }, status: :forbidden unless current_user && current_user.created_by_application_id == doorkeeper_token.application_id
+ end
+end
diff --git a/config/initializers/rack_attack.rb b/config/initializers/rack_attack.rb
index c0db499072..2a6cca7dc8 100644
--- a/config/initializers/rack_attack.rb
+++ b/config/initializers/rack_attack.rb
@@ -94,11 +94,15 @@ class Rack::Attack
end
throttle('throttle_email_confirmations/ip', limit: 25, period: 5.minutes) do |req|
- req.remote_ip if req.post? && req.path == '/auth/confirmation'
+ req.remote_ip if req.post? && %w(/auth/confirmation /api/v1/emails/confirmations).include?(req.path)
end
throttle('throttle_email_confirmations/email', limit: 5, period: 30.minutes) do |req|
- req.params.dig('user', 'email').presence if req.post? && req.path == '/auth/password'
+ if req.post? && req.path == '/auth/password'
+ req.params.dig('user', 'email').presence
+ elsif req.post? && req.path == '/api/v1/emails/confirmations'
+ req.authenticated_user_id
+ end
end
throttle('throttle_login_attempts/ip', limit: 25, period: 5.minutes) do |req|
diff --git a/config/routes.rb b/config/routes.rb
index 0ff48cf482..780a52b0ce 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -403,6 +403,10 @@ Rails.application.routes.draw do
resources :apps, only: [:create]
+ namespace :emails do
+ resources :confirmations, only: [:create]
+ end
+
resource :instance, only: [:show] do
resources :peers, only: [:index], controller: 'instances/peers'
resource :activity, only: [:show], controller: 'instances/activity'
--
GitLab