X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fauth.php;h=49b953ffedaefddd4e3ec48b4c0ed55408493245;hb=cc51047fc1b0a21a0491c34487661698567c2100;hp=53b96d9f717e27ee90ef326bc99bb62dfe9fa452;hpb=0940b016e1d622661909f2787ceebe468b04a8bc;p=squirrelmail.git diff --git a/functions/auth.php b/functions/auth.php index 53b96d9f..49b953ff 100644 --- a/functions/auth.php +++ b/functions/auth.php @@ -71,19 +71,26 @@ function sqauth_read_password() { /** * Saves or updates user password information * - * This function is used to update password information that SquirrelMail - * stores during existing web session. It does not modify password stored - * in authentication system used by IMAP server. + * This function is used to update the password information that + * SquirrelMail stores in the existing PHP session. It does NOT + * modify the password stored in the authentication system used + * by the IMAP server. + * + * This function must be called before any html output is started. + * Direct access to password information is deprecated. The saved + * password information is available only to the SquirrelMail script + * that is called/executed AFTER the current one. If your script + * needs access to the saved password after a sqauth_save_password() + * call, use the returned OTP encrypted key. * - * Function must be called before any html output started. Direct access - * to password information is deprecated. Saved password information is - * available only to next executed SquirrelMail script. If your script needs - * access to saved password after sqauth_save_password() call, use returned - * OTP encrypted key. * @param string $pass password - * @return string password encrypted with OTP. In case script wants to access - * password information before reloading page. + * + * @return string Password encrypted with OTP. In case the script + * wants to access the password information before + * the end of its execution. + * * @since 1.5.1 + * */ function sqauth_save_password($pass) { sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION); @@ -131,6 +138,7 @@ function cram_md5_response ($username,$password,$challenge) { */ function digest_md5_response ($username,$password,$challenge,$service,$host,$authz='') { $result=digest_md5_parse_challenge($challenge); + //FIXME we should check that $result contains the expected values that we use below // verify server supports qop=auth // $qop = explode(",",$result['qop']); @@ -192,7 +200,8 @@ function digest_md5_response ($username,$password,$challenge,$service,$host,$aut */ function digest_md5_parse_challenge($challenge) { $challenge=base64_decode($challenge); - while (isset($challenge)) { + $parsed = array(); + while (!empty($challenge)) { if ($challenge{0} == ',') { // First char is a comma, must not be 1st time through loop $challenge=substr($challenge,1); }