From c95ee14de9590acbab6ae6bcb2419c6489eb5c16 Mon Sep 17 00:00:00 2001 From: Stefan Midjich Date: Sat, 16 Apr 2016 21:31:11 +0200 Subject: [PATCH] fixed iptables cmd execution. --- plugins/iptables.py | 138 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 124 insertions(+), 14 deletions(-) diff --git a/plugins/iptables.py b/plugins/iptables.py index f37c94f..bc86090 100644 --- a/plugins/iptables.py +++ b/plugins/iptables.py @@ -1,35 +1,145 @@ # Add an iptables rule +import re +from io import BytesIO from logging import getLogger, DEBUG, WARN, INFO from portal import logHandler, logFormatter -# Try to import arping for mac_from_ip(), otherwise use just the client IP. -only_ip = False +# Try to import arping for mac_from_ip() try: from sh import arping except ImportError: - only_ip = True pass +# By default run iptables through sudo, so the worker process must run with +# a user that is allowed to execute iptables commands with NOPASSWD. +from sh import sudo, ErrorReturnCode def run(arg): + # Some info from the plugin dispatcher. environ = arg['environ'] + config = arg['config'] - l = getLogger('plugin_logging') + # Setup plugin logging + l = getLogger('plugin_iptables') l.addHandler(logHandler) l.setLevel(DEBUG) client_ip = environ.get('REMOTE_ADDR') - if only_ip: - if not client_ip: - return { - 'error': 'Unknown client IP', - 'status': False - } - else: - client_mac = mac_from_ip(client_ip) + client_mac = None + error_msg = None + iptables_failed = False + + # Attempt to get client HW address first. + try: + client_mac = mac_from_ip( + l, + config.get('arping'), + client_ip + ) + except Exception as e: + l.warn('Failed to get client HW address: {error}'.format( + error=str(e) + )) + error_msg = str(e) + pass + + # If HW address was found, use it now. + if client_mac: + l.debug('Found client HW address: {hw}'.format( + hw=client_mac + )) + + # Create tuple out of iptables command + iptables_mac = config.get('iptables_mac').format( + mac_address=client_mac + ) + iptables_mac = tuple(iptables_mac.split(' ')) + + output = BytesIO() + error = BytesIO() + try: + rc = sudo.iptables(iptables_mac, _out=output, _err=error) + except ErrorReturnCode: + error.seek(0) + error_msg = error.read() + l.warn('{cmd}: exited badly: {error}'.format( + cmd=('iptables', iptables_mac), + error=error_msg + )) + iptables_failed = True + pass + except Exception as e: + l.warn('{cmd}: failed: {error}'.format( + cmd=('iptables', iptables_mac), + error=str(e) + )) + error_msg = str(e) + iptables_failed = True + pass + + # Fallback on IP if HW address fails + if client_ip: + l.debug('Using client IP: {ip}'.format( + ip=client_ip + )) + + iptables_ip = config.get('iptables_ip').format( + ip_address=client_ip + ) + iptables_ip = tuple(iptables_ip.split(' ')) + + output = BytesIO() + error = BytesIO() + try: + rc = sudo.iptables(iptables_ip, _out=output, _err=error) + except ErrorReturnCode: + error.seek(0) + error_msg = error.read() + l.warn('{cmd}: exited badly: {error}'.format( + cmd=('iptables', iptables_ip), + error=error_msg + )) + iptables_failed = True + pass + except Exception as e: + l.warn('{cmd}: failed: {error}'.format( + cmd=('iptables', iptables_ip), + error=str(e) + )) + error_msg = str(e) + iptables_failed = True + pass + + # If all else fails, error! This will be shown to end users. + return { + 'error': error_msg, + 'failed': iptables_failed + } # Try to get the mac address from the IP. Requires arping installed. -def mac_from_ip(ip): - return +def mac_from_ip(l, arping_args, ip): + # Add IP to args + arping_args = arping_args.format( + ip_address=ip + ) + + # Make args into tuple + arping_args = tuple(arping_args.split(' ')) + + # Save output as buffer object + output = BytesIO() + + # Run arping + arping(arping_args, _out=output) + output.seek(0) + + # Parse HW address from output + for line in output: + line_start = 'Unicast reply from {ip} '.format( + ip=ip + ) + if line.startswith(line_start): + m = re.search('(([0-9A-Fa-f]{2}[:]){5}([0-9A-Fa-f]{2}))', line) + if m: return m.group(0)