go-packages/iris
1
0
Fork 0
mirror of https://github.com/kataras/iris.git synced 2025-03-14 08:16:28 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

friendly name displayed on AutoTLS as suggested at #1578

Browse Source
This commit is contained in:
Gerasimos (Makis) Maropoulos 2020-08-12 08:18:31 +03:00
parent 22e25c3586
commit 0edf0affb0
No known key found for this signature in database
GPG Key ID: 5DBE766BD26A54E7
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/host/supervisor.go
View File

@ -31,6 +31,7 @@ type Configurator func(su *Supervisor)
// Interfaces are separated to return relative functionality to them. // Interfaces are separated to return relative functionality to them.
type Supervisor struct { type Supervisor struct {
Server *http.Server Server *http.Server
friendlyAddr string // e.g mydomain.com instead of :443 when AutoTLS is used, see `WriteStartupLogOnServe` task.
disableHTTP1ToHTTP2Redirection bool disableHTTP1ToHTTP2Redirection bool
closedManually uint32 // future use, accessed atomically (non-zero means we've called the Shutdown) closedManually uint32 // future use, accessed atomically (non-zero means we've called the Shutdown)
closedByInterruptHandler uint32 // non-zero means that the end-developer interrupted it by-purpose. closedByInterruptHandler uint32 // non-zero means that the end-developer interrupted it by-purpose.
@ -347,8 +348,9 @@ func (su *Supervisor) ListenAndServeAutoTLS(domain string, email string, cacheDi
cache = autocert.DirCache(cacheDir) cache = autocert.DirCache(cacheDir)
} }
if domain != "" { if strings.TrimSpace(domain) != "" {
domains := strings.Split(domain, " ") domains := strings.Split(domain, " ")
su.friendlyAddr = domains[0]
hostPolicy = autocert.HostWhitelist(domains...) hostPolicy = autocert.HostWhitelist(domains...)
} }

8
core/host/task.go
View File

@ -22,8 +22,12 @@ import (
// This function should be registered on Serve. // This function should be registered on Serve.
func WriteStartupLogOnServe(w io.Writer) func(TaskHost) { func WriteStartupLogOnServe(w io.Writer) func(TaskHost) {
return func(h TaskHost) { return func(h TaskHost) {
guessScheme := netutil.ResolveScheme(h.Supervisor.manuallyTLS) guessScheme := netutil.ResolveScheme(h.Supervisor.manuallyTLS || h.Supervisor.Fallback != nil)
listeningURI := netutil.ResolveURL(guessScheme, h.Supervisor.Server.Addr) addr := h.Supervisor.friendlyAddr
if addr == "" {
addr = h.Supervisor.Server.Addr
}
listeningURI := netutil.ResolveURL(guessScheme, addr)
interruptkey := "CTRL" interruptkey := "CTRL"
if runtime.GOOS == "darwin" { if runtime.GOOS == "darwin" {
interruptkey = "CMD" interruptkey = "CMD"