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
194 lines
4.1 KiB
Go
194 lines
4.1 KiB
Go
/*
|
|
* MIT License
|
|
*
|
|
* Copyright (c) 2022 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 tls
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
libtls "github.com/nabbar/golib/certificates"
|
|
cfgtps "github.com/nabbar/golib/config/types"
|
|
libver "github.com/nabbar/golib/version"
|
|
libvpr "github.com/nabbar/golib/viper"
|
|
spfvbr "github.com/spf13/viper"
|
|
)
|
|
|
|
func (o *componentTls) _getKey() string {
|
|
o.m.RLock()
|
|
defer o.m.RUnlock()
|
|
|
|
if i, l := o.x.Load(keyCptKey); !l {
|
|
return ""
|
|
} else if i == nil {
|
|
return ""
|
|
} else if v, k := i.(string); !k {
|
|
return ""
|
|
} else {
|
|
return v
|
|
}
|
|
}
|
|
|
|
func (o *componentTls) _getFctVpr() libvpr.FuncViper {
|
|
o.m.RLock()
|
|
defer o.m.RUnlock()
|
|
|
|
if i, l := o.x.Load(keyFctViper); !l {
|
|
return nil
|
|
} else if i == nil {
|
|
return nil
|
|
} else if f, k := i.(libvpr.FuncViper); !k {
|
|
return nil
|
|
} else {
|
|
return f
|
|
}
|
|
}
|
|
|
|
func (o *componentTls) _getViper() libvpr.Viper {
|
|
if f := o._getFctVpr(); f == nil {
|
|
return nil
|
|
} else if v := f(); v == nil {
|
|
return nil
|
|
} else {
|
|
return v
|
|
}
|
|
}
|
|
|
|
func (o *componentTls) _getSPFViper() *spfvbr.Viper {
|
|
if f := o._getViper(); f == nil {
|
|
return nil
|
|
} else if v := f.Viper(); v == nil {
|
|
return nil
|
|
} else {
|
|
return v
|
|
}
|
|
}
|
|
|
|
func (o *componentTls) _getFctCpt() cfgtps.FuncCptGet {
|
|
o.m.RLock()
|
|
defer o.m.RUnlock()
|
|
|
|
if i, l := o.x.Load(keyFctGetCpt); !l {
|
|
return nil
|
|
} else if i == nil {
|
|
return nil
|
|
} else if f, k := i.(cfgtps.FuncCptGet); !k {
|
|
return nil
|
|
} else {
|
|
return f
|
|
}
|
|
}
|
|
|
|
func (o *componentTls) _getVersion() libver.Version {
|
|
o.m.RLock()
|
|
defer o.m.RUnlock()
|
|
|
|
if i, l := o.x.Load(keyCptVersion); !l {
|
|
return nil
|
|
} else if i == nil {
|
|
return nil
|
|
} else if v, k := i.(libver.Version); !k {
|
|
return nil
|
|
} else {
|
|
return v
|
|
}
|
|
}
|
|
|
|
func (o *componentTls) _getFct() (cfgtps.FuncCptEvent, cfgtps.FuncCptEvent) {
|
|
if o.IsStarted() {
|
|
return o._getFctEvt(keyFctRelBef), o._getFctEvt(keyFctRelAft)
|
|
} else {
|
|
return o._getFctEvt(keyFctStaBef), o._getFctEvt(keyFctStaAft)
|
|
}
|
|
}
|
|
|
|
func (o *componentTls) _getFctEvt(key uint8) cfgtps.FuncCptEvent {
|
|
o.m.RLock()
|
|
defer o.m.RUnlock()
|
|
|
|
if i, l := o.x.Load(key); !l {
|
|
return nil
|
|
} else if i == nil {
|
|
return nil
|
|
} else if f, k := i.(cfgtps.FuncCptEvent); !k {
|
|
return nil
|
|
} else {
|
|
return f
|
|
}
|
|
}
|
|
|
|
func (o *componentTls) _runFct(fct func(cpt cfgtps.Component) error) error {
|
|
if fct != nil {
|
|
return fct(o)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (o *componentTls) _runCli() error {
|
|
var (
|
|
err error
|
|
prt = ErrorComponentReload
|
|
tls libtls.TLSConfig
|
|
cfg *libtls.Config
|
|
)
|
|
|
|
if !o.IsStarted() {
|
|
prt = ErrorComponentStart
|
|
}
|
|
|
|
if cfg, err = o._getConfig(); err != nil {
|
|
return prt.Error(err)
|
|
} else if tls = cfg.New(); tls == nil {
|
|
return prt.Error(fmt.Errorf("cannot use tls config for new instance"))
|
|
} else if o.f != nil {
|
|
if v := o.f(); v != nil && v.Len() > 0 {
|
|
tls.AddRootCA(v)
|
|
}
|
|
}
|
|
|
|
o.m.Lock()
|
|
defer o.m.Unlock()
|
|
|
|
o.t = tls
|
|
o.c = cfg
|
|
|
|
return nil
|
|
}
|
|
|
|
func (o *componentTls) _run() error {
|
|
fb, fa := o._getFct()
|
|
|
|
if err := o._runFct(fb); err != nil {
|
|
return err
|
|
} else if err = o._runCli(); err != nil {
|
|
return err
|
|
} else if err = o._runFct(fa); err != nil {
|
|
return err
|
|
}
|
|
|
|
return nil
|
|
}
|