[daemon] Authorize using database

1 files changed, 13 insertions, 6 deletions

diff --git a/server/user.go b/server/user.go
index 5b8049f..c27c6a1 100644
--- a/server/user.go
+++ b/server/user.go
@@ -84,15 +84,16 @@ func (s *Server) performUserAuth(conn net.Conn) (string, error) {
 		return "", core.ErrUnexpectedPayloadType
 	}
 
-	// For testing ---
-	if clientAuth.Pass != "valid" {
-		if err := core.Send(conn, core.Error{core.ErrorAuthFailed}); err != nil {
-			log.Println("cannot send auth error:", err)
-		}
+	hash, err := s.Storage.GetUserPass(clientAuth.Name)
+	if err != nil {
+		s.authFail(conn)
+		return "", core.ErrAuthInvalidUser
+	}
 
+	if !core.CheckPass(clientAuth.Pass, hash) {
+		s.authFail(conn)
 		return "", core.ErrAuthInvalidPassword
 	}
-	// ---
 
 	if err := core.Send(conn, core.Success{}); err != nil {
 		return "", err
@@ -101,6 +102,12 @@ func (s *Server) performUserAuth(conn net.Conn) (string, error) {
 	return clientAuth.Name, nil
 }
 
+func (s *Server) authFail(conn net.Conn) {
+	if err := core.Send(conn, core.Error{core.ErrorAuthFailed}); err != nil {
+		log.Println("cannot send auth error:", err)
+	}
+}
+
 func (s *Server) readUserInput(user *User, conn net.Conn) error {
 	for {
 		payload, err := core.Decode(conn)