mirror of
https://github.com/nabbar/golib.git
synced 2025-09-26 20:01:15 +08:00

- fix bug with cert type marshall/unmarshall - add old config to allow retro compatibility - add new type function to retrieve a tls root ca cert instead of a slice of string to get root ca Package HTTPCli: - fix default DNS Mapper - optimze global DNS Mapper - fix non closing sub goroutine Package HTTPCli/DNS-Mapper: - change request function of Root CA with function of root ca cert instance - add function to return a root ca cert from a function that return a slice of root ca string Package Config/Components: - httpcli: bump sub package of certificate, httpcli - httpcli: adjust code following bump - httpcli: change request function of Root CA with function of root ca cert instance - httpcli: add function to return a root ca cert from a function that return a slice of root ca string - tls: change request function of Root CA with function of root ca cert instance - tls: add function to return a root ca cert from a function that return a slice of root ca string Package IOUtils/mapCloser: - fix bug with mapcloser not stopped - optimize code & goroutine Package Logger: - rework mapCloser call - optimize mapClaoser managment Package Request: - rework error managment - using []byte instead of buffer to read response body - add free capability - optimize memory consumption Package Socket / Server: - add filtering error capability - add params to specify a function called on each new connection and before using the connection - the new function param allow to update the network incomming connection (like buffer, deadline...) - rework some useless atomic to direct value to optimize code Package Socket/Delim: - rework to optimize memory & variable use - remove capabilities of update the instance when running, prefert recreate new one if necessary Other: - bump dependencies - minor bug / fix
166 lines
4.3 KiB
Go
166 lines
4.3 KiB
Go
/*
|
|
* MIT License
|
|
*
|
|
* Copyright (c) 2020 Nicolas JUHEL
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in all
|
|
* copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
* SOFTWARE.
|
|
*
|
|
*
|
|
*/
|
|
|
|
package dns_mapper
|
|
|
|
import (
|
|
"context"
|
|
"crypto/tls"
|
|
"fmt"
|
|
"net"
|
|
"net/http"
|
|
"net/url"
|
|
"time"
|
|
|
|
libtls "github.com/nabbar/golib/certificates"
|
|
libdur "github.com/nabbar/golib/duration"
|
|
)
|
|
|
|
func (o *dmp) dialer() *net.Dialer {
|
|
return &net.Dialer{
|
|
Timeout: o.configDialerTimeout(),
|
|
DualStack: true,
|
|
KeepAlive: o.configDialerKeepAlive(),
|
|
}
|
|
}
|
|
|
|
func (o *dmp) Dial(network, address string) (net.Conn, error) {
|
|
return o.DialContext(context.Background(), network, address)
|
|
}
|
|
|
|
func (o *dmp) DialContext(ctx context.Context, network, address string) (net.Conn, error) {
|
|
var (
|
|
e error
|
|
d = o.dialer()
|
|
dst string
|
|
)
|
|
|
|
if dst, e = o.SearchWithCache(address); e != nil {
|
|
return nil, e
|
|
} else {
|
|
o.Message(fmt.Sprintf("Dialing '%s %s' => '%s %s'", network, address, network, dst))
|
|
o.CacheSet(address, dst)
|
|
return d.DialContext(ctx, network, dst)
|
|
}
|
|
}
|
|
|
|
func (o *dmp) Transport(cfg TransportConfig) *http.Transport {
|
|
var prx func(*http.Request) (*url.URL, error)
|
|
if cfg.Proxy == nil {
|
|
prx = http.ProxyFromEnvironment
|
|
} else {
|
|
prx = http.ProxyURL(cfg.Proxy)
|
|
}
|
|
|
|
var ssl libtls.TLSConfig
|
|
|
|
if cfg.TLSConfig == nil {
|
|
ssl = libtls.New()
|
|
ssl.SetVersionMin(tls.VersionTLS12)
|
|
ssl.SetVersionMax(tls.VersionTLS13)
|
|
} else if ssl = cfg.TLSConfig.New(); ssl == nil {
|
|
ssl = libtls.New()
|
|
ssl.SetVersionMin(tls.VersionTLS12)
|
|
ssl.SetVersionMax(tls.VersionTLS13)
|
|
}
|
|
|
|
if v := o.f(); v != nil && v.Len() > 0 {
|
|
ssl.AddRootCA(v)
|
|
}
|
|
|
|
if cfg.TimeoutGlobal == 0 {
|
|
cfg.TimeoutGlobal = libdur.ParseDuration(30 * time.Second)
|
|
}
|
|
|
|
if cfg.TimeoutKeepAlive == 0 {
|
|
cfg.TimeoutKeepAlive = libdur.ParseDuration(15 * time.Second)
|
|
}
|
|
|
|
if cfg.TimeoutTLSHandshake == 0 {
|
|
cfg.TimeoutTLSHandshake = libdur.ParseDuration(10 * time.Second)
|
|
}
|
|
|
|
if cfg.TimeoutExpectContinue == 0 {
|
|
cfg.TimeoutExpectContinue = libdur.ParseDuration(3 * time.Second)
|
|
}
|
|
|
|
if cfg.TimeoutIdleConn == 0 {
|
|
cfg.TimeoutIdleConn = libdur.ParseDuration(90 * time.Second)
|
|
}
|
|
|
|
if cfg.MaxConnsPerHost == 0 {
|
|
cfg.MaxIdleConns = 25
|
|
}
|
|
|
|
if cfg.MaxIdleConnsPerHost == 0 {
|
|
cfg.MaxIdleConnsPerHost = 5
|
|
}
|
|
|
|
if cfg.MaxIdleConns == 0 {
|
|
cfg.MaxIdleConns = 25
|
|
}
|
|
|
|
return &http.Transport{
|
|
Proxy: prx,
|
|
Dial: o.Dial,
|
|
DialContext: o.DialContext,
|
|
TLSClientConfig: ssl.TlsConfig(""),
|
|
TLSHandshakeTimeout: cfg.TimeoutTLSHandshake.Time(),
|
|
DisableKeepAlives: cfg.DisableKeepAlive,
|
|
DisableCompression: cfg.DisableCompression,
|
|
MaxIdleConns: cfg.MaxIdleConns,
|
|
MaxIdleConnsPerHost: cfg.MaxIdleConnsPerHost,
|
|
MaxConnsPerHost: cfg.MaxConnsPerHost,
|
|
IdleConnTimeout: cfg.TimeoutIdleConn.Time(),
|
|
ResponseHeaderTimeout: cfg.TimeoutResponseHeader.Time(),
|
|
ExpectContinueTimeout: cfg.TimeoutExpectContinue.Time(),
|
|
ForceAttemptHTTP2: !cfg.DisableHTTP2,
|
|
}
|
|
}
|
|
|
|
func (o *dmp) Client(cfg TransportConfig) *http.Client {
|
|
return &http.Client{
|
|
Transport: o.Transport(cfg),
|
|
}
|
|
}
|
|
|
|
func (o *dmp) DefaultTransport() *http.Transport {
|
|
i := o.t.Load()
|
|
if i != nil {
|
|
return i
|
|
}
|
|
|
|
t := o.Transport(o.config().Transport)
|
|
o.t.Store(t)
|
|
return t
|
|
}
|
|
|
|
func (o *dmp) DefaultClient() *http.Client {
|
|
return &http.Client{
|
|
Transport: o.DefaultTransport(),
|
|
}
|
|
}
|