X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fconnection.c;h=ca778ab3e36952edd7424e05a7a4de1871b090e6;hb=e3d8ed2a9688b50e22e71755d83984659879ecf3;hp=43cdc1456ca8f00a66b4b7fe1d1bb58e4e99d1d1;hpb=0f1ac5c4fbf807a024511068aa3dd8f0eb0b9af7;p=pazpar2-moved-to-github.git

diff --git a/src/connection.c b/src/connection.c
index 43cdc14..ca778ab 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -92,6 +92,7 @@ struct connection {
     struct host *host;
     struct client *client;
     char *zproxy;
+    char *url;
     enum {
         Conn_Closed,
         Conn_Connecting,
@@ -150,7 +151,7 @@ static void connection_destroy(struct connection *co)
         ZOOM_connection_destroy(co->link);
         iochan_destroy(co->iochan);
     }
-    yaz_log(YLOG_DEBUG, "%p Connection destroy %s", co, co->host->url);
+    yaz_log(YLOG_DEBUG, "%p Connection destroy %s", co, co->url);
 
     if (co->client)
     {
@@ -158,6 +159,7 @@ static void connection_destroy(struct connection *co)
     }
 
     xfree(co->zproxy);
+    xfree(co->url);
     xfree(co);
     connection_use(-1);
 }
@@ -165,6 +167,7 @@ static void connection_destroy(struct connection *co)
 // Creates a new connection for client, associated with the host of
 // client's database
 static struct connection *connection_create(struct client *cl,
+                                            const char *url,
                                             struct host *host,
                                             int operation_timeout,
                                             int session_timeout,
@@ -176,6 +179,7 @@ static struct connection *connection_create(struct client *cl,
     co->host = host;
 
     co->client = cl;
+    co->url = xstrdup(url);
     co->zproxy = 0;
     client_set_connection(cl, co);
     co->link = 0;
@@ -371,7 +375,6 @@ void connect_resolver_host(struct host *host, iochan_man_t iochan_man)
                 if (sdb)
                 {
                     yaz_mutex_leave(host->mutex);
-                    connection_connect(con, iochan_man);
                     client_start_search(con->client);
                 }
                 else
@@ -387,7 +390,6 @@ void connect_resolver_host(struct host *host, iochan_man_t iochan_man)
         }
         else
         {
-            yaz_log(YLOG_LOG, "connect_resolver_host: state=%d", con->state);
             con = con->next;
         }
     }
@@ -407,6 +409,8 @@ static int connection_connect(struct connection *con, iochan_man_t iochan_man)
     const char *charset;
     const char *sru;
     const char *sru_version = 0;
+    const char *value;
+    WRBUF w;
 
     struct session_database *sdb = client_get_database(con->client);
     const char *apdulog = session_setting_oneval(sdb, PZ_APDULOG);
@@ -436,13 +440,44 @@ static int connection_connect(struct connection *con, iochan_man_t iochan_man)
     if (apdulog && *apdulog)
         ZOOM_options_set(zoptions, "apdulog", apdulog);
 
-    if ((auth = session_setting_oneval(sdb, PZ_AUTHENTICATION)))
-        ZOOM_options_set(zoptions, "user", auth);
+
     if ((sru = session_setting_oneval(sdb, PZ_SRU)) && *sru)
         ZOOM_options_set(zoptions, "sru", sru);
     if ((sru_version = session_setting_oneval(sdb, PZ_SRU_VERSION))
         && *sru_version)
         ZOOM_options_set(zoptions, "sru_version", sru_version);
+
+    if ((auth = session_setting_oneval(sdb, PZ_AUTHENTICATION)))
+    {
+        /* allow splitting user and reset with a blank always */
+        const char *cp1 = strchr(auth, ' ');
+        if (!cp1 && sru && *sru)
+            cp1 =  strchr(auth, '/');
+        if (!cp1)
+        {
+            /* Z39.50 user/password style, or no password for SRU */
+            ZOOM_options_set(zoptions, "user", auth);
+        }
+        else
+        {
+            /* now consider group as well */
+            const char *cp2 = strchr(cp1 + 1, ' ');
+
+            ZOOM_options_setl(zoptions, "user", auth, cp1 - auth);
+            if (!cp2)
+                ZOOM_options_set(zoptions, "password", cp1 + 1);
+            else
+            {
+                ZOOM_options_setl(zoptions, "group", cp1 + 1, cp2 - cp1 - 1);
+                ZOOM_options_set(zoptions, "password", cp2 + 1);
+            }
+        }
+    }
+
+    value = session_setting_oneval(sdb, PZ_AUTHENTICATION_MODE);
+    if (value && *value)
+        ZOOM_options_set(zoptions, "authenticationMode", value);
+
     if (!(con->link = ZOOM_connection_create(zoptions)))
     {
         yaz_log(YLOG_FATAL|YLOG_ERRNO, "Failed to create ZOOM Connection");
@@ -450,18 +485,19 @@ static int connection_connect(struct connection *con, iochan_man_t iochan_man)
         return -1;
     }
 
-    if (sru && *sru && !strstr(host->url, "://"))
-    {
-        WRBUF w = wrbuf_alloc();
+    w = wrbuf_alloc();
+    if (sru && *sru && !strstr(con->url, "://"))
         wrbuf_puts(w, "http://");
-        wrbuf_puts(w, host->url);
-        ZOOM_connection_connect(con->link, wrbuf_cstr(w), 0);
-        wrbuf_destroy(w);
-    }
-    else
+    if (strchr(con->url, '#'))
     {
-        ZOOM_connection_connect(con->link, host->url, 0);
+        const char *cp = strchr(con->url, '#');
+        wrbuf_write(w, con->url, cp - con->url);
     }
+    else
+        wrbuf_puts(w, con->url);
+
+    ZOOM_connection_connect(con->link, wrbuf_cstr(w), 0);
+
     con->iochan = iochan_create(-1, connection_handler, 0, "connection_socket");
     con->state = Conn_Connecting;
     iochan_settimeout(con->iochan, con->operation_timeout);
@@ -470,6 +506,7 @@ static int connection_connect(struct connection *con, iochan_man_t iochan_man)
 
     client_set_state(con->client, Client_Connecting);
     ZOOM_options_destroy(zoptions);
+    wrbuf_destroy(w);
     return 0;
 }
 
@@ -539,6 +576,7 @@ int client_prep_connection(struct client *cl,
                 for (co = host->connections; co; co = co->next)
                 {
                     if (connection_is_idle(co) &&
+                        !strcmp(url, co->url) &&
                         (!co->client || client_get_state(co->client) == Client_Idle) &&
                         !strcmp(ZOOM_connection_option_get(co->link, "user"),
                                 session_setting_oneval(client_get_database(cl),
@@ -591,7 +629,8 @@ int client_prep_connection(struct client *cl,
         else
         {
             yaz_mutex_leave(host->mutex);
-            co = connection_create(cl, host, operation_timeout, session_timeout,
+            co = connection_create(cl, url, host,
+                                   operation_timeout, session_timeout,
                                    iochan_man);
         }
         assert(co->host);