2 files changed, 28 insertions, 7 deletions
diff --git a/python/vyos/ipsec.py b/python/vyos/ipsec.py
index bb5611025..4603aab22 100644
--- a/python/vyos/ipsec.py
+++ b/python/vyos/ipsec.py
@@ -33,9 +33,11 @@ def get_vici_sas():
         session = vici_session()
     except Exception:
         raise ViciInitiateError("IPsec not initialized")
-    sas = list(session.list_sas())
-    return sas
-
+    try:
+        sas = list(session.list_sas())
+        return sas
+    except Exception:
+        raise ViciCommandError(f'Failed to get SAs')
 
 def get_vici_connections():
     from vici import Session as vici_session
@@ -44,9 +46,11 @@ def get_vici_connections():
         session = vici_session()
     except Exception:
         raise ViciInitiateError("IPsec not initialized")
-    connections = list(session.list_conns())
-    return connections
-
+    try:
+        connections = list(session.list_conns())
+        return connections
+    except Exception:
+        raise ViciCommandError(f'Failed to get connections')
 
 def get_vici_sas_by_name(ike_name: str, tunnel: str) -> list:
     """
diff --git a/python/vyos/validate.py b/python/vyos/validate.py
index 567f4c972..b149b258f 100644
--- a/python/vyos/validate.py
+++ b/python/vyos/validate.py
@@ -1,4 +1,4 @@
-# Copyright 2018-2021 VyOS maintainers and contributors <maintainers@vyos.io>
+# Copyright 2018-2023 VyOS maintainers and contributors <maintainers@vyos.io>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -302,3 +302,20 @@ def has_vrf_configured(conf, intf):
 
     conf.set_level(old_level)
     return ret
+
+def is_wireguard_key_pair(private_key: str, public_key:str) -> bool:
+    """
+     Checks if public/private keys are keypair
+    :param private_key: Wireguard private key
+    :type private_key: str
+    :param public_key: Wireguard public key
+    :type public_key: str
+    :return: If public/private keys are keypair returns True else False
+    :rtype: bool
+    """
+    from vyos.utils.process import cmd
+    gen_public_key = cmd('wg pubkey', input=private_key)
+    if gen_public_key == public_key:
+        return True
+    else:
+        return False