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.

Sign up for GitHub

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

[FIX]tacacs max server return and same tacacs server return #3667

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

[FIX]tacacs max server return and same tacacs server return #3667

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
38f97e8
Update aaa.py of tacacs
651477787 Dec 9, 2024
8f12671
Update aaa.py
651477787 Dec 9, 2024
c27231a
Update aaa.py
651477787 Dec 9, 2024
c414528
Update aaa.py
651477787 Dec 9, 2024
23c6533
Update aaa.py
651477787 Dec 9, 2024
cb2eb4e
Update aaa.py
651477787 Dec 9, 2024
d1ae07b
Update aaa.py
651477787 Dec 20, 2024
a65c808
remove whitespace
651477787 Dec 23, 2024
36599cb
use f-string
651477787 Dec 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions config/aaa.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

ADHOC_VALIDATION = True
RADIUS_MAXSERVERS = 8
TACACS_MAXSERVERS = 8
RADIUS_PASSKEY_MAX_LEN = 65
VALID_CHARS_MSG = "Valid chars are ASCII printable except SPACE, '#', and ','"

Expand Down Expand Up @@ -265,9 +266,12 @@ def add(address, timeout, key, auth_type, port, pri, use_mgmt_vrf):

config_db = ValidatedConfigDBConnector(ConfigDBConnector())
config_db.connect()
old_data = config_db.get_entry('TACPLUS_SERVER', address)
if old_data != {}:
click.echo('server %s already exists' % address)
old_data = config_db.get_table('TACPLUS_SERVER')
ctx = click.get_current_context()
if address in old_data:
ctx.fail(f'server {address} already exists')
if len(old_data) == TACACS_MAXSERVERS:
ctx.fail(f'tacacs server reached max size {TACACS_MAXSERVERS}')
else:
data = {
'tcp_port': str(port),
Expand All @@ -284,7 +288,6 @@ def add(address, timeout, key, auth_type, port, pri, use_mgmt_vrf):
try:
config_db.set_entry('TACPLUS_SERVER', address, data)
except ValueError as e:
ctx = click.get_current_context()
ctx.fail("Invalid ip address. Error: {}".format(e))
tacacs.add_command(add)

Expand Down Expand Up @@ -511,11 +514,11 @@ def add(address, retransmit, timeout, key, auth_type, auth_port, pri, use_mgmt_v
config_db = ValidatedConfigDBConnector(ConfigDBConnector())
config_db.connect()
old_data = config_db.get_table('RADIUS_SERVER')
if address in old_data :
click.echo('server %s already exists' % address)
return
ctx = click.get_current_context()
if address in old_data:
ctx.fail(f'server {address} already exists')
if len(old_data) == RADIUS_MAXSERVERS:
click.echo('Maximum of %d can be configured' % RADIUS_MAXSERVERS)
ctx.fail(f'Maximum of {RADIUS_MAXSERVERS} can be configured')
else:
data = {
'auth_port': str(auth_port),
Expand Down Expand Up @@ -547,7 +550,6 @@ def add(address, retransmit, timeout, key, auth_type, auth_port, pri, use_mgmt_v
try:
config_db.set_entry('RADIUS_SERVER', address, data)
except ValueError as e:
ctx = click.get_current_context()
ctx.fail("Invalid ConfigDB. Error: {}".format(e))
radius.add_command(add)

Expand Down
Loading