Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Add crypted pass on login form and using POST method

Browse Source
This commit is contained in:
VESSILLER
2024-01-10 09:20:49 +01:00
parent 232b1baa1c
commit cc474aa9ec
3 changed files with 40 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/public/webportal/tpl/login.tpl.php
View File

@@ -5,14 +5,12 @@ if (empty($context) || !is_object($context)) {
exit;
}
?>
<div class="login-page__container">
<div class="login-screen">
<div class="login-screen__content">
<form class="login">
<form class="login" method="POST">
<?php echo $context->getFormToken(); ?>
<input type="hidden" name="action_login" value="login">
<div class="login__logo"><!-- see --login-logo css var to change logo --></div>

2
htdocs/public/webportal/webportal.main.inc.php
View File

@@ -116,7 +116,7 @@ if (!defined('WEBPORTAL_NOLOGIN') && !empty($context->controllerInstance->access
//) {
// $context->setEventMessage($langs->trans("ErrorBadValueForCode"), 'errors');
// if (empty($focus_element)) $focus_element = 'security_code';
// $error++;s
// $error++;
//}
if (!$error) {

41
htdocs/webportal/class/context.class.php
View File

@@ -649,16 +649,16 @@ class Context
*
* @param string $login Login
* @param string $pass Password
* @return int Third-party account id
* @return int Third-party account id || <0 if error
*/
public function getThirdPartyAccountFromLogin($login, $pass)
{
$id = 0;
$sql = "SELECT sa.rowid as id";
$sql = "SELECT sa.rowid as id, sa.pass_crypted";
$sql .= " FROM " . $this->db->prefix() . "societe_account as sa";
$sql .= " WHERE BINARY sa.login = '" . $this->db->escape($login) . "'"; // case sensitive
$sql .= " AND BINARY sa.pass_crypted = '" . $this->db->escape($pass) . "'"; // case sensitive
//$sql .= " AND BINARY sa.pass_crypted = '" . $this->db->escape($pass) . "'"; // case sensitive
$sql .= " AND sa.site = 'dolibarr_portal'";
$sql .= " AND sa.status = 1";
$sql .= " AND sa.entity IN (" . getEntity('societe') . ")";
@@ -667,8 +667,41 @@ class Context
$result = $this->db->query($sql);
if ($result) {
if ($this->db->num_rows($result) == 1) {
$passok = false;
$obj = $this->db->fetch_object($result);
$id = $obj->id;
if ($obj) {
$passcrypted = $obj->pass_crypted;
// Check crypted password
$cryptType = '';
if (getDolGlobalString('DATABASE_PWD_ENCRYPTED')) {
$cryptType = getDolGlobalString('DATABASE_PWD_ENCRYPTED');
}
// By default, we use default setup for encryption rule
if (!in_array($cryptType, array('auto'))) {
$cryptType = 'auto';
}
// Check crypted password according to crypt algorithm
if ($cryptType == 'auto') {
if ($passcrypted && dol_verifyHash($pass, $passcrypted, '0')) {
$passok = true;
}
}
// Password ok ?
if ($passok) {
$id = $obj->id;
} else {
dol_syslog(__METHOD__ .' Authentication KO bad password for ' . $login . ', cryptType=' . $cryptType, LOG_NOTICE);
sleep(1); // Brut force protection. Must be same delay when login is not valid
return -3;
}
}
} else {
dol_syslog(__METHOD__ . ' Many third-party account found for login"' . $login . '" and site="dolibarr_portal"', LOG_ERR);
return -2;
}
} else {
$this->error = $this->db->lasterror();