mirror of
https://github.com/sipeed/NanoKVM.git
synced 2026-09-11 00:22:56 -05:00
fix ipv6
This commit is contained in:
@@ -28,7 +28,7 @@ The configuration file path is `/etc/kvm/server.yaml`.
|
||||
```yaml
|
||||
# Network Settings
|
||||
proto: http # Access protocol. Can be changed to `https` only when certificates are configured. Default is `http`
|
||||
host: 0.0.0.0 # The listening address for the HTTP/HTTPS service.
|
||||
host: "" # The listening address for the HTTP/HTTPS service. If left empty, all network interfaces will be bound
|
||||
port:
|
||||
http: 80 # The listening port for the HTTP service. Default is `80`
|
||||
https: 443 # The listening port for the HTTPS service (effective when HTTPS is enabled). Default is `443`
|
||||
|
||||
@@ -27,7 +27,7 @@ server
|
||||
|
||||
```yaml
|
||||
proto: http
|
||||
host: 0.0.0.0
|
||||
host: ""
|
||||
port:
|
||||
http: 80
|
||||
https: 443
|
||||
|
||||
@@ -26,7 +26,7 @@ server
|
||||
```yaml
|
||||
# 网络设置
|
||||
proto: http # 访问协议,默认为 `http`,仅当配置了证书时支持改为 `https`
|
||||
host: 0.0.0.0
|
||||
host: ""
|
||||
port:
|
||||
http: 80 # HTTP 服务的监听端口,默认为 `80`
|
||||
https: 443 # HTTPS 服务的监听端口(启用 https 协议时生效),默认为 `443`
|
||||
|
||||
@@ -2,7 +2,7 @@ package config
|
||||
|
||||
var defaultConfig = &Config{
|
||||
Proto: "http",
|
||||
Host: "0.0.0.0",
|
||||
Host: "",
|
||||
Port: Port{
|
||||
Http: 80,
|
||||
Https: 443,
|
||||
|
||||
@@ -3,6 +3,7 @@ package main
|
||||
import (
|
||||
"fmt"
|
||||
"log"
|
||||
"net"
|
||||
"os"
|
||||
"os/signal"
|
||||
"strconv"
|
||||
@@ -68,13 +69,13 @@ func run() {
|
||||
|
||||
router.Init(r)
|
||||
|
||||
httpAddr := fmt.Sprintf("%s:%d", conf.Host, conf.Port.Http)
|
||||
httpAddr := listenAddr(conf.Host, strconv.Itoa(conf.Port.Http))
|
||||
|
||||
if conf.Proto == "https" {
|
||||
httpsAddr := fmt.Sprintf("%s:%d", conf.Host, conf.Port.Https)
|
||||
httpsPortStr := strconv.Itoa(conf.Port.Https)
|
||||
|
||||
go func() {
|
||||
err := r.RunTLS(httpsAddr, conf.Cert.Crt, conf.Cert.Key)
|
||||
err := r.RunTLS(listenAddr(conf.Host, httpsPortStr), conf.Cert.Crt, conf.Cert.Key)
|
||||
if err != nil {
|
||||
panic("start https server failed")
|
||||
}
|
||||
@@ -82,7 +83,7 @@ func run() {
|
||||
|
||||
if err := middleware.ListenAndServeLoopbackHTTPRedirect(
|
||||
httpAddr,
|
||||
strconv.Itoa(conf.Port.Https),
|
||||
httpsPortStr,
|
||||
r,
|
||||
router.PicoclawLoopbackHTTPAllowedPaths()...,
|
||||
); err != nil {
|
||||
@@ -98,3 +99,10 @@ func run() {
|
||||
func dispose() {
|
||||
common.GetKvmVision().Close()
|
||||
}
|
||||
|
||||
func listenAddr(host string, port string) string {
|
||||
if host == "" {
|
||||
return fmt.Sprintf(":%s", port)
|
||||
}
|
||||
return net.JoinHostPort(host, port)
|
||||
}
|
||||
|
||||
@@ -38,8 +38,12 @@ func ListenAndServeLoopbackHTTPRedirect(
|
||||
if h, _, err := net.SplitHostPort(host); err == nil {
|
||||
host = h
|
||||
}
|
||||
|
||||
if strings.Contains(host, ":") {
|
||||
host = "[" + host + "]"
|
||||
}
|
||||
if httpsPort != "443" {
|
||||
host = net.JoinHostPort(host, httpsPort)
|
||||
host += ":" + httpsPort
|
||||
}
|
||||
|
||||
http.Redirect(w, req, "https://"+host+req.URL.RequestURI(), http.StatusTemporaryRedirect)
|
||||
|
||||
Reference in New Issue
Block a user