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

Various auth.py fixes. #919

Merged
merged 4 commits into from Jul 15, 2016

Conversation

Projects
None yet
2 participants
Owner

erikjohnston commented Jul 13, 2016

No description provided.

erikjohnston added some commits Jul 13, 2016

@NegativeMjark NegativeMjark commented on an outdated diff Jul 14, 2016

synapse/state.py
@@ -379,7 +379,7 @@ def _resolve_auth_events(self, events, auth_events):
try:
# FIXME: hs.get_auth() is bad style, but we need to do it to
# get around circular deps.
- self.hs.get_auth().check(event, auth_events)
+ self.hs.get_auth().check(event, auth_events, do_sig_check=False)
@NegativeMjark

NegativeMjark Jul 14, 2016 edited

Contributor

Maybe add a comment to explain why we can do do_sig_check=False here?

@NegativeMjark NegativeMjark commented on an outdated diff Jul 14, 2016

synapse/state.py
@@ -391,7 +391,7 @@ def _resolve_normal_events(self, events, auth_events):
try:
# FIXME: hs.get_auth() is bad style, but we need to do it to
# get around circular deps.
- self.hs.get_auth().check(event, auth_events)
+ self.hs.get_auth().check(event, auth_events, do_sig_check=False)
@NegativeMjark

NegativeMjark Jul 14, 2016

Contributor

Maybe add a comment to explain why we can do do_sig_check=False here?

@NegativeMjark NegativeMjark commented on an outdated diff Jul 14, 2016

synapse/handlers/federation.py
@@ -918,7 +918,7 @@ def on_make_leave_request(self, room_id, user_id):
)
try:
- self.auth.check(event, auth_events=context.current_state)
+ self.auth.check(event, auth_events=context.current_state, do_sig_check=False)
@NegativeMjark

NegativeMjark Jul 14, 2016

Contributor

Maybe add a comment to explain why we can do do_sig_check=False here?

@NegativeMjark NegativeMjark commented on an outdated diff Jul 14, 2016

synapse/handlers/federation.py
@@ -688,7 +688,7 @@ def on_make_join_request(self, room_id, user_id):
logger.warn("Failed to create join %r because %s", event, e)
raise e
- self.auth.check(event, auth_events=context.current_state)
+ self.auth.check(event, auth_events=context.current_state, do_sig_check=False)
@NegativeMjark

NegativeMjark Jul 14, 2016

Contributor

Maybe add a comment to explain why we can do do_sig_check=False here?

Contributor

NegativeMjark commented Jul 15, 2016

LGTM

@erikjohnston erikjohnston merged commit bd7c519 into develop Jul 15, 2016

10 checks passed

Flake8 + Packaging (Commit) Build #1148 origin/erikj/auth_fix succeeded in 37 sec
Details
Flake8 + Packaging (Merged PR) Build finished.
Details
Sytest Dendron (Commit) Build #262 origin/erikj/auth_fix succeeded in 7 min 22 sec
Details
Sytest Dendron (Merged PR) Build finished.
Details
Sytest Postgres (Commit) Build #1100 origin/erikj/auth_fix succeeded in 6 min 51 sec
Details
Sytest Postgres (Merged PR) Build finished.
Details
Sytest SQLite (Commit) Build #1121 origin/erikj/auth_fix succeeded in 6 min 13 sec
Details
Sytest SQLite (Merged PR) Build finished.
Details
Unit Tests (Commit) Build #1187 origin/erikj/auth_fix succeeded in 1 min 35 sec
Details
Unit Tests (Merged PR) Build finished.
Details

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

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