add default access to {get} response, fix for a crash when reporting …

…a topic
tinode · Mar 19, 2022 · 363bb0f · 363bb0f
1 parent 1903052
commit 363bb0f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/server/hub.go b/server/hub.go
@@ -593,6 +593,13 @@ func replyOfflineTopicGetDesc(sess *Session, msg *ClientComMessage) {
 				Anon: stopic.Access.Anon.String(),
 			}
 		}
+		// Report appropriate access level. Could be overriden below if subscription exists.
+		desc.Acs = &MsgAccessMode{}
+		if sess.authLvl == auth.LevelAuth || sess.authLvl == auth.LevelRoot {
+			desc.Acs.Mode = stopic.Access.Auth.String()
+		} else if sess.authLvl == auth.LevelAnon {
+			desc.Acs.Mode = stopic.Access.Anon.String()
+		}
 	} else {
 		// 'me' and p2p topics
 		uid := types.ZeroUid
@@ -632,6 +639,14 @@ func replyOfflineTopicGetDesc(sess *Session, msg *ClientComMessage) {
 		if sess.authLvl == auth.LevelRoot {
 			desc.State = suser.State.String()
 		}
+
+		// Report appropriate access level. Could be overriden below if subscription exists.
+		desc.Acs = &MsgAccessMode{}
+		if sess.authLvl == auth.LevelAuth || sess.authLvl == auth.LevelRoot {
+			desc.Acs.Mode = suser.Access.Auth.String()
+		} else if sess.authLvl == auth.LevelAnon {
+			desc.Acs.Mode = suser.Access.Anon.String()
+		}
 	}
 
 	sub, err := store.Subs.Get(topic, asUid, false)

diff --git a/server/topic.go b/server/topic.go
@@ -1007,8 +1007,9 @@ func (t *Topic) handlePubBroadcast(msg *ClientComMessage) {
 	t.broadcastToSessions(data)
 
 	// usersPush will update unread message count and send push notification.
-	pushRcpt := t.pushForData(asUid, data.Data)
-	usersPush(pushRcpt)
+	if pushRcpt := t.pushForData(asUid, data.Data); pushRcpt != nil {
+		usersPush(pushRcpt)
+	}
 }
 
 // handleNoteBroadcast fans out {note} -> {info} messages to recipients in a master topic.
@@ -1957,7 +1958,7 @@ func (t *Topic) replyGetDesc(sess *Session, asUid types.Uid, asChan bool, opts *
 	// Give subscriber a fuller description than to a stranger/channel reader.
 	if full {
 		if t.cat == types.TopicCatP2P {
-			// For p2p topics default access mode makes no sense.
+			// For p2p topics default access mode makes no sense: only participants have access to topic.
 			// Don't report it.
 		} else if t.cat == types.TopicCatMe || (pud.modeGiven & pud.modeWant).IsSharer() {
 			desc.DefaultAcs = &MsgDefaultAcsMode{