From: Amos Jeffries <amosjeffries@squid-cache.org>
Date: Sun, 1 Aug 2010 13:13:10 +0000 (-0600)
Subject: Author: Milen Pankov <mail@milen.pankov.eu>
X-Git-Tag: SQUID_3_1_6~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e675155ec28e124b90757196243f2832898ac018;p=thirdparty%2Fsquid.git

Author: Milen Pankov <mail@milen.pankov.eu>
squid_db_auth support md5 encrypted passwords

--md5 option supporting unsalted MD5 password
---

diff --git a/helpers/basic_auth/DB/squid_db_auth.in b/helpers/basic_auth/DB/squid_db_auth.in
index b49782da96..615c47bc28 100644
--- a/helpers/basic_auth/DB/squid_db_auth.in
+++ b/helpers/basic_auth/DB/squid_db_auth.in
@@ -22,6 +22,7 @@ my $db_usercol = "user";
 my $db_passwdcol = "password";
 my $db_cond = "enabled = 1";
 my $plaintext = 0;
+my $md5 = 0;
 my $persist = 0;
 my $isjoomla = 0;
 my $debug = 0;
@@ -72,6 +73,10 @@ If you use --joomla flag, this condition will be changed to block=0
 
 Database contains plain-text passwords
 
+=item   B<--md5>
+
+Database contains unsalted md5 passwords
+
 =item	B<--salt>
 
 Selects the correct salt to evaluate passwords
@@ -98,6 +103,7 @@ GetOptions(
 	'passwdcol=s' => \$db_passwdcol,
 	'cond=s' => \$db_cond,
 	'plaintext' => \$plaintext,
+	'md5' => \$md5,
 	'persist' => \$persist,
 	'joomla' => \$isjoomla,
 	'debug' => \$debug,
@@ -142,6 +148,7 @@ sub check_password($$)
     else{
         return 1 if defined $hashsalt && crypt($password, $hashsalt) eq $key;
         return 1 if crypt($password, $key) eq $key;
+        return 1 if $md5 && md5_hex($password) eq $key;
         return 1 if $plaintext && $password eq $key;
     }