/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

Handle the case of missing auth events when joining a room #964

Merged
merged 3 commits into from Jul 29, 2016

Conversation

Reviewers
No reviews
Assignees

@NegativeMjark NegativeMjark

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

erikjohnston commented Jul 28, 2016

No description provided.

@erikjohnston
Handle the case of missing auth events when joining a room

All checks have passed

8 successful checks
@matrixbot
Flake8 + Packaging (Commit) — Build #1278 origin/erikj/fed_join_fix succeeded in 43 sec
Details
@matrixbot
Sytest Dendron (Commit) — Build #384 origin/erikj/fed_join_fix succeeded in 7 min 33 sec
Details
@matrixbot
Sytest Dendron (Merged PR) — Build finished.
Details
@matrixbot
Sytest Postgres (Commit) — Build #1220 origin/erikj/fed_join_fix succeeded in 7 min 14 sec
Details
@matrixbot
Sytest Postgres (Merged PR) — Build finished.
Details
@matrixbot
Sytest SQLite (Commit) — Build #1248 origin/erikj/fed_join_fix succeeded in 6 min 5 sec
Details
@matrixbot
Sytest SQLite (Merged PR) — Build finished.
Details
@matrixbot
Unit Tests (Commit) — Build #1315 origin/erikj/fed_join_fix succeeded in 2 min 27 sec
Details
1e2740c

@erikjohnston erikjohnston assigned NegativeMjark Jul 28, 2016

@NegativeMjark NegativeMjark commented on the diff Jul 28, 2016

View full changes
synapse/handlers/federation.py
@@ -1155,7 +1155,7 @@ def _handle_new_events(self, origin, event_infos, backfilled=False):
)
@defer.inlineCallbacks
- def _persist_auth_tree(self, auth_events, state, event):
+ def _persist_auth_tree(self, origin, auth_events, state, event):
"""Checks the auth chain is valid (and passes auth checks) for the
state and event. Then persists the auth chain and state atomically.
Persists the event seperately.
@NegativeMjark

NegativeMjark Jul 28, 2016

Contributor

Maybe update the docstring with the changes?
@erikjohnston
Update docstring

All checks have passed

10 successful checks
@matrixbot
Flake8 + Packaging (Commit) — Build #1287 origin/erikj/fed_join_fix succeeded in 35 sec
Details
@matrixbot
Flake8 + Packaging (Merged PR) — Build finished.
Details
@matrixbot
Sytest Dendron (Commit) — Build #393 origin/erikj/fed_join_fix succeeded in 7 min 57 sec
Details
@matrixbot
Sytest Dendron (Merged PR) — Build finished.
Details
@matrixbot
Sytest Postgres (Commit) — Build #1229 origin/erikj/fed_join_fix succeeded in 7 min 24 sec
Details
@matrixbot
Sytest Postgres (Merged PR) — Build finished.
Details
@matrixbot
Sytest SQLite (Commit) — Build #1257 origin/erikj/fed_join_fix succeeded in 6 min 19 sec
Details
@matrixbot
Sytest SQLite (Merged PR) — Build finished.
Details
@matrixbot
Unit Tests (Commit) — Build #1324 origin/erikj/fed_join_fix succeeded in 2 min 22 sec
Details
@matrixbot
Unit Tests (Merged PR) — Build finished.
Details
3d13c3a
@erikjohnston
Owner

erikjohnston commented Jul 29, 2016

@NegativeMjark PTAL

@NegativeMjark NegativeMjark commented on the diff Jul 29, 2016

View full changes
synapse/handlers/federation.py
@@ -1160,6 +1160,12 @@ def _persist_auth_tree(self, origin, auth_events, state, event):
state and event. Then persists the auth chain and state atomically.
Persists the event seperately.
@NegativeMjark

NegativeMjark Jul 29, 2016

Contributor

Could you add a couple of lines explaining that it will fetch missing events, and under what conditions it will do so?
@erikjohnston
Mention that func will fetch auth events

All checks have passed

10 successful checks
@matrixbot
Flake8 + Packaging (Commit) — Build #1288 origin/erikj/fed_join_fix succeeded in 36 sec
Details
@matrixbot
Flake8 + Packaging (Merged PR) — Build finished.
Details
@matrixbot
Sytest Dendron (Commit) — Build #394 origin/erikj/fed_join_fix succeeded in 6 min 58 sec
Details
@matrixbot
Sytest Dendron (Merged PR) — Build finished.
Details
@matrixbot
Sytest Postgres (Commit) — Build #1230 origin/erikj/fed_join_fix succeeded in 6 min 58 sec
Details
@matrixbot
Sytest Postgres (Merged PR) — Build finished.
Details
@matrixbot
Sytest SQLite (Commit) — Build #1258 origin/erikj/fed_join_fix succeeded in 5 min 58 sec
Details
@matrixbot
Sytest SQLite (Merged PR) — Build finished.
Details
@matrixbot
Unit Tests (Commit) — Build #1325 origin/erikj/fed_join_fix succeeded in 2 min 35 sec
Details
@matrixbot
Unit Tests (Merged PR) — Build finished.
Details
c51a52f
@NegativeMjark
Contributor

NegativeMjark commented Jul 29, 2016

Eh LGTM

@erikjohnston erikjohnston merged commit cbea0c7 into develop Jul 29, 2016
10 checks passed

10 checks passed

Flake8 + Packaging (Commit) Build #1288 origin/erikj/fed_join_fix succeeded in 36 sec
Details
Flake8 + Packaging (Merged PR) Build finished.
Details
Sytest Dendron (Commit) Build #394 origin/erikj/fed_join_fix succeeded in 6 min 58 sec
Details
Sytest Dendron (Merged PR) Build finished.
Details
Sytest Postgres (Commit) Build #1230 origin/erikj/fed_join_fix succeeded in 6 min 58 sec
Details
Sytest Postgres (Merged PR) Build finished.
Details
Sytest SQLite (Commit) Build #1258 origin/erikj/fed_join_fix succeeded in 5 min 58 sec
Details
Sytest SQLite (Merged PR) Build finished.
Details
Unit Tests (Commit) Build #1325 origin/erikj/fed_join_fix succeeded in 2 min 35 sec
Details
Unit Tests (Merged PR) Build finished.
Details

@richvdh richvdh deleted the erikj/fed_join_fix branch Dec 1, 2016

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