[uri] Refactor URI parsing and formatting
Add support for parsing of URIs containing literal IPv6 addresses (e.g. "http://[fe80::69ff:fe50:5845%25net0]/boot.ipxe"). Duplicate URIs by directly copying the relevant fields, rather than by formatting and reparsing a URI string. This relaxes the requirements on the URI formatting code and allows it to focus on generating human-readable URIs (e.g. by not escaping ':' characters within literal IPv6 addresses). As a side-effect, this allows relative URIs containing parameter lists (e.g. "../boot.php##params") to function as expected. Add validity check for FTP paths to ensure that only printable characters are accepted (since FTP is a human-readable line-based protocol with no support for character escaping). Construct TFTP next-server+filename URIs directly, rather than parsing a constructed "tftp://..." string, Add self-tests for URI functions. Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
+2
-11
@@ -91,8 +91,6 @@ static struct net_device * find_boot_netdev ( void ) {
|
||||
*/
|
||||
static struct uri * parse_next_server_and_filename ( struct in_addr next_server,
|
||||
const char *filename ) {
|
||||
char buf[ 23 /* "tftp://xxx.xxx.xxx.xxx/" */ + strlen ( filename )
|
||||
+ 1 /* NUL */ ];
|
||||
struct uri *uri;
|
||||
|
||||
/* Parse filename */
|
||||
@@ -100,17 +98,10 @@ static struct uri * parse_next_server_and_filename ( struct in_addr next_server,
|
||||
if ( ! uri )
|
||||
return NULL;
|
||||
|
||||
/* Construct a tftp:// URI for the filename, if applicable.
|
||||
* We can't just rely on the current working URI, because the
|
||||
* relative URI resolution will remove the distinction between
|
||||
* filenames with and without initial slashes, which is
|
||||
* significant for TFTP.
|
||||
*/
|
||||
/* Construct a TFTP URI for the filename, if applicable */
|
||||
if ( next_server.s_addr && filename[0] && ! uri_is_absolute ( uri ) ) {
|
||||
uri_put ( uri );
|
||||
snprintf ( buf, sizeof ( buf ), "tftp://%s/%s",
|
||||
inet_ntoa ( next_server ), filename );
|
||||
uri = parse_uri ( buf );
|
||||
uri = tftp_uri ( next_server, filename );
|
||||
if ( ! uri )
|
||||
return NULL;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user