From 8c203a144f73dcebaaa2d2e94ad37d6da0db3462 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Wed, 10 Apr 2024 14:49:50 +0200 Subject: [PATCH] bump libregraph/idm to lastest master --- go.mod | 2 +- go.sum | 4 ++-- vendor/github.com/libregraph/idm/.golangci.yaml | 3 --- .../libregraph/idm/pkg/ldapserver/search.go | 14 +++++++++++--- .../libregraph/idm/pkg/ldapserver/server.go | 1 - .../libregraph/idm/pkg/ldbbolt/ldbbolt.go | 14 +++++++------- vendor/modules.txt | 4 ++-- 7 files changed, 23 insertions(+), 19 deletions(-) diff --git a/go.mod b/go.mod index c1f913b1a4..57331e69e2 100644 --- a/go.mod +++ b/go.mod @@ -56,7 +56,7 @@ require ( github.com/jinzhu/now v1.1.5 github.com/justinas/alice v1.2.0 github.com/leonelquinteros/gotext v1.5.3-0.20230317130943-71a59c05b2c1 - github.com/libregraph/idm v0.4.1-0.20231213140724-56a222fb4215 + github.com/libregraph/idm v0.4.1-0.20240410123343-a51b459380d0 github.com/libregraph/lico v0.61.3-0.20240322112242-72cf9221d3a7 github.com/mitchellh/mapstructure v1.5.0 github.com/mna/pigeon v1.2.1 diff --git a/go.sum b/go.sum index 47471bd8d3..6de6fa1c27 100644 --- a/go.sum +++ b/go.sum @@ -1634,8 +1634,8 @@ github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= github.com/leonelquinteros/gotext v1.5.3-0.20230317130943-71a59c05b2c1 h1:k56sFOOJ0CYuQtGoRSeAMhP1R692+iNH+S1dC/CEz0w= github.com/leonelquinteros/gotext v1.5.3-0.20230317130943-71a59c05b2c1/go.mod h1:AT4NpQrOmyj1L/+hLja6aR0lk81yYYL4ePnj2kp7d6M= -github.com/libregraph/idm v0.4.1-0.20231213140724-56a222fb4215 h1:Yw/I6l/0S/zDq2Hnibvwy8cVLpMaBwDe0aUSv/FNU6U= -github.com/libregraph/idm v0.4.1-0.20231213140724-56a222fb4215/go.mod h1:h/B7mB5OqrsrobydErMGewHxonYDKjGOaJsFabXyRo8= +github.com/libregraph/idm v0.4.1-0.20240410123343-a51b459380d0 h1:NC6JoX08mr2WOVyplqbLUFFZuGJQHc/Xzsbtcpz0aqA= +github.com/libregraph/idm v0.4.1-0.20240410123343-a51b459380d0/go.mod h1:taEqhdiG7u1aXxPNAi1+IQUpxDP0JpoDGrwhfpmHlhs= github.com/libregraph/lico v0.61.3-0.20240322112242-72cf9221d3a7 h1:fcPgiBu7DGyGeokE0Qk+S+GW/3n+QWu1dIjw0TqadhI= github.com/libregraph/lico v0.61.3-0.20240322112242-72cf9221d3a7/go.mod h1:TgZGBAYzVRQSRdBC8PgGQKjYhtXuTr6UCM3ZZyGTleQ= github.com/libregraph/oidc-go v1.0.0 h1:l2tE/EwLyLXVy0B5BuVKgIFX9pNpz/5J3x5IBw0KEhc= diff --git a/vendor/github.com/libregraph/idm/.golangci.yaml b/vendor/github.com/libregraph/idm/.golangci.yaml index ee1e0165cf..32268e2603 100644 --- a/vendor/github.com/libregraph/idm/.golangci.yaml +++ b/vendor/github.com/libregraph/idm/.golangci.yaml @@ -40,7 +40,6 @@ linters: disable-all: true enable: - bodyclose - - deadcode - dupl - errcheck - exportloopref @@ -60,13 +59,11 @@ linters: - nakedret - revive - staticcheck - - structcheck - stylecheck - typecheck - unconvert - unparam - unused - - varcheck # don't enable: # - depguard - until https://github.com/OpenPeeDeeP/depguard/issues/7 gets fixed diff --git a/vendor/github.com/libregraph/idm/pkg/ldapserver/search.go b/vendor/github.com/libregraph/idm/pkg/ldapserver/search.go index 84f6a749e2..992707d950 100644 --- a/vendor/github.com/libregraph/idm/pkg/ldapserver/search.go +++ b/vendor/github.com/libregraph/idm/pkg/ldapserver/search.go @@ -141,9 +141,17 @@ func parseSearchRequest(boundDN string, req *ber.Packet, controls *[]ldap.Contro } attributes = append(attributes, a) } - searchReq := &ldap.SearchRequest{baseObject, scope, - derefAliases, sizeLimit, timeLimit, - typesOnly, filter, attributes, *controls} + searchReq := &ldap.SearchRequest{ + BaseDN: baseObject, + Scope: scope, + DerefAliases: derefAliases, + SizeLimit: sizeLimit, + TimeLimit: timeLimit, + TypesOnly: typesOnly, + Filter: filter, + Attributes: attributes, + Controls: *controls, + } return searchReq, nil } diff --git a/vendor/github.com/libregraph/idm/pkg/ldapserver/server.go b/vendor/github.com/libregraph/idm/pkg/ldapserver/server.go index d3c4610ac0..0ecab7582d 100644 --- a/vendor/github.com/libregraph/idm/pkg/ldapserver/server.go +++ b/vendor/github.com/libregraph/idm/pkg/ldapserver/server.go @@ -210,7 +210,6 @@ listener: return nil } -// func (server *Server) handleConnection(conn net.Conn) { boundDN := "" // "" == anonymous diff --git a/vendor/github.com/libregraph/idm/pkg/ldbbolt/ldbbolt.go b/vendor/github.com/libregraph/idm/pkg/ldbbolt/ldbbolt.go index c305087a5c..2d6f554e03 100644 --- a/vendor/github.com/libregraph/idm/pkg/ldbbolt/ldbbolt.go +++ b/vendor/github.com/libregraph/idm/pkg/ldbbolt/ldbbolt.go @@ -6,16 +6,16 @@ // Package ldbbolt provides the lower-level Database functions for managing LDAP Entries // in a BoltDB database. Some implementation details: // -// The database is currently separated in these three buckets +// # The database is currently separated in these three buckets // -// - id2entry: This bucket contains the GOB encoded ldap.Entry instances keyed -// by a unique 64bit ID +// - id2entry: This bucket contains the GOB encoded ldap.Entry instances keyed +// by a unique 64bit ID // -// - dn2id: This bucket is used as an index to lookup the ID of an entry by its DN. The DN -// is used in an normalized (case-folded) form here. +// - dn2id: This bucket is used as an index to lookup the ID of an entry by its DN. The DN +// is used in an normalized (case-folded) form here. // -// - id2children: This bucket uses the entry-ids as and index and the values contain a list -// of the entry ids of its direct childdren +// - id2children: This bucket uses the entry-ids as and index and the values contain a list +// of the entry ids of its direct childdren // // Additional buckets will likely be added in the future to create efficient search indexes package ldbbolt diff --git a/vendor/modules.txt b/vendor/modules.txt index 35dbe14c1c..d896e9457a 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1260,8 +1260,8 @@ github.com/leodido/go-urn/scim/schema ## explicit; go 1.13 github.com/leonelquinteros/gotext github.com/leonelquinteros/gotext/plurals -# github.com/libregraph/idm v0.4.1-0.20231213140724-56a222fb4215 -## explicit; go 1.18 +# github.com/libregraph/idm v0.4.1-0.20240410123343-a51b459380d0 +## explicit; go 1.21 github.com/libregraph/idm github.com/libregraph/idm/pkg/ldapdn github.com/libregraph/idm/pkg/ldapentry