New issue

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

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix an internal server error when viewing the public privacy policy #4184

merged 3 commits into from Nov 14, 2018


None yet
3 participants

richvdh commented Nov 14, 2018

For the new accept-the-terms-during-consent flow, we need to be able to see the privacy policy without a registered user.

@richvdh richvdh requested review from turt2live and matrix-org/synapse-core Nov 14, 2018


This comment has been minimized.


richvdh commented Nov 14, 2018

FTR this got broken in #4163. Definitely a poster-child for tests being a good thing.

@richvdh richvdh merged commit 4b60c96 into develop Nov 14, 2018

5 checks passed

ci/circleci: sytestpy2merged Your tests passed on CircleCI!
ci/circleci: sytestpy2postgresmerged Your tests passed on CircleCI!
ci/circleci: sytestpy3merged Your tests passed on CircleCI!
ci/circleci: sytestpy3postgresmerged Your tests passed on CircleCI!
continuous-integration/travis-ci/pr The Travis CI build passed

@richvdh richvdh deleted the rav/fix_public_consent branch Nov 14, 2018

@@ -142,10 +142,10 @@ def _async_render_GET(self, request):
userhmac = None
has_consented = False
public_version = username == ""
if not public_version or not self.hs.config.user_consent_at_registration:

This comment has been minimized.


turt2live Nov 14, 2018


Taking off the config flag causes a different set of errors. If the policy template doesn't correctly block usage of the missing variables, it will explode.

I'd highly recommend maintaining the flag.

This comment has been minimized.


erikjohnston Nov 14, 2018


I don't follow I'm afraid. That if statement doesn't block calls to _render_template?

This comment has been minimized.


turt2live Nov 14, 2018


Github helpfully wasn't showing me that userhmac is defined above here and therefore fine (I think).

The problem is more of one where undefined variables can make it through _render_template and cause problems when the template tries to use them. When I was testing the template stuff originally, the thing exploded if stuff like userhmac wasn't defined at template time if the template didn't have an !is_public if statement around it.

hawkowl added a commit that referenced this pull request Nov 19, 2018

Merge tag 'v0.33.9'

- Include flags to optionally add `m.login.terms` to the registration flow when consent tracking is enabled.
([\#4004](#4004), [\#4133](#4133),
[\#4142](#4142), [\#4184](#4184))
- Support for replacing rooms with new ones ([\#4091](#4091), [\#4099](#4099),
[\#4100](#4100), [\#4101](#4101))


- Fix exceptions when using the email mailer on Python 3. ([\#4095](#4095))
- Fix e2e key backup with more than 9 backup versions ([\#4113](#4113))
- Searches that request profile info now no longer fail with a 500. ([\#4122](#4122))
- fix return code of empty key backups ([\#4123](#4123))
- If the typing stream ID goes backwards (as on a worker when the master restarts), the worker's typing handler will no longer erroneously report rooms containing new
typing events. ([\#4127](#4127))
- Fix table lock of device_lists_remote_cache which could freeze the application ([\#4132](#4132))
- Fix exception when using state res v2 algorithm ([\#4135](#4135))
- Generating the user consent URI no longer fails on Python 3. ([\#4140](#4140),
- Loading URL previews from the DB cache on Postgres will no longer cause Unicode type errors when responding to the request, and URL previews will no longer fail if
the remote server returns a Content-Type header with the chartype in quotes. ([\#4157](#4157))
- The hash_password script now works on Python 3. ([\#4161](#4161))
- Fix noop checks when updating device keys, reducing spurious device list update notifications. ([\#4164](#4164))

Deprecations and Removals

- The disused and un-specced identicon generator has been removed. ([\#4106](#4106))
- The obsolete and non-functional /pull federation endpoint has been removed. ([\#4118](#4118))
- The deprecated v1 key exchange endpoints have been removed. ([\#4119](#4119))
- Synapse will no longer fetch keys using the fallback deprecated v1 key exchange method and will now always use v2.

Internal Changes

- Fix build of Docker image with docker-compose ([\#3778](#3778))
- Delete unreferenced state groups during history purge ([\#4006](#4006))
- The "Received rdata" log messages on workers is now logged at DEBUG, not INFO. ([\#4108](#4108))
- Reduce replication traffic for device lists ([\#4109](#4109))
- Fix `synapse_replication_tcp_protocol_*_commands` metric label to be full command name, rather than just the first character
- Log some bits about room creation ([\#4121](#4121))
- Fix `tox` failure on old systems ([\#4124](#4124))
- Add STATE_V2_TEST room version ([\#4128](#4128))
- Clean up event accesses and tests ([\#4137](#4137))
- The default logging config will now set an explicit log file encoding of UTF-8. ([\#4138](#4138))
- Add helpers functions for getting prev and auth events of an event ([\#4139](#4139))
- Add some tests for the HTTP pusher. ([\#4149](#4149))
- add and scripts to contrib/ ([\#4155](#4155))
- HTTP tests have been refactored to contain less boilerplate. ([\#4156](#4156))
- Drop incoming events from federation for unknown rooms ([\#4165](#4165))
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment