Skip to content

Commit

Permalink
system: remove the user-shell-access privilege #2154
Browse files Browse the repository at this point in the history
Eventually, the two remaining user privileges should be killed
as well in favour of similar approaches.  The ACL should be for
page access, not more, not less.
  • Loading branch information
fichtner committed Feb 4, 2018
1 parent c8bdf3e commit 5a9f6c4
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 10 deletions.
2 changes: 1 addition & 1 deletion src/etc/config.xml.sample
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,6 @@
<scope>system</scope>
<gid>1999</gid>
<member>0</member>
<priv>user-shell-access</priv>
<priv>page-all</priv>
</group>
<user>
Expand All @@ -205,6 +204,7 @@
<groupname>admins</groupname>
<password>$2b$10$YRVoF4SgskIsrXOvOQjGieB9XqHPRra9R7d80B3BZdbY/j21TwBfS</password>
<uid>0</uid>
<shell>/bin/csh</shell>
</user>
<nextuid>2000</nextuid>
<nextgid>2000</nextgid>
Expand Down
6 changes: 0 additions & 6 deletions src/etc/inc/auth.inc
Original file line number Diff line number Diff line change
Expand Up @@ -455,12 +455,6 @@ function local_user_set(&$user, $force_password = false)
$user_group = 'wheel';
}

/* configure shell type */
if (userHasPrivilege($user, 'user-shell-access')) {
/* XXX override the shell for this privilege so we can zap it in 18.7 */
$user_shell = '/bin/csh';
}

/* unlock valid shell users */
if (!is_account_disabled($user_name) && !is_account_expired($user_name)) {
$lock_account = 'unlock';
Expand Down
3 changes: 0 additions & 3 deletions src/opnsense/mvc/app/models/OPNsense/Core/ACL/ACL.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
<user-config-readonly>
<name>System: Deny config write</name>
</user-config-readonly>
<user-shell-access>
<name>System: Shell account access</name>
</user-shell-access>
<user-proxy-auth>
<name>Proxy: Login</name>
</user-proxy-auth>
Expand Down

0 comments on commit 5a9f6c4

Please sign in to comment.