From 1e625093b63e657f6f9e5bd0e7cefd2ea951a4d7 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Mon, 14 Aug 2023 12:34:11 +0200 Subject: [PATCH] Bump libregraph/lico to latest master This is need for getting this fix: libregraph/lico#104 --- go.mod | 2 +- go.sum | 4 ++-- .../libregraph/lico/identifier/backends/ldap/ldap.go | 4 ++-- vendor/modules.txt | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 3a3a3033ea..b98252aafe 100644 --- a/go.mod +++ b/go.mod @@ -51,7 +51,7 @@ require ( 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.20230221143410-3503963047a5 - github.com/libregraph/lico v0.60.1-0.20230516115351-f904ff5fd200 + github.com/libregraph/lico v0.60.1-0.20230811070109-1d4140be554d github.com/mitchellh/mapstructure v1.5.0 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 github.com/nats-io/nats-server/v2 v2.9.19 diff --git a/go.sum b/go.sum index ba5985646b..0417709d0c 100644 --- a/go.sum +++ b/go.sum @@ -1495,8 +1495,8 @@ github.com/leonelquinteros/gotext v1.5.3-0.20230317130943-71a59c05b2c1 h1:k56sFO github.com/leonelquinteros/gotext v1.5.3-0.20230317130943-71a59c05b2c1/go.mod h1:AT4NpQrOmyj1L/+hLja6aR0lk81yYYL4ePnj2kp7d6M= github.com/libregraph/idm v0.4.1-0.20230221143410-3503963047a5 h1:brLMXSjWoWhGXs8LpK+Lx+FQCtGLUa51Mq/ggHv9AV0= github.com/libregraph/idm v0.4.1-0.20230221143410-3503963047a5/go.mod h1:Tnm4pyVJTEbHm3GUNmceWT1DHzdrYqrJmZyt/xh7L+A= -github.com/libregraph/lico v0.60.1-0.20230516115351-f904ff5fd200 h1:O8Kvm1/mLz/PG7e7ayLCjC+9rWZC5wmGLLn0rnHQ51o= -github.com/libregraph/lico v0.60.1-0.20230516115351-f904ff5fd200/go.mod h1:PM71KyVlzVbLq0i6Zf2BBlY2rtoF1/Q1H3WlFeZuLaI= +github.com/libregraph/lico v0.60.1-0.20230811070109-1d4140be554d h1:ukYcazYg31ipU6emsMKAdxYZT9o78T9ypQ1f7ThbcyQ= +github.com/libregraph/lico v0.60.1-0.20230811070109-1d4140be554d/go.mod h1:RLIfwh3pIE27Sbe/aBHlaZEE6j11Fvg7xAGHnNqGt+U= github.com/libregraph/oidc-go v1.0.0 h1:l2tE/EwLyLXVy0B5BuVKgIFX9pNpz/5J3x5IBw0KEhc= github.com/libregraph/oidc-go v1.0.0/go.mod h1:7TRHrY/H1Vg6JqFjV0oAe1+kN+mGFBqXYvclSyvhRyc= github.com/linode/linodego v0.25.3/go.mod h1:GSBKPpjoQfxEfryoCRcgkuUOCuVtGHWhzI8OMdycNTE= diff --git a/vendor/github.com/libregraph/lico/identifier/backends/ldap/ldap.go b/vendor/github.com/libregraph/lico/identifier/backends/ldap/ldap.go index 2d20ba906e..3413106a6a 100644 --- a/vendor/github.com/libregraph/lico/identifier/backends/ldap/ldap.go +++ b/vendor/github.com/libregraph/lico/identifier/backends/ldap/ldap.go @@ -645,7 +645,7 @@ func (b *LDAPIdentifierBackend) baseAndGetFilterFromEntryID(entryID string) (str filter := "" for k, values := range values { for _, value := range values { - filter = fmt.Sprintf("%s(%s=%s)", filter, k, value) + filter = fmt.Sprintf("%s(%s=%s)", filter, k, ldap.EscapeFilter(value)) } } if filter != "" { @@ -666,5 +666,5 @@ func (b *LDAPIdentifierBackend) baseAndGetFilterFromEntryID(entryID string) (str func (b *LDAPIdentifierBackend) baseAndSearchFilterFromUsername(username string) (string, string) { // Build search filter with username. - return b.baseDN, fmt.Sprintf(b.searchFilter, username) + return b.baseDN, fmt.Sprintf(b.searchFilter, ldap.EscapeFilter(username)) } diff --git a/vendor/modules.txt b/vendor/modules.txt index b0a88bd93d..03f1ad59bf 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1203,7 +1203,7 @@ github.com/libregraph/idm/server github.com/libregraph/idm/server/handler github.com/libregraph/idm/server/handler/boltdb github.com/libregraph/idm/server/handler/ldif -# github.com/libregraph/lico v0.60.1-0.20230516115351-f904ff5fd200 +# github.com/libregraph/lico v0.60.1-0.20230811070109-1d4140be554d ## explicit; go 1.18 github.com/libregraph/lico github.com/libregraph/lico/bootstrap