summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorJ. Ryan Stinnett <jryans@gmail.com>2019-09-24 14:39:50 +0100
committerGitHub <noreply@github.com>2019-09-24 14:39:50 +0100
commit40fb00f5b7a8a9df15169900df218df19423b93e (patch)
treeb7abe0f9fab0b9e19aa021920018fd5e1423cae4 /synapse
parentAdd submit_url response parameter to msisdn /requestToken (#6079) (diff)
downloadsynapse-40fb00f5b7a8a9df15169900df218df19423b93e.tar.xz
Add sid to next_link for email validation (#6097)
Diffstat (limited to 'synapse')
-rw-r--r--synapse/handlers/identity.py10
1 files changed, 10 insertions, 0 deletions
diff --git a/synapse/handlers/identity.py b/synapse/handlers/identity.py
index 1f16afd14e..6d42a1aed8 100644
--- a/synapse/handlers/identity.py
+++ b/synapse/handlers/identity.py
@@ -18,6 +18,7 @@
 """Utilities for interacting with Identity Servers"""
 
 import logging
+import urllib
 
 from canonicaljson import json
 
@@ -328,6 +329,15 @@ class IdentityHandler(BaseHandler):
             # Generate a session id
             session_id = random_string(16)
 
+        if next_link:
+            # Manipulate the next_link to add the sid, because the caller won't get
+            # it until we send a response, by which time we've sent the mail.
+            if "?" in next_link:
+                next_link += "&"
+            else:
+                next_link += "?"
+            next_link += "sid=" + urllib.parse.quote(session_id)
+
         # Generate a new validation token
         token = random_string(32)