This repository has been archived by the owner on Apr 26, 2024. It is now read-only.
Remove email addresses / phone numbers from ID servers when they're removed from synapse #3276
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
richvdh
reviewed
Jun 1, 2018
synapse/handlers/auth.py
Outdated
| @@ -825,6 +825,15 @@ def delete_threepid(self, user_id, medium, address): | |||
| if medium == 'email': | |||
| address = address.lower() | |||
|
|
|||
| identity_handler = self.hs.get_handlers().identity_handler | |||
| identity_handler.unbind_threepid( | |||
| yield self.store.user_delete_threepid( | ||
| user_id, threepid['medium'], threepid['address'], | ||
| ) | ||
|
|
||
| # first delete any devices belonging to the user, which will also |
synapse/handlers/identity.py
Outdated
| @@ -138,6 +140,44 @@ def bind_threepid(self, creds, mxid): | |||
| data = json.loads(e.msg) | |||
| defer.returnValue(data) | |||
|
|
|||
| @defer.inlineCallbacks | |||
| def unbind_threepid(self, mxid, threepid): | |||
| yield run_on_reactor() | |||
There was a problem hiding this comment.
cargoculting probably. removed.
| @@ -138,6 +140,44 @@ def bind_threepid(self, creds, mxid): | |||
| data = json.loads(e.msg) | |||
| defer.returnValue(data) | |||
|
|
|||
| @defer.inlineCallbacks | |||
| def unbind_threepid(self, mxid, threepid): | |||
| @@ -264,14 +264,19 @@ def _request(self, destination, method, path, | |||
| defer.returnValue(response) | |||
|
|
|||
| def sign_request(self, destination, method, url_bytes, headers_dict, | |||
| content=None): | |||
| content=None, destination_is=None): | |||
richvdh
reviewed
Jun 5, 2018
synapse/handlers/identity.py
Outdated
| threepid (dict): Dict with medium & address of binding to be removed | ||
|
|
||
| Returns: | ||
| Deferred |
There was a problem hiding this comment.
deferred what?
Deferred[bool] I guess, but what does the bool mean?
| destination_is (str): As 'destination', but if the destination is an identity server | ||
|
|
||
| Returns: | ||
| Deferred |
| """ | ||
| Signs a request by adding an Authorization header to headers_dict | ||
| Args: | ||
| destination (str): The desination home server of the request. May be null if the |
| """ | ||
| Signs a request by adding an Authorization header to headers_dict | ||
| Args: | ||
| destination (str): The desination home server of the request. May be null if the |
There was a problem hiding this comment.
I think these are all meant to be bytes rather than str fwiw. Especially url_bytes which you are carefully .encodeing
| destination (str): The desination home server of the request. May be null if the | ||
| destination is an identity server, in which case destination_is must be non-null. | ||
| method (str): The HTTP method of the request | ||
| url_bytes (str): ? |
| request["destination"] = destination | ||
|
|
||
| if destination_is is not None: | ||
| request["destination_is"] = destination_is |
There was a problem hiding this comment.
so what is the logic behind putting this in a different field?
There was a problem hiding this comment.
To make sure it's always distinct from a request to a homeserver with the same name, eg. that you could reuse the same signature for a request to the matrix.org HS to sign the same request to the matrix.org IS as they're different destinations (although in practice are unlikely to support the same request).
|
also your pep8 is bad |
|
ptal! |
richvdh
approved these changes
Jun 5, 2018
| url_bytes (str): ? | ||
| destination (bytes): The desination home server of the request. May be None | ||
| if the destination is an identity server, in which case destination_is | ||
| must be non-null. |
| destination is an identity server, in which case destination_is must be non-null. | ||
| method (str): The HTTP method of the request | ||
| url_bytes (str): ? | ||
| destination (bytes): The desination home server of the request. May be None |
| content (str): The body of the request | ||
| destination_is (str): As 'destination', but if the destination is an identity server | ||
| content (bytes): The body of the request | ||
| destination_is (bytes): As 'destination', but if the destination is an |
|
could you try to update the PR summary to something which will make more sense when it lands in the changelog? |
dbkr
changed the title
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
On account deactivation and 3pid deletion.
Implements unbind API as per spec proposal: matrix-org/matrix-spec-proposals#1194
Related sydent PR: matrix-org/sydent#67