From 5feca880d13e515edc0792169011bea043b23bb6 Mon Sep 17 00:00:00 2001 From: Matthieu Lamalle Date: Wed, 8 Jul 2020 11:21:24 +0200 Subject: [PATCH] set correct default auth type --- go.mod | 3 +++ go.sum | 15 +++++++++++++++ server.conf.dist | 13 +++++++++++++ server.go | 21 ++++++++++----------- 4 files changed, 41 insertions(+), 11 deletions(-) create mode 100644 server.conf.dist diff --git a/go.mod b/go.mod index 8fb4b70..8df7260 100644 --- a/go.mod +++ b/go.mod @@ -3,11 +3,14 @@ module forge.cadoles.com/foodoles go 1.13 require ( + github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect github.com/boltdb/bolt v1.3.1 github.com/go-chi/chi v4.0.2+incompatible github.com/jtblin/go-ldap-client v0.0.0-20170223121919-b73f66626b33 github.com/pkg/errors v0.8.1 + github.com/smartystreets/goconvey v1.6.4 // indirect golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 // indirect + gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect gopkg.in/ini.v1 v1.51.0 gopkg.in/ldap.v2 v2.5.1 // indirect ) diff --git a/go.sum b/go.sum index 6c39437..e96d621 100644 --- a/go.sum +++ b/go.sum @@ -1,17 +1,32 @@ +github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4B6AGu/h5Sxe66HYVdqdGu2l9Iebqhi/AEoA= +github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4= github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= github.com/go-chi/chi v4.0.2+incompatible h1:maB6vn6FqCxrpz4FqWdh4+lwpyZIQS7YEAUcHlgXVRs= github.com/go-chi/chi v4.0.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/jtblin/go-ldap-client v0.0.0-20170223121919-b73f66626b33 h1:XDpFOMOZq0u0Ar4F0p/wklqQXp/AMV1pTF5T5bDoUfQ= github.com/jtblin/go-ldap-client v0.0.0-20170223121919-b73f66626b33/go.mod h1:+0BcLY5d54TVv6irFzHoiFvwAHR6T0g9B+by/UaS9T0= +github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= +github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 h1:efeOvDhwQ29Dj3SdAV/MJf8oukgn+8D8WgaCaRMchF8= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d h1:TxyelI5cVkbREznMhfzycHdkp5cLA7DpE+GKjSslYhM= +gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw= gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ldap.v2 v2.5.1 h1:wiu0okdNfjlBzg6UWvd1Hn8Y+Ux17/u/4nlk4CQr6tU= diff --git a/server.conf.dist b/server.conf.dist new file mode 100644 index 0000000..a2b5dee --- /dev/null +++ b/server.conf.dist @@ -0,0 +1,13 @@ +[HTTP] +Secret = "not_so_secret" +Address = ":8080" +[LDAP] +Base = "" +Host = "" +Port = 389 +BindDN = "" +BindPassword = "" +UserFilter = "(uid=%s)" +Attributes = {"uid", "mail"} + + diff --git a/server.go b/server.go index bc415b9..346c34d 100644 --- a/server.go +++ b/server.go @@ -10,6 +10,7 @@ import ( "github.com/go-chi/chi/middleware" "github.com/pkg/errors" + "forge.cadoles.com/foodoles/auth" "forge.cadoles.com/foodoles/bdd" "forge.cadoles.com/foodoles/config" "forge.cadoles.com/foodoles/foodlist" @@ -83,17 +84,15 @@ func (u *User) ServeHTTP(w http.ResponseWriter, r *http.Request) { // Auth is the login page for user func (u *User) Auth(user string, pass string) bool { - // auth, _ := auth.LogIn(user, pass) - // if auth { - // u.Name = user - // u.Password = pass - // } else { - // u.Name = "" - // u.Password = "" - //} - auth := true - u.Name = "mlamalle" - u.Password = "pass" + auth, _ := auth.LogIn(user, pass) + if auth { + u.Name = user + u.Password = pass + } else { + u.Name = "" + u.Password = "" + } + return auth }