openidec

commit c47c8e7db2815aee98d4b038b451644751e7a19d
parent 01f8b03f530249a15260f34371ab67c0389c40e0
Author: Peter Kosyh <p.kosyh@gmail.com>
Date:   Thu, 11 Mar 2021 07:12:59 +0000

Merge branch 'master' of https://github.com/gl00my/ii-go

Diffstat:
M
ii-node/web.go
 | 
5
+++++
M
ii/db.go
 | 
22
+++++++++++++++-------

2 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/ii-node/web.go b/ii-node/web.go
@@ -496,6 +496,11 @@ func www_topic(ctx *WebContext, w http.ResponseWriter, r *http.Request, page int
 	if mi == nil {
 		return errors.New("No such message")
 	}
+
+	if !db.Access(mi, ctx.User) {
+		return errors.New("Access denied")
+	}
+
 	if page == 0 {
 		ctx.Selected = id
 	}
diff --git a/ii/db.go b/ii/db.go
@@ -484,6 +484,19 @@ func prependStr(x []string, y string) []string {
 	return x
 }
 
+// Check if message is private
+func (db *DB) Access(info *MsgInfo, user *User) bool {
+	if IsPrivate(info.Echo) {
+		if user.Name == "" {
+			return false
+		}
+		if info.To != "All" && info.From != user.Name && info.To != user.Name {
+			return false
+		}
+	}
+	return true
+}
+
 // Default match function for queries.
 func (db *DB) Match(info *MsgInfo, r Query) bool {
 	if r.Blacklisted {
@@ -509,13 +522,8 @@ func (db *DB) Match(info *MsgInfo, r Query) bool {
 	if r.From != "" && r.From != info.From {
 		return false
 	}
-	if IsPrivate(info.Echo) {
-		if r.User.Name == "" {
-			return false
-		}
-		if info.To != "All" && info.From != r.User.Name && info.To != r.User.Name {
-			return false
-		}
+	if !db.Access(info, &r.User) {
+		return false
 	}
 	if r.Match != nil {
 		return r.Match(info, r)