mirror of
git://git.gnupg.org/gnupg.git
synced 2024-11-10 21:38:50 +01:00
4a4bb874f6
* dirmngr/http.h (parsed_uri_s): Add fields off_host and off_path.
(http_redir_info_t): New.
* dirmngr/http.c (do_parse_uri): Set new fields.
(same_host_p): New.
(http_prepare_redirect): New.
* dirmngr/t-http-basic.c: New test.
* dirmngr/ks-engine-hkp.c (send_request): Use http_prepare_redirect
instead of the open code.
* dirmngr/ks-engine-http.c (ks_http_fetch): Ditto.
--
With this change a http query will not follow a redirect unless the
Location header gives the same host. If the host is different only
the host and port is taken from the Location header and the original
path and query parts are kept.
Signed-off-by: Werner Koch <wk@gnupg.org>
(cherry picked from commit fa1b1eaa42
)
200 lines
5.2 KiB
C
200 lines
5.2 KiB
C
/* t-http-basic.c - Basic regression tests for http.c
|
|
* Copyright (C) 2018 g10 Code GmbH
|
|
*
|
|
* This file is part of GnuPG.
|
|
*
|
|
* GnuPG is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* GnuPG is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, see <https://gnu.org/licenses/>.
|
|
* SPDX-License-Identifier: GPL-3.0-or-later
|
|
*/
|
|
|
|
#include <config.h>
|
|
#include <stdlib.h>
|
|
|
|
#include "../common/util.h"
|
|
#include "t-support.h"
|
|
#include "http.h"
|
|
|
|
#define PGM "t-http-basic"
|
|
|
|
|
|
static void
|
|
test_http_prepare_redirect (void)
|
|
{
|
|
static struct {
|
|
const char *url;
|
|
const char *location;
|
|
const char *expect_url;
|
|
gpg_error_t expect_err;
|
|
} tests[] = {
|
|
{
|
|
"http://gnupg.org/.well-known/openpgpkey/hu/12345678",
|
|
NULL,
|
|
"",
|
|
GPG_ERR_NO_DATA
|
|
},
|
|
{
|
|
"http://gnupg.org/.well-known/openpgpkey/hu/12345678",
|
|
"",
|
|
"",
|
|
GPG_ERR_NO_DATA
|
|
},
|
|
{
|
|
"http://gnupg.org/.well-known/openpgpkey/hu/12345678",
|
|
"foo//bla",
|
|
"",
|
|
GPG_ERR_BAD_URI
|
|
},
|
|
{
|
|
"http://gnupg.org/.well-known/openpgpkey/hu/12345678",
|
|
"http://gnupg.org/.well-known/openpgpkey/hu/12345678",
|
|
"http://gnupg.org/.well-known/openpgpkey/hu/12345678",
|
|
0
|
|
},
|
|
{
|
|
"http://gnupg.org/.well-known/openpgpkey/hu/12345678",
|
|
"http://gnupg.org/.well-known/openpgpkey/hu/12345678",
|
|
"http://gnupg.org/.well-known/openpgpkey/hu/12345678",
|
|
0
|
|
},
|
|
{
|
|
"http://gnupg.org/.well-known/openpgpkey/hu/12345678",
|
|
"http://foo.gnupg.org:8080/.not-so-well-known/openpgpkey/hu/12345678",
|
|
"http://foo.gnupg.org:8080/.well-known/openpgpkey/hu/12345678",
|
|
0
|
|
},
|
|
{
|
|
"http://gnupg.org/.well-known/openpgpkey/hu/12345678",
|
|
"http:///.no-so-well-known/openpgpkey/hu/12345678",
|
|
"http://gnupg.org/.well-known/openpgpkey/hu/12345678",
|
|
GPG_ERR_BAD_URI
|
|
},
|
|
{
|
|
"http://gnupg.org/.well-known/openpgpkey/hu/12345678",
|
|
"http://gnupg.org:8080/.not-so-well-known/openpgpkey/hu/12345678",
|
|
"http://gnupg.org:8080/.not-so-well-known/openpgpkey/hu/12345678",
|
|
0
|
|
},
|
|
{
|
|
"http://gnupg.org/.well-known/openpgpkey/hu/12345678",
|
|
"http://gnupg.org:8/.not-so-well-known/openpgpkey/hu/12345678",
|
|
"http://gnupg.org:8/.not-so-well-known/openpgpkey/hu/12345678",
|
|
0
|
|
},
|
|
{
|
|
"http://gnupg.org/.well-known/openpgpkey/hu/12345678",
|
|
"http://gnupg.org:/.no-so-well-known/openpgpkey/hu/12345678",
|
|
"http://gnupg.org:/.no-so-well-known/openpgpkey/hu/12345678",
|
|
0
|
|
},
|
|
{
|
|
"http://gnupg.org/.well-known/openpgpkey/hu/12345678",
|
|
"http://gnupg.org/",
|
|
"http://gnupg.org/",
|
|
0
|
|
},
|
|
{
|
|
"http://gnupg.org/.well-known/openpgpkey/hu/12345678",
|
|
"http://gnupg.net",
|
|
"http://gnupg.net/.well-known/openpgpkey/hu/12345678",
|
|
0
|
|
},
|
|
{
|
|
"http://gnupg.org",
|
|
"http://gnupg.org",
|
|
"http://gnupg.org",
|
|
0
|
|
},
|
|
{
|
|
"http://gnupg.org",
|
|
"http://foo.gnupg.org",
|
|
"http://foo.gnupg.org",
|
|
0
|
|
},
|
|
{
|
|
"http://gnupg.org/",
|
|
"http://foo.gnupg.org",
|
|
"http://foo.gnupg.org/",
|
|
0
|
|
},
|
|
{
|
|
"http://gnupg.org",
|
|
"http://foo.gnupg.org/",
|
|
"http://foo.gnupg.org",
|
|
0
|
|
},
|
|
{
|
|
"http://gnupg.org/.well-known/openpgpkey/hu/12345678",
|
|
"http://gnupg.org/something-else",
|
|
"http://gnupg.org/something-else",
|
|
0
|
|
},
|
|
};
|
|
int tidx;
|
|
http_redir_info_t ri;
|
|
gpg_error_t err;
|
|
char *newurl;
|
|
|
|
err = http_prepare_redirect (NULL, 301, tests[0].location, &newurl);
|
|
if (gpg_err_code (err) != GPG_ERR_INV_ARG)
|
|
fail (0);
|
|
memset (&ri, 0, sizeof ri);
|
|
err = http_prepare_redirect (&ri, 301, tests[0].location, &newurl);
|
|
if (gpg_err_code (err) != GPG_ERR_INV_ARG)
|
|
fail (0);
|
|
memset (&ri, 0, sizeof ri);
|
|
ri.silent = 1;
|
|
ri.orig_url = "http://example.org";
|
|
err = http_prepare_redirect (&ri, 301, tests[0].location, &newurl);
|
|
if (gpg_err_code (err) != GPG_ERR_NO_DATA)
|
|
fail (0);
|
|
|
|
for (tidx = 0; tidx < DIM (tests); tidx++)
|
|
{
|
|
memset (&ri, 0, sizeof ri);
|
|
ri.silent = 1;
|
|
ri.redirects_left = 1;
|
|
ri.orig_url = tests[tidx].url;
|
|
|
|
err = http_prepare_redirect (&ri, 301, tests[tidx].location, &newurl);
|
|
if (err && newurl)
|
|
fail (tidx);
|
|
if (err && gpg_err_code (err) != tests[tidx].expect_err)
|
|
fail (tidx);
|
|
if (err)
|
|
continue;
|
|
if (!newurl)
|
|
fail (tidx);
|
|
if (strcmp (tests[tidx].expect_url, newurl))
|
|
{
|
|
fprintf (stderr, "want: '%s'\n", tests[tidx].expect_url);
|
|
fprintf (stderr, "got : '%s'\n", newurl);
|
|
fail (tidx);
|
|
}
|
|
|
|
xfree (newurl);
|
|
}
|
|
}
|
|
|
|
|
|
int
|
|
main (int argc, char **argv)
|
|
{
|
|
(void)argc;
|
|
(void)argv;
|
|
|
|
test_http_prepare_redirect ();
|
|
|
|
return 0;
|
|
}
|