chore(release): merge hotfix-mon-15384 in 21.04.x (#11980)

* enh(auth): autologin enhancement (#11958) Refs: MON-15384 * update version to 21.04.20 Co-authored-by: Kevin Duret <[email protected]>
centreon · Oct 12, 2022 · c2cf496 · c2cf496
1 parent 3002339
commit c2cf496
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 1 deletion.
diff --git a/www/class/centreonAuth.class.php b/www/class/centreonAuth.class.php
@@ -230,6 +230,14 @@ protected function checkPassword($password, $token = "", $autoImport = false)
             || $this->userInfos["contact_auth_type"] == "local"
             || $this->autologin
         ) {
+            if (
+                array_key_exists('contact_oreon', $this->userInfos)
+                && $this->userInfos['contact_oreon'] !== '1'
+            ) {
+                $this->passwdOk = 0;
+                return;
+            }
+
             if ($this->autologin
                 && $this->userInfos["contact_autologin_key"]
                 && $this->userInfos["contact_autologin_key"] === $token

diff --git a/www/install/insertBaseConf.sql b/www/install/insertBaseConf.sql
@@ -2,7 +2,7 @@
 -- Insert version
 --
 
-INSERT INTO `informations` (`key` ,`value`) VALUES ('version', '21.04.19');
+INSERT INTO `informations` (`key` ,`value`) VALUES ('version', '21.04.20');
 
 --
 -- Contenu de la table `contact`

diff --git a/www/install/php/Update-21.04.20.php b/www/install/php/Update-21.04.20.php
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ * Copyright 2005 - 2022 Centreon (https://www.centreon.com/)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * For more information : [email protected]
+ *
+ */