Changeset 4001:a2dd2cb6fd33

Timestamp:

07/01/19 11:23:37 (6 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Add settings (in maintenance plugin) for CSP system

Files:

• inc/core/class.dc.namespace.php (modified) (1 diff)
• inc/core/class.dc.workspace.php (modified) (1 diff)
• locales/fr/plugins.po (modified) (1 diff)
• plugins/maintenance/index.php (modified) (3 diffs)

inc/core/class.dc.namespace.php

@@ -349 +349 @@
 
     /**
+     * Removes every existing specific setting in a namespace
+     *
+     * @param      string     $id      Setting ID
+     * @param      boolean    $global  Remove global setting too
+     */
+    public function dropEvery($id, $global = false)
+    {
+        if (!$this->ns) {
+            throw new Exception(__('No namespace specified'));
+        }
+
+        $strReq = 'DELETE FROM ' . $this->table . ' ';
+        if (!$global) {
+            $strReq .= 'WHERE blog_id IS NOT NULL ';
+        }
+        $strReq .= "AND setting_id = '" . $this->con->escape($id) . "' ";
+        $strReq .= "AND setting_ns = '" . $this->con->escape($this->ns) . "' ";
+
+        $this->con->execute($strReq);
+    }
+
+    /**
     Removes all existing settings in a Namespace
 

inc/core/class.dc.workspace.php

@@ -365 +365 @@
 
     /**
+     * Removes every existing specific pref. in a workspace
+     *
+     * @param      string     $id      Pref ID
+     * @param      boolean    $global  Remove global pref too
+     */
+    public function dropEvery($id, $global = false)
+    {
+        if (!$this->ws) {
+            throw new Exception(__('No workspace specified'));
+        }
+
+        $strReq = 'DELETE FROM ' . $this->table . ' ';
+        if (!$global) {
+            $strReq .= 'WHERE user_id IS NOT NULL ';
+        }
+        $strReq .= "AND pref_id = '" . $this->con->escape($id) . "' ";
+        $strReq .= "AND pref_ws = '" . $this->con->escape($this->ws) . "' ";
+
+        $this->con->execute($strReq);
+    }
+
+    /**
     Removes all existing pref. in a Workspace
 

locales/fr/plugins.po

@@ -1487 +1487 @@
 msgstr "Utiliser un délai de rappel différent pour chaque tâche"
 
+msgid "Content-Security-Policy"
+msgstr "Content-Security-Policy"
+
+msgid "Enable Content-Security-Policy system"
+msgstr "Activer le système Content-Security-Policy"
+
+msgid "Enable Content-Security-Policy report only"
+msgstr "Activer le rapport seul pour le système Content-Security-Policy"
+
+msgid "Enable Content-Security-Policy system by default"
+msgstr "Activer par défaut le système Content-Security-Policy"
+
+msgid "Enable Content-Security-Policy report only by default"
+msgstr "Activer par défaut le rapport seul pour le système Content-Security-Policy"
+
+msgid "Also reset all Content-Security-Policy blogs's settings to default"
+msgstr "Remettre tous les réglages Content-Security-Policy des blogs aux valeurs par défaut"
+
+msgid "System settings have been saved."
+msgstr "Les réglages système ont été enregistrés."
+
+msgid "All blog's Content-Security-Policy settings have been reset to default."
+msgstr "Tous les réglages Content-Security-Policy des blogs ont été remis aux valeurs par défaut."
+
 msgid "New page"
 msgstr "Nouvelle page"

plugins/maintenance/index.php

@@ -99 +99 @@
 }
 
+// Save system settings
+
+if (!empty($_POST['save_system'])) {
+
+    try {
+        // Default (global) settings
+        $core->blog->settings->system->put('csp_admin_on', !empty($_POST['system_csp_global']), null, null, true, true);
+        $core->blog->settings->system->put('csp_admin_report_only', !empty($_POST['system_csp_global_report_only']), null, null, true, true);
+        // Current blog settings
+        $core->blog->settings->system->put('csp_admin_on', !empty($_POST['system_csp']));
+        $core->blog->settings->system->put('csp_admin_report_only', !empty($_POST['system_csp_report_only']));
+
+        dcPage::addSuccessNotice(__('System settings have been saved.'));
+
+        if (!empty($_POST['system_csp_reset'])) {
+            $core->blog->settings->system->dropEvery('csp_admin_on');
+            $core->blog->settings->system->dropEvery('csp_admin_report_only');
+            dcPage::addSuccessNotice(__('All blog\'s Content-Security-Policy settings have been reset to default.'));
+        }
+
+        http::redirect($p_url . '&tab=' . $tab . '#' . $tab);
+    } catch (Exception $e) {
+        $core->error->add($e->getMessage());
+    }
+}
+
 // Combos
 
@@ -127 +153 @@
 <body>';
 
-// Check if there is somthing to display according to user permissions
+// Check if there is something to display according to user permissions
 if (empty($tasks)) {
     echo dcPage::breadcrumb(
@@ -324 +350 @@
         '</form>' .
         '</div>';
+
+    // System tab
+    if ($core->auth->isSuperAdmin()) {
+        echo
+        '<div id="system" class="multi-part" title="' . __('System') . '">' .
+        '<h3>' . __('System settings') . '</h3>' .
+            '<form action="' . $p_url . '" method="post">';
+
+        echo
+        '<div class="fieldset two-cols clearfix">' .
+        '<h4 class="pretty-title">' . __('Content-Security-Policy') . '</h4>' .
+
+        '<div class="col">' .
+        '<p><label for="system_csp" class="classic">' .
+        form::checkbox('system_csp', '1', $core->blog->settings->system->csp_admin_on) .
+        __('Enable Content-Security-Policy system') . '</label></p>' .
+        '<p><label for="system_csp_report_only" class="classic">' .
+        form::checkbox('system_csp_report_only', '1', $core->blog->settings->system->csp_admin_report_only) .
+        __('Enable Content-Security-Policy report only') . '</label></p>' .
+        '</div>' .
+
+        '<div class="col">' .
+        '<p><label for="system_csp_global" class="classic">' .
+        form::checkbox('system_csp_global', '1', $core->blog->settings->system->getGlobal('csp_admin_on')) .
+        __('Enable Content-Security-Policy system by default') . '</label></p>' .
+        '<p><label for="system_csp_global_report_only" class="classic">' .
+        form::checkbox('system_csp_global_report_only', '1', $core->blog->settings->system->getGlobal('csp_admin_report_only')) .
+        __('Enable Content-Security-Policy report only by default') . '</label></p>' .
+        '<p><label for="system_csp_reset" class="classic">' .
+        form::checkbox('system_csp_reset', '1', 0) .
+        __('Also reset all Content-Security-Policy blogs\'s settings to default') . '</label></p>' .
+        '</div>' .
+        '</div>';
+
+        echo
+        '<p class="field wide"><input type="submit" value="' . __('Save') . '" /> ' .
+        form::hidden(['tab'], 'system') .
+        form::hidden(['save_system'], 1) .
+        $core->formNonce() . '</p>' .
+            '</form>' .
+            '</div>';
+    }
+
 }