/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2013 Index Data
+ * Copyright (C) Index Data
* See the file LICENSE for details.
*/
/**
#include <yaz/url.h>
#include <yaz/comstack.h>
#include <yaz/log.h>
+#include <yaz/wrbuf.h>
+#include <yaz/cookie.h>
struct yaz_url {
ODR odr_in;
ODR odr_out;
char *proxy;
int max_redirects;
+ WRBUF w_error;
+ int verbose;
+ yaz_cookies_t cookies;
};
yaz_url_t yaz_url_create(void)
p->odr_out = odr_createmem(ODR_ENCODE);
p->proxy = 0;
p->max_redirects = 10;
+ p->w_error = wrbuf_alloc();
+ p->verbose = 0;
+ p->cookies = yaz_cookies_create();
return p;
}
odr_destroy(p->odr_in);
odr_destroy(p->odr_out);
xfree(p->proxy);
+ wrbuf_destroy(p->w_error);
+ yaz_cookies_destroy(p->cookies);
xfree(p);
}
}
p->max_redirects = num;
}
+void yaz_url_set_verbose(yaz_url_t p, int num)
+{
+ p->verbose = num;
+}
+
static void extract_user_pass(NMEM nmem,
const char *uri,
char **uri_lean, char **http_user,
*uri_lean = nmem_strdup(nmem, uri);
}
+const char *yaz_url_get_error(yaz_url_t p)
+{
+ return wrbuf_cstr(p->w_error);
+}
+
+static void log_warn(yaz_url_t p)
+{
+ yaz_log(YLOG_WARN, "yaz_url: %s", wrbuf_cstr(p->w_error));
+}
+
Z_HTTP_Response *yaz_url_exec(yaz_url_t p, const char *uri,
const char *method,
Z_HTTP_Header *user_headers,
Z_HTTP_Response *res = 0;
int number_of_redirects = 0;
+ yaz_cookies_reset(p->cookies);
+ wrbuf_rewind(p->w_error);
while (1)
{
void *add;
char *http_user = 0;
char *http_pass = 0;
char *uri_lean = 0;
- Z_GDU *gdu;
+ int proxy_mode = 0;
extract_user_pass(p->odr_out->mem, uri, &uri_lean,
&http_user, &http_pass);
-
- gdu = z_get_HTTP_Request_uri(p->odr_out, uri_lean, 0, p->proxy ? 1 : 0);
- gdu->u.HTTP_Request->method = odr_strdup(p->odr_out, method);
-
- for ( ; user_headers; user_headers = user_headers->next)
- {
- /* prefer new Host over user-supplied Host */
- if (!strcmp(user_headers->name, "Host"))
- ;
- /* prefer user-supplied User-Agent over YAZ' own */
- else if (!strcmp(user_headers->name, "User-Agent"))
- z_HTTP_header_set(p->odr_out, &gdu->u.HTTP_Request->headers,
- user_headers->name, user_headers->value);
- else
- z_HTTP_header_add(p->odr_out, &gdu->u.HTTP_Request->headers,
- user_headers->name, user_headers->value);
- }
- if (http_user && http_pass)
- z_HTTP_header_add_basic_auth(p->odr_out,
- &gdu->u.HTTP_Request->headers,
- http_user, http_pass);
-
- res = 0;
- if (buf && len)
- {
- gdu->u.HTTP_Request->content_buf = (char *) buf;
- gdu->u.HTTP_Request->content_len = len;
- }
- if (!z_GDU(p->odr_out, &gdu, 0, 0))
- {
- yaz_log(YLOG_WARN, "Can not encode HTTP request URL:%s", uri);
- return 0;
- }
- conn = cs_create_host_proxy(uri_lean, 1, &add, p->proxy);
+ conn = cs_create_host2(uri_lean, 1, &add, p->proxy, &proxy_mode);
if (!conn)
{
- yaz_log(YLOG_WARN, "Could not resolve URL: %s", uri);
- }
- else if (cs_connect(conn, add) < 0)
- {
- yaz_log(YLOG_WARN, "Can not connect to URL: %s", uri);
+ wrbuf_printf(p->w_error, "Can not resolve URL %s", uri);
+ log_warn(p);
}
else
{
- int len;
- char *buf = odr_getbuf(p->odr_out, &len, 0);
-
- if (cs_put(conn, buf, len) < 0)
- yaz_log(YLOG_WARN, "cs_put failed URL: %s", uri);
+ Z_GDU *gdu =
+ z_get_HTTP_Request_uri(p->odr_out, uri_lean, 0, proxy_mode);
+ gdu->u.HTTP_Request->method = odr_strdup(p->odr_out, method);
+ yaz_cookies_request(p->cookies, p->odr_out, gdu->u.HTTP_Request);
+ for ( ; user_headers; user_headers = user_headers->next)
+ {
+ /* prefer new Host over user-supplied Host */
+ if (!strcmp(user_headers->name, "Host"))
+ ;
+ /* prefer user-supplied User-Agent over YAZ' own */
+ else if (!strcmp(user_headers->name, "User-Agent"))
+ z_HTTP_header_set(p->odr_out, &gdu->u.HTTP_Request->headers,
+ user_headers->name, user_headers->value);
+ else
+ z_HTTP_header_add(p->odr_out, &gdu->u.HTTP_Request->headers,
+ user_headers->name, user_headers->value);
+ }
+ if (http_user && http_pass)
+ z_HTTP_header_add_basic_auth(p->odr_out,
+ &gdu->u.HTTP_Request->headers,
+ http_user, http_pass);
+ res = 0;
+ if (buf && len)
+ {
+ gdu->u.HTTP_Request->content_buf = (char *) buf;
+ gdu->u.HTTP_Request->content_len = len;
+ }
+ if (!z_GDU(p->odr_out, &gdu, 0, 0))
+ {
+ wrbuf_printf(p->w_error, "Can not encode HTTP request for URL %s",
+ uri);
+ log_warn(p);
+ return 0;
+ }
+ if (cs_connect(conn, add) < 0)
+ {
+ wrbuf_printf(p->w_error, "Can not connect to URL %s", uri);
+ log_warn(p);
+ }
else
{
- char *netbuffer = 0;
- int netlen = 0;
- int cs_res = cs_get(conn, &netbuffer, &netlen);
- if (cs_res <= 0)
+ int len;
+ char *buf = odr_getbuf(p->odr_out, &len, 0);
+ if (p->verbose)
+ fwrite(buf, 1, len, stdout);
+ if (cs_put(conn, buf, len) < 0)
{
- yaz_log(YLOG_WARN, "cs_get failed URL: %s", uri);
+ wrbuf_printf(p->w_error, "cs_put fail for URL %s", uri);
+ log_warn(p);
}
else
{
- Z_GDU *gdu;
- odr_setbuf(p->odr_in, netbuffer, cs_res, 0);
- if (!z_GDU(p->odr_in, &gdu, 0, 0)
- || gdu->which != Z_GDU_HTTP_Response)
+ char *netbuffer = 0;
+ int netlen = 0;
+ int cs_res = cs_get(conn, &netbuffer, &netlen);
+ if (cs_res <= 0)
{
- yaz_log(YLOG_WARN, "HTTP decoding failed "
- "URL:%s", uri);
+ wrbuf_printf(p->w_error, "cs_get failed for URL %s", uri);
+ log_warn(p);
}
else
{
- res = gdu->u.HTTP_Response;
+ Z_GDU *gdu;
+ if (p->verbose)
+ fwrite(netbuffer, 1, cs_res, stdout);
+ odr_setbuf(p->odr_in, netbuffer, cs_res, 0);
+ if (!z_GDU(p->odr_in, &gdu, 0, 0)
+ || gdu->which != Z_GDU_HTTP_Response)
+ {
+ wrbuf_printf(p->w_error, "HTTP decoding fail for "
+ "URL %s", uri);
+ log_warn(p);
+ }
+ else
+ {
+ res = gdu->u.HTTP_Response;
+ }
}
+ xfree(netbuffer);
}
- xfree(netbuffer);
}
- }
- if (conn)
cs_close(conn);
+ }
if (!res)
break;
code = res->code;
if (++number_of_redirects <= p->max_redirects &&
location && (code == 301 || code == 302 || code == 307))
{
+ int host_change = 0;
+ const char *nlocation = yaz_check_location(p->odr_in, uri,
+ location, &host_change);
+
odr_reset(p->odr_out);
- uri = odr_strdup(p->odr_out, location);
- odr_reset(p->odr_in);
+ uri = odr_strdup(p->odr_out, nlocation);
}
else
break;
+ yaz_cookies_response(p->cookies, res);
+ odr_reset(p->odr_in);
}
return res;
}
projects / yaz-moved-to-github.git / blobdiff