Skip to content

Commit

Permalink
Merge pull request #173 from nabbar/update_fix_2403
Browse files Browse the repository at this point in the history
Update / Fix - 2024-03

Package Config/component/LDAP: 
- replace mutex by atomic
- fix minor bugs & optimize code

Package Size:
- add function 'mul' allowing do a multiplaction on the size value by a float64 given value (could use another size.float64)
- add function 'div' allowing do a division of the size value by a float64 given value (could use another size.float64)
- add function 'add' allowing do an addtion of the size value with a uint64 given value (could use another size.uint64)
- add function 'sub' allowing do an substraction of the size value with a uint64 given value (could use another size.uint64)

Package Encoding:
- rework completly crypt package to new package encoding
- part aes of old crypt become new subpackage encoding/aes
- part hex of old crypt (associated with aes) become new standalone subpackage encoding/hexa
- adding new subpackage mux to use multiplexer/de-multiplexer of io stream
- mux is different of multireader / multiwriter in way as io send from mux in one channel will be received only in the coresponding channel  of de-mux
- mux is encoding subpackage becauxse based on hex + cbor marshalling / unmarshalling
- all subpackage can be used directly of by io reader / writer

Package Socket/server
- rework server to use as possible direct io to con
- rework server to optimize & fix managment (context / shutdown...)
- rework server to stop connection befor stopping server
- rework server to not load incoming and send it to handler by allowing handler to manager io input/output directly
- server not more used buff internally (less memory consuption)
- adding counter of opened connection
- adding some testing who's checking server & client for each protocol

Package Socket/client
- rework client to allow connect to server before reading/writing on io stream
- rework client to allow consum direct io stream instead of reading locally / call function
- rework client to allow having less memory consumption by removing internal buffer
- rework client allowing to use root io function (bufio, io copy, ...)

Package Socket/multi
- adding new subpackage multi to simplfy using of 1 reader / x writer
- if no writer is define, using an extended io discard
- allowing asynch instancing, populate writer and calling main writer
- allowing calling writer / reader to expose the main io reader / writer

Package Socket/delim:
- adding new subpackage delim to simplify using of bufio reader with delimiter
- using 1 writer / 1 reader
- allowing root io function like readwritecloser, writeto, ...
- use local buffer to prevent race if reader and writer are not is same process

Package PProf:
- fix missing \n in message

Package HttpServer:
- fix bug with init TLS & http2

Other:
- bump dependencies
  • Loading branch information
nabbar authored Mar 23, 2024
2 parents d84e6a7 + 9ca3530 commit eed9a8e
Show file tree
Hide file tree
Showing 87 changed files with 5,530 additions and 967 deletions.
34 changes: 7 additions & 27 deletions config/components/ldap/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@ import (
)

func (o *componentLDAP) _getKey() string {
o.m.RLock()
defer o.m.RUnlock()

if i, l := o.x.Load(keyCptKey); !l {
return ""
} else if i == nil {
Expand All @@ -50,9 +47,6 @@ func (o *componentLDAP) _getKey() string {
}

func (o *componentLDAP) _getFctVpr() libvpr.FuncViper {
o.m.RLock()
defer o.m.RUnlock()

if i, l := o.x.Load(keyFctViper); !l {
return nil
} else if i == nil {
Expand Down Expand Up @@ -85,9 +79,6 @@ func (o *componentLDAP) _getSPFViper() *spfvbr.Viper {
}

func (o *componentLDAP) _getFctCpt() cfgtps.FuncCptGet {
o.m.RLock()
defer o.m.RUnlock()

if i, l := o.x.Load(keyFctGetCpt); !l {
return nil
} else if i == nil {
Expand All @@ -100,9 +91,6 @@ func (o *componentLDAP) _getFctCpt() cfgtps.FuncCptGet {
}

func (o *componentLDAP) _getVersion() libver.Version {
o.m.RLock()
defer o.m.RUnlock()

if i, l := o.x.Load(keyCptVersion); !l {
return nil
} else if i == nil {
Expand All @@ -123,9 +111,6 @@ func (o *componentLDAP) _getFct() (cfgtps.FuncCptEvent, cfgtps.FuncCptEvent) {
}

func (o *componentLDAP) _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 {
Expand Down Expand Up @@ -153,27 +138,22 @@ func (o *componentLDAP) _runCli() error {
cfg *lbldap.Config
)

o.m.RLock()
defer o.m.RUnlock()

if cfg, err = o._getConfig(); err != nil {
return ErrorParamInvalid.Error(err)
} else if cli, e = lbldap.NewLDAP(o.x.GetContext(), cfg, o.a); e != nil {
} else if cli, e = lbldap.NewLDAP(o.x.GetContext(), cfg, o.GetAttributes()); e != nil {
return ErrorConfigInvalid.Error(e)
} else {
cli.SetLogger(o.getLogger)
}

if o.l != nil {
o.l.Close()
if i := o.l.Load(); i != nil {
if v, k := i.(*lbldap.HelperLDAP); k {
v.Close()
}
}

o.m.RUnlock()
o.m.Lock()
o.l = cli
o.c = cfg
o.m.Unlock()
o.m.RLock()
o.SetConfig(cfg)
o.SetLDAP(cli)

return nil
}
Expand Down
53 changes: 23 additions & 30 deletions config/components/ldap/component.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ package ldap
import (
cfgtps "github.com/nabbar/golib/config/types"
libctx "github.com/nabbar/golib/context"
lbldap "github.com/nabbar/golib/ldap"
liblog "github.com/nabbar/golib/logger"
libver "github.com/nabbar/golib/version"
libvpr "github.com/nabbar/golib/viper"
Expand All @@ -55,17 +56,6 @@ func (o *componentLDAP) Type() string {
}

func (o *componentLDAP) Init(key string, ctx libctx.FuncContext, get cfgtps.FuncCptGet, vpr libvpr.FuncViper, vrs libver.Version, log liblog.FuncLog) {
o.m.Lock()
defer o.m.Unlock()

if o.x == nil {
o.x = libctx.NewConfig[uint8](ctx)
} else {
x := libctx.NewConfig[uint8](ctx)
x.Merge(o.x)
o.x = x
}

o.x.Store(keyCptKey, key)
o.x.Store(keyFctGetCpt, get)
o.x.Store(keyFctViper, vpr)
Expand All @@ -84,10 +74,17 @@ func (o *componentLDAP) RegisterFuncReload(before, after cfgtps.FuncCptEvent) {
}

func (o *componentLDAP) IsStarted() bool {
o.m.RLock()
defer o.m.RUnlock()

return o != nil && o.l != nil
if o == nil {
return false
} else if i := o.l.Load(); i == nil {
return false
} else if v, k := i.(*lbldap.HelperLDAP); !k {
return false
} else if v.Check() != nil {
return false
} else {
return true
}
}

func (o *componentLDAP) IsRunning() bool {
Expand All @@ -103,25 +100,20 @@ func (o *componentLDAP) Reload() error {
}

func (o *componentLDAP) Stop() {
o.m.Lock()
defer o.m.Unlock()

o.l.Close()
o.l = nil

return
if i := o.l.Swap(&lbldap.HelperLDAP{}); i == nil {
return
} else if v, k := i.(*lbldap.HelperLDAP); !k {
return
} else {
v.Close()
}
}

func (o *componentLDAP) Dependencies() []string {
o.m.RLock()
defer o.m.RUnlock()

var def = make([]string, 0)

if o == nil {
return def
} else if o.x == nil {
return def
} else if i, l := o.x.Load(keyCptDependencies); !l {
return def
} else if v, k := i.([]string); !k {
Expand All @@ -134,12 +126,13 @@ func (o *componentLDAP) Dependencies() []string {
}

func (o *componentLDAP) SetDependencies(d []string) error {
o.m.RLock()
defer o.m.RUnlock()

if o.x == nil {
return ErrorComponentNotInitialized.Error(nil)
} else {
if d == nil {
d = make([]string, 0)
}

o.x.Store(keyCptDependencies, d)
return nil
}
Expand Down
18 changes: 14 additions & 4 deletions config/components/ldap/interface.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
package ldap

import (
"sync"
"sync/atomic"

libcfg "github.com/nabbar/golib/config"
cfgtps "github.com/nabbar/golib/config/types"
Expand All @@ -50,11 +50,21 @@ type ComponentLDAP interface {
}

func New(ctx libctx.FuncContext) ComponentLDAP {
var (
a = new(atomic.Value)
c = new(atomic.Value)
l = new(atomic.Value)
)

a.Store(make([]string, 0))
c.Store(&lbldap.Config{})
l.Store(&lbldap.HelperLDAP{})

return &componentLDAP{
m: sync.RWMutex{},
a: a,
c: c,
l: l,
x: libctx.NewConfig[uint8](ctx),
c: nil,
l: nil,
}
}

Expand Down
81 changes: 55 additions & 26 deletions config/components/ldap/model.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,55 +27,84 @@
package ldap

import (
"sync"
"sync/atomic"

libctx "github.com/nabbar/golib/context"
lbldap "github.com/nabbar/golib/ldap"
)

type componentLDAP struct {
m sync.RWMutex
a *atomic.Value // slice attributes []string
c *atomic.Value // config
l *atomic.Value // client LDAP
x libctx.Config[uint8]

a []string
c *lbldap.Config
l *lbldap.HelperLDAP
}

func (o *componentLDAP) GetConfig() *lbldap.Config {
o.m.RLock()
defer o.m.RUnlock()

return o.c
if i := o.c.Load(); i == nil {
return nil
} else if v, k := i.(*lbldap.Config); !k {
return nil
} else if len(v.Uri) < 1 {
return nil
} else if v.PortLdap < 1 && v.Portldaps < 1 {
return nil
} else {
var cfg = lbldap.Config{}
cfg = *v
return &cfg
}
}

func (o *componentLDAP) SetConfig(opt *lbldap.Config) {
o.m.Lock()
defer o.m.Unlock()
if opt == nil {
opt = &lbldap.Config{}
}

o.c = opt
o.c.Store(opt)
}

func (o *componentLDAP) GetLDAP() *lbldap.HelperLDAP {
o.m.RLock()
defer o.m.RUnlock()

return o.l
if i := o.l.Load(); i == nil {
return nil
} else if v, k := i.(*lbldap.HelperLDAP); !k {
return nil
} else if v == nil {
return nil
} else if n := v.Clone(); n == nil {
return nil
} else if n.Check() != nil {
return nil
} else {
n.Attributes = o.GetAttributes()
return n
}
}

func (o *componentLDAP) SetLDAP(l *lbldap.HelperLDAP) {
o.m.Lock()
defer o.m.Unlock()
if l == nil {
l = &lbldap.HelperLDAP{}
}

o.l = l
o.l.Store(l)
}

func (o *componentLDAP) SetAttributes(att []string) {
o.m.Lock()
defer o.m.Unlock()
func (o *componentLDAP) GetAttributes() []string {
if i := o.a.Load(); i == nil {
return make([]string, 0)
} else if v, k := i.([]string); !k {
return make([]string, 0)
} else if len(v) > 0 {
return v
} else {
return make([]string, 0)
}
}

o.a = att
if o.l != nil {
o.l.Attributes = att
func (o *componentLDAP) SetAttributes(att []string) {
if att == nil {
att = make([]string, 0)
}

o.a.Store(att)
}
File renamed without changes.
53 changes: 53 additions & 0 deletions encoding/aes/aes_suite_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
/*
* MIT License
*
* Copyright (c) 2023 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 aes_test

import (
"testing"
"time"

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
)

/*
Using https://onsi.github.io/ginkgo/
Running with $> ginkgo -cover .
*/

// TestGolibEncodingAESHelper tests the Golib AES Encoding Helper function.
func TestGolibEncodingAESHelper(t *testing.T) {
time.Sleep(500 * time.Millisecond) // Adding delay for better testing synchronization
RegisterFailHandler(Fail) // Registering fail handler for better test failure reporting
RunSpecs(t, "Encoding AES Helper Suite") // Running the test suite for Encoding AES Helper
}

var _ = BeforeSuite(func() {
})

var _ = AfterSuite(func() {
})
Loading

0 comments on commit eed9a8e

Please sign in to comment.