From 507d3dc650751cdbe0aff45d63b21415bf748e33 Mon Sep 17 00:00:00 2001
From: PiotrKozimor <37144818+PiotrKozimor@users.noreply.github.com>
Date: Tue, 2 Aug 2022 15:39:10 +0200
Subject: [PATCH] Allow invited users to fetch state events and events by ID
 (#17)

* Allow invited users to fetch state events and events by ID

* Move failing test case to blacklist

* Fix /sync panicking due to presence udpates

* Use upload-artifact v3

* Yet another attempt to fix sytest artefacts

* Maybe this will work?
---
 .github/workflows/dendrite.yml | 5 ++---
 clientapi/routing/getevent.go  | 2 +-
 clientapi/routing/state.go     | 4 ++--
 syncapi/sync/requestpool.go    | 2 +-
 sytest-blacklist               | 4 ++++
 sytest-whitelist               | 1 -
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/dendrite.yml b/.github/workflows/dendrite.yml
index 9a4cec591..14b4717c9 100644
--- a/.github/workflows/dendrite.yml
+++ b/.github/workflows/dendrite.yml
@@ -191,13 +191,12 @@ jobs:
         run: /src/are-we-synapse-yet.py /logs/results.tap -v
         continue-on-error: true # not fatal
       - name: Upload Sytest logs
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         if: ${{ always() }}
         with:
           name: Sytest Logs - ${{ job.status }} - (Dendrite, ${{ join(matrix.*, ', ') }})
           path: |
-            /logs/results.tap
-            /logs/**/*.log*
+            /logs
 
   # run Complement
   complement:
diff --git a/clientapi/routing/getevent.go b/clientapi/routing/getevent.go
index 7f5842800..f44790689 100644
--- a/clientapi/routing/getevent.go
+++ b/clientapi/routing/getevent.go
@@ -123,7 +123,7 @@ func GetEvent(
 			util.GetLogger(req.Context()).WithError(err).Error("stateEvent.Membership failed")
 			return jsonerror.InternalServerError()
 		}
-		if membership == gomatrixserverlib.Join {
+		if membership == gomatrixserverlib.Join || membership == gomatrixserverlib.Invite {
 			return util.JSONResponse{
 				Code: http.StatusOK,
 				JSON: gomatrixserverlib.ToClientEvent(r.requestedEvent, gomatrixserverlib.FormatAll),
diff --git a/clientapi/routing/state.go b/clientapi/routing/state.go
index 12984c39a..a687211b6 100644
--- a/clientapi/routing/state.go
+++ b/clientapi/routing/state.go
@@ -101,7 +101,7 @@ func OnIncomingStateRequest(ctx context.Context, device *userapi.Device, rsAPI a
 		}
 		// If the user has never been in the room then stop at this point.
 		// We won't tell the user about a room they have never joined.
-		if !membershipRes.HasBeenInRoom {
+		if !membershipRes.HasBeenInRoom && membershipRes.Membership != gomatrixserverlib.Invite {
 			return util.JSONResponse{
 				Code: http.StatusForbidden,
 				JSON: jsonerror.Forbidden(fmt.Sprintf("Unknown room %q or user %q has never joined this room", roomID, device.UserID)),
@@ -241,7 +241,7 @@ func OnIncomingStateTypeRequest(
 		}
 		// If the user has never been in the room then stop at this point.
 		// We won't tell the user about a room they have never joined.
-		if !membershipRes.HasBeenInRoom || membershipRes.Membership == gomatrixserverlib.Ban {
+		if !membershipRes.HasBeenInRoom && membershipRes.Membership != gomatrixserverlib.Invite || membershipRes.Membership == gomatrixserverlib.Ban {
 			return util.JSONResponse{
 				Code: http.StatusForbidden,
 				JSON: jsonerror.Forbidden(fmt.Sprintf("Unknown room %q or user %q has never joined this room", roomID, device.UserID)),
diff --git a/syncapi/sync/requestpool.go b/syncapi/sync/requestpool.go
index 878dd9fa3..257729016 100644
--- a/syncapi/sync/requestpool.go
+++ b/syncapi/sync/requestpool.go
@@ -157,7 +157,7 @@ func (rp *RequestPool) updatePresence(db storage.Presence, presence string, user
 	existingPresence, ok := rp.Presence.LoadOrStore(userID, newPresence)
 	if ok {
 		p := existingPresence.(types.PresenceInternal)
-		if p.ClientFields.Presence == newPresence.ClientFields.Presence && newPresence.LastActiveTS-dbPresence.LastActiveTS < types.PresenceNoOpMs {
+		if dbPresence != nil && p.Presence == newPresence.Presence && newPresence.LastActiveTS-dbPresence.LastActiveTS < types.PresenceNoOpMs {
 			return
 		}
 		if dbPresence.Presence == types.PresenceOnline && presenceID == types.PresenceOnline && newPresence.LastActiveTS-dbPresence.LastActiveTS >= types.PresenceNoOpMs {
diff --git a/sytest-blacklist b/sytest-blacklist
index bcc345f6e..ec22979d4 100644
--- a/sytest-blacklist
+++ b/sytest-blacklist
@@ -49,3 +49,7 @@ Notifications can be viewed with GET /notifications
 
 If remote user leaves room we no longer receive device updates
 Guest users can join guest_access rooms
+
+# For notifications extension on iOS
+
+/event/ does not allow access to events before the user joined
\ No newline at end of file
diff --git a/sytest-whitelist b/sytest-whitelist
index ea25c75d0..f97330352 100644
--- a/sytest-whitelist
+++ b/sytest-whitelist
@@ -207,7 +207,6 @@ Deleted tags appear in an incremental v2 /sync
 /event/ on non world readable room does not work
 Outbound federation can query profile data
 /event/ on joined room works
-/event/ does not allow access to events before the user joined
 Federation key API allows unsigned requests for keys
 GET /publicRooms lists rooms
 GET /publicRooms includes avatar URLs