File 0002-Configure-Sys-API-via-configuration.yml-or... of Package openproject

Overview Repositories Revisions Requests Users Attributes Meta

File 0002-Configure-Sys-API-via-configuration.yml-or-environme.patch of Package openproject

From 839c0da1bec14780df4dbf0b623d2f8168959813 Mon Sep 17 00:00:00 2001
From: Matthew Trescott <matthewtrescott@gmail.com>
Date: Thu, 5 Nov 2020 23:56:01 -0500
Subject: [PATCH 2/8] Configure Sys API via configuration.yml or environment

This significantly eases the task of automating configuration via sysconfig
---
 app/controllers/sys_controller.rb                 |  2 +-
 .../settings/repositories_settings/show.html.erb  | 15 ---------------
 config/settings.yml                               |  4 ----
 lib/open_project/configuration.rb                 |  2 ++
 4 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/app/controllers/sys_controller.rb b/app/controllers/sys_controller.rb
index 086ed2c2f6..9a8ab82834 100644
--- a/app/controllers/sys_controller.rb
+++ b/app/controllers/sys_controller.rb
@@ -97,7 +97,7 @@ class SysController < ActionController::Base
 
   def check_enabled
     User.current = nil
-    unless Setting.sys_api_enabled? && params[:key].to_s == Setting.sys_api_key
+    unless OpenProject::Configuration.sys_api_enabled == 1 && params[:key].to_s == OpenProject::Configuration.sys_api_key
       render plain: 'Access denied. Repository management WS is disabled or key is invalid.',
              status: 403
       false
diff --git a/app/views/admin/settings/repositories_settings/show.html.erb b/app/views/admin/settings/repositories_settings/show.html.erb
index c80873304c..77ed841819 100644
--- a/app/views/admin/settings/repositories_settings/show.html.erb
+++ b/app/views/admin/settings/repositories_settings/show.html.erb
@@ -45,21 +45,6 @@ See docs/COPYRIGHT.rdoc for more details.
         <%= simple_format t('repositories.storage.update_timeout') %>
       </div>
     </div>
-    <div class="form--field">
-      <%= setting_check_box :sys_api_enabled %>
-      <% csp_onclick("jQuery('#settings_sys_api_key').prop('disabled', !this.checked)",
-                     '#settings_sys_api_enabled',
-                     prevent_default: false) %>
-      <div class="form--field-instructions">
-        <%= t(:setting_sys_api_description) %>
-      </div>
-    </div>
-    <div class="form--field"><%= setting_text_field :sys_api_key, size: 30,
-                                        id: 'settings_sys_api_key',
-                                        disabled: !Setting.sys_api_enabled?,
-                                        label: :setting_mail_handler_api_key,
-                                        container_class: '-middle' %>
-    </div>
     <%
     available_scms = OpenProject::SCM::Manager.registered
       .map {|vendor, klass| [klass.vendor_name, vendor.to_s] }
diff --git a/config/settings.yml b/config/settings.yml
index 3a46d7cd54..ac4afed80d 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -192,10 +192,6 @@ enabled_scm:
   - git
 autofetch_changesets:
   default: 1
-sys_api_enabled:
-  default: 0
-sys_api_key:
-  default: ''
 repository_authentication_caching_enabled:
   default: 1
 repositories_automatic_managed_vendor:
diff --git a/lib/open_project/configuration.rb b/lib/open_project/configuration.rb
index 0ca678894e..b8dd7f0cfc 100644
--- a/lib/open_project/configuration.rb
+++ b/lib/open_project/configuration.rb
@@ -64,6 +64,8 @@ module OpenProject
       'scm_subversion_command' => nil,
       'scm_local_checkout_path' => 'repositories', # relative to OpenProject directory
       'disable_browser_cache' => true,
+      'sys_api_enabled' => 0, # Sys API configuration moved out of database for convenience
+      'sys_api_key' => '',
       # default cache_store is :file_store in production and :memory_store in development
       'rails_cache_store' => nil,
       'cache_expires_in_seconds' => nil,
-- 
2.32.0

Places

File 0002-Configure-Sys-API-via-configuration.yml-or-environme.patch of Package openproject

Places