diff --git a/go.mod b/go.mod index 118eeeed9..850465945 100644 --- a/go.mod +++ b/go.mod @@ -97,10 +97,10 @@ require ( github.com/hashicorp/go-kms-wrapping/extras/kms/v2 v2.0.0-20221122211539-47c893099f13 github.com/hashicorp/go-version v1.3.0 github.com/hashicorp/nodeenrollment v0.2.0 - github.com/jimlambrt/gldap v0.1.5 + github.com/jimlambrt/gldap v0.1.6-0.20230501161051-4e73db4906d4 github.com/kelseyhightower/envconfig v1.4.0 github.com/mikesmitty/edkey v0.0.0-20170222072505-3356ea4e686a - golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2 + golang.org/x/exp v0.0.0-20230425010034-47ecfdc1ba53 golang.org/x/net v0.7.0 ) diff --git a/go.sum b/go.sum index 385272030..837b8f5cd 100644 --- a/go.sum +++ b/go.sum @@ -879,6 +879,8 @@ github.com/jimlambrt/gldap v0.1.2 h1:Xprug+i9WdvdQd8u2bi05JVbllZ+SHhNu4alDY38+Kw github.com/jimlambrt/gldap v0.1.2/go.mod h1:sKo9VprcJwZRj7OoE7p8YLaPEeNxw3WIEY42NS/iV7E= github.com/jimlambrt/gldap v0.1.5 h1:m7473IVYxbNvcOWpGQ4uq0fLoiSEdC8Zbbv/mujVO8U= github.com/jimlambrt/gldap v0.1.5/go.mod h1:ia/l4Jhm+tdupLvZe7tRCbpv+HyXr1B5QFirsewfWEA= +github.com/jimlambrt/gldap v0.1.6-0.20230501161051-4e73db4906d4 h1:2fiRwR3V/07f8nyPsFWhYZ9TdUPNLhmyLPlraer7bj8= +github.com/jimlambrt/gldap v0.1.6-0.20230501161051-4e73db4906d4/go.mod h1:BRdefIDhx2uYBjxL0fRBGi3eyOvAkkRIXSJYMCyzCaI= github.com/jinzhu/gorm v1.9.12 h1:Drgk1clyWT9t9ERbzHza6Mj/8FY/CqMyVzOiHviMo6Q= github.com/jinzhu/gorm v1.9.12/go.mod h1:vhTjlKSJUTWNtcbQtrMBFCxy7eXTzeCAzfL5fBZT/Qs= github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= @@ -1438,6 +1440,8 @@ golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EH golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2 h1:Jvc7gsqn21cJHCmAWx0LiimpP18LZmUxkT5Mp7EZ1mI= golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= +golang.org/x/exp v0.0.0-20230425010034-47ecfdc1ba53 h1:5llv2sWeaMSnA3w2kS57ouQQ4pudlXrR0dCgw51QK9o= +golang.org/x/exp v0.0.0-20230425010034-47ecfdc1ba53/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= diff --git a/internal/cmd/base/dev.go b/internal/cmd/base/dev.go index d14da6eed..4b316786b 100644 --- a/internal/cmd/base/dev.go +++ b/internal/cmd/base/dev.go @@ -253,6 +253,12 @@ func (b *Server) CreateDevLdapAuthMethod(ctx context.Context) error { b.DevLdapSetup.testDirectory.Stop() return nil }) + b.InfoKeys = append(b.InfoKeys, "generated ldap auth method host:port") + b.Info["generated ldap auth method host:port"] = fmt.Sprintf("%s:%d (does not have a root DSE; use simple bind, ou=people,ex)", host, port) + + // users="ou=people,dc=example,dc=org" groups="ou=groups,dc=example,dc=org" + b.InfoKeys = append(b.InfoKeys, "generated ldap auth method base search DNs") + b.Info["generated ldap auth method base search DNs"] = `users="ou=people,dc=example,dc=org" groups="ou=groups,dc=example,dc=org"` groups := []*gldap.Entry{ testdirectory.NewGroup(tb, "admin", []string{"admin"}),