From 6492541b2ee3f7f246682d27974670bd6fbdacbe Mon Sep 17 00:00:00 2001 From: zsdc Date: Wed, 14 Aug 2019 22:03:42 +0300 Subject: [bfd] T1183: Added validations and fixing bugs in BFD: * added validations for "source address IP" and "bfd peer IP" * added check for configuring multihop together with an interface name * fixed "show protocols bfd peer X" for peers with custom options --- op-mode-definitions/show-protocols-bfd.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'op-mode-definitions') diff --git a/op-mode-definitions/show-protocols-bfd.xml b/op-mode-definitions/show-protocols-bfd.xml index 2a94d0497..398a81d1b 100644 --- a/op-mode-definitions/show-protocols-bfd.xml +++ b/op-mode-definitions/show-protocols-bfd.xml @@ -24,16 +24,16 @@ Show Bidirectional Forwarding Detection (BFD) peer status - + - /usr/bin/vtysh -c "show bfd peer $5" + /usr/bin/vtysh -c "show bfd peers" | awk -v BFD_PEER=$5 '($0 ~ peer BFD_PEER) { system("/usr/bin/vtysh -c \"show bfd " $0 "\"") }' Show Bidirectional Forwarding Detection (BFD) peer counters - /usr/bin/vtysh -c "show bfd peer $5 counters" + /usr/bin/vtysh -c "show bfd peers" | awk -v BFD_PEER=$5 '($0 ~ peer BFD_PEER) { system("/usr/bin/vtysh -c \"show bfd " $0 " counters\"") }' -- cgit v1.2.3 From 3d94de9b56ef2a6030ef5cea8b307098688c949d Mon Sep 17 00:00:00 2001 From: Dmytro Aleksandrov Date: Wed, 14 Aug 2019 01:21:20 +0300 Subject: [op-mode] T1590 xml-style rewrite of 'show system' operations --- Makefile | 1 + op-mode-definitions/show-system-info.xml | 167 +++++++++++++++++++++++++++++++ src/helpers/vyos-sudo.py | 40 ++++++++ src/op_mode/show_ram.sh | 33 ++++++ src/op_mode/show_users.py | 111 ++++++++++++++++++++ 5 files changed, 352 insertions(+) create mode 100644 op-mode-definitions/show-system-info.xml create mode 100755 src/helpers/vyos-sudo.py create mode 100755 src/op_mode/show_ram.sh create mode 100755 src/op_mode/show_users.py (limited to 'op-mode-definitions') diff --git a/Makefile b/Makefile index 89b83d4f4..ee01e5ad3 100644 --- a/Makefile +++ b/Makefile @@ -37,6 +37,7 @@ op_mode_definitions: rm -f $(OP_TMPL_DIR)/monitor/node.def rm -f $(OP_TMPL_DIR)/generate/node.def rm -f $(OP_TMPL_DIR)/show/vpn/node.def + rm -f $(OP_TMPL_DIR)/show/system/node.def .PHONY: all all: clean interface_definitions op_mode_definitions diff --git a/op-mode-definitions/show-system-info.xml b/op-mode-definitions/show-system-info.xml new file mode 100644 index 000000000..ade3829f2 --- /dev/null +++ b/op-mode-definitions/show-system-info.xml @@ -0,0 +1,167 @@ + + + + + + + Show system information + + + + + + Show active network connections on the system + + netstat -an + + + + Show TCP connection information + + ss -t -r + + + + Show all TCP connections + + ss -t -a + + + + Show TCP connection without resolving names + + ss -t -n + + + + + + Show UDP socket information + + ss -u -a -r + + + + Show UDP socket information without resolving names + + ss -u -a -n + + + + + + + + + Show messages in kernel ring buffer + + sudo dmesg + + + + + Show user accounts + + + + + Show user account information + + ${vyos_libexec_dir}/vyos-sudo.py ${vyos_op_scripts_dir}/show_users.py + + + + Show information about all accounts + + ${vyos_libexec_dir}/vyos-sudo.py ${vyos_op_scripts_dir}/show_users.py all + + + + Show information about locked accounts + + ${vyos_libexec_dir}/vyos-sudo.py ${vyos_op_scripts_dir}/show_users.py locked + + + + Show information about non VyOS user accounts + + ${vyos_libexec_dir}/vyos-sudo.py ${vyos_op_scripts_dir}/show_users.py other + + + + Show information about VyOS user accounts + + ${vyos_libexec_dir}/vyos-sudo.py ${vyos_op_scripts_dir}/show_users.py vyos + + + + + + + + + Show system memory usage + + ${vyos_op_scripts_dir}/show_ram.sh + + + + Show kernel cache information + + sudo slabtop -o + + + + Show detailed system memory usage + + cat /proc/meminfo + + + + + + + Show system processes + + ps ax + + + + Show extensive process info + + top -b -n1 + + + + Show summary of system processes + + uptime + + + + Show process tree + + ps -ejH + + + + + + + Show filesystem usage + + df -h -x squashfs + + + + + Show how long the system has been up + + uptime + + + + + + + diff --git a/src/helpers/vyos-sudo.py b/src/helpers/vyos-sudo.py new file mode 100755 index 000000000..0101a0c95 --- /dev/null +++ b/src/helpers/vyos-sudo.py @@ -0,0 +1,40 @@ +#!/usr/bin/env python3 + +# Copyright 2019 VyOS maintainers and contributors +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library. If not, see . + +import getpass +import grp +import os +import sys + + +def is_admin() -> bool: + """Look if current user is in sudo group""" + current_user = getpass.getuser() + (_, _, _, admin_group_members) = grp.getgrnam('sudo') + return current_user in admin_group_members + + +if __name__ == '__main__': + if len(sys.argv) < 2: + print('Missing command argument') + sys.exit(1) + + if not is_admin(): + print('This account is not authorized to run this command') + sys.exit(1) + + os.execvp('sudo', ['sudo'] + sys.argv[1:]) diff --git a/src/op_mode/show_ram.sh b/src/op_mode/show_ram.sh new file mode 100755 index 000000000..b013e16f8 --- /dev/null +++ b/src/op_mode/show_ram.sh @@ -0,0 +1,33 @@ +#!/bin/bash +# +# Module: vyos-show-ram.sh +# Displays memory usage information in minimalistic format +# +# Copyright (C) 2019 VyOS maintainers and contributors +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +MB_DIVISOR=1024 + +TOTAL=$(cat /proc/meminfo | grep -E "^MemTotal:" | awk -F ' ' '{print $2}') +FREE=$(cat /proc/meminfo | grep -E "^MemFree:" | awk -F ' ' '{print $2}') +BUFFERS=$(cat /proc/meminfo | grep -E "^Buffers:" | awk -F ' ' '{print $2}') +CACHED=$(cat /proc/meminfo | grep -E "^Cached:" | awk -F ' ' '{print $2}') + +DISPLAY_FREE=$(( ($FREE + $BUFFERS + $CACHED) / $MB_DIVISOR )) +DISPLAY_TOTAL=$(( $TOTAL / $MB_DIVISOR )) +DISPLAY_USED=$(( $DISPLAY_TOTAL - $DISPLAY_FREE )) + +echo "Total: $DISPLAY_TOTAL" +echo "Free: $DISPLAY_FREE" +echo "Used: $DISPLAY_USED" diff --git a/src/op_mode/show_users.py b/src/op_mode/show_users.py new file mode 100755 index 000000000..8e4f12851 --- /dev/null +++ b/src/op_mode/show_users.py @@ -0,0 +1,111 @@ +#!/usr/bin/env python3 +# +# Copyright (C) 2019 VyOS maintainers and contributors +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 or later as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +import argparse +import pwd +import spwd +import struct +import sys +from time import ctime + +from tabulate import tabulate +from vyos.config import Config + + +class UserInfo: + def __init__(self, uid, name, user_type, is_locked, login_time, tty, host): + self.uid = uid + self.name = name + self.user_type = user_type + self.is_locked = is_locked + self.login_time = login_time + self.tty = tty + self.host = host + + +filters = { + 'default': lambda user: not user.is_locked, # Default is everything but locked accounts + 'vyos': lambda user: user.user_type == 'vyos', + 'other': lambda user: user.user_type != 'vyos', + 'locked': lambda user: user.is_locked, + 'all': lambda user: True +} + + +def is_locked(user_name: str) -> bool: + """Check if a given user has password in shadow db""" + + try: + encrypted_password = spwd.getspnam(user_name)[1] + return encrypted_password == '*' or encrypted_password.startswith('!') + except (KeyError, PermissionError): + print('Cannot access shadow database, ensure this script is run with sufficient permissions') + sys.exit(1) + + +def decode_lastlog(lastlog_file, uid: int): + """Decode last login info of a given user uid from the lastlog file""" + + struct_fmt = '=L32s256s' + recordsize = struct.calcsize(struct_fmt) + lastlog_file.seek(recordsize * uid) + buf = lastlog_file.read(recordsize) + if len(buf) < recordsize: + return None + (time, tty, host) = struct.unpack(struct_fmt, buf) + time = 'never logged in' if time == 0 else ctime(time) + tty = tty.strip(b'\x00') + host = host.strip(b'\x00') + return time, tty, host + + +def list_users(): + cfg = Config() + vyos_users = cfg.list_effective_nodes('system login user') + users = [] + with open('/var/log/lastlog', 'rb') as lastlog_file: + for (name, _, uid, _, _, _, _) in pwd.getpwall(): + lastlog_info = decode_lastlog(lastlog_file, uid) + if lastlog_info is None: + continue + user_info = UserInfo( + uid, name, + user_type='vyos' if name in vyos_users else 'other', + is_locked=is_locked(name), + login_time=lastlog_info[0], + tty=lastlog_info[1], + host=lastlog_info[2]) + users.append(user_info) + return users + + +def main(): + parser = argparse.ArgumentParser(prog=sys.argv[0], add_help=False) + parser.add_argument('type', nargs='?', choices=['all', 'vyos', 'other', 'locked']) + args = parser.parse_args() + + filter_type = args.type if args.type is not None else 'default' + filter_expr = filters[filter_type] + + headers = ['Username', 'Type', 'Locked', 'Tty', 'From', 'Last login'] + table_data = [] + for user in list_users(): + if filter_expr(user): + table_data.append([user.name, user.user_type, user.is_locked, user.tty, user.host, user.login_time]) + print(tabulate(table_data, headers, tablefmt='simple')) + + +if __name__ == '__main__': + main() -- cgit v1.2.3 From fdb474235a8ce7fd0d5cc9fd74e5c880eb2093e6 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sat, 17 Aug 2019 00:02:11 +0200 Subject: openvpn: T1548: add op-mode command for key generation --- op-mode-definitions/openvpn.xml | 48 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 op-mode-definitions/openvpn.xml (limited to 'op-mode-definitions') diff --git a/op-mode-definitions/openvpn.xml b/op-mode-definitions/openvpn.xml new file mode 100644 index 000000000..44f8e01e9 --- /dev/null +++ b/op-mode-definitions/openvpn.xml @@ -0,0 +1,48 @@ + + + + + + + OpenVPN key generation tool + + + + + Generate shared-secret key with specified file name + + <filename> + + + + result=1; + key_path=$4 + full_path= + + # Prepend /config/auth if the path is not absolute + if echo $key_path | egrep -ve '^/.*' > /dev/null; then + full_path=/config/auth/$key_path + else + full_path=$key_path + fi + + key_dir=`dirname $full_path` + if [ ! -d $key_dir ]; then + echo "Directory $key_dir does not exist!" + exit 1 + fi + + echo "Generating OpenVPN key to $full_path" + sudo /usr/sbin/openvpn --genkey --secret "$full_path" + result=$? + if [ $result = 0 ]; then + echo "Your new local OpenVPN key has been generated" + fi + /usr/libexec/vyos/validators/file-exists --directory /config/auth "$full_path" + + + + + + + -- cgit v1.2.3 From 1fea0d1cd6232033bde839642446fad162f6f8c8 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sat, 17 Aug 2019 02:07:07 +0200 Subject: openvpn: T1548: add op-mode command for resetting client vyos@vyos:~$ run reset openvpn client client1 --- op-mode-definitions/openvpn.xml | 17 ++++++++++ src/completion/list_openvpn_clients.py | 57 ++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100755 src/completion/list_openvpn_clients.py (limited to 'op-mode-definitions') diff --git a/op-mode-definitions/openvpn.xml b/op-mode-definitions/openvpn.xml index 44f8e01e9..9c9c3b3ad 100644 --- a/op-mode-definitions/openvpn.xml +++ b/op-mode-definitions/openvpn.xml @@ -45,4 +45,21 @@ + + + + + + + Reset specified OpenVPN client + + + + + echo kill $4 | socat - UNIX-CONNECT:/tmp/openvpn-mgmt-intf > /dev/null + + + + + diff --git a/src/completion/list_openvpn_clients.py b/src/completion/list_openvpn_clients.py new file mode 100755 index 000000000..828ce6b5e --- /dev/null +++ b/src/completion/list_openvpn_clients.py @@ -0,0 +1,57 @@ +#!/usr/bin/env python3 +# +# Copyright (C) 2019 VyOS maintainers and contributors +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 or later as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +import os +import sys +import argparse + +from vyos.interfaces import list_interfaces_of_type + +def get_client_from_interface(interface): + clients = [] + with open('/opt/vyatta/etc/openvpn/status/' + interface + '.status', 'r') as f: + dump = False + for line in f: + if line.startswith("Common Name,"): + dump = True + continue + if line.startswith("ROUTING TABLE"): + dump = False + continue + if dump: + # client entry in this file looks like + # client1,172.18.202.10:47495,2957,2851,Sat Aug 17 00:07:11 2019 + # we are only interested in the client name 'client1' + clients.append(line.split(',')[0]) + + return clients + +if __name__ == "__main__": + parser = argparse.ArgumentParser() + parser.add_argument("-i", "--interface", type=str, help="List connected clients per interface") + parser.add_argument("-a", "--all", action='store_true', help="List all connected OpenVPN clients") + args = parser.parse_args() + + clients = [] + + if args.interface: + clients = get_client_from_interface(args.interface) + elif args.all: + for interface in list_interfaces_of_type("openvpn"): + clients += get_client_from_interface(interface) + + print(" ".join(clients)) + -- cgit v1.2.3 From dbffd657b46fe0edcba67141bf87173448043b70 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sat, 17 Aug 2019 02:15:51 +0200 Subject: openvpn: T1548: add op-mode command for resetting vyos@vyos:~$ reset openvpn interface vtun10 --- op-mode-definitions/openvpn.xml | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'op-mode-definitions') diff --git a/op-mode-definitions/openvpn.xml b/op-mode-definitions/openvpn.xml index 9c9c3b3ad..4a7f985e9 100644 --- a/op-mode-definitions/openvpn.xml +++ b/op-mode-definitions/openvpn.xml @@ -58,6 +58,15 @@ echo kill $4 | socat - UNIX-CONNECT:/tmp/openvpn-mgmt-intf > /dev/null + + + Reset OpenVPN process on interface + + + + + sudo kill -SIGUSR1 $(cat /var/run/openvpn/$4.pid) + -- cgit v1.2.3 From 66fdca096a268ca574b81b2664078011c5bac3a7 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sat, 17 Aug 2019 18:51:00 +0200 Subject: openvpn: T1548: add 'show interfaces openvpn' op-mode command --- op-mode-definitions/openvpn.xml | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'op-mode-definitions') diff --git a/op-mode-definitions/openvpn.xml b/op-mode-definitions/openvpn.xml index 4a7f985e9..4c958257a 100644 --- a/op-mode-definitions/openvpn.xml +++ b/op-mode-definitions/openvpn.xml @@ -71,4 +71,42 @@ + + + + + + + Show OpenVPN interface information + + + + + Show detailed OpenVPN interface information + + ${vyatta_bindir}/vyatta-show-interfaces.pl --intf-type=openvpn --action=show + + + + + + Show OpenVPN interface information + + + + + ${vyatta_bindir}/vyatta-show-interfaces.pl --intf=$4 + + + + Show summary of specified OpenVPN interface information + + ${vyatta_bindir}/vyatta-show-interfaces.pl --intf="$4" --action=show-brief + + + + + + + -- cgit v1.2.3