1999-12-02 02:42:23 -05:00
|
|
|
|
/* URL handling.
|
2009-09-04 03:13:47 -04:00
|
|
|
|
Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
|
2011-01-01 07:19:37 -05:00
|
|
|
|
2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
|
|
|
|
|
Inc.
|
1999-12-02 02:42:23 -05:00
|
|
|
|
|
2001-05-27 15:35:15 -04:00
|
|
|
|
This file is part of GNU Wget.
|
1999-12-02 02:42:23 -05:00
|
|
|
|
|
2001-05-27 15:35:15 -04:00
|
|
|
|
GNU Wget is free software; you can redistribute it and/or modify
|
1999-12-02 02:42:23 -05:00
|
|
|
|
it under the terms of the GNU General Public License as published by
|
2007-07-10 01:53:22 -04:00
|
|
|
|
the Free Software Foundation; either version 3 of the License, or (at
|
2000-11-01 13:31:53 -05:00
|
|
|
|
your option) any later version.
|
1999-12-02 02:42:23 -05:00
|
|
|
|
|
2001-05-27 15:35:15 -04:00
|
|
|
|
GNU Wget is distributed in the hope that it will be useful,
|
1999-12-02 02:42:23 -05:00
|
|
|
|
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
|
2007-07-10 01:53:22 -04:00
|
|
|
|
along with Wget. If not, see <http://www.gnu.org/licenses/>.
|
2002-05-17 22:16:36 -04:00
|
|
|
|
|
2007-11-28 03:05:33 -05:00
|
|
|
|
Additional permission under GNU GPL version 3 section 7
|
|
|
|
|
|
|
|
|
|
If you modify this program, or any covered work, by linking or
|
|
|
|
|
combining it with the OpenSSL project's OpenSSL library (or a
|
|
|
|
|
modified version of that library), containing parts covered by the
|
|
|
|
|
terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
|
|
|
|
|
grants you additional permission to convey the resulting work.
|
|
|
|
|
Corresponding Source for a non-source form of such a combination
|
|
|
|
|
shall include the source code for the parts of OpenSSL used as well
|
|
|
|
|
as that of the covered work. */
|
1999-12-02 02:42:23 -05:00
|
|
|
|
|
2007-10-18 23:50:40 -04:00
|
|
|
|
#include "wget.h"
|
1999-12-02 02:42:23 -05:00
|
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <stdlib.h>
|
2005-06-19 18:34:58 -04:00
|
|
|
|
#include <string.h>
|
2010-12-01 07:15:13 -05:00
|
|
|
|
#include <unistd.h>
|
1999-12-02 02:42:23 -05:00
|
|
|
|
#include <errno.h>
|
|
|
|
|
#include <assert.h>
|
|
|
|
|
|
|
|
|
|
#include "utils.h"
|
|
|
|
|
#include "url.h"
|
2005-03-04 14:21:02 -05:00
|
|
|
|
#include "host.h" /* for is_valid_ipv6_address */
|
1999-12-02 02:42:23 -05:00
|
|
|
|
|
2008-04-22 17:48:36 -04:00
|
|
|
|
#ifdef __VMS
|
|
|
|
|
#include "vms.h"
|
|
|
|
|
#endif /* def __VMS */
|
|
|
|
|
|
2006-06-13 09:58:33 -04:00
|
|
|
|
#ifdef TESTING
|
|
|
|
|
#include "test.h"
|
|
|
|
|
#endif
|
|
|
|
|
|
2005-07-01 22:51:38 -04:00
|
|
|
|
enum {
|
2006-06-28 07:09:30 -04:00
|
|
|
|
scm_disabled = 1, /* for https when OpenSSL fails to init. */
|
|
|
|
|
scm_has_params = 2, /* whether scheme has ;params */
|
|
|
|
|
scm_has_query = 4, /* whether scheme has ?query */
|
|
|
|
|
scm_has_fragment = 8 /* whether scheme has #fragment */
|
2005-07-01 22:51:38 -04:00
|
|
|
|
};
|
|
|
|
|
|
2001-11-18 19:12:05 -05:00
|
|
|
|
struct scheme_data
|
1999-12-02 02:42:23 -05:00
|
|
|
|
{
|
2005-07-01 13:22:57 -04:00
|
|
|
|
/* Short name of the scheme, such as "http" or "ftp". */
|
2003-12-05 22:01:31 -05:00
|
|
|
|
const char *name;
|
2005-07-01 13:22:57 -04:00
|
|
|
|
/* Leading string that identifies the scheme, such as "https://". */
|
2003-12-05 22:01:31 -05:00
|
|
|
|
const char *leading_string;
|
2005-07-01 13:22:57 -04:00
|
|
|
|
/* Default port of the scheme when none is specified. */
|
2001-11-18 19:12:05 -05:00
|
|
|
|
int default_port;
|
2005-07-01 22:51:38 -04:00
|
|
|
|
/* Various flags. */
|
2005-07-01 13:22:57 -04:00
|
|
|
|
int flags;
|
1999-12-02 02:42:23 -05:00
|
|
|
|
};
|
|
|
|
|
|
2001-11-18 19:12:05 -05:00
|
|
|
|
/* Supported schemes: */
|
|
|
|
|
static struct scheme_data supported_schemes[] =
|
1999-12-02 02:42:23 -05:00
|
|
|
|
{
|
2006-06-28 07:09:30 -04:00
|
|
|
|
{ "http", "http://", DEFAULT_HTTP_PORT, scm_has_query|scm_has_fragment },
|
2000-12-05 18:09:41 -05:00
|
|
|
|
#ifdef HAVE_SSL
|
2006-06-28 07:09:30 -04:00
|
|
|
|
{ "https", "https://", DEFAULT_HTTPS_PORT, scm_has_query|scm_has_fragment },
|
2000-12-05 18:09:41 -05:00
|
|
|
|
#endif
|
2006-06-28 07:09:30 -04:00
|
|
|
|
{ "ftp", "ftp://", DEFAULT_FTP_PORT, scm_has_params|scm_has_fragment },
|
2001-11-21 19:24:28 -05:00
|
|
|
|
|
|
|
|
|
/* SCHEME_INVALID */
|
2006-06-28 07:09:30 -04:00
|
|
|
|
{ NULL, NULL, -1, 0 }
|
1999-12-02 02:42:23 -05:00
|
|
|
|
};
|
|
|
|
|
|
2001-12-14 10:46:00 -05:00
|
|
|
|
/* Forward declarations: */
|
|
|
|
|
|
2008-04-27 06:23:54 -04:00
|
|
|
|
static bool path_simplify (enum url_scheme, char *);
|
1999-12-02 02:42:23 -05:00
|
|
|
|
|
2003-11-07 07:00:23 -05:00
|
|
|
|
/* Support for escaping and unescaping of URL strings. */
|
2003-11-06 20:10:12 -05:00
|
|
|
|
|
2003-11-07 07:00:23 -05:00
|
|
|
|
/* Table of "reserved" and "unsafe" characters. Those terms are
|
|
|
|
|
rfc1738-speak, as such largely obsoleted by rfc2396 and later
|
|
|
|
|
specs, but the general idea remains.
|
|
|
|
|
|
|
|
|
|
A reserved character is the one that you can't decode without
|
|
|
|
|
changing the meaning of the URL. For example, you can't decode
|
|
|
|
|
"/foo/%2f/bar" into "/foo///bar" because the number and contents of
|
|
|
|
|
path components is different. Non-reserved characters can be
|
2005-04-09 07:48:31 -04:00
|
|
|
|
changed, so "/foo/%78/bar" is safe to change to "/foo/x/bar". The
|
|
|
|
|
unsafe characters are loosely based on rfc1738, plus "$" and ",",
|
|
|
|
|
as recommended by rfc2396, and minus "~", which is very frequently
|
|
|
|
|
used (and sometimes unrecognized as %7E by broken servers).
|
|
|
|
|
|
|
|
|
|
An unsafe character is the one that should be encoded when URLs are
|
|
|
|
|
placed in foreign environments. E.g. space and newline are unsafe
|
|
|
|
|
in HTTP contexts because HTTP uses them as separator and line
|
2003-11-07 07:00:23 -05:00
|
|
|
|
terminator, so they must be encoded to %20 and %0A respectively.
|
|
|
|
|
"*" is unsafe in shell context, etc.
|
|
|
|
|
|
|
|
|
|
We determine whether a character is unsafe through static table
|
|
|
|
|
lookup. This code assumes ASCII character set and 8-bit chars. */
|
2001-04-24 20:20:30 -04:00
|
|
|
|
|
|
|
|
|
enum {
|
2003-11-07 07:00:23 -05:00
|
|
|
|
/* rfc1738 reserved chars + "$" and ",". */
|
2001-04-24 20:20:30 -04:00
|
|
|
|
urlchr_reserved = 1,
|
2003-09-14 18:04:13 -04:00
|
|
|
|
|
2003-11-07 07:00:23 -05:00
|
|
|
|
/* rfc1738 unsafe chars, plus non-printables. */
|
2001-04-24 20:20:30 -04:00
|
|
|
|
urlchr_unsafe = 2
|
|
|
|
|
};
|
|
|
|
|
|
2003-09-14 18:04:13 -04:00
|
|
|
|
#define urlchr_test(c, mask) (urlchr_table[(unsigned char)(c)] & (mask))
|
|
|
|
|
#define URL_RESERVED_CHAR(c) urlchr_test(c, urlchr_reserved)
|
|
|
|
|
#define URL_UNSAFE_CHAR(c) urlchr_test(c, urlchr_unsafe)
|
|
|
|
|
|
|
|
|
|
/* Shorthands for the table: */
|
2001-04-24 20:20:30 -04:00
|
|
|
|
#define R urlchr_reserved
|
|
|
|
|
#define U urlchr_unsafe
|
|
|
|
|
#define RU R|U
|
|
|
|
|
|
2005-04-09 07:48:31 -04:00
|
|
|
|
static const unsigned char urlchr_table[256] =
|
2000-11-19 15:50:10 -05:00
|
|
|
|
{
|
2001-04-24 20:20:30 -04:00
|
|
|
|
U, U, U, U, U, U, U, U, /* NUL SOH STX ETX EOT ENQ ACK BEL */
|
|
|
|
|
U, U, U, U, U, U, U, U, /* BS HT LF VT FF CR SO SI */
|
|
|
|
|
U, U, U, U, U, U, U, U, /* DLE DC1 DC2 DC3 DC4 NAK SYN ETB */
|
|
|
|
|
U, U, U, U, U, U, U, U, /* CAN EM SUB ESC FS GS RS US */
|
2003-11-06 20:10:12 -05:00
|
|
|
|
U, 0, U, RU, R, U, R, 0, /* SP ! " # $ % & ' */
|
|
|
|
|
0, 0, 0, R, R, 0, 0, R, /* ( ) * + , - . / */
|
2001-04-24 20:20:30 -04:00
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, /* 0 1 2 3 4 5 6 7 */
|
2001-11-21 19:24:28 -05:00
|
|
|
|
0, 0, RU, R, U, R, U, R, /* 8 9 : ; < = > ? */
|
2001-04-24 20:20:30 -04:00
|
|
|
|
RU, 0, 0, 0, 0, 0, 0, 0, /* @ A B C D E F G */
|
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, /* H I J K L M N O */
|
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, /* P Q R S T U V W */
|
2002-01-26 14:00:38 -05:00
|
|
|
|
0, 0, 0, RU, U, RU, U, 0, /* X Y Z [ \ ] ^ _ */
|
2001-04-24 20:20:30 -04:00
|
|
|
|
U, 0, 0, 0, 0, 0, 0, 0, /* ` a b c d e f g */
|
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, /* h i j k l m n o */
|
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, /* p q r s t u v w */
|
2005-04-09 07:48:31 -04:00
|
|
|
|
0, 0, 0, U, U, U, 0, U, /* x y z { | } ~ DEL */
|
2001-04-24 20:20:30 -04:00
|
|
|
|
|
|
|
|
|
U, U, U, U, U, U, U, U, U, U, U, U, U, U, U, U,
|
|
|
|
|
U, U, U, U, U, U, U, U, U, U, U, U, U, U, U, U,
|
|
|
|
|
U, U, U, U, U, U, U, U, U, U, U, U, U, U, U, U,
|
|
|
|
|
U, U, U, U, U, U, U, U, U, U, U, U, U, U, U, U,
|
|
|
|
|
|
|
|
|
|
U, U, U, U, U, U, U, U, U, U, U, U, U, U, U, U,
|
|
|
|
|
U, U, U, U, U, U, U, U, U, U, U, U, U, U, U, U,
|
|
|
|
|
U, U, U, U, U, U, U, U, U, U, U, U, U, U, U, U,
|
|
|
|
|
U, U, U, U, U, U, U, U, U, U, U, U, U, U, U, U,
|
|
|
|
|
};
|
2003-09-14 18:04:13 -04:00
|
|
|
|
#undef R
|
|
|
|
|
#undef U
|
|
|
|
|
#undef RU
|
2000-11-19 15:50:10 -05:00
|
|
|
|
|
2003-09-16 20:18:52 -04:00
|
|
|
|
/* URL-unescape the string S.
|
|
|
|
|
|
|
|
|
|
This is done by transforming the sequences "%HH" to the character
|
|
|
|
|
represented by the hexadecimal digits HH. If % is not followed by
|
|
|
|
|
two hexadecimal digits, it is inserted literally.
|
|
|
|
|
|
|
|
|
|
The transformation is done in place. If you need the original
|
|
|
|
|
string intact, make a copy before calling this function. */
|
1999-12-02 02:42:23 -05:00
|
|
|
|
|
2014-02-14 09:44:51 -05:00
|
|
|
|
void
|
2003-09-14 18:04:13 -04:00
|
|
|
|
url_unescape (char *s)
|
1999-12-02 02:42:23 -05:00
|
|
|
|
{
|
2006-06-28 07:09:30 -04:00
|
|
|
|
char *t = s; /* t - tortoise */
|
|
|
|
|
char *h = s; /* h - hare */
|
1999-12-02 02:42:23 -05:00
|
|
|
|
|
2001-04-24 20:20:30 -04:00
|
|
|
|
for (; *h; h++, t++)
|
1999-12-02 02:42:23 -05:00
|
|
|
|
{
|
2001-04-24 20:20:30 -04:00
|
|
|
|
if (*h != '%')
|
2006-06-28 07:09:30 -04:00
|
|
|
|
{
|
|
|
|
|
copychar:
|
|
|
|
|
*t = *h;
|
|
|
|
|
}
|
1999-12-02 02:42:23 -05:00
|
|
|
|
else
|
2006-06-28 07:09:30 -04:00
|
|
|
|
{
|
|
|
|
|
char c;
|
|
|
|
|
/* Do nothing if '%' is not followed by two hex digits. */
|
2007-10-14 17:46:24 -04:00
|
|
|
|
if (!h[1] || !h[2] || !(c_isxdigit (h[1]) && c_isxdigit (h[2])))
|
2006-06-28 07:09:30 -04:00
|
|
|
|
goto copychar;
|
|
|
|
|
c = X2DIGITS_TO_NUM (h[1], h[2]);
|
|
|
|
|
/* Don't unescape %00 because there is no way to insert it
|
|
|
|
|
into a C string without effectively truncating it. */
|
|
|
|
|
if (c == '\0')
|
|
|
|
|
goto copychar;
|
|
|
|
|
*t = c;
|
|
|
|
|
h += 2;
|
|
|
|
|
}
|
1999-12-02 02:42:23 -05:00
|
|
|
|
}
|
2001-04-24 20:20:30 -04:00
|
|
|
|
*t = '\0';
|
1999-12-02 02:42:23 -05:00
|
|
|
|
}
|
|
|
|
|
|
2003-09-16 20:18:52 -04:00
|
|
|
|
/* The core of url_escape_* functions. Escapes the characters that
|
|
|
|
|
match the provided mask in urlchr_table.
|
|
|
|
|
|
2005-06-22 15:38:10 -04:00
|
|
|
|
If ALLOW_PASSTHROUGH is true, a string with no unsafe chars will be
|
|
|
|
|
returned unchanged. If ALLOW_PASSTHROUGH is false, a freshly
|
|
|
|
|
allocated string will be returned in all cases. */
|
2001-04-14 00:11:35 -04:00
|
|
|
|
|
|
|
|
|
static char *
|
2005-06-22 15:38:10 -04:00
|
|
|
|
url_escape_1 (const char *s, unsigned char mask, bool allow_passthrough)
|
2001-04-14 00:11:35 -04:00
|
|
|
|
{
|
|
|
|
|
const char *p1;
|
|
|
|
|
char *p2, *newstr;
|
|
|
|
|
int newlen;
|
|
|
|
|
int addition = 0;
|
|
|
|
|
|
|
|
|
|
for (p1 = s; *p1; p1++)
|
2003-09-16 20:18:52 -04:00
|
|
|
|
if (urlchr_test (*p1, mask))
|
2006-06-28 07:09:30 -04:00
|
|
|
|
addition += 2; /* Two more characters (hex digits) */
|
2001-04-14 00:11:35 -04:00
|
|
|
|
|
|
|
|
|
if (!addition)
|
2003-09-16 20:18:52 -04:00
|
|
|
|
return allow_passthrough ? (char *)s : xstrdup (s);
|
2001-04-14 00:11:35 -04:00
|
|
|
|
|
|
|
|
|
newlen = (p1 - s) + addition;
|
2005-06-19 19:03:27 -04:00
|
|
|
|
newstr = xmalloc (newlen + 1);
|
2001-04-14 00:11:35 -04:00
|
|
|
|
|
|
|
|
|
p1 = s;
|
|
|
|
|
p2 = newstr;
|
|
|
|
|
while (*p1)
|
|
|
|
|
{
|
2003-09-16 20:18:52 -04:00
|
|
|
|
/* Quote the characters that match the test mask. */
|
|
|
|
|
if (urlchr_test (*p1, mask))
|
2006-06-28 07:09:30 -04:00
|
|
|
|
{
|
|
|
|
|
unsigned char c = *p1++;
|
|
|
|
|
*p2++ = '%';
|
|
|
|
|
*p2++ = XNUM_TO_DIGIT (c >> 4);
|
|
|
|
|
*p2++ = XNUM_TO_DIGIT (c & 0xf);
|
|
|
|
|
}
|
2001-04-14 00:11:35 -04:00
|
|
|
|
else
|
2006-06-28 07:09:30 -04:00
|
|
|
|
*p2++ = *p1++;
|
2001-04-14 00:11:35 -04:00
|
|
|
|
}
|
|
|
|
|
assert (p2 - newstr == newlen);
|
2003-09-16 20:18:52 -04:00
|
|
|
|
*p2 = '\0';
|
2001-04-14 00:11:35 -04:00
|
|
|
|
|
|
|
|
|
return newstr;
|
|
|
|
|
}
|
|
|
|
|
|
2003-09-16 20:18:52 -04:00
|
|
|
|
/* URL-escape the unsafe characters (see urlchr_table) in a given
|
|
|
|
|
string, returning a freshly allocated string. */
|
|
|
|
|
|
1999-12-02 02:42:23 -05:00
|
|
|
|
char *
|
2003-09-14 18:04:13 -04:00
|
|
|
|
url_escape (const char *s)
|
1999-12-02 02:42:23 -05:00
|
|
|
|
{
|
2005-06-22 15:38:10 -04:00
|
|
|
|
return url_escape_1 (s, urlchr_unsafe, false);
|
1999-12-02 02:42:23 -05:00
|
|
|
|
}
|
2001-04-14 00:11:35 -04:00
|
|
|
|
|
2008-11-12 23:47:52 -05:00
|
|
|
|
/* URL-escape the unsafe and reserved characters (see urlchr_table) in
|
|
|
|
|
a given string, returning a freshly allocated string. */
|
|
|
|
|
|
|
|
|
|
char *
|
|
|
|
|
url_escape_unsafe_and_reserved (const char *s)
|
|
|
|
|
{
|
|
|
|
|
return url_escape_1 (s, urlchr_unsafe|urlchr_reserved, false);
|
|
|
|
|
}
|
|
|
|
|
|
2003-09-16 20:18:52 -04:00
|
|
|
|
/* URL-escape the unsafe characters (see urlchr_table) in a given
|
|
|
|
|
string. If no characters are unsafe, S is returned. */
|
|
|
|
|
|
|
|
|
|
static char *
|
|
|
|
|
url_escape_allow_passthrough (const char *s)
|
|
|
|
|
{
|
2005-06-22 15:38:10 -04:00
|
|
|
|
return url_escape_1 (s, urlchr_unsafe, true);
|
2003-09-16 20:18:52 -04:00
|
|
|
|
}
|
1999-12-02 02:42:23 -05:00
|
|
|
|
|
2005-05-07 11:09:45 -04:00
|
|
|
|
/* Decide whether the char at position P needs to be encoded. (It is
|
|
|
|
|
not enough to pass a single char *P because the function may need
|
|
|
|
|
to inspect the surrounding context.)
|
2005-05-06 20:34:45 -04:00
|
|
|
|
|
2005-06-22 15:38:10 -04:00
|
|
|
|
Return true if the char should be escaped as %XX, false otherwise. */
|
2001-11-21 19:24:28 -05:00
|
|
|
|
|
2005-06-22 15:38:10 -04:00
|
|
|
|
static inline bool
|
2005-05-07 11:09:45 -04:00
|
|
|
|
char_needs_escaping (const char *p)
|
2001-11-21 19:24:28 -05:00
|
|
|
|
{
|
|
|
|
|
if (*p == '%')
|
|
|
|
|
{
|
2007-10-14 17:46:24 -04:00
|
|
|
|
if (c_isxdigit (*(p + 1)) && c_isxdigit (*(p + 2)))
|
2006-06-28 07:09:30 -04:00
|
|
|
|
return false;
|
2001-11-21 19:24:28 -05:00
|
|
|
|
else
|
2006-06-28 07:09:30 -04:00
|
|
|
|
/* Garbled %.. sequence: encode `%'. */
|
|
|
|
|
return true;
|
2001-11-21 19:24:28 -05:00
|
|
|
|
}
|
2003-09-14 18:04:13 -04:00
|
|
|
|
else if (URL_UNSAFE_CHAR (*p) && !URL_RESERVED_CHAR (*p))
|
2005-06-22 15:38:10 -04:00
|
|
|
|
return true;
|
2001-11-21 19:24:28 -05:00
|
|
|
|
else
|
2005-06-22 15:38:10 -04:00
|
|
|
|
return false;
|
2001-11-21 19:24:28 -05:00
|
|
|
|
}
|
|
|
|
|
|
2003-09-14 18:04:13 -04:00
|
|
|
|
/* Translate a %-escaped (but possibly non-conformant) input string S
|
|
|
|
|
into a %-escaped (and conformant) output string. If no characters
|
2001-11-21 19:24:28 -05:00
|
|
|
|
are encoded or decoded, return the same string S; otherwise, return
|
|
|
|
|
a freshly allocated string with the new contents.
|
|
|
|
|
|
|
|
|
|
After a URL has been run through this function, the protocols that
|
|
|
|
|
use `%' as the quote character can use the resulting string as-is,
|
2005-05-06 20:34:45 -04:00
|
|
|
|
while those that don't can use url_unescape to get to the intended
|
|
|
|
|
data. This function is stable: once the input is transformed,
|
|
|
|
|
further transformations of the result yield the same output.
|
2001-11-21 19:24:28 -05:00
|
|
|
|
|
|
|
|
|
Let's discuss why this function is needed.
|
|
|
|
|
|
2005-05-06 20:34:45 -04:00
|
|
|
|
Imagine Wget is asked to retrieve `http://abc.xyz/abc def'. Since
|
|
|
|
|
a raw space character would mess up the HTTP request, it needs to
|
|
|
|
|
be quoted, like this:
|
2001-11-21 19:24:28 -05:00
|
|
|
|
|
|
|
|
|
GET /abc%20def HTTP/1.0
|
|
|
|
|
|
2005-05-07 17:11:43 -04:00
|
|
|
|
It would appear that the unsafe chars need to be quoted, for
|
|
|
|
|
example with url_escape. But what if we're requested to download
|
2003-09-14 18:04:13 -04:00
|
|
|
|
`abc%20def'? url_escape transforms "%" to "%25", which would leave
|
|
|
|
|
us with `abc%2520def'. This is incorrect -- since %-escapes are
|
|
|
|
|
part of URL syntax, "%20" is the correct way to denote a literal
|
2005-05-07 17:11:43 -04:00
|
|
|
|
space on the Wget command line. This leads to the conclusion that
|
|
|
|
|
in that case Wget should not call url_escape, but leave the `%20'
|
|
|
|
|
as is. This is clearly contradictory, but it only gets worse.
|
2003-09-14 18:04:13 -04:00
|
|
|
|
|
2005-05-06 20:34:45 -04:00
|
|
|
|
What if the requested URI is `abc%20 def'? If we call url_escape,
|
|
|
|
|
we end up with `/abc%2520%20def', which is almost certainly not
|
|
|
|
|
intended. If we don't call url_escape, we are left with the
|
|
|
|
|
embedded space and cannot complete the request. What the user
|
|
|
|
|
meant was for Wget to request `/abc%20%20def', and this is where
|
|
|
|
|
reencode_escapes kicks in.
|
2001-11-21 19:24:28 -05:00
|
|
|
|
|
|
|
|
|
Wget used to solve this by first decoding %-quotes, and then
|
|
|
|
|
encoding all the "unsafe" characters found in the resulting string.
|
|
|
|
|
This was wrong because it didn't preserve certain URL special
|
|
|
|
|
(reserved) characters. For instance, URI containing "a%2B+b" (0x2b
|
|
|
|
|
== '+') would get translated to "a%2B%2Bb" or "a++b" depending on
|
|
|
|
|
whether we considered `+' reserved (it is). One of these results
|
|
|
|
|
is inevitable because by the second step we would lose information
|
|
|
|
|
on whether the `+' was originally encoded or not. Both results
|
|
|
|
|
were wrong because in CGI parameters + means space, while %2B means
|
2003-09-14 18:04:13 -04:00
|
|
|
|
literal plus. reencode_escapes correctly translates the above to
|
2001-11-21 19:24:28 -05:00
|
|
|
|
"a%2B+b", i.e. returns the original string.
|
|
|
|
|
|
2005-05-06 20:34:45 -04:00
|
|
|
|
This function uses a modified version of the algorithm originally
|
|
|
|
|
proposed by Anon Sricharoenchai:
|
2001-11-21 19:24:28 -05:00
|
|
|
|
|
2005-05-06 20:34:45 -04:00
|
|
|
|
* Encode all "unsafe" characters, except those that are also
|
|
|
|
|
"reserved", to %XX. See urlchr_table for which characters are
|
|
|
|
|
unsafe and reserved.
|
2001-11-21 19:24:28 -05:00
|
|
|
|
|
2005-05-06 20:34:45 -04:00
|
|
|
|
* Encode the "%" characters not followed by two hex digits to
|
|
|
|
|
"%25".
|
2001-11-21 19:24:28 -05:00
|
|
|
|
|
2005-05-06 20:34:45 -04:00
|
|
|
|
* Pass through all other characters and %XX escapes as-is. (Up to
|
|
|
|
|
Wget 1.10 this decoded %XX escapes corresponding to "safe"
|
|
|
|
|
characters, but that was obtrusive and broke some servers.)
|
2001-11-21 19:24:28 -05:00
|
|
|
|
|
|
|
|
|
Anon's test case:
|
|
|
|
|
|
|
|
|
|
"http://abc.xyz/%20%3F%%36%31%25aa% a?a=%61+a%2Ba&b=b%26c%3Dc"
|
|
|
|
|
->
|
2005-05-06 20:34:45 -04:00
|
|
|
|
"http://abc.xyz/%20%3F%25%36%31%25aa%25%20a?a=%61+a%2Ba&b=b%26c%3Dc"
|
2001-11-21 19:24:28 -05:00
|
|
|
|
|
|
|
|
|
Simpler test cases:
|
|
|
|
|
|
|
|
|
|
"foo bar" -> "foo%20bar"
|
|
|
|
|
"foo%20bar" -> "foo%20bar"
|
|
|
|
|
"foo %20bar" -> "foo%20%20bar"
|
|
|
|
|
"foo%%20bar" -> "foo%25%20bar" (0x25 == '%')
|
|
|
|
|
"foo%25%20bar" -> "foo%25%20bar"
|
|
|
|
|
"foo%2%20bar" -> "foo%252%20bar"
|
|
|
|
|
"foo+bar" -> "foo+bar" (plus is reserved!)
|
|
|
|
|
"foo%2b+bar" -> "foo%2b+bar" */
|
|
|
|
|
|
2001-12-08 20:24:41 -05:00
|
|
|
|
static char *
|
2003-09-14 18:04:13 -04:00
|
|
|
|
reencode_escapes (const char *s)
|
2001-11-21 19:24:28 -05:00
|
|
|
|
{
|
|
|
|
|
const char *p1;
|
|
|
|
|
char *newstr, *p2;
|
|
|
|
|
int oldlen, newlen;
|
|
|
|
|
|
|
|
|
|
int encode_count = 0;
|
|
|
|
|
|
2005-05-07 11:09:45 -04:00
|
|
|
|
/* First pass: inspect the string to see if there's anything to do,
|
2001-11-21 19:24:28 -05:00
|
|
|
|
and to calculate the new length. */
|
|
|
|
|
for (p1 = s; *p1; p1++)
|
2005-05-07 11:09:45 -04:00
|
|
|
|
if (char_needs_escaping (p1))
|
|
|
|
|
++encode_count;
|
2001-11-21 19:24:28 -05:00
|
|
|
|
|
2005-05-06 20:34:45 -04:00
|
|
|
|
if (!encode_count)
|
2001-11-21 19:24:28 -05:00
|
|
|
|
/* The string is good as it is. */
|
2006-06-28 07:09:30 -04:00
|
|
|
|
return (char *) s; /* C const model sucks. */
|
2001-11-21 19:24:28 -05:00
|
|
|
|
|
|
|
|
|
oldlen = p1 - s;
|
2005-05-06 20:34:45 -04:00
|
|
|
|
/* Each encoding adds two characters (hex digits). */
|
|
|
|
|
newlen = oldlen + 2 * encode_count;
|
2001-11-21 19:24:28 -05:00
|
|
|
|
newstr = xmalloc (newlen + 1);
|
|
|
|
|
|
2005-05-07 11:09:45 -04:00
|
|
|
|
/* Second pass: copy the string to the destination address, encoding
|
|
|
|
|
chars when needed. */
|
2001-11-21 19:24:28 -05:00
|
|
|
|
p1 = s;
|
|
|
|
|
p2 = newstr;
|
|
|
|
|
|
|
|
|
|
while (*p1)
|
2005-05-07 11:09:45 -04:00
|
|
|
|
if (char_needs_escaping (p1))
|
|
|
|
|
{
|
2006-06-28 07:09:30 -04:00
|
|
|
|
unsigned char c = *p1++;
|
|
|
|
|
*p2++ = '%';
|
|
|
|
|
*p2++ = XNUM_TO_DIGIT (c >> 4);
|
|
|
|
|
*p2++ = XNUM_TO_DIGIT (c & 0xf);
|
2005-05-07 11:09:45 -04:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
*p2++ = *p1++;
|
|
|
|
|
|
2001-11-21 19:24:28 -05:00
|
|
|
|
*p2 = '\0';
|
|
|
|
|
assert (p2 - newstr == newlen);
|
|
|
|
|
return newstr;
|
|
|
|
|
}
|
|
|
|
|
|
2001-11-18 19:12:05 -05:00
|
|
|
|
/* Returns the scheme type if the scheme is supported, or
|
|
|
|
|
SCHEME_INVALID if not. */
|
2003-09-19 20:05:36 -04:00
|
|
|
|
|
2001-11-18 19:12:05 -05:00
|
|
|
|
enum url_scheme
|
|
|
|
|
url_scheme (const char *url)
|
1999-12-02 02:42:23 -05:00
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
2001-11-21 19:24:28 -05:00
|
|
|
|
for (i = 0; supported_schemes[i].leading_string; i++)
|
2001-12-05 20:13:31 -05:00
|
|
|
|
if (0 == strncasecmp (url, supported_schemes[i].leading_string,
|
2006-06-28 07:09:30 -04:00
|
|
|
|
strlen (supported_schemes[i].leading_string)))
|
2001-12-05 20:13:31 -05:00
|
|
|
|
{
|
2006-06-28 07:09:30 -04:00
|
|
|
|
if (!(supported_schemes[i].flags & scm_disabled))
|
|
|
|
|
return (enum url_scheme) i;
|
|
|
|
|
else
|
|
|
|
|
return SCHEME_INVALID;
|
2001-12-05 20:13:31 -05:00
|
|
|
|
}
|
|
|
|
|
|
2001-11-18 19:12:05 -05:00
|
|
|
|
return SCHEME_INVALID;
|
1999-12-02 02:42:23 -05:00
|
|
|
|
}
|
|
|
|
|
|
2007-10-14 17:46:24 -04:00
|
|
|
|
#define SCHEME_CHAR(ch) (c_isalnum (ch) || (ch) == '-' || (ch) == '+')
|
2001-11-18 01:49:09 -05:00
|
|
|
|
|
2003-09-19 20:05:36 -04:00
|
|
|
|
/* Return 1 if the URL begins with any "scheme", 0 otherwise. As
|
|
|
|
|
currently implemented, it returns true if URL begins with
|
|
|
|
|
[-+a-zA-Z0-9]+: . */
|
1999-12-02 02:42:23 -05:00
|
|
|
|
|
2005-06-22 15:38:10 -04:00
|
|
|
|
bool
|
2001-11-18 19:12:05 -05:00
|
|
|
|
url_has_scheme (const char *url)
|
1999-12-02 02:42:23 -05:00
|
|
|
|
{
|
2001-11-18 01:49:09 -05:00
|
|
|
|
const char *p = url;
|
2003-09-19 20:05:36 -04:00
|
|
|
|
|
|
|
|
|
/* The first char must be a scheme char. */
|
|
|
|
|
if (!*p || !SCHEME_CHAR (*p))
|
2005-06-22 15:38:10 -04:00
|
|
|
|
return false;
|
2003-09-19 20:05:36 -04:00
|
|
|
|
++p;
|
|
|
|
|
/* Followed by 0 or more scheme chars. */
|
|
|
|
|
while (*p && SCHEME_CHAR (*p))
|
2001-11-18 01:49:09 -05:00
|
|
|
|
++p;
|
2003-09-19 20:05:36 -04:00
|
|
|
|
/* Terminated by ':'. */
|
2001-11-18 01:49:09 -05:00
|
|
|
|
return *p == ':';
|
1999-12-02 02:42:23 -05:00
|
|
|
|
}
|
|
|
|
|
|
2010-03-02 15:41:32 -05:00
|
|
|
|
bool
|
|
|
|
|
url_valid_scheme (const char *url)
|
|
|
|
|
{
|
|
|
|
|
enum url_scheme scheme = url_scheme (url);
|
|
|
|
|
return scheme != SCHEME_INVALID;
|
|
|
|
|
}
|
|
|
|
|
|
2001-11-21 19:24:28 -05:00
|
|
|
|
int
|
|
|
|
|
scheme_default_port (enum url_scheme scheme)
|
|
|
|
|
{
|
|
|
|
|
return supported_schemes[scheme].default_port;
|
|
|
|
|
}
|
|
|
|
|
|
2001-12-05 20:13:31 -05:00
|
|
|
|
void
|
|
|
|
|
scheme_disable (enum url_scheme scheme)
|
|
|
|
|
{
|
2005-07-01 22:51:38 -04:00
|
|
|
|
supported_schemes[scheme].flags |= scm_disabled;
|
2001-12-05 20:13:31 -05:00
|
|
|
|
}
|
|
|
|
|
|
2003-12-15 05:22:54 -05:00
|
|
|
|
/* Skip the username and password, if present in the URL. The
|
|
|
|
|
function should *not* be called with the complete URL, but with the
|
|
|
|
|
portion after the scheme.
|
1999-12-02 02:42:23 -05:00
|
|
|
|
|
2003-12-15 05:22:54 -05:00
|
|
|
|
If no username and password are found, return URL. */
|
2001-11-21 19:24:28 -05:00
|
|
|
|
|
2003-12-14 08:42:53 -05:00
|
|
|
|
static const char *
|
2003-09-19 20:05:36 -04:00
|
|
|
|
url_skip_credentials (const char *url)
|
|
|
|
|
{
|
|
|
|
|
/* Look for '@' that comes before terminators, such as '/', '?',
|
|
|
|
|
'#', or ';'. */
|
|
|
|
|
const char *p = (const char *)strpbrk (url, "@/?#;");
|
2001-11-21 19:24:28 -05:00
|
|
|
|
if (!p || *p != '@')
|
2003-12-15 05:22:54 -05:00
|
|
|
|
return url;
|
2003-12-14 08:42:53 -05:00
|
|
|
|
return p + 1;
|
2001-11-21 19:24:28 -05:00
|
|
|
|
}
|
|
|
|
|
|
2003-09-19 20:05:36 -04:00
|
|
|
|
/* Parse credentials contained in [BEG, END). The region is expected
|
|
|
|
|
to have come from a URL and is unescaped. */
|
|
|
|
|
|
2005-06-22 15:38:10 -04:00
|
|
|
|
static bool
|
2003-09-19 20:05:36 -04:00
|
|
|
|
parse_credentials (const char *beg, const char *end, char **user, char **passwd)
|
2001-11-21 19:24:28 -05:00
|
|
|
|
{
|
|
|
|
|
char *colon;
|
2003-09-19 20:05:36 -04:00
|
|
|
|
const char *userend;
|
2001-11-21 19:24:28 -05:00
|
|
|
|
|
2003-09-19 20:05:36 -04:00
|
|
|
|
if (beg == end)
|
2006-06-28 07:09:30 -04:00
|
|
|
|
return false; /* empty user name */
|
2001-11-21 19:24:28 -05:00
|
|
|
|
|
2003-09-19 20:05:36 -04:00
|
|
|
|
colon = memchr (beg, ':', end - beg);
|
|
|
|
|
if (colon == beg)
|
2006-06-28 07:09:30 -04:00
|
|
|
|
return false; /* again empty user name */
|
2001-11-21 19:24:28 -05:00
|
|
|
|
|
|
|
|
|
if (colon)
|
|
|
|
|
{
|
2003-09-19 20:05:36 -04:00
|
|
|
|
*passwd = strdupdelim (colon + 1, end);
|
|
|
|
|
userend = colon;
|
|
|
|
|
url_unescape (*passwd);
|
2001-11-21 19:24:28 -05:00
|
|
|
|
}
|
|
|
|
|
else
|
2003-09-19 20:05:36 -04:00
|
|
|
|
{
|
|
|
|
|
*passwd = NULL;
|
|
|
|
|
userend = end;
|
|
|
|
|
}
|
|
|
|
|
*user = strdupdelim (beg, userend);
|
|
|
|
|
url_unescape (*user);
|
2005-06-22 15:38:10 -04:00
|
|
|
|
return true;
|
1999-12-02 02:42:23 -05:00
|
|
|
|
}
|
2001-11-18 20:14:14 -05:00
|
|
|
|
|
|
|
|
|
/* Used by main.c: detect URLs written using the "shorthand" URL forms
|
2005-07-08 02:31:26 -04:00
|
|
|
|
originally popularized by Netscape and NcFTP. HTTP shorthands look
|
|
|
|
|
like this:
|
2001-11-18 20:14:14 -05:00
|
|
|
|
|
|
|
|
|
www.foo.com[:port]/dir/file -> http://www.foo.com[:port]/dir/file
|
|
|
|
|
www.foo.com[:port] -> http://www.foo.com[:port]
|
|
|
|
|
|
|
|
|
|
FTP shorthands look like this:
|
|
|
|
|
|
|
|
|
|
foo.bar.com:dir/file -> ftp://foo.bar.com/dir/file
|
|
|
|
|
foo.bar.com:/absdir/file -> ftp://foo.bar.com//absdir/file
|
|
|
|
|
|
|
|
|
|
If the URL needs not or cannot be rewritten, return NULL. */
|
2003-09-19 20:05:36 -04:00
|
|
|
|
|
2001-11-18 20:14:14 -05:00
|
|
|
|
char *
|
2001-11-21 19:24:28 -05:00
|
|
|
|
rewrite_shorthand_url (const char *url)
|
2001-11-18 20:14:14 -05:00
|
|
|
|
{
|
|
|
|
|
const char *p;
|
2005-07-08 02:31:26 -04:00
|
|
|
|
char *ret;
|
2001-11-18 20:14:14 -05:00
|
|
|
|
|
2005-04-01 18:59:48 -05:00
|
|
|
|
if (url_scheme (url) != SCHEME_INVALID)
|
2001-11-18 20:14:14 -05:00
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
/* Look for a ':' or '/'. The former signifies NcFTP syntax, the
|
|
|
|
|
latter Netscape. */
|
2005-07-08 02:31:26 -04:00
|
|
|
|
p = strpbrk (url, ":/");
|
2001-11-18 20:14:14 -05:00
|
|
|
|
if (p == url)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
2005-05-12 07:45:05 -04:00
|
|
|
|
/* If we're looking at "://", it means the URL uses a scheme we
|
|
|
|
|
don't support, which may include "https" when compiled without
|
|
|
|
|
SSL support. Don't bogusly rewrite such URLs. */
|
2005-07-08 02:31:26 -04:00
|
|
|
|
if (p && p[0] == ':' && p[1] == '/' && p[2] == '/')
|
2005-05-12 07:45:05 -04:00
|
|
|
|
return NULL;
|
|
|
|
|
|
2005-07-08 02:31:26 -04:00
|
|
|
|
if (p && *p == ':')
|
2001-11-18 20:14:14 -05:00
|
|
|
|
{
|
2005-07-08 02:31:26 -04:00
|
|
|
|
/* Colon indicates ftp, as in foo.bar.com:path. Check for
|
2006-06-28 07:09:30 -04:00
|
|
|
|
special case of http port number ("localhost:10000"). */
|
2005-07-08 02:31:26 -04:00
|
|
|
|
int digits = strspn (p + 1, "0123456789");
|
|
|
|
|
if (digits && (p[1 + digits] == '/' || p[1 + digits] == '\0'))
|
2006-06-28 07:09:30 -04:00
|
|
|
|
goto http;
|
2001-11-18 20:14:14 -05:00
|
|
|
|
|
2005-07-08 02:31:26 -04:00
|
|
|
|
/* Turn "foo.bar.com:path" to "ftp://foo.bar.com/path". */
|
|
|
|
|
ret = aprintf ("ftp://%s", url);
|
|
|
|
|
ret[6 + (p - url)] = '/';
|
2001-11-18 20:14:14 -05:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
http:
|
2005-07-08 02:31:26 -04:00
|
|
|
|
/* Just prepend "http://" to URL. */
|
|
|
|
|
ret = aprintf ("http://%s", url);
|
2001-11-18 20:14:14 -05:00
|
|
|
|
}
|
2005-07-08 02:31:26 -04:00
|
|
|
|
return ret;
|
2001-11-18 20:14:14 -05:00
|
|
|
|
}
|
1999-12-02 02:42:23 -05:00
|
|
|
|
|
2005-06-19 18:34:58 -04:00
|
|
|
|
static void split_path (const char *, char **, char **);
|
1999-12-02 02:42:23 -05:00
|
|
|
|
|
2003-09-14 18:04:13 -04:00
|
|
|
|
/* Like strpbrk, with the exception that it returns the pointer to the
|
|
|
|
|
terminating zero (end-of-string aka "eos") if no matching character
|
2005-07-02 20:03:39 -04:00
|
|
|
|
is found. */
|
2003-09-14 18:04:13 -04:00
|
|
|
|
|
2005-05-07 13:32:25 -04:00
|
|
|
|
static inline char *
|
2001-11-21 19:24:28 -05:00
|
|
|
|
strpbrk_or_eos (const char *s, const char *accept)
|
1999-12-02 02:42:23 -05:00
|
|
|
|
{
|
2001-11-21 19:24:28 -05:00
|
|
|
|
char *p = strpbrk (s, accept);
|
|
|
|
|
if (!p)
|
2005-05-07 13:32:25 -04:00
|
|
|
|
p = strchr (s, '\0');
|
2001-11-21 19:24:28 -05:00
|
|
|
|
return p;
|
1999-12-02 02:42:23 -05:00
|
|
|
|
}
|
2001-11-21 19:24:28 -05:00
|
|
|
|
|
2005-06-22 15:38:10 -04:00
|
|
|
|
/* Turn STR into lowercase; return true if a character was actually
|
|
|
|
|
changed. */
|
2001-11-24 22:10:34 -05:00
|
|
|
|
|
2005-06-22 15:38:10 -04:00
|
|
|
|
static bool
|
2001-11-24 22:10:34 -05:00
|
|
|
|
lowercase_str (char *str)
|
|
|
|
|
{
|
2005-06-22 15:38:10 -04:00
|
|
|
|
bool changed = false;
|
2001-11-24 22:10:34 -05:00
|
|
|
|
for (; *str; str++)
|
2007-10-14 17:46:24 -04:00
|
|
|
|
if (c_isupper (*str))
|
2001-11-24 22:10:34 -05:00
|
|
|
|
{
|
2006-06-28 07:09:30 -04:00
|
|
|
|
changed = true;
|
2007-10-14 17:46:24 -04:00
|
|
|
|
*str = c_tolower (*str);
|
2001-11-24 22:10:34 -05:00
|
|
|
|
}
|
2005-06-22 15:38:10 -04:00
|
|
|
|
return changed;
|
2001-11-24 22:10:34 -05:00
|
|
|
|
}
|
|
|
|
|
|
2005-07-01 22:51:38 -04:00
|
|
|
|
static const char *
|
|
|
|
|
init_seps (enum url_scheme scheme)
|
|
|
|
|
{
|
|
|
|
|
static char seps[8] = ":/";
|
|
|
|
|
char *p = seps + 2;
|
|
|
|
|
int flags = supported_schemes[scheme].flags;
|
|
|
|
|
|
|
|
|
|
if (flags & scm_has_params)
|
|
|
|
|
*p++ = ';';
|
|
|
|
|
if (flags & scm_has_query)
|
|
|
|
|
*p++ = '?';
|
|
|
|
|
if (flags & scm_has_fragment)
|
|
|
|
|
*p++ = '#';
|
2010-10-15 21:04:25 -04:00
|
|
|
|
*p = '\0';
|
2005-07-01 22:51:38 -04:00
|
|
|
|
return seps;
|
|
|
|
|
}
|
|
|
|
|
|
2003-12-14 08:35:27 -05:00
|
|
|
|
static const char *parse_errors[] = {
|
2006-06-28 07:09:30 -04:00
|
|
|
|
#define PE_NO_ERROR 0
|
2003-10-01 15:59:48 -04:00
|
|
|
|
N_("No error"),
|
2006-06-28 07:09:30 -04:00
|
|
|
|
#define PE_UNSUPPORTED_SCHEME 1
|
2009-07-04 05:19:57 -04:00
|
|
|
|
N_("Unsupported scheme %s"), /* support for format token only here */
|
|
|
|
|
#define PE_MISSING_SCHEME 2
|
|
|
|
|
N_("Scheme missing"),
|
|
|
|
|
#define PE_INVALID_HOST_NAME 3
|
2005-07-01 13:22:57 -04:00
|
|
|
|
N_("Invalid host name"),
|
2009-07-04 05:19:57 -04:00
|
|
|
|
#define PE_BAD_PORT_NUMBER 4
|
2003-10-01 15:59:48 -04:00
|
|
|
|
N_("Bad port number"),
|
2009-07-04 05:19:57 -04:00
|
|
|
|
#define PE_INVALID_USER_NAME 5
|
2003-10-01 15:59:48 -04:00
|
|
|
|
N_("Invalid user name"),
|
2009-07-04 05:19:57 -04:00
|
|
|
|
#define PE_UNTERMINATED_IPV6_ADDRESS 6
|
2003-10-01 15:59:48 -04:00
|
|
|
|
N_("Unterminated IPv6 numeric address"),
|
2009-07-04 05:19:57 -04:00
|
|
|
|
#define PE_IPV6_NOT_SUPPORTED 7
|
2003-10-01 15:59:48 -04:00
|
|
|
|
N_("IPv6 addresses not supported"),
|
2009-07-04 05:19:57 -04:00
|
|
|
|
#define PE_INVALID_IPV6_ADDRESS 8
|
2003-10-01 15:59:48 -04:00
|
|
|
|
N_("Invalid IPv6 numeric address")
|
2001-11-18 19:12:05 -05:00
|
|
|
|
};
|
|
|
|
|
|
2001-11-21 19:24:28 -05:00
|
|
|
|
/* Parse a URL.
|
|
|
|
|
|
|
|
|
|
Return a new struct url if successful, NULL on error. In case of
|
|
|
|
|
error, and if ERROR is not NULL, also set *ERROR to the appropriate
|
|
|
|
|
error code. */
|
|
|
|
|
struct url *
|
2008-09-27 05:13:21 -04:00
|
|
|
|
url_parse (const char *url, int *error, struct iri *iri, bool percent_encode)
|
1999-12-02 02:42:23 -05:00
|
|
|
|
{
|
2001-11-21 19:24:28 -05:00
|
|
|
|
struct url *u;
|
|
|
|
|
const char *p;
|
2005-06-22 15:38:10 -04:00
|
|
|
|
bool path_modified, host_modified;
|
2001-11-21 19:24:28 -05:00
|
|
|
|
|
|
|
|
|
enum url_scheme scheme;
|
2005-07-01 13:22:57 -04:00
|
|
|
|
const char *seps;
|
2001-11-21 19:24:28 -05:00
|
|
|
|
|
|
|
|
|
const char *uname_b, *uname_e;
|
|
|
|
|
const char *host_b, *host_e;
|
|
|
|
|
const char *path_b, *path_e;
|
|
|
|
|
const char *params_b, *params_e;
|
|
|
|
|
const char *query_b, *query_e;
|
|
|
|
|
const char *fragment_b, *fragment_e;
|
|
|
|
|
|
|
|
|
|
int port;
|
|
|
|
|
char *user = NULL, *passwd = NULL;
|
|
|
|
|
|
2009-06-25 04:14:11 -04:00
|
|
|
|
const char *url_encoded = NULL;
|
2003-10-01 15:59:48 -04:00
|
|
|
|
|
|
|
|
|
int error_code;
|
2001-11-21 19:24:28 -05:00
|
|
|
|
|
|
|
|
|
scheme = url_scheme (url);
|
|
|
|
|
if (scheme == SCHEME_INVALID)
|
1999-12-02 02:42:23 -05:00
|
|
|
|
{
|
2009-07-04 05:19:57 -04:00
|
|
|
|
if (url_has_scheme (url))
|
|
|
|
|
error_code = PE_UNSUPPORTED_SCHEME;
|
|
|
|
|
else
|
|
|
|
|
error_code = PE_MISSING_SCHEME;
|
2005-06-19 18:34:58 -04:00
|
|
|
|
goto error;
|
1999-12-02 02:42:23 -05:00
|
|
|
|
}
|
2001-11-21 19:24:28 -05:00
|
|
|
|
|
2014-10-06 10:32:37 -04:00
|
|
|
|
url_encoded = url;
|
|
|
|
|
|
2008-07-23 18:56:29 -04:00
|
|
|
|
if (iri && iri->utf8_encode)
|
2008-06-26 11:59:07 -04:00
|
|
|
|
{
|
2014-10-06 10:32:37 -04:00
|
|
|
|
char *new_url = NULL;
|
|
|
|
|
|
2008-09-27 05:13:21 -04:00
|
|
|
|
iri->utf8_encode = remote_to_utf8 (iri, iri->orig_url ? iri->orig_url : url, (const char **) &new_url);
|
2008-07-23 18:56:29 -04:00
|
|
|
|
if (!iri->utf8_encode)
|
|
|
|
|
new_url = NULL;
|
2008-09-27 05:13:21 -04:00
|
|
|
|
else
|
2013-10-10 17:13:13 -04:00
|
|
|
|
{
|
2014-10-09 06:17:07 -04:00
|
|
|
|
xfree_null (iri->orig_url);
|
2013-10-10 17:13:13 -04:00
|
|
|
|
iri->orig_url = xstrdup (url);
|
2014-10-06 10:32:37 -04:00
|
|
|
|
url_encoded = reencode_escapes (new_url);
|
|
|
|
|
if (url_encoded != new_url)
|
|
|
|
|
xfree (new_url);
|
|
|
|
|
percent_encode = false;
|
2013-10-10 17:13:13 -04:00
|
|
|
|
}
|
2008-06-26 11:59:07 -04:00
|
|
|
|
}
|
|
|
|
|
|
2008-09-27 05:13:21 -04:00
|
|
|
|
if (percent_encode)
|
2014-10-06 10:32:37 -04:00
|
|
|
|
url_encoded = reencode_escapes (url);
|
2008-09-27 05:13:21 -04:00
|
|
|
|
|
2001-11-24 22:10:34 -05:00
|
|
|
|
p = url_encoded;
|
2001-11-21 19:24:28 -05:00
|
|
|
|
p += strlen (supported_schemes[scheme].leading_string);
|
|
|
|
|
uname_b = p;
|
2003-12-14 08:42:53 -05:00
|
|
|
|
p = url_skip_credentials (p);
|
2001-11-21 19:24:28 -05:00
|
|
|
|
uname_e = p;
|
|
|
|
|
|
|
|
|
|
/* scheme://user:pass@host[:port]... */
|
|
|
|
|
/* ^ */
|
|
|
|
|
|
|
|
|
|
/* We attempt to break down the URL into the components path,
|
|
|
|
|
params, query, and fragment. They are ordered like this:
|
|
|
|
|
|
|
|
|
|
scheme://host[:port][/path][;params][?query][#fragment] */
|
|
|
|
|
|
2005-07-01 13:22:57 -04:00
|
|
|
|
path_b = path_e = NULL;
|
2001-11-21 19:24:28 -05:00
|
|
|
|
params_b = params_e = NULL;
|
|
|
|
|
query_b = query_e = NULL;
|
|
|
|
|
fragment_b = fragment_e = NULL;
|
|
|
|
|
|
2005-07-01 13:22:57 -04:00
|
|
|
|
/* Initialize separators for optional parts of URL, depending on the
|
|
|
|
|
scheme. For example, FTP has params, and HTTP and HTTPS have
|
|
|
|
|
query string and fragment. */
|
2005-07-01 22:51:38 -04:00
|
|
|
|
seps = init_seps (scheme);
|
2005-07-01 13:22:57 -04:00
|
|
|
|
|
2001-11-21 19:24:28 -05:00
|
|
|
|
host_b = p;
|
2002-01-26 14:00:38 -05:00
|
|
|
|
|
|
|
|
|
if (*p == '[')
|
|
|
|
|
{
|
2003-09-05 16:36:17 -04:00
|
|
|
|
/* Handle IPv6 address inside square brackets. Ideally we'd
|
2006-06-28 07:09:30 -04:00
|
|
|
|
just look for the terminating ']', but rfc2732 mandates
|
|
|
|
|
rejecting invalid IPv6 addresses. */
|
2003-09-05 16:36:17 -04:00
|
|
|
|
|
|
|
|
|
/* The address begins after '['. */
|
|
|
|
|
host_b = p + 1;
|
|
|
|
|
host_e = strchr (host_b, ']');
|
|
|
|
|
|
|
|
|
|
if (!host_e)
|
2006-06-28 07:09:30 -04:00
|
|
|
|
{
|
|
|
|
|
error_code = PE_UNTERMINATED_IPV6_ADDRESS;
|
|
|
|
|
goto error;
|
|
|
|
|
}
|
2003-09-05 16:36:17 -04:00
|
|
|
|
|
2003-09-09 15:30:45 -04:00
|
|
|
|
#ifdef ENABLE_IPV6
|
2003-09-05 16:36:17 -04:00
|
|
|
|
/* Check if the IPv6 address is valid. */
|
|
|
|
|
if (!is_valid_ipv6_address(host_b, host_e))
|
2006-06-28 07:09:30 -04:00
|
|
|
|
{
|
|
|
|
|
error_code = PE_INVALID_IPV6_ADDRESS;
|
|
|
|
|
goto error;
|
|
|
|
|
}
|
2003-09-05 16:36:17 -04:00
|
|
|
|
|
|
|
|
|
/* Continue parsing after the closing ']'. */
|
|
|
|
|
p = host_e + 1;
|
2003-09-09 09:06:58 -04:00
|
|
|
|
#else
|
2003-10-01 15:59:48 -04:00
|
|
|
|
error_code = PE_IPV6_NOT_SUPPORTED;
|
2005-06-19 18:34:58 -04:00
|
|
|
|
goto error;
|
2003-09-09 09:06:58 -04:00
|
|
|
|
#endif
|
2005-07-01 13:22:57 -04:00
|
|
|
|
|
|
|
|
|
/* The closing bracket must be followed by a separator or by the
|
2006-06-28 07:09:30 -04:00
|
|
|
|
null char. */
|
2005-07-01 13:22:57 -04:00
|
|
|
|
/* http://[::1]... */
|
|
|
|
|
/* ^ */
|
|
|
|
|
if (!strchr (seps, *p))
|
2006-06-28 07:09:30 -04:00
|
|
|
|
{
|
|
|
|
|
/* Trailing garbage after []-delimited IPv6 address. */
|
|
|
|
|
error_code = PE_INVALID_HOST_NAME;
|
|
|
|
|
goto error;
|
|
|
|
|
}
|
2002-01-26 14:00:38 -05:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2005-07-01 13:22:57 -04:00
|
|
|
|
p = strpbrk_or_eos (p, seps);
|
2002-01-26 14:00:38 -05:00
|
|
|
|
host_e = p;
|
|
|
|
|
}
|
2006-06-28 07:09:30 -04:00
|
|
|
|
++seps; /* advance to '/' */
|
2001-11-21 19:24:28 -05:00
|
|
|
|
|
|
|
|
|
if (host_b == host_e)
|
2001-11-20 11:03:41 -05:00
|
|
|
|
{
|
2005-07-01 13:22:57 -04:00
|
|
|
|
error_code = PE_INVALID_HOST_NAME;
|
2005-06-19 18:34:58 -04:00
|
|
|
|
goto error;
|
2001-11-20 11:03:41 -05:00
|
|
|
|
}
|
1999-12-02 02:42:23 -05:00
|
|
|
|
|
2001-11-21 19:24:28 -05:00
|
|
|
|
port = scheme_default_port (scheme);
|
|
|
|
|
if (*p == ':')
|
1999-12-02 02:42:23 -05:00
|
|
|
|
{
|
2001-11-21 19:24:28 -05:00
|
|
|
|
const char *port_b, *port_e, *pp;
|
|
|
|
|
|
|
|
|
|
/* scheme://host:port/tralala */
|
|
|
|
|
/* ^ */
|
|
|
|
|
++p;
|
|
|
|
|
port_b = p;
|
2005-07-01 13:22:57 -04:00
|
|
|
|
p = strpbrk_or_eos (p, seps);
|
2001-11-21 19:24:28 -05:00
|
|
|
|
port_e = p;
|
|
|
|
|
|
2003-11-06 20:10:12 -05:00
|
|
|
|
/* Allow empty port, as per rfc2396. */
|
|
|
|
|
if (port_b != port_e)
|
2006-06-28 07:09:30 -04:00
|
|
|
|
for (port = 0, pp = port_b; pp < port_e; pp++)
|
|
|
|
|
{
|
2007-10-14 17:46:24 -04:00
|
|
|
|
if (!c_isdigit (*pp))
|
2006-06-28 07:09:30 -04:00
|
|
|
|
{
|
|
|
|
|
/* http://host:12randomgarbage/blah */
|
|
|
|
|
/* ^ */
|
|
|
|
|
error_code = PE_BAD_PORT_NUMBER;
|
|
|
|
|
goto error;
|
|
|
|
|
}
|
|
|
|
|
port = 10 * port + (*pp - '0');
|
|
|
|
|
/* Check for too large port numbers here, before we have
|
|
|
|
|
a chance to overflow on bogus port values. */
|
|
|
|
|
if (port > 0xffff)
|
|
|
|
|
{
|
|
|
|
|
error_code = PE_BAD_PORT_NUMBER;
|
|
|
|
|
goto error;
|
|
|
|
|
}
|
|
|
|
|
}
|
1999-12-02 02:42:23 -05:00
|
|
|
|
}
|
2005-07-01 13:22:57 -04:00
|
|
|
|
/* Advance to the first separator *after* '/' (either ';' or '?',
|
|
|
|
|
depending on the scheme). */
|
|
|
|
|
++seps;
|
|
|
|
|
|
|
|
|
|
/* Get the optional parts of URL, each part being delimited by
|
|
|
|
|
current location and the position of the next separator. */
|
2006-06-28 07:09:30 -04:00
|
|
|
|
#define GET_URL_PART(sepchar, var) do { \
|
|
|
|
|
if (*p == sepchar) \
|
|
|
|
|
var##_b = ++p, var##_e = p = strpbrk_or_eos (p, seps); \
|
|
|
|
|
++seps; \
|
2005-07-01 13:22:57 -04:00
|
|
|
|
} while (0)
|
|
|
|
|
|
|
|
|
|
GET_URL_PART ('/', path);
|
2005-07-01 22:51:38 -04:00
|
|
|
|
if (supported_schemes[scheme].flags & scm_has_params)
|
|
|
|
|
GET_URL_PART (';', params);
|
|
|
|
|
if (supported_schemes[scheme].flags & scm_has_query)
|
|
|
|
|
GET_URL_PART ('?', query);
|
|
|
|
|
if (supported_schemes[scheme].flags & scm_has_fragment)
|
|
|
|
|
GET_URL_PART ('#', fragment);
|
2005-07-01 13:22:57 -04:00
|
|
|
|
|
|
|
|
|
#undef GET_URL_PART
|
2001-11-21 19:24:28 -05:00
|
|
|
|
assert (*p == 0);
|
|
|
|
|
|
|
|
|
|
if (uname_b != uname_e)
|
1999-12-02 02:42:23 -05:00
|
|
|
|
{
|
2001-11-21 19:24:28 -05:00
|
|
|
|
/* http://user:pass@host */
|
|
|
|
|
/* ^ ^ */
|
|
|
|
|
/* uname_b uname_e */
|
2003-09-19 20:05:36 -04:00
|
|
|
|
if (!parse_credentials (uname_b, uname_e - 1, &user, &passwd))
|
2006-06-28 07:09:30 -04:00
|
|
|
|
{
|
|
|
|
|
error_code = PE_INVALID_USER_NAME;
|
|
|
|
|
goto error;
|
|
|
|
|
}
|
1999-12-02 02:42:23 -05:00
|
|
|
|
}
|
2001-11-21 19:24:28 -05:00
|
|
|
|
|
2003-10-31 09:55:50 -05:00
|
|
|
|
u = xnew0 (struct url);
|
2001-11-21 19:24:28 -05:00
|
|
|
|
u->scheme = scheme;
|
|
|
|
|
u->host = strdupdelim (host_b, host_e);
|
|
|
|
|
u->port = port;
|
|
|
|
|
u->user = user;
|
|
|
|
|
u->passwd = passwd;
|
|
|
|
|
|
|
|
|
|
u->path = strdupdelim (path_b, path_e);
|
2008-04-27 06:23:54 -04:00
|
|
|
|
path_modified = path_simplify (scheme, u->path);
|
2003-09-19 20:05:36 -04:00
|
|
|
|
split_path (u->path, &u->dir, &u->file);
|
2001-11-24 22:10:34 -05:00
|
|
|
|
|
|
|
|
|
host_modified = lowercase_str (u->host);
|
2001-11-21 19:24:28 -05:00
|
|
|
|
|
2004-03-19 16:00:09 -05:00
|
|
|
|
/* Decode %HH sequences in host name. This is important not so much
|
2005-05-06 20:34:45 -04:00
|
|
|
|
to support %HH sequences in host names (which other browser
|
|
|
|
|
don't), but to support binary characters (which will have been
|
|
|
|
|
converted to %HH by reencode_escapes). */
|
2004-03-19 16:00:09 -05:00
|
|
|
|
if (strchr (u->host, '%'))
|
|
|
|
|
{
|
|
|
|
|
url_unescape (u->host);
|
2005-06-22 15:38:10 -04:00
|
|
|
|
host_modified = true;
|
2004-03-19 16:00:09 -05:00
|
|
|
|
|
2008-07-23 18:56:29 -04:00
|
|
|
|
/* Apply IDNA regardless of iri->utf8_encode status */
|
|
|
|
|
if (opt.enable_iri && iri)
|
2008-06-26 11:59:07 -04:00
|
|
|
|
{
|
2008-07-23 18:56:29 -04:00
|
|
|
|
char *new = idn_encode (iri, u->host);
|
|
|
|
|
if (new)
|
|
|
|
|
{
|
|
|
|
|
xfree (u->host);
|
|
|
|
|
u->host = new;
|
|
|
|
|
host_modified = true;
|
|
|
|
|
}
|
2008-06-26 11:59:07 -04:00
|
|
|
|
}
|
2004-03-19 16:00:09 -05:00
|
|
|
|
}
|
|
|
|
|
|
2001-11-21 19:24:28 -05:00
|
|
|
|
if (params_b)
|
|
|
|
|
u->params = strdupdelim (params_b, params_e);
|
|
|
|
|
if (query_b)
|
|
|
|
|
u->query = strdupdelim (query_b, query_e);
|
|
|
|
|
if (fragment_b)
|
|
|
|
|
u->fragment = strdupdelim (fragment_b, fragment_e);
|
|
|
|
|
|
2008-06-26 11:59:07 -04:00
|
|
|
|
if (opt.enable_iri || path_modified || u->fragment || host_modified || path_b == path_e)
|
2001-11-24 22:10:34 -05:00
|
|
|
|
{
|
2001-12-04 16:03:35 -05:00
|
|
|
|
/* If we suspect that a transformation has rendered what
|
2006-06-28 07:09:30 -04:00
|
|
|
|
url_string might return different from URL_ENCODED, rebuild
|
|
|
|
|
u->url using url_string. */
|
2007-07-29 21:22:34 -04:00
|
|
|
|
u->url = url_string (u, URL_AUTH_SHOW);
|
2001-11-24 22:10:34 -05:00
|
|
|
|
|
|
|
|
|
if (url_encoded != url)
|
2006-06-28 07:09:30 -04:00
|
|
|
|
xfree ((char *) url_encoded);
|
2001-11-24 22:10:34 -05:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (url_encoded == url)
|
2006-06-28 07:09:30 -04:00
|
|
|
|
u->url = xstrdup (url);
|
2001-11-24 22:10:34 -05:00
|
|
|
|
else
|
2009-06-25 04:14:11 -04:00
|
|
|
|
u->url = (char *) url_encoded;
|
2001-11-24 22:10:34 -05:00
|
|
|
|
}
|
2001-11-21 19:24:28 -05:00
|
|
|
|
|
|
|
|
|
return u;
|
2003-10-01 15:59:48 -04:00
|
|
|
|
|
2005-06-19 18:34:58 -04:00
|
|
|
|
error:
|
2003-10-01 15:59:48 -04:00
|
|
|
|
/* Cleanup in case of error: */
|
|
|
|
|
if (url_encoded && url_encoded != url)
|
2009-06-25 04:14:11 -04:00
|
|
|
|
xfree ((char *) url_encoded);
|
2003-10-01 15:59:48 -04:00
|
|
|
|
|
|
|
|
|
/* Transmit the error code to the caller, if the caller wants to
|
|
|
|
|
know. */
|
|
|
|
|
if (error)
|
|
|
|
|
*error = error_code;
|
|
|
|
|
return NULL;
|
1999-12-02 02:42:23 -05:00
|
|
|
|
}
|
|
|
|
|
|
2003-10-01 15:59:48 -04:00
|
|
|
|
/* Return the error message string from ERROR_CODE, which should have
|
|
|
|
|
been retrieved from url_parse. The error message is translated. */
|
|
|
|
|
|
2008-08-04 01:03:04 -04:00
|
|
|
|
char *
|
|
|
|
|
url_error (const char *url, int error_code)
|
1999-12-02 02:42:23 -05:00
|
|
|
|
{
|
2008-05-31 01:42:36 -04:00
|
|
|
|
assert (error_code >= 0 && ((size_t) error_code) < countof (parse_errors));
|
2008-08-04 01:03:04 -04:00
|
|
|
|
|
|
|
|
|
if (error_code == PE_UNSUPPORTED_SCHEME)
|
|
|
|
|
{
|
|
|
|
|
char *error, *p;
|
|
|
|
|
char *scheme = xstrdup (url);
|
|
|
|
|
assert (url_has_scheme (url));
|
|
|
|
|
|
|
|
|
|
if ((p = strchr (scheme, ':')))
|
|
|
|
|
*p = '\0';
|
|
|
|
|
if (!strcasecmp (scheme, "https"))
|
2008-09-09 13:26:44 -04:00
|
|
|
|
error = aprintf (_("HTTPS support not compiled in"));
|
2008-08-04 01:03:04 -04:00
|
|
|
|
else
|
2008-09-09 13:26:44 -04:00
|
|
|
|
error = aprintf (_(parse_errors[error_code]), quote (scheme));
|
2008-08-04 01:03:04 -04:00
|
|
|
|
xfree (scheme);
|
|
|
|
|
|
|
|
|
|
return error;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
return xstrdup (_(parse_errors[error_code]));
|
1999-12-02 02:42:23 -05:00
|
|
|
|
}
|
|
|
|
|
|
2003-09-19 20:05:36 -04:00
|
|
|
|
/* Split PATH into DIR and FILE. PATH comes from the URL and is
|
|
|
|
|
expected to be URL-escaped.
|
|
|
|
|
|
|
|
|
|
The path is split into directory (the part up to the last slash)
|
|
|
|
|
and file (the part after the last slash), which are subsequently
|
|
|
|
|
unescaped. Examples:
|
|
|
|
|
|
|
|
|
|
PATH DIR FILE
|
|
|
|
|
"foo/bar/baz" "foo/bar" "baz"
|
|
|
|
|
"foo/bar/" "foo/bar" ""
|
|
|
|
|
"foo" "" "foo"
|
|
|
|
|
"foo/bar/baz%2fqux" "foo/bar" "baz/qux" (!)
|
|
|
|
|
|
|
|
|
|
DIR and FILE are freshly allocated. */
|
2003-09-14 18:04:13 -04:00
|
|
|
|
|
2001-11-21 19:24:28 -05:00
|
|
|
|
static void
|
2003-09-19 20:05:36 -04:00
|
|
|
|
split_path (const char *path, char **dir, char **file)
|
1999-12-02 02:42:23 -05:00
|
|
|
|
{
|
2003-09-19 20:05:36 -04:00
|
|
|
|
char *last_slash = strrchr (path, '/');
|
2001-11-21 19:24:28 -05:00
|
|
|
|
if (!last_slash)
|
1999-12-02 02:42:23 -05:00
|
|
|
|
{
|
2001-11-21 19:24:28 -05:00
|
|
|
|
*dir = xstrdup ("");
|
|
|
|
|
*file = xstrdup (path);
|
1999-12-02 02:42:23 -05:00
|
|
|
|
}
|
|
|
|
|
else
|
2001-11-21 19:24:28 -05:00
|
|
|
|
{
|
|
|
|
|
*dir = strdupdelim (path, last_slash);
|
|
|
|
|
*file = xstrdup (last_slash + 1);
|
|
|
|
|
}
|
2003-09-14 18:04:13 -04:00
|
|
|
|
url_unescape (*dir);
|
|
|
|
|
url_unescape (*file);
|
1999-12-02 02:42:23 -05:00
|
|
|
|
}
|
2001-11-21 19:24:28 -05:00
|
|
|
|
|
|
|
|
|
/* Note: URL's "full path" is the path with the query string and
|
|
|
|
|
params appended. The "fragment" (#foo) is intentionally ignored,
|
|
|
|
|
but that might be changed. For example, if the original URL was
|
|
|
|
|
"http://host:port/foo/bar/baz;bullshit?querystring#uselessfragment",
|
|
|
|
|
the full path will be "/foo/bar/baz;bullshit?querystring". */
|
|
|
|
|
|
|
|
|
|
/* Return the length of the full path, without the terminating
|
|
|
|
|
zero. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
full_path_length (const struct url *url)
|
|
|
|
|
{
|
|
|
|
|
int len = 0;
|
|
|
|
|
|
|
|
|
|
#define FROB(el) if (url->el) len += 1 + strlen (url->el)
|
|
|
|
|
|
|
|
|
|
FROB (path);
|
|
|
|
|
FROB (params);
|
|
|
|
|
FROB (query);
|
|
|
|
|
|
|
|
|
|
#undef FROB
|
|
|
|
|
|
|
|
|
|
return len;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Write out the full path. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
full_path_write (const struct url *url, char *where)
|
|
|
|
|
{
|
2006-06-28 07:09:30 -04:00
|
|
|
|
#define FROB(el, chr) do { \
|
|
|
|
|
char *f_el = url->el; \
|
|
|
|
|
if (f_el) { \
|
|
|
|
|
int l = strlen (f_el); \
|
|
|
|
|
*where++ = chr; \
|
|
|
|
|
memcpy (where, f_el, l); \
|
|
|
|
|
where += l; \
|
|
|
|
|
} \
|
2001-11-21 19:24:28 -05:00
|
|
|
|
} while (0)
|
|
|
|
|
|
|
|
|
|
FROB (path, '/');
|
|
|
|
|
FROB (params, ';');
|
|
|
|
|
FROB (query, '?');
|
|
|
|
|
|
|
|
|
|
#undef FROB
|
|
|
|
|
}
|
|
|
|
|
|
2001-12-01 12:39:07 -05:00
|
|
|
|
/* Public function for getting the "full path". E.g. if u->path is
|
|
|
|
|
"foo/bar" and u->query is "param=value", full_path will be
|
|
|
|
|
"/foo/bar?param=value". */
|
|
|
|
|
|
1999-12-02 02:42:23 -05:00
|
|
|
|
char *
|
2001-11-21 19:24:28 -05:00
|
|
|
|
url_full_path (const struct url *url)
|
1999-12-02 02:42:23 -05:00
|
|
|
|
{
|
2001-11-21 19:24:28 -05:00
|
|
|
|
int length = full_path_length (url);
|
2005-06-19 19:03:27 -04:00
|
|
|
|
char *full_path = xmalloc (length + 1);
|
1999-12-02 02:42:23 -05:00
|
|
|
|
|
2001-11-21 19:24:28 -05:00
|
|
|
|
full_path_write (url, full_path);
|
|
|
|
|
full_path[length] = '\0';
|
1999-12-02 02:42:23 -05:00
|
|
|
|
|
2001-11-21 19:24:28 -05:00
|
|
|
|
return full_path;
|
|
|
|
|
}
|
|
|
|
|
|
2005-03-20 10:07:40 -05:00
|
|
|
|
/* Unescape CHR in an otherwise escaped STR. Used to selectively
|
|
|
|
|
escaping of certain characters, such as "/" and ":". Returns a
|
|
|
|
|
count of unescaped chars. */
|
2001-12-01 12:39:07 -05:00
|
|
|
|
|
2005-03-20 10:07:40 -05:00
|
|
|
|
static void
|
|
|
|
|
unescape_single_char (char *str, char chr)
|
2001-11-21 19:24:28 -05:00
|
|
|
|
{
|
2005-03-20 10:07:40 -05:00
|
|
|
|
const char c1 = XNUM_TO_DIGIT (chr >> 4);
|
|
|
|
|
const char c2 = XNUM_TO_DIGIT (chr & 0xf);
|
2006-06-28 07:09:30 -04:00
|
|
|
|
char *h = str; /* hare */
|
|
|
|
|
char *t = str; /* tortoise */
|
2003-09-16 20:18:52 -04:00
|
|
|
|
for (; *h; h++, t++)
|
1999-12-02 02:42:23 -05:00
|
|
|
|
{
|
2005-03-20 10:07:40 -05:00
|
|
|
|
if (h[0] == '%' && h[1] == c1 && h[2] == c2)
|
2006-06-28 07:09:30 -04:00
|
|
|
|
{
|
|
|
|
|
*t = chr;
|
|
|
|
|
h += 2;
|
|
|
|
|
}
|
2003-09-16 20:18:52 -04:00
|
|
|
|
else
|
2006-06-28 07:09:30 -04:00
|
|
|
|
*t = *h;
|
1999-12-02 02:42:23 -05:00
|
|
|
|
}
|
2003-09-16 20:18:52 -04:00
|
|
|
|
*t = '\0';
|
2005-03-20 10:07:40 -05:00
|
|
|
|
}
|
2003-09-16 20:18:52 -04:00
|
|
|
|
|
2005-03-20 10:07:40 -05:00
|
|
|
|
/* Escape unsafe and reserved characters, except for the slash
|
|
|
|
|
characters. */
|
|
|
|
|
|
|
|
|
|
static char *
|
|
|
|
|
url_escape_dir (const char *dir)
|
|
|
|
|
{
|
|
|
|
|
char *newdir = url_escape_1 (dir, urlchr_unsafe | urlchr_reserved, 1);
|
|
|
|
|
if (newdir == dir)
|
|
|
|
|
return (char *)dir;
|
|
|
|
|
|
|
|
|
|
unescape_single_char (newdir, '/');
|
2003-09-16 20:18:52 -04:00
|
|
|
|
return newdir;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Sync u->path and u->url with u->dir and u->file. Called after
|
|
|
|
|
u->file or u->dir have been changed, typically by the FTP code. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
sync_path (struct url *u)
|
|
|
|
|
{
|
|
|
|
|
char *newpath, *efile, *edir;
|
|
|
|
|
|
|
|
|
|
xfree (u->path);
|
|
|
|
|
|
|
|
|
|
/* u->dir and u->file are not escaped. URL-escape them before
|
|
|
|
|
reassembling them into u->path. That way, if they contain
|
|
|
|
|
separators like '?' or even if u->file contains slashes, the
|
|
|
|
|
path will be correctly assembled. (u->file can contain slashes
|
|
|
|
|
if the URL specifies it with %2f, or if an FTP server returns
|
|
|
|
|
it.) */
|
|
|
|
|
edir = url_escape_dir (u->dir);
|
|
|
|
|
efile = url_escape_1 (u->file, urlchr_unsafe | urlchr_reserved, 1);
|
|
|
|
|
|
|
|
|
|
if (!*edir)
|
|
|
|
|
newpath = xstrdup (efile);
|
2001-11-21 19:24:28 -05:00
|
|
|
|
else
|
2000-06-01 06:47:03 -04:00
|
|
|
|
{
|
2003-09-16 20:18:52 -04:00
|
|
|
|
int dirlen = strlen (edir);
|
|
|
|
|
int filelen = strlen (efile);
|
|
|
|
|
|
|
|
|
|
/* Copy "DIR/FILE" to newpath. */
|
|
|
|
|
char *p = newpath = xmalloc (dirlen + 1 + filelen + 1);
|
|
|
|
|
memcpy (p, edir, dirlen);
|
|
|
|
|
p += dirlen;
|
|
|
|
|
*p++ = '/';
|
|
|
|
|
memcpy (p, efile, filelen);
|
|
|
|
|
p += filelen;
|
2005-05-08 12:25:42 -04:00
|
|
|
|
*p = '\0';
|
2000-06-01 06:47:03 -04:00
|
|
|
|
}
|
2001-11-21 19:24:28 -05:00
|
|
|
|
|
2003-09-16 20:18:52 -04:00
|
|
|
|
u->path = newpath;
|
2001-11-21 19:24:28 -05:00
|
|
|
|
|
2003-09-16 20:18:52 -04:00
|
|
|
|
if (edir != u->dir)
|
|
|
|
|
xfree (edir);
|
|
|
|
|
if (efile != u->file)
|
|
|
|
|
xfree (efile);
|
|
|
|
|
|
|
|
|
|
/* Regenerate u->url as well. */
|
|
|
|
|
xfree (u->url);
|
2007-07-29 21:22:34 -04:00
|
|
|
|
u->url = url_string (u, URL_AUTH_SHOW);
|
1999-12-02 02:42:23 -05:00
|
|
|
|
}
|
|
|
|
|
|
2001-11-21 19:24:28 -05:00
|
|
|
|
/* Mutators. Code in ftp.c insists on changing u->dir and u->file.
|
|
|
|
|
This way we can sync u->path and u->url when they get changed. */
|
1999-12-02 02:42:23 -05:00
|
|
|
|
|
2001-11-21 19:24:28 -05:00
|
|
|
|
void
|
|
|
|
|
url_set_dir (struct url *url, const char *newdir)
|
1999-12-02 02:42:23 -05:00
|
|
|
|
{
|
2001-11-21 19:24:28 -05:00
|
|
|
|
xfree (url->dir);
|
|
|
|
|
url->dir = xstrdup (newdir);
|
|
|
|
|
sync_path (url);
|
|
|
|
|
}
|
1999-12-02 02:42:23 -05:00
|
|
|
|
|
2001-11-21 19:24:28 -05:00
|
|
|
|
void
|
|
|
|
|
url_set_file (struct url *url, const char *newfile)
|
|
|
|
|
{
|
|
|
|
|
xfree (url->file);
|
|
|
|
|
url->file = xstrdup (newfile);
|
|
|
|
|
sync_path (url);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
url_free (struct url *url)
|
|
|
|
|
{
|
|
|
|
|
xfree (url->host);
|
|
|
|
|
xfree (url->path);
|
|
|
|
|
xfree (url->url);
|
|
|
|
|
|
2003-11-02 14:56:37 -05:00
|
|
|
|
xfree_null (url->params);
|
|
|
|
|
xfree_null (url->query);
|
|
|
|
|
xfree_null (url->fragment);
|
|
|
|
|
xfree_null (url->user);
|
|
|
|
|
xfree_null (url->passwd);
|
2001-11-24 22:10:34 -05:00
|
|
|
|
|
|
|
|
|
xfree (url->dir);
|
|
|
|
|
xfree (url->file);
|
2001-11-21 19:24:28 -05:00
|
|
|
|
|
|
|
|
|
xfree (url);
|
1999-12-02 02:42:23 -05:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Create all the necessary directories for PATH (a file). Calls
|
2005-05-16 13:30:07 -04:00
|
|
|
|
make_directory internally. */
|
1999-12-02 02:42:23 -05:00
|
|
|
|
int
|
|
|
|
|
mkalldirs (const char *path)
|
|
|
|
|
{
|
|
|
|
|
const char *p;
|
|
|
|
|
char *t;
|
2005-02-23 17:21:04 -05:00
|
|
|
|
struct_stat st;
|
1999-12-02 02:42:23 -05:00
|
|
|
|
int res;
|
|
|
|
|
|
|
|
|
|
p = path + strlen (path);
|
2003-09-14 18:04:13 -04:00
|
|
|
|
for (; *p != '/' && p != path; p--)
|
|
|
|
|
;
|
|
|
|
|
|
1999-12-02 02:42:23 -05:00
|
|
|
|
/* Don't create if it's just a file. */
|
|
|
|
|
if ((p == path) && (*p != '/'))
|
|
|
|
|
return 0;
|
|
|
|
|
t = strdupdelim (path, p);
|
2003-09-14 18:04:13 -04:00
|
|
|
|
|
1999-12-02 02:42:23 -05:00
|
|
|
|
/* Check whether the directory exists. */
|
|
|
|
|
if ((stat (t, &st) == 0))
|
|
|
|
|
{
|
|
|
|
|
if (S_ISDIR (st.st_mode))
|
2006-06-28 07:09:30 -04:00
|
|
|
|
{
|
|
|
|
|
xfree (t);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
1999-12-02 02:42:23 -05:00
|
|
|
|
else
|
2006-06-28 07:09:30 -04:00
|
|
|
|
{
|
|
|
|
|
/* If the dir exists as a file name, remove it first. This
|
|
|
|
|
is *only* for Wget to work with buggy old CERN http
|
|
|
|
|
servers. Here is the scenario: When Wget tries to
|
|
|
|
|
retrieve a directory without a slash, e.g.
|
|
|
|
|
http://foo/bar (bar being a directory), CERN server will
|
|
|
|
|
not redirect it too http://foo/bar/ -- it will generate a
|
|
|
|
|
directory listing containing links to bar/file1,
|
|
|
|
|
bar/file2, etc. Wget will lose because it saves this
|
|
|
|
|
HTML listing to a file `bar', so it cannot create the
|
|
|
|
|
directory. To work around this, if the file of the same
|
|
|
|
|
name exists, we just remove it and create the directory
|
|
|
|
|
anyway. */
|
|
|
|
|
DEBUGP (("Removing %s because of directory danger!\n", t));
|
|
|
|
|
unlink (t);
|
|
|
|
|
}
|
1999-12-02 02:42:23 -05:00
|
|
|
|
}
|
|
|
|
|
res = make_directory (t);
|
|
|
|
|
if (res != 0)
|
|
|
|
|
logprintf (LOG_NOTQUIET, "%s: %s", t, strerror (errno));
|
2000-11-22 11:58:28 -05:00
|
|
|
|
xfree (t);
|
1999-12-02 02:42:23 -05:00
|
|
|
|
return res;
|
|
|
|
|
}
|
2003-09-14 18:04:13 -04:00
|
|
|
|
|
|
|
|
|
/* Functions for constructing the file name out of URL components. */
|
1999-12-02 02:42:23 -05:00
|
|
|
|
|
2003-09-14 18:04:13 -04:00
|
|
|
|
/* A growable string structure, used by url_file_name and friends.
|
|
|
|
|
This should perhaps be moved to utils.c.
|
|
|
|
|
|
2003-09-16 20:18:52 -04:00
|
|
|
|
The idea is to have a convenient and efficient way to construct a
|
|
|
|
|
string by having various functions append data to it. Instead of
|
|
|
|
|
passing the obligatory BASEVAR, SIZEVAR and TAILPOS to all the
|
2012-10-08 01:08:49 -04:00
|
|
|
|
functions in questions, we pass the pointer to this struct.
|
|
|
|
|
|
|
|
|
|
Functions that write to the members in this struct must make sure
|
|
|
|
|
that base remains null terminated by calling append_null().
|
|
|
|
|
*/
|
2003-09-14 18:04:13 -04:00
|
|
|
|
|
|
|
|
|
struct growable {
|
|
|
|
|
char *base;
|
2012-10-08 01:08:49 -04:00
|
|
|
|
int size; /* memory allocated */
|
|
|
|
|
int tail; /* string length */
|
2003-09-14 18:04:13 -04:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Ensure that the string can accept APPEND_COUNT more characters past
|
|
|
|
|
the current TAIL position. If necessary, this will grow the string
|
|
|
|
|
and update its allocated size. If the string is already large
|
|
|
|
|
enough to take TAIL+APPEND_COUNT characters, this does nothing. */
|
2006-06-28 07:09:30 -04:00
|
|
|
|
#define GROW(g, append_size) do { \
|
|
|
|
|
struct growable *G_ = g; \
|
|
|
|
|
DO_REALLOC (G_->base, G_->size, G_->tail + append_size, char); \
|
2003-09-14 18:04:13 -04:00
|
|
|
|
} while (0)
|
|
|
|
|
|
|
|
|
|
/* Return the tail position of the string. */
|
|
|
|
|
#define TAIL(r) ((r)->base + (r)->tail)
|
|
|
|
|
|
|
|
|
|
/* Move the tail position by APPEND_COUNT characters. */
|
|
|
|
|
#define TAIL_INCR(r, append_count) ((r)->tail += append_count)
|
|
|
|
|
|
|
|
|
|
|
2012-10-08 01:08:49 -04:00
|
|
|
|
/* Append NULL to DEST. */
|
2003-09-14 18:04:13 -04:00
|
|
|
|
static void
|
2012-10-08 01:08:49 -04:00
|
|
|
|
append_null (struct growable *dest)
|
1999-12-02 02:42:23 -05:00
|
|
|
|
{
|
2012-10-08 01:08:49 -04:00
|
|
|
|
GROW (dest, 1);
|
|
|
|
|
*TAIL (dest) = 0;
|
1999-12-02 02:42:23 -05:00
|
|
|
|
}
|
|
|
|
|
|
2012-10-08 01:08:49 -04:00
|
|
|
|
/* Append CH to DEST. */
|
2003-09-14 18:04:13 -04:00
|
|
|
|
static void
|
|
|
|
|
append_char (char ch, struct growable *dest)
|
1999-12-02 02:42:23 -05:00
|
|
|
|
{
|
2012-10-08 01:08:49 -04:00
|
|
|
|
if (ch)
|
|
|
|
|
{
|
|
|
|
|
GROW (dest, 1);
|
|
|
|
|
*TAIL (dest) = ch;
|
|
|
|
|
TAIL_INCR (dest, 1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
append_null (dest);
|
2003-09-14 18:04:13 -04:00
|
|
|
|
}
|
1999-12-02 02:42:23 -05:00
|
|
|
|
|
2012-10-08 01:08:49 -04:00
|
|
|
|
/* Append the string STR to DEST. */
|
|
|
|
|
static void
|
|
|
|
|
append_string (const char *str, struct growable *dest)
|
|
|
|
|
{
|
|
|
|
|
int l = strlen (str);
|
|
|
|
|
|
|
|
|
|
if (l)
|
|
|
|
|
{
|
|
|
|
|
GROW (dest, l);
|
|
|
|
|
memcpy (TAIL (dest), str, l);
|
|
|
|
|
TAIL_INCR (dest, l);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
append_null (dest);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2003-09-14 18:04:13 -04:00
|
|
|
|
enum {
|
2006-06-28 07:09:30 -04:00
|
|
|
|
filechr_not_unix = 1, /* unusable on Unix, / and \0 */
|
2007-10-06 15:44:17 -04:00
|
|
|
|
filechr_not_windows = 2, /* unusable on Windows, one of \|/<>?:*" */
|
2006-06-28 07:09:30 -04:00
|
|
|
|
filechr_control = 4 /* a control character, e.g. 0-31 */
|
2003-09-14 18:04:13 -04:00
|
|
|
|
};
|
1999-12-02 02:42:23 -05:00
|
|
|
|
|
2009-07-28 02:41:26 -04:00
|
|
|
|
#define FILE_CHAR_TEST(c, mask) \
|
|
|
|
|
((opt.restrict_files_nonascii && !c_isascii ((unsigned char)(c))) || \
|
|
|
|
|
(filechr_table[(unsigned char)(c)] & (mask)))
|
2001-11-24 22:10:34 -05:00
|
|
|
|
|
2003-09-14 18:04:13 -04:00
|
|
|
|
/* Shorthands for the table: */
|
2003-09-16 21:32:05 -04:00
|
|
|
|
#define U filechr_not_unix
|
|
|
|
|
#define W filechr_not_windows
|
|
|
|
|
#define C filechr_control
|
1999-12-02 02:42:23 -05:00
|
|
|
|
|
2003-09-16 21:32:05 -04:00
|
|
|
|
#define UW U|W
|
|
|
|
|
#define UWC U|W|C
|
2001-11-24 22:10:34 -05:00
|
|
|
|
|
2003-09-16 21:32:05 -04:00
|
|
|
|
/* Table of characters unsafe under various conditions (see above).
|
1999-12-02 02:42:23 -05:00
|
|
|
|
|
2003-09-14 18:04:13 -04:00
|
|
|
|
Arguably we could also claim `%' to be unsafe, since we use it as
|
|
|
|
|
the escape character. If we ever want to be able to reliably
|
|
|
|
|
translate file name back to URL, this would become important
|
|
|
|
|
crucial. Right now, it's better to be minimal in escaping. */
|
|
|
|
|
|
2005-04-09 07:48:31 -04:00
|
|
|
|
static const unsigned char filechr_table[256] =
|
2003-09-14 18:04:13 -04:00
|
|
|
|
{
|
2003-09-16 21:32:05 -04:00
|
|
|
|
UWC, C, C, C, C, C, C, C, /* NUL SOH STX ETX EOT ENQ ACK BEL */
|
|
|
|
|
C, C, C, C, C, C, C, C, /* BS HT LF VT FF CR SO SI */
|
|
|
|
|
C, C, C, C, C, C, C, C, /* DLE DC1 DC2 DC3 DC4 NAK SYN ETB */
|
|
|
|
|
C, C, C, C, C, C, C, C, /* CAN EM SUB ESC FS GS RS US */
|
2003-09-14 18:04:13 -04:00
|
|
|
|
0, 0, W, 0, 0, 0, 0, 0, /* SP ! " # $ % & ' */
|
2003-09-16 21:32:05 -04:00
|
|
|
|
0, 0, W, 0, 0, 0, 0, UW, /* ( ) * + , - . / */
|
2003-09-14 18:04:13 -04:00
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, /* 0 1 2 3 4 5 6 7 */
|
|
|
|
|
0, 0, W, 0, W, 0, W, W, /* 8 9 : ; < = > ? */
|
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, /* @ A B C D E F G */
|
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, /* H I J K L M N O */
|
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, /* P Q R S T U V W */
|
|
|
|
|
0, 0, 0, 0, W, 0, 0, 0, /* X Y Z [ \ ] ^ _ */
|
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, /* ` a b c d e f g */
|
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, /* h i j k l m n o */
|
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, /* p q r s t u v w */
|
2006-07-10 13:01:03 -04:00
|
|
|
|
0, 0, 0, 0, W, 0, 0, C, /* x y z { | } ~ DEL */
|
1999-12-02 02:42:23 -05:00
|
|
|
|
|
2003-09-16 21:32:05 -04:00
|
|
|
|
C, C, C, C, C, C, C, C, C, C, C, C, C, C, C, C, /* 128-143 */
|
|
|
|
|
C, C, C, C, C, C, C, C, C, C, C, C, C, C, C, C, /* 144-159 */
|
2003-09-14 18:04:13 -04:00
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
2002-04-11 11:25:51 -04:00
|
|
|
|
|
2003-09-14 18:04:13 -04:00
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
|
|
};
|
2003-09-16 21:59:46 -04:00
|
|
|
|
#undef U
|
|
|
|
|
#undef W
|
|
|
|
|
#undef C
|
|
|
|
|
#undef UW
|
|
|
|
|
#undef UWC
|
2003-09-14 18:04:13 -04:00
|
|
|
|
|
|
|
|
|
/* FN_PORT_SEP is the separator between host and port in file names
|
|
|
|
|
for non-standard port numbers. On Unix this is normally ':', as in
|
|
|
|
|
"www.xemacs.org:4001/index.html". Under Windows, we set it to +
|
|
|
|
|
because Windows can't handle ':' in file names. */
|
2003-09-16 21:32:05 -04:00
|
|
|
|
#define FN_PORT_SEP (opt.restrict_files_os != restrict_windows ? ':' : '+')
|
2001-06-18 05:08:04 -04:00
|
|
|
|
|
2003-09-14 18:04:13 -04:00
|
|
|
|
/* FN_QUERY_SEP is the separator between the file name and the URL
|
|
|
|
|
query, normally '?'. Since Windows cannot handle '?' as part of
|
|
|
|
|
file name, we use '@' instead there. */
|
2003-09-16 21:32:05 -04:00
|
|
|
|
#define FN_QUERY_SEP (opt.restrict_files_os != restrict_windows ? '?' : '@')
|
2012-09-29 07:47:53 -04:00
|
|
|
|
#define FN_QUERY_SEP_STR (opt.restrict_files_os != restrict_windows ? "?" : "@")
|
2003-09-14 18:04:13 -04:00
|
|
|
|
|
|
|
|
|
/* Quote path element, characters in [b, e), as file name, and append
|
|
|
|
|
the quoted string to DEST. Each character is quoted as per
|
2003-10-30 10:42:52 -05:00
|
|
|
|
file_unsafe_char and the corresponding table.
|
|
|
|
|
|
2005-06-22 15:38:10 -04:00
|
|
|
|
If ESCAPED is true, the path element is considered to be
|
2003-10-30 10:42:52 -05:00
|
|
|
|
URL-escaped and will be unescaped prior to inspection. */
|
2003-09-14 18:04:13 -04:00
|
|
|
|
|
|
|
|
|
static void
|
2005-06-22 15:38:10 -04:00
|
|
|
|
append_uri_pathel (const char *b, const char *e, bool escaped,
|
2006-06-28 07:09:30 -04:00
|
|
|
|
struct growable *dest)
|
2001-06-18 05:08:04 -04:00
|
|
|
|
{
|
2003-09-14 18:04:13 -04:00
|
|
|
|
const char *p;
|
|
|
|
|
int quoted, outlen;
|
|
|
|
|
|
2003-09-16 21:32:05 -04:00
|
|
|
|
int mask;
|
|
|
|
|
if (opt.restrict_files_os == restrict_unix)
|
|
|
|
|
mask = filechr_not_unix;
|
|
|
|
|
else
|
|
|
|
|
mask = filechr_not_windows;
|
|
|
|
|
if (opt.restrict_files_ctrl)
|
|
|
|
|
mask |= filechr_control;
|
2003-09-14 18:04:13 -04:00
|
|
|
|
|
|
|
|
|
/* Copy [b, e) to PATHEL and URL-unescape it. */
|
2005-06-22 15:38:10 -04:00
|
|
|
|
if (escaped)
|
2003-10-30 10:42:52 -05:00
|
|
|
|
{
|
|
|
|
|
char *unescaped;
|
|
|
|
|
BOUNDED_TO_ALLOCA (b, e, unescaped);
|
|
|
|
|
url_unescape (unescaped);
|
|
|
|
|
b = unescaped;
|
|
|
|
|
e = unescaped + strlen (unescaped);
|
|
|
|
|
}
|
2003-09-14 18:04:13 -04:00
|
|
|
|
|
2003-11-13 20:36:02 -05:00
|
|
|
|
/* Defang ".." when found as component of path. Remember that path
|
|
|
|
|
comes from the URL and might contain malicious input. */
|
|
|
|
|
if (e - b == 2 && b[0] == '.' && b[1] == '.')
|
|
|
|
|
{
|
|
|
|
|
b = "%2E%2E";
|
|
|
|
|
e = b + 6;
|
|
|
|
|
}
|
|
|
|
|
|
2003-10-30 10:42:52 -05:00
|
|
|
|
/* Walk the PATHEL string and check how many characters we'll need
|
2003-11-13 20:36:02 -05:00
|
|
|
|
to quote. */
|
2003-09-14 18:04:13 -04:00
|
|
|
|
quoted = 0;
|
2003-10-30 10:42:52 -05:00
|
|
|
|
for (p = b; p < e; p++)
|
2003-09-16 21:32:05 -04:00
|
|
|
|
if (FILE_CHAR_TEST (*p, mask))
|
2003-09-14 18:04:13 -04:00
|
|
|
|
++quoted;
|
|
|
|
|
|
2003-11-13 20:36:02 -05:00
|
|
|
|
/* Calculate the length of the output string. e-b is the input
|
|
|
|
|
string length. Each quoted char introduces two additional
|
2003-10-30 10:42:52 -05:00
|
|
|
|
characters in the string, hence 2*quoted. */
|
|
|
|
|
outlen = (e - b) + (2 * quoted);
|
2003-09-14 18:04:13 -04:00
|
|
|
|
GROW (dest, outlen);
|
|
|
|
|
|
|
|
|
|
if (!quoted)
|
2001-06-18 05:08:04 -04:00
|
|
|
|
{
|
2003-11-13 20:36:02 -05:00
|
|
|
|
/* If there's nothing to quote, we can simply append the string
|
2006-06-28 07:09:30 -04:00
|
|
|
|
without processing it again. */
|
2003-10-30 10:42:52 -05:00
|
|
|
|
memcpy (TAIL (dest), b, outlen);
|
2001-06-18 05:08:04 -04:00
|
|
|
|
}
|
2003-09-14 18:04:13 -04:00
|
|
|
|
else
|
2001-06-18 05:08:04 -04:00
|
|
|
|
{
|
2003-09-14 18:04:13 -04:00
|
|
|
|
char *q = TAIL (dest);
|
2003-10-30 10:42:52 -05:00
|
|
|
|
for (p = b; p < e; p++)
|
2006-06-28 07:09:30 -04:00
|
|
|
|
{
|
|
|
|
|
if (!FILE_CHAR_TEST (*p, mask))
|
|
|
|
|
*q++ = *p;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
unsigned char ch = *p;
|
|
|
|
|
*q++ = '%';
|
|
|
|
|
*q++ = XNUM_TO_DIGIT (ch >> 4);
|
|
|
|
|
*q++ = XNUM_TO_DIGIT (ch & 0xf);
|
|
|
|
|
}
|
|
|
|
|
}
|
2003-09-14 18:04:13 -04:00
|
|
|
|
assert (q - TAIL (dest) == outlen);
|
2001-06-18 05:08:04 -04:00
|
|
|
|
}
|
2009-09-21 23:39:44 -04:00
|
|
|
|
|
2006-06-13 09:58:33 -04:00
|
|
|
|
/* Perform inline case transformation if required. */
|
|
|
|
|
if (opt.restrict_files_case == restrict_lowercase
|
|
|
|
|
|| opt.restrict_files_case == restrict_uppercase)
|
|
|
|
|
{
|
|
|
|
|
char *q;
|
2007-08-16 04:41:04 -04:00
|
|
|
|
for (q = TAIL (dest); q < TAIL (dest) + outlen; ++q)
|
2006-06-13 09:58:33 -04:00
|
|
|
|
{
|
|
|
|
|
if (opt.restrict_files_case == restrict_lowercase)
|
2007-10-14 17:46:24 -04:00
|
|
|
|
*q = c_tolower (*q);
|
2006-06-13 09:58:33 -04:00
|
|
|
|
else
|
2007-10-14 17:46:24 -04:00
|
|
|
|
*q = c_toupper (*q);
|
2006-06-13 09:58:33 -04:00
|
|
|
|
}
|
|
|
|
|
}
|
2009-09-21 23:39:44 -04:00
|
|
|
|
|
2003-09-14 18:04:13 -04:00
|
|
|
|
TAIL_INCR (dest, outlen);
|
2012-10-08 01:08:49 -04:00
|
|
|
|
append_null (dest);
|
2003-09-14 18:04:13 -04:00
|
|
|
|
}
|
2001-11-21 19:24:28 -05:00
|
|
|
|
|
2003-09-14 18:04:13 -04:00
|
|
|
|
/* Append to DEST the directory structure that corresponds the
|
|
|
|
|
directory part of URL's path. For example, if the URL is
|
|
|
|
|
http://server/dir1/dir2/file, this appends "/dir1/dir2".
|
|
|
|
|
|
|
|
|
|
Each path element ("dir1" and "dir2" in the above example) is
|
|
|
|
|
examined, url-unescaped, and re-escaped as file name element.
|
|
|
|
|
|
|
|
|
|
Additionally, it cuts as many directories from the path as
|
|
|
|
|
specified by opt.cut_dirs. For example, if opt.cut_dirs is 1, it
|
|
|
|
|
will produce "bar" for the above example. For 2 or more, it will
|
|
|
|
|
produce "".
|
|
|
|
|
|
|
|
|
|
Each component of the path is quoted for use as file name. */
|
2001-11-21 19:24:28 -05:00
|
|
|
|
|
2003-09-14 18:04:13 -04:00
|
|
|
|
static void
|
|
|
|
|
append_dir_structure (const struct url *u, struct growable *dest)
|
|
|
|
|
{
|
|
|
|
|
char *pathel, *next;
|
|
|
|
|
int cut = opt.cut_dirs;
|
|
|
|
|
|
|
|
|
|
/* Go through the path components, de-URL-quote them, and quote them
|
|
|
|
|
(if necessary) as file names. */
|
|
|
|
|
|
|
|
|
|
pathel = u->path;
|
|
|
|
|
for (; (next = strchr (pathel, '/')) != NULL; pathel = next + 1)
|
|
|
|
|
{
|
|
|
|
|
if (cut-- > 0)
|
2006-06-28 07:09:30 -04:00
|
|
|
|
continue;
|
2003-09-14 18:04:13 -04:00
|
|
|
|
if (pathel == next)
|
2006-06-28 07:09:30 -04:00
|
|
|
|
/* Ignore empty pathels. */
|
|
|
|
|
continue;
|
2003-09-14 18:04:13 -04:00
|
|
|
|
|
|
|
|
|
if (dest->tail)
|
2006-06-28 07:09:30 -04:00
|
|
|
|
append_char ('/', dest);
|
2005-06-22 15:38:10 -04:00
|
|
|
|
append_uri_pathel (pathel, next, true, dest);
|
2003-09-14 18:04:13 -04:00
|
|
|
|
}
|
2001-06-18 05:08:04 -04:00
|
|
|
|
}
|
|
|
|
|
|
2012-09-29 07:47:53 -04:00
|
|
|
|
/* Return a unique file name that matches the given URL as well as
|
2003-09-14 18:04:13 -04:00
|
|
|
|
possible. Does not create directories on the file system. */
|
|
|
|
|
|
1999-12-02 02:42:23 -05:00
|
|
|
|
char *
|
2010-09-24 08:07:58 -04:00
|
|
|
|
url_file_name (const struct url *u, char *replaced_filename)
|
1999-12-02 02:42:23 -05:00
|
|
|
|
{
|
2006-06-28 07:09:30 -04:00
|
|
|
|
struct growable fnres; /* stands for "file name result" */
|
2012-09-29 07:47:53 -04:00
|
|
|
|
struct growable temp_fnres;
|
2002-04-11 11:25:51 -04:00
|
|
|
|
|
2012-04-24 15:46:06 -04:00
|
|
|
|
const char *u_file;
|
2012-09-29 07:47:53 -04:00
|
|
|
|
char *fname, *unique, *fname_len_check;
|
removed 'const' warnings.
* hash.h (hash_table_put): Make argument "value" const.
* hash.c (hash_table_put): Make argument value const. Cast `value' to
void.
* http.c (request_set_header): Make argument `name' const. Cast `value'
and `name' to void*.
(request_remove_header): Make argument `name' const.
* url.c (url_file_name): Make `index_filename' static.
* warc.h (warc_write_cdx_record): Make `url', `timestamp', `mime_type',
`payload_digest', `redirect_location', `warc_filename', response_uuid'
arguments const. Make `checksum' const.
* warc.c (warc_write_date_header): Make the `timestamp' argument const.
Make `extension' const.
(warc_write_cdx_record): Make `url', `timestamp', `mime_type',
`payload_digest', `redirect_location', `warc_filename', response_uuid'
arguments const. Make `checksum' const.
2012-05-14 11:32:55 -04:00
|
|
|
|
const char *index_filename = "index.html"; /* The default index file is index.html */
|
2012-09-29 07:47:53 -04:00
|
|
|
|
size_t max_length;
|
1999-12-02 02:42:23 -05:00
|
|
|
|
|
2003-09-14 18:04:13 -04:00
|
|
|
|
fnres.base = NULL;
|
|
|
|
|
fnres.size = 0;
|
|
|
|
|
fnres.tail = 0;
|
|
|
|
|
|
2012-09-29 07:47:53 -04:00
|
|
|
|
temp_fnres.base = NULL;
|
|
|
|
|
temp_fnres.size = 0;
|
|
|
|
|
temp_fnres.tail = 0;
|
|
|
|
|
|
2008-08-04 01:12:34 -04:00
|
|
|
|
/* If an alternative index file was defined, change index_filename */
|
|
|
|
|
if (opt.default_page)
|
|
|
|
|
index_filename = opt.default_page;
|
2009-09-21 23:39:44 -04:00
|
|
|
|
|
2008-08-04 01:12:34 -04:00
|
|
|
|
|
2003-09-14 18:04:13 -04:00
|
|
|
|
/* Start with the directory prefix, if specified. */
|
2003-09-19 11:28:36 -04:00
|
|
|
|
if (opt.dir_prefix)
|
2003-09-14 18:04:13 -04:00
|
|
|
|
append_string (opt.dir_prefix, &fnres);
|
|
|
|
|
|
|
|
|
|
/* If "dirstruct" is turned on (typically the case with -r), add
|
|
|
|
|
the host and port (unless those have been turned off) and
|
|
|
|
|
directory structure. */
|
1999-12-02 02:42:23 -05:00
|
|
|
|
if (opt.dirstruct)
|
|
|
|
|
{
|
2003-12-05 22:01:31 -05:00
|
|
|
|
if (opt.protocol_directories)
|
2006-06-28 07:09:30 -04:00
|
|
|
|
{
|
|
|
|
|
if (fnres.tail)
|
|
|
|
|
append_char ('/', &fnres);
|
|
|
|
|
append_string (supported_schemes[u->scheme].name, &fnres);
|
|
|
|
|
}
|
2003-09-14 18:04:13 -04:00
|
|
|
|
if (opt.add_hostdir)
|
2006-06-28 07:09:30 -04:00
|
|
|
|
{
|
|
|
|
|
if (fnres.tail)
|
|
|
|
|
append_char ('/', &fnres);
|
|
|
|
|
if (0 != strcmp (u->host, ".."))
|
|
|
|
|
append_string (u->host, &fnres);
|
|
|
|
|
else
|
|
|
|
|
/* Host name can come from the network; malicious DNS may
|
|
|
|
|
allow ".." to be resolved, causing us to write to
|
|
|
|
|
"../<file>". Defang such host names. */
|
|
|
|
|
append_string ("%2E%2E", &fnres);
|
|
|
|
|
if (u->port != scheme_default_port (u->scheme))
|
|
|
|
|
{
|
|
|
|
|
char portstr[24];
|
|
|
|
|
number_to_string (portstr, u->port);
|
|
|
|
|
append_char (FN_PORT_SEP, &fnres);
|
|
|
|
|
append_string (portstr, &fnres);
|
|
|
|
|
}
|
|
|
|
|
}
|
2003-09-14 18:04:13 -04:00
|
|
|
|
|
|
|
|
|
append_dir_structure (u, &fnres);
|
1999-12-02 02:42:23 -05:00
|
|
|
|
}
|
2002-04-11 11:25:51 -04:00
|
|
|
|
|
2010-09-24 08:07:58 -04:00
|
|
|
|
if (!replaced_filename)
|
|
|
|
|
{
|
2012-09-29 07:47:53 -04:00
|
|
|
|
/* Create the filename. */
|
2010-09-24 08:07:58 -04:00
|
|
|
|
u_file = *u->file ? u->file : index_filename;
|
|
|
|
|
|
2012-09-29 07:47:53 -04:00
|
|
|
|
/* Append "?query" to the file name, even if empty,
|
|
|
|
|
* and create fname_len_check. */
|
2012-04-24 15:46:06 -04:00
|
|
|
|
if (u->query)
|
2012-09-29 07:47:53 -04:00
|
|
|
|
fname_len_check = concat_strings (u_file, FN_QUERY_SEP_STR, u->query, NULL);
|
|
|
|
|
else
|
|
|
|
|
fname_len_check = strdupdelim (u_file, u_file + strlen (u_file));
|
2010-09-24 08:07:58 -04:00
|
|
|
|
}
|
|
|
|
|
else
|
2003-09-14 18:04:13 -04:00
|
|
|
|
{
|
2010-09-24 08:07:58 -04:00
|
|
|
|
u_file = replaced_filename;
|
2012-09-29 07:47:53 -04:00
|
|
|
|
fname_len_check = strdupdelim (u_file, u_file + strlen (u_file));
|
2003-09-14 18:04:13 -04:00
|
|
|
|
}
|
|
|
|
|
|
2012-09-29 07:47:53 -04:00
|
|
|
|
append_uri_pathel (fname_len_check,
|
|
|
|
|
fname_len_check + strlen (fname_len_check), false, &temp_fnres);
|
|
|
|
|
|
|
|
|
|
/* Zero-terminate the temporary file name. */
|
|
|
|
|
append_char ('\0', &temp_fnres);
|
|
|
|
|
|
|
|
|
|
/* Check that the length of the file name is acceptable. */
|
2013-05-21 18:06:25 -04:00
|
|
|
|
#ifdef WINDOWS
|
|
|
|
|
if (MAX_PATH > (fnres.tail + CHOMP_BUFFER + 2))
|
|
|
|
|
{
|
|
|
|
|
max_length = MAX_PATH - (fnres.tail + CHOMP_BUFFER + 2);
|
|
|
|
|
/* FIXME: In Windows a filename is usually limited to 255 characters.
|
|
|
|
|
To really be accurate you could call GetVolumeInformation() to get
|
|
|
|
|
lpMaximumComponentLength
|
|
|
|
|
*/
|
|
|
|
|
if (max_length > 255)
|
|
|
|
|
{
|
|
|
|
|
max_length = 255;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
max_length = 0;
|
|
|
|
|
}
|
|
|
|
|
#else
|
2012-09-29 07:47:53 -04:00
|
|
|
|
max_length = get_max_length (fnres.base, fnres.tail, _PC_NAME_MAX) - CHOMP_BUFFER;
|
2013-05-21 18:06:25 -04:00
|
|
|
|
#endif
|
2012-09-29 07:47:53 -04:00
|
|
|
|
if (max_length > 0 && strlen (temp_fnres.base) > max_length)
|
|
|
|
|
{
|
|
|
|
|
logprintf (LOG_NOTQUIET, "The name is too long, %lu chars total.\n",
|
|
|
|
|
(unsigned long) strlen (temp_fnres.base));
|
|
|
|
|
logprintf (LOG_NOTQUIET, "Trying to shorten...\n");
|
|
|
|
|
|
|
|
|
|
/* Shorten the file name. */
|
|
|
|
|
temp_fnres.base[max_length] = '\0';
|
|
|
|
|
|
|
|
|
|
logprintf (LOG_NOTQUIET, "New name is %s.\n", temp_fnres.base);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
free (fname_len_check);
|
|
|
|
|
|
|
|
|
|
/* The filename has already been 'cleaned' by append_uri_pathel() above. So,
|
|
|
|
|
* just append it. */
|
|
|
|
|
if (fnres.tail)
|
|
|
|
|
append_char ('/', &fnres);
|
|
|
|
|
append_string (temp_fnres.base, &fnres);
|
|
|
|
|
|
2003-09-14 18:04:13 -04:00
|
|
|
|
fname = fnres.base;
|
1999-12-02 02:42:23 -05:00
|
|
|
|
|
2012-09-29 07:47:53 -04:00
|
|
|
|
/* Make a final check that the path length is acceptable? */
|
|
|
|
|
/* TODO: check fnres.base for path length problem */
|
|
|
|
|
|
|
|
|
|
free (temp_fnres.base);
|
|
|
|
|
|
1999-12-02 02:42:23 -05:00
|
|
|
|
/* Check the cases in which the unique extensions are not used:
|
|
|
|
|
1) Clobbering is turned off (-nc).
|
|
|
|
|
2) Retrieval with regetting.
|
|
|
|
|
3) Timestamping is used.
|
|
|
|
|
4) Hierarchy is built.
|
2013-07-10 14:59:34 -04:00
|
|
|
|
5) Backups are specified.
|
1999-12-02 02:42:23 -05:00
|
|
|
|
|
|
|
|
|
The exception is the case when file does exist and is a
|
2003-09-16 17:47:49 -04:00
|
|
|
|
directory (see `mkalldirs' for explanation). */
|
2003-09-14 18:04:13 -04:00
|
|
|
|
|
2013-07-10 14:59:34 -04:00
|
|
|
|
if (ALLOW_CLOBBER
|
2003-09-14 18:04:13 -04:00
|
|
|
|
&& !(file_exists_p (fname) && !file_non_directory_p (fname)))
|
2008-04-22 17:48:36 -04:00
|
|
|
|
{
|
|
|
|
|
unique = fname;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
unique = unique_name (fname, true);
|
|
|
|
|
if (unique != fname)
|
|
|
|
|
xfree (fname);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* On VMS, alter the name as required. */
|
|
|
|
|
#ifdef __VMS
|
|
|
|
|
{
|
|
|
|
|
char *unique2;
|
|
|
|
|
|
|
|
|
|
unique2 = ods_conform( unique);
|
|
|
|
|
if (unique2 != unique)
|
|
|
|
|
{
|
|
|
|
|
xfree (unique);
|
|
|
|
|
unique = unique2;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif /* def __VMS */
|
1999-12-02 02:42:23 -05:00
|
|
|
|
|
2003-09-14 18:04:13 -04:00
|
|
|
|
return unique;
|
1999-12-02 02:42:23 -05:00
|
|
|
|
}
|
2001-12-14 10:46:00 -05:00
|
|
|
|
|
|
|
|
|
/* Resolve "." and ".." elements of PATH by destructively modifying
|
2005-06-22 15:38:10 -04:00
|
|
|
|
PATH and return true if PATH has been modified, false otherwise.
|
2001-12-14 10:46:00 -05:00
|
|
|
|
|
2003-09-22 08:03:34 -04:00
|
|
|
|
The algorithm is in spirit similar to the one described in rfc1808,
|
|
|
|
|
although implemented differently, in one pass. To recap, path
|
|
|
|
|
elements containing only "." are removed, and ".." is taken to mean
|
|
|
|
|
"back up one element". Single leading and trailing slashes are
|
|
|
|
|
preserved.
|
2001-12-14 10:46:00 -05:00
|
|
|
|
|
|
|
|
|
For example, "a/b/c/./../d/.." will yield "a/b/". More exhaustive
|
|
|
|
|
test examples are provided below. If you change anything in this
|
|
|
|
|
function, run test_path_simplify to make sure you haven't broken a
|
2003-09-22 08:03:34 -04:00
|
|
|
|
test case. */
|
2001-12-14 10:46:00 -05:00
|
|
|
|
|
2005-06-22 15:38:10 -04:00
|
|
|
|
static bool
|
2008-04-27 06:23:54 -04:00
|
|
|
|
path_simplify (enum url_scheme scheme, char *path)
|
2001-12-14 10:46:00 -05:00
|
|
|
|
{
|
2006-06-28 07:09:30 -04:00
|
|
|
|
char *h = path; /* hare */
|
|
|
|
|
char *t = path; /* tortoise */
|
2008-04-27 06:23:54 -04:00
|
|
|
|
char *beg = path;
|
2006-02-28 12:41:09 -05:00
|
|
|
|
char *end = strchr (path, '\0');
|
2001-12-14 10:46:00 -05:00
|
|
|
|
|
2003-09-21 20:23:44 -04:00
|
|
|
|
while (h < end)
|
2001-12-14 10:46:00 -05:00
|
|
|
|
{
|
2003-09-21 20:23:44 -04:00
|
|
|
|
/* Hare should be at the beginning of a path element. */
|
2001-12-14 10:46:00 -05:00
|
|
|
|
|
2003-09-21 20:23:44 -04:00
|
|
|
|
if (h[0] == '.' && (h[1] == '/' || h[1] == '\0'))
|
2006-06-28 07:09:30 -04:00
|
|
|
|
{
|
|
|
|
|
/* Ignore "./". */
|
|
|
|
|
h += 2;
|
|
|
|
|
}
|
2003-09-21 20:23:44 -04:00
|
|
|
|
else if (h[0] == '.' && h[1] == '.' && (h[2] == '/' || h[2] == '\0'))
|
2006-06-28 07:09:30 -04:00
|
|
|
|
{
|
|
|
|
|
/* Handle "../" by retreating the tortoise by one path
|
|
|
|
|
element -- but not past beggining. */
|
2008-04-27 06:23:54 -04:00
|
|
|
|
if (t > beg)
|
2006-06-28 07:09:30 -04:00
|
|
|
|
{
|
|
|
|
|
/* Move backwards until T hits the beginning of the
|
|
|
|
|
previous path element or the beginning of path. */
|
2008-04-27 06:23:54 -04:00
|
|
|
|
for (--t; t > beg && t[-1] != '/'; t--)
|
2006-06-28 07:09:30 -04:00
|
|
|
|
;
|
|
|
|
|
}
|
2008-04-27 06:23:54 -04:00
|
|
|
|
else if (scheme == SCHEME_FTP)
|
|
|
|
|
{
|
|
|
|
|
/* If we're at the beginning, copy the "../" literally
|
|
|
|
|
and move the beginning so a later ".." doesn't remove
|
|
|
|
|
it. This violates RFC 3986; but we do it for FTP
|
|
|
|
|
anyway because there is otherwise no way to get at a
|
|
|
|
|
parent directory, when the FTP server drops us in a
|
|
|
|
|
non-root directory (which is not uncommon). */
|
|
|
|
|
beg = t + 3;
|
|
|
|
|
goto regular;
|
|
|
|
|
}
|
2006-06-28 07:09:30 -04:00
|
|
|
|
h += 3;
|
|
|
|
|
}
|
2003-09-21 20:23:44 -04:00
|
|
|
|
else
|
2006-06-28 07:09:30 -04:00
|
|
|
|
{
|
2008-04-27 06:23:54 -04:00
|
|
|
|
regular:
|
2006-06-28 07:09:30 -04:00
|
|
|
|
/* A regular path element. If H hasn't advanced past T,
|
|
|
|
|
simply skip to the next path element. Otherwise, copy
|
|
|
|
|
the path element until the next slash. */
|
|
|
|
|
if (t == h)
|
|
|
|
|
{
|
|
|
|
|
/* Skip the path element, including the slash. */
|
|
|
|
|
while (h < end && *h != '/')
|
|
|
|
|
t++, h++;
|
|
|
|
|
if (h < end)
|
|
|
|
|
t++, h++;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* Copy the path element, including the final slash. */
|
|
|
|
|
while (h < end && *h != '/')
|
|
|
|
|
*t++ = *h++;
|
|
|
|
|
if (h < end)
|
|
|
|
|
*t++ = *h++;
|
|
|
|
|
}
|
|
|
|
|
}
|
2001-12-14 10:46:00 -05:00
|
|
|
|
}
|
2000-10-31 19:26:33 -05:00
|
|
|
|
|
2003-09-21 20:23:44 -04:00
|
|
|
|
if (t != h)
|
|
|
|
|
*t = '\0';
|
|
|
|
|
|
|
|
|
|
return t != h;
|
2001-12-14 10:46:00 -05:00
|
|
|
|
}
|
|
|
|
|
|
2003-11-13 20:36:02 -05:00
|
|
|
|
/* Return the length of URL's path. Path is considered to be
|
2005-07-02 20:03:39 -04:00
|
|
|
|
terminated by one or more of the ?query or ;params or #fragment,
|
|
|
|
|
depending on the scheme. */
|
2003-11-13 20:36:02 -05:00
|
|
|
|
|
2005-07-02 20:03:39 -04:00
|
|
|
|
static const char *
|
|
|
|
|
path_end (const char *url)
|
2003-11-13 20:36:02 -05:00
|
|
|
|
{
|
2005-07-02 20:03:39 -04:00
|
|
|
|
enum url_scheme scheme = url_scheme (url);
|
|
|
|
|
const char *seps;
|
|
|
|
|
if (scheme == SCHEME_INVALID)
|
2006-06-28 07:09:30 -04:00
|
|
|
|
scheme = SCHEME_HTTP; /* use http semantics for rel links */
|
2005-07-02 20:03:39 -04:00
|
|
|
|
/* +2 to ignore the first two separators ':' and '/' */
|
|
|
|
|
seps = init_seps (scheme) + 2;
|
|
|
|
|
return strpbrk_or_eos (url, seps);
|
2003-11-13 20:36:02 -05:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Find the last occurrence of character C in the range [b, e), or
|
2006-02-28 14:27:52 -05:00
|
|
|
|
NULL, if none are present. */
|
|
|
|
|
#define find_last_char(b, e, c) memrchr ((b), (c), (e) - (b))
|
2003-11-13 20:36:02 -05:00
|
|
|
|
|
2003-09-19 20:05:36 -04:00
|
|
|
|
/* Merge BASE with LINK and return the resulting URI.
|
2001-04-14 00:11:35 -04:00
|
|
|
|
|
|
|
|
|
Either of the URIs may be absolute or relative, complete with the
|
2003-09-19 20:05:36 -04:00
|
|
|
|
host name, or path only. This tries to reasonably handle all
|
|
|
|
|
foreseeable cases. It only employs minimal URL parsing, without
|
|
|
|
|
knowledge of the specifics of schemes.
|
2001-04-14 00:11:35 -04:00
|
|
|
|
|
2003-11-13 20:36:02 -05:00
|
|
|
|
I briefly considered making this function call path_simplify after
|
|
|
|
|
the merging process, as rfc1738 seems to suggest. This is a bad
|
|
|
|
|
idea for several reasons: 1) it complexifies the code, and 2)
|
|
|
|
|
url_parse has to simplify path anyway, so it's wasteful to boot. */
|
2003-09-19 20:05:36 -04:00
|
|
|
|
|
|
|
|
|
char *
|
|
|
|
|
uri_merge (const char *base, const char *link)
|
1999-12-02 02:42:23 -05:00
|
|
|
|
{
|
2003-09-19 20:05:36 -04:00
|
|
|
|
int linklength;
|
|
|
|
|
const char *end;
|
|
|
|
|
char *merge;
|
|
|
|
|
|
|
|
|
|
if (url_has_scheme (link))
|
|
|
|
|
return xstrdup (link);
|
1999-12-02 02:42:23 -05:00
|
|
|
|
|
2003-09-19 20:05:36 -04:00
|
|
|
|
/* We may not examine BASE past END. */
|
2005-07-02 20:03:39 -04:00
|
|
|
|
end = path_end (base);
|
2003-09-19 20:05:36 -04:00
|
|
|
|
linklength = strlen (link);
|
|
|
|
|
|
|
|
|
|
if (!*link)
|
|
|
|
|
{
|
|
|
|
|
/* Empty LINK points back to BASE, query string and all. */
|
|
|
|
|
return xstrdup (base);
|
|
|
|
|
}
|
|
|
|
|
else if (*link == '?')
|
|
|
|
|
{
|
|
|
|
|
/* LINK points to the same location, but changes the query
|
2006-06-28 07:09:30 -04:00
|
|
|
|
string. Examples: */
|
2003-09-19 20:05:36 -04:00
|
|
|
|
/* uri_merge("path", "?new") -> "path?new" */
|
|
|
|
|
/* uri_merge("path?foo", "?new") -> "path?new" */
|
|
|
|
|
/* uri_merge("path?foo#bar", "?new") -> "path?new" */
|
|
|
|
|
/* uri_merge("path#foo", "?new") -> "path?new" */
|
|
|
|
|
int baselength = end - base;
|
|
|
|
|
merge = xmalloc (baselength + linklength + 1);
|
|
|
|
|
memcpy (merge, base, baselength);
|
|
|
|
|
memcpy (merge + baselength, link, linklength);
|
|
|
|
|
merge[baselength + linklength] = '\0';
|
|
|
|
|
}
|
|
|
|
|
else if (*link == '#')
|
|
|
|
|
{
|
|
|
|
|
/* uri_merge("path", "#new") -> "path#new" */
|
|
|
|
|
/* uri_merge("path#foo", "#new") -> "path#new" */
|
|
|
|
|
/* uri_merge("path?foo", "#new") -> "path?foo#new" */
|
|
|
|
|
/* uri_merge("path?foo#bar", "#new") -> "path?foo#new" */
|
|
|
|
|
int baselength;
|
|
|
|
|
const char *end1 = strchr (base, '#');
|
|
|
|
|
if (!end1)
|
2006-06-28 07:09:30 -04:00
|
|
|
|
end1 = base + strlen (base);
|
2003-09-19 20:05:36 -04:00
|
|
|
|
baselength = end1 - base;
|
|
|
|
|
merge = xmalloc (baselength + linklength + 1);
|
|
|
|
|
memcpy (merge, base, baselength);
|
|
|
|
|
memcpy (merge + baselength, link, linklength);
|
|
|
|
|
merge[baselength + linklength] = '\0';
|
|
|
|
|
}
|
|
|
|
|
else if (*link == '/' && *(link + 1) == '/')
|
|
|
|
|
{
|
|
|
|
|
/* LINK begins with "//" and so is a net path: we need to
|
2006-06-28 07:09:30 -04:00
|
|
|
|
replace everything after (and including) the double slash
|
|
|
|
|
with LINK. */
|
2003-09-19 20:05:36 -04:00
|
|
|
|
|
|
|
|
|
/* uri_merge("foo", "//new/bar") -> "//new/bar" */
|
|
|
|
|
/* uri_merge("//old/foo", "//new/bar") -> "//new/bar" */
|
|
|
|
|
/* uri_merge("http://old/foo", "//new/bar") -> "http://new/bar" */
|
|
|
|
|
|
|
|
|
|
int span;
|
|
|
|
|
const char *slash;
|
|
|
|
|
const char *start_insert;
|
|
|
|
|
|
|
|
|
|
/* Look for first slash. */
|
|
|
|
|
slash = memchr (base, '/', end - base);
|
|
|
|
|
/* If found slash and it is a double slash, then replace
|
2006-06-28 07:09:30 -04:00
|
|
|
|
from this point, else default to replacing from the
|
|
|
|
|
beginning. */
|
2003-09-19 20:05:36 -04:00
|
|
|
|
if (slash && *(slash + 1) == '/')
|
2006-06-28 07:09:30 -04:00
|
|
|
|
start_insert = slash;
|
2003-09-19 20:05:36 -04:00
|
|
|
|
else
|
2006-06-28 07:09:30 -04:00
|
|
|
|
start_insert = base;
|
2003-09-19 20:05:36 -04:00
|
|
|
|
|
|
|
|
|
span = start_insert - base;
|
2005-06-19 19:03:27 -04:00
|
|
|
|
merge = xmalloc (span + linklength + 1);
|
2003-09-19 20:05:36 -04:00
|
|
|
|
if (span)
|
2006-06-28 07:09:30 -04:00
|
|
|
|
memcpy (merge, base, span);
|
2003-09-19 20:05:36 -04:00
|
|
|
|
memcpy (merge + span, link, linklength);
|
|
|
|
|
merge[span + linklength] = '\0';
|
|
|
|
|
}
|
|
|
|
|
else if (*link == '/')
|
1999-12-02 02:42:23 -05:00
|
|
|
|
{
|
2003-09-19 20:05:36 -04:00
|
|
|
|
/* LINK is an absolute path: we need to replace everything
|
2006-06-28 07:09:30 -04:00
|
|
|
|
after (and including) the FIRST slash with LINK.
|
2003-09-19 20:05:36 -04:00
|
|
|
|
|
2006-06-28 07:09:30 -04:00
|
|
|
|
So, if BASE is "http://host/whatever/foo/bar", and LINK is
|
|
|
|
|
"/qux/xyzzy", our result should be
|
|
|
|
|
"http://host/qux/xyzzy". */
|
2003-09-19 20:05:36 -04:00
|
|
|
|
int span;
|
|
|
|
|
const char *slash;
|
|
|
|
|
const char *start_insert = NULL; /* for gcc to shut up. */
|
|
|
|
|
const char *pos = base;
|
2005-06-22 15:38:10 -04:00
|
|
|
|
bool seen_slash_slash = false;
|
2003-09-19 20:05:36 -04:00
|
|
|
|
/* We're looking for the first slash, but want to ignore
|
2006-06-28 07:09:30 -04:00
|
|
|
|
double slash. */
|
2003-09-19 20:05:36 -04:00
|
|
|
|
again:
|
|
|
|
|
slash = memchr (pos, '/', end - pos);
|
|
|
|
|
if (slash && !seen_slash_slash)
|
2006-06-28 07:09:30 -04:00
|
|
|
|
if (*(slash + 1) == '/')
|
|
|
|
|
{
|
|
|
|
|
pos = slash + 2;
|
|
|
|
|
seen_slash_slash = true;
|
|
|
|
|
goto again;
|
|
|
|
|
}
|
1999-12-02 02:42:23 -05:00
|
|
|
|
|
2003-09-19 20:05:36 -04:00
|
|
|
|
/* At this point, SLASH is the location of the first / after
|
2006-06-28 07:09:30 -04:00
|
|
|
|
"//", or the first slash altogether. START_INSERT is the
|
|
|
|
|
pointer to the location where LINK will be inserted. When
|
|
|
|
|
examining the last two examples, keep in mind that LINK
|
|
|
|
|
begins with '/'. */
|
2003-09-19 20:05:36 -04:00
|
|
|
|
|
|
|
|
|
if (!slash && !seen_slash_slash)
|
2006-06-28 07:09:30 -04:00
|
|
|
|
/* example: "foo" */
|
|
|
|
|
/* ^ */
|
|
|
|
|
start_insert = base;
|
2003-09-19 20:05:36 -04:00
|
|
|
|
else if (!slash && seen_slash_slash)
|
2006-06-28 07:09:30 -04:00
|
|
|
|
/* example: "http://foo" */
|
|
|
|
|
/* ^ */
|
|
|
|
|
start_insert = end;
|
2003-09-19 20:05:36 -04:00
|
|
|
|
else if (slash && !seen_slash_slash)
|
2006-06-28 07:09:30 -04:00
|
|
|
|
/* example: "foo/bar" */
|
|
|
|
|
/* ^ */
|
|
|
|
|
start_insert = base;
|
2003-09-19 20:05:36 -04:00
|
|
|
|
else if (slash && seen_slash_slash)
|
2006-06-28 07:09:30 -04:00
|
|
|
|
/* example: "http://something/" */
|
|
|
|
|
/* ^ */
|
|
|
|
|
start_insert = slash;
|
2003-09-19 20:05:36 -04:00
|
|
|
|
|
|
|
|
|
span = start_insert - base;
|
2005-06-19 19:03:27 -04:00
|
|
|
|
merge = xmalloc (span + linklength + 1);
|
2003-09-19 20:05:36 -04:00
|
|
|
|
if (span)
|
2006-06-28 07:09:30 -04:00
|
|
|
|
memcpy (merge, base, span);
|
2003-09-19 20:05:36 -04:00
|
|
|
|
memcpy (merge + span, link, linklength);
|
|
|
|
|
merge[span + linklength] = '\0';
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* LINK is a relative URL: we need to replace everything
|
2006-06-28 07:09:30 -04:00
|
|
|
|
after last slash (possibly empty) with LINK.
|
2003-09-19 20:05:36 -04:00
|
|
|
|
|
2006-06-28 07:09:30 -04:00
|
|
|
|
So, if BASE is "whatever/foo/bar", and LINK is "qux/xyzzy",
|
|
|
|
|
our result should be "whatever/foo/qux/xyzzy". */
|
2005-06-22 15:38:10 -04:00
|
|
|
|
bool need_explicit_slash = false;
|
2003-09-19 20:05:36 -04:00
|
|
|
|
int span;
|
|
|
|
|
const char *start_insert;
|
|
|
|
|
const char *last_slash = find_last_char (base, end, '/');
|
|
|
|
|
if (!last_slash)
|
2006-06-28 07:09:30 -04:00
|
|
|
|
{
|
|
|
|
|
/* No slash found at all. Replace what we have with LINK. */
|
|
|
|
|
start_insert = base;
|
|
|
|
|
}
|
2003-09-19 20:05:36 -04:00
|
|
|
|
else if (last_slash && last_slash >= base + 2
|
2006-06-28 07:09:30 -04:00
|
|
|
|
&& last_slash[-2] == ':' && last_slash[-1] == '/')
|
|
|
|
|
{
|
|
|
|
|
/* example: http://host" */
|
|
|
|
|
/* ^ */
|
|
|
|
|
start_insert = end + 1;
|
|
|
|
|
need_explicit_slash = true;
|
|
|
|
|
}
|
2001-11-24 22:10:34 -05:00
|
|
|
|
else
|
2006-06-28 07:09:30 -04:00
|
|
|
|
{
|
|
|
|
|
/* example: "whatever/foo/bar" */
|
|
|
|
|
/* ^ */
|
|
|
|
|
start_insert = last_slash + 1;
|
|
|
|
|
}
|
2003-09-19 20:05:36 -04:00
|
|
|
|
|
|
|
|
|
span = start_insert - base;
|
2005-06-19 19:03:27 -04:00
|
|
|
|
merge = xmalloc (span + linklength + 1);
|
2003-09-19 20:05:36 -04:00
|
|
|
|
if (span)
|
2006-06-28 07:09:30 -04:00
|
|
|
|
memcpy (merge, base, span);
|
2003-09-19 20:05:36 -04:00
|
|
|
|
if (need_explicit_slash)
|
2006-06-28 07:09:30 -04:00
|
|
|
|
merge[span - 1] = '/';
|
2003-09-19 20:05:36 -04:00
|
|
|
|
memcpy (merge + span, link, linklength);
|
|
|
|
|
merge[span + linklength] = '\0';
|
1999-12-02 02:42:23 -05:00
|
|
|
|
}
|
2000-10-31 14:25:32 -05:00
|
|
|
|
|
2003-09-19 20:05:36 -04:00
|
|
|
|
return merge;
|
2000-10-31 14:25:32 -05:00
|
|
|
|
}
|
1999-12-02 02:42:23 -05:00
|
|
|
|
|
2006-06-28 07:09:30 -04:00
|
|
|
|
#define APPEND(p, s) do { \
|
|
|
|
|
int len = strlen (s); \
|
|
|
|
|
memcpy (p, s, len); \
|
|
|
|
|
p += len; \
|
2001-11-21 19:24:28 -05:00
|
|
|
|
} while (0)
|
|
|
|
|
|
|
|
|
|
/* Use this instead of password when the actual password is supposed
|
|
|
|
|
to be hidden. We intentionally use a generic string without giving
|
|
|
|
|
away the number of characters in the password, like previous
|
|
|
|
|
versions did. */
|
|
|
|
|
#define HIDDEN_PASSWORD "*password*"
|
|
|
|
|
|
|
|
|
|
/* Recreate the URL string from the data in URL.
|
|
|
|
|
|
2005-06-22 15:38:10 -04:00
|
|
|
|
If HIDE is true (as it is when we're calling this on a URL we plan
|
|
|
|
|
to print, but not when calling it to canonicalize a URL for use
|
|
|
|
|
within the program), password will be hidden. Unsafe characters in
|
|
|
|
|
the URL will be quoted. */
|
2001-11-21 19:24:28 -05:00
|
|
|
|
|
|
|
|
|
char *
|
2007-07-29 21:22:34 -04:00
|
|
|
|
url_string (const struct url *url, enum url_auth_mode auth_mode)
|
1999-12-02 02:42:23 -05:00
|
|
|
|
{
|
2001-11-21 19:24:28 -05:00
|
|
|
|
int size;
|
|
|
|
|
char *result, *p;
|
2005-03-20 10:07:40 -05:00
|
|
|
|
char *quoted_host, *quoted_user = NULL, *quoted_passwd = NULL;
|
2001-11-21 19:24:28 -05:00
|
|
|
|
|
2005-06-22 15:38:10 -04:00
|
|
|
|
int scheme_port = supported_schemes[url->scheme].default_port;
|
2003-12-05 22:01:31 -05:00
|
|
|
|
const char *scheme_str = supported_schemes[url->scheme].leading_string;
|
2001-11-21 19:24:28 -05:00
|
|
|
|
int fplen = full_path_length (url);
|
|
|
|
|
|
2005-06-22 15:38:10 -04:00
|
|
|
|
bool brackets_around_host;
|
2002-01-26 14:00:38 -05:00
|
|
|
|
|
2001-11-21 19:24:28 -05:00
|
|
|
|
assert (scheme_str != NULL);
|
|
|
|
|
|
|
|
|
|
/* Make sure the user name and password are quoted. */
|
|
|
|
|
if (url->user)
|
|
|
|
|
{
|
2007-07-29 21:22:34 -04:00
|
|
|
|
if (auth_mode != URL_AUTH_HIDE)
|
2006-06-28 07:09:30 -04:00
|
|
|
|
{
|
2007-07-29 21:22:34 -04:00
|
|
|
|
quoted_user = url_escape_allow_passthrough (url->user);
|
|
|
|
|
if (url->passwd)
|
|
|
|
|
{
|
2007-08-16 04:27:02 -04:00
|
|
|
|
if (auth_mode == URL_AUTH_HIDE_PASSWD)
|
2014-05-11 17:20:49 -04:00
|
|
|
|
quoted_passwd = (char *) HIDDEN_PASSWORD;
|
2007-07-29 21:22:34 -04:00
|
|
|
|
else
|
|
|
|
|
quoted_passwd = url_escape_allow_passthrough (url->passwd);
|
|
|
|
|
}
|
2006-06-28 07:09:30 -04:00
|
|
|
|
}
|
2001-11-21 19:24:28 -05:00
|
|
|
|
}
|
|
|
|
|
|
2005-03-20 10:07:40 -05:00
|
|
|
|
/* In the unlikely event that the host name contains non-printable
|
|
|
|
|
characters, quote it for displaying to the user. */
|
|
|
|
|
quoted_host = url_escape_allow_passthrough (url->host);
|
|
|
|
|
|
|
|
|
|
/* Undo the quoting of colons that URL escaping performs. IPv6
|
|
|
|
|
addresses may legally contain colons, and in that case must be
|
|
|
|
|
placed in square brackets. */
|
|
|
|
|
if (quoted_host != url->host)
|
|
|
|
|
unescape_single_char (quoted_host, ':');
|
|
|
|
|
brackets_around_host = strchr (quoted_host, ':') != NULL;
|
2002-01-26 14:00:38 -05:00
|
|
|
|
|
2001-11-21 19:24:28 -05:00
|
|
|
|
size = (strlen (scheme_str)
|
2006-06-28 07:09:30 -04:00
|
|
|
|
+ strlen (quoted_host)
|
|
|
|
|
+ (brackets_around_host ? 2 : 0)
|
|
|
|
|
+ fplen
|
|
|
|
|
+ 1);
|
2001-11-21 19:24:28 -05:00
|
|
|
|
if (url->port != scheme_port)
|
|
|
|
|
size += 1 + numdigit (url->port);
|
|
|
|
|
if (quoted_user)
|
|
|
|
|
{
|
|
|
|
|
size += 1 + strlen (quoted_user);
|
|
|
|
|
if (quoted_passwd)
|
2006-06-28 07:09:30 -04:00
|
|
|
|
size += 1 + strlen (quoted_passwd);
|
2001-11-21 19:24:28 -05:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
p = result = xmalloc (size);
|
|
|
|
|
|
|
|
|
|
APPEND (p, scheme_str);
|
|
|
|
|
if (quoted_user)
|
|
|
|
|
{
|
|
|
|
|
APPEND (p, quoted_user);
|
|
|
|
|
if (quoted_passwd)
|
2006-06-28 07:09:30 -04:00
|
|
|
|
{
|
|
|
|
|
*p++ = ':';
|
|
|
|
|
APPEND (p, quoted_passwd);
|
|
|
|
|
}
|
2001-11-21 19:24:28 -05:00
|
|
|
|
*p++ = '@';
|
|
|
|
|
}
|
|
|
|
|
|
2002-01-26 14:00:38 -05:00
|
|
|
|
if (brackets_around_host)
|
|
|
|
|
*p++ = '[';
|
2005-03-20 10:07:40 -05:00
|
|
|
|
APPEND (p, quoted_host);
|
2002-01-26 14:00:38 -05:00
|
|
|
|
if (brackets_around_host)
|
|
|
|
|
*p++ = ']';
|
2001-11-21 19:24:28 -05:00
|
|
|
|
if (url->port != scheme_port)
|
|
|
|
|
{
|
|
|
|
|
*p++ = ':';
|
2001-12-09 21:29:12 -05:00
|
|
|
|
p = number_to_string (p, url->port);
|
2001-11-21 19:24:28 -05:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
full_path_write (url, p);
|
|
|
|
|
p += fplen;
|
|
|
|
|
*p++ = '\0';
|
|
|
|
|
|
|
|
|
|
assert (p - result == size);
|
|
|
|
|
|
|
|
|
|
if (quoted_user && quoted_user != url->user)
|
|
|
|
|
xfree (quoted_user);
|
2007-07-29 21:22:34 -04:00
|
|
|
|
if (quoted_passwd && auth_mode == URL_AUTH_SHOW
|
|
|
|
|
&& quoted_passwd != url->passwd)
|
2001-11-21 19:24:28 -05:00
|
|
|
|
xfree (quoted_passwd);
|
2005-03-20 10:07:40 -05:00
|
|
|
|
if (quoted_host != url->host)
|
|
|
|
|
xfree (quoted_host);
|
2001-11-21 19:24:28 -05:00
|
|
|
|
|
|
|
|
|
return result;
|
1999-12-02 02:42:23 -05:00
|
|
|
|
}
|
|
|
|
|
|
2005-06-22 15:38:10 -04:00
|
|
|
|
/* Return true if scheme a is similar to scheme b.
|
2009-09-21 23:39:44 -04:00
|
|
|
|
|
2002-05-16 13:22:24 -04:00
|
|
|
|
Schemes are similar if they are equal. If SSL is supported, schemes
|
|
|
|
|
are also similar if one is http (SCHEME_HTTP) and the other is https
|
|
|
|
|
(SCHEME_HTTPS). */
|
2005-06-22 15:38:10 -04:00
|
|
|
|
bool
|
2002-05-16 13:22:24 -04:00
|
|
|
|
schemes_are_similar_p (enum url_scheme a, enum url_scheme b)
|
|
|
|
|
{
|
|
|
|
|
if (a == b)
|
2005-06-22 15:38:10 -04:00
|
|
|
|
return true;
|
2002-05-16 13:22:24 -04:00
|
|
|
|
#ifdef HAVE_SSL
|
|
|
|
|
if ((a == SCHEME_HTTP && b == SCHEME_HTTPS)
|
|
|
|
|
|| (a == SCHEME_HTTPS && b == SCHEME_HTTP))
|
2005-06-22 15:38:10 -04:00
|
|
|
|
return true;
|
2002-05-16 13:22:24 -04:00
|
|
|
|
#endif
|
2005-06-22 15:38:10 -04:00
|
|
|
|
return false;
|
2002-05-16 13:22:24 -04:00
|
|
|
|
}
|
2001-12-14 10:46:00 -05:00
|
|
|
|
|
2006-06-28 07:09:30 -04:00
|
|
|
|
static int
|
|
|
|
|
getchar_from_escaped_string (const char *str, char *c)
|
2008-09-27 05:13:21 -04:00
|
|
|
|
{
|
2006-06-28 07:09:30 -04:00
|
|
|
|
const char *p = str;
|
|
|
|
|
|
|
|
|
|
assert (str && *str);
|
|
|
|
|
assert (c);
|
2008-09-27 05:13:21 -04:00
|
|
|
|
|
2006-06-28 07:09:30 -04:00
|
|
|
|
if (p[0] == '%')
|
|
|
|
|
{
|
2007-10-14 17:46:24 -04:00
|
|
|
|
if (!c_isxdigit(p[1]) || !c_isxdigit(p[2]))
|
2006-06-28 07:09:30 -04:00
|
|
|
|
{
|
|
|
|
|
*c = '%';
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (p[2] == 0)
|
|
|
|
|
return 0; /* error: invalid string */
|
|
|
|
|
|
|
|
|
|
*c = X2DIGITS_TO_NUM (p[1], p[2]);
|
2007-08-30 00:39:33 -04:00
|
|
|
|
if (URL_RESERVED_CHAR(*c))
|
|
|
|
|
{
|
|
|
|
|
*c = '%';
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
return 3;
|
2006-06-28 07:09:30 -04:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
*c = p[0];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool
|
|
|
|
|
are_urls_equal (const char *u1, const char *u2)
|
|
|
|
|
{
|
|
|
|
|
const char *p, *q;
|
|
|
|
|
int pp, qq;
|
|
|
|
|
char ch1, ch2;
|
2007-08-30 00:36:30 -04:00
|
|
|
|
assert(u1 && u2);
|
2006-06-28 07:09:30 -04:00
|
|
|
|
|
|
|
|
|
p = u1;
|
|
|
|
|
q = u2;
|
|
|
|
|
|
2007-08-30 00:36:30 -04:00
|
|
|
|
while (*p && *q
|
2006-06-28 07:09:30 -04:00
|
|
|
|
&& (pp = getchar_from_escaped_string (p, &ch1))
|
|
|
|
|
&& (qq = getchar_from_escaped_string (q, &ch2))
|
2007-10-14 17:46:24 -04:00
|
|
|
|
&& (c_tolower(ch1) == c_tolower(ch2)))
|
2006-06-28 07:09:30 -04:00
|
|
|
|
{
|
|
|
|
|
p += pp;
|
|
|
|
|
q += qq;
|
|
|
|
|
}
|
2008-09-27 05:13:21 -04:00
|
|
|
|
|
2006-06-28 07:09:30 -04:00
|
|
|
|
return (*p == 0 && *q == 0 ? true : false);
|
|
|
|
|
}
|
|
|
|
|
|
2008-04-27 06:23:54 -04:00
|
|
|
|
#ifdef TESTING
|
2001-12-14 10:46:00 -05:00
|
|
|
|
/* Debugging and testing support for path_simplify. */
|
|
|
|
|
|
2008-04-27 06:23:54 -04:00
|
|
|
|
#if 0
|
2001-12-14 10:46:00 -05:00
|
|
|
|
/* Debug: run path_simplify on PATH and return the result in a new
|
|
|
|
|
string. Useful for calling from the debugger. */
|
|
|
|
|
static char *
|
|
|
|
|
ps (char *path)
|
|
|
|
|
{
|
|
|
|
|
char *copy = xstrdup (path);
|
|
|
|
|
path_simplify (copy);
|
|
|
|
|
return copy;
|
|
|
|
|
}
|
2008-04-27 06:23:54 -04:00
|
|
|
|
#endif
|
2001-12-14 10:46:00 -05:00
|
|
|
|
|
2008-04-27 06:23:54 -04:00
|
|
|
|
static const char *
|
2014-05-11 17:20:49 -04:00
|
|
|
|
run_test (const char *test, const char *expected_result, enum url_scheme scheme,
|
2008-04-27 06:23:54 -04:00
|
|
|
|
bool expected_change)
|
2001-12-14 10:46:00 -05:00
|
|
|
|
{
|
|
|
|
|
char *test_copy = xstrdup (test);
|
2008-04-27 06:23:54 -04:00
|
|
|
|
bool modified = path_simplify (scheme, test_copy);
|
2001-12-14 10:46:00 -05:00
|
|
|
|
|
|
|
|
|
if (0 != strcmp (test_copy, expected_result))
|
|
|
|
|
{
|
|
|
|
|
printf ("Failed path_simplify(\"%s\"): expected \"%s\", got \"%s\".\n",
|
2006-06-28 07:09:30 -04:00
|
|
|
|
test, expected_result, test_copy);
|
2008-04-27 06:23:54 -04:00
|
|
|
|
mu_assert ("", 0);
|
2001-12-14 10:46:00 -05:00
|
|
|
|
}
|
|
|
|
|
if (modified != expected_change)
|
|
|
|
|
{
|
2005-06-22 15:38:10 -04:00
|
|
|
|
if (expected_change)
|
2006-06-28 07:09:30 -04:00
|
|
|
|
printf ("Expected modification with path_simplify(\"%s\").\n",
|
|
|
|
|
test);
|
2001-12-14 10:46:00 -05:00
|
|
|
|
else
|
2006-06-28 07:09:30 -04:00
|
|
|
|
printf ("Expected no modification with path_simplify(\"%s\").\n",
|
|
|
|
|
test);
|
2001-12-14 10:46:00 -05:00
|
|
|
|
}
|
|
|
|
|
xfree (test_copy);
|
2008-04-27 06:23:54 -04:00
|
|
|
|
mu_assert ("", modified == expected_change);
|
|
|
|
|
return NULL;
|
2001-12-14 10:46:00 -05:00
|
|
|
|
}
|
|
|
|
|
|
2008-04-27 06:23:54 -04:00
|
|
|
|
const char *
|
2001-12-14 10:46:00 -05:00
|
|
|
|
test_path_simplify (void)
|
|
|
|
|
{
|
2014-05-11 17:20:49 -04:00
|
|
|
|
static const struct {
|
|
|
|
|
const char *test, *result;
|
2008-04-27 06:23:54 -04:00
|
|
|
|
enum url_scheme scheme;
|
2005-06-22 15:38:10 -04:00
|
|
|
|
bool should_modify;
|
2001-12-14 10:46:00 -05:00
|
|
|
|
} tests[] = {
|
2008-04-27 06:23:54 -04:00
|
|
|
|
{ "", "", SCHEME_HTTP, false },
|
|
|
|
|
{ ".", "", SCHEME_HTTP, true },
|
|
|
|
|
{ "./", "", SCHEME_HTTP, true },
|
|
|
|
|
{ "..", "", SCHEME_HTTP, true },
|
|
|
|
|
{ "../", "", SCHEME_HTTP, true },
|
|
|
|
|
{ "..", "..", SCHEME_FTP, false },
|
|
|
|
|
{ "../", "../", SCHEME_FTP, false },
|
|
|
|
|
{ "foo", "foo", SCHEME_HTTP, false },
|
|
|
|
|
{ "foo/bar", "foo/bar", SCHEME_HTTP, false },
|
|
|
|
|
{ "foo///bar", "foo///bar", SCHEME_HTTP, false },
|
|
|
|
|
{ "foo/.", "foo/", SCHEME_HTTP, true },
|
|
|
|
|
{ "foo/./", "foo/", SCHEME_HTTP, true },
|
|
|
|
|
{ "foo./", "foo./", SCHEME_HTTP, false },
|
|
|
|
|
{ "foo/../bar", "bar", SCHEME_HTTP, true },
|
|
|
|
|
{ "foo/../bar/", "bar/", SCHEME_HTTP, true },
|
|
|
|
|
{ "foo/bar/..", "foo/", SCHEME_HTTP, true },
|
|
|
|
|
{ "foo/bar/../x", "foo/x", SCHEME_HTTP, true },
|
|
|
|
|
{ "foo/bar/../x/", "foo/x/", SCHEME_HTTP, true },
|
|
|
|
|
{ "foo/..", "", SCHEME_HTTP, true },
|
|
|
|
|
{ "foo/../..", "", SCHEME_HTTP, true },
|
|
|
|
|
{ "foo/../../..", "", SCHEME_HTTP, true },
|
|
|
|
|
{ "foo/../../bar/../../baz", "baz", SCHEME_HTTP, true },
|
|
|
|
|
{ "foo/../..", "..", SCHEME_FTP, true },
|
|
|
|
|
{ "foo/../../..", "../..", SCHEME_FTP, true },
|
|
|
|
|
{ "foo/../../bar/../../baz", "../../baz", SCHEME_FTP, true },
|
|
|
|
|
{ "a/b/../../c", "c", SCHEME_HTTP, true },
|
|
|
|
|
{ "./a/../b", "b", SCHEME_HTTP, true }
|
2001-12-14 10:46:00 -05:00
|
|
|
|
};
|
2014-05-11 17:20:49 -04:00
|
|
|
|
unsigned i;
|
2001-12-14 10:46:00 -05:00
|
|
|
|
|
2003-09-19 10:08:37 -04:00
|
|
|
|
for (i = 0; i < countof (tests); i++)
|
2001-12-14 10:46:00 -05:00
|
|
|
|
{
|
2008-04-27 06:23:54 -04:00
|
|
|
|
const char *message;
|
2014-05-11 17:20:49 -04:00
|
|
|
|
const char *test = tests[i].test;
|
|
|
|
|
const char *expected_result = tests[i].result;
|
2008-04-27 06:23:54 -04:00
|
|
|
|
enum url_scheme scheme = tests[i].scheme;
|
2005-06-22 15:38:10 -04:00
|
|
|
|
bool expected_change = tests[i].should_modify;
|
2014-05-11 17:20:49 -04:00
|
|
|
|
|
2008-04-27 06:23:54 -04:00
|
|
|
|
message = run_test (test, expected_result, scheme, expected_change);
|
|
|
|
|
if (message) return message;
|
2001-12-14 10:46:00 -05:00
|
|
|
|
}
|
2008-04-27 06:23:54 -04:00
|
|
|
|
return NULL;
|
2001-12-14 10:46:00 -05:00
|
|
|
|
}
|
2006-06-13 09:58:33 -04:00
|
|
|
|
|
|
|
|
|
const char *
|
2014-05-11 17:20:49 -04:00
|
|
|
|
test_append_uri_pathel(void)
|
2006-06-13 09:58:33 -04:00
|
|
|
|
{
|
2014-05-11 17:20:49 -04:00
|
|
|
|
unsigned i;
|
|
|
|
|
static const struct {
|
|
|
|
|
const char *original_url;
|
|
|
|
|
const char *input;
|
2006-06-13 09:58:33 -04:00
|
|
|
|
bool escaped;
|
2014-05-11 17:20:49 -04:00
|
|
|
|
const char *expected_result;
|
2006-06-13 09:58:33 -04:00
|
|
|
|
} test_array[] = {
|
|
|
|
|
{ "http://www.yoyodyne.com/path/", "somepage.html", false, "http://www.yoyodyne.com/path/somepage.html" },
|
|
|
|
|
};
|
2008-09-27 05:13:21 -04:00
|
|
|
|
|
2014-05-11 17:20:49 -04:00
|
|
|
|
for (i = 0; i < countof(test_array); ++i)
|
2006-06-13 09:58:33 -04:00
|
|
|
|
{
|
|
|
|
|
struct growable dest;
|
|
|
|
|
const char *p = test_array[i].input;
|
2009-09-21 23:39:44 -04:00
|
|
|
|
|
2006-06-13 09:58:33 -04:00
|
|
|
|
memset (&dest, 0, sizeof (dest));
|
2009-09-21 23:39:44 -04:00
|
|
|
|
|
2006-06-13 09:58:33 -04:00
|
|
|
|
append_string (test_array[i].original_url, &dest);
|
|
|
|
|
append_uri_pathel (p, p + strlen(p), test_array[i].escaped, &dest);
|
|
|
|
|
|
2009-09-21 23:39:44 -04:00
|
|
|
|
mu_assert ("test_append_uri_pathel: wrong result",
|
2006-06-13 09:58:33 -04:00
|
|
|
|
strcmp (dest.base, test_array[i].expected_result) == 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2014-05-11 17:20:49 -04:00
|
|
|
|
const char *
|
|
|
|
|
test_are_urls_equal(void)
|
2006-06-28 07:09:30 -04:00
|
|
|
|
{
|
2014-05-11 17:20:49 -04:00
|
|
|
|
unsigned i;
|
|
|
|
|
static const struct {
|
|
|
|
|
const char *url1;
|
|
|
|
|
const char *url2;
|
2006-06-28 07:09:30 -04:00
|
|
|
|
bool expected_result;
|
|
|
|
|
} test_array[] = {
|
|
|
|
|
{ "http://www.adomain.com/apath/", "http://www.adomain.com/apath/", true },
|
|
|
|
|
{ "http://www.adomain.com/apath/", "http://www.adomain.com/anotherpath/", false },
|
|
|
|
|
{ "http://www.adomain.com/apath/", "http://www.anotherdomain.com/path/", false },
|
|
|
|
|
{ "http://www.adomain.com/~path/", "http://www.adomain.com/%7epath/", true },
|
2007-08-30 00:36:30 -04:00
|
|
|
|
{ "http://www.adomain.com/longer-path/", "http://www.adomain.com/path/", false },
|
|
|
|
|
{ "http://www.adomain.com/path%2f", "http://www.adomain.com/path/", false },
|
2006-06-28 07:09:30 -04:00
|
|
|
|
};
|
2009-09-21 23:39:44 -04:00
|
|
|
|
|
2014-05-11 17:20:49 -04:00
|
|
|
|
for (i = 0; i < countof(test_array); ++i)
|
2006-06-28 07:09:30 -04:00
|
|
|
|
{
|
2009-09-21 23:39:44 -04:00
|
|
|
|
mu_assert ("test_are_urls_equal: wrong result",
|
2006-06-28 07:09:30 -04:00
|
|
|
|
are_urls_equal (test_array[i].url1, test_array[i].url2) == test_array[i].expected_result);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2006-06-13 09:58:33 -04:00
|
|
|
|
#endif /* TESTING */
|
|
|
|
|
|
2006-06-28 07:09:30 -04:00
|
|
|
|
/*
|
|
|
|
|
* vim: et ts=2 sw=2
|
|
|
|
|
*/
|