tests - add tls checks on common name

2026-05-24 09:28:37 +00:00 · 2024-01-05 09:37:18 +01:00 · 2024-01-05 09:37:18 +01:00 · b3a5dfeaaa
commit b3a5dfeaaa
parent f843cbda5b
28 changed files with 101 additions and 51 deletions
--- a/examples/authelia/tests.json
+++ b/examples/authelia/tests.json
@ -7,12 +7,14 @@
    {
      "type": "string",
      "url": "https://app1.example.com",
-      "string": "authelia"
+      "string": "authelia",
+      "tls": "app1.example.com"
    },
    {
      "type": "string",
      "url": "https://app2.example.com",
-      "string": "authelia"
+      "string": "authelia",
+      "tls": "app2.example.com"
    }
  ]
 }
--- a/examples/autoconf-configs/tests.json
+++ b/examples/autoconf-configs/tests.json
@ -7,17 +7,20 @@
    {
      "type": "string",
      "url": "https://app1.example.com/hello",
-      "string": "app1"
+      "string": "app1",
+      "tls": "app1.example.com"
    },
    {
      "type": "string",
      "url": "https://app2.example.com/hello",
-      "string": "app2"
+      "string": "app2",
+      "tls": "app2.example.com"
    },
    {
      "type": "string",
      "url": "https://app3.example.com/hello",
-      "string": "app3"
+      "string": "app3",
+      "tls": "app3.example.com"
    }
  ]
 }
--- a/examples/cors/tests.json
+++ b/examples/cors/tests.json
@ -6,17 +6,20 @@
    {
      "type": "string",
      "url": "https://app1.example.com",
-      "string": "app1"
+      "string": "app1",
+      "tls": "app1.example.com"
    },
    {
      "type": "string",
      "url": "https://app2.example.com",
-      "string": "app2"
+      "string": "app2",
+      "tls": "app2.example.com"
    },
    {
      "type": "string",
      "url": "https://app3.example.com",
-      "string": "app3"
+      "string": "app3",
+      "tls": "app3.example.com"
    }
  ]
 }
--- a/examples/docker-configs/tests.json
+++ b/examples/docker-configs/tests.json
@ -7,22 +7,26 @@
    {
      "type": "string",
      "url": "https://app1.example.com/hello",
-      "string": "world"
+      "string": "world",
+      "tls": "app1.example.com"
    },
    {
      "type": "string",
      "url": "https://app2.example.com/hello",
-      "string": "world"
+      "string": "world",
+      "tls": "app2.example.com"
    },
    {
      "type": "string",
      "url": "https://app1.example.com/app1",
-      "string": "app1"
+      "string": "app1",
+      "tls": "app1.example.com"
    },
    {
      "type": "string",
      "url": "https://app2.example.com/app2",
-      "string": "app2"
+      "string": "app2",
+      "tls": "app2.example.com"
    }
  ]
 }
--- a/examples/drupal/tests.json
+++ b/examples/drupal/tests.json
@ -8,7 +8,8 @@
    {
      "type": "string",
      "url": "https://www.example.com",
-      "string": "drupal"
+      "string": "drupal",
+      "tls": "www.example.com"
    }
  ]
 }
--- a/examples/ghost/tests.json
+++ b/examples/ghost/tests.json
@ -7,7 +7,8 @@
    {
      "type": "string",
      "url": "https://www.example.com",
-      "string": "ghost"
+      "string": "ghost",
+      "tls": "www.example.com"
    }
  ]
 }
--- a/examples/gogs/tests.json
+++ b/examples/gogs/tests.json
@ -8,7 +8,8 @@
    {
      "type": "string",
      "url": "https://www.example.com",
-      "string": "gogs"
+      "string": "gogs",
+      "tls": "www.example.com"
    }
  ]
 }
--- a/examples/hardened/tests.json
+++ b/examples/hardened/tests.json
@ -6,7 +6,8 @@
    {
      "type": "string",
      "url": "https://www.example.com",
-      "string": "hello"
+      "string": "hello",
+      "tls": "www.example.com"
    }
  ]
 }
--- a/examples/joomla/tests.json
+++ b/examples/joomla/tests.json
@ -7,7 +7,8 @@
    {
      "type": "string",
      "url": "https://www.example.com",
-      "string": "joomla"
+      "string": "joomla",
+      "tls": "www.example.com"
    }
  ]
 }
--- a/examples/kubernetes-configs/tests.json
+++ b/examples/kubernetes-configs/tests.json
@ -7,32 +7,38 @@
    {
      "type": "string",
      "url": "https://app1.example.com/hello",
-      "string": "hello"
+      "string": "hello",
+      "tls": "app1.example.com"
    },
    {
      "type": "string",
      "url": "https://app2.example.com/hello",
-      "string": "hello"
+      "string": "hello",
+      "tls": "app2.example.com"
    },
    {
      "type": "string",
      "url": "https://app3.example.com/hello",
-      "string": "hello"
+      "string": "hello",
+      "tls": "app3.example.com"
    },
    {
      "type": "string",
      "url": "https://app1.example.com/app1",
-      "string": "app1"
+      "string": "app1",
+      "tls": "app1.example.com"
    },
    {
      "type": "string",
      "url": "https://app2.example.com/app2",
-      "string": "app2"
+      "string": "app2",
+      "tls": "app2.example.com"
    },
    {
      "type": "string",
      "url": "https://app3.example.com/app3",
-      "string": "app3"
+      "string": "app3",
+      "tls": "app3.example.com"
    }
  ]
 }
--- a/examples/kubernetes-ingress/tests.json
+++ b/examples/kubernetes-ingress/tests.json
@ -7,17 +7,20 @@
    {
      "type": "string",
      "url": "https://app1.example.com",
-      "string": "hello"
+      "string": "hello",
+      "tls": "app1.example.com"
    },
    {
      "type": "string",
      "url": "https://app2.example.com",
-      "string": "hello"
+      "string": "hello",
+      "tls": "app2.example.com"
    },
    {
      "type": "string",
      "url": "https://app3.example.com",
-      "string": "hello"
+      "string": "hello",
+      "tls": "app3.example.com"
    }
  ]
 }
--- a/examples/load-balancer/tests.json
+++ b/examples/load-balancer/tests.json
@ -7,7 +7,8 @@
    {
      "type": "string",
      "url": "https://www.example.com",
-      "string": "hello"
+      "string": "hello",
+      "tls": "www.example.com"
    }
  ]
 }
--- a/examples/mattermost/tests.json
+++ b/examples/mattermost/tests.json
@ -7,7 +7,8 @@
    {
      "type": "string",
      "url": "https://www.example.com",
-      "string": "mattermost"
+      "string": "mattermost",
+      "tls": "www.example.com"
    }
  ]
 }
--- a/examples/mongo-express/tests.json
+++ b/examples/mongo-express/tests.json
@ -8,7 +8,8 @@
    {
      "type": "status",
      "url": "https://www.example.com",
-      "status": 401
+      "status": 401,
+      "tls": "www.example.com"
    }
  ]
 }
--- a/examples/moodle/tests.json
+++ b/examples/moodle/tests.json
@ -7,7 +7,8 @@
    {
      "type": "string",
      "url": "https://www.example.com",
-      "string": "moodle"
+      "string": "moodle",
+      "tls": "www.example.com"
    }
  ]
 }
--- a/examples/nextcloud/tests.json
+++ b/examples/nextcloud/tests.json
@ -8,7 +8,8 @@
    {
      "type": "string",
      "url": "https://www.example.com",
-      "string": "nextcloud"
+      "string": "nextcloud",
+      "tls": "www.example.com"
    }
  ]
 }
--- a/examples/passbolt/tests.json
+++ b/examples/passbolt/tests.json
@ -6,7 +6,8 @@
    {
      "type": "string",
      "url": "https://www.example.com",
-      "string": "passbolt"
+      "string": "passbolt",
+      "tls": "www.example.com"
    }
  ]
 }
--- a/examples/php-multisite/tests.json
+++ b/examples/php-multisite/tests.json
@ -6,12 +6,14 @@
    {
      "type": "string",
      "url": "https://app1.example.com",
-      "string": "app1"
+      "string": "app1",
+      "tls": "app1.example.com"
    },
    {
      "type": "string",
      "url": "https://app2.example.com",
-      "string": "app2"
+      "string": "app2",
+      "tls": "app2.example.com"
    }
  ]
 }
--- a/examples/php-singlesite/tests.json
+++ b/examples/php-singlesite/tests.json
@ -6,7 +6,8 @@
    {
      "type": "string",
      "url": "https://www.example.com",
-      "string": "hello"
+      "string": "hello",
+      "tls": "www.example.com"
    }
  ]
 }
--- a/examples/prestashop/tests.json
+++ b/examples/prestashop/tests.json
@ -7,7 +7,8 @@
    {
      "type": "string",
      "url": "https://www.example.com/administration",
-      "string": "prestashop"
+      "string": "prestashop",
+      "tls": "www.example.com"
    }
  ]
 }
--- a/examples/radarr/tests.json
+++ b/examples/radarr/tests.json
@ -7,7 +7,8 @@
    {
      "type": "string",
      "url": "https://www.example.com",
-      "string": "radarr"
+      "string": "radarr",
+      "tls": "www.example.com"
    }
  ]
 }
--- a/examples/redmine/tests.json
+++ b/examples/redmine/tests.json
@ -7,7 +7,8 @@
    {
      "type": "string",
      "url": "https://www.example.com",
-      "string": "redmine"
+      "string": "redmine",
+      "tls": "www.example.com"
    }
  ]
 }
--- a/examples/reverse-proxy-multisite/tests.json
+++ b/examples/reverse-proxy-multisite/tests.json
@ -7,12 +7,14 @@
    {
      "type": "string",
      "url": "https://app1.example.com",
-      "string": "hello"
+      "string": "hello",
+      "tls": "app1.example.com"
    },
    {
      "type": "string",
      "url": "https://app2.example.com",
-      "string": "hello"
+      "string": "hello",
+      "tls": "app2.example.com"
    }
  ]
 }
--- a/examples/reverse-proxy-singlesite/tests.json
+++ b/examples/reverse-proxy-singlesite/tests.json
@ -8,12 +8,14 @@
    {
      "type": "string",
      "url": "https://www.example.com/app1",
-      "string": "hello"
+      "string": "hello",
+      "tls": "www.example.com"
    },
    {
      "type": "string",
      "url": "https://www.example.com/app2",
-      "string": "hello"
+      "string": "hello",
+      "tls": "www.example.com"
    }
  ]
 }
--- a/examples/swarm-configs/tests.json
+++ b/examples/swarm-configs/tests.json
@ -6,32 +6,38 @@
    {
      "type": "string",
      "url": "https://app1.example.com/app1",
-      "string": "app1"
+      "string": "app1",
+      "tls": "app1.example.com"
    },
    {
      "type": "string",
      "url": "https://app2.example.com/app2",
-      "string": "app2"
+      "string": "app2",
+      "tls": "app2.example.com"
    },
    {
      "type": "string",
      "url": "https://app3.example.com/app3",
-      "string": "app3"
+      "string": "app3",
+      "tls": "app3.example.com"
    },
    {
      "type": "string",
      "url": "https://app1.example.com/hello",
-      "string": "hello"
+      "string": "hello",
+      "tls": "app1.example.com"
    },
    {
      "type": "string",
      "url": "https://app2.example.com/hello",
-      "string": "hello"
+      "string": "hello",
+      "tls": "app2.example.com"
    },
    {
      "type": "string",
      "url": "https://app3.example.com/hello",
-      "string": "hello"
+      "string": "hello",
+      "tls": "app3.example.com"
    }
  ]
 }
--- a/examples/tomcat/tests.json
+++ b/examples/tomcat/tests.json
@ -6,7 +6,8 @@
    {
      "type": "string",
      "url": "https://www.example.com",
-      "string": "tomcat"
+      "string": "tomcat",
+      "tls": "www.example.com"
    }
  ]
 }
--- a/examples/wordpress/tests.json
+++ b/examples/wordpress/tests.json
@ -8,7 +8,8 @@
    {
      "type": "string",
      "url": "https://www.example.com",
-      "string": "wordpress"
+      "string": "wordpress",
+      "tls": "www.example.com"
    }
  ]
 }
--- a/src/common/core/misc/jobs/default-server-cert.py
+++ b/src/common/core/misc/jobs/default-server-cert.py
@ -47,7 +47,7 @@ try:
                    "-days",
                    "3650",
                    "-subj",
-                    "/C=AU/ST=Some-State/O=Internet Widgits Pty Ltd/",
+                    "/C=AU/ST=Some-State/O=Internet Widgits Pty Ltd/CN=www.example.org/",
                ],
                stdin=DEVNULL,
                stderr=DEVNULL,