Merge branch 'master' of http://phuket.vyatta.com/vyatta-cfg

7 files changed, 72 insertions, 2 deletions

diff --git a/etc/bash_completion.d/20vyatta-cfg b/etc/bash_completion.d/20vyatta-cfg
index fe64f40..dc05cf1 100644
--- a/etc/bash_completion.d/20vyatta-cfg
+++ b/etc/bash_completion.d/20vyatta-cfg
@@ -54,8 +54,9 @@ show ()
       args[${#args[@]}]="$arg"
     fi
   done
-  eval "${vyatta_sbindir}/vyatta-output-config.pl ${show_all}\
-        \${VYATTA_EDIT_LEVEL//\// } ${args[@]}"
+  ${vyatta_sbindir}/vyatta-output-config.pl ${show_all} \
+    ${VYATTA_EDIT_LEVEL//\// } ${args[@]} \
+  | eval "${VYATTA_PAGER:-cat}"
 }
 
 save ()
@@ -705,6 +706,20 @@ vyatta_config_complete ()
     end_space=1
     (( num_comp -= 1 ))
   fi
+
+  # handle pipe
+  if [ "${COMP_WORDS[$num_comp]}" == "|" ]; then
+    declare -a hitems=( "more" \
+                      )
+    declare -a hstrs=( \
+      "Paginate the output" \
+    )
+    generate_help_text hitems hstrs
+    vyatta_completions=( "${hitems[@]}" )
+    vyatta_do_complete
+    return
+  fi
+
   (( last_idx = num_comp - 1 ))
   comp_words=( ${COMP_WORDS[@]:1:$num_comp} )
 
diff --git a/etc/default/vyatta-cfg b/etc/default/vyatta-cfg
new file mode 100644
index 0000000..d369e0f
--- /dev/null
+++ b/etc/default/vyatta-cfg
@@ -0,0 +1,40 @@
+# Vyatta shell environment variables for config mode
+# should be sourced from /etc/default/vyatta
+
+export VYATTA_ACTIVE_CONFIGURATION_DIR=${vyatta_configdir}/active
+export VYATTA_CHANGES_ONLY_DIR=${vyatta_configdir}/tmp/changes_only_$$
+export VYATTA_TEMP_CONFIG_DIR=${vyatta_configdir}/tmp/new_config_$$
+export VYATTA_CONFIG_TMP=${vyatta_configdir}/tmp/tmp_$$
+export VYATTA_CONFIG_TEMPLATE=$vyatta_cfg_templates
+export VYATTA_EDIT_LEVEL=/
+export VYATTA_TEMPLATE_LEVEL=/
+export VYATTA_TAG_NAME=node.tag
+export VYATTA_MOD_NAME=.modified
+
+# don't set level if already set
+if [ -n "$VYATTA_USER_LEVEL_DIR" ]; then
+  return
+fi
+{
+is_admin=0
+is_users=0
+VYATTA_LEVEL_GROUP_ADMIN=vyattacfg
+VYATTA_LEVEL_GROUP_USERS=quaggavty
+local -a groups=( $(id -Gn) )
+for g in "${groups[@]}"; do
+  if [ "$g" == "$VYATTA_LEVEL_GROUP_ADMIN" ]; then
+    is_admin=1
+  fi
+  if [ "$g" == "$VYATTA_LEVEL_GROUP_USERS" ]; then
+    is_users=1
+  fi
+done
+# check level from high to low
+if [ $is_admin == 1 ]; then
+  declare -x -r VYATTA_USER_LEVEL_DIR=${vyatta_sysconfdir}/shell/level/admin
+else
+  # no need to check is_users since there are only 2 levels for now
+  declare -x -r VYATTA_USER_LEVEL_DIR=${vyatta_sysconfdir}/shell/level/users
+fi
+} 2>/dev/null || :
+
diff --git a/etc/shell/level/admin/restricted-mode b/etc/shell/level/admin/restricted-mode
new file mode 100644
index 0000000..53752db
--- /dev/null
+++ b/etc/shell/level/admin/restricted-mode
@@ -0,0 +1 @@
+output
diff --git a/etc/shell/level/users/allowed-cfg b/etc/shell/level/users/allowed-cfg
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/etc/shell/level/users/allowed-cfg
diff --git a/etc/shell/level/users/allowed-op b/etc/shell/level/users/allowed-op
new file mode 100644
index 0000000..a2ad52d
--- /dev/null
+++ b/etc/shell/level/users/allowed-op
@@ -0,0 +1,3 @@
+show
+terminal
+exit
diff --git a/etc/shell/level/users/allowed-pipe b/etc/shell/level/users/allowed-pipe
new file mode 100644
index 0000000..3204ef3
--- /dev/null
+++ b/etc/shell/level/users/allowed-pipe
@@ -0,0 +1,10 @@
+more
+1
+no-more
+1
+count
+1
+match
+2
+no-match
+2
diff --git a/etc/shell/level/users/restricted-mode b/etc/shell/level/users/restricted-mode
new file mode 100644
index 0000000..2877147
--- /dev/null
+++ b/etc/shell/level/users/restricted-mode
@@ -0,0 +1 @@
+full