From 5cf578f486e835293e56d83f11eae3cd4949c2fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Thu, 12 Sep 2019 21:11:05 +0200 Subject: [PATCH] Migrating to our ldap fork (#12149) --- cmd/mattermost/main.go | 2 +- go.mod | 3 ++- go.sum | 3 +++ model/config.go | 2 +- .../{go-ldap => mattermost}/ldap/.gitignore | 0 .../{go-ldap => mattermost}/ldap/.travis.yml | 0 .../{go-ldap => mattermost}/ldap/CONTRIBUTING.md | 0 .../{go-ldap => mattermost}/ldap/LICENSE | 0 .../{go-ldap => mattermost}/ldap/Makefile | 0 .../{go-ldap => mattermost}/ldap/README.md | 0 .../{go-ldap => mattermost}/ldap/add.go | 0 .../{go-ldap => mattermost}/ldap/bind.go | 0 .../{go-ldap => mattermost}/ldap/client.go | 0 .../{go-ldap => mattermost}/ldap/compare.go | 0 .../{go-ldap => mattermost}/ldap/conn.go | 0 .../{go-ldap => mattermost}/ldap/control.go | 0 .../{go-ldap => mattermost}/ldap/debug.go | 0 .../{go-ldap => mattermost}/ldap/del.go | 0 .../{go-ldap => mattermost}/ldap/dn.go | 0 .../{go-ldap => mattermost}/ldap/doc.go | 0 .../{go-ldap => mattermost}/ldap/error.go | 0 .../{go-ldap => mattermost}/ldap/filter.go | 0 .../{go-ldap => mattermost}/ldap/ldap.go | 16 ++++++++++++---- .../{go-ldap => mattermost}/ldap/moddn.go | 0 .../{go-ldap => mattermost}/ldap/modify.go | 0 .../{go-ldap => mattermost}/ldap/passwdmodify.go | 0 .../{go-ldap => mattermost}/ldap/search.go | 0 vendor/modules.txt | 4 ++-- 28 files changed, 21 insertions(+), 9 deletions(-) rename vendor/github.com/{go-ldap => mattermost}/ldap/.gitignore (100%) rename vendor/github.com/{go-ldap => mattermost}/ldap/.travis.yml (100%) rename vendor/github.com/{go-ldap => mattermost}/ldap/CONTRIBUTING.md (100%) rename vendor/github.com/{go-ldap => mattermost}/ldap/LICENSE (100%) rename vendor/github.com/{go-ldap => mattermost}/ldap/Makefile (100%) rename vendor/github.com/{go-ldap => mattermost}/ldap/README.md (100%) rename vendor/github.com/{go-ldap => mattermost}/ldap/add.go (100%) rename vendor/github.com/{go-ldap => mattermost}/ldap/bind.go (100%) rename vendor/github.com/{go-ldap => mattermost}/ldap/client.go (100%) rename vendor/github.com/{go-ldap => mattermost}/ldap/compare.go (100%) rename vendor/github.com/{go-ldap => mattermost}/ldap/conn.go (100%) rename vendor/github.com/{go-ldap => mattermost}/ldap/control.go (100%) rename vendor/github.com/{go-ldap => mattermost}/ldap/debug.go (100%) rename vendor/github.com/{go-ldap => mattermost}/ldap/del.go (100%) rename vendor/github.com/{go-ldap => mattermost}/ldap/dn.go (100%) rename vendor/github.com/{go-ldap => mattermost}/ldap/doc.go (100%) rename vendor/github.com/{go-ldap => mattermost}/ldap/error.go (100%) rename vendor/github.com/{go-ldap => mattermost}/ldap/filter.go (100%) rename vendor/github.com/{go-ldap => mattermost}/ldap/ldap.go (96%) rename vendor/github.com/{go-ldap => mattermost}/ldap/moddn.go (100%) rename vendor/github.com/{go-ldap => mattermost}/ldap/modify.go (100%) rename vendor/github.com/{go-ldap => mattermost}/ldap/passwdmodify.go (100%) rename vendor/github.com/{go-ldap => mattermost}/ldap/search.go (100%) diff --git a/cmd/mattermost/main.go b/cmd/mattermost/main.go index c74ca8763d..69907b0f3c 100644 --- a/cmd/mattermost/main.go +++ b/cmd/mattermost/main.go @@ -16,9 +16,9 @@ import ( // Enterprise Deps _ "github.com/dgryski/dgoogauth" - _ "github.com/go-ldap/ldap" _ "github.com/hako/durafmt" _ "github.com/hashicorp/memberlist" + _ "github.com/mattermost/ldap" _ "github.com/mattermost/rsc/qr" _ "github.com/prometheus/client_golang/prometheus" _ "github.com/prometheus/client_golang/prometheus/promhttp" diff --git a/go.mod b/go.mod index 9d678fef9e..68fb18281c 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/fortytw2/leaktest v1.3.0 // indirect github.com/fsnotify/fsnotify v1.4.7 github.com/go-gorp/gorp v2.0.0+incompatible // indirect - github.com/go-ldap/ldap v3.0.3+incompatible + github.com/go-ldap/ldap v3.0.3+incompatible // indirect github.com/go-redis/redis v6.15.2+incompatible github.com/go-sql-driver/mysql v1.4.1 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 @@ -45,6 +45,7 @@ require ( github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e // indirect github.com/mattermost/go-i18n v1.11.0 github.com/mattermost/gorp v2.0.1-0.20190301154413-3b31e9a39d05+incompatible + github.com/mattermost/ldap v3.0.4+incompatible github.com/mattermost/rsc v0.0.0-20160330161541-bbaefb05eaa0 github.com/mattermost/viper v1.0.4 github.com/mattn/go-runewidth v0.0.4 // indirect diff --git a/go.sum b/go.sum index ad84326b89..80832b8a78 100644 --- a/go.sum +++ b/go.sum @@ -24,6 +24,7 @@ github.com/a8m/mark v0.1.1-0.20170507133748-44f2db618845/go.mod h1:c8Mh99Cw82nrs github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= +github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da h1:8GUt8eRujhVEGZFFEjBj46YV4rDjvGrNxb0KMWYkL2I= @@ -239,6 +240,8 @@ github.com/mattermost/go-i18n v1.11.0 h1:1hLKqn/ZvhZ80OekjVPGYcCrBfMz+YxNNgqS+be github.com/mattermost/go-i18n v1.11.0/go.mod h1:RyS7FDNQlzF1PsjbJWHRI35exqaKGSO9qD4iv8QjE34= github.com/mattermost/gorp v2.0.1-0.20190301154413-3b31e9a39d05+incompatible h1:FN4zK2wNig7MVVsOsGEZ+LeIq0gUcudn3LEGgbodMq8= github.com/mattermost/gorp v2.0.1-0.20190301154413-3b31e9a39d05+incompatible/go.mod h1:0kX1qa3DOpaPJyOdMLeo7TcBN0QmUszj9a/VygOhDe0= +github.com/mattermost/ldap v3.0.4+incompatible h1:SOeNnz+JNR+foQ3yHkYqijb9MLPhXN2BZP/PdX23VDU= +github.com/mattermost/ldap v3.0.4+incompatible/go.mod h1:b4reDCcGpBxJ4WX0f224KFY+OR0npin7or7EFpeIko4= github.com/mattermost/rsc v0.0.0-20160330161541-bbaefb05eaa0 h1:G9tL6JXRBMzjuD1kkBtcnd42kUiT6QDwxfFYu7adM6o= github.com/mattermost/rsc v0.0.0-20160330161541-bbaefb05eaa0/go.mod h1:nV5bfVpT//+B1RPD2JvRnxbkLmJEYXmRaaVl15fsXjs= github.com/mattermost/viper v1.0.4 h1:cMYOz4PhguscGSPxrSokUtib5HrG4gCpiUh27wyA3d0= diff --git a/model/config.go b/model/config.go index 9bc4376b5b..740c92ccf3 100644 --- a/model/config.go +++ b/model/config.go @@ -17,7 +17,7 @@ import ( "strings" "time" - "github.com/go-ldap/ldap" + "github.com/mattermost/ldap" ) const ( diff --git a/vendor/github.com/go-ldap/ldap/.gitignore b/vendor/github.com/mattermost/ldap/.gitignore similarity index 100% rename from vendor/github.com/go-ldap/ldap/.gitignore rename to vendor/github.com/mattermost/ldap/.gitignore diff --git a/vendor/github.com/go-ldap/ldap/.travis.yml b/vendor/github.com/mattermost/ldap/.travis.yml similarity index 100% rename from vendor/github.com/go-ldap/ldap/.travis.yml rename to vendor/github.com/mattermost/ldap/.travis.yml diff --git a/vendor/github.com/go-ldap/ldap/CONTRIBUTING.md b/vendor/github.com/mattermost/ldap/CONTRIBUTING.md similarity index 100% rename from vendor/github.com/go-ldap/ldap/CONTRIBUTING.md rename to vendor/github.com/mattermost/ldap/CONTRIBUTING.md diff --git a/vendor/github.com/go-ldap/ldap/LICENSE b/vendor/github.com/mattermost/ldap/LICENSE similarity index 100% rename from vendor/github.com/go-ldap/ldap/LICENSE rename to vendor/github.com/mattermost/ldap/LICENSE diff --git a/vendor/github.com/go-ldap/ldap/Makefile b/vendor/github.com/mattermost/ldap/Makefile similarity index 100% rename from vendor/github.com/go-ldap/ldap/Makefile rename to vendor/github.com/mattermost/ldap/Makefile diff --git a/vendor/github.com/go-ldap/ldap/README.md b/vendor/github.com/mattermost/ldap/README.md similarity index 100% rename from vendor/github.com/go-ldap/ldap/README.md rename to vendor/github.com/mattermost/ldap/README.md diff --git a/vendor/github.com/go-ldap/ldap/add.go b/vendor/github.com/mattermost/ldap/add.go similarity index 100% rename from vendor/github.com/go-ldap/ldap/add.go rename to vendor/github.com/mattermost/ldap/add.go diff --git a/vendor/github.com/go-ldap/ldap/bind.go b/vendor/github.com/mattermost/ldap/bind.go similarity index 100% rename from vendor/github.com/go-ldap/ldap/bind.go rename to vendor/github.com/mattermost/ldap/bind.go diff --git a/vendor/github.com/go-ldap/ldap/client.go b/vendor/github.com/mattermost/ldap/client.go similarity index 100% rename from vendor/github.com/go-ldap/ldap/client.go rename to vendor/github.com/mattermost/ldap/client.go diff --git a/vendor/github.com/go-ldap/ldap/compare.go b/vendor/github.com/mattermost/ldap/compare.go similarity index 100% rename from vendor/github.com/go-ldap/ldap/compare.go rename to vendor/github.com/mattermost/ldap/compare.go diff --git a/vendor/github.com/go-ldap/ldap/conn.go b/vendor/github.com/mattermost/ldap/conn.go similarity index 100% rename from vendor/github.com/go-ldap/ldap/conn.go rename to vendor/github.com/mattermost/ldap/conn.go diff --git a/vendor/github.com/go-ldap/ldap/control.go b/vendor/github.com/mattermost/ldap/control.go similarity index 100% rename from vendor/github.com/go-ldap/ldap/control.go rename to vendor/github.com/mattermost/ldap/control.go diff --git a/vendor/github.com/go-ldap/ldap/debug.go b/vendor/github.com/mattermost/ldap/debug.go similarity index 100% rename from vendor/github.com/go-ldap/ldap/debug.go rename to vendor/github.com/mattermost/ldap/debug.go diff --git a/vendor/github.com/go-ldap/ldap/del.go b/vendor/github.com/mattermost/ldap/del.go similarity index 100% rename from vendor/github.com/go-ldap/ldap/del.go rename to vendor/github.com/mattermost/ldap/del.go diff --git a/vendor/github.com/go-ldap/ldap/dn.go b/vendor/github.com/mattermost/ldap/dn.go similarity index 100% rename from vendor/github.com/go-ldap/ldap/dn.go rename to vendor/github.com/mattermost/ldap/dn.go diff --git a/vendor/github.com/go-ldap/ldap/doc.go b/vendor/github.com/mattermost/ldap/doc.go similarity index 100% rename from vendor/github.com/go-ldap/ldap/doc.go rename to vendor/github.com/mattermost/ldap/doc.go diff --git a/vendor/github.com/go-ldap/ldap/error.go b/vendor/github.com/mattermost/ldap/error.go similarity index 100% rename from vendor/github.com/go-ldap/ldap/error.go rename to vendor/github.com/mattermost/ldap/error.go diff --git a/vendor/github.com/go-ldap/ldap/filter.go b/vendor/github.com/mattermost/ldap/filter.go similarity index 100% rename from vendor/github.com/go-ldap/ldap/filter.go rename to vendor/github.com/mattermost/ldap/filter.go diff --git a/vendor/github.com/go-ldap/ldap/ldap.go b/vendor/github.com/mattermost/ldap/ldap.go similarity index 96% rename from vendor/github.com/go-ldap/ldap/ldap.go rename to vendor/github.com/mattermost/ldap/ldap.go index d7666676fe..e6155d508b 100644 --- a/vendor/github.com/go-ldap/ldap/ldap.go +++ b/vendor/github.com/mattermost/ldap/ldap.go @@ -270,10 +270,18 @@ func addRequestDescriptions(packet *ber.Packet) error { } func addDefaultLDAPResponseDescriptions(packet *ber.Packet) error { - err := GetLDAPError(packet) - packet.Children[1].Children[0].Description = "Result Code (" + LDAPResultCodeMap[err.(*Error).ResultCode] + ")" - packet.Children[1].Children[1].Description = "Matched DN (" + err.(*Error).MatchedDN + ")" - packet.Children[1].Children[2].Description = "Error Message" + resultCode := uint16(LDAPResultSuccess) + matchedDN := "" + description := "Success" + if err := GetLDAPError(packet); err != nil { + resultCode = err.(*Error).ResultCode + matchedDN = err.(*Error).MatchedDN + description = "Error Message" + } + + packet.Children[1].Children[0].Description = "Result Code (" + LDAPResultCodeMap[resultCode] + ")" + packet.Children[1].Children[1].Description = "Matched DN (" + matchedDN + ")" + packet.Children[1].Children[2].Description = description if len(packet.Children[1].Children) > 3 { packet.Children[1].Children[3].Description = "Referral" } diff --git a/vendor/github.com/go-ldap/ldap/moddn.go b/vendor/github.com/mattermost/ldap/moddn.go similarity index 100% rename from vendor/github.com/go-ldap/ldap/moddn.go rename to vendor/github.com/mattermost/ldap/moddn.go diff --git a/vendor/github.com/go-ldap/ldap/modify.go b/vendor/github.com/mattermost/ldap/modify.go similarity index 100% rename from vendor/github.com/go-ldap/ldap/modify.go rename to vendor/github.com/mattermost/ldap/modify.go diff --git a/vendor/github.com/go-ldap/ldap/passwdmodify.go b/vendor/github.com/mattermost/ldap/passwdmodify.go similarity index 100% rename from vendor/github.com/go-ldap/ldap/passwdmodify.go rename to vendor/github.com/mattermost/ldap/passwdmodify.go diff --git a/vendor/github.com/go-ldap/ldap/search.go b/vendor/github.com/mattermost/ldap/search.go similarity index 100% rename from vendor/github.com/go-ldap/ldap/search.go rename to vendor/github.com/mattermost/ldap/search.go diff --git a/vendor/modules.txt b/vendor/modules.txt index 7a1125ff2a..bfcff35ba2 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -22,8 +22,6 @@ github.com/disintegration/imaging github.com/dyatlov/go-opengraph/opengraph # github.com/fsnotify/fsnotify v1.4.7 github.com/fsnotify/fsnotify -# github.com/go-ldap/ldap v3.0.3+incompatible -github.com/go-ldap/ldap # github.com/go-redis/redis v6.15.2+incompatible github.com/go-redis/redis github.com/go-redis/redis/internal @@ -126,6 +124,8 @@ github.com/mattermost/go-i18n/i18n/language github.com/mattermost/go-i18n/i18n/translation # github.com/mattermost/gorp v2.0.1-0.20190301154413-3b31e9a39d05+incompatible github.com/mattermost/gorp +# github.com/mattermost/ldap v3.0.4+incompatible +github.com/mattermost/ldap # github.com/mattermost/rsc v0.0.0-20160330161541-bbaefb05eaa0 github.com/mattermost/rsc/qr github.com/mattermost/rsc/qr/coding