* This file is part of DisOrder.
* Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell
*
- * This program is free software; you can redistribute it and/or modify
+ * This program 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 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
- * This program 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.
- *
+ *
+ * This program 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 this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/** @file lib/cgi.c
* @brief CGI tools
*/
-#include <config.h>
-#include "types.h"
+#include "common.h"
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
#include <unistd.h>
#include <errno.h>
-#include <stdio.h>
#include "cgi.h"
#include "mem.h"
if((q = getenv("QUERY_STRING")))
return kvp_urldecode(q, strlen(q));
- error(0, "QUERY_STRING not set, assuming empty");
+ disorder_error(0, "QUERY_STRING not set, assuming empty");
return NULL;
}
int r;
if(!(cl = getenv("CONTENT_LENGTH")))
- fatal(0, "CONTENT_LENGTH not set");
+ disorder_fatal(0, "CONTENT_LENGTH not set");
n = atol(cl);
/* We check for overflow and also limit the input to 16MB. Lower
* would probably do. */
if(!(n+1) || n > 16 * 1024 * 1024)
- fatal(0, "input is much too large");
+ disorder_fatal(0, "input is much too large");
q = xmalloc_noptr(n + 1);
while(m < n) {
r = read(0, q + m, n - m);
if(r > 0)
m += r;
else if(r == 0)
- fatal(0, "unexpected end of file reading request body");
+ disorder_fatal(0, "unexpected end of file reading request body");
else switch(errno) {
case EINTR: break;
- default: fatal(errno, "error reading request body");
+ default: disorder_fatal(errno, "error reading request body");
}
}
if(memchr(q, 0, n))
- fatal(0, "null character in request body");
+ disorder_fatal(0, "null character in request body");
q[n + 1] = 0;
*ptrp = q;
if(np)
&disposition,
&pname,
&pvalue))
- fatal(0, "error parsing Content-Disposition field");
+ disorder_fatal(0, "error parsing Content-Disposition field");
if(!strcmp(disposition, "form-data")
&& pname
&& !strcmp(pname, "name")) {
if(*namep)
- fatal(0, "duplicate Content-Disposition field");
+ disorder_fatal(0, "duplicate Content-Disposition field");
*namep = pvalue;
}
}
void *u) {
char *name = 0;
struct kvp *k, **head = u;
-
+
if(!(s = mime_parse(s, cgi__field_callback, &name)))
- fatal(0, "error parsing part header");
+ disorder_fatal(0, "error parsing part header");
if(!name)
- fatal(0, "no name found");
+ disorder_fatal(0, "no name found");
k = xmalloc(sizeof *k);
k->next = *head;
k->name = name;
cgi__input(&q, 0);
if(mime_multipart(q, cgi__part_callback, boundary, &head))
- fatal(0, "invalid multipart object");
+ disorder_fatal(0, "invalid multipart object");
return head;
}
if(!(ct = getenv("CONTENT_TYPE")))
ct = "application/x-www-form-urlencoded";
if(mime_content_type(ct, &type, &k))
- fatal(0, "invalid content type '%s'", ct);
+ disorder_fatal(0, "invalid content type '%s'", ct);
if(!strcmp(type, "application/x-www-form-urlencoded")) {
cgi__input(&q, &n);
return kvp_urldecode(q, n);
}
if(!strcmp(type, "multipart/form-data")) {
if(!(boundary = kvp_get(k, "boundary")))
- fatal(0, "no boundary parameter found");
+ disorder_fatal(0, "no boundary parameter found");
return cgi__init_multipart(boundary);
}
- fatal(0, "unrecognized content type '%s'", type);
+ disorder_fatal(0, "unrecognized content type '%s'", type);
}
/** @brief Initialize CGI arguments
cgi_args = hash_new(sizeof (char *));
if(!(p = getenv("REQUEST_METHOD")))
- error(0, "REQUEST_METHOD not set, assuming GET");
+ disorder_error(0, "REQUEST_METHOD not set, assuming GET");
if(!p || !strcmp(p, "GET"))
k = cgi__init_get();
else if(!strcmp(p, "POST"))
k = cgi__init_post();
else
- fatal(0, "unknown request method %s", p);
+ disorder_fatal(0, "unknown request method %s", p);
/* Validate the arguments and put them in a hash */
for(; k; k = k->next) {
if(!utf8_valid(k->name, strlen(k->name))
|| !utf8_valid(k->value, strlen(k->value)))
- error(0, "invalid UTF-8 sequence in cgi argument %s", k->name);
+ disorder_error(0, "invalid UTF-8 sequence in cgi argument %s", k->name);
else
hash_add(cgi_args, k->name, &k->value, HASH_INSERT_OR_REPLACE);
/* We just drop bogus arguments. */
return v ? *v : NULL;
}
+/** @brief Set a CGI argument */
+void cgi_set(const char *name, const char *value) {
+ value = xstrdup(value);
+ hash_add(cgi_args, name, &value, HASH_INSERT_OR_REPLACE);
+}
+
+/** @brief Clear CGI arguments */
+void cgi_clear(void) {
+ cgi_args = hash_new(sizeof (char *));
+}
+
/** @brief Add SGML-style quoting
* @param src String to quote (UTF-8)
* @return Quoted string
return d->vec;
}
-/** @brief Write a CGI attribute
- * @param output Where to send output
- * @param name Attribute name
- * @param value Attribute value
- */
-void cgi_attr(struct sink *output, const char *name, const char *value) {
- /* Try to avoid needless quoting */
- if(!value[strspn(value, "abcdefghijklmnopqrstuvwxyz"
- "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
- "0123456789")])
- sink_printf(output, "%s=%s", name, value);
- else
- sink_printf(output, "%s=\"%s\"", name, cgi_sgmlquote(value));
-}
-
-/** @brief Write an open tag
- * @param output Where to send output
- * @param name Element name
- * @param ... Attribute name/value pairs
- *
- * The name/value pair list is terminated by a single (char *)0.
- */
-void cgi_opentag(struct sink *output, const char *name, ...) {
- va_list ap;
- const char *n, *v;
-
- sink_printf(output, "<%s", name);
- va_start(ap, name);
- while((n = va_arg(ap, const char *))) {
- sink_printf(output, " ");
- v = va_arg(ap, const char *);
- if(v)
- cgi_attr(output, n, v);
- else
- sink_printf(output, n);
- }
- va_end(ap);
- sink_printf(output, ">");
-}
-
-/** @brief Write a close tag
- * @param output Where to send output
- * @param name Element name
- */
-void cgi_closetag(struct sink *output, const char *name) {
- sink_printf(output, "</%s>", name);
-}
-
/** @brief Construct a URL
* @param url Base URL
* @param ... Name/value pairs for constructed query string
return d.vec;
}
+/** @brief Construct a URL from current parameters
+ * @param url Base URL
+ * @return Constructed URL
+ */
+char *cgi_thisurl(const char *url) {
+ struct dynstr d[1];
+ char **keys = hash_keys(cgi_args);
+ int n;
+
+ dynstr_init(d);
+ dynstr_append_string(d, url);
+ for(n = 0; keys[n]; ++n) {
+ dynstr_append(d, n ? '&' : '?');
+ dynstr_append_string(d, urlencodestring(keys[n]));
+ dynstr_append(d, '=');
+ dynstr_append_string(d, urlencodestring(cgi_get(keys[n])));
+ }
+ dynstr_terminate(d);
+ return d->vec;
+}
+
/*
Local Variables:
c-basic-offset:2
~mdw / disorder / blobdiff