From: Arran Cudbard-Bell Date: Mon, 21 Jun 2021 04:59:49 +0000 (-0500) Subject: Fix tests and references X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=deffc61e8af77e6e3d38fdcda146917dc88e1e52;p=thirdparty%2Ffreeradius-server.git Fix tests and references --- diff --git a/doc/antora/modules/raddb/pages/sites-available/default.adoc b/doc/antora/modules/raddb/pages/sites-available/default.adoc index 852a71462d6..9b0b73f1498 100644 --- a/doc/antora/modules/raddb/pages/sites-available/default.adoc +++ b/doc/antora/modules/raddb/pages/sites-available/default.adoc @@ -1412,17 +1412,11 @@ send Access-Accept { # wimax # update reply { # &Reply-Message += "%{session-state.TLS-Cert-Serial}" -# &Reply-Message += "%{session-state.TLS-Cert-Expiration}" +# &Reply-Message += "%{session-state.TLS-Cert-Not-After}" # &Reply-Message += "%{session-state.TLS-Cert-Subject}" # &Reply-Message += "%{session-state.TLS-Cert-Issuer}" # &Reply-Message += "%{session-state.TLS-Cert-Common-Name}" # &Reply-Message += "%{session-state.TLS-Cert-Subject-Alt-Name-Email}" -# &Reply-Message += "%{session-state.TLS-Client-Cert-Serial}" -# &Reply-Message += "%{session-state.TLS-Client-Cert-Expiration}" -# &Reply-Message += "%{session-state.TLS-Client-Cert-Subject}" -# &Reply-Message += "%{session-state.TLS-Client-Cert-Issuer}" -# &Reply-Message += "%{session-state.TLS-Client-Cert-Common-Name}" -# &Reply-Message += "%{session-state.TLS-Client-Cert-Subject-Alt-Name-Email}" # } # insert_acct_class # if (&reply.EAP-Session-Id) { diff --git a/doc/antora/modules/raddb/pages/sites-available/tls-cache.adoc b/doc/antora/modules/raddb/pages/sites-available/tls-cache.adoc index ea7a7873b07..f3488a01d35 100644 --- a/doc/antora/modules/raddb/pages/sites-available/tls-cache.adoc +++ b/doc/antora/modules/raddb/pages/sites-available/tls-cache.adoc @@ -77,18 +77,12 @@ and will just cause the server to emit a warning. == Default Configuration ``` -# TLS-Cert-Serial -# TLS-Cert-Expiration -# TLS-Cert-Subject -# TLS-Cert-Issuer -# TLS-Cert-Common-Name -# TLS-Cert-Subject-Alt-Name-Email -# TLS-Client-Cert-Serial -# TLS-Client-Cert-Expiration -# TLS-Client-Cert-Subject -# TLS-Client-Cert-Issuer -# TLS-Client-Cert-Common-Name -# TLS-Client-Cert-Subject-Alt-Name-Email +# TLS-Cert.Serial +# TLS-Cert.Expiration +# TLS-Cert.Subject +# TLS-Cert.Issuer +# TLS-Cert.Common-Name +# TLS-Cert.Subject-Alt-Name-Email server tls-cache { namespace = tls_cache load tls-session { diff --git a/raddb/sites-available/default b/raddb/sites-available/default index 0ad510f9ed8..7be883313d1 100644 --- a/raddb/sites-available/default +++ b/raddb/sites-available/default @@ -1176,19 +1176,12 @@ send Access-Accept { # available). # # update reply { -# &Reply-Message += "%{session-state.TLS-Cert-Serial}" -# &Reply-Message += "%{session-state.TLS-Cert-Expiration}" -# &Reply-Message += "%{session-state.TLS-Cert-Subject}" -# &Reply-Message += "%{session-state.TLS-Cert-Issuer}" -# &Reply-Message += "%{session-state.TLS-Cert-Common-Name}" -# &Reply-Message += "%{session-state.TLS-Cert-Subject-Alt-Name-Email}" -# -# &Reply-Message += "%{session-state.TLS-Client-Cert-Serial}" -# &Reply-Message += "%{session-state.TLS-Client-Cert-Expiration}" -# &Reply-Message += "%{session-state.TLS-Client-Cert-Subject}" -# &Reply-Message += "%{session-state.TLS-Client-Cert-Issuer}" -# &Reply-Message += "%{session-state.TLS-Client-Cert-Common-Name}" -# &Reply-Message += "%{session-state.TLS-Client-Cert-Subject-Alt-Name-Email}" +# &Reply-Message += "%{session-state.TLS-Cert.Serial}" +# &Reply-Message += "%{session-state.TLS-Cert.Not-After}" +# &Reply-Message += "%{session-state.TLS-Cert.Subject}" +# &Reply-Message += "%{session-state.TLS-Cert.Issuer}" +# &Reply-Message += "%{session-state.TLS-Cert.Common-Name}" +# &Reply-Message += "%{session-state.TLS-Cert.Subject-Alt-Name-Email}" # } # diff --git a/src/tests/modules/imap/imap_opt_tls/auth_try_tls.unlang b/src/tests/modules/imap/imap_opt_tls/auth_try_tls.unlang index 4367dc22423..34265cc55b5 100644 --- a/src/tests/modules/imap/imap_opt_tls/auth_try_tls.unlang +++ b/src/tests/modules/imap/imap_opt_tls/auth_try_tls.unlang @@ -17,7 +17,7 @@ else { reject } -if (&request.TLS-Cert-Issuer =~ /@example\.org/) { +if (&request.TLS-Cert.Issuer =~ /@example\.org/) { test_pass } else { test_fail diff --git a/src/tests/modules/imap/imap_tls/auth_tls.unlang b/src/tests/modules/imap/imap_tls/auth_tls.unlang index 3c02953c854..94dad9cc7ae 100644 --- a/src/tests/modules/imap/imap_tls/auth_tls.unlang +++ b/src/tests/modules/imap/imap_tls/auth_tls.unlang @@ -9,7 +9,7 @@ else { reject } -if (&request.TLS-Cert-Issuer =~ /@example\.org/) { +if (&request.TLS-Cert.Issuer =~ /@example\.org/) { test_pass } else { test_fail diff --git a/src/tests/modules/smtp/smtp_authenticate/tls_authenticate.unlang b/src/tests/modules/smtp/smtp_authenticate/tls_authenticate.unlang index 505de6f4741..17acd8468f1 100644 --- a/src/tests/modules/smtp/smtp_authenticate/tls_authenticate.unlang +++ b/src/tests/modules/smtp/smtp_authenticate/tls_authenticate.unlang @@ -18,7 +18,7 @@ else { reject } -if (&request.TLS-Cert-Issuer =~ /@example\.org/) { +if (&request.TLS-Cert.Issuer =~ /@example\.org/) { test_pass } else { test_fail diff --git a/src/tests/modules/smtp/smtp_crln/tls_crln.unlang b/src/tests/modules/smtp/smtp_crln/tls_crln.unlang index 2eb5e7c2f6a..8e3156123df 100644 --- a/src/tests/modules/smtp/smtp_crln/tls_crln.unlang +++ b/src/tests/modules/smtp/smtp_crln/tls_crln.unlang @@ -36,7 +36,7 @@ else { reject } -if (&request.TLS-Cert-Issuer =~ /@example\.org/) { +if (&request.TLS-Cert.Issuer =~ /@example\.org/) { test_pass } else { test_fail diff --git a/src/tests/modules/smtp/smtp_stringparse/tls_stringparse.unlang b/src/tests/modules/smtp/smtp_stringparse/tls_stringparse.unlang index eaa2223c403..89ae070f39f 100644 --- a/src/tests/modules/smtp/smtp_stringparse/tls_stringparse.unlang +++ b/src/tests/modules/smtp/smtp_stringparse/tls_stringparse.unlang @@ -33,7 +33,7 @@ else { reject } -if (&request.TLS-Cert-Issuer =~ /@example\.org/) { +if (&request.TLS-Cert.Issuer =~ /@example\.org/) { test_pass } else { test_fail