helper/test-urlmatch-normalization along with t0110-urlmatch-normalization test the `url_normalize()` function from 'urlmatch.h'. Migrate them to the unit testing framework for better performance. And also add different test_msg()s for better debugging. In the migration, last two of the checks from `t_url_general_escape()` were slightly changed compared to the shellscript. This involves changing '\'' -> ' '\!' -> ! in the urls of those checks. This is because in C strings, we don't need to escape "'" and "!". Other than these two, all the urls were pasted verbatim from the shellscript. Another change is the removal of MINGW prerequisite from one of the test. It was there because[1] on Windows, the command line is a Unicode string, it is not possible to pass arbitrary bytes to a program. But in unit tests we don't have this limitation. With the addition of this unit test, we impose a new restriction of running the unit tests from either 't/' or 't/unit-tests/bin/' directories. This is to construct the path to files which contain some input urls under the 't/t-urlmatch-normalization' directory. This restriction is similar to one we have for end-to-end tests, where they can be ran from only 't/'. Addition of 't/unit-tests/bin/' is to allow for running individual tests which is not currently possible via any 'make' targets and also 'unit-tests-test-tool' target is also ran from the 't/unit-tests/bin' directory. [1]: https://lore.kernel.org/git/53CAC8EF.6020707@xxxxxxxxx/ Mentored-by: Christian Couder <chriscool@xxxxxxxxxxxxx> Mentored-by: Kaartic Sivaraam <kaartic.sivaraam@xxxxxxxxx> Signed-off-by: Ghanshyam Thakkar <shyamthakkar001@xxxxxxxxx> --- Makefile | 2 +- t/helper/test-tool.c | 1 - t/helper/test-tool.h | 1 - t/helper/test-urlmatch-normalization.c | 56 ---- t/t0110-urlmatch-normalization.sh | 182 ----------- t/unit-tests/t-urlmatch-normalization.c | 294 ++++++++++++++++++ .../t-urlmatch-normalization}/README | 0 .../t-urlmatch-normalization}/url-1 | Bin .../t-urlmatch-normalization}/url-10 | Bin .../t-urlmatch-normalization}/url-11 | Bin .../t-urlmatch-normalization}/url-2 | Bin .../t-urlmatch-normalization}/url-3 | Bin .../t-urlmatch-normalization}/url-4 | Bin .../t-urlmatch-normalization}/url-5 | Bin .../t-urlmatch-normalization}/url-6 | Bin .../t-urlmatch-normalization}/url-7 | Bin .../t-urlmatch-normalization}/url-8 | Bin .../t-urlmatch-normalization}/url-9 | Bin 18 files changed, 295 insertions(+), 241 deletions(-) delete mode 100644 t/helper/test-urlmatch-normalization.c delete mode 100755 t/t0110-urlmatch-normalization.sh create mode 100644 t/unit-tests/t-urlmatch-normalization.c rename t/{t0110 => unit-tests/t-urlmatch-normalization}/README (100%) rename t/{t0110 => unit-tests/t-urlmatch-normalization}/url-1 (100%) rename t/{t0110 => unit-tests/t-urlmatch-normalization}/url-10 (100%) rename t/{t0110 => unit-tests/t-urlmatch-normalization}/url-11 (100%) rename t/{t0110 => unit-tests/t-urlmatch-normalization}/url-2 (100%) rename t/{t0110 => unit-tests/t-urlmatch-normalization}/url-3 (100%) rename t/{t0110 => unit-tests/t-urlmatch-normalization}/url-4 (100%) rename t/{t0110 => unit-tests/t-urlmatch-normalization}/url-5 (100%) rename t/{t0110 => unit-tests/t-urlmatch-normalization}/url-6 (100%) rename t/{t0110 => unit-tests/t-urlmatch-normalization}/url-7 (100%) rename t/{t0110 => unit-tests/t-urlmatch-normalization}/url-8 (100%) rename t/{t0110 => unit-tests/t-urlmatch-normalization}/url-9 (100%) diff --git a/Makefile b/Makefile index 3863e60b66..d7bc19e823 100644 --- a/Makefile +++ b/Makefile @@ -843,7 +843,6 @@ TEST_BUILTINS_OBJS += test-submodule.o TEST_BUILTINS_OBJS += test-subprocess.o TEST_BUILTINS_OBJS += test-trace2.o TEST_BUILTINS_OBJS += test-truncate.o -TEST_BUILTINS_OBJS += test-urlmatch-normalization.o TEST_BUILTINS_OBJS += test-userdiff.o TEST_BUILTINS_OBJS += test-wildmatch.o TEST_BUILTINS_OBJS += test-windows-named-pipe.o @@ -1346,6 +1345,7 @@ UNIT_TEST_PROGRAMS += t-strbuf UNIT_TEST_PROGRAMS += t-strcmp-offset UNIT_TEST_PROGRAMS += t-strvec UNIT_TEST_PROGRAMS += t-trailer +UNIT_TEST_PROGRAMS += t-urlmatch-normalization UNIT_TEST_PROGS = $(patsubst %,$(UNIT_TEST_BIN)/%$X,$(UNIT_TEST_PROGRAMS)) UNIT_TEST_OBJS = $(patsubst %,$(UNIT_TEST_DIR)/%.o,$(UNIT_TEST_PROGRAMS)) UNIT_TEST_OBJS += $(UNIT_TEST_DIR)/test-lib.o diff --git a/t/helper/test-tool.c b/t/helper/test-tool.c index da3e69128a..f8a67df7de 100644 --- a/t/helper/test-tool.c +++ b/t/helper/test-tool.c @@ -83,7 +83,6 @@ static struct test_cmd cmds[] = { { "trace2", cmd__trace2 }, { "truncate", cmd__truncate }, { "userdiff", cmd__userdiff }, - { "urlmatch-normalization", cmd__urlmatch_normalization }, { "xml-encode", cmd__xml_encode }, { "wildmatch", cmd__wildmatch }, #ifdef GIT_WINDOWS_NATIVE diff --git a/t/helper/test-tool.h b/t/helper/test-tool.h index 642a34578c..e74bc0ffd4 100644 --- a/t/helper/test-tool.h +++ b/t/helper/test-tool.h @@ -76,7 +76,6 @@ int cmd__subprocess(int argc, const char **argv); int cmd__trace2(int argc, const char **argv); int cmd__truncate(int argc, const char **argv); int cmd__userdiff(int argc, const char **argv); -int cmd__urlmatch_normalization(int argc, const char **argv); int cmd__xml_encode(int argc, const char **argv); int cmd__wildmatch(int argc, const char **argv); #ifdef GIT_WINDOWS_NATIVE diff --git a/t/helper/test-urlmatch-normalization.c b/t/helper/test-urlmatch-normalization.c deleted file mode 100644 index 86edd454f5..0000000000 --- a/t/helper/test-urlmatch-normalization.c +++ /dev/null @@ -1,56 +0,0 @@ -#include "test-tool.h" -#include "git-compat-util.h" -#include "urlmatch.h" - -int cmd__urlmatch_normalization(int argc, const char **argv) -{ - const char usage[] = "test-tool urlmatch-normalization [-p | -l] <url1> | <url1> <url2>"; - char *url1 = NULL, *url2 = NULL; - int opt_p = 0, opt_l = 0; - int ret = 0; - - /* - * For one url, succeed if url_normalize succeeds on it, fail otherwise. - * For two urls, succeed only if url_normalize succeeds on both and - * the results compare equal with strcmp. If -p is given (one url only) - * and url_normalize succeeds, print the result followed by "\n". If - * -l is given (one url only) and url_normalize succeeds, print the - * returned length in decimal followed by "\n". - */ - - if (argc > 1 && !strcmp(argv[1], "-p")) { - opt_p = 1; - argc--; - argv++; - } else if (argc > 1 && !strcmp(argv[1], "-l")) { - opt_l = 1; - argc--; - argv++; - } - - if (argc < 2 || argc > 3) - die("%s", usage); - - if (argc == 2) { - struct url_info info; - url1 = url_normalize(argv[1], &info); - if (!url1) - return 1; - if (opt_p) - printf("%s\n", url1); - if (opt_l) - printf("%u\n", (unsigned)info.url_len); - goto cleanup; - } - - if (opt_p || opt_l) - die("%s", usage); - - url1 = url_normalize(argv[1], NULL); - url2 = url_normalize(argv[2], NULL); - ret = (url1 && url2 && !strcmp(url1, url2)) ? 0 : 1; -cleanup: - free(url1); - free(url2); - return ret; -} diff --git a/t/t0110-urlmatch-normalization.sh b/t/t0110-urlmatch-normalization.sh deleted file mode 100755 index 12d817fbd3..0000000000 --- a/t/t0110-urlmatch-normalization.sh +++ /dev/null @@ -1,182 +0,0 @@ -#!/bin/sh - -test_description='urlmatch URL normalization' - -TEST_PASSES_SANITIZE_LEAK=true -. ./test-lib.sh - -# The base name of the test url files -tu="$TEST_DIRECTORY/t0110/url" - -# Note that only file: URLs should be allowed without a host - -test_expect_success 'url scheme' ' - ! test-tool urlmatch-normalization "" && - ! test-tool urlmatch-normalization "_" && - ! test-tool urlmatch-normalization "scheme" && - ! test-tool urlmatch-normalization "scheme:" && - ! test-tool urlmatch-normalization "scheme:/" && - ! test-tool urlmatch-normalization "scheme://" && - ! test-tool urlmatch-normalization "file" && - ! test-tool urlmatch-normalization "file:" && - ! test-tool urlmatch-normalization "file:/" && - test-tool urlmatch-normalization "file://" && - ! test-tool urlmatch-normalization "://acme.co" && - ! test-tool urlmatch-normalization "x_test://acme.co" && - ! test-tool urlmatch-normalization "-test://acme.co" && - ! test-tool urlmatch-normalization "0test://acme.co" && - ! test-tool urlmatch-normalization "+test://acme.co" && - ! test-tool urlmatch-normalization ".test://acme.co" && - ! test-tool urlmatch-normalization "schem%6e://" && - test-tool urlmatch-normalization "x-Test+v1.0://acme.co" && - test "$(test-tool urlmatch-normalization -p "AbCdeF://x.Y")" = "abcdef://x.y/" -' - -test_expect_success 'url authority' ' - ! test-tool urlmatch-normalization "scheme://user:pass@" && - ! test-tool urlmatch-normalization "scheme://?" && - ! test-tool urlmatch-normalization "scheme://#" && - ! test-tool urlmatch-normalization "scheme:///" && - ! test-tool urlmatch-normalization "scheme://:" && - ! test-tool urlmatch-normalization "scheme://:555" && - test-tool urlmatch-normalization "file://user:pass@" && - test-tool urlmatch-normalization "file://?" && - test-tool urlmatch-normalization "file://#" && - test-tool urlmatch-normalization "file:///" && - test-tool urlmatch-normalization "file://:" && - ! test-tool urlmatch-normalization "file://:555" && - test-tool urlmatch-normalization "scheme://user:pass@host" && - test-tool urlmatch-normalization "scheme://@host" && - test-tool urlmatch-normalization "scheme://%00@host" && - ! test-tool urlmatch-normalization "scheme://%%@host" && - test-tool urlmatch-normalization "scheme://host_" && - test-tool urlmatch-normalization "scheme://user:pass@host/" && - test-tool urlmatch-normalization "scheme://@host/" && - test-tool urlmatch-normalization "scheme://host/" && - test-tool urlmatch-normalization "scheme://host?x" && - test-tool urlmatch-normalization "scheme://host#x" && - test-tool urlmatch-normalization "scheme://host/@" && - test-tool urlmatch-normalization "scheme://host?@x" && - test-tool urlmatch-normalization "scheme://host#@x" && - test-tool urlmatch-normalization "scheme://[::1]" && - test-tool urlmatch-normalization "scheme://[::1]/" && - ! test-tool urlmatch-normalization "scheme://hos%41/" && - test-tool urlmatch-normalization "scheme://[invalid....:/" && - test-tool urlmatch-normalization "scheme://invalid....:]/" && - ! test-tool urlmatch-normalization "scheme://invalid....:[/" && - ! test-tool urlmatch-normalization "scheme://invalid....:[" -' - -test_expect_success 'url port checks' ' - test-tool urlmatch-normalization "xyz://q@xxxxxxxxx:" && - test-tool urlmatch-normalization "xyz://q@xxxxxxxxx:456/" && - ! test-tool urlmatch-normalization "xyz://q@xxxxxxxxx:0" && - ! test-tool urlmatch-normalization "xyz://q@xxxxxxxxx:0000000" && - test-tool urlmatch-normalization "xyz://q@xxxxxxxxx:0000001?" && - test-tool urlmatch-normalization "xyz://q@xxxxxxxxx:065535#" && - test-tool urlmatch-normalization "xyz://q@xxxxxxxxx:65535" && - ! test-tool urlmatch-normalization "xyz://q@xxxxxxxxx:65536" && - ! test-tool urlmatch-normalization "xyz://q@xxxxxxxxx:99999" && - ! test-tool urlmatch-normalization "xyz://q@xxxxxxxxx:100000" && - ! test-tool urlmatch-normalization "xyz://q@xxxxxxxxx:100001" && - test-tool urlmatch-normalization "http://q@xxxxxxxxx:80"; && - test-tool urlmatch-normalization "https://q@xxxxxxxxx:443"; && - test-tool urlmatch-normalization "http://q@xxxxxxxxx:80/"; && - test-tool urlmatch-normalization "https://q@xxxxxxxxx:443?"; && - ! test-tool urlmatch-normalization "http://q@:8008"; && - ! test-tool urlmatch-normalization "http://:8080"; && - ! test-tool urlmatch-normalization "http://:"; && - test-tool urlmatch-normalization "xyz://q@xxxxxxxxx:456/" && - test-tool urlmatch-normalization "xyz://[::1]:456/" && - test-tool urlmatch-normalization "xyz://[::1]:/" && - ! test-tool urlmatch-normalization "xyz://[::1]:000/" && - ! test-tool urlmatch-normalization "xyz://[::1]:0%300/" && - ! test-tool urlmatch-normalization "xyz://[::1]:0x80/" && - ! test-tool urlmatch-normalization "xyz://[::1]:4294967297/" && - ! test-tool urlmatch-normalization "xyz://[::1]:030f/" -' - -test_expect_success 'url port normalization' ' - test "$(test-tool urlmatch-normalization -p "http://x:800";)" = "http://x:800/"; && - test "$(test-tool urlmatch-normalization -p "http://x:0800";)" = "http://x:800/"; && - test "$(test-tool urlmatch-normalization -p "http://x:00000800";)" = "http://x:800/"; && - test "$(test-tool urlmatch-normalization -p "http://x:065535";)" = "http://x:65535/"; && - test "$(test-tool urlmatch-normalization -p "http://x:1";)" = "http://x:1/"; && - test "$(test-tool urlmatch-normalization -p "http://x:80";)" = "http://x/"; && - test "$(test-tool urlmatch-normalization -p "http://x:080";)" = "http://x/"; && - test "$(test-tool urlmatch-normalization -p "http://x:000000080";)" = "http://x/"; && - test "$(test-tool urlmatch-normalization -p "https://x:443";)" = "https://x/"; && - test "$(test-tool urlmatch-normalization -p "https://x:0443";)" = "https://x/"; && - test "$(test-tool urlmatch-normalization -p "https://x:000000443";)" = "https://x/"; -' - -test_expect_success 'url general escapes' ' - ! test-tool urlmatch-normalization "http://x.y?%fg"; && - test "$(test-tool urlmatch-normalization -p "X://W/%7e%41^%3a")" = "x://w/~A%5E%3A" && - test "$(test-tool urlmatch-normalization -p "X://W/:/?#[]@")" = "x://w/:/?#[]@" && - test "$(test-tool urlmatch-normalization -p "X://W/$&()*+,;=")" = "x://w/$&()*+,;=" && - test "$(test-tool urlmatch-normalization -p "X://W/'\''")" = "x://w/'\''" && - test "$(test-tool urlmatch-normalization -p "X://W?'\!'")" = "x://w/?'\!'" -' - -test_expect_success !MINGW 'url high-bit escapes' ' - test "$(test-tool urlmatch-normalization -p "$(cat "$tu-1")")" = "x://q/%01%02%03%04%05%06%07%08%0E%0F%10%11%12" && - test "$(test-tool urlmatch-normalization -p "$(cat "$tu-2")")" = "x://q/%13%14%15%16%17%18%19%1B%1C%1D%1E%1F%7F" && - test "$(test-tool urlmatch-normalization -p "$(cat "$tu-3")")" = "x://q/%80%81%82%83%84%85%86%87%88%89%8A%8B%8C%8D%8E%8F" && - test "$(test-tool urlmatch-normalization -p "$(cat "$tu-4")")" = "x://q/%90%91%92%93%94%95%96%97%98%99%9A%9B%9C%9D%9E%9F" && - test "$(test-tool urlmatch-normalization -p "$(cat "$tu-5")")" = "x://q/%A0%A1%A2%A3%A4%A5%A6%A7%A8%A9%AA%AB%AC%AD%AE%AF" && - test "$(test-tool urlmatch-normalization -p "$(cat "$tu-6")")" = "x://q/%B0%B1%B2%B3%B4%B5%B6%B7%B8%B9%BA%BB%BC%BD%BE%BF" && - test "$(test-tool urlmatch-normalization -p "$(cat "$tu-7")")" = "x://q/%C0%C1%C2%C3%C4%C5%C6%C7%C8%C9%CA%CB%CC%CD%CE%CF" && - test "$(test-tool urlmatch-normalization -p "$(cat "$tu-8")")" = "x://q/%D0%D1%D2%D3%D4%D5%D6%D7%D8%D9%DA%DB%DC%DD%DE%DF" && - test "$(test-tool urlmatch-normalization -p "$(cat "$tu-9")")" = "x://q/%E0%E1%E2%E3%E4%E5%E6%E7%E8%E9%EA%EB%EC%ED%EE%EF" && - test "$(test-tool urlmatch-normalization -p "$(cat "$tu-10")")" = "x://q/%F0%F1%F2%F3%F4%F5%F6%F7%F8%F9%FA%FB%FC%FD%FE%FF" -' - -test_expect_success 'url utf-8 escapes' ' - test "$(test-tool urlmatch-normalization -p "$(cat "$tu-11")")" = "x://q/%C2%80%DF%BF%E0%A0%80%EF%BF%BD%F0%90%80%80%F0%AF%BF%BD" -' - -test_expect_success 'url username/password escapes' ' - test "$(test-tool urlmatch-normalization -p "x://%41%62(^):%70+d@foo")" = "x://Ab(%5E):p+d@foo/" -' - -test_expect_success 'url normalized lengths' ' - test "$(test-tool urlmatch-normalization -l "Http://%4d%65:%4d^%70@xxxxxxxx")" = 25 && - test "$(test-tool urlmatch-normalization -l "http://%41:%42@x.y/%61/";)" = 17 && - test "$(test-tool urlmatch-normalization -l "http://@x.y/^";)" = 15 -' - -test_expect_success 'url . and .. segments' ' - test "$(test-tool urlmatch-normalization -p "x://y/.")" = "x://y/" && - test "$(test-tool urlmatch-normalization -p "x://y/./")" = "x://y/" && - test "$(test-tool urlmatch-normalization -p "x://y/a/.")" = "x://y/a" && - test "$(test-tool urlmatch-normalization -p "x://y/a/./")" = "x://y/a/" && - test "$(test-tool urlmatch-normalization -p "x://y/.?")" = "x://y/?" && - test "$(test-tool urlmatch-normalization -p "x://y/./?")" = "x://y/?" && - test "$(test-tool urlmatch-normalization -p "x://y/a/.?")" = "x://y/a?" && - test "$(test-tool urlmatch-normalization -p "x://y/a/./?")" = "x://y/a/?" && - test "$(test-tool urlmatch-normalization -p "x://y/a/./b/.././../c")" = "x://y/c" && - test "$(test-tool urlmatch-normalization -p "x://y/a/./b/../.././c/")" = "x://y/c/" && - test "$(test-tool urlmatch-normalization -p "x://y/a/./b/.././../c/././.././.")" = "x://y/" && - ! test-tool urlmatch-normalization "x://y/a/./b/.././../c/././.././.." && - test "$(test-tool urlmatch-normalization -p "x://y/a/./?/././..")" = "x://y/a/?/././.." && - test "$(test-tool urlmatch-normalization -p "x://y/%2e/")" = "x://y/" && - test "$(test-tool urlmatch-normalization -p "x://y/%2E/")" = "x://y/" && - test "$(test-tool urlmatch-normalization -p "x://y/a/%2e./")" = "x://y/" && - test "$(test-tool urlmatch-normalization -p "x://y/b/.%2E/")" = "x://y/" && - test "$(test-tool urlmatch-normalization -p "x://y/c/%2e%2E/")" = "x://y/" -' - -# http://@foo specifies an empty user name but does not specify a password -# http://foo specifies neither a user name nor a password -# So they should not be equivalent -test_expect_success 'url equivalents' ' - test-tool urlmatch-normalization "httP://x" "Http://X/" && - test-tool urlmatch-normalization "Http://%4d%65:%4d^%70@xxxxxxxx" "hTTP://Me:%4D^p@xxxxxxxx:80/" && - ! test-tool urlmatch-normalization "https://@x.y/^"; "httpS://x.y:443/^" && - test-tool urlmatch-normalization "https://@x.y/^"; "httpS://@x.y:0443/^" && - test-tool urlmatch-normalization "https://@x.y/^/../abc"; "httpS://@x.y:0443/abc" && - test-tool urlmatch-normalization "https://@x.y/^/.."; "httpS://@x.y:0443/" -' - -test_done diff --git a/t/unit-tests/t-urlmatch-normalization.c b/t/unit-tests/t-urlmatch-normalization.c new file mode 100644 index 0000000000..e0dd50dc11 --- /dev/null +++ b/t/unit-tests/t-urlmatch-normalization.c @@ -0,0 +1,294 @@ +#include "test-lib.h" +#include "urlmatch.h" +#include "strbuf.h" + +static void check_url_normalizable(const char *url, int normalizable) +{ + char *url_norm = url_normalize(url, NULL); + + if (!check_int(normalizable, ==, url_norm ? 1 : 0)) + test_msg("input url: %s", url); + free(url_norm); +} + +static void check_normalized_url(const char *url, const char *expect) +{ + char *url_norm = url_normalize(url, NULL); + + if (!check_str(url_norm, expect)) + test_msg("input url: %s", url); + free(url_norm); +} + +static void compare_normalized_urls(const char *url1, const char *url2, + size_t equal) +{ + char *url1_norm = url_normalize(url1, NULL); + char *url2_norm = url_normalize(url2, NULL); + + if (equal) { + if (!check_str(url1_norm, url2_norm)) + test_msg("input url1: %s\n input url2: %s", url1, + url2); + } else if (!check_int(strcmp(url1_norm, url2_norm), !=, 0)) { + test_msg(" url1_norm: %s\n url2_norm: %s\n" + " input url1: %s\n input url2: %s", + url1_norm, url2_norm, url1, url2); + } + free(url1_norm); + free(url2_norm); +} + +static void check_normalized_url_from_file(const char *file, const char *expect) +{ + struct strbuf content = STRBUF_INIT, path = STRBUF_INIT; + char *cwd_basename; + + if (!check_int(strbuf_getcwd(&path), ==, 0)) + return; + + cwd_basename = basename(path.buf); + if (!check(!strcmp(cwd_basename, "t") || !strcmp(cwd_basename, "bin"))) { + test_msg("BUG: unit-tests should be run from either 't/' or 't/unit-tests/bin' directory"); + return; + } + + strbuf_strip_suffix(&path, "/unit-tests/bin"); + strbuf_addf(&path, "/unit-tests/t-urlmatch-normalization/%s", file); + + if (!check_int(strbuf_read_file(&content, path.buf, 0), >, 0)) { + test_msg("failed to read from file '%s': %s", file, strerror(errno)); + } else { + char *url_norm; + + strbuf_trim_trailing_newline(&content); + url_norm = url_normalize(content.buf, NULL); + if (!check_str(url_norm, expect)) + test_msg("input file: %s", file); + free(url_norm); + } + + strbuf_release(&content); + strbuf_release(&path); +} + +static void check_normalized_url_length(const char *url, size_t len) +{ + struct url_info info; + char *url_norm = url_normalize(url, &info); + + if (!check_int(info.url_len, ==, len)) + test_msg(" input url: %s\n normalized url: %s", url, + url_norm); + free(url_norm); +} + +/* Note that only file: URLs should be allowed without a host */ +static void t_url_scheme(void) +{ + check_url_normalizable("", 0); + check_url_normalizable("_", 0); + check_url_normalizable("scheme", 0); + check_url_normalizable("scheme:", 0); + check_url_normalizable("scheme:/", 0); + check_url_normalizable("scheme://", 0); + check_url_normalizable("file", 0); + check_url_normalizable("file:", 0); + check_url_normalizable("file:/", 0); + check_url_normalizable("file://", 1); + check_url_normalizable("://acme.co", 0); + check_url_normalizable("x_test://acme.co", 0); + check_url_normalizable("-test://acme.co", 0); + check_url_normalizable("0test://acme.co", 0); + check_url_normalizable("+test://acme.co", 0); + check_url_normalizable(".test://acme.co", 0); + check_url_normalizable("schem%6e://", 0); + check_url_normalizable("x-Test+v1.0://acme.co", 1); + check_normalized_url("AbCdeF://x.Y", "abcdef://x.y/"); +} + +static void t_url_authority(void) +{ + check_url_normalizable("scheme://user:pass@", 0); + check_url_normalizable("scheme://?", 0); + check_url_normalizable("scheme://#", 0); + check_url_normalizable("scheme:///", 0); + check_url_normalizable("scheme://:", 0); + check_url_normalizable("scheme://:555", 0); + check_url_normalizable("file://user:pass@", 1); + check_url_normalizable("file://?", 1); + check_url_normalizable("file://#", 1); + check_url_normalizable("file:///", 1); + check_url_normalizable("file://:", 1); + check_url_normalizable("file://:555", 0); + check_url_normalizable("scheme://user:pass@host", 1); + check_url_normalizable("scheme://@host", 1); + check_url_normalizable("scheme://%00@host", 1); + check_url_normalizable("scheme://%%@host", 0); + check_url_normalizable("scheme://host_", 1); + check_url_normalizable("scheme://user:pass@host/", 1); + check_url_normalizable("scheme://@host/", 1); + check_url_normalizable("scheme://host/", 1); + check_url_normalizable("scheme://host?x", 1); + check_url_normalizable("scheme://host#x", 1); + check_url_normalizable("scheme://host/@", 1); + check_url_normalizable("scheme://host?@x", 1); + check_url_normalizable("scheme://host#@x", 1); + check_url_normalizable("scheme://[::1]", 1); + check_url_normalizable("scheme://[::1]/", 1); + check_url_normalizable("scheme://hos%41/", 0); + check_url_normalizable("scheme://[invalid....:/", 1); + check_url_normalizable("scheme://invalid....:]/", 1); + check_url_normalizable("scheme://invalid....:[/", 0); + check_url_normalizable("scheme://invalid....:[", 0); +} + +static void t_url_port(void) +{ + check_url_normalizable("xyz://q@xxxxxxxxx:", 1); + check_url_normalizable("xyz://q@xxxxxxxxx:456/", 1); + check_url_normalizable("xyz://q@xxxxxxxxx:0", 0); + check_url_normalizable("xyz://q@xxxxxxxxx:0000000", 0); + check_url_normalizable("xyz://q@xxxxxxxxx:0000001?", 1); + check_url_normalizable("xyz://q@xxxxxxxxx:065535#", 1); + check_url_normalizable("xyz://q@xxxxxxxxx:65535", 1); + check_url_normalizable("xyz://q@xxxxxxxxx:65536", 0); + check_url_normalizable("xyz://q@xxxxxxxxx:99999", 0); + check_url_normalizable("xyz://q@xxxxxxxxx:100000", 0); + check_url_normalizable("xyz://q@xxxxxxxxx:100001", 0); + check_url_normalizable("http://q@xxxxxxxxx:80";, 1); + check_url_normalizable("https://q@xxxxxxxxx:443";, 1); + check_url_normalizable("http://q@xxxxxxxxx:80/";, 1); + check_url_normalizable("https://q@xxxxxxxxx:443?";, 1); + check_url_normalizable("http://q@:8008";, 0); + check_url_normalizable("http://:8080";, 0); + check_url_normalizable("http://:";, 0); + check_url_normalizable("xyz://q@xxxxxxxxx:456/", 1); + check_url_normalizable("xyz://[::1]:456/", 1); + check_url_normalizable("xyz://[::1]:/", 1); + check_url_normalizable("xyz://[::1]:000/", 0); + check_url_normalizable("xyz://[::1]:0%300/", 0); + check_url_normalizable("xyz://[::1]:0x80/", 0); + check_url_normalizable("xyz://[::1]:4294967297/", 0); + check_url_normalizable("xyz://[::1]:030f/", 0); +} + +static void t_url_port_normalization(void) +{ + check_normalized_url("http://x:800";, "http://x:800/";); + check_normalized_url("http://x:0800";, "http://x:800/";); + check_normalized_url("http://x:00000800";, "http://x:800/";); + check_normalized_url("http://x:065535";, "http://x:65535/";); + check_normalized_url("http://x:1";, "http://x:1/";); + check_normalized_url("http://x:80";, "http://x/";); + check_normalized_url("http://x:080";, "http://x/";); + check_normalized_url("http://x:000000080";, "http://x/";); + check_normalized_url("https://x:443";, "https://x/";); + check_normalized_url("https://x:0443";, "https://x/";); + check_normalized_url("https://x:000000443";, "https://x/";); +} + +static void t_url_general_escape(void) +{ + check_url_normalizable("http://x.y?%fg";, 0); + check_normalized_url("X://W/%7e%41^%3a", "x://w/~A%5E%3A"); + check_normalized_url("X://W/:/?#[]@", "x://w/:/?#[]@"); + check_normalized_url("X://W/$&()*+,;=", "x://w/$&()*+,;="); + check_normalized_url("X://W/'", "x://w/'"); + check_normalized_url("X://W?!", "x://w/?!"); +} + +static void t_url_high_bit(void) +{ + check_normalized_url_from_file("url-1", + "x://q/%01%02%03%04%05%06%07%08%0E%0F%10%11%12"); + check_normalized_url_from_file("url-2", + "x://q/%13%14%15%16%17%18%19%1B%1C%1D%1E%1F%7F"); + check_normalized_url_from_file("url-3", + "x://q/%80%81%82%83%84%85%86%87%88%89%8A%8B%8C%8D%8E%8F"); + check_normalized_url_from_file("url-4", + "x://q/%90%91%92%93%94%95%96%97%98%99%9A%9B%9C%9D%9E%9F"); + check_normalized_url_from_file("url-5", + "x://q/%A0%A1%A2%A3%A4%A5%A6%A7%A8%A9%AA%AB%AC%AD%AE%AF"); + check_normalized_url_from_file("url-6", + "x://q/%B0%B1%B2%B3%B4%B5%B6%B7%B8%B9%BA%BB%BC%BD%BE%BF"); + check_normalized_url_from_file("url-7", + "x://q/%C0%C1%C2%C3%C4%C5%C6%C7%C8%C9%CA%CB%CC%CD%CE%CF"); + check_normalized_url_from_file("url-8", + "x://q/%D0%D1%D2%D3%D4%D5%D6%D7%D8%D9%DA%DB%DC%DD%DE%DF"); + check_normalized_url_from_file("url-9", + "x://q/%E0%E1%E2%E3%E4%E5%E6%E7%E8%E9%EA%EB%EC%ED%EE%EF"); + check_normalized_url_from_file("url-10", + "x://q/%F0%F1%F2%F3%F4%F5%F6%F7%F8%F9%FA%FB%FC%FD%FE%FF"); +} + +static void t_url_utf8_escape(void) +{ + check_normalized_url_from_file("url-11", + "x://q/%C2%80%DF%BF%E0%A0%80%EF%BF%BD%F0%90%80%80%F0%AF%BF%BD"); +} + +static void t_url_username_pass(void) +{ + check_normalized_url("x://%41%62(^):%70+d@foo", "x://Ab(%5E):p+d@foo/"); +} + +static void t_url_length(void) +{ + check_normalized_url_length("Http://%4d%65:%4d^%70@xxxxxxxx", 25); + check_normalized_url_length("http://%41:%42@x.y/%61/";, 17); + check_normalized_url_length("http://@x.y/^";, 15); +} + +static void t_url_dots(void) +{ + check_normalized_url("x://y/.", "x://y/"); + check_normalized_url("x://y/./", "x://y/"); + check_normalized_url("x://y/a/.", "x://y/a"); + check_normalized_url("x://y/a/./", "x://y/a/"); + check_normalized_url("x://y/.?", "x://y/?"); + check_normalized_url("x://y/./?", "x://y/?"); + check_normalized_url("x://y/a/.?", "x://y/a?"); + check_normalized_url("x://y/a/./?", "x://y/a/?"); + check_normalized_url("x://y/a/./b/.././../c", "x://y/c"); + check_normalized_url("x://y/a/./b/../.././c/", "x://y/c/"); + check_normalized_url("x://y/a/./b/.././../c/././.././.", "x://y/"); + check_url_normalizable("x://y/a/./b/.././../c/././.././..", 0); + check_normalized_url("x://y/a/./?/././..", "x://y/a/?/././.."); + check_normalized_url("x://y/%2e/", "x://y/"); + check_normalized_url("x://y/%2E/", "x://y/"); + check_normalized_url("x://y/a/%2e./", "x://y/"); + check_normalized_url("x://y/b/.%2E/", "x://y/"); + check_normalized_url("x://y/c/%2e%2E/", "x://y/"); +} + +/* + * http://@foo specifies an empty user name but does not specify a password + * http://foo specifies neither a user name nor a password + * So they should not be equivalent + */ +static void t_url_equivalents(void) +{ + compare_normalized_urls("httP://x", "Http://X/", 1); + compare_normalized_urls("Http://%4d%65:%4d^%70@xxxxxxxx", "hTTP://Me:%4D^p@xxxxxxxx:80/", 1); + compare_normalized_urls("https://@x.y/^";, "httpS://x.y:443/^", 0); + compare_normalized_urls("https://@x.y/^";, "httpS://@x.y:0443/^", 1); + compare_normalized_urls("https://@x.y/^/../abc";, "httpS://@x.y:0443/abc", 1); + compare_normalized_urls("https://@x.y/^/..";, "httpS://@x.y:0443/", 1); +} + +int cmd_main(int argc UNUSED, const char **argv UNUSED) +{ + TEST(t_url_scheme(), "url scheme"); + TEST(t_url_authority(), "url authority"); + TEST(t_url_port(), "url port checks"); + TEST(t_url_port_normalization(), "url port normalization"); + TEST(t_url_general_escape(), "url general escapes"); + TEST(t_url_high_bit(), "url high-bit escapes"); + TEST(t_url_utf8_escape(), "url utf8 escapes"); + TEST(t_url_username_pass(), "url username/password escapes"); + TEST(t_url_length(), "url normalized lengths"); + TEST(t_url_dots(), "url . and .. segments"); + TEST(t_url_equivalents(), "url equivalents"); + return test_done(); +} diff --git a/t/t0110/README b/t/unit-tests/t-urlmatch-normalization/README similarity index 100% rename from t/t0110/README rename to t/unit-tests/t-urlmatch-normalization/README diff --git a/t/t0110/url-1 b/t/unit-tests/t-urlmatch-normalization/url-1 similarity index 100% rename from t/t0110/url-1 rename to t/unit-tests/t-urlmatch-normalization/url-1 diff --git a/t/t0110/url-10 b/t/unit-tests/t-urlmatch-normalization/url-10 similarity index 100% rename from t/t0110/url-10 rename to t/unit-tests/t-urlmatch-normalization/url-10 diff --git a/t/t0110/url-11 b/t/unit-tests/t-urlmatch-normalization/url-11 similarity index 100% rename from t/t0110/url-11 rename to t/unit-tests/t-urlmatch-normalization/url-11 diff --git a/t/t0110/url-2 b/t/unit-tests/t-urlmatch-normalization/url-2 similarity index 100% rename from t/t0110/url-2 rename to t/unit-tests/t-urlmatch-normalization/url-2 diff --git a/t/t0110/url-3 b/t/unit-tests/t-urlmatch-normalization/url-3 similarity index 100% rename from t/t0110/url-3 rename to t/unit-tests/t-urlmatch-normalization/url-3 diff --git a/t/t0110/url-4 b/t/unit-tests/t-urlmatch-normalization/url-4 similarity index 100% rename from t/t0110/url-4 rename to t/unit-tests/t-urlmatch-normalization/url-4 diff --git a/t/t0110/url-5 b/t/unit-tests/t-urlmatch-normalization/url-5 similarity index 100% rename from t/t0110/url-5 rename to t/unit-tests/t-urlmatch-normalization/url-5 diff --git a/t/t0110/url-6 b/t/unit-tests/t-urlmatch-normalization/url-6 similarity index 100% rename from t/t0110/url-6 rename to t/unit-tests/t-urlmatch-normalization/url-6 diff --git a/t/t0110/url-7 b/t/unit-tests/t-urlmatch-normalization/url-7 similarity index 100% rename from t/t0110/url-7 rename to t/unit-tests/t-urlmatch-normalization/url-7 diff --git a/t/t0110/url-8 b/t/unit-tests/t-urlmatch-normalization/url-8 similarity index 100% rename from t/t0110/url-8 rename to t/unit-tests/t-urlmatch-normalization/url-8 diff --git a/t/t0110/url-9 b/t/unit-tests/t-urlmatch-normalization/url-9 similarity index 100% rename from t/t0110/url-9 rename to t/unit-tests/t-urlmatch-normalization/url-9 Range-diff against v1: 1: 6a44d676cd ! 1: 3f4e4be1a6 t: migrate helper/test-urlmatch-normalization to unit tests @@ Commit message string, it is not possible to pass arbitrary bytes to a program. But in unit tests we don't have this limitation. + With the addition of this unit test, we impose a new restriction of + running the unit tests from either 't/' or 't/unit-tests/bin/' + directories. This is to construct the path to files which contain some + input urls under the 't/t-urlmatch-normalization' directory. This + restriction is similar to one we have for end-to-end tests, where they + can be ran from only 't/'. Addition of 't/unit-tests/bin/' is to allow + for running individual tests which is not currently possible via any + 'make' targets and also 'unit-tests-test-tool' target is also ran from + the 't/unit-tests/bin' directory. + [1]: https://lore.kernel.org/git/53CAC8EF.6020707@xxxxxxxxx/ Mentored-by: Christian Couder <chriscool@xxxxxxxxxxxxx> @@ t/unit-tests/t-urlmatch-normalization.c (new) + if (!check_str(url1_norm, url2_norm)) + test_msg("input url1: %s\n input url2: %s", url1, + url2); -+ } else if (!check_int(strcmp(url1_norm, url2_norm), !=, 0)) ++ } else if (!check_int(strcmp(url1_norm, url2_norm), !=, 0)) { + test_msg(" url1_norm: %s\n url2_norm: %s\n" + " input url1: %s\n input url2: %s", + url1_norm, url2_norm, url1, url2); ++ } + free(url1_norm); + free(url2_norm); +} @@ t/unit-tests/t-urlmatch-normalization.c (new) +static void check_normalized_url_from_file(const char *file, const char *expect) +{ + struct strbuf content = STRBUF_INIT, path = STRBUF_INIT; ++ char *cwd_basename; ++ ++ if (!check_int(strbuf_getcwd(&path), ==, 0)) ++ return; ++ ++ cwd_basename = basename(path.buf); ++ if (!check(!strcmp(cwd_basename, "t") || !strcmp(cwd_basename, "bin"))) { ++ test_msg("BUG: unit-tests should be run from either 't/' or 't/unit-tests/bin' directory"); ++ return; ++ } + -+ strbuf_getcwd(&path); -+ strbuf_strip_suffix(&path, "/unit-tests/bin"); /* because 'unit-tests-test-tool' is run from 'bin' directory */ ++ strbuf_strip_suffix(&path, "/unit-tests/bin"); + strbuf_addf(&path, "/unit-tests/t-urlmatch-normalization/%s", file); + + if (!check_int(strbuf_read_file(&content, path.buf, 0), >, 0)) { -- 2.46.0
