mirror of
https://github.com/nabbar/golib.git
synced 2025-10-05 07:46:56 +08:00

- Add DNS Mapper to force destination for a fqdn source - Allow wildcard and multi wildcard for fqdn source - DNS Mapper create Transport, Dialer & http client - DNS Mapper allow a config input to customize timeout, limit and TLS config - DNS Mapper use a gloabl transport connection poller - DNS Mapper implement DialContext & Dial method for transport - DNS Mapper use cache to accelerate process - DNS Mapper cache is only dnsmapper, not DNS cache - Replace old helper for http client with DNSMapper - Add default DNSMapper into the main lib of http client - Allow to overide the default DNS Mapper with a new one - Add ticker to force clean idle connection every given duration - "Compatible" with old config, as the default config will be used instead of old client build - Clean code and fix minor bugs - Add config component to allow use a global config - Config Component httpcli can overide default httpcli dns mapper when updated Package Certificates - Add function type to impose function that return a slice of rootCA string - update config/component/tls by replacing mutex with atomic - optimize some code Package Config - expand errors code index to add component httpcli Package Config/component: - database: add new validation, that config key existing into viper - head: add new validation, that config key existing into viper - http: add new validation, that config key existing into viper - ldap: add new validation, that config key existing into viper - log: add new validation, that config key existing into viper - mail: add new validation, that config key existing into viper - smtp: add new validation, that config key existing into viper Package AWS: - update package following update of httpcli - use interface for http cli that implement the Do function - update following the config/component/aws - rework config/component/aws to use atomic instead of mutex - update test unit following change Package Request: - update following http client update - use interface of HTTP Client that implement DO function, instead of http client struct pointer - update config & code following - apply same modification into config/component/request - update config/component/request by replacing mutex to atomic Package Server - add function Uptime to model to expose the duration since last start Package Semaphore - apply change name of constant following bump of lib associated Package Crypt - fix bug into reader to remove suffix of EOF if prevent Package Errors: - expand index module to add DNS Mapper client Package HTTP Server: - update monitor to apply changes Package Socket: - add additional check if reading error: if buffer has data, send it to handler before break run Other: - bump dependencies
202 lines
5.9 KiB
Go
202 lines
5.9 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 certificates
|
|
|
|
import (
|
|
"crypto/tls"
|
|
"crypto/x509"
|
|
"net/http"
|
|
|
|
liberr "github.com/nabbar/golib/errors"
|
|
)
|
|
|
|
type FctHttpClient func(def TLSConfig, servername string) *http.Client
|
|
type FctTLSDefault func() TLSConfig
|
|
type FctRootCA func() []string
|
|
|
|
type TLSConfig interface {
|
|
AddRootCAString(rootCA string) bool
|
|
AddRootCAFile(pemFile string) liberr.Error
|
|
GetRootCA() *x509.CertPool
|
|
|
|
AddClientCAString(ca string) bool
|
|
AddClientCAFile(pemFile string) liberr.Error
|
|
GetClientCA() *x509.CertPool
|
|
|
|
AddCertificatePairString(key, crt string) liberr.Error
|
|
AddCertificatePairFile(keyFile, crtFile string) liberr.Error
|
|
LenCertificatePair() int
|
|
CleanCertificatePair()
|
|
GetCertificatePair() []tls.Certificate
|
|
|
|
SetVersionMin(vers uint16)
|
|
SetVersionMax(vers uint16)
|
|
SetClientAuth(cAuth tls.ClientAuthType)
|
|
SetCipherList(cipher []uint16)
|
|
SetCurveList(curves []tls.CurveID)
|
|
SetDynamicSizingDisabled(flag bool)
|
|
SetSessionTicketDisabled(flag bool)
|
|
|
|
Clone() TLSConfig
|
|
TlsConfig(serverName string) *tls.Config
|
|
}
|
|
|
|
var Default = New()
|
|
|
|
func New() TLSConfig {
|
|
return &config{
|
|
caRoot: nil,
|
|
cert: nil,
|
|
|
|
tlsMinVersion: 0,
|
|
tlsMaxVersion: 0,
|
|
|
|
cipherList: nil,
|
|
curveList: nil,
|
|
|
|
dynSizingDisabled: false,
|
|
ticketSessionDisabled: false,
|
|
|
|
clientAuth: 0,
|
|
clientCA: nil,
|
|
}
|
|
}
|
|
|
|
// Deprecated: use local config and no more globals default config.
|
|
func AddRootCAContents(rootContent string) bool {
|
|
return Default.AddRootCAString(rootContent)
|
|
}
|
|
|
|
// Deprecated: use local config and no more globals default config.
|
|
func AddRootCAFile(rootFile string) liberr.Error {
|
|
return Default.AddRootCAFile(rootFile)
|
|
}
|
|
|
|
// Deprecated: use local config and no more globals default config.
|
|
func AddCACertificateContents(caContent string) bool {
|
|
return Default.AddClientCAString(caContent)
|
|
}
|
|
|
|
// Deprecated: use local config and no more globals default config.
|
|
func AddCACertificateFile(caFile string) liberr.Error {
|
|
return Default.AddClientCAFile(caFile)
|
|
}
|
|
|
|
// Deprecated: use local config and no more globals default config.
|
|
func AddCertificatePairString(key, crt string) liberr.Error {
|
|
return Default.AddCertificatePairString(key, crt)
|
|
}
|
|
|
|
// Deprecated: use local config and no more globals default config.
|
|
func AddCertificatePairFile(keyFile, crtFile string) liberr.Error {
|
|
return Default.AddCertificatePairFile(keyFile, crtFile)
|
|
}
|
|
|
|
// Deprecated: use local config and no more globals default config.
|
|
func CheckCertificates() bool {
|
|
return Default.LenCertificatePair() > 0
|
|
}
|
|
|
|
// Deprecated: use local config and no more globals default config.
|
|
func GetCertificates() []tls.Certificate {
|
|
return Default.GetCertificatePair()
|
|
}
|
|
|
|
// Deprecated: use local config and no more globals default config.
|
|
func AppendCertificates(cert []tls.Certificate) []tls.Certificate {
|
|
if !CheckCertificates() {
|
|
return cert
|
|
}
|
|
|
|
return append(cert, GetCertificates()...)
|
|
}
|
|
|
|
// Deprecated: use local config and no more globals default config.
|
|
func GetRootCA() *x509.CertPool {
|
|
return Default.GetRootCA()
|
|
}
|
|
|
|
// Deprecated: use local config and no more globals default config.
|
|
func GetClientCA() *x509.CertPool {
|
|
return Default.GetClientCA()
|
|
}
|
|
|
|
// Deprecated: use local config and no more globals default config.
|
|
func SetVersionMin(vers uint16) {
|
|
Default.SetVersionMin(vers)
|
|
}
|
|
|
|
// Deprecated: use local config and no more globals default config.
|
|
func SetVersionMax(vers uint16) {
|
|
Default.SetVersionMax(vers)
|
|
}
|
|
|
|
// Deprecated: use local config and no more globals default config.
|
|
func SetClientAuth(auth string) {
|
|
Default.SetClientAuth(StringToClientAuth(auth))
|
|
}
|
|
|
|
// Deprecated: use local config and no more globals default config.
|
|
func SetCipherList(cipher []uint16) {
|
|
Default.SetCipherList(cipher)
|
|
}
|
|
|
|
// Deprecated: use local config and no more globals default config.
|
|
func SetCurve(curves []tls.CurveID) {
|
|
Default.SetCurveList(curves)
|
|
}
|
|
|
|
// Deprecated: use local config and no more globals default config.
|
|
func SetDynamicSizing(enable bool) {
|
|
Default.SetDynamicSizingDisabled(!enable)
|
|
}
|
|
|
|
// Deprecated: use local config and no more globals default config.
|
|
func SetSessionTicket(enable bool) {
|
|
Default.SetSessionTicketDisabled(!enable)
|
|
}
|
|
|
|
// Deprecated: use local config and no more globals default config.
|
|
func GetTLSConfig(serverName string) *tls.Config {
|
|
return Default.TlsConfig(serverName)
|
|
}
|
|
|
|
// Deprecated: use local config and no more globals default config.
|
|
func GetTlsConfigCertificates() *tls.Config {
|
|
return Default.TlsConfig("")
|
|
}
|
|
|
|
// Deprecated: use local config and no more globals default config.
|
|
func AddCertificateContents(keyContents, certContents string) liberr.Error {
|
|
return Default.AddCertificatePairString(keyContents, certContents)
|
|
}
|
|
|
|
// Deprecated: use local config and no more globals default config.
|
|
func AddCertificateFile(keyFile, certFile string) liberr.Error {
|
|
return Default.AddCertificatePairFile(keyFile, certFile)
|
|
}
|