From: Felix Fietkau <nbd@nbd.name>
Date: Tue, 5 Jul 2016 10:39:01 +0000 (+0200)
Subject: http: add support for relative location on redirect
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuclient.git;a=commitdiff_plain;h=4fdad31fd199ef97b078f6355463d64ce598e85e

http: add support for relative location on redirect

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---

diff --git a/uclient-backend.h b/uclient-backend.h
index 84d7b87..c2b9fd5 100644
--- a/uclient-backend.h
+++ b/uclient-backend.h
@@ -40,5 +40,6 @@ void uclient_backend_set_error(struct uclient *cl, int code);
 void uclient_backend_set_eof(struct uclient *cl);
 void uclient_backend_reset_state(struct uclient *cl);
 struct uclient_url *uclient_get_url(const char *url_str, const char *auth_str);
+struct uclient_url *uclient_get_url_location(struct uclient_url *url, const char *location);
 
 #endif
diff --git a/uclient-http.c b/uclient-http.c
index f0451cc..899f367 100644
--- a/uclient-http.c
+++ b/uclient-http.c
@@ -1114,7 +1114,7 @@ int uclient_http_redirect(struct uclient *cl)
 	if (!tb)
 		return false;
 
-	url = uclient_get_url(blobmsg_data(tb), url->auth);
+	url = uclient_get_url_location(url, blobmsg_data(tb));
 	if (!url)
 		return false;
 
diff --git a/uclient.c b/uclient.c
index 3b3864f..8862b55 100644
--- a/uclient.c
+++ b/uclient.c
@@ -121,6 +121,61 @@ uclient_split_host(const char *base, int *host_len)
 }
 
 struct uclient_url __hidden *
+uclient_get_url_location(struct uclient_url *url, const char *location)
+{
+	struct uclient_url *new_url;
+	char *host_buf, *uri_buf, *auth_buf, *port_buf;
+	int host_len = strlen(url->host) + 1;
+	int auth_len = url->auth ? strlen(url->auth) + 1 : 0;
+	int port_len = url->port ? strlen(url->port) + 1 : 0;
+	int uri_len;
+
+	if (strstr(location, "://"))
+		return uclient_get_url(location, url->auth);
+
+	if (location[0] == '/')
+		uri_len = strlen(location) + 1;
+	else
+		uri_len = strlen(url->location) + strlen(location) + 2;
+
+	new_url = calloc_a(sizeof(*url),
+		&host_buf, host_len,
+		&port_buf, port_len,
+		&uri_buf, uri_len,
+		&auth_buf, auth_len);
+
+	if (!new_url)
+		return NULL;
+
+	new_url->backend = url->backend;
+	new_url->prefix = url->prefix;
+	new_url->host = strcpy(host_buf, url->host);
+	if (url->port)
+		new_url->port = strcpy(port_buf, url->port);
+	if (url->auth)
+		new_url->auth = strcpy(auth_buf, url->auth);
+
+	new_url->location = uri_buf;
+	if (location[0] == '/')
+		strcpy(uri_buf, location);
+	else {
+		int len = strcspn(url->location, "?#");
+		char *buf = uri_buf;
+
+		memcpy(buf, url->location, len);
+		if (buf[len - 1] != '/') {
+			buf[len] = '/';
+			len++;
+		}
+
+		buf += len;
+		strcpy(buf, location);
+	}
+
+	return new_url;
+}
+
+struct uclient_url __hidden *
 uclient_get_url(const char *url_str, const char *auth_str)
 {
 	static const struct uclient_backend *backends[] = {