From ee87be7994ad16dd7656f4b88d911ce5061e023b Mon Sep 17 00:00:00 2001 From: Yann Stepienik Date: Sun, 18 Jun 2023 10:35:07 +0100 Subject: [PATCH] [release] v0.7.5 --- package.json | 2 +- src/utils/utils.go | 13 +++---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 6a1c4a4..f85c629 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cosmos-server", - "version": "0.7.4", + "version": "0.7.5", "description": "", "main": "test-server.js", "bugs": { diff --git a/src/utils/utils.go b/src/utils/utils.go index 40066b5..e6a585c 100644 --- a/src/utils/utils.go +++ b/src/utils/utils.go @@ -307,15 +307,6 @@ func GetAllHostnames(applyWildCard bool, removePorts bool) []string { mainHostname, } - if applyWildCard && MainConfig.HTTPConfig.UseWildcardCertificate { - mainHostnameWild := "*." + mainHostname - hostnames = []string{ - mainHostname, - mainHostnameWild, - } - Log("Using wildcard certificate for " + mainHostname + " and all subdomains.") - } - proxies := GetMainConfig().HTTPConfig.ProxyConfig.Routes for _, proxy := range proxies { if proxy.UseHost && proxy.Host != "" && strings.Contains(proxy.Host, ".") && !strings.Contains(proxy.Host, ",") && !strings.Contains(proxy.Host, " ") { @@ -339,14 +330,16 @@ func GetAllHostnames(applyWildCard bool, removePorts bool) []string { if applyWildCard && MainConfig.HTTPConfig.UseWildcardCertificate { filteredHostnames := []string{ + "*." + mainHostname, mainHostname, } for _, hostname := range uniqueHostnames { - if hostname != mainHostname && !strings.HasSuffix(hostname, mainHostname[1:]) { + if hostname != mainHostname && !strings.HasSuffix(hostname, "."+mainHostname) { filteredHostnames = append(filteredHostnames, hostname) } } + uniqueHostnames = filteredHostnames }