Merge pull request #46 from ticgal/revert-45-bugfix/sanitizedSecret

Revert "Bugfix/sanitized secret"
ticgal · Apr 9, 2024 · 9d4812b · 9d4812b
2 parents 1844fde + 2bf294d
commit 9d4812b
Show file tree

Hide file tree

Showing 11 changed files with 419 additions and 615 deletions.
diff --git a/css/link.css b/css/link.css
diff --git a/front/config.form.php b/front/config.form.php
@@ -1,34 +1,34 @@
 <?php
 
-/**
- * -------------------------------------------------------------------------
- * OneTimeSecret plugin for GLPI
- * Copyright (C) 2021-2024 by the TICgal Team.
- * https://www.tic.gal
- * -------------------------------------------------------------------------
- * LICENSE
- * This file is part of the OneTimeSecret plugin.
- * OneTimeSecret plugin is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- * OneTimeSecret plugin is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with OneTimeSecret. If not, see
- * <http: //www.gnu.org/licenses />.
- * -------------------------------------------------------------------------
- * @package OneTimeSecret
- * @author the TICgal team
- * @copyright Copyright (c) 2021-2024 TICgal team
- * @license AGPL License 3.0 or (at your option) any later version
- * http://www.gnu.org/licenses/agpl-3.0-standalone.html
- * @link https://www.tic.gal
- * @since 2021
- * -------------------------------------------------------------------------
- */
+/*
+-------------------------------------------------------------------------
+OneTimeSecret plugin for GLPI
+Copyright (C) 2021-2023 by the TICgal Team.
+https://www.tic.gal
+-------------------------------------------------------------------------
+LICENSE
+This file is part of the OneTimeSecret plugin.
+OneTimeSecret plugin is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+OneTimeSecret plugin is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with OneTimeSecret. If not, see
+<http: //www.gnu.org/licenses />.
+--------------------------------------------------------------------------
+@package OneTimeSecret
+@author the TICgal team
+@copyright Copyright (c) 2021-2023 TICgal team
+@license AGPL License 3.0 or (at your option) any later version
+http://www.gnu.org/licenses/agpl-3.0-standalone.html
+@link https://www.tic.gal
+@since 2021-2023
+----------------------------------------------------------------------
+*/
 
 include('../../../inc/includes.php');
 
@@ -42,10 +42,8 @@
 $config = new PluginOnetimesecretConfig();
 if (isset($_POST["update"])) {
     $config->check($_POST['id'], UPDATE);
+    $_POST["apikey"] = (new GLPIKey())->encrypt($_POST["apikey"]);
     $config->update($_POST);
     Html::back();
 }
-
-$redirect = $CFG_GLPI["root_doc"] . "/front/config.form.php";
-$redirect .= "?forcetab=" . urlencode('PluginOnetimesecretConfig$1');
-Html::redirect($redirect);
+Html::redirect($CFG_GLPI["root_doc"] . "/front/config.form.php?forcetab=" . urlencode('PluginOnetimesecretConfig$1'));
diff --git a/front/link.form.php b/front/link.form.php
@@ -1,34 +1,34 @@
 <?php
 
-/**
- * -------------------------------------------------------------------------
- * OneTimeSecret plugin for GLPI
- * Copyright (C) 2021-2024 by the TICgal Team.
- * https://www.tic.gal
- * -------------------------------------------------------------------------
- * LICENSE
- * This file is part of the OneTimeSecret plugin.
- * OneTimeSecret plugin is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- * OneTimeSecret plugin is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with OneTimeSecret. If not, see
- * <http: //www.gnu.org/licenses />.
- * -------------------------------------------------------------------------
- * @package OneTimeSecret
- * @author the TICgal team
- * @copyright Copyright (c) 2021-2024 TICgal team
- * @license AGPL License 3.0 or (at your option) any later version
- * http://www.gnu.org/licenses/agpl-3.0-standalone.html
- * @link https://www.tic.gal
- * @since 2021
- * -------------------------------------------------------------------------
- */
+/*
+-------------------------------------------------------------------------
+OneTimeSecret plugin for GLPI
+Copyright (C) 2021-2023 by the TICgal Team.
+https://www.tic.gal
+-------------------------------------------------------------------------
+LICENSE
+This file is part of the OneTimeSecret plugin.
+OneTimeSecret plugin is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+OneTimeSecret plugin is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with OneTimeSecret. If not, see
+<http: //www.gnu.org/licenses />.
+--------------------------------------------------------------------------
+@package OneTimeSecret
+@author the TICgal team
+@copyright Copyright (c) 2021-2023 TICgal team
+@license AGPL License 3.0 or (at your option) any later version
+http://www.gnu.org/licenses/agpl-3.0-standalone.html
+@link https://www.tic.gal
+@since 2021-2023
+----------------------------------------------------------------------
+*/
 
 include('../../../inc/includes.php');
 

diff --git a/hook.php b/hook.php
@@ -1,41 +1,36 @@
 <?php
 
-/**
- * -------------------------------------------------------------------------
- * OneTimeSecret plugin for GLPI
- * Copyright (C) 2021-2024 by the TICgal Team.
- * https://www.tic.gal
- * -------------------------------------------------------------------------
- * LICENSE
- * This file is part of the OneTimeSecret plugin.
- * OneTimeSecret plugin is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- * OneTimeSecret plugin is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with OneTimeSecret. If not, see
- * <http: //www.gnu.org/licenses />.
- * -------------------------------------------------------------------------
- * @package OneTimeSecret
- * @author the TICgal team
- * @copyright Copyright (c) 2021-2024 TICgal team
- * @license AGPL License 3.0 or (at your option) any later version
- * http://www.gnu.org/licenses/agpl-3.0-standalone.html
- * @link https://www.tic.gal
- * @since 2021
- * -------------------------------------------------------------------------
- */
+/*
+-------------------------------------------------------------------------
+OneTimeSecret plugin for GLPI
+Copyright (C) 2021-2023 by the TICgal Team.
+https://www.tic.gal
+-------------------------------------------------------------------------
+LICENSE
+This file is part of the OneTimeSecret plugin.
+OneTimeSecret plugin is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+OneTimeSecret plugin is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with OneTimeSecret. If not, see
+<http: //www.gnu.org/licenses />.
+--------------------------------------------------------------------------
+@package OneTimeSecret
+@author the TICgal team
+@copyright Copyright (c) 2021-2023 TICgal team
+@license AGPL License 3.0 or (at your option) any later version
+http://www.gnu.org/licenses/agpl-3.0-standalone.html
+@link https://www.tic.gal
+@since 2021-2023
+----------------------------------------------------------------------
+*/
 
-/**
- * plugin_onetimesecret_install
- *
- * @return bool
- */
-function plugin_onetimesecret_install(): bool
+function plugin_onetimesecret_install()
 {
     $migration = new Migration(PLUGIN_ONETIMESECRET_VERSION);
 
@@ -51,7 +46,6 @@ function plugin_onetimesecret_install(): bool
             }
         }
     }
-
     $conf = Config::getConfigurationValues('core', ['notifications_push']);
     if (!isset($conf['notifications_push'])) {
         Config::setConfigurationValues('core', ['notifications_push' => 0]);
@@ -60,12 +54,7 @@ function plugin_onetimesecret_install(): bool
     return true;
 }
 
-/**
- * plugin_onetimesecret_uninstall
- *
- * @return bool
- */
-function plugin_onetimesecret_uninstall(): bool
+function plugin_onetimesecret_uninstall()
 {
     $migration = new Migration(PLUGIN_ONETIMESECRET_VERSION);