From ecc56953374e66d3375f980a21adc663a5e7a9ae Mon Sep 17 00:00:00 2001
From: Philip O'Toole <philip.otoole@yahoo.com>
Date: Fri, 22 Dec 2023 08:38:38 -0500
Subject: [PATCH 1/2] Add support to Python end-to-end for mTLS testing

---
 system_test/e2e/helpers.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/system_test/e2e/helpers.py b/system_test/e2e/helpers.py
index 94b84aca..35437327 100644
--- a/system_test/e2e/helpers.py
+++ b/system_test/e2e/helpers.py
@@ -90,7 +90,8 @@ class Node(object):
                raft_snap_threshold=8192, raft_snap_int="1s",
                raft_cluster_remove_shutdown=False,
                http_cert=None, http_key=None, http_no_verify=False,
-               node_cert=None, node_key=None, node_no_verify=False,
+               node_cert=None, node_key=None, node_ca_cert=None,
+               node_verify_server_name=None, node_no_verify=False,
                auth=None, auto_backup=None, auto_restore=None,
                dir=None):
     
@@ -123,6 +124,8 @@ class Node(object):
     self.node_cert = node_cert
     self.node_key = node_key
     self.node_no_verify = node_no_verify
+    self.node_ca_cert = node_ca_cert
+    self.node_verify_server_name = node_verify_server_name
     self.auth = auth
     self.auto_backup = auto_backup
     self.auto_restore = auto_restore
@@ -187,8 +190,12 @@ class Node(object):
         command += ['-http-no-verify']
     if self.node_cert is not None:
       command += ['-node-cert', self.node_cert, '-node-key', self.node_key]
-      if self.node_no_verify:
-        command += ['-node-no-verify']
+    if self.node_ca_cert is not None:
+      command += ['-node-ca-cert', self.node_ca_cert]
+    if self.node_no_verify:
+      command += ['-node-no-verify']
+    if self.node_verify_server_name is not None:
+      command += ['-node-verify-server-name', self.node_verify_server_name]
     if self.auth is not None:
       command += ['-auth', self.auth]
     if self.auto_backup is not None:

From 2423c513fda510984879ae0fdde5111f47cd6e9f Mon Sep 17 00:00:00 2001
From: Philip O'Toole <philip.otoole@yahoo.com>
Date: Fri, 22 Dec 2023 08:39:46 -0500
Subject: [PATCH 2/2] CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 42857930..7c3f9147 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## 8.13.3 (unreleased)
 ### Implementation changes and bug fixes
 - [PR #1515](https://github.com/rqlite/rqlite/pull/1515): Fix a log message related to mutual TLS.
+- [PR #1516](https://github.com/rqlite/rqlite/pull/1516): Add support to Python end-to-end test helpers for mTLS.
 
 ## 8.13.2 (December 21st 2023)
 ### Implementation changes and bug fixes