aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2021-03-09 18:30:59 +0100
committerAlex Auvolat <alex@adnab.me>2021-03-09 18:30:59 +0100
commit1a20a64eff34336789c0e3b41db1de727e3fe998 (patch)
tree27e32e575eeace4260f21f76969f6e1ab5c8b5c2
parentdc3fd4df659bb35d7858714a429fc797bf5f1222 (diff)
downloadbottin-1a20a64eff34336789c0e3b41db1de727e3fe998.tar.gz
bottin-1a20a64eff34336789c0e3b41db1de727e3fe998.zip
Refactoring
-rw-r--r--main.go79
-rw-r--r--read.go40
-rw-r--r--util.go6
-rw-r--r--write.go44
4 files changed, 87 insertions, 82 deletions
diff --git a/main.go b/main.go
index 5f309bc..3d5ba57 100644
--- a/main.go
+++ b/main.go
@@ -10,7 +10,6 @@ import (
"io/ioutil"
"os"
"os/signal"
- "strings"
"syscall"
ldap "bottin/ldapserver"
@@ -358,84 +357,6 @@ func (server *Server) init() error {
return nil
}
-func (server *Server) putAttributes(dn string, attrs Entry) error {
- prefix, err := dnToConsul(dn)
- if err != nil {
- return err
- }
-
- for k, valuesNC := range attrs {
- path := prefix + "/attribute=" + k
-
- // Trim spaces and remove empty values
- values := []string{}
- for _, v := range valuesNC {
- vv := strings.TrimSpace(v)
- if len(vv) > 0 {
- values = append(values, vv)
- }
- }
-
- // If we have zero values, delete associated k/v pair
- // Otherwise, write new values
- if len(values) == 0 {
- _, err := server.kv.Delete(path, nil)
- if err != nil {
- return err
- }
- } else {
- json, err := json.MarshalIndent(values, "", " ")
- if err != nil {
- return err
- }
- pair := &consul.KVPair{Key: path, Value: json}
- _, err = server.kv.Put(pair, nil)
- if err != nil {
- return err
- }
- }
- }
- return nil
-}
-
-func (server *Server) getAttribute(dn string, attr string) ([]string, error) {
- path, err := dnToConsul(dn)
- if err != nil {
- return nil, err
- }
-
- pairs, _, err := server.kv.List(path+"/attribute=", &server.readOpts)
- if err != nil {
- return nil, err
- }
-
- values := []string{}
- for _, pair := range pairs {
- if strings.EqualFold(pair.Key, path+"/attribute="+attr) {
- newVals, err := parseValue(pair.Value)
- if err != nil {
- return nil, err
- }
- values = append(values, newVals...)
- }
- }
-
- return values, nil
-}
-
-func (server *Server) objectExists(dn string) (bool, error) {
- prefix, err := dnToConsul(dn)
- if err != nil {
- return false, err
- }
-
- data, _, err := server.kv.List(prefix+"/attribute=", &server.readOpts)
- if err != nil {
- return false, err
- }
- return len(data) > 0, nil
-}
-
func (server *Server) checkDN(dn string, allow_extend bool) (string, error) {
// 1. Canonicalize: remove spaces between things and put all in lower case
dn, err := canonicalDN(dn)
diff --git a/read.go b/read.go
index b139175..b36b966 100644
--- a/read.go
+++ b/read.go
@@ -9,6 +9,46 @@ import (
message "github.com/lor00x/goldap/message"
)
+// Generic read utility functions ----------
+
+func (server *Server) getAttribute(dn string, attr string) ([]string, error) {
+ path, err := dnToConsul(dn)
+ if err != nil {
+ return nil, err
+ }
+
+ pairs, _, err := server.kv.List(path+"/attribute=", &server.readOpts)
+ if err != nil {
+ return nil, err
+ }
+
+ values := []string{}
+ for _, pair := range pairs {
+ if strings.EqualFold(pair.Key, path+"/attribute="+attr) {
+ newVals, err := parseValue(pair.Value)
+ if err != nil {
+ return nil, err
+ }
+ values = append(values, newVals...)
+ }
+ }
+
+ return values, nil
+}
+
+func (server *Server) objectExists(dn string) (bool, error) {
+ prefix, err := dnToConsul(dn)
+ if err != nil {
+ return false, err
+ }
+
+ data, _, err := server.kv.List(prefix+"/attribute=", &server.readOpts)
+ if err != nil {
+ return false, err
+ }
+ return len(data) > 0, nil
+}
+
// Compare request -------------------------
func (server *Server) handleCompare(s ldap.UserState, w ldap.ResponseWriter, m *ldap.Message) {
diff --git a/util.go b/util.go
index 95ad102..30d7a67 100644
--- a/util.go
+++ b/util.go
@@ -64,15 +64,15 @@ func parseValue(value []byte) ([]string, error) {
func parseConsulResult(data []*consul.KVPair) (map[string]Entry, error) {
aggregator := map[string]Entry{}
- for _, kv := range data {
- dn, attr, err := consulToDN(kv.Key)
+ for _, pair := range data {
+ dn, attr, err := consulToDN(pair.Key)
if err != nil {
continue
}
if _, exists := aggregator[dn]; !exists {
aggregator[dn] = Entry{}
}
- value, err := parseValue(kv.Value)
+ value, err := parseValue(pair.Value)
if err != nil {
return nil, err
}
diff --git a/write.go b/write.go
index 41d00c6..e4c7de1 100644
--- a/write.go
+++ b/write.go
@@ -1,14 +1,58 @@
package main
import (
+ "encoding/json"
"fmt"
"strings"
ldap "bottin/ldapserver"
+ consul "github.com/hashicorp/consul/api"
message "github.com/lor00x/goldap/message"
)
+// Generic item modification function --------
+
+func (server *Server) putAttributes(dn string, attrs Entry) error {
+ prefix, err := dnToConsul(dn)
+ if err != nil {
+ return err
+ }
+
+ for k, valuesNC := range attrs {
+ path := prefix + "/attribute=" + k
+
+ // Trim spaces and remove empty values
+ values := []string{}
+ for _, v := range valuesNC {
+ vv := strings.TrimSpace(v)
+ if len(vv) > 0 {
+ values = append(values, vv)
+ }
+ }
+
+ // If we have zero values, delete associated k/v pair
+ // Otherwise, write new values
+ if len(values) == 0 {
+ _, err := server.kv.Delete(path, nil)
+ if err != nil {
+ return err
+ }
+ } else {
+ json, err := json.MarshalIndent(values, "", " ")
+ if err != nil {
+ return err
+ }
+ pair := &consul.KVPair{Key: path, Value: json}
+ _, err = server.kv.Put(pair, nil)
+ if err != nil {
+ return err
+ }
+ }
+ }
+ return nil
+}
+
// Add request ------------------------
func (server *Server) handleAdd(s ldap.UserState, w ldap.ResponseWriter, m *ldap.Message) {