From: "Kyle J. McKay" <mackyle@xxxxxxxxx> Use the urlmatch_config_entry() to wrap the underlying http_options() two-level variable parser in order to set http.<variable> to the value with the most specific URL in the configuration. Signed-off-by: Kyle J. McKay <mackyle@xxxxxxxxx> Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx> --- .gitignore | 1 + Documentation/config.txt | 44 +++++++++++ Makefile | 7 ++ http.c | 13 +++- t/.gitattributes | 1 + t/t5200-url-normalize.sh | 199 +++++++++++++++++++++++++++++++++++++++++++++++ t/t5200/README | Bin 0 -> 644 bytes t/t5200/config-1 | Bin 0 -> 180 bytes t/t5200/config-2 | Bin 0 -> 80 bytes t/t5200/config-3 | Bin 0 -> 118 bytes t/t5200/url-1 | Bin 0 -> 20 bytes t/t5200/url-10 | Bin 0 -> 23 bytes t/t5200/url-11 | Bin 0 -> 25 bytes t/t5200/url-2 | Bin 0 -> 20 bytes t/t5200/url-3 | Bin 0 -> 23 bytes t/t5200/url-4 | Bin 0 -> 23 bytes t/t5200/url-5 | Bin 0 -> 23 bytes t/t5200/url-6 | Bin 0 -> 23 bytes t/t5200/url-7 | Bin 0 -> 23 bytes t/t5200/url-8 | Bin 0 -> 23 bytes t/t5200/url-9 | Bin 0 -> 23 bytes test-url-normalize.c | 137 ++++++++++++++++++++++++++++++++ 22 files changed, 401 insertions(+), 1 deletion(-) create mode 100755 t/t5200-url-normalize.sh create mode 100644 t/t5200/README create mode 100644 t/t5200/config-1 create mode 100644 t/t5200/config-2 create mode 100644 t/t5200/config-3 create mode 100644 t/t5200/url-1 create mode 100644 t/t5200/url-10 create mode 100644 t/t5200/url-11 create mode 100644 t/t5200/url-2 create mode 100644 t/t5200/url-3 create mode 100644 t/t5200/url-4 create mode 100644 t/t5200/url-5 create mode 100644 t/t5200/url-6 create mode 100644 t/t5200/url-7 create mode 100644 t/t5200/url-8 create mode 100644 t/t5200/url-9 create mode 100644 test-url-normalize.c diff --git a/.gitignore b/.gitignore index 6669bf0..cd97e16 100644 --- a/.gitignore +++ b/.gitignore @@ -198,6 +198,7 @@ /test-string-list /test-subprocess /test-svn-fe +/test-url-normalize /test-wildmatch /common-cmds.h *.tar.gz diff --git a/Documentation/config.txt b/Documentation/config.txt index 6e53fc5..60c140f 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1513,6 +1513,50 @@ http.useragent:: of common USER_AGENT strings (but not including those like git/1.7.1). Can be overridden by the 'GIT_HTTP_USER_AGENT' environment variable. +http.<url>.*:: + Any of the http.* options above can be applied selectively to some urls. + For a config key to match a URL, each element of the config key is + compared to that of the URL, in the following order: ++ +-- +. Scheme (e.g., `https` in `https://example.com/`). This field + must match exactly between the config key and the URL. + +. Host/domain name (e.g., `example.com` in `https://example.com/`). + This field must match exactly between the config key and the URL. + +. Port number (e.g., `8080` in `http://example.com:8080/`). + This field must match exactly between the config key and the URL. + Omitted port numbers are automatically converted to the correct + default for the scheme before matching. + +. Path (e.g., `repo.git` in `https://example.com/repo.git`). The + path field of the config key must match the path field of the URL + either exactly or as a prefix of slash-delimited path elements. This means + a config key with path `foo/` matches URL path `foo/bar`. A prefix can only + match on a slash (`/`) boundary. Longer matches take precedence (so a config + key with path `foo/bar` is a better match to URL path `foo/bar` than a config + key with just path `foo/`). + +. User name (e.g., `user` in `https://user@xxxxxxxxxxx/repo.git`). If + the config key has a user name it must match the user name in the + URL exactly. If the config key does not have a user name, that + config key will match a URL with any user name (including none). +-- ++ +The list above is ordered by decreasing precedence; a URL that matches +a config key's path is preferred to one that matches its user name. For example, +if the URL is `https://user@xxxxxxxxxxx/foo/bar` a config key match of +`https://example.com/foo` will be preferred over a config key match of +`https://user@xxxxxxxxxxx`. ++ +All URLs are normalized before attempting any matching (the password part, +if embedded in the URL, is always ignored for matching purposes) so that +equivalent urls that are simply spelled differently will match properly. +Environment variable settings always override any matches. The urls that are +matched against are those given directly to Git commands. This means any URLs +visited as a result of a redirection do not participate in matching. + i18n.commitEncoding:: Character encoding the commit messages are stored in; Git itself does not care per se, but this information is necessary e.g. when diff --git a/Makefile b/Makefile index 0f931a2..ea3edba 100644 --- a/Makefile +++ b/Makefile @@ -567,6 +567,7 @@ TEST_PROGRAMS_NEED_X += test-sigchain TEST_PROGRAMS_NEED_X += test-string-list TEST_PROGRAMS_NEED_X += test-subprocess TEST_PROGRAMS_NEED_X += test-svn-fe +TEST_PROGRAMS_NEED_X += test-url-normalize TEST_PROGRAMS_NEED_X += test-wildmatch TEST_PROGRAMS = $(patsubst %,%$X,$(TEST_PROGRAMS_NEED_X)) @@ -721,6 +722,7 @@ LIB_H += tree-walk.h LIB_H += tree.h LIB_H += unpack-trees.h LIB_H += url.h +LIB_H += urlmatch.h LIB_H += userdiff.h LIB_H += utf8.h LIB_H += varint.h @@ -868,6 +870,7 @@ LIB_OBJS += tree.o LIB_OBJS += tree-walk.o LIB_OBJS += unpack-trees.o LIB_OBJS += url.o +LIB_OBJS += urlmatch.o LIB_OBJS += usage.o LIB_OBJS += userdiff.o LIB_OBJS += utf8.o @@ -2235,6 +2238,10 @@ test-parse-options$X: parse-options.o parse-options-cb.o test-svn-fe$X: vcs-svn/lib.a +test-url-normalize$X: test-url-normalize.o GIT-LDFLAGS $(GITLIBS) + $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \ + $(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT) + .PRECIOUS: $(TEST_OBJS) test-%$X: test-%.o GIT-LDFLAGS $(GITLIBS) diff --git a/http.c b/http.c index 37986f8..5eda356 100644 --- a/http.c +++ b/http.c @@ -3,6 +3,7 @@ #include "sideband.h" #include "run-command.h" #include "url.h" +#include "urlmatch.h" #include "credential.h" #include "version.h" #include "pkt-line.h" @@ -334,10 +335,20 @@ void http_init(struct remote *remote, const char *url, int proactive_auth) { char *low_speed_limit; char *low_speed_time; + char *normalized_url; + struct urlmatch_config config = { STRING_LIST_INIT_DUP }; + + config.section = "http"; + config.key = NULL; + config.collect_fn = http_options; + config.cascade_fn = git_default_config; + config.cb = NULL; http_is_verbose = 0; + normalized_url = url_normalize(url, &config.url); - git_config(http_options, NULL); + git_config(urlmatch_config_entry, &config); + free(normalized_url); curl_global_init(CURL_GLOBAL_ALL); diff --git a/t/.gitattributes b/t/.gitattributes index 1b97c54..f6f1df3 100644 --- a/t/.gitattributes +++ b/t/.gitattributes @@ -1 +1,2 @@ t[0-9][0-9][0-9][0-9]/* -whitespace +t5200/url-* binary diff --git a/t/t5200-url-normalize.sh b/t/t5200-url-normalize.sh new file mode 100755 index 0000000..f79bb0f --- /dev/null +++ b/t/t5200-url-normalize.sh @@ -0,0 +1,199 @@ +#!/bin/sh + +test_description='url normalization' +. ./test-lib.sh + +if test -n "$NO_CURL"; then + skip_all='skipping test, git built without http support' + test_done +fi + +# The base name of the test url files +tu="$TEST_DIRECTORY/t5200/url" + +# The base name of the test config files +tc="$TEST_DIRECTORY/t5200/config" + +# Note that only file: URLs should be allowed without a host + +test_expect_success 'url scheme' ' + ! test-url-normalize "" && + ! test-url-normalize "_" && + ! test-url-normalize "scheme" && + ! test-url-normalize "scheme:" && + ! test-url-normalize "scheme:/" && + ! test-url-normalize "scheme://" && + ! test-url-normalize "file" && + ! test-url-normalize "file:" && + ! test-url-normalize "file:/" && + test-url-normalize "file://" && + ! test-url-normalize "://acme.co" && + ! test-url-normalize "x_test://acme.co" && + ! test-url-normalize "-test://acme.co" && + ! test-url-normalize "0test://acme.co" && + ! test-url-normalize "+test://acme.co" && + ! test-url-normalize ".test://acme.co" && + ! test-url-normalize "schem%6e://" && + test-url-normalize "x-Test+v1.0://acme.co" && + test "$(test-url-normalize -p "AbCdeF://x.Y")" = "abcdef://x.y/" +' + +test_expect_success 'url authority' ' + ! test-url-normalize "scheme://user:pass@" && + ! test-url-normalize "scheme://?" && + ! test-url-normalize "scheme://#" && + ! test-url-normalize "scheme:///" && + ! test-url-normalize "scheme://:" && + ! test-url-normalize "scheme://:555" && + test-url-normalize "file://user:pass@" && + test-url-normalize "file://?" && + test-url-normalize "file://#" && + test-url-normalize "file:///" && + test-url-normalize "file://:" && + ! test-url-normalize "file://:555" && + test-url-normalize "scheme://user:pass@host" && + test-url-normalize "scheme://@host" && + test-url-normalize "scheme://%00@host" && + ! test-url-normalize "scheme://%%@host" && + ! test-url-normalize "scheme://host_" && + test-url-normalize "scheme://user:pass@host/" && + test-url-normalize "scheme://@host/" && + test-url-normalize "scheme://host/" && + test-url-normalize "scheme://host?x" && + test-url-normalize "scheme://host#x" && + test-url-normalize "scheme://host/@" && + test-url-normalize "scheme://host?@x" && + test-url-normalize "scheme://host#@x" && + test-url-normalize "scheme://[::1]" && + test-url-normalize "scheme://[::1]/" && + ! test-url-normalize "scheme://hos%41/" && + test-url-normalize "scheme://[invalid....:/" && + test-url-normalize "scheme://invalid....:]/" && + ! test-url-normalize "scheme://invalid....:[/" && + ! test-url-normalize "scheme://invalid....:[" +' + +test_expect_success 'url port checks' ' + test-url-normalize "xyz://q@xxxxxxxxx:" && + test-url-normalize "xyz://q@xxxxxxxxx:456/" && + ! test-url-normalize "xyz://q@xxxxxxxxx:0" && + ! test-url-normalize "xyz://q@xxxxxxxxx:0000000" && + test-url-normalize "xyz://q@xxxxxxxxx:0000001?" && + test-url-normalize "xyz://q@xxxxxxxxx:065535#" && + test-url-normalize "xyz://q@xxxxxxxxx:65535" && + ! test-url-normalize "xyz://q@xxxxxxxxx:65536" && + ! test-url-normalize "xyz://q@xxxxxxxxx:99999" && + ! test-url-normalize "xyz://q@xxxxxxxxx:100000" && + ! test-url-normalize "xyz://q@xxxxxxxxx:100001" && + test-url-normalize "http://q@xxxxxxxxx:80"; && + test-url-normalize "https://q@xxxxxxxxx:443"; && + test-url-normalize "http://q@xxxxxxxxx:80/"; && + test-url-normalize "https://q@xxxxxxxxx:443?"; && + ! test-url-normalize "http://q@:8008"; && + ! test-url-normalize "http://:8080"; && + ! test-url-normalize "http://:"; && + test-url-normalize "xyz://q@xxxxxxxxx:456/" && + test-url-normalize "xyz://[::1]:456/" && + test-url-normalize "xyz://[::1]:/" && + ! test-url-normalize "xyz://[::1]:000/" && + ! test-url-normalize "xyz://[::1]:0%300/" && + ! test-url-normalize "xyz://[::1]:0x80/" && + ! test-url-normalize "xyz://[::1]:4294967297/" && + ! test-url-normalize "xyz://[::1]:030f/" +' + +test_expect_success 'url port normalization' ' + test "$(test-url-normalize -p "http://x:800";)" = "http://x:800/"; && + test "$(test-url-normalize -p "http://x:0800";)" = "http://x:800/"; && + test "$(test-url-normalize -p "http://x:00000800";)" = "http://x:800/"; && + test "$(test-url-normalize -p "http://x:065535";)" = "http://x:65535/"; && + test "$(test-url-normalize -p "http://x:1";)" = "http://x:1/"; && + test "$(test-url-normalize -p "http://x:80";)" = "http://x/"; && + test "$(test-url-normalize -p "http://x:080";)" = "http://x/"; && + test "$(test-url-normalize -p "http://x:000000080";)" = "http://x/"; && + test "$(test-url-normalize -p "https://x:443";)" = "https://x/"; && + test "$(test-url-normalize -p "https://x:0443";)" = "https://x/"; && + test "$(test-url-normalize -p "https://x:000000443";)" = "https://x/"; +' + +test_expect_success 'url general escapes' ' + ! test-url-normalize "http://x.y?%fg"; && + test "$(test-url-normalize -p "X://W/%7e%41^%3a")" = "x://w/~A%5E%3A" && + test "$(test-url-normalize -p "X://W/:/?#[]@")" = "x://w/:/?#[]@" && + test "$(test-url-normalize -p "X://W/$&()*+,;=")" = "x://w/$&()*+,;=" && + test "$(test-url-normalize -p "X://W/'\''")" = "x://w/'\''" && + test "$(test-url-normalize -p "X://W?'\!'")" = "x://w/?'\!'" +' + +test_expect_success 'url high-bit escapes' ' + test "$(test-url-normalize -p "$(cat "$tu-1")")" = "x://q/%01%02%03%04%05%06%07%08%0E%0F%10%11%12" && + test "$(test-url-normalize -p "$(cat "$tu-2")")" = "x://q/%13%14%15%16%17%18%19%1B%1C%1D%1E%1F%7F" && + test "$(test-url-normalize -p "$(cat "$tu-3")")" = "x://q/%80%81%82%83%84%85%86%87%88%89%8A%8B%8C%8D%8E%8F" && + test "$(test-url-normalize -p "$(cat "$tu-4")")" = "x://q/%90%91%92%93%94%95%96%97%98%99%9A%9B%9C%9D%9E%9F" && + test "$(test-url-normalize -p "$(cat "$tu-5")")" = "x://q/%A0%A1%A2%A3%A4%A5%A6%A7%A8%A9%AA%AB%AC%AD%AE%AF" && + test "$(test-url-normalize -p "$(cat "$tu-6")")" = "x://q/%B0%B1%B2%B3%B4%B5%B6%B7%B8%B9%BA%BB%BC%BD%BE%BF" && + test "$(test-url-normalize -p "$(cat "$tu-7")")" = "x://q/%C0%C1%C2%C3%C4%C5%C6%C7%C8%C9%CA%CB%CC%CD%CE%CF" && + test "$(test-url-normalize -p "$(cat "$tu-8")")" = "x://q/%D0%D1%D2%D3%D4%D5%D6%D7%D8%D9%DA%DB%DC%DD%DE%DF" && + test "$(test-url-normalize -p "$(cat "$tu-9")")" = "x://q/%E0%E1%E2%E3%E4%E5%E6%E7%E8%E9%EA%EB%EC%ED%EE%EF" && + test "$(test-url-normalize -p "$(cat "$tu-10")")" = "x://q/%F0%F1%F2%F3%F4%F5%F6%F7%F8%F9%FA%FB%FC%FD%FE%FF" && + test "$(test-url-normalize -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-url-normalize -p "x://%41%62(^):%70+d@foo")" = "x://Ab(%5E):p+d@foo/" +' + +test_expect_success 'url normalized lengths' ' + test "$(test-url-normalize -l "Http://%4d%65:%4d^%70@xxxxxxxx")" = 25 && + test "$(test-url-normalize -l "http://%41:%42@x.y/%61/";)" = 17 && + test "$(test-url-normalize -l "http://@x.y/^";)" = 15 +' + +test_expect_success 'url . and .. segments' ' + test "$(test-url-normalize -p "x://y/.")" = "x://y/" && + test "$(test-url-normalize -p "x://y/./")" = "x://y/" && + test "$(test-url-normalize -p "x://y/a/.")" = "x://y/a" && + test "$(test-url-normalize -p "x://y/a/./")" = "x://y/a/" && + test "$(test-url-normalize -p "x://y/.?")" = "x://y/?" && + test "$(test-url-normalize -p "x://y/./?")" = "x://y/?" && + test "$(test-url-normalize -p "x://y/a/.?")" = "x://y/a?" && + test "$(test-url-normalize -p "x://y/a/./?")" = "x://y/a/?" && + test "$(test-url-normalize -p "x://y/a/./b/.././../c")" = "x://y/c" && + test "$(test-url-normalize -p "x://y/a/./b/../.././c/")" = "x://y/c/" && + test "$(test-url-normalize -p "x://y/a/./b/.././../c/././.././.")" = "x://y/" && + ! test-url-normalize "x://y/a/./b/.././../c/././.././.." && + test "$(test-url-normalize -p "x://y/a/./?/././..")" = "x://y/a/?/././.." && + test "$(test-url-normalize -p "x://y/%2e/")" = "x://y/" && + test "$(test-url-normalize -p "x://y/%2E/")" = "x://y/" && + test "$(test-url-normalize -p "x://y/a/%2e./")" = "x://y/" && + test "$(test-url-normalize -p "x://y/b/.%2E/")" = "x://y/" && + test "$(test-url-normalize -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-url-normalize "httP://x" "Http://X/" && + test-url-normalize "Http://%4d%65:%4d^%70@xxxxxxxx" "hTTP://Me:%4D^p@xxxxxxxx:80/" && + ! test-url-normalize "https://@x.y/^"; "httpS://x.y:443/^" && + test-url-normalize "https://@x.y/^"; "httpS://@x.y:0443/^" && + test-url-normalize "https://@x.y/^/../abc"; "httpS://@x.y:0443/abc" && + test-url-normalize "https://@x.y/^/.."; "httpS://@x.y:0443/" +' + +test_expect_success 'url config normalization matching' ' + test "$(test-url-normalize -c "$tc-1" "useragent" "https://other.example.com/";)" = "other-agent" && + test "$(test-url-normalize -c "$tc-1" "useragent" "https://example.com/";)" = "example-agent" && + test "$(test-url-normalize -c "$tc-1" "sslVerify" "https://example.com/";)" = "false" && + test "$(test-url-normalize -c "$tc-1" "useragent" "https://example.com/path/sub";)" = "path-agent" && + test "$(test-url-normalize -c "$tc-1" "sslVerify" "https://example.com/path/sub";)" = "false" && + test "$(test-url-normalize -c "$tc-1" "noEPSV" "https://elsewhere.com/";)" = "true" && + test "$(test-url-normalize -c "$tc-1" "noEPSV" "https://example.com";)" = "true" && + test "$(test-url-normalize -c "$tc-1" "noEPSV" "https://example.com/path";)" = "true" && + test "$(test-url-normalize -c "$tc-2" "useragent" "HTTPS://example.COM/p%61th")" = "example-agent" && + test "$(test-url-normalize -c "$tc-2" "sslVerify" "HTTPS://example.COM/p%61th")" = "false" && + test "$(test-url-normalize -c "$tc-3" "sslcainfo" "https://user@xxxxxxxxxxx/path/name/here";)" = "file-1" +' + +test_done diff --git a/t/t5200/README b/t/t5200/README new file mode 100644 index 0000000000000000000000000000000000000000..e3a67d94fb52201b565884daf050f7f76294a4f3 GIT binary patch literal 644 zcmaKqxl+V142F9@g&u(2St@FJDrTt}C6;3izD9QT;OUW_WmpPmGULekk54&zf>i=o zYzU46Rp128a|O#nbIWptIj4sD`t9|l!kL?g*`wgxNU9mv2?WzZaJU>EcZbWP158#= zPfkzHLCesnHWel)k_!o>ED-~LV&j}lcCe-*tVUCyJN>;e&rm676mWFDn`}YvJ+}-f z1oeYUA=`aDg<|lO*>-0Yj}>H1iPJLTj9lE*!l~DB<58ij^lClzUt9#WkEjYJm`DW; z#fhv{;~SOnd7Xues$_wZMGJD^cD<P?TgS`){Dq28rPTT+^!BR83auKgHz`n*s+Q9g zd~4-BmobE@%sp<*9VZO1P2hxKRm3B-=?TgH4zu-*__O(#702kAlhVaVyQB}Ro0+?t kf;N@o8n6*~JaxDT^{U$O0hW*_weP>ge&O#H1FIUFFGl3$z5oCK literal 0 HcmV?d00001 diff --git a/t/t5200/config-1 b/t/t5200/config-1 new file mode 100644 index 0000000000000000000000000000000000000000..8aaf23c41c52c28bea4da92ba172c54e8d2a4926 GIT binary patch literal 180 zcma#fC@Cq3<>D+YPAy7IPt7Y)uvN$}$w)2I1@pK#^YUE-g2RBKB}JvFT+txq3Q8cd z*h*hNwIVUMASYEXIX_nk%@C**%$VZhoUqiQ%(P0NNok2W#rTZUFGwuOKsOI01~m)- D(n&qZ literal 0 HcmV?d00001 diff --git a/t/t5200/config-2 b/t/t5200/config-2 new file mode 100644 index 0000000000000000000000000000000000000000..749f4bd5c4e93b6f0e8a18b3efe794fb3b0b5832 GIT binary patch literal 80 zcma#fC@CpWPy&&~R{Hv>6^Xe8IjMTd`MLT9i6t3Iv0R*`#i>P!>8W`o3bqPRd0jA{ Xi?g^mCoHunGp!ORm6n)OoXQ0NccUB6 literal 0 HcmV?d00001 diff --git a/t/t5200/config-3 b/t/t5200/config-3 new file mode 100644 index 0000000000000000000000000000000000000000..5c8d3e85dda86e4e2e36d362a0d16400509a45ea GIT binary patch literal 118 zcma#fC@CpWPy&&~R{Hv>6^Xe8IjMTd`MLT9i6t5Od5O8HO0is=#l<<viJ5t6`3klQ aX_+~xx`tfQs9H;lQ;QtX^<&j)#03D2JSaT? literal 0 HcmV?d00001 diff --git a/t/t5200/url-1 b/t/t5200/url-1 new file mode 100644 index 0000000000000000000000000000000000000000..519019c5ce6c58478f048a2f39e2321370d318c6 GIT binary patch literal 20 bcmb=h($_E4XJle#VP#|I;Nuq%6ygE^Admtt literal 0 HcmV?d00001 diff --git a/t/t5200/url-10 b/t/t5200/url-10 new file mode 100644 index 0000000000000000000000000000000000000000..b9965de6a5d74b122179821212b2c27c8ae03e80 GIT binary patch literal 23 hcmV+y0O<dCIxjDAFYxj5^Yr!h_xSnx`~3a>{|dCd5i<Y) literal 0 HcmV?d00001 diff --git a/t/t5200/url-11 b/t/t5200/url-11 new file mode 100644 index 0000000000000000000000000000000000000000..f0a50f10096a20d597f40c775f09a71276e0050a GIT binary patch literal 25 hcmb=h($_E4Kh$u4|APe$@AvQhFrlI0!}|Suxd5(W4xs=5 literal 0 HcmV?d00001 diff --git a/t/t5200/url-2 b/t/t5200/url-2 new file mode 100644 index 0000000000000000000000000000000000000000..43334b05b2de3794d6020abd96e634a4e9e49cb0 GIT binary patch literal 20 bcmb=h($_E47Zwo}6PJ*bmXVc{ujc{)C{+Vx literal 0 HcmV?d00001 diff --git a/t/t5200/url-3 b/t/t5200/url-3 new file mode 100644 index 0000000000000000000000000000000000000000..7378c7bec247b996bc67b00a05ed89cf47d4b7a7 GIT binary patch literal 23 ecmb=h($_E4Z)j|4ZfR|6@96C6?&<C8=K=t7Jqj}b literal 0 HcmV?d00001 diff --git a/t/t5200/url-4 b/t/t5200/url-4 new file mode 100644 index 0000000000000000000000000000000000000000..220b198c97f942fea4960f51a2105cc42261061a GIT binary patch literal 23 hcmV+y0O<dCIxjDAFOZRvla!T~mzbHFo1C4Vp9*`u3o`%! literal 0 HcmV?d00001 diff --git a/t/t5200/url-5 b/t/t5200/url-5 new file mode 100644 index 0000000000000000000000000000000000000000..1ccd9277792840955bb124bdde21f4b08bcccb63 GIT binary patch literal 23 hcmV+y0O<dCIxjDAFQB2Kqok##r>Lo_tE{cAuL^}d3^M=# literal 0 HcmV?d00001 diff --git a/t/t5200/url-6 b/t/t5200/url-6 new file mode 100644 index 0000000000000000000000000000000000000000..e8283aac6dff049d3e02454db6e684c5790a5996 GIT binary patch literal 23 hcmV+y0O<dCIxjDAFR-z)v$VCgx45~wyS%-=zY31M4Kn}$ literal 0 HcmV?d00001 diff --git a/t/t5200/url-7 b/t/t5200/url-7 new file mode 100644 index 0000000000000000000000000000000000000000..fa7c10b615259deefd15b638b021da7c60eba1b2 GIT binary patch literal 23 hcmV+y0O<dCIxjDAFTlaV!^FkL$H>Xb%goKr&kC454l@7% literal 0 HcmV?d00001 diff --git a/t/t5200/url-8 b/t/t5200/url-8 new file mode 100644 index 0000000000000000000000000000000000000000..79a0ba836f5b8886b0a73f161eb292af2b105e65 GIT binary patch literal 23 hcmV+y0O<dCIxjDAFVNA_)6~`0*Vx(G+uYsW-wL6<4>JG& literal 0 HcmV?d00001 diff --git a/t/t5200/url-9 b/t/t5200/url-9 new file mode 100644 index 0000000000000000000000000000000000000000..8b44bec48b94467c63e8e1ad18162e465da6d6dd GIT binary patch literal 23 hcmV+y0O<dCIxjDAFW}+g<K*S$=jiF`>+J3B?+U9u5HkP( literal 0 HcmV?d00001 diff --git a/test-url-normalize.c b/test-url-normalize.c new file mode 100644 index 0000000..81d3da9 --- /dev/null +++ b/test-url-normalize.c @@ -0,0 +1,137 @@ +#ifdef NO_CURL + +int main() +{ + return 125; +} + +#else /* !NO_CURL */ + +#include "http.c" + +static int run_http_options(const char *file, + const char *opt, + const struct url_info *info) +{ + struct strbuf opt_lc; + size_t i, len; + struct urlmatch_config config = { STRING_LIST_INIT_DUP }; + + memcpy(&config.url, info, sizeof(*info)); + config.section = "http"; + config.collect_fn = http_options; + config.cascade_fn = git_default_config; + config.cb = NULL; + + if (git_config_with_options(urlmatch_config_entry, &config, file, 0)) + return 1; + + len = strlen(opt); + strbuf_init(&opt_lc, len); + for (i = 0; i < len; ++i) { + strbuf_addch(&opt_lc, tolower(opt[i])); + } + + if (!strcmp("sslverify", opt_lc.buf)) + printf("%s\n", curl_ssl_verify ? "true" : "false"); + else if (!strcmp("sslcert", opt_lc.buf)) + printf("%s\n", ssl_cert); +#if LIBCURL_VERSION_NUM >= 0x070903 + else if (!strcmp("sslkey", opt_lc.buf)) + printf("%s\n", ssl_key); +#endif +#if LIBCURL_VERSION_NUM >= 0x070908 + else if (!strcmp("sslcapath", opt_lc.buf)) + printf("%s\n", ssl_capath); +#endif + else if (!strcmp("sslcainfo", opt_lc.buf)) + printf("%s\n", ssl_cainfo); + else if (!strcmp("sslcertpasswordprotected", opt_lc.buf)) + printf("%s\n", ssl_cert_password_required ? "true" : "false"); + else if (!strcmp("ssltry", opt_lc.buf)) + printf("%s\n", curl_ssl_try ? "true" : "false"); + else if (!strcmp("minsessions", opt_lc.buf)) + printf("%d\n", min_curl_sessions); + else if (!strcmp("maxrequests", opt_lc.buf)) + printf("%d\n", max_requests); + else if (!strcmp("lowspeedlimit", opt_lc.buf)) + printf("%ld\n", curl_low_speed_limit); + else if (!strcmp("lowspeedtime", opt_lc.buf)) + printf("%ld\n", curl_low_speed_time); + else if (!strcmp("noepsv", opt_lc.buf)) + printf("%s\n", curl_ftp_no_epsv ? "true" : "false"); + else if (!strcmp("proxy", opt_lc.buf)) + printf("%s\n", curl_http_proxy); + else if (!strcmp("cookiefile", opt_lc.buf)) + printf("%s\n", curl_cookie_file); + else if (!strcmp("postbuffer", opt_lc.buf)) + printf("%u\n", (unsigned)http_post_buffer); + else if (!strcmp("useragent", opt_lc.buf)) + printf("%s\n", user_agent); + + return 0; +} + +int main(int argc, char **argv) +{ + const char *usage = "test-url-normalize [-p | -l] <url1> | <url1> <url2>" + " | -c file option <url1>"; + char *url1, *url2; + int opt_p = 0, opt_l = 0, opt_c = 0; + char *file = NULL, *optname = NULL; + + /* + * 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 -c is given, call git_config_with_options using the specified file + * and http_options and passing the normalized value of the url. Then + * print the value of 'option' afterwards. 'option' must be one of the + * valid 'http.*' options. + */ + + 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++; + } else if (argc > 3 && !strcmp(argv[1], "-c")) { + opt_c = 1; + file = argv[2]; + optname = argv[3]; + argc -= 3; + argv += 3; + } + + if (argc < 2 || argc > 3) + die(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); + if (opt_c) + return run_http_options(file, optname, &info); + return 0; + } + + if (opt_p || opt_l || opt_c) + die(usage); + + url1 = url_normalize(argv[1], NULL); + url2 = url_normalize(argv[2], NULL); + return (url1 && url2 && !strcmp(url1, url2)) ? 0 : 1; +} + +#endif /* !NO_CURL */ -- 1.8.4-rc0-153-g9820077 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html