Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

T5145: Add maximum number of all logins on system #1939

Merged
merged 1 commit into from
Apr 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions data/templates/login/limits.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Generated by /usr/libexec/vyos/conf_mode/system-login.py

{% if max_login_session is vyos_defined %}
* - maxsyslogins {{ max_login_session }}
{% endif %}
13 changes: 13 additions & 0 deletions interface-definitions/system-login.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,19 @@
#include <include/interface/vrf.xml.i>
</children>
</node>
<leafNode name="max-login-session">
<properties>
<help>Maximum number of all login sessions</help>
<valueHelp>
<format>u32:1-65536</format>
<description>Maximum number of all login sessions</description>
</valueHelp>
<constraint>
<validator name="numeric" argument="--range 1-65536"/>
</constraint>
<constraintErrorMessage>Maximum logins must be between 1 and 65536</constraintErrorMessage>
</properties>
</leafNode>
<leafNode name="timeout">
<properties>
<help>Session timeout</help>
Expand Down
23 changes: 22 additions & 1 deletion smoketest/scripts/cli/test_system_login.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
#
# Copyright (C) 2019-2022 VyOS maintainers and contributors
# Copyright (C) 2019-2023 VyOS maintainers and contributors
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 or later as
Expand Down Expand Up @@ -264,5 +264,26 @@ def test_system_login_radius_ipv6(self):
tmp = re.findall(r'group:\s+mapname\s+files', nsswitch_conf)
self.assertTrue(tmp)

def test_system_login_max_login_session(self):
max_logins = '2'
timeout = '600'

self.cli_set(base_path + ['max-login-session', max_logins])

# 'max-login-session' must be only with 'timeout' option
with self.assertRaises(ConfigSessionError):
self.cli_commit()

self.cli_set(base_path + ['timeout', timeout])

self.cli_commit()

security_limits = read_file('/etc/security/limits.d/10-vyos.conf')
self.assertIn(f'* - maxsyslogins {max_logins}', security_limits)

self.cli_delete(base_path + ['timeout'])
self.cli_delete(base_path + ['max-login-session'])


if __name__ == '__main__':
unittest.main(verbosity=2)
14 changes: 13 additions & 1 deletion src/conf_mode/system-login.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
#
# Copyright (C) 2020-2022 VyOS maintainers and contributors
# Copyright (C) 2020-2023 VyOS maintainers and contributors
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 or later as
Expand Down Expand Up @@ -40,6 +40,7 @@
airbag.enable()

autologout_file = "/etc/profile.d/autologout.sh"
limits_file = "/etc/security/limits.d/10-vyos.conf"
radius_config_file = "/etc/pam_radius_auth.conf"

# LOGIN_TIMEOUT from /etc/loign.defs minus 10 sec
Expand Down Expand Up @@ -164,6 +165,9 @@ def verify(login):
if ipv6_count > 1:
raise ConfigError('Only one IPv6 source-address can be set!')

if 'max_login_session' in login and 'timeout' not in login:
raise ConfigError('"login timeout" must be configured!')

return None


Expand Down Expand Up @@ -226,6 +230,14 @@ def generate(login):
if os.path.isfile(radius_config_file):
os.unlink(radius_config_file)

# /etc/security/limits.d/10-vyos.conf
if 'max_login_session' in login:
render(limits_file, 'login/limits.j2', login,
permission=0o644, user='root', group='root')
else:
if os.path.isfile(limits_file):
os.unlink(limits_file)

if 'timeout' in login:
render(autologout_file, 'login/autologout.j2', login,
permission=0o755, user='root', group='root')
Expand Down