Skip to content

Commit 97c4d6c

Browse files
jaapmarcusjaapmarcus
committed
Fixes few merge issues + Updated /edit/server
1 parent 1beb1ed commit 97c4d6c

File tree

12 files changed

+70
-56
lines changed

12 files changed

+70
-56
lines changed

‎bin/v-list-user-auth-log‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,20 @@ json_list() {
2828
DATE=$(echo "$str" |cut -f 6 -d \')
2929
TIME=$(echo "$str" |cut -f 8 -d \')
3030
ACTIVE=$(echo "$str" |cut -f 10 -d \')
31-
CMD=${CMD//\"/\\\"}
32-
echo -n ' {
33-
"DATE": "'$DATE'",
34-
"TIME": "'$TIME'",
35-
"IP": "'$IP'",
36-
"FINGERPRINT": "'$FINGERPRINT'",
37-
"ACTIVE": "'$ACTIVE'",
38-
39-
}'
31+
echo -n ' "'$i'": {
32+
"IP": "'$IP'",
33+
"FINGERPRINT": "'$FINGERPRINT'",
34+
"TIME": "'$TIME'",
35+
"DATE": "'$DATE'",
36+
"ACTIVE": "'$ACTIVE'"
37+
}'
4038
if [ "$i" -lt "$objects" ]; then
4139
echo ','
4240
else
4341
echo
4442
fi
4543
((i++))
46-
done
44+
done
4745
echo '}'
4846
}
4947

‎web/edit/server/index.php‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -528,15 +528,26 @@
528528

529529
// Change login style
530530
if (empty($_SESSION['error_msg'])) {
531-
if ($_POST['v_login_style'] != $_SESSION['LOGIN_STYLE']) {
532-
exec (HESTIA_CMD."v-change-sys-config-value LOGIN_STYLE ".escapeshellarg($_POST['v_login_style']), $output, $return_var);
531+
if ($_POST['v_inactive_session_timeout'] != $_SESSION['INACTIVE_SESSION_TIMEOUT']) {
532+
exec (HESTIA_CMD."v-change-sys-config-value INACTIVE_SESSION_TIMEOUT ".escapeshellarg($_POST['v_inactive_session_timeout']), $output, $return_var);
533533
check_return_code($return_var,$output);
534534
unset($output);
535-
if (empty($_SESSION['error_msg'])) $v_login_style = $_POST['v_login_style'];
535+
if (empty($_SESSION['error_msg'])) $v_login_style = $_POST['v_inactive_session_timeout'];
536536
$v_security_adv = 'yes';
537537
}
538538
}
539539

540+
// Change login style
541+
if (empty($_SESSION['error_msg'])) {
542+
if ($_POST['v_login_style'] != $_SESSION['LOGIN_STYLE']) {
543+
exec (HESTIA_CMD."v-change-sys-config-value LOGIN_STYLE ".escapeshellarg($_POST['v_login_style']), $output, $return_var);
544+
check_return_code($return_var,$output);
545+
unset($output);
546+
if (empty($_SESSION['error_msg'])) $v_login_style = $_POST['v_login_style'];
547+
$v_security_adv = 'yes';
548+
}
549+
}
550+
540551
// Update SSL certificate
541552
if ((!empty($_POST['v_ssl_crt'])) && (empty($_SESSION['error_msg']))) {
542553
if (($v_ssl_crt != str_replace("\r\n", "\n", $_POST['v_ssl_crt'])) || ($v_ssl_key != str_replace("\r\n", "\n", $_POST['v_ssl_key']))) {

‎web/login/index.php‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
function authenticate_user($user, $password, $twofa = ''){
3535
if(isset($_SESSION['token']) && isset($_POST['token']) && $_POST['token'] == $_SESSION['token']) {
3636
$v_user = escapeshellarg($user);
37-
$v_ip = escapeshellarg($_SERVER['REMOTE_ADDR']);
37+
$ip = $_SERVER['REMOTE_ADDR'];
3838
if(isset($_SERVER['HTTP_CF_CONNECTING_IP'])){
3939
if(!empty($_SERVER['HTTP_CF_CONNECTING_IP'])){
4040
$ip = $_SERVER['HTTP_CF_CONNECTING_IP'];
@@ -88,10 +88,6 @@ function authenticate_user($user, $password, $twofa = ''){
8888
exec (HESTIA_CMD . "v-list-user ".$v_user." json", $output, $return_var);
8989
$data = json_decode(implode('', $output), true);
9090
if ($data[$user]['TWOFA'] != '') {
91-
if(password_verify($data[$user]['TWOFA'].$ip.$_POST['murmur'],$_COOKIE['limit2fa'])){
92-
93-
}else{
94-
setcookie('limit2fa','',time() - 3600,"/");
9591
if(empty($_POST['twofa'])){
9692
return false;
9793
}else{
@@ -107,8 +103,6 @@ function authenticate_user($user, $password, $twofa = ''){
107103
unset($_POST['twofa']);
108104
}
109105
}
110-
111-
}
112106
}
113107

114108
if ($data[$user]['ROLE'] == 'admin'){
@@ -123,10 +117,6 @@ function authenticate_user($user, $password, $twofa = ''){
123117
$v_murmur = escapeshellarg($_POST['murmur']);
124118
exec(HESTIA_CMD."v-log-user-login ".$v_user." ".$v_ip." ".$v_murmur, $output, $return_var);
125119

126-
//rename $_SESSION['TWOFA_VALID_LENGTH'] still to be done!
127-
if(empty($_COOKIE['limit2fa'] && $_SESSION['TWOFA_VALID_LENGTH'] == 1 && $data[$user]['TWOFA'] != "")){
128-
setcookie('limit2fa',password_hash($data[$user]['TWOFA'].$ip.$_POST['murmur'],PASSWORD_BCRYPT),time()+60*60*24,"/");
129-
};
130120
$_SESSION['LAST_ACTIVITY'] = time();
131121
$_SESSION['MURMUR'] = $_POST['murmur'];
132122

‎web/templates/admin/edit_server.html‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -866,6 +866,17 @@
866866
<br><br>
867867
</td>
868868
</tr>
869+
<tr>
870+
<td class="vst-text input-label">
871+
<?php print _('Inactive session length');?> (<?php print _('Minutes');?>)
872+
</td>
873+
</tr>
874+
<tr>
875+
<td>
876+
<input type="text" size="20" class="vst-input" name="v_inactive_session_timeout" value="<?=trim($_SESSION['INACTIVE_SESSION_TIMEOUT'], "'")?>">
877+
<br><br>
878+
</td>
879+
</tr>
869880
</table>
870881
</td>
871882
</tr>

‎web/templates/admin/edit_user.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="l-sort clearfix">
33
<div class="l-unit-toolbar__buttonstrip">
44
<a class="ui-button cancel" id="btn-back" href="/list/user/"><i class="fas fa-arrow-left status-icon blue"></i> <?=_('Back')?></a>
5-
<a href="/list/key/" id="btn-create" class="ui-button cancel" title="<?=__('Manage SSH keys');?>"><i class="fas fa-key status-icon orange"></i><?=_('Manage SSH keys')?></a>
5+
<a href="/list/key/" id="btn-create" class="ui-button cancel" title="<?=_('Manage SSH keys');?>"><i class="fas fa-key status-icon orange"></i><?=_('Manage SSH keys')?></a>
66
<a href="/edit/user/log/?user=<?php echo $_SESSION['user'];?>" id="btn-list" class="ui-button cancel" title="<?=_('Login history');?>"><i class="fas fa-key status-icon orange"></i><?=_('Login history')?></a>
77
</div>
88
<div class="l-unit-toolbar__buttonstrip float-right">

‎web/templates/admin/list_auth.html‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<div class="l-center">
22
<div class="l-sort clearfix noselect">
3-
<div class="l-unit-toolbar__buttonstrip">
4-
<a href="javascript:location.reload();" class="ui-button cancel" title="<?=__('Refresh')?>"><i class="fas fa-redo status-icon green"></i> <?=__('Refresh')?></a>
3+
<div class="l-unit-toolbar_buttonstrip">
4+
<a href="javascript:location.reload();" class="ui-button cancel" title="<?=_('Refresh')?>"><i class="fas fa-redo status-icon green"></i> <?=_('Refresh')?></a>
55
<div class="actions-panel display-inline-block" key-action="js">
6-
<a class="data-controls do_delete ui-button danger cancel" title="<?=__('Delete')?>">
6+
<a class="data-controls do_delete ui-button danger cancel" title="<?=_('Delete')?>">
77
<i class="do_delete fas fa-times-circle status-icon red"></i>
8-
<?=__('Delete')?>
8+
<?=_('Delete')?>
99
<input type="hidden" name="delete_url" value="/delete/user/log/?token=<?=$_SESSION['token']?>" />
10-
<div class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
11-
<p class="confirmation"><?=__('Delete authentication logs?')?></p>
10+
<div class="confirmation-text-delete hidden" title="<?=_('Confirmation')?>">
11+
<p class="confirmation"><?=_('Delete authentication logs?')?></p>
1212
</div>
1313
</a>
1414
</div>
@@ -23,15 +23,15 @@
2323
<div class="l-center units animated fadeIn">
2424

2525
<div class="header table-header">
26-
<div class="l-unit__col l-unit__col--right">
27-
<div class="clearfix l-unit__stat-col--left super-compact">
26+
<div class="l-unit_col l-unit_col--right">
27+
<div class="clearfix l-unit_stat-col--left super-compact">
2828
&nbsp;
2929
</div>
30-
<div class="clearfix l-unit__stat-col--left"><b><?php print __('Date');?></b></div>
31-
<div class="clearfix l-unit__stat-col--left"><b><?php print __('Time');?></b></div>
32-
<div class="clearfix l-unit__stat-col--left "><b><?php print __('Ip adress');?></b></div>
33-
<div class="clearfix l-unit__stat-col--left "><b><?php print __('Active');?></b></div>
34-
<div class="clearfix l-unit__stat-col--left "><b><?php print __('Browser Fingerprint');?></b></div>
30+
<div class="clearfix l-unit_stat-col--left"><b><?php print _('Date');?></b></div>
31+
<div class="clearfix l-unit_stat-col--left"><b><?php print _('Time');?></b></div>
32+
<div class="clearfix l-unit_stat-col--left"><b><?php print _('Ip adress');?></b></div>
33+
<div class="clearfix l-unit_stat-col--left"><b><?php print _('Active');?></b></div>
34+
<div class="clearfix l-unit_stat-col--left"><b><?php print _('Browser Fingerprint');?></b></div>
3535
</div>
3636
</div>
3737

@@ -40,15 +40,15 @@
4040
++$i;
4141
?>
4242
<div class="l-unit header">
43-
<div class="l-unit__col l-unit__col--right">
44-
<div class="clearfix l-unit__stat-col--left super-compact">
43+
<div class="l-unit_col l-unit_col--right">
44+
<div class="clearfix l-unit_stat-col--left super-compact">
4545
<i class="fas fa-info-circle status-icon dim"></i>
4646
</div>
47-
<div class="clearfix l-unit__stat-col--left "><b><?=translate_date($data[$key]['DATE'])?></b></div>
48-
<div class="clearfix l-unit__stat-col--left "><b><?=$data[$key]['TIME']?></b></div>
49-
<div class="clearfix l-unit__stat-col--left "><?=$data[$key]['IP']?></div>
50-
<div class="clearfix l-unit__stat-col--left small"><?=$data[$key]['ACTIVE']?></div>
51-
<div class="clearfix l-unit__stat-col--left "><?=$data[$key]['FINGERPRINT']?></div>
47+
<div class="clearfix l-unit_stat-col--left "><b><?=translate_date($data[$key]['DATE'])?></b></div>
48+
<div class="clearfix l-unit_stat-col--left "><b><?=$data[$key]['TIME']?></b></div>
49+
<div class="clearfix l-unit_stat-col--left "><?=$data[$key]['IP']?></div>
50+
<div class="clearfix l-unit_stat-col--left small"><?=$data[$key]['ACTIVE']?></div>
51+
<div class="clearfix l-unit_stat-col--left "><?=$data[$key]['FINGERPRINT']?></div>
5252
</div>
5353
</div>
5454
<?}?>
@@ -59,12 +59,12 @@
5959
<div class="l-center">
6060
<div class="l-unit-ft">
6161
<table class='data'></table>
62-
<div class="data-count l-unit__col l-unit__col--right clearfix">
62+
<div class="data-count l-unit_col l-unit_col--right clearfix">
6363
<?
6464
if ( $i == 1) {
65-
echo __('1 log record');
65+
echo _('1 log record');
6666
} else {
67-
echo __('%s log records',$i);
67+
echo _('%s log records',$i);
6868
}
6969
?>
7070
</div>

‎web/templates/header.html‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@
33
<head>
44
<meta charset="utf-8">
55
<link rel="icon" href="/images/favicon.ico" type="image/x-icon">
6-
<title><?php echo $_SERVER['HTTP_HOST']; ?> - <?=__($TAB)?> - <?=_('Hestia Control Panel');?></title>
6+
<title><?php echo $_SERVER['HTTP_HOST']; ?> - <?=_($TAB)?> - <?=_('Hestia Control Panel');?></title>
77
<link type="text/css" rel="stylesheet" href="/css/styles.min.css?<?=JS_LATEST_UPDATE?>" />
88
<link type="text/css" rel="stylesheet" href="/css/active-theme.css?<?php echo rand(); ?>" />
99
<link type="text/css" href="/css/animate.min.css?<?=JS_LATEST_UPDATE?>" rel="stylesheet" />
1010
<link type="text/css" href="/css/jquery-custom-dialogs.css?<?=JS_LATEST_UPDATE?>" rel="stylesheet" />
1111
<link type="text/css" href="/css/all.min.css?<?=JS_LATEST_UPDATE?>" rel="stylesheet" />
12-
<script src="/inc/jquery/jquery-3.4.1.min.js"></script>
13-
<script type="text/javascript" src="/js/fingerprint2.min.js?<?=JS_LATEST_UPDATE?>"></script>
1412
<script>
1513
//
1614
// GLOBAL SETTINGS

‎web/templates/login.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
</tr>
5252
</table>
5353
</center>
54-
54+
<script src="/inc/jquery/jquery-3.5.1.min.js"></script>
55+
<script type="text/javascript" src="/js/fingerprint2.min.js?<?=JS_LATEST_UPDATE?>"></script>
5556
</body>
5657
</html>

‎web/templates/login_1.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,5 +58,7 @@
5858
</tr>
5959
</table>
6060
</center>
61+
<script src="/inc/jquery/jquery-3.5.1.min.js"></script>
62+
<script type="text/javascript" src="/js/fingerprint2.min.js?<?=JS_LATEST_UPDATE?>"></script>
6163
</body>
6264
</html>

‎web/templates/login_2.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
<td style="padding: 40px 60px 0 0;" class="animated fadeIn">
1111
<form method="post" action="/login/" id="form_login">
1212
<input type="hidden" name="token" value="<?php echo $_SESSION['token']; ?>">
13-
<input type="hidden" name="user" value="<?php echo $_POST['user']; ?>">
14-
<input type="hidden" name="password" value="<?php echo $_POST['password']; ?>">
1513
<input type="hidden" name="murmur" value="" id="murmur">
1614
<table class="login-box">
1715
<tr>
@@ -58,5 +56,7 @@
5856
</tr>
5957
</table>
6058
</center>
59+
<script src="/inc/jquery/jquery-3.5.1.min.js"></script>
60+
<script type="text/javascript" src="/js/fingerprint2.min.js?<?=JS_LATEST_UPDATE?>"></script>
6161
</body>
6262
</html>

0 commit comments

Comments
 (0)