X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fhttp_command.c;h=0c660b6cfb8a5a90bfcc6f972d6b5ddee20abb57;hb=aa8fed542911807dcf5f753288eb724cc1e1cc8a;hp=ae6e8f893c47824aa7147ba42d8dae721d5fa7a9;hpb=7cb18e001c719f24b9f440f91fc44ddaaeda3303;p=pazpar2-moved-to-github.git diff --git a/src/http_command.c b/src/http_command.c index ae6e8f8..0c660b6 100644 --- a/src/http_command.c +++ b/src/http_command.c @@ -1,5 +1,26 @@ +/* $Id: http_command.c,v 1.45 2007-06-04 14:27:48 adam Exp $ + Copyright (c) 2006-2007, Index Data. + +This file is part of Pazpar2. + +Pazpar2 is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 2, or (at your option) any later +version. + +Pazpar2 is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with Pazpar2; see the file LICENSE. If not, write to the +Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. + */ + /* - * $Id: http_command.c,v 1.30 2007-04-08 23:04:20 adam Exp $ + * $Id: http_command.c,v 1.45 2007-06-04 14:27:48 adam Exp $ */ #include @@ -10,7 +31,7 @@ #include #include #include - +#include #if HAVE_CONFIG_H #include #endif @@ -23,15 +44,18 @@ #include "pazpar2.h" #include "http.h" #include "http_command.h" +#include "settings.h" +#include "client.h" -extern struct parameters global_parameters; -extern IOCHAN channel_list; +// Update this when the protocol changes +#define PAZPAR2_PROTOCOL_VERSION "1" struct http_session { IOCHAN timeout_iochan; // NOTE: This is NOT associated with a socket struct session *psession; unsigned int session_id; int timestamp; + NMEM nmem; struct http_session *next; }; @@ -47,17 +71,20 @@ static void session_timeout(IOCHAN i, int event) struct http_session *http_session_create() { - struct http_session *r = xmalloc(sizeof(*r)); - r->psession = new_session(); + NMEM nmem = nmem_create(); + struct http_session *r = nmem_malloc(nmem, sizeof(*r)); + + r->psession = new_session(nmem); r->session_id = 0; r->timestamp = 0; + r->nmem = nmem; r->next = session_list; session_list = r; r->timeout_iochan = iochan_create(-1, session_timeout, 0); iochan_setdata(r->timeout_iochan, r); iochan_settimeout(r->timeout_iochan, global_parameters.session_timeout); - r->timeout_iochan->next = channel_list; - channel_list = r->timeout_iochan; + + pazpar2_add_channel(r->timeout_iochan); return r; } @@ -73,34 +100,51 @@ void http_session_destroy(struct http_session *s) } iochan_destroy(s->timeout_iochan); destroy_session(s->psession); - xfree(s); + nmem_destroy(s->nmem); } -static void error(struct http_response *rs, char *code, char *msg, char *txt) +static void error(struct http_response *rs, + const char *code, const char *msg, const char *extra) { struct http_channel *c = rs->channel; - char tmp[1024]; + char text[1024]; + char *sep = extra ? ": " : ""; - if (!txt) - txt = msg; rs->msg = nmem_strdup(c->nmem, msg); strcpy(rs->code, code); - sprintf(tmp, "%s", txt); - rs->payload = nmem_strdup(c->nmem, tmp); + + yaz_snprintf(text, sizeof(text), + "%s%s%s", msg, sep, + extra ? extra : ""); + + yaz_log(YLOG_WARN, "HTTP %s %s%s%s", code, msg, sep, + extra ? extra : ""); + rs->payload = nmem_strdup(c->nmem, text); http_send_response(c); } unsigned int make_sessionid() { - struct timeval t; - unsigned int res; static int seq = 0; + unsigned int res; seq++; - if (gettimeofday(&t, 0) < 0) - abort(); - res = t.tv_sec; - res = ((res << 8) | (seq & 0xff)) & ((1U << 31) - 1); + if (global_parameters.debug_mode) + res = seq; + else + { + struct timeval t; + + if (gettimeofday(&t, 0) < 0) + { + yaz_log(YLOG_WARN|YLOG_ERRNO, "gettimeofday"); + exit(1); + } + /* at most 256 sessions per second .. + (long long would be more appropriate)*/ + res = t.tv_sec; + res = ((res << 8) | (seq & 0xff)) & ((1U << 31) - 1); + } return res; } @@ -126,13 +170,42 @@ static struct http_session *locate_session(struct http_request *rq, struct http_ return 0; } +// Decode settings parameters and apply to session +// Syntax: setting[target]=value +static int process_settings(struct session *se, struct http_request *rq, + struct http_response *rs) +{ + struct http_argument *a; + + for (a = rq->arguments; a; a = a->next) + if (strchr(a->name, '[')) + { + char **res; + int num; + char *dbname; + char *setting; + + // Nmem_strsplit *rules*!!! + nmem_strsplit(se->session_nmem, "[]", a->name, &res, &num); + if (num != 2) + { + error(rs, "417", "Malformed setting argument", a->name); + return -1; + } + setting = res[0]; + dbname = res[1]; + session_apply_setting(se, dbname, setting, + nmem_strdup(se->session_nmem, a->value)); + } + return 0; +} + static void cmd_exit(struct http_channel *c) { yaz_log(YLOG_WARN, "exit"); exit(0); } - static void cmd_init(struct http_channel *c) { unsigned int sesid; @@ -143,11 +216,29 @@ static void cmd_init(struct http_channel *c) yaz_log(YLOG_DEBUG, "HTTP Session init"); sesid = make_sessionid(); s->session_id = sesid; - sprintf(buf, "OK%u", sesid); + if (process_settings(s->psession, c->request, c->response) < 0) + return; + sprintf(buf, "OK%u" + "" PAZPAR2_PROTOCOL_VERSION "", sesid); rs->payload = nmem_strdup(c->nmem, buf); http_send_response(c); } +static void cmd_settings(struct http_channel *c) +{ + struct http_response *rs = c->response; + struct http_request *rq = c->request; + struct http_session *s = locate_session(rq, rs); + + if (!s) + return; + + if (process_settings(s->psession, rq, rs) < 0) + return; + rs->payload = "OK"; + http_send_response(c); +} + // Compares two hitsbytarget nodes by hitcount static int cmp_ht(const void *p1, const void *p2) { @@ -169,7 +260,10 @@ static void targets_termlist(WRBUF wrbuf, struct session *se, int num) { wrbuf_puts(wrbuf, "\n\n"); wrbuf_printf(wrbuf, "%s\n", ht[i].id); - wrbuf_printf(wrbuf, "%s\n", ht[i].name); + wrbuf_puts(wrbuf, ""); + wrbuf_xmlputs(wrbuf, ht[i].name); + wrbuf_puts(wrbuf, "\n"); + wrbuf_printf(wrbuf, "%d\n", ht[i].hits); wrbuf_printf(wrbuf, "%s\n", ht[i].state); wrbuf_printf(wrbuf, "%d\n", ht[i].diagnostic); @@ -216,7 +310,9 @@ static void cmd_termlist(struct http_channel *c) strncpy(tname, name, tp - name); tname[tp - name] = '\0'; - wrbuf_printf(c->wrbuf, "\n\n", tname); + wrbuf_puts(c->wrbuf, "\nwrbuf, tname); + wrbuf_puts(c->wrbuf, "\">\n"); if (!strcmp(tname, "xtargets")) targets_termlist(c->wrbuf, s->psession, num); else @@ -226,7 +322,10 @@ static void cmd_termlist(struct http_channel *c) for (i = 0; i < len && i < num; i++) { wrbuf_puts(c->wrbuf, "\n"); - wrbuf_printf(c->wrbuf, "%s", p[i]->term); + wrbuf_puts(c->wrbuf, ""); + wrbuf_xmlputs(c->wrbuf, p[i]->term); + wrbuf_puts(c->wrbuf, ""); + wrbuf_printf(c->wrbuf, "%d", p[i]->frequency); wrbuf_puts(c->wrbuf, ""); } @@ -289,7 +388,7 @@ static void write_metadata(WRBUF w, struct conf_service *service, continue; for (md = ml[imeta]; md; md = md->next) { - wrbuf_printf(w, "", cmd->name); + wrbuf_printf(w, "\n", cmd->name); switch (cmd->type) { case Metadata_type_generic: @@ -308,12 +407,21 @@ static void write_metadata(WRBUF w, struct conf_service *service, } } -static void write_subrecord(struct record *r, WRBUF w, struct conf_service *service) +static void write_subrecord(struct record *r, WRBUF w, + struct conf_service *service, int show_details) { - wrbuf_printf(w, "\n", - r->client->database->url, - r->client->database->name ? r->client->database->name : ""); - write_metadata(w, service, r->metadata, 1); + char *name = session_setting_oneval(client_get_database(r->client), PZ_NAME); + + wrbuf_printf(w, "client)->database->url); + wrbuf_puts(w, "\" "); + + wrbuf_printf(w, "name=\""); + + wrbuf_xmlputs(w, *name ? name : "Unknown"); + wrbuf_printf(w, "\">"); + if (show_details) + write_metadata(w, service, r->metadata, 1); wrbuf_puts(w, "\n"); } @@ -346,7 +454,7 @@ static void cmd_record(struct http_channel *c) wrbuf_printf(c->wrbuf, "%d", rec->recid); write_metadata(c->wrbuf, service, rec->metadata, 1); for (r = rec->records; r; r = r->next) - write_subrecord(r, c->wrbuf, service); + write_subrecord(r, c->wrbuf, service, 1); wrbuf_puts(c->wrbuf, "\n"); rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf)); http_send_response(c); @@ -407,7 +515,7 @@ static void show_records(struct http_channel *c, int active) wrbuf_puts(c->wrbuf, "\n"); write_metadata(c->wrbuf, service, rec->metadata, 0); for (ccount = 0, p = rl[i]->records; p; p = p->next, ccount++) - ; + write_subrecord(p, c->wrbuf, service, 0); // subrecs w/o details if (ccount > 1) wrbuf_printf(c->wrbuf, "%d\n", ccount); wrbuf_printf(c->wrbuf, "%d\n", rec->recid); @@ -463,6 +571,31 @@ static void cmd_ping(struct http_channel *c) http_send_response(c); } +static int utf_8_valid(const char *str) +{ + yaz_iconv_t cd = yaz_iconv_open("utf-8", "utf-8"); + if (cd) + { + /* check that query is UTF-8 encoded */ + char *inbuf = (char *) str; /* we know iconv does not alter this */ + size_t inbytesleft = strlen(inbuf); + + size_t outbytesleft = strlen(inbuf) + 10; + char *out = xmalloc(outbytesleft); + char *outbuf = out; + size_t r = yaz_iconv(cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft); + + /* if OK, try flushing the rest */ + if (r != (size_t) (-1)) + r = yaz_iconv(cd, 0, 0, &outbuf, &outbytesleft); + yaz_iconv_close(cd); + xfree(out); + if (r == (size_t) (-1)) + return 0; + } + return 1; +} + static void cmd_search(struct http_channel *c) { struct http_request *rq = c->request; @@ -479,10 +612,15 @@ static void cmd_search(struct http_channel *c) error(rs, "417", "Must supply query", 0); return; } + if (!utf_8_valid(query)) + { + error(rs, "417", "Query not UTF-8 encoded", 0); + return; + } res = search(s->psession, query, filter); if (res) { - error(rs, "417", res, res); + error(rs, "417", res, 0); return; } rs->payload = "OK"; @@ -548,6 +686,7 @@ struct { void (*fun)(struct http_channel *c); } commands[] = { { "init", cmd_init }, + { "settings", cmd_settings }, { "stat", cmd_stat }, { "bytarget", cmd_bytarget }, { "show", cmd_show }, @@ -583,7 +722,7 @@ void http_command(struct http_channel *c) break; } if (!commands[i].name) - error(rs, "417", "Unknown command", 0); + error(rs, "417", "Unknown command", command); return; }