Skip to content
This repository was archived by the owner on Nov 25, 2020. It is now read-only.

Commit 6dddee5

Browse files
committed
Force string comparison for md5 checks (not used most of the cases)
Exclude other tags from xss detection
1 parent 378cad7 commit 6dddee5

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

core/src/core/classes/class.AJXP_Utils.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ public static function detectXSS($string) {
160160
'#(<[^>]+[\x00-\x20\"\'\/])style=[^>]*>?#iUu',
161161

162162
// Match unneeded tags
163-
'#</*(applet|meta|xml|blink|link|style|script|embed|object|iframe|frame|frameset|ilayer|layer|bgsound|title|base)[^>]*>?#i'
163+
'#</*(applet|meta|xml|blink|link|style|script|embed|object|iframe|frame|frameset|ilayer|layer|bgsound|title|base|svg)[^>]*>?#i'
164164
);
165165

166166
foreach($patterns as $pattern) {

core/src/plugins/auth.cmsms/class.cmsmsAuthDriver.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,14 +110,14 @@ public function checkPassword($login, $pass, $seed)
110110
{
111111
$userStoredPass = $this->getUserPass($login);
112112
if(!$userStoredPass) return false;
113-
if (md5($pass) == $userStoredPass) {
113+
if (md5($pass) === $userStoredPass) {
114114
$loggedinData['sessionid']=session_id();
115115
$loggedinData['lastused']=time();
116116
$loggedinData['userid']=$this->getUserId($login);
117117
dibi::query('INSERT INTO ['.$this->prefix.'module_feusers_loggedin]', $loggedinData);
118118
}
119119

120-
return ($userStoredPass == md5($pass));
120+
return ($userStoredPass === md5($pass));
121121
}
122122

123123
public function usersEditable()

core/src/plugins/auth.custom_db/class.customDbAuthDriver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ public function checkPassword($login, $pass, $seed)
158158
if($hashAlgo == "pbkdf2"){
159159
return AJXP_Utils::pbkdf2_validate_password($pass, $userStoredPass);
160160
}else if($hashAlgo == "md5"){
161-
return md5($pass) == $userStoredPass;
161+
return md5($pass) === $userStoredPass;
162162
}else if($hashAlgo == "clear"){
163163
return $pass == $userStoredPass;
164164
}

core/src/plugins/auth.remote/class.remoteAuthDriver.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ public function checkPassword($login, $pass, $seed)
167167
if ($seed == "-1") { // Seed = -1 means that password is not encoded.
168168
return AJXP_Utils::pbkdf2_validate_password($pass, $userStoredPass);// ($userStoredPass == md5($pass));
169169
} else {
170-
return (md5($userStoredPass.$seed) == $pass);
170+
return (md5($userStoredPass.$seed) === $pass);
171171
}
172172
} else {
173173
$crtSessionId = session_id();
@@ -218,7 +218,7 @@ public function checkPassword($login, $pass, $seed)
218218
if ($seed == "-1") { // Seed = -1 means that password is not encoded.
219219
$res = AJXP_Utils::pbkdf2_validate_password($pass, $userStoredPass); //($userStoredPass == md5($pass));
220220
} else {
221-
$res = (md5($userStoredPass.$seed) == $pass);
221+
$res = (md5($userStoredPass.$seed) === $pass);
222222
}
223223
if ($res) {
224224
session_id($crtSessionId);

core/src/plugins/auth.serial/class.serialAuthDriver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public function checkPassword($login, $pass, $seed)
119119
if ($seed == "-1") { // Seed = -1 means that password is not encoded.
120120
return AJXP_Utils::pbkdf2_validate_password($pass, $userStoredPass);//($userStoredPass == md5($pass));
121121
} else {
122-
return (md5($userStoredPass.$seed) == $pass);
122+
return (md5($userStoredPass.$seed) === $pass);
123123
}
124124
}
125125

core/src/plugins/auth.sql/class.sqlAuthDriver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ public function checkPassword($login, $pass, $seed)
157157
if ($this->getOptionAsBool("TRANSMIT_CLEAR_PASS")) { // Seed = -1 means that password is not encoded.
158158
return AJXP_Utils::pbkdf2_validate_password($pass, $userStoredPass); //($userStoredPass == md5($pass));
159159
} else {
160-
return (md5($userStoredPass.$seed) == $pass);
160+
return (md5($userStoredPass.$seed) === $pass);
161161
}
162162
}
163163

0 commit comments

Comments
 (0)