/synapse

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Fix invite state to always include all events #2163

Merged
merged 3 commits into from Apr 27, 2017

Conversation

Reviewers

@NegativeMjark NegativeMjark

Assignees

@NegativeMjark NegativeMjark

Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@erikjohnston @NegativeMjark
@erikjohnston
Owner

erikjohnston commented Apr 26, 2017

Currently they aren't sent unless the server has been restarted, as we accidentally edited the unsigned section of the event that causes the event in the cache to be wrong
@erikjohnston
Fix invite state to always include all events

Some checks were not successful

2 failing and 6 successful checks
continuous-integration/travis-ci/pr — The Travis CI build failed
Details
continuous-integration/travis-ci/push — The Travis CI build failed
Details
@matrixbot
Sytest Dendron (Commit) — Build #2020 origin/erikj/fix_invite_state succeeded in 7 min 19 sec
Details
@matrixbot
Sytest Dendron (Merged PR) — Build finished.
Details
@matrixbot
Sytest Postgres (Commit) — Build #2851 origin/erikj/fix_invite_state succeeded in 8 min 14 sec
Details
@matrixbot
Sytest Postgres (Merged PR) — Build finished.
Details
@matrixbot
Sytest SQLite (Commit) — Build #2920 origin/erikj/fix_invite_state succeeded in 4 min 45 sec
Details
@matrixbot
Sytest SQLite (Merged PR) — Build finished.
Details
34e682d

@erikjohnston erikjohnston assigned NegativeMjark Apr 26, 2017

@erikjohnston erikjohnston referenced this pull request Apr 26, 2017

Closed

On my custom server, preview invitations contains matrixid instead of displayname #2124

@erikjohnston
Fix tests

All checks have passed

8 successful checks
@matrixbot
Sytest Dendron (Commit) — Build #2021 origin/erikj/fix_invite_state succeeded in 9 min 51 sec
Details
@matrixbot
Sytest Dendron (Merged PR) — Build finished.
Details
@matrixbot
Sytest Postgres (Commit) — Build #2852 origin/erikj/fix_invite_state succeeded in 7 min 36 sec
Details
@matrixbot
Sytest Postgres (Merged PR) — Build finished.
Details
@matrixbot
Sytest SQLite (Commit) — Build #2921 origin/erikj/fix_invite_state succeeded in 6 min 56 sec
Details
@matrixbot
Sytest SQLite (Merged PR) — Build finished.
Details
continuous-integration/travis-ci/pr — The Travis CI build passed
Details
continuous-integration/travis-ci/push — The Travis CI build passed
Details
1e16647
synapse/rest/client/v2_alpha/sync.py
@@ -250,9 +250,11 @@ def encode_invited(self, rooms, time_now, token_id):
"""
invited = {}
for room in rooms:
+ logger.info("invite: %r", room.invite)
@NegativeMjark

NegativeMjark Apr 27, 2017

Contributor

Is this logging useful and how noisy is it?

synapse/events/utils.py
@@ -251,6 +266,9 @@ def serialize_event(e, time_now_ms, as_client_event=True,
if txn_id is not None:
d["unsigned"]["transaction_id"] = txn_id
+ if not is_invite:
+ d["unsigned"].pop("invite_room_state", None)
@NegativeMjark

NegativeMjark Apr 27, 2017

Contributor

Could you add a comment to explain why this is necessary?

@NegativeMjark
Contributor

NegativeMjark commented Apr 27, 2017

LGTM other than possibly spurious logging and needing a couple more comments.
@erikjohnston
Comment and remove spurious logging

All checks have passed

8 successful checks
@matrixbot
Sytest Dendron (Commit) — Build #2033 origin/erikj/fix_invite_state succeeded in 9 min 15 sec
Details
@matrixbot
Sytest Dendron (Merged PR) — Build finished.
Details
@matrixbot
Sytest Postgres (Commit) — Build #2864 origin/erikj/fix_invite_state succeeded in 8 min 47 sec
Details
@matrixbot
Sytest Postgres (Merged PR) — Build finished.
Details
@matrixbot
Sytest SQLite (Commit) — Build #2932 origin/erikj/fix_invite_state succeeded in 6 min 39 sec
Details
@matrixbot
Sytest SQLite (Merged PR) — Build finished.
Details
continuous-integration/travis-ci/pr — The Travis CI build passed
Details
continuous-integration/travis-ci/push — The Travis CI build passed
Details
46826bb

@erikjohnston erikjohnston merged commit 25a96e0 into develop Apr 27, 2017
6 of 8 checks passed

6 of 8 checks passed

Sytest Dendron (Commit) Build #2033 origin/erikj/fix_invite_state in progress...
Details
Sytest Postgres (Commit) Build #2864 origin/erikj/fix_invite_state in progress...
Details
Sytest Dendron (Merged PR) Build finished.
Details
Sytest Postgres (Merged PR) Build finished.
Details
Sytest SQLite (Commit) Build #2932 origin/erikj/fix_invite_state succeeded in 6 min 39 sec
Details
Sytest SQLite (Merged PR) Build finished.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

psaavedra added a commit to psaavedra/synapse that referenced this pull request May 19, 2017

@psaavedra
Merge tag 'v0.21.0' into v0.21.0_no_federate_by_default 
Changes in synapse v0.21.0 (2017-05-18)
=======================================

No changes since v0.21.0-rc3

Changes in synapse v0.21.0-rc3 (2017-05-17)
===========================================

Features:

* Add per user rate-limiting overrides (PR #2208)
* Add config option to limit maximum number of events requested by ``/sync``
  and ``/messages`` (PR #2221) Thanks to @psaavedra!

Changes:

* Various small performance fixes (PR #2201, #2202, #2224, #2226, #2227, #2228,
  #2229)
* Update username availability checker API (PR #2209, #2213)
* When purging, don't de-delta state groups we're about to delete (PR #2214)
* Documentation to check synapse version (PR #2215) Thanks to @hamber-dick!
* Add an index to event_search to speed up purge history API (PR #2218)

Bug fixes:

* Fix API to allow clients to upload one-time-keys with new sigs (PR #2206)

Changes in synapse v0.21.0-rc2 (2017-05-08)
===========================================

Changes:

* Always mark remotes as up if we receive a signed request from them (PR #2190)

Bug fixes:

* Fix bug where users got pushed for rooms they had muted (PR #2200)

Changes in synapse v0.21.0-rc1 (2017-05-08)
===========================================

Features:

* Add username availability checker API (PR #2183)
* Add read marker API (PR #2120)

Changes:

* Enable guest access for the 3pl/3pid APIs (PR #1986)
* Add setting to support TURN for guests (PR #2011)
* Various performance improvements (PR #2075, #2076, #2080, #2083, #2108,
  #2158, #2176, #2185)
* Make synctl a bit more user friendly (PR #2078, #2127) Thanks @APwhitehat!
* Replace HTTP replication with TCP replication (PR #2082, #2097, #2098,
  #2099, #2103, #2014, #2016, #2115, #2116, #2117)
* Support authenticated SMTP (PR #2102) Thanks @DanielDent!
* Add a counter metric for successfully-sent transactions (PR #2121)
* Propagate errors sensibly from proxied IS requests (PR #2147)
* Add more granular event send metrics (PR #2178)

Bug fixes:

* Fix nuke-room script to work with current schema (PR #1927) Thanks
  @zuckschwerdt!
* Fix db port script to not assume postgres tables are in the public schema
  (PR #2024) Thanks @jerrykan!
* Fix getting latest device IP for user with no devices (PR #2118)
* Fix rejection of invites to unreachable servers (PR #2145)
* Fix code for reporting old verify keys in synapse (PR #2156)
* Fix invite state to always include all events (PR #2163)
* Fix bug where synapse would always fetch state for any missing event (PR #2170)
* Fix a leak with timed out HTTP connections (PR #2180)
* Fix bug where we didn't time out HTTP requests to ASes  (PR #2192)

Docs:

* Clarify doc for SQLite to PostgreSQL port (PR #1961) Thanks @benhylau!
* Fix typo in synctl help (PR #2107) Thanks @HarHarLinks!
* ``web_client_location`` documentation fix (PR #2131) Thanks @matthewjwolff!
* Update README.rst with FreeBSD changes (PR #2132) Thanks @feld!
* Clarify setting up metrics (PR #2149) Thanks @encks!
badd30b

@erikjohnston erikjohnston deleted the erikj/fix_invite_state branch Oct 26, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment