Skip to content

Commit a0f1ac4

Browse files
committed
chore: apply ntp time function more place
1 parent 57e14e5 commit a0f1ac4

File tree

14 files changed

+28
-15
lines changed

14 files changed

+28
-15
lines changed

component/ca/config.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212

1313
"github.com/metacubex/mihomo/common/once"
1414
C "github.com/metacubex/mihomo/constant"
15+
"github.com/metacubex/mihomo/ntp"
1516
)
1617

1718
var globalCertPool *x509.CertPool
@@ -110,6 +111,7 @@ func GetTLSConfig(opt Option) (tlsConfig *tls.Config, err error) {
110111
if tlsConfig == nil {
111112
tlsConfig = &tls.Config{}
112113
}
114+
tlsConfig.Time = ntp.Now
113115

114116
if opt.ZeroTrust {
115117
tlsConfig.RootCAs = zeroTrustCertPool()

hub/route/server.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
tlsC "github.com/metacubex/mihomo/component/tls"
2121
C "github.com/metacubex/mihomo/constant"
2222
"github.com/metacubex/mihomo/log"
23+
"github.com/metacubex/mihomo/ntp"
2324
"github.com/metacubex/mihomo/tunnel/statistic"
2425

2526
"github.com/go-chi/chi/v5"
@@ -201,7 +202,7 @@ func startTLS(cfg *Config) {
201202
}
202203

203204
log.Infoln("RESTful API tls listening at: %s", l.Addr().String())
204-
tlsConfig := &tlsC.Config{}
205+
tlsConfig := &tlsC.Config{Time: ntp.Now}
205206
tlsConfig.NextProtos = []string{"h2", "http/1.1"}
206207
tlsConfig.Certificates = []tlsC.Certificate{tlsC.UCertificate(cert)}
207208

listener/anytls/server.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import (
1717
C "github.com/metacubex/mihomo/constant"
1818
LC "github.com/metacubex/mihomo/listener/config"
1919
"github.com/metacubex/mihomo/listener/sing"
20+
"github.com/metacubex/mihomo/ntp"
2021
"github.com/metacubex/mihomo/transport/anytls/padding"
2122
"github.com/metacubex/mihomo/transport/anytls/session"
2223

@@ -42,7 +43,7 @@ func New(config LC.AnyTLSServer, tunnel C.Tunnel, additions ...inbound.Addition)
4243
}
4344
}
4445

45-
tlsConfig := &tlsC.Config{}
46+
tlsConfig := &tlsC.Config{Time: ntp.Now}
4647
if config.Certificate != "" && config.PrivateKey != "" {
4748
cert, err := ca.LoadTLSKeyPair(config.Certificate, config.PrivateKey, C.Path)
4849
if err != nil {

listener/http/server.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
authStore "github.com/metacubex/mihomo/listener/auth"
1313
LC "github.com/metacubex/mihomo/listener/config"
1414
"github.com/metacubex/mihomo/listener/reality"
15+
"github.com/metacubex/mihomo/ntp"
1516
)
1617

1718
type Listener struct {
@@ -65,7 +66,7 @@ func NewWithConfig(config LC.AuthServer, tunnel C.Tunnel, additions ...inbound.A
6566
return nil, err
6667
}
6768

68-
tlsConfig := &tlsC.Config{}
69+
tlsConfig := &tlsC.Config{Time: ntp.Now}
6970
var realityBuilder *reality.Builder
7071

7172
if config.Certificate != "" && config.PrivateKey != "" {

listener/mixed/mixed.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616
"github.com/metacubex/mihomo/listener/http"
1717
"github.com/metacubex/mihomo/listener/reality"
1818
"github.com/metacubex/mihomo/listener/socks"
19+
"github.com/metacubex/mihomo/ntp"
1920
"github.com/metacubex/mihomo/transport/socks4"
2021
"github.com/metacubex/mihomo/transport/socks5"
2122
)
@@ -61,7 +62,7 @@ func NewWithConfig(config LC.AuthServer, tunnel C.Tunnel, additions ...inbound.A
6162
return nil, err
6263
}
6364

64-
tlsConfig := &tlsC.Config{}
65+
tlsConfig := &tlsC.Config{Time: ntp.Now}
6566
var realityBuilder *reality.Builder
6667

6768
if config.Certificate != "" && config.PrivateKey != "" {

listener/sing_hysteria2/server.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
LC "github.com/metacubex/mihomo/listener/config"
2121
"github.com/metacubex/mihomo/listener/sing"
2222
"github.com/metacubex/mihomo/log"
23+
"github.com/metacubex/mihomo/ntp"
2324

2425
"github.com/metacubex/sing-quic/hysteria2"
2526

@@ -61,6 +62,7 @@ func New(config LC.Hysteria2Server, tunnel C.Tunnel, additions ...inbound.Additi
6162
return nil, err
6263
}
6364
tlsConfig := &tlsC.Config{
65+
Time: ntp.Now,
6466
MinVersion: tlsC.VersionTLS13,
6567
}
6668
tlsConfig.Certificates = []tlsC.Certificate{tlsC.UCertificate(cert)}

listener/sing_vless/server.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515
LC "github.com/metacubex/mihomo/listener/config"
1616
"github.com/metacubex/mihomo/listener/reality"
1717
"github.com/metacubex/mihomo/listener/sing"
18+
"github.com/metacubex/mihomo/ntp"
1819
"github.com/metacubex/mihomo/transport/gun"
1920
"github.com/metacubex/mihomo/transport/vless/encryption"
2021
mihomoVMess "github.com/metacubex/mihomo/transport/vmess"
@@ -75,7 +76,7 @@ func New(config LC.VlessServer, tunnel C.Tunnel, additions ...inbound.Addition)
7576
}()
7677
}
7778

78-
tlsConfig := &tlsC.Config{}
79+
tlsConfig := &tlsC.Config{Time: ntp.Now}
7980
var realityBuilder *reality.Builder
8081
var httpServer http.Server
8182

listener/sing_vmess/server.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ func New(config LC.VmessServer, tunnel C.Tunnel, additions ...inbound.Addition)
7676

7777
sl = &Listener{false, config, nil, service}
7878

79-
tlsConfig := &tlsC.Config{}
79+
tlsConfig := &tlsC.Config{Time: ntp.Now}
8080
var realityBuilder *reality.Builder
8181
var httpServer http.Server
8282

listener/socks/tcp.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515
authStore "github.com/metacubex/mihomo/listener/auth"
1616
LC "github.com/metacubex/mihomo/listener/config"
1717
"github.com/metacubex/mihomo/listener/reality"
18+
"github.com/metacubex/mihomo/ntp"
1819
"github.com/metacubex/mihomo/transport/socks4"
1920
"github.com/metacubex/mihomo/transport/socks5"
2021
)
@@ -60,7 +61,7 @@ func NewWithConfig(config LC.AuthServer, tunnel C.Tunnel, additions ...inbound.A
6061
return nil, err
6162
}
6263

63-
tlsConfig := &tlsC.Config{}
64+
tlsConfig := &tlsC.Config{Time: ntp.Now}
6465
var realityBuilder *reality.Builder
6566

6667
if config.Certificate != "" && config.PrivateKey != "" {

listener/trojan/server.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515
LC "github.com/metacubex/mihomo/listener/config"
1616
"github.com/metacubex/mihomo/listener/reality"
1717
"github.com/metacubex/mihomo/listener/sing"
18+
"github.com/metacubex/mihomo/ntp"
1819
"github.com/metacubex/mihomo/transport/gun"
1920
"github.com/metacubex/mihomo/transport/shadowsocks/core"
2021
"github.com/metacubex/mihomo/transport/socks5"
@@ -70,7 +71,7 @@ func New(config LC.TrojanServer, tunnel C.Tunnel, additions ...inbound.Addition)
7071
}
7172
sl = &Listener{false, config, nil, keys, pickCipher, h}
7273

73-
tlsConfig := &tlsC.Config{}
74+
tlsConfig := &tlsC.Config{Time: ntp.Now}
7475
var realityBuilder *reality.Builder
7576
var httpServer http.Server
7677

0 commit comments

Comments
 (0)