groove/routeros-scripts-main
1
0
Fork 0
mirror of https://github.com/eworm-de/routeros-scripts.git synced 2026-08-09 10:01:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'cert-by-OU' into next

Browse source
This commit is contained in:
Christian Hesse 2026-08-07 13:56:43 +02:00
commit 9d309e8b20
3 changed files with 35 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
CERTIFICATES.d/05-cert-from-OU.avif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 12 KiB

14
CERTIFICATES.md
View file

@ -71,6 +71,20 @@ is no output. Otherwise the certificate is downloaded and imported.
If importing a certificate with that exact name fails a warning is given
and nothing is actually imported.
Certificate by Organizational Unit
----------------------------------
There are some rare cases where the *Common Name* is not unique, for example
several certificates with name "`GlobalSign`" do exist. To download and
import these (from [mkcert.org ↗️](https://mkcert.org)) it may be required to
use the *Organizational Unit*.
![screenshot: certificate by OU](CERTIFICATES.d/05-cert-from-OU.avif)
In this special case run:
$CertificateAvailable "GlobalSign Root CA - R3" "fetch";
See also
--------

28
global-functions.rsc
View file

@ -133,23 +133,23 @@
:local CertSettings [ /certificate/settings/get ];
:if ((($CertSettings->"builtin-trust-store") ~ $UseFor || \
($CertSettings->"builtin-trust-store") = "all") && \
[ :len [ /certificate/builtin/find where common-name=$CommonName ] ] > 0) do={
[ :len [ /certificate/builtin/find where common-name=$CommonName or unit=$CommonName ] ] > 0) do={
:return true;
}
:if ([ :len [ /certificate/find where common-name=$CommonName ] ] = 0) do={
:if ([ :len [ /certificate/find where common-name=$CommonName or unit=$CommonName ] ] = 0) do={
$LogPrint info $0 ("Certificate with CommonName '" . $CommonName . "' not available.");
:if ([ $CertificateDownload $CommonName ] = false) do={
:return false;
}
}
:if ([ :len [ /certificate/find where common-name=$CommonName ] ] > 1) do={
:if ([ :len [ /certificate/find where common-name=$CommonName or unit=$CommonName ] ] > 1) do={
$LogPrint info $0 ("There are " . $CertCount . " Certificates with CommonName '" . $CommonName . "'. Should be ok.");
:return true;
}
:local CertVal [ /certificate/get [ find where common-name=$CommonName ] ];
:local CertVal [ /certificate/get [ find where common-name=$CommonName or unit=$CommonName ] ];
:while (($CertVal->"akid") != "" && ($CertVal->"akid") != ($CertVal->"skid")) do={
:if ([ :len [ /certificate/find where skid=($CertVal->"akid") ] ] = 0) do={
:local IssuerCN ([ $ParseKeyValueStore ($CertVal->"issuer") ]->"CN");
@ -172,6 +172,7 @@
:global CertificateNameByCN;
:global CleanName;
:global IfThenElse;
:global FetchUserAgentStr;
:global LogPrint;
:global RmFile;
@ -215,14 +216,15 @@
:delay 1s;
$RmFile $FileName;
:if ([ :len [ /certificate/find where common-name=$CommonName ] ] = 0) do={
:if ([ :len [ /certificate/find where common-name=$CommonName or unit=$CommonName ] ] = 0) do={
/certificate/remove [ find where name~("^" . $FileName . "_[0-9]+\$") ];
$LogPrint warning $0 ("Certificate with CommonName '" . $CommonName . "' still unavailable!");
:return false;
}
:foreach Cert in=[ /certificate/find where name~("^" . $FileName . "_[0-9]+\$") ] do={
$CertificateNameByCN [ /certificate/get $Cert common-name ];
$CertificateNameByCN [ $IfThenElse ([ /certificate/get $Cert unit ] = $CommonName) \
$CommonName [ /certificate/get $Cert common-name ] ];
}
:return true;
}
@ -234,11 +236,23 @@
:global CleanName;
:global LogPrint;
:local Cert ([ /certificate/find where (common-name=$Match or fingerprint=$Match or name=$Match) ]->0);
:local Cert [ /certificate/find where unit=$Match ];
:if ([ :len $Cert ] = 1) do={
/certificate/set $Cert name=[ $CleanName $Match ];
:return true;
}
:set Cert [ /certificate/find where common-name=$Match or fingerprint=$Match or name=$Match ];
:if ([ :len $Cert ] > 1) do={
$LogPrint warning $0 ("Too many matching certificates found.");
:return false;
}
:if ([ :len $Cert ] = 0) do={
$LogPrint warning $0 ("No matching certificate found.");
:return false;
}
:local CommonName [ /certificate/get $Cert common-name ];
/certificate/set $Cert name=[ $CleanName $CommonName ];
:return true;