session store now checks password

1 files changed, 7 insertions, 24 deletions

diff --git a/src/helsinki.at/rhimport/fetcher.go b/src/helsinki.at/rhimport/fetcher.go
index acb6592..81072eb 100644
--- a/src/helsinki.at/rhimport/fetcher.go
+++ b/src/helsinki.at/rhimport/fetcher.go
@@ -247,31 +247,14 @@ func fetcher_init() {
 }
 
 func checkPassword(ctx *ImportContext, result *FetchResult) (err error) {
-	cached := true
-
-	for {
-		res_ch := make(chan getPasswordResult)
-		req := getPasswordRequest{}
-		req.username = ctx.UserName
-		req.cached = cached
-		req.response = res_ch
-		ctx.rddb.getPasswordChan <- req
-
-		res := <-res_ch
-		if res.err != nil {
-			return res.err
-		}
-		if ctx.Password == res.password {
-			return nil
-		}
-		if cached {
-			cached = false
-		} else {
-			break
-		}
+	ok := false
+	if ok, err = ctx.rddb.CheckPassword(ctx.UserName, ctx.Password); err != nil {
+		return
+	}
+	if !ok {
+		result.ResponseCode = http.StatusUnauthorized
+		result.ErrorString = "invalid username and/or password"
 	}
-	result.ResponseCode = http.StatusUnauthorized
-	result.ErrorString = "invalid username and/or password"
 	return
 }