summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorPaul Jakma <paul.jakma@sun.com>2008-09-04 13:52:38 +0100
committerPaul Jakma <paul@quagga.net>2008-09-04 13:52:38 +0100
commitef16c8a2abd39b14fed45665eda5c293b93ee54b (patch)
tree3e8a386296fcc36ec3ffef6ebbf38da36c7cfdcf /lib
parentb3bc68e5a4eecd85138463ae5742c2ccaa1db4bb (diff)
parent62687ff1cd3d4460cdbd4b0fbf1e3298fe277ad2 (diff)
Merge branch 'restricted-mode'
Diffstat (limited to 'lib')
-rw-r--r--lib/command.c20
-rw-r--r--lib/command.h3
-rw-r--r--lib/memory.c10
-rw-r--r--lib/vty.c46
4 files changed, 75 insertions, 4 deletions
diff --git a/lib/command.c b/lib/command.c
index f3d96ede..4887f94f 100644
--- a/lib/command.c
+++ b/lib/command.c
@@ -53,6 +53,12 @@ struct cmd_node view_node =
"%s> ",
};
+struct cmd_node restricted_node =
+{
+ RESTRICTED_NODE,
+ "%s$ ",
+};
+
struct cmd_node auth_enable_node =
{
AUTH_ENABLE_NODE,
@@ -1563,6 +1569,7 @@ cmd_try_do_shortcut (enum node_type node, char* first_word) {
node != VIEW_NODE &&
node != AUTH_ENABLE_NODE &&
node != ENABLE_NODE &&
+ node != RESTRICTED_NODE &&
0 == strcmp( "do", first_word ) )
return 1;
return 0;
@@ -2376,6 +2383,7 @@ DEFUN (config_exit,
{
case VIEW_NODE:
case ENABLE_NODE:
+ case RESTRICTED_NODE:
if (vty_shell (vty))
exit (0);
else
@@ -2431,6 +2439,7 @@ DEFUN (config_end,
{
case VIEW_NODE:
case ENABLE_NODE:
+ case RESTRICTED_NODE:
/* Nothing to do. */
break;
case CONFIG_NODE:
@@ -3538,6 +3547,7 @@ cmd_init (int terminal)
install_node (&enable_node, NULL);
install_node (&auth_node, NULL);
install_node (&auth_enable_node, NULL);
+ install_node (&restricted_node, NULL);
install_node (&config_node, config_write_host);
/* Each node's basic commands. */
@@ -3553,6 +3563,15 @@ cmd_init (int terminal)
install_element (VIEW_NODE, &config_terminal_no_length_cmd);
install_element (VIEW_NODE, &show_logging_cmd);
install_element (VIEW_NODE, &echo_cmd);
+
+ install_element (RESTRICTED_NODE, &config_list_cmd);
+ install_element (RESTRICTED_NODE, &config_exit_cmd);
+ install_element (RESTRICTED_NODE, &config_quit_cmd);
+ install_element (RESTRICTED_NODE, &config_help_cmd);
+ install_element (RESTRICTED_NODE, &config_enable_cmd);
+ install_element (RESTRICTED_NODE, &config_terminal_length_cmd);
+ install_element (RESTRICTED_NODE, &config_terminal_no_length_cmd);
+ install_element (RESTRICTED_NODE, &echo_cmd);
}
if (terminal)
@@ -3620,6 +3639,7 @@ cmd_init (int terminal)
install_element (VIEW_NODE, &show_thread_cpu_cmd);
install_element (ENABLE_NODE, &show_thread_cpu_cmd);
+ install_element (RESTRICTED_NODE, &show_thread_cpu_cmd);
install_element (VIEW_NODE, &show_work_queues_cmd);
install_element (ENABLE_NODE, &show_work_queues_cmd);
}
diff --git a/lib/command.h b/lib/command.h
index a7253788..d093df3c 100644
--- a/lib/command.h
+++ b/lib/command.h
@@ -63,6 +63,7 @@ struct host
enum node_type
{
AUTH_NODE, /* Authentication mode of vty interface. */
+ RESTRICTED_NODE, /* Restricted view mode */
VIEW_NODE, /* View node. Default mode of vty interface. */
AUTH_ENABLE_NODE, /* Authentication mode for change enable. */
ENABLE_NODE, /* Enable node. */
@@ -100,7 +101,7 @@ enum node_type
DUMP_NODE, /* Packet dump node. */
FORWARDING_NODE, /* IP forwarding node. */
PROTOCOL_NODE, /* protocol filtering node */
- VTY_NODE /* Vty node. */
+ VTY_NODE, /* Vty node. */
};
/* Node which has some commands and prompt string and configuration
diff --git a/lib/memory.c b/lib/memory.c
index 28b3d896..f5d0cba6 100644
--- a/lib/memory.c
+++ b/lib/memory.c
@@ -444,6 +444,16 @@ DEFUN (show_memory_isis,
void
memory_init (void)
{
+ install_element (RESTRICTED_NODE, &show_memory_cmd);
+ install_element (RESTRICTED_NODE, &show_memory_all_cmd);
+ install_element (RESTRICTED_NODE, &show_memory_lib_cmd);
+ install_element (RESTRICTED_NODE, &show_memory_rip_cmd);
+ install_element (RESTRICTED_NODE, &show_memory_ripng_cmd);
+ install_element (RESTRICTED_NODE, &show_memory_bgp_cmd);
+ install_element (RESTRICTED_NODE, &show_memory_ospf_cmd);
+ install_element (RESTRICTED_NODE, &show_memory_ospf6_cmd);
+ install_element (RESTRICTED_NODE, &show_memory_isis_cmd);
+
install_element (VIEW_NODE, &show_memory_cmd);
install_element (VIEW_NODE, &show_memory_all_cmd);
install_element (VIEW_NODE, &show_memory_lib_cmd);
diff --git a/lib/vty.c b/lib/vty.c
index 32084713..14a36c16 100644
--- a/lib/vty.c
+++ b/lib/vty.c
@@ -82,6 +82,10 @@ static int vty_config;
/* Login password check. */
static int no_password_check = 0;
+/* Restrict unauthenticated logins? */
+static const u_char restricted_mode_default = 0;
+static u_char restricted_mode = 0;
+
/* Integrated configuration file path */
char integrate_default[] = SYSCONFDIR INTEGRATE_DEFAULT_CONFIG;
@@ -383,7 +387,7 @@ vty_auth (struct vty *vty, char *buf)
/* AUTH_ENABLE_NODE */
vty->fail = 0;
vty_out (vty, "%% Bad enable passwords, too many failures!%s", VTY_NEWLINE);
- vty->node = VIEW_NODE;
+ vty->node = restricted_mode ? RESTRICTED_NODE : VIEW_NODE;
}
}
}
@@ -687,6 +691,7 @@ vty_end_config (struct vty *vty)
{
case VIEW_NODE:
case ENABLE_NODE:
+ case RESTRICTED_NODE:
/* Nothing to do. */
break;
case CONFIG_NODE:
@@ -1094,6 +1099,7 @@ vty_stop_input (struct vty *vty)
{
case VIEW_NODE:
case ENABLE_NODE:
+ case RESTRICTED_NODE:
/* Nothing to do. */
break;
case CONFIG_NODE:
@@ -1613,7 +1619,9 @@ vty_create (int vty_sock, union sockunion *su)
vty->address = sockunion_su2str (su);
if (no_password_check)
{
- if (host.advanced)
+ if (restricted_mode)
+ vty->node = RESTRICTED_NODE;
+ else if (host.advanced)
vty->node = ENABLE_NODE;
else
vty->node = VIEW_NODE;
@@ -2715,6 +2723,26 @@ DEFUN (no_vty_login,
return CMD_SUCCESS;
}
+/* initial mode. */
+DEFUN (vty_restricted_mode,
+ vty_restricted_mode_cmd,
+ "anonymous restricted",
+ "Restrict view commands available in anonymous, unauthenticated vty\n")
+{
+ restricted_mode = 1;
+ return CMD_SUCCESS;
+}
+
+DEFUN (vty_no_restricted_mode,
+ vty_no_restricted_mode_cmd,
+ "no anonymous restricted",
+ NO_STR
+ "Enable password checking\n")
+{
+ restricted_mode = 0;
+ return CMD_SUCCESS;
+}
+
DEFUN (service_advanced_vty,
service_advanced_vty_cmd,
"service advanced-vty",
@@ -2812,7 +2840,15 @@ vty_config_write (struct vty *vty)
/* login */
if (no_password_check)
vty_out (vty, " no login%s", VTY_NEWLINE);
-
+
+ if (restricted_mode != restricted_mode_default)
+ {
+ if (restricted_mode_default)
+ vty_out (vty, " no anonymous restricted%s", VTY_NEWLINE);
+ else
+ vty_out (vty, " anonymous restricted%s", VTY_NEWLINE);
+ }
+
vty_out (vty, "!%s", VTY_NEWLINE);
return CMD_SUCCESS;
@@ -2923,6 +2959,8 @@ vty_init (struct thread_master *master_thread)
/* Install bgp top node. */
install_node (&vty_node, vty_config_write);
+ install_element (RESTRICTED_NODE, &config_who_cmd);
+ install_element (RESTRICTED_NODE, &show_history_cmd);
install_element (VIEW_NODE, &config_who_cmd);
install_element (VIEW_NODE, &show_history_cmd);
install_element (ENABLE_NODE, &config_who_cmd);
@@ -2943,6 +2981,8 @@ vty_init (struct thread_master *master_thread)
install_element (VTY_NODE, &no_vty_access_class_cmd);
install_element (VTY_NODE, &vty_login_cmd);
install_element (VTY_NODE, &no_vty_login_cmd);
+ install_element (VTY_NODE, &vty_restricted_mode_cmd);
+ install_element (VTY_NODE, &vty_no_restricted_mode_cmd);
#ifdef HAVE_IPV6
install_element (VTY_NODE, &vty_ipv6_access_class_cmd);
install_element (VTY_NODE, &no_vty_ipv6_access_class_cmd);