summaryrefslogtreecommitdiff
path: root/src/util
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2019-09-23 17:23:54 +0200
committerFlorian Dold <florian.dold@gmail.com>2019-09-23 17:23:54 +0200
commit5e859bae099245af0b9a95b6c45059863153b95f (patch)
tree9fd8281728f111ee40774ee808de3694cab2a8a9 /src/util
parent389b5de09dc3720c22ac86d5cad4c1495fc5be58 (diff)
downloadexchange-5e859bae099245af0b9a95b6c45059863153b95f.tar.gz
exchange-5e859bae099245af0b9a95b6c45059863153b95f.tar.bz2
exchange-5e859bae099245af0b9a95b6c45059863153b95f.zip
make URL joining more restrictive to avoid mistakes
Diffstat (limited to 'src/util')
-rw-r--r--src/util/test_url.c10
-rw-r--r--src/util/util.c9
2 files changed, 12 insertions, 7 deletions
diff --git a/src/util/test_url.c b/src/util/test_url.c
index 59a5e3fa..f6aab0dc 100644
--- a/src/util/test_url.c
+++ b/src/util/test_url.c
@@ -51,12 +51,8 @@ main (int argc,
cf (TALER_url_join ("https://taler.net/", "foo", NULL),
"https://taler.net/foo");
- cf (TALER_url_join ("https://taler.net", "foo", NULL),
- "https://taler.net/foo");
- cf (TALER_url_join ("https://taler.net/", "/foo", NULL),
+ cf (TALER_url_join ("https://taler.net/", "foo", NULL),
"https://taler.net/foo");
- cf (TALER_url_join ("https://taler.net/", "/foo/", NULL),
- "https://taler.net/foo/");
cf (TALER_url_join ("https://taler.net/", "foo", "x", "42", NULL),
"https://taler.net/foo?x=42");
@@ -67,11 +63,11 @@ main (int argc,
cf (TALER_url_join ("https://taler.net/", "foo", "x", "", "y", "1", NULL),
"https://taler.net/foo?x=&y=1");
- cf (TALER_url_join ("https://taler.net", "foo/bar", "x", "a&b", NULL),
+ cf (TALER_url_join ("https://taler.net/", "foo/bar", "x", "a&b", NULL),
"https://taler.net/foo/bar?x=a%26b");
/* Path component is not encoded! */
- cf (TALER_url_join ("https://taler.net", "foo/bar?spam=eggs&quux=", NULL),
+ cf (TALER_url_join ("https://taler.net/", "foo/bar?spam=eggs&quux=", NULL),
"https://taler.net/foo/bar?spam=eggs&quux=");
cf (TALER_url_absolute_raw ("https", "taler.net", "foo/bar", "baz",
diff --git a/src/util/util.c b/src/util/util.c
index 75ace4dc..027daf42 100644
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -300,6 +300,15 @@ TALER_url_join (const char *base_url,
va_list args;
GNUNET_assert (NULL != res);
+ GNUNET_assert (NULL != base_url);
+ GNUNET_assert (NULL != path);
+ GNUNET_assert (strlen (base_url) > 0);
+
+ // Must be an actual base URL!
+ GNUNET_assert ('/' == base_url[strlen (base_url) - 1]);
+
+ // Path must be relative to existing path of base URL
+ GNUNET_assert ('/' != path[0]);
grow_string (&res, base_url, &n);