Merge branch 'rel-11_0' into rel-11_1

RotherOSS · Feb 16, 2025 · f8ba2cb · f8ba2cb
2 parents 7930ee3 + bdcc38f
commit f8ba2cb
Show file tree

Hide file tree

Showing 5 changed files with 96 additions and 252 deletions.
diff --git a/.github/workflows/docker_image_update_checker.yml b/.github/workflows/docker_image_update_checker.yml
diff --git a/Kernel/System/Auth/DB.pm b/Kernel/System/Auth/DB.pm
@@ -26,9 +26,9 @@ use warnings;
 use Digest::SHA ();
 
 # CPAN modules
+use Crypt::PasswdMD5 qw(apache_md5_crypt unix_md5_crypt);
 
 # OTOBO modules
-use Crypt::PasswdMD5 qw(apache_md5_crypt unix_md5_crypt);
 
 our @ObjectDependencies = (
     'Kernel::Config',
@@ -48,7 +48,7 @@ sub new {
     # allocate new hash for object
     my $Self = bless {}, $Type;
 
-    # get config object
+    # get needed objects
     my $ConfigObject = $Kernel::OM->Get('Kernel::Config');
 
     # get user table
@@ -94,6 +94,7 @@ sub Auth {
             Priority => 'error',
             Message  => "Need User!"
         );
+
         return;
     }
 
@@ -103,7 +104,7 @@ sub Auth {
     my $ParamObject = $Kernel::OM->Get('Kernel::System::Web::Request');
     my $RemoteAddr  = $ParamObject->RemoteAddr() || 'Got no REMOTE_ADDR env!';
     my $UserID      = '';
-    my $GetPw       = '';
+    my $GetPw       = '';                                                        # the hashed password, may include salt and other settings
     my $Method      = '';
 
     # get database object
@@ -164,7 +165,6 @@ sub Auth {
                 $CryptedPw = unix_md5_crypt( $Pw, $Salt );
                 $Method    = 'unix_md5_crypt';
             }
-
         }
 
         # sha256 pw
@@ -190,13 +190,13 @@ sub Auth {
         elsif ( $GetPw =~ m{^BCRYPT:} ) {
 
             # require module, log errors if module was not found
-            if ( !$Kernel::OM->Get('Kernel::System::Main')->Require('Crypt::Eksblowfish::Bcrypt') )
-            {
+            if ( !$Kernel::OM->Get('Kernel::System::Main')->Require('Crypt::Eksblowfish::Bcrypt') ) {
                 $Kernel::OM->Get('Kernel::System::Log')->Log(
                     Priority => 'error',
                     Message  =>
                         "User: $User tried to authenticate with bcrypt but 'Crypt::Eksblowfish::Bcrypt' is not installed!",
                 );
+
                 return;
             }
 
@@ -248,7 +248,7 @@ sub Auth {
     # crypt pw
     else {
 
-        # strip Salt only for (Extended) DES, not for any of Modular crypt's
+        # strip salt only for (Extended) DES, not for any of modular crypts
         if ( $Salt !~ /^\$\d\$/ ) {
             $Salt =~ s/^(..).*/$1/;
         }
@@ -291,8 +291,7 @@ sub Auth {
     }
 
     # login note
-    elsif ( ( ($GetPw) && ($User) && ($UserID) ) && $CryptedPw eq $GetPw ) {
-
+    elsif ( $GetPw && $User && $UserID && $CryptedPw eq $GetPw ) {
         $Kernel::OM->Get('Kernel::System::Log')->Log(
             Priority => 'notice',
             Message  => "User: $User authentication ok (Method: $Method, REMOTE_ADDR: $RemoteAddr).",
@@ -302,7 +301,7 @@ sub Auth {
     }
 
     # just a note
-    elsif ( ($UserID) && ($GetPw) ) {
+    elsif ( $UserID && $GetPw ) {
         $Kernel::OM->Get('Kernel::System::Log')->Log(
             Priority => 'notice',
             Message  =>