Changeset 10491

Timestamp:

13 Aug 2013, 13:14:50 (11 years ago)

Author:

uli

Message:

Add a helper to update URLs query strings correctly.

Location:

main/waeup.cas/trunk/waeup/cas

Files:

• server.py (modified) (2 diffs)
• tests/test_server.py (modified) (2 diffs)

main/waeup.cas/trunk/waeup/cas/server.py

@@ -5 +5 @@
 import random
 import time
+import urllib
+from urlparse import urlparse, parse_qsl, urlunparse
 from webob import exc, Response
 from webob.dec import wsgify
@@ -168 +170 @@
         return open(path, 'r').read()
     return None
+
+
+def update_url(url, params_dict):
+    """Update query params of an url.
+
+    The `url` is modified to have the query parameters set to
+    keys/values in `params_dict`, preserving any different existing
+    keys/values and overwriting any existing keys/values that are also
+    in `params_dict`.
+
+    Thus, ``'http://sample?a=1', dict(b='1')`` will result in
+    ``'http://sample?a=1&b=1`` and similar.
+    """
+    parts = [x for x in urlparse(url)]
+    old_params = dict(parse_qsl(parts[4]))
+    old_params.update(params_dict)
+    query_string = urllib.urlencode(old_params)
+    parts[4] = query_string
+    return urlunparse(parts)
 
 

main/waeup.cas/trunk/waeup/cas/tests/test_server.py

@@ -13 +13 @@
     create_tgc_value, check_login_ticket, set_session_cookie,
     check_session_cookie, get_template, delete_session_cookie,
-    check_service_ticket,
+    check_service_ticket, update_url
     )
 
@@ -564 +564 @@
         assert check_service_ticket(
             db,  'ST-123456', 'http://myservice.com', False) is not None
+
+    def test_update_url(self):
+        # we can create valid new urls with query string params updated
+        url = 'http://sample.com/index?a=1&b=2'
+        result1 = update_url('http://sample.com/index?a=1&b=2', dict(b='3'))
+        assert result1 == 'http://sample.com/index?a=1&b=3'
+        result2 = update_url('http://sample.com/index?b=2', dict(b='3'))
+        assert result2 == 'http://sample.com/index?b=3'
+        result3 = update_url('http://sample.com/index', dict(b='3'))
+        assert result3 == 'http://sample.com/index?b=3'
+        result4 = update_url('http://sample.com/index?a=2', dict(b='3'))
+        assert result4 == 'http://sample.com/index?a=2&b=3'