aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/urlapi-int.h5
-rw-r--r--lib/urlapi.c10
-rw-r--r--tests/data/Makefile.inc2
-rw-r--r--tests/data/test165323
-rw-r--r--tests/unit/Makefile.inc5
-rw-r--r--tests/unit/unit1653.c129
6 files changed, 170 insertions, 4 deletions
diff --git a/lib/urlapi-int.h b/lib/urlapi-int.h
index a57d2e22b..75a360542 100644
--- a/lib/urlapi-int.h
+++ b/lib/urlapi-int.h
@@ -30,4 +30,9 @@ bool Curl_is_absolute_url(const char *url, char *scheme, size_t buflen);
char *Curl_concat_url(const char *base, const char *relurl);
size_t Curl_strlen_url(const char *url, bool relative);
void Curl_strcpy_url(char *output, const char *url, bool relative);
+
+#ifdef DEBUGBUILD
+CURLUcode Curl_parse_port(struct Curl_URL *u, char *hostname);
+#endif
+
#endif /* HEADER_CURL_URLAPI_INT_H */
diff --git a/lib/urlapi.c b/lib/urlapi.c
index 21942ebad..5cbda6a98 100644
--- a/lib/urlapi.c
+++ b/lib/urlapi.c
@@ -67,6 +67,12 @@ struct Curl_URL {
#define DEFAULT_SCHEME "https"
+#ifdef DEBUGBUILD
+#define UNITTEST
+#else
+#define UNITTEST static
+#endif
+
static void free_urlhandle(struct Curl_URL *u)
{
free(u->scheme);
@@ -488,7 +494,7 @@ static CURLUcode parse_hostname_login(struct Curl_URL *u,
return result;
}
-static CURLUcode parse_port(struct Curl_URL *u, char *hostname)
+UNITTEST CURLUcode Curl_parse_port(struct Curl_URL *u, char *hostname)
{
char *portptr = NULL;
char endbracket;
@@ -845,7 +851,7 @@ static CURLUcode seturl(const char *url, CURLU *u, unsigned int flags)
if(result)
return result;
- result = parse_port(u, hostname);
+ result = Curl_parse_port(u, hostname);
if(result)
return result;
diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc
index 7adebd3f9..5c202a3fe 100644
--- a/tests/data/Makefile.inc
+++ b/tests/data/Makefile.inc
@@ -184,7 +184,7 @@ test1590 \
test1600 test1601 test1602 test1603 test1604 test1605 test1606 test1607 \
test1608 test1609 test1620 \
\
-test1650 test1651 test1652 \
+test1650 test1651 test1652 test1653 \
\
test1700 test1701 test1702 \
\
diff --git a/tests/data/test1653 b/tests/data/test1653
new file mode 100644
index 000000000..0de2c14b5
--- /dev/null
+++ b/tests/data/test1653
@@ -0,0 +1,23 @@
+<testcase>
+<info>
+<keywords>
+unittest
+urlapi
+</keywords>
+</info>
+
+<client>
+<server>
+none
+</server>
+<features>
+unittest
+</features>
+<name>
+urlapi
+</name>
+<tool>
+unit1653
+</tool>
+</client>
+</testcase>
diff --git a/tests/unit/Makefile.inc b/tests/unit/Makefile.inc
index 2ba6b5ee5..8b1a6071a 100644
--- a/tests/unit/Makefile.inc
+++ b/tests/unit/Makefile.inc
@@ -11,7 +11,7 @@ UNITPROGS = unit1300 unit1301 unit1302 unit1303 unit1304 unit1305 unit1307 \
unit1399 \
unit1600 unit1601 unit1602 unit1603 unit1604 unit1605 unit1606 unit1607 \
unit1608 unit1609 unit1620 \
- unit1650 unit1651 unit1652
+ unit1650 unit1651 unit1652 unit1653
unit1300_SOURCES = unit1300.c $(UNITFILES)
unit1300_CPPFLAGS = $(AM_CPPFLAGS)
@@ -108,3 +108,6 @@ unit1651_CPPFLAGS = $(AM_CPPFLAGS)
unit1652_SOURCES = unit1652.c $(UNITFILES)
unit1652_CPPFLAGS = $(AM_CPPFLAGS)
+
+unit1653_SOURCES = unit1653.c $(UNITFILES)
+unit1653_CPPFLAGS = $(AM_CPPFLAGS)
diff --git a/tests/unit/unit1653.c b/tests/unit/unit1653.c
new file mode 100644
index 000000000..9851ee58c
--- /dev/null
+++ b/tests/unit/unit1653.c
@@ -0,0 +1,129 @@
+/***************************************************************************
+ * _ _ ____ _
+ * Project ___| | | | _ \| |
+ * / __| | | | |_) | |
+ * | (__| |_| | _ <| |___
+ * \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at https://curl.haxx.se/docs/copyright.html.
+ *
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ***************************************************************************/
+#include "curlcheck.h"
+
+#include "urldata.h"
+#include "curl/urlapi.h"
+#include "urlapi-int.h"
+
+
+static CURLU *u;
+
+static CURLcode
+unit_setup(void)
+{
+ return CURLE_OK;
+}
+
+static void
+unit_stop(void)
+{
+ curl_global_cleanup();
+}
+
+UNITTEST_START
+
+ CURLUcode ret;
+ char *ipv6port;
+ char *portnum;
+
+ /* Valid IPv6 */
+ u = curl_url();
+ ipv6port = strdup("[fe80::250:56ff:fea7:da15]");
+ ret = Curl_parse_port(u, ipv6port);
+ fail_unless(ret == CURLUE_OK, "Curl_parse_port returned error");
+ ret = curl_url_get(u, CURLUPART_PORT, &portnum, CURLU_NO_DEFAULT_PORT);
+ fail_unless(ret != CURLUE_OK, "curl_url_get portnum returned something");
+ free(ipv6port);
+ curl_url_cleanup(u);
+
+ /* Invalid IPv6 */
+ u = curl_url();
+ ipv6port = strdup("[fe80::250:56ff:fea7:da15|");
+ ret = Curl_parse_port(u, ipv6port);
+ fail_unless(ret != CURLUE_OK, "Curl_parse_port true on error");
+ free(ipv6port);
+ curl_url_cleanup(u);
+
+ u = curl_url();
+ ipv6port = strdup("[fe80::250:56ff;fea7:da15]:80");
+ ret = Curl_parse_port(u, ipv6port);
+ fail_unless(ret != CURLUE_OK, "Curl_parse_port true on error");
+ free(ipv6port);
+ curl_url_cleanup(u);
+
+ /* Valid IPv6 with zone index and port number */
+ u = curl_url();
+ ipv6port = strdup("[fe80::250:56ff:fea7:da15%25eth3]:80");
+ ret = Curl_parse_port(u, ipv6port);
+ fail_unless(ret == CURLUE_OK, "Curl_parse_port returned error");
+ ret = curl_url_get(u, CURLUPART_PORT, &portnum, 0);
+ fail_unless(ret == CURLUE_OK, "curl_url_get portnum returned error");
+ fail_unless(strcmp(portnum, "80") == 0, "Check portnumber");
+ curl_free(portnum);
+ free(ipv6port);
+ curl_url_cleanup(u);
+
+ /* Valid IPv6 with port number */
+ u = curl_url();
+ ipv6port = strdup("[fe80::250:56ff:fea7:da15]:81");
+ ret = Curl_parse_port(u, ipv6port);
+ fail_unless(ret == CURLUE_OK, "Curl_parse_port returned error");
+ ret = curl_url_get(u, CURLUPART_PORT, &portnum, 0);
+ fail_unless(ret == CURLUE_OK, "curl_url_get portnum returned error");
+ fail_unless(strcmp(portnum, "81") == 0, "Check portnumber");
+ curl_free(portnum);
+ free(ipv6port);
+ curl_url_cleanup(u);
+
+ /* Valid IPv6 with syntax error in the port number */
+ u = curl_url();
+ ipv6port = strdup("[fe80::250:56ff:fea7:da15];81");
+ ret = Curl_parse_port(u, ipv6port);
+ fail_unless(ret != CURLUE_OK, "Curl_parse_port true on error");
+ free(ipv6port);
+ curl_url_cleanup(u);
+
+ u = curl_url();
+ ipv6port = strdup("[fe80::250:56ff:fea7:da15]80");
+ ret = Curl_parse_port(u, ipv6port);
+ fail_unless(ret != CURLUE_OK, "Curl_parse_port true on error");
+ free(ipv6port);
+ curl_url_cleanup(u);
+
+ /* Incorrect zone index syntax */
+ u = curl_url();
+ ipv6port = strdup("[fe80::250:56ff:fea7:da15%!25eth3]:80");
+ ret = Curl_parse_port(u, ipv6port);
+ fail_unless(ret != CURLUE_OK, "Curl_parse_port returned non-error");
+ free(ipv6port);
+ curl_url_cleanup(u);
+
+ /* Non percent-encoded zone index */
+ u = curl_url();
+ ipv6port = strdup("[fe80::250:56ff:fea7:da15%eth3]:80");
+ ret = Curl_parse_port(u, ipv6port);
+ fail_unless(ret != CURLUE_OK, "Curl_parse_port returned non-error");
+ free(ipv6port);
+ curl_url_cleanup(u);
+
+UNITTEST_STOP
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 19:01:00 +0000