proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-29 17:13:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2212 from ppmathis/feature/implement-no-password-cmd

Browse Source 
lib: Ported 'no (enable) password' from stable/3.0
This commit is contained in:
Donald Sharp 2018-05-11 08:07:18 -04:00 committed by GitHub
commit deb253051a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 67 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
doc/user/basic.rst
View File

@ -55,18 +55,23 @@ Basic Config Commands
Set hostname of the router. Set hostname of the router.
.. index:: password PASSWORD .. index::
single: no password PASSWORD
single: password PASSWORD
.. clicmd:: password PASSWORD .. clicmd:: [no] password PASSWORD
Set password for vty interface. If there is no password, a vty won't Set password for vty interface. The ``no`` form of the command deletes the
accept connections. password. If there is no password, a vty won't accept connections.
.. index:: enable password PASSWORD .. index::
single: no enable password PASSWORD
single: enable password PASSWORD
.. clicmd:: enable password PASSWORD .. clicmd:: [no] enable password PASSWORD
Set enable password. Set enable password. The ``no`` form of the command deletes the enable
password.
.. index:: .. index::
single: no log trap [LEVEL] single: no log trap [LEVEL]

49
lib/command.c
View File

@ -1895,7 +1895,7 @@ DEFUN (config_no_hostname,
DEFUN (config_password, DEFUN (config_password,
password_cmd, password_cmd,
"password [(8-8)] WORD", "password [(8-8)] WORD",
"Assign the terminal connection password\n" "Modify the terminal connection password\n"
"Specifies a HIDDEN password will follow\n" "Specifies a HIDDEN password will follow\n"
"The password string\n") "The password string\n")
{ {
@ -1934,6 +1934,36 @@ DEFUN (config_password,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
/* VTY interface password delete. */
DEFUN (no_config_password,
no_password_cmd,
"no password",
NO_STR
"Modify the terminal connection password\n")
{
bool warned = false;
if (host.password) {
vty_out(vty,
"Please be aware that removing the password is a security risk and "
"you should think twice about this command\n");
warned = true;
XFREE(MTYPE_HOST, host.password);
}
host.password = NULL;
if (host.password_encrypt) {
if (!warned)
vty_out(vty,
"Please be aware that removing the password is a security risk "
"and you should think twice about this command\n");
XFREE(MTYPE_HOST, host.password_encrypt);
}
host.password_encrypt = NULL;
return CMD_SUCCESS;
}
/* VTY enable password set. */ /* VTY enable password set. */
DEFUN (config_enable_password, DEFUN (config_enable_password,
enable_password_cmd, enable_password_cmd,
@ -1995,12 +2025,24 @@ DEFUN (no_config_enable_password,
"Modify enable password parameters\n" "Modify enable password parameters\n"
"Assign the privileged level password\n") "Assign the privileged level password\n")
{ {
if (host.enable) bool warned = false;
if (host.enable) {
vty_out(vty,
"Please be aware that removing the password is a security risk and "
"you should think twice about this command\n");
warned = true;
XFREE(MTYPE_HOST, host.enable); XFREE(MTYPE_HOST, host.enable);
}
host.enable = NULL; host.enable = NULL;
if (host.enable_encrypt) if (host.enable_encrypt) {
if (!warned)
vty_out(vty,
"Please be aware that removing the password is a security risk "
"and you should think twice about this command\n");
XFREE(MTYPE_HOST, host.enable_encrypt); XFREE(MTYPE_HOST, host.enable_encrypt);
}
host.enable_encrypt = NULL; host.enable_encrypt = NULL;
return CMD_SUCCESS; return CMD_SUCCESS;
@ -2710,6 +2752,7 @@ void cmd_init(int terminal)
if (terminal > 0) { if (terminal > 0) {
install_element(CONFIG_NODE, &password_cmd); install_element(CONFIG_NODE, &password_cmd);
install_element(CONFIG_NODE, &no_password_cmd);
install_element(CONFIG_NODE, &enable_password_cmd); install_element(CONFIG_NODE, &enable_password_cmd);
install_element(CONFIG_NODE, &no_enable_password_cmd); install_element(CONFIG_NODE, &no_enable_password_cmd);

10
vtysh/vtysh.c
View File

@ -2361,13 +2361,20 @@ DEFUNSH(VTYSH_ALL, no_vtysh_service_password_encrypt,
DEFUNSH(VTYSH_ALL, vtysh_config_password, vtysh_password_cmd, DEFUNSH(VTYSH_ALL, vtysh_config_password, vtysh_password_cmd,
"password [(8-8)] LINE", "password [(8-8)] LINE",
"Assign the terminal connection password\n" "Modify the terminal connection password\n"
"Specifies a HIDDEN password will follow\n" "Specifies a HIDDEN password will follow\n"
"The password string\n") "The password string\n")
{ {
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUNSH(VTYSH_ALL, no_vtysh_config_password, no_vtysh_password_cmd,
"no password", NO_STR
"Modify the terminal connection password\n")
{
return CMD_SUCCESS;
}
DEFUNSH(VTYSH_ALL, vtysh_config_enable_password, vtysh_enable_password_cmd, DEFUNSH(VTYSH_ALL, vtysh_config_enable_password, vtysh_enable_password_cmd,
"enable password [(8-8)] LINE", "enable password [(8-8)] LINE",
"Modify enable password parameters\n" "Modify enable password parameters\n"
@ -3605,6 +3612,7 @@ void vtysh_init_vty(void)
install_element(CONFIG_NODE, &no_vtysh_service_password_encrypt_cmd); install_element(CONFIG_NODE, &no_vtysh_service_password_encrypt_cmd);
install_element(CONFIG_NODE, &vtysh_password_cmd); install_element(CONFIG_NODE, &vtysh_password_cmd);
install_element(CONFIG_NODE, &no_vtysh_password_cmd);
install_element(CONFIG_NODE, &vtysh_enable_password_cmd); install_element(CONFIG_NODE, &vtysh_enable_password_cmd);
install_element(CONFIG_NODE, &no_vtysh_enable_password_cmd); install_element(CONFIG_NODE, &no_vtysh_enable_password_cmd);
} }