[daemon] Use database to check history read permissions

3 files changed, 25 insertions, 8 deletions

diff --git a/.gitignore b/.gitignore
index 2c206f1..0cbf4fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 test.db
+test.db-journal
 *.pem
\ No newline at end of file
diff --git a/server/user.go b/server/user.go
index c27c6a1..6ca857a 100644
--- a/server/user.go
+++ b/server/user.go
@@ -171,13 +171,19 @@ func (s *Server) handleUsermode(user *User, conn net.Conn, mode core.Usermode) e
 // TODO: Better errors
 
 func (s *Server) handleHistory(user *User, conn net.Conn, hist core.History) error {
-	addr, err := core.ReadAddr(hist.Channel)
+	_, err := core.ReadAddr(hist.Channel)
 	if err != nil {
 		fmt.Println("cannot parse address:", err)
 		return user.Send(conn, core.Error{core.ErrorNotFound})
 	}
 
-	if _, ok := user.Channels[addr.Channel]; !ok {
+	perm, err := s.Storage.GetPermission(user.Name+"@"+s.cfg.Name, hist.Channel)
+	if err != nil {
+		fmt.Println("cannot get message history:", err)
+		return user.Send(conn, core.Error{core.ErrorNotFound})
+	}
+
+	if perm.Read == false {
 		fmt.Println("cannot get message history: not authorized")
 		return user.Send(conn, core.Error{core.ErrorNotFound})
 	}
diff --git a/storage/storage.go b/storage/storage.go
index 28f2564..510b587 100644
--- a/storage/storage.go
+++ b/storage/storage.go
@@ -109,16 +109,26 @@ func (db *Database) SetPermission(perm core.PermissionData) error {
 }
 
 func (db *Database) GetPermission(user, channel string) (core.PermissionData, error) {
-	var perm core.PermissionData
+	var read, write int
 
 	err := db.QueryRow(
-		"SELECT (read, write) FROM permissions WHERE user = ? AND channel = ?", user, channel).
-		Scan(&perm.Read, &perm.Write)
+		"SELECT read, write FROM permissions WHERE user = ? AND channel = ?", user, channel).
+		Scan(&read, &write)
 	if err != nil {
 		return core.PermissionData{}, err
 	}
 
-	perm.User = user
-	perm.Channel = channel
-	return perm, nil
+	return core.PermissionData{
+		User:    user,
+		Channel: channel,
+		Read:    itob(read),
+		Write:   itob(write),
+	}, nil
+}
+
+func itob(v int) bool {
+	if v == 1 {
+		return true
+	}
+	return false
 }