mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2025-05-10 09:40:11 +03:00
fixed conflict
This commit is contained in:
commit
8a924cb4ed
4 changed files with 33 additions and 2 deletions
internal/home
|
@ -57,6 +57,9 @@ type webConfig struct {
|
|||
firstRun bool
|
||||
|
||||
serveHTTP3 bool
|
||||
|
||||
// ciphers specified by user
|
||||
tlsCiphers []string
|
||||
}
|
||||
|
||||
// httpsServer contains the data for the HTTPS server.
|
||||
|
@ -288,6 +291,14 @@ func (web *Web) tlsServerLoop() {
|
|||
|
||||
web.httpsServer.cond.L.Unlock()
|
||||
|
||||
var cipher []uint16
|
||||
|
||||
if len(web.conf.tlsCiphers) == 0 {
|
||||
cipher = aghtls.SaferCipherSuites()
|
||||
} else {
|
||||
cipher = aghtls.UserPreferredCipherSuites(web.conf.tlsCiphers)
|
||||
}
|
||||
|
||||
addr := netutil.JoinHostPort(web.conf.BindHost.String(), web.conf.PortHTTPS)
|
||||
web.httpsServer.server = &http.Server{
|
||||
ErrorLog: log.StdLog("web: https", log.DEBUG),
|
||||
|
@ -295,7 +306,7 @@ func (web *Web) tlsServerLoop() {
|
|||
TLSConfig: &tls.Config{
|
||||
Certificates: []tls.Certificate{web.httpsServer.cert},
|
||||
RootCAs: Context.tlsRoots,
|
||||
CipherSuites: aghtls.SaferCipherSuites(),
|
||||
CipherSuites: cipher,
|
||||
MinVersion: tls.VersionTLS12,
|
||||
},
|
||||
Handler: withMiddlewares(Context.mux, limitRequestBody),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue