From a4a70fdfbcbe383335784035dcdfb4e73e59778f Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Mon, 13 May 2019 13:42:35 +0200 Subject: [PATCH] python 2->3 ipsec scripts --- src/opnsense/scripts/ipsec/connect.py | 4 ++-- src/opnsense/scripts/ipsec/disconnect.py | 4 ++-- src/opnsense/scripts/ipsec/list_leases.py | 6 +++--- src/opnsense/scripts/ipsec/list_status.py | 12 ++++++------ 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/opnsense/scripts/ipsec/connect.py b/src/opnsense/scripts/ipsec/connect.py index a60090176..d28eff66f 100755 --- a/src/opnsense/scripts/ipsec/connect.py +++ b/src/opnsense/scripts/ipsec/connect.py @@ -1,7 +1,7 @@ -#!/usr/local/bin/python2.7 +#!/usr/local/bin/python3 """ - Copyright (c) 2015 Ad Schellevis + Copyright (c) 2015-2019 Ad Schellevis All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/opnsense/scripts/ipsec/disconnect.py b/src/opnsense/scripts/ipsec/disconnect.py index abdf69cb2..4d854c745 100755 --- a/src/opnsense/scripts/ipsec/disconnect.py +++ b/src/opnsense/scripts/ipsec/disconnect.py @@ -1,7 +1,7 @@ -#!/usr/local/bin/python2.7 +#!/usr/local/bin/python3 """ - Copyright (c) 2015 Ad Schellevis + Copyright (c) 2015-2019 Ad Schellevis All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/opnsense/scripts/ipsec/list_leases.py b/src/opnsense/scripts/ipsec/list_leases.py index 08cb88cc6..5bec162c5 100755 --- a/src/opnsense/scripts/ipsec/list_leases.py +++ b/src/opnsense/scripts/ipsec/list_leases.py @@ -1,7 +1,7 @@ -#!/usr/local/bin/python2.7 +#!/usr/local/bin/python3 """ - Copyright (c) 2016 Ad Schellevis + Copyright (c) 2016-2019 Ad Schellevis All rights reserved. Redistribution and use in source and binary forms, with or without @@ -39,7 +39,7 @@ if __name__ == '__main__': with tempfile.NamedTemporaryFile() as output_stream: subprocess.call(['/usr/local/sbin/ipsec', 'leases'], stdout=output_stream, stderr=open(os.devnull, 'wb')) output_stream.seek(0) - data = output_stream.read().strip() + data = output_stream.read().decode().strip() current_pool=None for line in data.split('\n'): if line.find('Leases in pool') > -1: diff --git a/src/opnsense/scripts/ipsec/list_status.py b/src/opnsense/scripts/ipsec/list_status.py index 391ee2cb7..fc714a931 100755 --- a/src/opnsense/scripts/ipsec/list_status.py +++ b/src/opnsense/scripts/ipsec/list_status.py @@ -1,7 +1,7 @@ -#!/usr/local/bin/python2.7 +#!/usr/local/bin/python3 """ - Copyright (c) 2015-2017 Ad Schellevis + Copyright (c) 2015-2019 Ad Schellevis All rights reserved. Redistribution and use in source and binary forms, with or without @@ -45,11 +45,11 @@ def parse_sa(in_conn): result = {'local-addrs': '', 'remote-addrs': '', 'children': '', 'local-id': '', 'remote-id': ''} result['version'] = in_conn['version'] if 'local_addrs' in in_conn: - result['local-addrs'] = ','.join(in_conn['local_addrs']) + result['local-addrs'] = b','.join(in_conn['local_addrs']) elif 'local-host' in in_conn: result['local-addrs'] = in_conn['local-host'] if 'remote_addrs' in in_conn: - result['remote-addrs'] = ','.join(in_conn['remote_addrs']) + result['remote-addrs'] = b','.join(in_conn['remote_addrs']) elif 'remote-host' in in_conn: result['remote-addrs'] = in_conn['remote-host'] if 'children' in in_conn: @@ -76,8 +76,8 @@ for conns in s.list_conns(): if 'id' in conns[connection_id][connKey]: result[connection_id]['remote-id'] = conns[connection_id][connKey]['id'] result[connection_id]['remote-class'].append(conns[connection_id][connKey]['class']) - result[connection_id]['local-class'] = '+'.join(result[connection_id]['local-class']) - result[connection_id]['remote-class'] = '+'.join(result[connection_id]['remote-class']) + result[connection_id]['local-class'] = b'+'.join(result[connection_id]['local-class']) + result[connection_id]['remote-class'] = b'+'.join(result[connection_id]['remote-class']) # attach Security Associations for sas in s.list_sas():