Allow custom csp header

application/controllers/ConfigController.php

@@ -6,7 +6,9 @@
 namespace Icinga\Controllers;
 
 use Exception;
+use GuzzleHttp\Psr7\ServerRequest;
 use Icinga\Application\Version;
+use Icinga\Util\Csp;
 use InvalidArgumentException;
 use Icinga\Application\Config;
 use Icinga\Application\Icinga;
@@ -17,6 +19,7 @@
 use Icinga\Forms\ActionForm;
 use Icinga\Forms\Config\GeneralConfigForm;
 use Icinga\Forms\Config\ResourceConfigForm;
+use Icinga\Forms\Config\Security\CspConfigForm;
 use Icinga\Forms\Config\UserBackendConfigForm;
 use Icinga\Forms\Config\UserBackendReorderForm;
 use Icinga\Forms\ConfirmRemovalForm;
@@ -25,6 +28,7 @@
 use Icinga\Web\Notification;
 use Icinga\Web\Url;
 use Icinga\Web\Widget;
+use ipl\Html\Contract\Form as ContractForm;
 
 /**
  * Application and module configuration
@@ -45,6 +49,14 @@ public function createApplicationTabs()
                 'baseTarget' => '_main'
             ));
         }
+        if ($this->hasPermission('config/security')) {
+            $tabs->add('security', array(
+                'title' => $this->translate('Adjust the security configuration of Icinga Web 2'),
+                'label' => $this->translate('Security'),
+                'url'   => 'config/security',
+                'baseTarget' => '_main'
+            ));
+        }
         if ($this->hasPermission('config/resources')) {
             $tabs->add('resource', array(
                 'title' => $this->translate('Configure which resources are being utilized by Icinga Web 2'),
@@ -96,24 +108,49 @@ public function indexAction()
     public function generalAction()
     {
         $this->assertPermission('config/general');
+
+        $this->view->title = $this->translate('General');
+
         $form = new GeneralConfigForm();
         $form->setIniConfig(Config::app());
-        $form->setOnSuccess(function (GeneralConfigForm $form) {
-            $config = Config::app();
-            $useStrictCsp = (bool) $config->get('security', 'use_strict_csp', false);
-            if ($form->onSuccess() === false) {
-                return false;
-            }
+        $form->handleRequest();
+
+        $this->view->form = $form;
 
-            $appConfigForm = $form->getSubForm('form_config_general_application');
-            if ($appConfigForm && (bool) $appConfigForm->getValue('security_use_strict_csp') !== $useStrictCsp) {
+        $this->createApplicationTabs()->activate('general');
+    }
+
+    /**
+     * Security configuration
+     *
+     * @throws SecurityException If the user lacks the permission for configuring the security configuration
+     */
+    public function securityAction(): void
+    {
+        $this->assertPermission('config/security');
+
+        $this->view->title = $this->translate('Security');
+
+        $config = Config::app();
+        $cspForm = new CspConfigForm($config);
+        $cspForm->populate([
+            'use_strict_csp' => Csp::isEnabled(),
+            'use_custom_csp' => $config->get('security', 'use_custom_csp', '0'),
+            'custom_csp' => $config->get('security', 'custom_csp', ''),
+            'csp_enable_modules' => $config->get('security', 'csp_enable_modules', '1'),
+            'csp_enable_dashboards' => $config->get('security', 'csp_enable_dashboards', '1'),
+            'csp_enable_navigation' => $config->get('security', 'csp_enable_navigation', '1'),
+        ]);
+
+        $cspForm->on(ContractForm::ON_SUBMIT, function (CspConfigForm $form) use ($config) {
+            if ($form->hasConfigChanged()) {
                 $this->getResponse()->setReloadWindow(true);
             }
-        })->handleRequest();
+        });
+        $cspForm->handleRequest(ServerRequest::fromGlobals());
+        $this->view->cspForm = $cspForm;
 
-        $this->view->form = $form;
-        $this->view->title = $this->translate('General');
-        $this->createApplicationTabs()->activate('general');
+        $this->createApplicationTabs()->activate('security');
     }
 
     /**

application/forms/Config/General/ApplicationConfigForm.php

@@ -57,18 +57,6 @@ public function createElements(array $formData)
             )
         );
 
-        $this->addElement(
-            'checkbox',
-            'security_use_strict_csp',
-            [
-                'label'         => $this->translate('Enable strict content security policy'),
-                'description'   => $this->translate(
-                    'Set whether to use strict content security policy (CSP).'
-                    . ' This setting helps to protect from cross-site scripting (XSS).'
-                )
-            ]
-        );
-
         $this->addElement(
             'text',
             'global_module_path',