diff options
Diffstat (limited to 'app/controllers/concerns/integrations')
-rw-r--r-- | app/controllers/concerns/integrations/actions.rb | 73 | ||||
-rw-r--r-- | app/controllers/concerns/integrations/hooks_execution.rb | 47 | ||||
-rw-r--r-- | app/controllers/concerns/integrations/params.rb | 4 |
3 files changed, 123 insertions, 1 deletions
diff --git a/app/controllers/concerns/integrations/actions.rb b/app/controllers/concerns/integrations/actions.rb new file mode 100644 index 00000000000..6490742c0f8 --- /dev/null +++ b/app/controllers/concerns/integrations/actions.rb @@ -0,0 +1,73 @@ +# frozen_string_literal: true + +module Integrations::Actions + extend ActiveSupport::Concern + + included do + include Integrations::Params + include IntegrationsHelper + + before_action :integration, only: [:edit, :update, :overrides, :test] + + urgency :low, [:test] + end + + def edit + render 'shared/integrations/edit' + end + + def update + saved = integration.update(integration_params[:integration]) + + respond_to do |format| + format.html do + if saved + PropagateIntegrationWorker.perform_async(integration.id) + redirect_to scoped_edit_integration_path(integration), notice: success_message + else + render 'shared/integrations/edit' + end + end + + format.json do + status = saved ? :ok : :unprocessable_entity + + render json: serialize_as_json, status: status + end + end + end + + def test + render json: {}, status: :ok + end + + def reset + integration.destroy! + + flash[:notice] = s_('Integrations|This integration, and inheriting projects were reset.') + + render json: {}, status: :ok + end + + private + + # rubocop:disable Gitlab/ModuleWithInstanceVariables + def integration + @integration ||= find_or_initialize_non_project_specific_integration(params[:id]) + end + # rubocop:enable Gitlab/ModuleWithInstanceVariables + + def success_message + if integration.active? + s_('Integrations|%{integration} settings saved and active.') % { integration: integration.title } + else + s_('Integrations|%{integration} settings saved, but not active.') % { integration: integration.title } + end + end + + def serialize_as_json + integration + .as_json(only: integration.json_fields) + .merge(errors: integration.errors.as_json) + end +end diff --git a/app/controllers/concerns/integrations/hooks_execution.rb b/app/controllers/concerns/integrations/hooks_execution.rb new file mode 100644 index 00000000000..af039057a9c --- /dev/null +++ b/app/controllers/concerns/integrations/hooks_execution.rb @@ -0,0 +1,47 @@ +# frozen_string_literal: true + +module Integrations::HooksExecution + extend ActiveSupport::Concern + + private + + def destroy_hook(hook) + result = WebHooks::DestroyService.new(current_user).execute(hook) + + if result[:status] == :success + flash[:notice] = + if result[:async] + _("%{hook_type} was scheduled for deletion") % { hook_type: hook.model_name.human } + else + _("%{hook_type} was deleted") % { hook_type: hook.model_name.human } + end + else + flash[:alert] = result[:message] + end + end + + def set_hook_execution_notice(result) + http_status = result[:http_status] + message = result[:message] + + if http_status && http_status >= 200 && http_status < 400 + flash[:notice] = "Hook executed successfully: HTTP #{http_status}" + elsif http_status + flash[:alert] = "Hook executed successfully but returned HTTP #{http_status} #{message}" + else + flash[:alert] = "Hook execution failed: #{message}" + end + end + + def create_rate_limit(key, scope) + if rate_limiter.throttled?(key, scope: [scope, current_user]) + rate_limiter.log_request(request, "#{key}_request_limit".to_sym, current_user) + + render plain: _('This endpoint has been requested too many times. Try again later.'), status: :too_many_requests + end + end + + def rate_limiter + ::Gitlab::ApplicationRateLimiter + end +end diff --git a/app/controllers/concerns/integrations/params.rb b/app/controllers/concerns/integrations/params.rb index 62585ab95af..201fb1dc83f 100644 --- a/app/controllers/concerns/integrations/params.rb +++ b/app/controllers/concerns/integrations/params.rb @@ -9,6 +9,7 @@ module Integrations :add_pusher, :alert_events, :api_key, + :api_token, :api_url, :bamboo_url, :branches_to_be_notified, @@ -74,7 +75,8 @@ module Integrations :url, :user_key, :username, - :webhook + :webhook, + :zentao_product_xid ].freeze def integration_params |