Applied Dave's GRS-1 patch - actually this was already done in revision 1.17.

[simpleserver-moved-to-github.git] / SimpleServer.xs

diff --git a/SimpleServer.xs b/SimpleServer.xs
index 5fe2cfa..e3e08be 100644 (file)
--- a/SimpleServer.xs
+++ b/SimpleServer.xs
@@ -25,7 +25,20 @@
  */
 
 /*$Log: SimpleServer.xs,v $
-/*Revision 1.13  2002-02-28 11:21:57  mike
+/*Revision 1.18  2003-01-03 09:05:41  sondberg
+/*Applied Dave's GRS-1 patch - actually this was already done in revision 1.17.
+/*
+/*Revision 1.16  2002/11/26 17:09:18  mike
+/*basic support for idPass authentication
+/*
+/*Revision 1.15  2002/09/16 13:55:53  sondberg
+/*Added support for authentication into SimpleServer.
+/*
+/*Revision 1.14  2002/03/05 00:34:13  mike
+/*Support for implementation_id (commented out until it's
+/*in mainstream Yaz)
+/*
+/*Revision 1.13  2002/02/28 11:21:57  mike
 /*Add RPN structure to search-handler argument hash.
 /*
 /*Revision 1.12  2001/08/30 14:02:10  sondberg
@@ -96,26 +109,37 @@ SV *delete_ref = NULL;
 SV *scan_ref = NULL;
 int MAX_OID = 15;
 
+#define GRS_BUF_SIZE 512
 
 Z_GenericRecord *read_grs1(char *str, ODR o)
 {
        int type, ivalue;
-       char line[512], *buf, *ptr, *original;
-       char value[512];
+       char line[GRS_BUF_SIZE+1], *buf, *ptr, *original;
+       char value[GRS_BUF_SIZE+1];
        Z_GenericRecord *r = 0;
 
        original = str;
+       r = (Z_GenericRecord *)odr_malloc(o, sizeof(*r));
+       r->elements = (Z_TaggedElement **) odr_malloc(o, sizeof(Z_TaggedElement*) * GRS_MAX_FIELDS);
+       r->num_elements = 0;
+       
        for (;;)
        {
                Z_TaggedElement *t;
                Z_ElementData *c;
+               int len;
        
                ptr = strchr(str, '\n');
                if (!ptr) {
                        return r;
                }
-               strncpy(line, str, ptr - str);
-               line[ptr - str] = 0;
+               len = ptr - str;
+               if (len > GRS_BUF_SIZE) {
+                   yaz_log(LOG_WARN, "GRS string too long - truncating (%d > %d)", len, GRS_BUF_SIZE);
+                   len = GRS_BUF_SIZE;
+               }
+               strncpy(line, str, len);
+               line[len] = 0;
                buf = line;
                str = ptr + 1;
                while (*buf && isspace(*buf))
@@ -127,25 +151,16 @@ Z_GenericRecord *read_grs1(char *str, ODR o)
                if (sscanf(buf, "(%d,%[^)])", &type, value) != 2)
                {
                        yaz_log(LOG_WARN, "Bad data in '%s'", buf);
-                       return 0;
+                       return r;
                }
                if (!type && *value == '0')
                        return r;
                if (!(buf = strchr(buf, ')')))
-                       return 0;
+                       return r;
                buf++;
                while (*buf && isspace(*buf))
                        buf++;
-               if (!*buf)
-                       return 0;
-               if (!r)
-               {
-                       r = (Z_GenericRecord *)odr_malloc(o, sizeof(*r));
-                       r->elements = (Z_TaggedElement **)
-                       odr_malloc(o, sizeof(Z_TaggedElement*) * GRS_MAX_FIELDS);
-                       r->num_elements = 0;
-               }
-               if (r->num_elements > GRS_MAX_FIELDS)
+               if (r->num_elements >= GRS_MAX_FIELDS)
                {
                        yaz_log(LOG_WARN, "Max number of GRS-1 elements exceeded [GRS_MAX_FIELDS=%d]", GRS_MAX_FIELDS);
                        exit(0);
@@ -179,8 +194,6 @@ Z_GenericRecord *read_grs1(char *str, ODR o)
                else
                {
                        c->which = Z_ElementData_string;
-/*                     buf[strlen(buf)-1] = '\0';*/
-                       buf[strlen(buf)] = '\0';
                        c->u.string = odr_strdup(o, buf);
                }
                r->num_elements++;
@@ -1095,6 +1108,7 @@ bend_initresult *bend_init(bend_initrequest *q)
        bend_initresult *r = (bend_initresult *) odr_malloc (q->stream, sizeof(*r));
        HV *href;
        SV **temp;
+       SV *id;
        SV *name;
        SV *ver;
        SV *err_str;
@@ -1106,6 +1120,8 @@ bend_initresult *bend_init(bend_initrequest *q)
        /*char *name_ptr;
        char *ver_ptr;*/
        char *ptr;
+       char *user = NULL;
+       char *passwd = NULL;
 
        dSP;
        ENTER;
@@ -1131,12 +1147,31 @@ bend_initresult *bend_init(bend_initrequest *q)
                q->bend_scan = bend_scan;
        }
                href = newHV(); 
+       hv_store(href, "IMP_ID", 6, newSVpv("", 0), 0);
        hv_store(href, "IMP_NAME", 8, newSVpv("", 0), 0);
        hv_store(href, "IMP_VER", 7, newSVpv("", 0), 0);
        hv_store(href, "ERR_CODE", 8, newSViv(0), 0);
        hv_store(href, "PEER_NAME", 9, newSVpv(q->peer_name, 0), 0);
        hv_store(href, "HANDLE", 6, newSVsv(&sv_undef), 0);
        hv_store(href, "PID", 3, newSViv(getpid()), 0);
+       if (q->auth) {
+           if (q->auth->which == Z_IdAuthentication_open) {
+               char *openpass = xstrdup (q->auth->u.open);
+               char *cp = strchr (openpass, '/');
+               if (cp) {
+                   *cp = '\0';
+                   user = nmem_strdup (odr_getmem (q->stream), openpass);
+                   passwd = nmem_strdup (odr_getmem (q->stream), cp + 1);
+               }
+               xfree(openpass);
+           } else if (q->auth->which == Z_IdAuthentication_idPass) {
+               user = q->auth->u.idPass->userId;
+               passwd = q->auth->u.idPass->password;
+           }
+           /* ### some code paths have user/password unassigned here */
+           hv_store(href, "USER", 4, newSVpv(user, 0), 0);
+           hv_store(href, "PASS", 4, newSVpv(passwd, 0), 0);
+       }
 
        PUSHMARK(sp);   
 
@@ -1151,6 +1186,9 @@ bend_initresult *bend_init(bend_initrequest *q)
 
        SPAGAIN;
 
+       temp = hv_fetch(href, "IMP_ID", 6, 1);
+       id = newSVsv(*temp);
+
        temp = hv_fetch(href, "IMP_NAME", 8, 1);
        name = newSVsv(*temp);
 
@@ -1170,6 +1208,11 @@ bend_initresult *bend_init(bend_initrequest *q)
        zhandle->handle = handle;
        r->errcode = SvIV(status);
        r->handle = zhandle;
+#if 0 /* implementation_id support is not yet in mainstream Yaz */
+       ptr = SvPV(id, len);
+       q->implementation_id = (char *)xmalloc(len + 1);
+       strcpy(q->implementation_id, ptr);
+#endif
        ptr = SvPV(name, len);
        q->implementation_name = (char *)xmalloc(len + 1);
        strcpy(q->implementation_name, ptr);