[GNUnet-SVN] [taler-exchange] branch master updated: make URL joining more restrictive to avoid mistakes

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a commit to branch master
in repository exchange.

The following commit(s) were added to refs/heads/master by this push:
     new 5e859bae make URL joining more restrictive to avoid mistakes
5e859bae is described below

commit 5e859bae099245af0b9a95b6c45059863153b95f
Author: Florian Dold <address@hidden>
AuthorDate: Mon Sep 23 17:23:54 2019 +0200

    make URL joining more restrictive to avoid mistakes
---
 src/util/test_url.c | 10 +++-------
 src/util/util.c     |  9 +++++++++
 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);
 

-- 
To stop receiving notification emails like this one, please contact
address@hidden.