Skip to content

Commit d16a885

Browse files
author
Kristan Kenney
committed
Rename policy to POLICY_SYSTEM_PROTECTED_ADMIN
1 parent edb7ff5 commit d16a885

File tree

18 files changed

+49
-49
lines changed

18 files changed

+49
-49
lines changed

‎bin/v-list-sys-config‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ json_list() {
7575
"DEBUG_MODE": "'$DEBUG_MODE'",
7676
"API": "'$API'",
7777
"API_ALLOWED_IP": "'$API_ALLOWED_IP'",
78-
"RESTRICTED_ADMIN": "'$RESTRICTED_ADMIN'",
78+
"POLICY_SYSTEM_PROTECTED_ADMIN": "'$POLICY_SYSTEM_PROTECTED_ADMIN'",
7979
"POLICY_SYSTEM_HIDE_ADMIN": "'$POLICY_SYSTEM_HIDE_ADMIN'",
8080
"POLICY_USER_EDIT_DETAILS": "'$POLICY_USER_EDIT_DETAILS'",
8181
"POLICY_USER_DELETE_LOGS": "'$POLICY_USER_DELETE_LOGS'",
@@ -178,7 +178,7 @@ shell_list() {
178178
echo "Release Branch: $RELEASE_BRANCH"
179179
echo "Debug Mode: $DEBUG_MODE"
180180
echo "Theme: $THEME"
181-
echo "Restricted Admin Access: $RESTRICTED_ADMIN"
181+
echo "Restricted Admin Access: $POLICY_SYSTEM_PROTECTED_ADMIN"
182182
echo "Hide System Administator: $POLICY_SYSTEM_HIDE_ADMIN"
183183
echo "Updates: Notify by email: $UPGRADE_SEND_EMAIL"
184184
echo "Updates: Email install log: $UPGRADE_SEND_EMAIL_LOG"
@@ -196,7 +196,7 @@ plain_list() {
196196
echo -ne "$SMTP_RELAY_HOST\t$SMTP_RELAY_PORT\t$SMTP_RELAY_USER\t"
197197
echo -ne "$UPGRADE_SEND_EMAIL\t$UPGRADE_SEND_EMAIL_LOG\t$THEME\t$LANGUAGE\t$BACKUP_GZIP\t"
198198
echo -ne "$BACKUP\t$WEBMAIL_ALIAS\t$DB_PMA_URL\t$DB_PGA_URL\t\t$DEBUG_MODE\t$API\t$API_ALLOWED_IP"
199-
echo -e "$RESTRICTED_ADMIN\t$POLICY_SYSTEM_HIDE_ADMIN"
199+
echo -e "$POLICY_SYSTEM_PROTECTED_ADMIN\t$POLICY_SYSTEM_HIDE_ADMIN"
200200
}
201201

202202

@@ -214,7 +214,7 @@ csv_list() {
214214
echo -n "'UPGRADE_SEND_EMAIL','UPGRADE_SEND_EMAIL_LOG',"
215215
echo -n "'THEME', 'LANGUAGE','BACKUP_GZIP','BACKUP','WEBMAIL_ALIAS',"
216216
echo -n "'DB_PMA_ALIAS','DB_PGA_ALIAS','DEBUG_MODE','API','API_ALLOWED_IP',"
217-
echo -n "'RESTRICTED_ADMIN',POLICY_SYSTEM_HIDE_ADMIN'"
217+
echo -n "'POLICY_SYSTEM_PROTECTED_ADMIN',POLICY_SYSTEM_HIDE_ADMIN'"
218218
echo
219219
echo -n "'$WEB_SYSTEM','$WEB_RGROUPS','$WEB_PORT','$WEB_SSL',"
220220
echo -n "'$WEB_SSL_PORT','$WEB_BACKEND','$PROXY_SYSTEM','$PROXY_PORT',"
@@ -226,7 +226,7 @@ csv_list() {
226226
echo -n "'$SMTP_RELAY','$SMTP_RELAY_HOST','$SMTP_RELAY_PORT','$SMTP_RELAY_USER',"
227227
echo -n "'$UPGRADE_SEND_EMAIL','$UPGRADE_SEND_EMAIL_LOG','$THEME','$LANGUAGE',"
228228
echo -n "'$BACKUP_GZIP','$BACKUP','$WEBMAIL_ALIAS','$DB_PMA_URL','$DB_PGA_URL'"
229-
echo -n "'$DEBUG_MODE','$API','$API_ALLOWED_IP','$RESTRICTED_ADMIN,$POLICY_SYSTEM_HIDE_ADMIN"
229+
echo -n "'$DEBUG_MODE','$API','$API_ALLOWED_IP','$POLICY_SYSTEM_PROTECTED_ADMIN,$POLICY_SYSTEM_HIDE_ADMIN"
230230

231231
echo
232232
}

‎install/deb/filemanager/filegator/backend/Services/Auth/Adapters/HestiaAuth.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function init(array $config = [])
3232
if (isset($_SESSION['user'])) {
3333
$v_user = $_SESSION['user'];
3434
}
35-
if (isset($_SESSION['look']) && ($_SESSION['userContext'] === 'admin') && ($_SESSION['RESTRICTED_ADMIN'] === 'no')) {
35+
if (isset($_SESSION['look']) && ($_SESSION['userContext'] === 'admin') && ($_SESSION['POLICY_SYSTEM_PROTECTED_ADMIN'] === 'no')) {
3636
$v_user = $_SESSION['look'];
3737
}
3838
$this->hestia_user = $v_user;

‎install/deb/filemanager/filegator/configuration.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
if (isset($_SESSION['user'])) {
1616
$v_user = $_SESSION['user'];
1717
}
18-
if (isset($_SESSION['look']) && ($_SESSION['userContext'] === 'admin') && ($_SESSION['RESTRICTED_ADMIN'] === 'no')) {
18+
if (isset($_SESSION['look']) && ($_SESSION['userContext'] === 'admin') && ($_SESSION['POLICY_SYSTEM_PROTECTED_ADMIN'] === 'no')) {
1919
$v_user = $_SESSION['look'];
2020
}
2121
# Create filemanager sftp key if missing and trash it after 30 min

‎install/hst-install-debian.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1682,7 +1682,7 @@ check_result $? "can't create admin user"
16821682
$HESTIA/bin/v-change-user-shell admin nologin
16831683
$HESTIA/bin/v-change-user-role admin admin
16841684
$HESTIA/bin/v-change-user-language admin $lang
1685-
$HESTIA/bin/v-change-sys-config-value 'RESTRICTED_ADMIN' 'yes'
1685+
$HESTIA/bin/v-change-sys-config-value 'POLICY_SYSTEM_PROTECTED_ADMIN' 'yes'
16861686

16871687
# Roundcube permissions fix
16881688
if [ "$exim" = 'yes' ] && [ "$mysql" = 'yes' ]; then

‎install/hst-install-ubuntu.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1703,7 +1703,7 @@ check_result $? "can't create admin user"
17031703
$HESTIA/bin/v-change-user-shell admin nologin
17041704
$HESTIA/bin/v-change-user-role admin admin
17051705
$HESTIA/bin/v-change-user-language admin $lang
1706-
$HESTIA/bin/v-change-sys-config-value 'RESTRICTED_ADMIN' 'yes'
1706+
$HESTIA/bin/v-change-sys-config-value 'POLICY_SYSTEM_PROTECTED_ADMIN' 'yes'
17071707

17081708
# Configuring system IPs
17091709
$HESTIA/bin/v-update-sys-ip > /dev/null 2>&1

‎web/edit/server/index.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -728,18 +728,18 @@
728728
}
729729
}
730730

731-
// Change RESTRICTED_ADMIN
731+
// Change POLICY_SYSTEM_PROTECTED_ADMIN
732732
if (empty($_SESSION['error_msg'])) {
733-
if ($_POST['v_restrict_admin'] != $_SESSION['RESTRICTED_ADMIN']) {
734-
exec (HESTIA_CMD."v-change-sys-config-value RESTRICTED_ADMIN ".escapeshellarg($_POST['v_restrict_admin']), $output, $return_var);
733+
if ($_POST['v_policy_system_protected_admin'] != $_SESSION['POLICY_SYSTEM_PROTECTED_ADMIN']) {
734+
exec (HESTIA_CMD."v-change-sys-config-value POLICY_SYSTEM_PROTECTED_ADMIN ".escapeshellarg($_POST['v_policy_system_protected_admin']), $output, $return_var);
735735
check_return_code($return_var,$output);
736736
unset($output);
737-
if (empty($_SESSION['error_msg'])) $v_enforce_subdomain_ownership = $_POST['v_restrict_admin'];
737+
if (empty($_SESSION['error_msg'])) $v_enforce_subdomain_ownership = $_POST['v_policy_system_protected_admin'];
738738
$v_security_adv = 'yes';
739739
}
740740
}
741741

742-
// Change RESTRICTED_ADMIN
742+
// Change POLICY_SYSTEM_PROTECTED_ADMIN
743743
if (empty($_SESSION['error_msg'])) {
744744
if ($_POST['v_policy_system_hide_admin'] != $_SESSION['POLICY_SYSTEM_HIDE_ADMIN']) {
745745
exec (HESTIA_CMD."v-change-sys-config-value POLICY_SYSTEM_HIDE_ADMIN ".escapeshellarg($_POST['v_policy_system_hide_admin']), $output, $return_var);

‎web/templates/admin/edit_server.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1034,9 +1034,9 @@
10341034
</tr>
10351035
<tr>
10361036
<td>
1037-
<select class="vst-list" name="v_restrict_admin">
1037+
<select class="vst-list" name="v_policy_system_protected_admin">
10381038
<option value='yes'><?php print _('yes'); ?></option>
1039-
<option value='no' <?php if($_SESSION['RESTRICTED_ADMIN'] == 'no') echo 'selected' ?> ><?php print _('no'); ?></option>
1039+
<option value='no' <?php if($_SESSION['POLICY_SYSTEM_PROTECTED_ADMIN'] == 'no') echo 'selected' ?> ><?php print _('no'); ?></option>
10401040
</select>
10411041
<br><br>
10421042
</td>

‎web/templates/admin/list_backup.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="l-center">
22
<div class="l-sort clearfix noselect">
33
<div class="l-unit-toolbar__buttonstrip">
4-
<? if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin') && ($_SESSION['RESTRICTED_ADMIN'] === 'yes')) {?>
4+
<? if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin') && ($_SESSION['POLICY_SYSTEM_PROTECTED_ADMIN'] === 'yes')) {?>
55
<!-- Hide item creation button when impersonating 'admin' account -->
66
<? } else { ?>
77
<a href="/schedule/backup/?token=<?=$_SESSION['token']?>" class="ui-button cancel" dir="ltr"><i class="fas fa-plus-circle status-icon green"></i><?=_('Create Backup')?></a>
@@ -18,7 +18,7 @@
1818
<button type="submit" class="l-sort-toolbar__filter-apply" onclick="return doSearch('/search/')" value="" title="<?=_('Search')?>"><i class="fas fa-search"></i></button>
1919
</form>
2020
</td>
21-
<? if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin') && ($_SESSION['RESTRICTED_ADMIN'] === 'yes')) {?>
21+
<? if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin') && ($_SESSION['POLICY_SYSTEM_PROTECTED_ADMIN'] === 'yes')) {?>
2222
<!-- Hide bulk actions for domain items when impersonating 'admin' account-->
2323
<? } else { ?>
2424
<td>
@@ -83,7 +83,7 @@
8383
<input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" title="<?=_('Select')?>" name="backup[]" value="<?php echo $key ?>">
8484
</div>
8585
<div class="clearfix l-unit__stat-col--left wide-3 truncate">
86-
<? if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin') && ($_SESSION['RESTRICTED_ADMIN'] === 'yes')) {?>
86+
<? if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin') && ($_SESSION['POLICY_SYSTEM_PROTECTED_ADMIN'] === 'yes')) {?>
8787
<b><?=$key?></b>
8888
<? } else { ?>
8989
<b><a href="/list/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('restore')?>"><?=$key?></a></b>
@@ -93,7 +93,7 @@
9393
<div class="clearfix l-unit__stat-col--left compact-4 text-right">
9494
<div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
9595
<div class="actions-panel clearfix">
96-
<? if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin') && ($_SESSION['RESTRICTED_ADMIN'] === 'yes')) {?>
96+
<? if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin') && ($_SESSION['POLICY_SYSTEM_PROTECTED_ADMIN'] === 'yes')) {?>
9797
<!-- Restrict ability to restore or delete backups when impersonating 'admin' account -->
9898
&nbsp;
9999
<? } else { ?>

‎web/templates/admin/list_cron.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="l-center">
22
<div class="l-sort clearfix noselect">
33
<div class="l-unit-toolbar__buttonstrip">
4-
<? if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin') && ($_SESSION['RESTRICTED_ADMIN'] === 'yes')) {?>
4+
<? if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin') && ($_SESSION['POLICY_SYSTEM_PROTECTED_ADMIN'] === 'yes')) {?>
55
<!-- Hide item creation button when impersonating 'admin' account -->
66
<? } else { ?>
77
<a href="/add/cron/" id="btn-create" class="ui-button cancel" dir="ltr"><i class="fas fa-plus-circle status-icon green"></i><?=_('Add Cron Job')?></a>
@@ -29,7 +29,7 @@
2929
<button type="submit" class="l-sort-toolbar__filter-apply" onclick="return doSearch('/search/')" value="" title="<?=_('Search')?>"><i class="fas fa-search"></i></button>
3030
</form>
3131
</td>
32-
<? if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin') && ($_SESSION['RESTRICTED_ADMIN'] === 'yes')) {?>
32+
<? if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin') && ($_SESSION['POLICY_SYSTEM_PROTECTED_ADMIN'] === 'yes')) {?>
3333
<!-- Hide bulk actions for domain items when impersonating 'admin' account-->
3434
<? } else { ?>
3535
<td class="">
@@ -95,7 +95,7 @@
9595
<input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" title="<?=_('Select')?>" name="job[]" value="<?php echo $key ?>">
9696
</div>
9797
<div class="clearfix l-unit__stat-col--left wide-5 truncate">
98-
<? if (($_SESSION['userContext'] === 'admin') && (isset($_SESSION['look'])) && ($_SESSION['look'] === 'admin') && ($_SESSION['RESTRICTED_ADMIN'] === 'yes') || ($data[$key]['SUSPENDED'] == 'yes')) {?>
98+
<? if (($_SESSION['userContext'] === 'admin') && (isset($_SESSION['look'])) && ($_SESSION['look'] === 'admin') && ($_SESSION['POLICY_SYSTEM_PROTECTED_ADMIN'] === 'yes') || ($data[$key]['SUSPENDED'] == 'yes')) {?>
9999
<b><?=htmlspecialchars($data[$key]['CMD'], ENT_NOQUOTES)?></b>
100100
<? } else { ?>
101101
<b><a href="/edit/cron/?job=<?=$data[$key]['JOB']?>&token=<?=$_SESSION['token']?>" title="<?=_('Editing Cron Job')?>: <?=htmlspecialchars($data[$key]['CMD'], ENT_NOQUOTES)?>"><?=htmlspecialchars($data[$key]['CMD'], ENT_NOQUOTES)?></a></b>
@@ -105,7 +105,7 @@
105105
<div class="clearfix l-unit__stat-col--left compact-2 text-right">
106106
<div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
107107
<div class="actions-panel clearfix">
108-
<? if (($_SESSION['userContext'] === 'admin') && (isset($_SESSION['look'])) && ($_SESSION['look'] === 'admin') && ($_SESSION['RESTRICTED_ADMIN'] === 'yes')) {?>
108+
<? if (($_SESSION['userContext'] === 'admin') && (isset($_SESSION['look'])) && ($_SESSION['look'] === 'admin') && ($_SESSION['POLICY_SYSTEM_PROTECTED_ADMIN'] === 'yes')) {?>
109109
<!-- Restrict other administrators from editing, deleting, or suspending 'admin' user cron jobs -->
110110
&nbsp;
111111
<? } else { ?>

‎web/templates/admin/list_db.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<div class="l-center">
1515
<div class="l-sort clearfix noselect">
1616
<div class="l-unit-toolbar__buttonstrip">
17-
<? if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin') && ($_SESSION['RESTRICTED_ADMIN'] === 'yes')) {?>
17+
<? if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin') && ($_SESSION['POLICY_SYSTEM_PROTECTED_ADMIN'] === 'yes')) {?>
1818
<!-- Hide item creation button when impersonating 'admin' account -->
1919
<? } else {?>
2020
<a href="/add/db/" id="btn-create" class="ui-button cancel" dir="ltr"><i class="fas fa-plus-circle status-icon green"></i><?=_('Add Database')?></a>
@@ -46,7 +46,7 @@
4646
<button type="submit" class="l-sort-toolbar__filter-apply" onclick="return doSearch('/search/')" value="" title="<?=_('Search')?>"><i class="fas fa-search"></i></button>
4747
</form>
4848
</td>
49-
<? if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin') && ($_SESSION['RESTRICTED_ADMIN'] === 'yes')) {?>
49+
<? if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin') && ($_SESSION['POLICY_SYSTEM_PROTECTED_ADMIN'] === 'yes')) {?>
5050
<!-- Hide bulk actions for domain items when impersonating 'admin' account-->
5151
<? } else { ?>
5252
<td>
@@ -122,7 +122,7 @@
122122
<input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" title="<?=_('Select')?>" name="database[]" value="<?php echo $key ?>">
123123
</div>
124124
<div class="clearfix l-unit__stat-col--left wide-3 truncate">
125-
<? if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin') && ($_SESSION['RESTRICTED_ADMIN'] === 'yes') || ($data[$key]['SUSPENDED'] == 'yes')) {?>
125+
<? if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin') && ($_SESSION['POLICY_SYSTEM_PROTECTED_ADMIN'] === 'yes') || ($data[$key]['SUSPENDED'] == 'yes')) {?>
126126
<b><?=$key?></b>
127127
<? } else { ?>
128128
<b><a href="/edit/db/?database=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?=_('Editing Database')?>: <?=$key?>"><?=$key?></a></b>
@@ -132,7 +132,7 @@
132132
<div class="clearfix l-unit__stat-col--left text-right compact-3">
133133
<div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
134134
<div class="actions-panel clearfix">
135-
<? if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin') && ($_SESSION['RESTRICTED_ADMIN'] === 'yes')) {?>
135+
<? if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin') && ($_SESSION['POLICY_SYSTEM_PROTECTED_ADMIN'] === 'yes')) {?>
136136
<!-- Restrict the ability to edit, delete, or suspend domain items when impersonating 'admin' user -->
137137
&nbsp;
138138
<? } else { ?>

0 commit comments

Comments
 (0)