summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore6
-rw-r--r--op-mode-definitions/connect-disconnect.xml35
-rwxr-xr-xsrc/conf_mode/interfaces-pppoe.py18
-rwxr-xr-xsrc/op_mode/connect_disconnect.py98
4 files changed, 152 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
index d89bf1cdc..e7c769aaa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -117,9 +117,9 @@ debian/debhelper-build-stamp
debian/.debhelper/
debian/vyos-1x
debian/vyos-1x-vmware
-debian/vyos-1x.postinst.debhelper
-debian/vyos-1x.prerm.debhelper
-debian/vyos-1x.substvars
+debian/*.postinst.debhelper
+debian/*.prerm.debhelper
+debian/*.substvars
# Sonar Cloud
.scannerwork
diff --git a/op-mode-definitions/connect-disconnect.xml b/op-mode-definitions/connect-disconnect.xml
new file mode 100644
index 000000000..77c334180
--- /dev/null
+++ b/op-mode-definitions/connect-disconnect.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+ <node name="connect">
+ <properties>
+ <help>Establish a connection</help>
+ </properties>
+ <children>
+ <tagNode name="interface">
+ <properties>
+ <help>Bring up a connection-oriented network interface</help>
+ <completionHelp>
+ <script>${vyos_completion_dir}/list_pppoe_peers.sh</script>
+ </completionHelp>
+ </properties>
+ <command>sudo ${vyos_op_scripts_dir}/connect_disconnect.py --connect "$3"</command>
+ </tagNode>
+ </children>
+ </node>
+ <node name="disconnect">
+ <properties>
+ <help>Take down a connection</help>
+ </properties>
+ <children>
+ <tagNode name="interface">
+ <properties>
+ <help>Take down a connection-oriented network interface</help>
+ <completionHelp>
+ <script>${vyos_completion_dir}/list_pppoe_peers.sh</script>
+ </completionHelp>
+ </properties>
+ <command>sudo ${vyos_op_scripts_dir}/connect_disconnect.py --disconnect "$3"</command>
+ </tagNode>
+ </children>
+ </node>
+</interfaceDefinition>
diff --git a/src/conf_mode/interfaces-pppoe.py b/src/conf_mode/interfaces-pppoe.py
index e6e71e501..02d3cf3ce 100755
--- a/src/conf_mode/interfaces-pppoe.py
+++ b/src/conf_mode/interfaces-pppoe.py
@@ -21,6 +21,8 @@ from copy import deepcopy
from jinja2 import Template
from subprocess import Popen, PIPE
from time import sleep
+from pwd import getpwnam
+from grp import getgrnam
from vyos.config import Config
from vyos.ifconfig import Interface
@@ -71,7 +73,7 @@ persist
ifname {{ intf }}
ipparam {{ intf }}
debug
-logfile /var/log/vyatta/ppp_{{ intf }}.log
+logfile {{ logfile }}
{% if 'auto' in default_route -%}
defaultroute
{% elif 'force' in default_route -%}
@@ -94,6 +96,8 @@ rp_pppoe_service "{{ service_name }}"
"""
+PPP_LOGFILE = '/var/log/vyatta/ppp_{}.log'
+
default_config_data = {
'access_concentrator': '',
'auth_username': '',
@@ -108,6 +112,7 @@ default_config_data = {
'ipv6_autoconf': False,
'ipv6_enable': False,
'local_address': '',
+ 'logfile': '',
'mtu': '1492',
'name_server': True,
'remote_address': '',
@@ -127,6 +132,7 @@ def get_config():
# determine tagNode instance
try:
pppoe['intf'] = os.environ['VYOS_TAGNODE_VALUE']
+ pppoe['logfile'] = PPP_LOGFILE.format(pppoe['intf'])
except KeyError as E:
print("Interface not specified")
@@ -212,6 +218,9 @@ def verify(pppoe):
if not pppoe['source_interface']:
raise ConfigError('PPPoE source interface is missing')
+ if pppoe['source_interface'] not in interfaces():
+ raise ConfigError('PPPoE source interface does not exist')
+
return None
def generate(pppoe):
@@ -241,7 +250,12 @@ def apply(pppoe):
return None
if not pppoe['disable']:
- # Dial PPPoE connection
+ # make logfile owned by root / vyattacfg
+ uid = getpwnam('root').pw_uid
+ gid = getgrnam('vyattacfg').gr_gid
+ os.chown(pppoe['logfile'], uid, gid)
+
+ # dial PPPoE connection
cmd = 'systemctl start ppp@{}.service'.format(pppoe['intf'])
subprocess_cmd(cmd)
diff --git a/src/op_mode/connect_disconnect.py b/src/op_mode/connect_disconnect.py
new file mode 100755
index 000000000..a22615096
--- /dev/null
+++ b/src/op_mode/connect_disconnect.py
@@ -0,0 +1,98 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2020 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 <http://www.gnu.org/licenses/>.
+
+import os
+import argparse
+
+from sys import exit
+from psutil import process_iter
+from time import strftime, localtime, time
+
+PPP_LOGFILE = '/var/log/vyatta/ppp_{}.log'
+
+def check_interface(interface):
+ if not os.path.isfile('/etc/ppp/peers/{}'.format(interface)):
+ print('Interface {}: invalid!'.format(interface))
+ exit(1)
+
+def check_ppp_running(interface):
+ """
+ Check if ppp process is running in the interface in question
+ """
+ for p in process_iter():
+ if "pppd" in p.name():
+ if interface in p.cmdline():
+ return True
+
+ return False
+
+def connect(interface):
+ """
+ Connect PPP interface
+ """
+ check_interface(interface)
+
+ # Check if interface is already dialed
+ if os.path.isdir('/sys/class/net/{}'.format(interface)):
+ print('Interface {}: already connected!'.format(interface))
+ elif check_ppp_running(interface):
+ print('Interface {}: connection is beeing established!'.format(interface))
+ else:
+ print('Interface {}: connecting...'.format(interface))
+ user = os.environ['SUDO_USER']
+ tm = strftime("%a %d %b %Y %I:%M:%S %p %Z", localtime(time()))
+ with open(PPP_LOGFILE.format(interface), 'a') as f:
+ f.write('{}: user {} started PPP daemon for {} by connect command\n'.format(tm, user, interface))
+ cmd = 'umask 0; setsid sh -c "nohup /usr/sbin/pppd call {0} > /tmp/{0}.log 2>&1 &"'.format(interface)
+ os.system(cmd)
+
+
+def disconnect(interface):
+ """
+ Disconnect PPP interface
+ """
+ check_interface(interface)
+
+ # Check if interface is already down
+ if not check_ppp_running(interface):
+ print('Interface {}: connection is already down'.format(interface))
+ else:
+ print('Interface {}: disconnecting...'.format(interface))
+ user = os.environ['SUDO_USER']
+ tm = strftime("%a %d %b %Y %I:%M:%S %p %Z", localtime(time()))
+ with open(PPP_LOGFILE.format(interface), 'a') as f:
+ f.write('{}: user {} stopped PPP daemon for {} by disconnect command\n'.format(tm, user, interface))
+ cmd = '/usr/bin/poff "{}"'.format(interface)
+ os.system(cmd)
+
+def main():
+ parser = argparse.ArgumentParser()
+ group = parser.add_mutually_exclusive_group()
+ group.add_argument("--connect", help="Bring up a connection-oriented network interface", action="store")
+ group.add_argument("--disconnect", help="Take down connection-oriented network interface", action="store")
+ args = parser.parse_args()
+
+ if args.connect:
+ connect(args.connect)
+ elif args.disconnect:
+ disconnect(args.disconnect)
+ else:
+ parser.print_help()
+
+ exit(0)
+
+if __name__ == '__main__':
+ main()