X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=cgiedit.c;h=e3ffce4baecbb4d76637de477e2b2a9914e73228;hb=2a15be9e2f66289de550fc88df4ac4bc969b41a7;hp=1b0ca29ea2f9f3b5b767107419325c4565c17269;hpb=4f72d7e5449fbbb7e7b4d3a9354ea55647ed3f1e;p=privoxy.git
diff --git a/cgiedit.c b/cgiedit.c
index 1b0ca29e..e3ffce4b 100644
--- a/cgiedit.c
+++ b/cgiedit.c
@@ -1,12 +1,19 @@
-const char cgiedit_rcs[] = "$Id: cgiedit.c,v 1.6 2001/10/29 03:48:09 david__schmidt Exp $";
+const char cgiedit_rcs[] = "$Id: cgiedit.c,v 1.15 2002/03/06 22:54:35 jongfoster Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/cgiedit.c,v $
*
* Purpose : CGI-based actionsfile editor.
*
- * Functions declared include:
+ * Functions declared include: cgi_edit_*
*
+ * NOTE: The CGIs in this file use parameter names
+ * such as "f" and "s" which are really *BAD* choices.
+ * However, I'm trying to save bytes in the
+ * edit-actions-list HTML page - the standard actions
+ * file generated a 550kbyte page, which is ridiculous.
+ *
+ * Stick to the short names in this file for consistency.
*
* Copyright : Written by and Copyright (C) 2001 the SourceForge
* IJBSWA team. http://ijbswa.sourceforge.net
@@ -35,6 +42,73 @@ const char cgiedit_rcs[] = "$Id: cgiedit.c,v 1.6 2001/10/29 03:48:09 david__schm
*
* Revisions :
* $Log: cgiedit.c,v $
+ * Revision 1.15 2002/03/06 22:54:35 jongfoster
+ * Automated function-comment nitpicking.
+ *
+ * Revision 1.14 2002/03/05 00:24:51 jongfoster
+ * Patch to always edit the current actions file.
+ *
+ * Revision 1.13 2002/03/04 02:07:59 david__schmidt
+ * Enable web editing of actions file on OS/2 (it had been broken all this time!)
+ *
+ * Revision 1.12 2002/03/03 09:18:03 joergs
+ * Made jumbjuster work on AmigaOS again.
+ *
+ * Revision 1.11 2002/01/23 01:03:31 jongfoster
+ * Fixing gcc [CygWin] compiler warnings
+ *
+ * Revision 1.10 2002/01/23 00:22:59 jongfoster
+ * Adding new function cgi_edit_actions_section_swap(), to reorder
+ * the actions file.
+ *
+ * Adding get_url_spec_param() to get a validated URL pattern.
+ *
+ * Moving edit_read_line() out of this file and into loaders.c.
+ *
+ * Adding missing html_encode() to many CGI functions.
+ *
+ * Moving the functions that #include actionlist.h to the end of the file,
+ * because the Visual C++ 97 debugger gets extremely confused if you try
+ * to debug any code that comes after them in the file.
+ *
+ * Major optimizations in cgi_edit_actions_list() to reduce the size of
+ * the generated HTML (down 40% from 550k to 304k), with major side-effects
+ * throughout the editor and templates. In particular, the length of the
+ * URLs throughout the editor has been drastically reduced, by cutting
+ * paramater names down to 1 character and CGI names down to 3-4
+ * characters, by removing all non-essential CGI paramaters even at the
+ * expense of having to re-read the actions file for the most trivial
+ * page, and by using relative rather than absolute URLs. This means
+ * that this (typical example):
+ *
+ *
+ *
+ * is now this:
+ *
+ *
+ *
+ * Revision 1.9 2002/01/17 20:56:22 jongfoster
+ * Replacing hard references to the URL of the config interface
+ * with #defines from project.h
+ *
+ * Revision 1.8 2001/11/30 23:35:51 jongfoster
+ * Renaming actionsfile to ijb.action
+ *
+ * Revision 1.7 2001/11/13 00:28:24 jongfoster
+ * - Renaming parameters from edit-actions-for-url so that they only
+ * contain legal JavaScript characters. If we wanted to write
+ * JavaScript that worked with Netscape 4, this is nessacery.
+ * (Note that at the moment the JavaScript doesn't actually work
+ * with Netscape 4, but now this is purely a template issue, not
+ * one affecting code).
+ * - Adding new CGIs for use by non-JavaScript browsers:
+ * edit-actions-url-form
+ * edit-actions-add-url-form
+ * edit-actions-remove-url-form
+ * - Fixing || bug.
+ *
* Revision 1.6 2001/10/29 03:48:09 david__schmidt
* OS/2 native needed a snprintf() routine. Added one to miscutil, brackedted
* by and __OS2__ ifdef.
@@ -109,8 +183,10 @@ const char cgiedit_rcs[] = "$Id: cgiedit.c,v 1.6 2001/10/29 03:48:09 david__schm
#include "actions.h"
#include "miscutil.h"
#include "errlog.h"
+#include "loaders.h"
#include "loadcfg.h"
/* loadcfg.h is for g_bToggleIJB only */
+#include "urlmatch.h"
const char cgiedit_h_rcs[] = CGIEDIT_H_VERSION;
@@ -169,7 +245,9 @@ struct editable_file
struct file_line * lines;
const char * filename; /* Full pathname - e.g. "/etc/junkbuster/wibble.action" */
const char * identifier; /* Filename stub - e.g. "wibble". Use for CGI param. */
+ /* Pre-encoded with url_encode() for ease of use. */
const char * version_str; /* Last modification time, as a string. For CGI param */
+ /* Can be used in URL without using url_param(). */
unsigned version; /* Last modification time - prevents chaos with
* the browser's "back" button. Note that this is a
* time_t cast to an unsigned. When comparing, always
@@ -177,6 +255,10 @@ struct editable_file
* This may lose the top few bits, but they're not
* significant anyway.
*/
+ int newline; /* Newline convention - one of the NEWLINE_xxx constants.
+ * Note that changing this after the file has been
+ * read in will cause a mess.
+ */
struct file_line * parse_error; /* On parse error, this is the offending line. */
const char * parse_error_text; /* On parse error, this is the problem.
* (Statically allocated) */
@@ -215,10 +297,8 @@ jb_err cgi_error_disabled(struct client_state *csp,
struct http_response *rsp);
/* Internal arbitrary config file support functions */
-static jb_err edit_read_file_lines(FILE *fp, struct file_line ** pfile);
+static jb_err edit_read_file_lines(FILE *fp, struct file_line ** pfile, int *newline);
static void edit_free_file_lines(struct file_line * first_line);
-static jb_err simple_read_line(char **dest, FILE *fp);
-static jb_err edit_read_line(FILE *fp, char **raw_out, char **prefix_out, char **data_out);
/* Internal actions file support functions */
static int match_actions_file_header_line(const char * line, const char * name);
@@ -235,12 +315,16 @@ static jb_err get_number_param(struct client_state *csp,
const struct map *parameters,
char *name,
unsigned *pvalue);
+static jb_err get_url_spec_param(struct client_state *csp,
+ const struct map *parameters,
+ const char *name,
+ char **pvalue);
/* Internal actionsfile <==> HTML conversion functions */
static jb_err map_radio(struct map * exports,
const char * optionname,
const char * values,
- char value);
+ int value);
static jb_err actions_to_radio(struct map * exports,
const struct action_spec *action);
static jb_err actions_from_radio(const struct map * parameters,
@@ -250,10 +334,11 @@ static jb_err actions_from_radio(const struct map * parameters,
static jb_err map_copy_parameter_html(struct map *out,
const struct map *in,
const char *name);
+#if 0 /* unused function */
static jb_err map_copy_parameter_url(struct map *out,
const struct map *in,
const char *name);
-
+#endif /* unused function */
/*********************************************************************
*
@@ -263,9 +348,9 @@ static jb_err map_copy_parameter_url(struct map *out,
* encoding it.
*
* Parameters :
- * 1 : out = target map
- * 2 : in = source map
- * 3 : name = name of cgi parameter to copy
+ * 1 : out = target map
+ * 2 : in = source map
+ * 3 : name = name of cgi parameter to copy
*
* Returns : JB_ERR_OK on success
* JB_ERR_MEMORY on out-of-memory
@@ -303,6 +388,7 @@ static jb_err map_copy_parameter_html(struct map *out,
}
+#if 0 /* unused function */
/*********************************************************************
*
* Function : map_copy_parameter_html
@@ -311,9 +397,9 @@ static jb_err map_copy_parameter_html(struct map *out,
* encoding it.
*
* Parameters :
- * 1 : out = target map
- * 2 : in = source map
- * 3 : name = name of cgi parameter to copy
+ * 1 : out = target map
+ * 2 : in = source map
+ * 3 : name = name of cgi parameter to copy
*
* Returns : JB_ERR_OK on success
* JB_ERR_MEMORY on out-of-memory
@@ -349,7 +435,7 @@ static jb_err map_copy_parameter_url(struct map *out,
return JB_ERR_OK;
}
}
-
+#endif /* 0 - unused function */
/*********************************************************************
*
@@ -359,16 +445,14 @@ static jb_err map_copy_parameter_url(struct map *out,
* edit-actions-url
*
* Parameters :
- * 1 : csp = Current client state (buffers, headers, etc...)
- * 2 : rsp = http_response data structure for output
- * 3 : parameters = map of cgi parameters
+ * 1 : csp = Current client state (buffers, headers, etc...)
+ * 2 : rsp = http_response data structure for output
+ * 3 : parameters = map of cgi parameters
*
* CGI Parameters
- * filename : Identifies the file to edit
- * ver : File's last-modified time
- * section : Line number of section to edit
- * pattern : Line number of pattern to edit
- * oldval : Current value for pattern
+ * f : (filename) Identifies the file to edit
+ * v : (version) File's last-modified time
+ * p : (pattern) Line number of pattern to edit
*
* Returns : JB_ERR_OK on success
* JB_ERR_MEMORY on out-of-memory
@@ -380,7 +464,11 @@ jb_err cgi_edit_actions_url_form(struct client_state *csp,
struct http_response *rsp,
const struct map *parameters)
{
- struct map *exports;
+ struct map * exports;
+ unsigned patternid;
+ struct editable_file * file;
+ struct file_line * cur_line;
+ unsigned line_number;
jb_err err;
assert(csp);
@@ -392,16 +480,48 @@ jb_err cgi_edit_actions_url_form(struct client_state *csp,
return cgi_error_disabled(csp, rsp);
}
+ err = get_number_param(csp, parameters, "p", &patternid);
+ if (err)
+ {
+ return err;
+ }
+
+ err = edit_read_actions_file(csp, rsp, parameters, 1, &file);
+ if (err)
+ {
+ /* No filename specified, can't read file, modified, or out of memory. */
+ return (err == JB_ERR_FILE ? JB_ERR_OK : err);
+ }
+
+ cur_line = file->lines;
+
+ for (line_number = 1; (cur_line != NULL) && (line_number < patternid); line_number++)
+ {
+ cur_line = cur_line->next;
+ }
+
+ if ( (cur_line == NULL)
+ || (line_number != patternid)
+ || (patternid < 1)
+ || (cur_line->type != FILE_LINE_URL))
+ {
+ /* Invalid "patternid" parameter */
+ edit_free_file(file);
+ return JB_ERR_CGI_PARAMS;
+ }
+
if (NULL == (exports = default_exports(csp, NULL)))
{
+ edit_free_file(file);
return JB_ERR_MEMORY;
}
- err = map_copy_parameter_html(exports, parameters, "section");
- if (!err) err = map_copy_parameter_html(exports, parameters, "pattern");
- if (!err) err = map_copy_parameter_html(exports, parameters, "ver");
- if (!err) err = map_copy_parameter_html(exports, parameters, "filename");
- if (!err) err = map_copy_parameter_html(exports, parameters, "oldval");
+ err = map(exports, "f", 1, file->identifier, 1);
+ if (!err) err = map(exports, "v", 1, file->version_str, 1);
+ if (!err) err = map(exports, "p", 1, url_encode(lookup(parameters, "p")), 0);
+ if (!err) err = map(exports, "u", 1, html_encode(cur_line->unprocessed), 0);
+
+ edit_free_file(file);
if (err)
{
@@ -421,14 +541,14 @@ jb_err cgi_edit_actions_url_form(struct client_state *csp,
* edit-actions-url
*
* Parameters :
- * 1 : csp = Current client state (buffers, headers, etc...)
- * 2 : rsp = http_response data structure for output
- * 3 : parameters = map of cgi parameters
+ * 1 : csp = Current client state (buffers, headers, etc...)
+ * 2 : rsp = http_response data structure for output
+ * 3 : parameters = map of cgi parameters
*
* CGI Parameters :
- * filename : Identifies the file to edit
- * ver : File's last-modified time
- * section : Line number of section to edit
+ * f : (filename) Identifies the file to edit
+ * v : (version) File's last-modified time
+ * s : (section) Line number of section to edit
*
* Returns : JB_ERR_OK on success
* JB_ERR_MEMORY on out-of-memory
@@ -457,9 +577,9 @@ jb_err cgi_edit_actions_add_url_form(struct client_state *csp,
return JB_ERR_MEMORY;
}
- err = map_copy_parameter_html(exports, parameters, "section");
- if (!err) err = map_copy_parameter_html(exports, parameters, "ver");
- if (!err) err = map_copy_parameter_html(exports, parameters, "filename");
+ err = map_copy_parameter_html(exports, parameters, "f");
+ if (!err) err = map_copy_parameter_html(exports, parameters, "v");
+ if (!err) err = map_copy_parameter_html(exports, parameters, "s");
if (err)
{
@@ -479,16 +599,14 @@ jb_err cgi_edit_actions_add_url_form(struct client_state *csp,
* edit-actions-url
*
* Parameters :
- * 1 : csp = Current client state (buffers, headers, etc...)
- * 2 : rsp = http_response data structure for output
- * 3 : parameters = map of cgi parameters
+ * 1 : csp = Current client state (buffers, headers, etc...)
+ * 2 : rsp = http_response data structure for output
+ * 3 : parameters = map of cgi parameters
*
* CGI Parameters :
- * filename : Identifies the file to edit
- * ver : File's last-modified time
- * section : Line number of section to edit
- * pattern : Line number of pattern to edit
- * oldval : Current value for pattern
+ * f : (filename) Identifies the file to edit
+ * v : (version) File's last-modified time
+ * p : (pattern) Line number of pattern to edit
*
* Returns : JB_ERR_OK on success
* JB_ERR_MEMORY on out-of-memory
@@ -500,7 +618,11 @@ jb_err cgi_edit_actions_remove_url_form(struct client_state *csp,
struct http_response *rsp,
const struct map *parameters)
{
- struct map *exports;
+ struct map * exports;
+ unsigned patternid;
+ struct editable_file * file;
+ struct file_line * cur_line;
+ unsigned line_number;
jb_err err;
assert(csp);
@@ -512,341 +634,56 @@ jb_err cgi_edit_actions_remove_url_form(struct client_state *csp,
return cgi_error_disabled(csp, rsp);
}
- if (NULL == (exports = default_exports(csp, NULL)))
- {
- return JB_ERR_MEMORY;
- }
-
- err = map_copy_parameter_url(exports, parameters, "section");
- if (!err) err = map_copy_parameter_url(exports, parameters, "pattern");
- if (!err) err = map_copy_parameter_url(exports, parameters, "ver");
- if (!err) err = map_copy_parameter_url(exports, parameters, "filename");
- if (!err) err = map_copy_parameter_html(exports, parameters, "oldval");
-
+ err = get_number_param(csp, parameters, "p", &patternid);
if (err)
{
- free_map(exports);
return err;
}
- return template_fill_for_cgi(csp, "edit-actions-remove-url-form", exports, rsp);
-}
-
-
-/*********************************************************************
- *
- * Function : simple_read_line
- *
- * Description : Read a single line from a file and return it.
- * This is basically a version of fgets() that malloc()s
- * it's own line buffer. Note that the buffer will
- * always be a multiple of BUFFER_SIZE bytes long.
- * Therefore if you are going to keep the string for
- * an extended period of time, you should probably
- * strdup() it and free() the original, to save memory.
- *
- *
- * Parameters :
- * 1 : dest = destination for newly malloc'd pointer to
- * line data. Will be set to NULL on error.
- * 2 : fp = File to read from
- *
- * Returns : JB_ERR_OK on success
- * JB_ERR_MEMORY on out-of-memory
- * JB_ERR_FILE on EOF.
- *
- *********************************************************************/
-static jb_err simple_read_line(char **dest, FILE *fp)
-{
- int len;
- char * buf;
- char * newbuf;
-
- assert(fp);
- assert(dest);
-
- *dest = NULL;
-
- if (NULL == (buf = malloc(BUFFER_SIZE)))
+ err = edit_read_actions_file(csp, rsp, parameters, 1, &file);
+ if (err)
{
- return JB_ERR_MEMORY;
+ /* No filename specified, can't read file, modified, or out of memory. */
+ return (err == JB_ERR_FILE ? JB_ERR_OK : err);
}
- *buf = '\0';
- len = 0;
+ cur_line = file->lines;
- while (FOREVER)
+ for (line_number = 1; (cur_line != NULL) && (line_number < patternid); line_number++)
{
- newbuf = buf + len;
- if ((!fgets(newbuf, BUFFER_SIZE, fp)) || (*newbuf == '\0'))
- {
- /* (*newbuf == '\0') should never happen unless fgets fails */
- if (*buf == '\0')
- {
- free(buf);
- return JB_ERR_FILE;
- }
- else
- {
- *dest = buf;
- return JB_ERR_OK;
- }
- }
- len = strlen(buf);
- if ((buf[len - 1] == '\n') || (buf[len - 1] == '\r'))
- {
- *dest = buf;
- return JB_ERR_OK;
- }
-
- if (NULL == (newbuf = realloc(buf, len + BUFFER_SIZE)))
- {
- free(buf);
- return JB_ERR_MEMORY;
- }
- buf = newbuf;
+ cur_line = cur_line->next;
}
-}
-
-/*********************************************************************
- *
- * Function : edit_read_line
- *
- * Description : Read a single non-empty line from a file and return
- * it. Trims comments, leading and trailing whitespace
- * and respects escaping of newline and comment char.
- * Provides the line in 2 alternative forms: raw and
- * preprocessed.
- * - raw is the raw data read from the file. If the
- * line is not modified, then this should be written
- * to the new file.
- * - prefix is any comments and blank lines that were
- * read from the file. If the line is modified, then
- * this should be written out to the file followed
- * by the modified data. (If this string is non-empty
- * then it will have a newline at the end).
- * - data is the actual data that will be parsed
- * further by appropriate routines.
- * On EOF, the 3 strings will all be set to NULL and
- * 0 will be returned.
- *
- * Parameters :
- * 1 : fp = File to read from
- * 2 : raw_out = destination for newly malloc'd pointer to
- * raw line data. May be NULL if you don't want it.
- * 3 : prefix_out = destination for newly malloc'd pointer to
- * comments. May be NULL if you don't want it.
- * 4 : data_out = destination for newly malloc'd pointer to
- * line data with comments and leading/trailing spaces
- * removed, and line continuation performed. May be
- * NULL if you don't want it.
- *
- * Returns : JB_ERR_OK on success
- * JB_ERR_MEMORY on out-of-memory
- * JB_ERR_FILE on EOF.
- *
- *********************************************************************/
-static jb_err edit_read_line(FILE *fp, char **raw_out, char **prefix_out, char **data_out)
-{
- char *p; /* Temporary pointer */
- char *linebuf; /* Line read from file */
- char *linestart; /* Start of linebuf, usually first non-whitespace char */
- char newline[3]; /* Used to store the newline - "\n", "\r", or "\r\n" */
- int contflag = 0; /* Nonzero for line continuation - i.e. line ends '\' */
- char *raw; /* String to be stored in raw_out */
- char *prefix; /* String to be stored in prefix_out */
- char *data; /* String to be stored in data_out */
- jb_err rval = JB_ERR_OK;
-
- assert(fp);
-
- /* Set output parameters to NULL */
- if (raw_out)
- {
- *raw_out = NULL;
- }
- if (prefix_out)
- {
- *prefix_out = NULL;
- }
- if (data_out)
+ if ( (cur_line == NULL)
+ || (line_number != patternid)
+ || (patternid < 1)
+ || (cur_line->type != FILE_LINE_URL))
{
- *data_out = NULL;
+ /* Invalid "patternid" parameter */
+ edit_free_file(file);
+ return JB_ERR_CGI_PARAMS;
}
- /* Set string variables to new, empty strings. */
-
- raw = malloc(1);
- prefix = malloc(1);
- data = malloc(1);
-
- if ((raw == NULL) || (prefix == NULL) || (data == NULL))
+ if (NULL == (exports = default_exports(csp, NULL)))
{
- freez(raw);
- freez(prefix);
- freez(data);
+ edit_free_file(file);
return JB_ERR_MEMORY;
}
- *raw = '\0';
- *prefix = '\0';
- *data = '\0';
-
- /* Main loop. Loop while we need more data & it's not EOF. */
-
- while ( (contflag || (*data == '\0'))
- && (JB_ERR_OK == (rval = simple_read_line(&linebuf, fp))))
- {
- if (string_append(&raw,linebuf))
- {
- free(prefix);
- free(data);
- free(linebuf);
- return JB_ERR_MEMORY;
- }
-
- /* Trim off newline */
- p = linebuf + strlen(linebuf);
- if ((p != linebuf) && ((p[-1] == '\r') || (p[-1] == '\n')))
- {
- p--;
- if ((p != linebuf) && ((p[-1] == '\r') || (p[-1] == '\n')))
- {
- p--;
- }
- }
- strcpy(newline, p);
- *p = '\0';
-
- /* Line continuation? Trim escape and set flag. */
- contflag = ((p != linebuf) && (*--p == '\\'));
- if (contflag)
- {
- *p = '\0';
- }
-
- /* Trim leading spaces if we're at the start of the line */
- linestart = linebuf;
- if (*data == '\0')
- {
- /* Trim leading spaces */
- while (*linestart && isspace((int)(unsigned char)*linestart))
- {
- linestart++;
- }
- }
-
- /* Handle comment characters. */
- p = linestart;
- while ((p = strchr(p, '#')) != NULL)
- {
- /* Found a comment char.. */
- if ((p != linebuf) && (*(p-1) == '\\'))
- {
- /* ..and it's escaped, left-shift the line over the escape. */
- char *q = p - 1;
- while ((*q = *(q + 1)) != '\0')
- {
- q++;
- }
- /* Now scan from just after the "#". */
- }
- else
- {
- /* Real comment. Save it... */
- if (p == linestart)
- {
- /* Special case: Line only contains a comment, so all the
- * previous whitespace is considered part of the comment.
- * Undo the whitespace skipping, if any.
- */
- linestart = linebuf;
- p = linestart;
- }
- string_append(&prefix,p);
- if (string_append(&prefix,newline))
- {
- free(raw);
- free(data);
- free(linebuf);
- return JB_ERR_MEMORY;
- }
- *newline = '\0';
-
- /* ... and chop off the rest of the line */
- *p = '\0';
- }
- } /* END while (there's a # character) */
-
- /* Write to the buffer */
- if (*linestart)
- {
- if (string_append(&data, linestart))
- {
- free(raw);
- free(prefix);
- free(linebuf);
- return JB_ERR_MEMORY;
- }
- }
-
- free(linebuf);
- } /* END while(we need more data) */
-
- /* Handle simple_read_line() errors - ignore EOF */
- if ((rval != JB_ERR_OK) && (rval != JB_ERR_FILE))
- {
- free(raw);
- free(prefix);
- free(data);
- return rval;
- }
+ err = map(exports, "f", 1, file->identifier, 1);
+ if (!err) err = map(exports, "v", 1, file->version_str, 1);
+ if (!err) err = map(exports, "s", 1, url_encode(lookup(parameters, "s")), 0);
+ if (!err) err = map(exports, "u", 1, html_encode(cur_line->unprocessed), 0);
+ edit_free_file(file);
- if (*raw)
+ if (err)
{
- /* Got at least some data */
-
- /* Remove trailing whitespace */
- chomp(data);
-
- if (raw_out)
- {
- *raw_out = raw;
- }
- else
- {
- free(raw);
- }
- if (prefix_out)
- {
- *prefix_out = prefix;
- }
- else
- {
- free(prefix);
- }
- if (data_out)
- {
- *data_out = data;
- }
- else
- {
- free(data);
- }
- return JB_ERR_OK;
+ free_map(exports);
+ return err;
}
- else
- {
- /* EOF and no data there. */
-
- free(raw);
- free(prefix);
- free(data);
- return JB_ERR_FILE;
- }
+ return template_fill_for_cgi(csp, "edit-actions-remove-url-form", exports, rsp);
}
@@ -878,7 +715,11 @@ jb_err edit_write_file(struct editable_file * file)
assert(file);
assert(file->filename);
+#if defined(AMIGA) || defined(__OS2__)
+ if (NULL == (fp = fopen(file->filename, "w")))
+#else
if (NULL == (fp = fopen(file->filename, "wt")))
+#endif /* def AMIGA */
{
return JB_ERR_FILE;
}
@@ -906,12 +747,72 @@ jb_err edit_write_file(struct editable_file * file)
}
if (cur_line->unprocessed)
{
- if (fputs(cur_line->unprocessed, fp) < 0)
+ /* This should be a single line - sanity check. */
+ assert(NULL == strchr(cur_line->unprocessed, '\r'));
+ assert(NULL == strchr(cur_line->unprocessed, '\n'));
+
+ if (NULL != strchr(cur_line->unprocessed, '#'))
{
- fclose(fp);
- return JB_ERR_FILE;
+ /* Must quote '#' characters */
+ int numhash = 0;
+ int len;
+ char * src;
+ char * dest;
+ char * str;
+
+ /* Count number of # characters, so we know length of output string */
+ src = cur_line->unprocessed;
+ while (NULL != (src = strchr(src, '#')))
+ {
+ numhash++;
+ src++;
+ }
+ assert(numhash > 0);
+
+ /* Allocate new memory for string */
+ len = strlen(cur_line->unprocessed);
+ if (NULL == (str = malloc((size_t) len + 1 + numhash)))
+ {
+ /* Uh oh, just trashed file! */
+ fclose(fp);
+ return JB_ERR_MEMORY;
+ }
+
+ /* Loop through string from end */
+ src = cur_line->unprocessed + len;
+ dest = str + len + numhash;
+ for ( ; len >= 0; len--)
+ {
+ if ((*dest-- = *src--) == '#')
+ {
+ *dest-- = '\\';
+ numhash--;
+ assert(numhash >= 0);
+ }
+ }
+ assert(numhash == 0);
+ assert(src + 1 == cur_line->unprocessed);
+ assert(dest + 1 == str);
+
+ if (fputs(str, fp) < 0)
+ {
+ free(str);
+ fclose(fp);
+ return JB_ERR_FILE;
+ }
+
+ free(str);
}
- if (fputs("\n", fp) < 0)
+ else
+ {
+ /* Can write without quoting '#' characters. */
+ if (fputs(cur_line->unprocessed, fp) < 0)
+ {
+ fclose(fp);
+ return JB_ERR_FILE;
+ }
+ }
+ if (fputs(NEWLINE(file->newline), fp) < 0)
{
fclose(fp);
return JB_ERR_FILE;
@@ -1049,15 +950,15 @@ static void edit_free_file_lines(struct file_line * first_line)
* Description : Match an actions file {{header}} line
*
* Parameters :
- * 1 : line - String from file
- * 2 : name - Header to match against
+ * 1 : line = String from file
+ * 2 : name = Header to match against
*
* Returns : 0 iff they match.
*
*********************************************************************/
static int match_actions_file_header_line(const char * line, const char * name)
{
- int len;
+ size_t len;
assert(line);
assert(name);
@@ -1107,10 +1008,10 @@ static int match_actions_file_header_line(const char * line, const char * name)
* Description : Match an actions file {{header}} line
*
* Parameters :
- * 1 : line - String from file. Must not start with
+ * 1 : line = String from file. Must not start with
* whitespace (else infinite loop!)
- * 2 : name - Destination for name
- * 2 : name - Destination for value
+ * 2 : name = Destination for name
+ * 2 : name = Destination for value
*
* Returns : JB_ERR_OK on success
* JB_ERR_MEMORY on out-of-memory
@@ -1123,7 +1024,7 @@ static jb_err split_line_on_equals(const char * line, char ** pname, char ** pva
{
const char * name_end;
const char * value_start;
- int name_len;
+ size_t name_len;
assert(line);
assert(pname);
@@ -1203,7 +1104,7 @@ static jb_err split_line_on_equals(const char * line, char ** pname, char ** pva
jb_err edit_parse_actions_file(struct editable_file * file)
{
struct file_line * cur_line;
- int len;
+ size_t len;
const char * text; /* Text from a line */
char * name; /* For lines of the form name=value */
char * value; /* For lines of the form name=value */
@@ -1493,7 +1394,7 @@ jb_err edit_parse_actions_file(struct editable_file * file)
* JB_ERR_MEMORY on out-of-memory
*
*********************************************************************/
-jb_err edit_read_file_lines(FILE *fp, struct file_line ** pfile)
+jb_err edit_read_file_lines(FILE *fp, struct file_line ** pfile, int *newline)
{
struct file_line * first_line; /* Keep for return value or to free */
struct file_line * cur_line; /* Current line */
@@ -1513,7 +1414,7 @@ jb_err edit_read_file_lines(FILE *fp, struct file_line ** pfile)
cur_line->type = FILE_LINE_UNPROCESSED;
- rval = edit_read_line(fp, &cur_line->raw, &cur_line->prefix, &cur_line->unprocessed);
+ rval = edit_read_line(fp, &cur_line->raw, &cur_line->prefix, &cur_line->unprocessed, newline, NULL);
if (rval)
{
/* Out of memory or empty file. */
@@ -1535,7 +1436,7 @@ jb_err edit_read_file_lines(FILE *fp, struct file_line ** pfile)
cur_line->type = FILE_LINE_UNPROCESSED;
- rval = edit_read_line(fp, &cur_line->raw, &cur_line->prefix, &cur_line->unprocessed);
+ rval = edit_read_line(fp, &cur_line->raw, &cur_line->prefix, &cur_line->unprocessed, newline, NULL);
if ((rval != JB_ERR_OK) && (rval != JB_ERR_FILE))
{
/* Out of memory */
@@ -1606,6 +1507,7 @@ jb_err edit_read_file(struct client_state *csp,
unsigned version = 0;
struct stat statbuf[1];
char version_buf[22];
+ int newline = NEWLINE_UNKNOWN;
assert(csp);
assert(parameters);
@@ -1613,7 +1515,7 @@ jb_err edit_read_file(struct client_state *csp,
*pfile = NULL;
- err = get_file_name_param(csp, parameters, "filename", suffix,
+ err = get_file_name_param(csp, parameters, "f", suffix,
&filename, &identifier);
if (err)
{
@@ -1631,7 +1533,7 @@ jb_err edit_read_file(struct client_state *csp,
if (require_version)
{
unsigned specified_version;
- err = get_number_param(csp, parameters, "ver", &specified_version);
+ err = get_number_param(csp, parameters, "v", &specified_version);
if (err)
{
free(filename);
@@ -1644,13 +1546,17 @@ jb_err edit_read_file(struct client_state *csp,
}
}
+#if defined(AMIGA) || defined(__OS2__)
+ if (NULL == (fp = fopen(filename,"r")))
+#else
if (NULL == (fp = fopen(filename,"rt")))
+#endif /* def AMIGA */
{
free(filename);
return JB_ERR_FILE;
}
- err = edit_read_file_lines(fp, &lines);
+ err = edit_read_file_lines(fp, &lines, &newline);
fclose(fp);
@@ -1669,9 +1575,10 @@ jb_err edit_read_file(struct client_state *csp,
}
file->lines = lines;
+ file->newline = newline;
file->filename = filename;
file->version = version;
- file->identifier = strdup(identifier);
+ file->identifier = url_encode(identifier);
if (file->identifier == NULL)
{
@@ -1754,11 +1661,11 @@ jb_err edit_read_actions_file(struct client_state *csp,
/* Try to handle if possible */
if (err == JB_ERR_FILE)
{
- err = cgi_error_file(csp, rsp, lookup(parameters, "filename"));
+ err = cgi_error_file(csp, rsp, lookup(parameters, "f"));
}
else if (err == JB_ERR_MODIFIED)
{
- err = cgi_error_modified(csp, rsp, lookup(parameters, "filename"));
+ err = cgi_error_modified(csp, rsp, lookup(parameters, "f"));
}
if (err == JB_ERR_OK)
{
@@ -1816,12 +1723,13 @@ jb_err edit_read_actions_file(struct client_state *csp,
* secure.
*
* Parameters :
- * 1 : csp = Current client state (buffers, headers, etc...)
- * 2 : parameters = map of cgi parameters
- * 3 : suffix = File extension, e.g. ".actions"
- * 4 : pfilename = destination for full filename. Caller
+ * 1 : csp = Current client state (buffers, headers, etc...)
+ * 2 : parameters = map of cgi parameters
+ * 3 : param_name = The name of the parameter to read
+ * 4 : suffix = File extension, e.g. ".actions"
+ * 5 : pfilename = destination for full filename. Caller
* free()s. Set to NULL on error.
- * 5 : pparam = destination for partial filename,
+ * 6 : pparam = destination for partial filename,
* suitable for use in another URL. Allocated as part
* of the map "parameters", so don't free it.
* Set to NULL if not specified.
@@ -1841,7 +1749,9 @@ static jb_err get_file_name_param(struct client_state *csp,
{
const char *param;
const char *s;
+#if 0 /* Patch to make 3.0.0 work properly. */
char *name;
+#endif /* 0 - Patch to make 3.0.0 work properly. */
char *fullpath;
char ch;
int len;
@@ -1885,6 +1795,13 @@ static jb_err get_file_name_param(struct client_state *csp,
}
}
+ /*
+ * FIXME Following is a hack to make 3.0.0 work properly.
+ * Change "#if 0" --> "#if 1" below when we have modular action
+ * files.
+ * -- Jon
+ */
+#if 0 /* Patch to make 3.0.0 work properly. */
/* Append extension */
name = malloc(len + strlen(suffix) + 1);
if (name == NULL)
@@ -1897,6 +1814,16 @@ static jb_err get_file_name_param(struct client_state *csp,
/* Prepend path */
fullpath = make_path(csp->config->confdir, name);
free(name);
+#else /* 1 - Patch to make 3.0.0 work properly. */
+ if ((csp->actions_list == NULL)
+ || (csp->actions_list->filename == NULL))
+ {
+ return JB_ERR_CGI_PARAMS;
+ }
+
+ fullpath = ( (csp->actions_list && csp->actions_list->filename)
+ ? strdup(csp->actions_list->filename) : NULL);
+#endif /* 1 - Patch to make 3.0.0 work properly. */
if (fullpath == NULL)
{
return JB_ERR_MEMORY;
@@ -1917,10 +1844,10 @@ static jb_err get_file_name_param(struct client_state *csp,
* passed to a CGI function.
*
* Parameters :
- * 1 : csp = Current client state (buffers, headers, etc...)
- * 2 : parameters = map of cgi parameters
- * 3 : name = Name of CGI parameter to read
- * 4 : pvalue = destination for value.
+ * 1 : csp = Current client state (buffers, headers, etc...)
+ * 2 : parameters = map of cgi parameters
+ * 3 : name = Name of CGI parameter to read
+ * 4 : pvalue = destination for value.
* Set to -1 on error.
*
* Returns : JB_ERR_OK on success
@@ -1943,7 +1870,7 @@ static jb_err get_number_param(struct client_state *csp,
assert(name);
assert(pvalue);
- *pvalue = -1;
+ *pvalue = 0;
param = lookup(parameters, name);
if (!*param)
@@ -1982,14 +1909,142 @@ static jb_err get_number_param(struct client_state *csp,
*pvalue = value;
return JB_ERR_OK;
+
}
/*********************************************************************
*
- * Function : map_radio
+ * Function : get_url_spec_param
*
- * Description : Map a set of radio button values. E.g. if you have
+ * Description : Get a URL pattern from the parameters
+ * passed to a CGI function. Removes leading/trailing
+ * spaces and validates it.
+ *
+ * Parameters :
+ * 1 : csp = Current client state (buffers, headers, etc...)
+ * 2 : parameters = map of cgi parameters
+ * 3 : name = Name of CGI parameter to read
+ * 4 : pvalue = destination for value. Will be malloc()'d.
+ * Set to NULL on error.
+ *
+ * Returns : JB_ERR_OK on success
+ * JB_ERR_MEMORY on out-of-memory
+ * JB_ERR_CGI_PARAMS if the parameter was not specified
+ * or is not valid.
+ *
+ *********************************************************************/
+static jb_err get_url_spec_param(struct client_state *csp,
+ const struct map *parameters,
+ const char *name,
+ char **pvalue)
+{
+ const char *orig_param;
+ char *param;
+ char *s;
+ struct url_spec compiled[1];
+ jb_err err;
+
+ assert(csp);
+ assert(parameters);
+ assert(name);
+ assert(pvalue);
+
+ *pvalue = NULL;
+
+ orig_param = lookup(parameters, name);
+ if (!*orig_param)
+ {
+ return JB_ERR_CGI_PARAMS;
+ }
+
+ /* Copy and trim whitespace */
+ param = strdup(orig_param);
+ if (param == NULL)
+ {
+ return JB_ERR_MEMORY;
+ }
+ chomp(param);
+
+ /* Must be non-empty, and can't allow 1st character to be '{' */
+ if (param[0] == '\0' || param[0] == '{')
+ {
+ free(param);
+ return JB_ERR_CGI_PARAMS;
+ }
+
+ /* Check for embedded newlines */
+ for (s = param; *s != '\0'; s++)
+ {
+ if ((*s == '\r') || (*s == '\n'))
+ {
+ free(param);
+ return JB_ERR_CGI_PARAMS;
+ }
+ }
+
+ /* Check that regex is valid */
+ s = strdup(param);
+ if (s == NULL)
+ {
+ free(param);
+ return JB_ERR_MEMORY;
+ }
+ err = create_url_spec(compiled, s);
+ free(s);
+ if (err)
+ {
+ free(param);
+ return (err == JB_ERR_MEMORY) ? JB_ERR_MEMORY : JB_ERR_CGI_PARAMS;
+ }
+ free_url_spec(compiled);
+
+ if (param[strlen(param) - 1] == '\\')
+ {
+ /*
+ * Must protect trailing '\\' from becoming line continuation character.
+ * Two methods: 1) If it's a domain only, add a trailing '/'.
+ * 2) For path, add the do-nothing PCRE expression (?:) to the end
+ */
+ if (strchr(param, '/') == NULL)
+ {
+ err = string_append(¶m, "/");
+ }
+ else
+ {
+ err = string_append(¶m, "(?:)");
+ }
+ if (err)
+ {
+ return err;
+ }
+
+ /* Check that the modified regex is valid */
+ s = strdup(param);
+ if (s == NULL)
+ {
+ free(param);
+ return JB_ERR_MEMORY;
+ }
+ err = create_url_spec(compiled, s);
+ free(s);
+ if (err)
+ {
+ free(param);
+ return (err == JB_ERR_MEMORY) ? JB_ERR_MEMORY : JB_ERR_CGI_PARAMS;
+ }
+ free_url_spec(compiled);
+ }
+
+ *pvalue = param;
+ return JB_ERR_OK;
+}
+
+/*********************************************************************
+ *
+ * Function : map_radio
+ *
+ * Description : Map a set of radio button values. E.g. if you have
* 3 radio buttons, declare them as:
*