Skip to content

Revert "[radius] Fix the issue in authorization and accounting CLI command to specifiy the methods will need quotes." #113

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

Merged
yehjunying merged 1 commit into from
Aug 19, 2025
Merged

Revert "[radius] Fix the issue in authorization and accounting CLI command to specifiy the methods will need quotes." #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
75 changes: 25 additions & 50 deletions config/aaa.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,68 +149,45 @@ def login(auth_protocol):
add_table_kv('AAA', 'authentication', 'login', val)
authentication.add_command(login)


# cmd: aaa authorization
@click.command()
@click.argument('protocol', nargs=-1, type=click.Choice([ "tacacs+", "local", "default"]))
@click.argument('protocol', nargs=-1, type=click.Choice([ "tacacs+", "local", "tacacs+ local"]))
def authorization(protocol):
"""
Switch AAA authorization default
authorization {tacacs+ | local} [local]
"""
"""Switch AAA authorization [tacacs+ | local | '\"tacacs+ local\"']"""
if len(protocol) == 0:
click.echo('Argument "protocol" is required')
return

if len(protocol) > 2:
click.fail('Only two "protocol" can be set at most')

if 'default' in protocol:
if len(protocol) >= 2:
click.fail('Invalidated parameter')

del_table_key('AAA', 'authorization', 'login')
return

if protocol[0] == 'local' and len(protocol) != 1:
click.fail('Invalidated parameter')

if len(protocol) != len(set(protocol)):
click.fail('Invalidated parameter')

add_table_kv('AAA', 'authorization', 'login', ','.join(protocol))
if len(protocol) == 1 and (protocol[0] == 'tacacs+' or protocol[0] == 'local'):
add_table_kv('AAA', 'authorization', 'login', protocol[0])
elif len(protocol) == 1 and protocol[0] == 'tacacs+ local':
add_table_kv('AAA', 'authorization', 'login', 'tacacs+,local')
else:
click.echo('Not a valid command')
aaa.add_command(authorization)


# cmd: aaa accounting
@click.command()
@click.argument('protocol', nargs=-1, type=click.Choice(["disable", "tacacs+", "local"]))
@click.argument('protocol', nargs=-1, type=click.Choice(["disable", "tacacs+", "local", "tacacs+ local"]))
def accounting(protocol):
"""
Switch AAA accounting disable
accounting {tacacs+ | local} [tacacs+ | local]
"""
"""Switch AAA accounting [disable | tacacs+ | local | '\"tacacs+ local\"']"""
if len(protocol) == 0:
click.echo('Argument "protocol" is required')
return

if len(protocol) > 2:
click.fail('Only two "protocol" can be set at most')

if 'disable' in protocol:
if len(protocol) >= 2:
click.fail('Invalidated parameter')

del_table_key('AAA', 'accounting', 'login')
return

if len(protocol) != len(set(protocol)):
click.fail('Invalidated parameter')

add_table_kv('AAA', 'accounting', 'login', ','.join(protocol))
if len(protocol) == 1:
if protocol[0] == 'tacacs+' or protocol[0] == 'local':
add_table_kv('AAA', 'accounting', 'login', protocol[0])
elif protocol[0] == 'tacacs+ local':
add_table_kv('AAA', 'accounting', 'login', 'tacacs+,local')
elif protocol[0] == 'disable':
del_table_key('AAA', 'accounting', 'login')
else:
click.echo('Not a valid command')
else:
click.echo('Not a valid command')
aaa.add_command(accounting)


@click.group()
def tacacs():
"""TACACS+ server configuration"""
Expand Down Expand Up @@ -428,9 +405,8 @@ def sourceip(ctx, src_ip):
click.echo('Invalid ip address')
return

v6_invalid_list = [ipaddress.IPv6Address(str('0::0')), ipaddress.IPv6Address(str('0::1'))]
net = ipaddress.ip_network(str(src_ip), strict=False)

v6_invalid_list = [ipaddress.IPv6Address('0::0'), ipaddress.IPv6Address('0::1')]
net = ipaddress.ip_network(src_ip, strict=False)
if (net.version == 4):
if src_ip == "0.0.0.0":
click.echo('enter non-zero ip address')
Expand Down Expand Up @@ -470,9 +446,8 @@ def nasip(ctx, nas_ip):
click.echo('Invalid ip address')
return

v6_invalid_list = [ipaddress.IPv6Address(str('0::0')), ipaddress.IPv6Address(str('0::1'))]
net = ipaddress.ip_network(str(nas_ip), strict=False)

v6_invalid_list = [ipaddress.IPv6Address('0::0'), ipaddress.IPv6Address('0::1')]
net = ipaddress.ip_network(nas_ip, strict=False)
if (net.version == 4):
if nas_ip == "0.0.0.0":
click.echo('enter non-zero ip address')
Expand Down
4 changes: 2 additions & 2 deletions tests/aaa_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ def test_config_aaa_tacacs(self, get_cmd_module):

# test tacacs + local authorization
result = runner.invoke(config.config.commands["aaa"],\
["authorization", "tacacs+", "local"], obj=db)
["authorization", "tacacs+ local"], obj=db)
print(result.exit_code)
print(result.output)
assert result.exit_code == 0
Expand Down Expand Up @@ -258,7 +258,7 @@ def test_config_aaa_tacacs(self, get_cmd_module):

# test tacacs + local accounting
result = runner.invoke(config.config.commands["aaa"],\
["accounting", "tacacs+", "local"], obj=db)
["accounting", "tacacs+ local"], obj=db)
print(result.exit_code)
print(result.output)
assert result.exit_code == 0
Expand Down