From 023d8e4a35939d0cb11cb5ebdfebb7a48fa2f4b8 Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Thu, 7 Jul 2022 11:34:10 +0200 Subject: [PATCH] VPN: IPsec: Security Policy Database - refactor to MVC and extend functionality. missed a spot in the previous commit, make sure we're not omitting host entries as they skip a subnet definition --- src/opnsense/scripts/ipsec/list_spd.py | 2 +- src/opnsense/scripts/ipsec/spddelete.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/opnsense/scripts/ipsec/list_spd.py b/src/opnsense/scripts/ipsec/list_spd.py index 666d97f05..91d5e1182 100755 --- a/src/opnsense/scripts/ipsec/list_spd.py +++ b/src/opnsense/scripts/ipsec/list_spd.py @@ -39,7 +39,7 @@ if __name__ == '__main__': for line in sp.stdout.split("\n"): line_no += 1 parts = line.split() - if not line.startswith("\t") and line.count('/') == 2: + if not line.startswith("\t") and len(parts) > 2: line_no = 0 spec_line = line.strip() spd_rec = { diff --git a/src/opnsense/scripts/ipsec/spddelete.py b/src/opnsense/scripts/ipsec/spddelete.py index f5f58fe63..844ed34a7 100755 --- a/src/opnsense/scripts/ipsec/spddelete.py +++ b/src/opnsense/scripts/ipsec/spddelete.py @@ -40,7 +40,7 @@ if __name__ == '__main__': sp = subprocess.run(['/sbin/setkey', '-DP'], capture_output=True, text=True) spec_line = None for line in sp.stdout.split("\n"): - if not line.startswith("\t") and line.count('/') == 2: + if not line.startswith("\t") and len(line.split()) > 2: spec_line = line.strip() elif spec_line: ident = "%s %s" % (spec_line, line.strip().split()[0])