refactor: move LDAP helper into it's own repository

netresearch · Jun 28, 2023 · 1f7591f · 1f7591f
1 parent 8c1414e
commit 1f7591f
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 202 deletions.
diff --git a/go.mod b/go.mod
@@ -20,6 +20,7 @@ require (
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.18 // indirect
 	github.com/mattn/go-runewidth v0.0.14 // indirect
+	github.com/netresearch/simple-ldap-go v0.0.0-20230628081923-f17d668afd54 // indirect
 	github.com/philhofer/fwd v1.1.2 // indirect
 	github.com/rivo/uniseg v0.2.0 // indirect
 	github.com/savsgio/dictpool v0.0.0-20221023140959-7bf2e61cea94 // indirect

diff --git a/go.sum b/go.sum
@@ -39,6 +39,8 @@ github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp9
 github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU=
 github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/netresearch/simple-ldap-go v0.0.0-20230628081923-f17d668afd54 h1:mOw2DDPlmutvBDeGptyu4fp76nP4ctGIrqz/dp2/gls=
+github.com/netresearch/simple-ldap-go v0.0.0-20230628081923-f17d668afd54/go.mod h1:l2QlOx+RzW/lx/3OfCJX3JE1leMKN0YQLtz1n2sngSM=
 github.com/philhofer/fwd v1.1.1/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU=
 github.com/philhofer/fwd v1.1.2 h1:bnDivRJ1EWPjUIRXV5KfORO897HTbpFAQddBdE8t7Gw=
 github.com/philhofer/fwd v1.1.2/go.mod h1:qkPdfjR2SIEbspLqpe1tO4n5yICnr2DY7mqEx2tUTP0=

diff --git a/internal/server/auth_middleware.go b/internal/server/auth_middleware.go
@@ -3,10 +3,10 @@ package server
 import (
 	"encoding/base64"
 	"errors"
-	"raybeam/pkg/ldap"
 	"strings"
 
 	ldap2 "github.com/go-ldap/ldap/v3"
+	ldap "github.com/netresearch/simple-ldap-go"
 
 	"github.com/gofiber/fiber/v2"
 )

diff --git a/internal/server/auth_middleware_test.go b/internal/server/auth_middleware_test.go
@@ -6,9 +6,10 @@ import (
 	"fmt"
 	"net/url"
 	"os"
-	"raybeam/pkg/ldap"
 	"strings"
 	"testing"
+
+	ldap "github.com/netresearch/simple-ldap-go"
 )
 
 func TestBasicAuthWithNonBasicAuthHeader(t *testing.T) {

diff --git a/internal/server/route_ssh_key.go b/internal/server/route_ssh_key.go
@@ -4,10 +4,10 @@ import (
 	"errors"
 	"fmt"
 	"raybeam/internal/models"
-	"raybeam/pkg/ldap"
 	"strings"
 
 	"github.com/gofiber/fiber/v2"
+	ldap "github.com/netresearch/simple-ldap-go"
 	"go.etcd.io/bbolt"
 	"golang.org/x/crypto/ssh"
 )

diff --git a/internal/server/service.go b/internal/server/service.go
@@ -1,10 +1,9 @@
 package server
 
 import (
-	"raybeam/pkg/ldap"
-
 	"github.com/gofiber/fiber/v2"
 	"github.com/gofiber/fiber/v2/middleware/logger"
+	ldap "github.com/netresearch/simple-ldap-go"
 	"go.etcd.io/bbolt"
 )
 

diff --git a/pkg/ldap/auth.go b/pkg/ldap/auth.go
diff --git a/pkg/ldap/auth_test.go b/pkg/ldap/auth_test.go
diff --git a/pkg/ldap/client.go b/pkg/ldap/client.go
diff --git a/pkg/ldap/search.go b/pkg/ldap/search.go