[release] v0.9.0-unstable2
This commit is contained in:
parent
d0eedf7cc1
commit
b58855b428
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "cosmos-server",
|
||||
"version": "0.9.0-unstable",
|
||||
"version": "0.9.0-unstable2",
|
||||
"description": "",
|
||||
"main": "test-server.js",
|
||||
"bugs": {
|
||||
|
|
|
@ -240,7 +240,6 @@ func InitServer() *mux.Router {
|
|||
baseMainConfig.HTTPConfig.ForceHTTPSCertificateRenewal = false
|
||||
|
||||
utils.SetBaseMainConfig(baseMainConfig)
|
||||
|
||||
utils.Log("Saved new LETSENCRYPT TLS certificate")
|
||||
|
||||
tlsCert = pub
|
||||
|
@ -385,14 +384,14 @@ func InitServer() *mux.Router {
|
|||
}
|
||||
|
||||
func StartServer() {
|
||||
router := InitServer()
|
||||
|
||||
config := utils.GetMainConfig()
|
||||
HTTPConfig := config.HTTPConfig
|
||||
|
||||
var tlsCert = HTTPConfig.TLSCert
|
||||
var tlsKey= HTTPConfig.TLSKey
|
||||
|
||||
router := InitServer()
|
||||
|
||||
if (
|
||||
(
|
||||
HTTPConfig.HTTPSCertificateMode == utils.HTTPSCertModeList["SELFSIGNED"] ||
|
||||
|
|
|
@ -200,7 +200,7 @@ func DoLetsEncrypt() (string, string) {
|
|||
myUser.Registration = reg
|
||||
|
||||
request := certificate.ObtainRequest{
|
||||
Domains: LetsEncryptValidOnly(GetAllHostnames(true, false)),
|
||||
Domains: LetsEncryptValidOnly(GetAllHostnames(true, false), config.HTTPConfig.DNSChallengeProvider != ""),
|
||||
Bundle: true,
|
||||
}
|
||||
certificates, err := client.Certificate.Obtain(request)
|
||||
|
|
|
@ -140,8 +140,8 @@ func HTTPError(w http.ResponseWriter, message string, code int, userCode string)
|
|||
}
|
||||
|
||||
func SetBaseMainConfig(config Config) {
|
||||
LoadBaseMainConfig(config)
|
||||
SaveConfigTofile(config)
|
||||
LoadBaseMainConfig(config)
|
||||
}
|
||||
|
||||
func ReadConfigFromFile() Config {
|
||||
|
@ -309,13 +309,13 @@ func RestartServer() {
|
|||
os.Exit(0)
|
||||
}
|
||||
|
||||
func LetsEncryptValidOnly(hostnames []string) []string {
|
||||
func LetsEncryptValidOnly(hostnames []string, acceptWildcard bool) []string {
|
||||
wrongPattern := `^(localhost|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}|.*\.local)$`
|
||||
re, _ := regexp.Compile(wrongPattern)
|
||||
|
||||
var validDomains []string
|
||||
for _, domain := range hostnames {
|
||||
if !re.MatchString(domain) && !strings.Contains(domain, "*") && !strings.Contains(domain, " ") && !strings.Contains(domain, ",") {
|
||||
if !re.MatchString(domain) && (acceptWildcard || !strings.Contains(domain, "*")) && !strings.Contains(domain, " ") && !strings.Contains(domain, ",") {
|
||||
validDomains = append(validDomains, domain)
|
||||
} else {
|
||||
Error("Invalid domain found in URLs: " + domain + " it was removed from the certificate to not break Let's Encrypt", nil)
|
||||
|
|
Loading…
Reference in a new issue