From: Alan T. DeKok Date: Thu, 2 Dec 2021 16:25:46 +0000 (-0500) Subject: Revert "tests use certs from src/tests/certs, not raddb/certs" X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce4d3f65b4f4cff769dd81e3f0a6fde302b9695e;p=thirdparty%2Ffreeradius-server.git Revert "tests use certs from src/tests/certs, not raddb/certs" This reverts commit 5f6bcbfffae48f896e50ebb3f9cdffa529f0e9b1. until such time as the docker images are updated to use these tests --- diff --git a/src/tests/modules/all.mk b/src/tests/modules/all.mk index 7125a888b61..1cfe588dbbd 100644 --- a/src/tests/modules/all.mk +++ b/src/tests/modules/all.mk @@ -124,3 +124,9 @@ $(foreach x,$(subst /,,$(sort $(dir $(FILES)))),$(eval $(call UNIT_TEST_MODULES, $(TEST): @touch $(BUILD_DIR)/tests/$@ + +# +# Create the certs directory +# +$(DIR)/certs: $(top_srcdir)/raddb/certs + @ln -s $< $@ diff --git a/src/tests/modules/imap/imap_bad_tls/module.conf b/src/tests/modules/imap/imap_bad_tls/module.conf index 5fc95b10920..726a6bd6aa3 100644 --- a/src/tests/modules/imap/imap_bad_tls/module.conf +++ b/src/tests/modules/imap/imap_bad_tls/module.conf @@ -5,11 +5,11 @@ imap imap_bad_tls { timeout = 1000 tls { - ca_file = "src/tests/certs/certs/rsa/client.pem" + ca_file = "$ENV{top_srcdir}raddb/certs/rsa/client.pem" - certificate_file = "src/tests/certs/certs/rsa/client.pem" + certificate_file = "$ENV{top_srcdir}raddb/certs/rsa/client.pem" - private_key_file = "src/tests/certs/certs/rsa/client.key" + private_key_file = "$ENV{top_srcdir}raddb/certs/rsa/client.key" private_key_password = "whatever" diff --git a/src/tests/modules/imap/imap_opt_tls/module.conf b/src/tests/modules/imap/imap_opt_tls/module.conf index 9a4f81dcb6d..5f9d7dece32 100644 --- a/src/tests/modules/imap/imap_opt_tls/module.conf +++ b/src/tests/modules/imap/imap_opt_tls/module.conf @@ -5,11 +5,11 @@ imap imap_try_tls { timeout = 1s tls { - ca_file = "src/tests/certs/certs/rsa/ca.pem" + ca_file = "$ENV{top_srcdir}raddb/certs/rsa/ca.pem" - certificate_file = "src/tests/certs/certs/rsa/client.pem" + certificate_file = "$ENV{top_srcdir}raddb/certs/rsa/client.pem" - private_key_file = "src/tests/certs/certs/rsa/client.key" + private_key_file = "$ENV{top_srcdir}raddb/certs/rsa/client.key" private_key_password = "whatever" diff --git a/src/tests/modules/imap/imap_tls/module.conf b/src/tests/modules/imap/imap_tls/module.conf index 8e86f50944b..e6f82f288cd 100644 --- a/src/tests/modules/imap/imap_tls/module.conf +++ b/src/tests/modules/imap/imap_tls/module.conf @@ -5,11 +5,11 @@ imap imap_tls { timeout = 1s tls { - ca_file = "src/tests/certs/certs/rsa/ca.pem" + ca_file = "$ENV{top_srcdir}raddb/certs/rsa/ca.pem" - certificate_file = "src/tests/certs/certs/rsa/client.pem" + certificate_file = "$ENV{top_srcdir}raddb/certs/rsa/client.pem" - private_key_file = "src/tests/certs/certs/rsa/client.key" + private_key_file = "$ENV{top_srcdir}raddb/certs/rsa/client.key" private_key_password = "whatever" diff --git a/src/tests/modules/rest/module.conf b/src/tests/modules/rest/module.conf index 43bf86e769d..9f38334c283 100644 --- a/src/tests/modules/rest/module.conf +++ b/src/tests/modules/rest/module.conf @@ -4,11 +4,11 @@ json { rest { tls { - ca_file = "src/tests/certs/certs/rsa/ca.pem" + ca_file = "$ENV{top_srcdir}raddb/certs/rsa/ca.pem" - certificate_file = "src/tests/certs/certs/rsa/client.pem" + certificate_file = "$ENV{top_srcdir}raddb/certs/rsa/client.pem" - private_key_file = "src/tests/certs/certs/rsa/client.key" + private_key_file = "$ENV{top_srcdir}raddb/certs/rsa/client.key" private_key_password = "whatever" diff --git a/src/tests/modules/smtp/module.conf b/src/tests/modules/smtp/module.conf index b7b58687ec3..05b1449ddd4 100644 --- a/src/tests/modules/smtp/module.conf +++ b/src/tests/modules/smtp/module.conf @@ -1,11 +1,11 @@ #smtp unit test config smtp { tls { - ca_file = "src/tests/certs/certs/rsa/ca.pem" + ca_file = "$ENV{top_srcdir}raddb/certs/rsa/ca.pem" - certificate_file = "src/tests/certs/certs/rsa/client.pem" + certificate_file = "$ENV{top_srcdir}raddb/certs/rsa/client.pem" - private_key_file = "src/tests/certs/certs/rsa/client.key" + private_key_file = "$ENV{top_srcdir}raddb/certs/rsa/client.key" private_key_password = "whatever" diff --git a/src/tests/modules/smtp/smtp_attachment/module.conf b/src/tests/modules/smtp/smtp_attachment/module.conf index 331553c8303..284a4d52262 100644 --- a/src/tests/modules/smtp/smtp_attachment/module.conf +++ b/src/tests/modules/smtp/smtp_attachment/module.conf @@ -1,11 +1,11 @@ #smtp_attachment unit test config smtp { tls { - ca_file = "src/tests/certs/certs/rsa/ca.pem" + ca_file = "$ENV{top_srcdir}raddb/certs/rsa/ca.pem" - certificate_file = "src/tests/certs/certs/rsa/client.pem" + certificate_file = "$ENV{top_srcdir}raddb/certs/rsa/client.pem" - private_key_file = "src/tests/certs/certs/rsa/client.key" + private_key_file = "$ENV{top_srcdir}raddb/certs/rsa/client.key" private_key_password = "whatever" diff --git a/src/tests/modules/smtp/smtp_authenticate/module.conf b/src/tests/modules/smtp/smtp_authenticate/module.conf index 7ebd08e187e..4136a046cf1 100644 --- a/src/tests/modules/smtp/smtp_authenticate/module.conf +++ b/src/tests/modules/smtp/smtp_authenticate/module.conf @@ -6,11 +6,11 @@ smtp { template_directory = "$ENV{top_srcdir}build/ci/exim4/" tls { - ca_file = "src/tests/certs/certs/rsa/ca.pem" + ca_file = "$ENV{top_srcdir}raddb/certs/rsa/ca.pem" - certificate_file = "src/tests/certs/certs/rsa/client.pem" + certificate_file = "$ENV{top_srcdir}raddb/certs/rsa/client.pem" - private_key_file = "src/tests/certs/certs/rsa/client.key" + private_key_file = "$ENV{top_srcdir}raddb/certs/rsa/client.key" private_key_password = "whatever" diff --git a/src/tests/modules/smtp/smtp_crln/module.conf b/src/tests/modules/smtp/smtp_crln/module.conf index f65cc85d772..cb2e30e2f01 100644 --- a/src/tests/modules/smtp/smtp_crln/module.conf +++ b/src/tests/modules/smtp/smtp_crln/module.conf @@ -2,11 +2,11 @@ smtp { tls { - ca_file = "src/tests/certs/certs/rsa/ca.pem" + ca_file = "$ENV{top_srcdir}raddb/certs/rsa/ca.pem" - certificate_file = "src/tests/certs/certs/rsa/client.pem" + certificate_file = "$ENV{top_srcdir}raddb/certs/rsa/client.pem" - private_key_file = "src/tests/certs/certs/rsa/client.key" + private_key_file = "$ENV{top_srcdir}raddb/certs/rsa/client.key" private_key_password = "whatever" diff --git a/src/tests/modules/smtp/smtp_stringparse/module.conf b/src/tests/modules/smtp/smtp_stringparse/module.conf index c2d8886a467..f3aa548c1ce 100644 --- a/src/tests/modules/smtp/smtp_stringparse/module.conf +++ b/src/tests/modules/smtp/smtp_stringparse/module.conf @@ -2,11 +2,11 @@ smtp { tls { - ca_file = "src/tests/certs/certs/rsa/ca.pem" + ca_file = "$ENV{top_srcdir}raddb/certs/rsa/ca.pem" - certificate_file = "src/tests/certs/certs/rsa/client.pem" + certificate_file = "$ENV{top_srcdir}raddb/certs/rsa/client.pem" - private_key_file = "src/tests/certs/certs/rsa/client.key" + private_key_file = "$ENV{top_srcdir}raddb/certs/rsa/client.key" private_key_password = "whatever"