Show certificate names in vhost selectors · f1cde52

+14 -7

scripts/host_manager.pl

@@ -4312,21 +4312,28 @@ sub app_html {
 
     function compactCertificateLabel(cert, row) {
       const relevance = certRelevance(cert, row);
-      const id = String(certificateIdOf(cert));
       const days = daysUntil(cert.not_after);
       const suffix = days === null ? '' : ` (${certStatusLabel(days)})`;
-      const timestamp = id.match(/-(\d{14})$/);
+      const name = certificateDisplayName(cert);
       if (row && row.vhost) {
-        if (relevance === 0) return `vhost${timestamp ? ' ' + timestamp[1] : ''}${suffix}`;
-        if (relevance === 1) return `host${timestamp ? ' ' + timestamp[1] : ''}${suffix}`;
-        if (relevance === 2) return `alias${timestamp ? ' ' + timestamp[1] : ''}${suffix}`;
+        if (relevance === 0) return `${name}${suffix}`;
+        if (relevance === 1) return `host ${name}${suffix}`;
+        if (relevance === 2) return `alias ${name}${suffix}`;
       } else {
-        if (relevance === 0) return `host${timestamp ? ' ' + timestamp[1] : ''}${suffix}`;
-        if (relevance === 1) return `alias${timestamp ? ' ' + timestamp[1] : ''}${suffix}`;
+        if (relevance === 0) return `${name}${suffix}`;
+        if (relevance === 1) return `alias ${name}${suffix}`;
       }
       return `${shortCertificateName(cert)}${suffix}`;
     }
 
+    function certificateDisplayName(cert) {
+      const commonName = String(cert.common_name || '').trim();
+      if (commonName) return commonName;
+      const dnsNames = certDnsNames(cert);
+      if (dnsNames.length) return dnsNames[0];
+      return shortCertificateName(cert);
+    }
+
     function shortCertificateName(cert) {
       const name = String(cert.common_name || cert.name || cert.id || '');
       const suffix = '.madagascar.xdev.ro';


	@@ -4312,21 +4312,28 @@ sub app_html {
4312	4312
4313	4313	function compactCertificateLabel(cert, row) {
4314	4314	const relevance = certRelevance(cert, row);
4315		- const id = String(certificateIdOf(cert));
4316	4315	const days = daysUntil(cert.not_after);
4317	4316	const suffix = days === null ? '' : ` (${certStatusLabel(days)})`;
4318		- const timestamp = id.match(/-(\d{14})$/);
	4317	+ const name = certificateDisplayName(cert);
4319	4318	if (row && row.vhost) {
4320		- if (relevance === 0) return `vhost${timestamp ? ' ' + timestamp[1] : ''}${suffix}`;
4321		- if (relevance === 1) return `host${timestamp ? ' ' + timestamp[1] : ''}${suffix}`;
4322		- if (relevance === 2) return `alias${timestamp ? ' ' + timestamp[1] : ''}${suffix}`;
	4319	+ if (relevance === 0) return `${name}${suffix}`;
	4320	+ if (relevance === 1) return `host ${name}${suffix}`;
	4321	+ if (relevance === 2) return `alias ${name}${suffix}`;
4323	4322	} else {
4324		- if (relevance === 0) return `host${timestamp ? ' ' + timestamp[1] : ''}${suffix}`;
4325		- if (relevance === 1) return `alias${timestamp ? ' ' + timestamp[1] : ''}${suffix}`;
	4323	+ if (relevance === 0) return `${name}${suffix}`;
	4324	+ if (relevance === 1) return `alias ${name}${suffix}`;
4326	4325	}
4327	4326	return `${shortCertificateName(cert)}${suffix}`;
4328	4327	}
4329	4328
	4329	+ function certificateDisplayName(cert) {
	4330	+ const commonName = String(cert.common_name \|\| '').trim();
	4331	+ if (commonName) return commonName;
	4332	+ const dnsNames = certDnsNames(cert);
	4333	+ if (dnsNames.length) return dnsNames[0];
	4334	+ return shortCertificateName(cert);
	4335	+ }
	4336	+
4330	4337	function shortCertificateName(cert) {
4331	4338	const name = String(cert.common_name \|\| cert.name \|\| cert.id \|\| '');
4332	4339	const suffix = '.madagascar.xdev.ro';