set ldap auth

.gitignore

@@ -1,2 +1,3 @@
 foods.db
-server.conf
+server.conf
+server

README.md

@@ -4,5 +4,4 @@ FOODOLES
 Projet Go de vote pour choisir ce qu'on mange au déjeuner
 
 TODO :
-    Afficher une liste de restaurants locaux répondant au vote du jour
-    Afficher le résultat du vote
+    Afficher une liste de restaurants locaux répondant au vote du jour

auth/auth.go

@@ -11,7 +11,7 @@ import (
 // LogIn auth the client
 func LogIn(username string, password string) (ok bool, user map[string]string) {
 
-	var configFile = "../server.conf"
+	var configFile = "server.conf"
 	var conf *config.Config
 	var conferr error
 	conf, conferr = config.NewFromFile(configFile)
@@ -30,6 +30,7 @@ func LogIn(username string, password string) (ok bool, user map[string]string) {
 		GroupFilter:  "(memberUid=%s)",
 		Attributes:   conf.LDAP.Attributes,
 	}
+	log.Print(ldapclient)
 	defer ldapclient.Close()
 
 	ok, user, err := ldapclient.Authenticate(username, password)

server.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"cadoles/foodoles/auth"
 	"cadoles/foodoles/bdd"
 	"cadoles/foodoles/config"
 	"cadoles/foodoles/foodlist"
@@ -51,12 +52,14 @@ func main() {
 
 // ServerHTTP is the entry point to all requests
 func (u *User) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+
 	if err := r.ParseForm(); err != nil {
 		log.Printf("ParseForm() err: %v", err)
 	} else {
 		u.Auth(r.FormValue("user"), r.FormValue("password"))
 	}
 	if u.Name == "" {
+
 		LogInPage(w, r)
 		return
 	}
@@ -77,14 +80,14 @@ 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
-	// }
-	u.Name = "mlamalle"
-	u.Password = "password"
-	var auth = true
+	auth, _ := auth.LogIn(user, pass)
+	if auth {
+		u.Name = user
+		u.Password = pass
+	}
+	// auth := true
+	// u.Name = "mlamalle"
+	// u.Password = "pass"
 	return auth
 }