Merge pull request #303 from matrix-org/babolivier/next_link

Use get_args to get next link
matrix-org · Jun 19, 2020 · cf4040b · cf4040b
2 parents de80990 + 0055760
commit cf4040b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/changelog.d/303.bugfix b/changelog.d/303.bugfix
@@ -0,0 +1 @@
+Fix a bug causing Sydent to ignore `nextLink` parameters.
diff --git a/sydent/http/servlets/emailservlet.py b/sydent/http/servlets/emailservlet.py
@@ -88,15 +88,17 @@ def __init__(self, syd):
         self.sydent = syd
 
     def render_GET(self, request):
+        args = get_args(request, ('nextLink',), required=False)
+
         resp = None
         try:
             resp = self.do_validate_request(request)
         except:
             pass
         if resp and 'success' in resp and resp['success']:
             msg = "Verification successful! Please return to your Matrix client to continue."
-            if 'nextLink' in request.args:
-                next_link = request.args['nextLink'][0]
+            if 'nextLink' in args:
+                next_link = args['nextLink']
                 if not next_link.startswith("file:///"):
                     request.setResponseCode(302)
                     request.setHeader("Location", next_link)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix a bug causing Sydent to ignore `nextLink` parameters.