X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Furl.c;h=97e8247b5e9b42f755c79a6b499d55f3a939aa06;hb=991a3cbe7c36c152a5657caaa87ef8d8a5c49ade;hp=6b0ef5200504038962c6552a3819ac6d56a8dcce;hpb=92085e57d085092c52e9b2ad9e0ee1405c0200c8;p=yaz-moved-to-github.git

diff --git a/src/url.c b/src/url.c
index 6b0ef52..97e8247 100644
--- a/src/url.c
+++ b/src/url.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2012 Index Data
+ * Copyright (C) 1995-2013 Index Data
  * See the file LICENSE for details.
  */
 /**
@@ -48,9 +48,47 @@ void yaz_url_set_proxy(yaz_url_t p, const char *proxy)
         p->proxy = xstrdup(proxy);
 }
 
+static void extract_user_pass(NMEM nmem,
+                              const char *uri,
+                              char **uri_lean, char **http_user,
+                              char **http_pass)
+{
+    const char *cp1 = strchr(uri, '/');
+    *uri_lean = 0;
+    *http_user = 0;
+    *http_pass = 0;
+    if (cp1 && cp1 > uri)
+    {
+        cp1--;
+
+        if (!strncmp(cp1, "://", 3))
+        {
+            const char *cp3 = 0;
+            const char *cp2 = cp1 + 3;
+            while (*cp2 && *cp2 != '/' && *cp2 != '@')
+            {
+                if (*cp2 == ':')
+                    cp3 = cp2;
+                cp2++;
+            }
+            if (*cp2 == '@' && cp3)
+            {
+                *uri_lean = nmem_malloc(nmem, strlen(uri) + 1);
+                memcpy(*uri_lean, uri, cp1 + 3 - uri);
+                strcpy(*uri_lean + (cp1 + 3 - uri), cp2 + 1);
+
+                *http_user = nmem_strdupn(nmem, cp1 + 3, cp3 - (cp1 + 3));
+                *http_pass = nmem_strdupn(nmem, cp3 + 1, cp2 - (cp3 + 1));
+            }
+        }
+    }
+    if (*uri_lean == 0)
+        *uri_lean = nmem_strdup(nmem, uri);
+}
+
 Z_HTTP_Response *yaz_url_exec(yaz_url_t p, const char *uri,
                               const char *method,
-                              Z_HTTP_Header *headers,
+                              Z_HTTP_Header *user_headers,
                               const char *buf, size_t len)
 {
     Z_HTTP_Response *res = 0;
@@ -61,18 +99,37 @@ Z_HTTP_Response *yaz_url_exec(yaz_url_t p, const char *uri,
         void *add;
         COMSTACK conn = 0;
         int code;
-        struct Z_HTTP_Header **last_header_entry;
         const char *location = 0;
-        Z_GDU *gdu = z_get_HTTP_Request_uri(p->odr_out, uri, 0,
-                                            p->proxy ? 1 : 0);
+        char *http_user = 0;
+        char *http_pass = 0;
+        char *uri_lean = 0;
+        Z_GDU *gdu;
+
+        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);
 
-        res = 0;
-        last_header_entry = &gdu->u.HTTP_Request->headers;
-        while (*last_header_entry)
-            last_header_entry = &(*last_header_entry)->next;
-        *last_header_entry = headers; /* attach user headers */
+        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;
@@ -83,7 +140,7 @@ Z_HTTP_Response *yaz_url_exec(yaz_url_t p, const char *uri,
             yaz_log(YLOG_WARN, "Can not encode HTTP request URL:%s", uri);
             return 0;
         }
-        conn = cs_create_host_proxy(uri, 1, &add, p->proxy);
+        conn = cs_create_host_proxy(uri_lean, 1, &add, p->proxy);
         if (!conn)
         {
             yaz_log(YLOG_WARN, "Could not resolve URL: %s", uri);
@@ -96,7 +153,7 @@ Z_HTTP_Response *yaz_url_exec(yaz_url_t p, const char *uri,
         {
             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);
             else