From f14788a10444022ae0f7d0bea7839facf36128f1 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Thu, 6 Apr 2023 22:38:17 +0200 Subject: check-certificates: properly escape the name for regex --- check-certificates.rsc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/check-certificates.rsc b/check-certificates.rsc index 1a984bc..98a6cab 100644 --- a/check-certificates.rsc +++ b/check-certificates.rsc @@ -32,6 +32,7 @@ :global CertRenewPass; :global CertificateNameByCN; + :global EscapeForRegEx; :global LogPrintExit2; :global UrlEncode; :global WaitForFile; @@ -58,7 +59,7 @@ $LogPrintExit2 warning $0 ("Decryption failed for certificate file " . $CertFileName) false; } - :foreach CertInChain in=[ /certificate/find where name~("^" . $CertFileName . "_[0-9]+\$") \ + :foreach CertInChain in=[ /certificate/find where name~("^" . [ $EscapeForRegEx $CertFileName ] . "_[0-9]+\$") \ common-name!=$Name !(subject-alt-name~("(^|\\W)(DNS|IP):" . [ $EscapeForRegEx $Name ] . "(\\W|\$)")) !(common-name=[]) ] do={ $CertificateNameByCN [ /certificate/get $CertInChain common-name ]; } -- cgit v1.2.3-70-g09d2