-const char parsers_rcs[] = "$Id: parsers.c,v 1.10 2001/05/29 09:50:24 jongfoster Exp $";
+const char parsers_rcs[] = "$Id: parsers.c,v 1.15 2001/06/03 11:03:48 oes Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/parsers.c,v $
*
* Revisions :
* $Log: parsers.c,v $
+ * Revision 1.15 2001/06/03 11:03:48 oes
+ * Makefile/in
+ *
+ * introduced cgi.c
+ *
+ * actions.c:
+ *
+ * adapted to new enlist_unique arg format
+ *
+ * conf loadcfg.c
+ *
+ * introduced confdir option
+ *
+ * filters.c filtrers.h
+ *
+ * extracted-CGI relevant stuff
+ *
+ * jbsockets.c
+ *
+ * filled comment
+ *
+ * jcc.c
+ *
+ * support for new cgi mechansim
+ *
+ * list.c list.h
+ *
+ * functions for new list type: "map"
+ * extended enlist_unique
+ *
+ * miscutil.c .h
+ * introduced bindup()
+ *
+ * parsers.c parsers.h
+ *
+ * deleted const struct interceptors
+ *
+ * pcrs.c
+ * added FIXME
+ *
+ * project.h
+ *
+ * added struct map
+ * added struct http_response
+ * changes struct interceptors to struct cgi_dispatcher
+ * moved HTML stuff to cgi.h
+ *
+ * re_filterfile:
+ *
+ * changed
+ *
+ * showargs.c
+ * NO TIME LEFT
+ *
+ * Revision 1.14 2001/06/01 18:49:17 jongfoster
+ * Replaced "list_share" with "list" - the tiny memory gain was not
+ * worth the extra complexity.
+ *
+ * Revision 1.13 2001/05/31 21:30:33 jongfoster
+ * Removed list code - it's now in list.[ch]
+ * Renamed "permission" to "action", and changed many features
+ * to use the actions file rather than the global config.
+ *
+ * Revision 1.12 2001/05/31 17:33:13 oes
+ *
+ * CRLF -> LF
+ *
+ * Revision 1.11 2001/05/29 20:11:19 joergs
+ * '/* inside comment' warning removed.
+ *
* Revision 1.10 2001/05/29 09:50:24 jongfoster
* Unified blocklist/imagelist/permissionslist.
* File format is still under discussion, but the internal changes
#endif
#include "project.h"
+#include "list.h"
#include "parsers.h"
#include "encode.h"
#include "filters.h"
#include "errlog.h"
#include "jbsockets.h"
#include "miscutil.h"
+#include "cgi.h"
const char parsers_h_rcs[] = PARSERS_H_VERSION;
{ NULL, 0, NULL }
};
-const struct interceptors intercept_patterns[] = {
- { "show-proxy-args", 14, show_proxy_args },
- { "ijb-send-banner", 14, ijb_send_banner },
-#ifdef TRUST_FILES
- { "ij-untrusted-url", 15, ij_untrusted_url },
-#endif /* def TRUST_FILES */
- { "show-url-info", 13, ijb_show_url_info },
- { NULL, 0, NULL }
-};
const struct parsers server_patterns[] = {
{ "set-cookie:", 11, server_set_cookie },
}
-/*********************************************************************
- *
- * Function : enlist
- *
- * Description : Append a string into a specified string list.
- *
- * Parameters :
- * 1 : h = pointer to list 'dummy' header
- * 2 : s = string to add to the list
- *
- * Returns : N/A
- *
- *********************************************************************/
-void enlist(struct list *h, const char *s)
-{
- struct list *n = (struct list *)malloc(sizeof(*n));
- struct list *l;
-
- if (n)
- {
- n->str = strdup(s);
- n->next = NULL;
-
- if ((l = h->last))
- {
- l->next = n;
- }
- else
- {
- h->next = n;
- }
-
- h->last = n;
- }
-
-}
-
-
-/*********************************************************************
- *
- * Function : destroy_list
- *
- * Description : Destroy a string list (opposite of enlist)
- *
- * Parameters :
- * 1 : h = pointer to list 'dummy' header
- *
- * Returns : N/A
- *
- *********************************************************************/
-void destroy_list(struct list *h)
-{
- struct list *p, *n;
-
- for (p = h->next; p ; p = n)
- {
- n = p->next;
- freez(p->str);
- freez(p);
- }
-
- memset(h, '\0', sizeof(*h));
-
-}
-
-
-/*********************************************************************
- *
- * Function : list_to_text
- *
- * Description : "Flaten" a string list into 1 long \r\n delimited string.
- *
- * Parameters :
- * 1 : h = pointer to list 'dummy' header
- *
- * Returns : NULL on malloc error, else new long string.
- *
- *********************************************************************/
-static char *list_to_text(struct list *h)
-{
- struct list *p;
- char *ret = NULL;
- char *s;
- int size;
-
- size = 0;
-
- for (p = h->next; p ; p = p->next)
- {
- if (p->str)
- {
- size += strlen(p->str) + 2;
- }
- }
-
- if ((ret = (char *)malloc(size + 1)) == NULL)
- {
- return(NULL);
- }
-
- ret[size] = '\0';
-
- s = ret;
-
- for (p = h->next; p ; p = p->next)
- {
- if (p->str)
- {
- strcpy(s, p->str);
- s += strlen(s);
- *s++ = '\r'; *s++ = '\n';
- }
- }
-
- return(ret);
-
-}
-
-
/*********************************************************************
*
* Function : sed
*********************************************************************/
char *client_referrer(const struct parsers *v, char *s, struct client_state *csp)
{
+ const char * newval;
#ifdef FORCE_LOAD
/* Since the referrer can include the prefix even
* even if the request itself is non-forced, we must
strclean(s, FORCE_PREFIX);
#endif /* def FORCE_LOAD */
-#ifdef TRUST_FILES\r
+#ifdef TRUST_FILES
csp->referrer = strdup(s);
-#endif /* def TRUST_FILES */\r
+#endif /* def TRUST_FILES */
/*
- * Check permissionsfile. If we have allowed this site to get the
- * referer, then send it and we're done.
+ * Are we sending referer?
*/
- if (csp->permissions & PERMIT_REFERER)
+ if ((csp->action->flags & ACTION_HIDE_REFERER) == 0)
{
return(strdup(s));
}
+ newval = csp->action->string[ACTION_STRING_REFERER];
+
/*
- * Check configfile. Are we blocking referer?
+ * Are we blocking referer?
*/
- if ( (csp->config->referrer == NULL)
- || (*csp->config->referrer == '@') )
+ if ((newval == NULL) || (0 == strcmpic(newval, "block")) )
{
log_error(LOG_LEVEL_HEADER, "crunch!");
return(NULL);
}
/*
- * Check configfile. Are we always sending referer?
- */
- if (*csp->config->referrer == '.')
- {
- return(strdup(s));
- }
-
- /*
- * New option § or L: Forge a referer as http://[hostname:port of REQUEST]/
- * to fool stupid checks for in-site links
+ * Are we forging referer?
*/
- if (*csp->config->referrer == '§' || *csp->config->referrer == 'L')
+ if (0 == strcmpic(newval, "forge"))
{
+ /*
+ * Forge a referer as http://[hostname:port of REQUEST]/
+ * to fool stupid checks for in-site links
+ */
log_error(LOG_LEVEL_HEADER, "crunch+forge!");
s = strsav(NULL, "Referer: ");
s = strsav(s, "http://");
}
/*
- * We have a specific (fixed) referer we want to send.
+ * Have we got a fixed referer?
*/
+ if (0 == strncmpic(newval, "http://", 7))
+ {
+ /*
+ * We have a specific (fixed) referer we want to send.
+ */
- log_error(LOG_LEVEL_HEADER, "modified");
+ log_error(LOG_LEVEL_HEADER, "modified");
- s = strsav( NULL, "Referer: " );
- s = strsav( s, csp->config->referrer );
- return(s);
+ s = strsav( NULL, "Referer: " );
+ s = strsav( s, newval );
+ return(s);
+ }
+ /* Should never get here! */
+ log_error(LOG_LEVEL_ERROR, "Bad parameter: +referer{%s}", newval);
+
+ /*
+ * Forge is probably the best default.
+ *
+ * Forge a referer as http://[hostname:port of REQUEST]/
+ * to fool stupid checks for in-site links
+ */
+ log_error(LOG_LEVEL_HEADER, "crunch+forge!");
+ s = strsav(NULL, "Referer: ");
+ s = strsav(s, "http://");
+ s = strsav(s, csp->http->hostport);
+ s = strsav(s, "/");
+ return(s);
}
*********************************************************************/
char *client_uagent(const struct parsers *v, char *s, struct client_state *csp)
{
+ const char * newval;
+
#ifdef DETECT_MSIE_IMAGES
if (strstr (s, "MSIE "))
{
}
#endif /* def DETECT_MSIE_IMAGES */
- if (csp->config->uagent == NULL)
- {
- log_error(LOG_LEVEL_HEADER, "default");
- return(strdup(DEFAULT_USER_AGENT));
- }
-
- if (*csp->config->uagent == '.')
+ if ((csp->action->flags & ACTION_HIDE_USER_AGENT) == 0)
{
return(strdup(s));
}
- if (*csp->config->uagent == '@')
+ newval = csp->action->string[ACTION_STRING_USER_AGENT];
+ if (newval == NULL)
{
- if (csp->permissions & PERMIT_USER_AGENT)
- {
- return(strdup(s));
- }
- else
- {
- log_error(LOG_LEVEL_HEADER, "default");
- return(strdup(DEFAULT_USER_AGENT));
- }
+ return(strdup(s));
}
log_error(LOG_LEVEL_HEADER, "modified");
s = strsav( NULL, "User-Agent: " );
- s = strsav( s, csp->config->uagent );
+ s = strsav( s, newval );
return(s);
}
*********************************************************************/
char *client_ua(const struct parsers *v, char *s, struct client_state *csp)
{
- if (csp->config->uagent == NULL)
- {
- log_error(LOG_LEVEL_HEADER, "crunch!");
- return(NULL);
- }
-
- if (*csp->config->uagent == '.')
+ if ((csp->action->flags & ACTION_HIDE_USER_AGENT) == 0)
{
return(strdup(s));
}
-
- if (*csp->config->uagent == '@')
+ else
{
- if (csp->permissions & PERMIT_USER_AGENT)
- {
- return(strdup(s));
- }
- else
- {
- log_error(LOG_LEVEL_HEADER, "crunch!");
- return(NULL);
- }
+ log_error(LOG_LEVEL_HEADER, "crunch!");
+ return(NULL);
}
-
- log_error(LOG_LEVEL_HEADER, "crunch!");
- return(NULL);
-
}
*********************************************************************/
char *client_from(const struct parsers *v, char *s, struct client_state *csp)
{
- /* if not set, zap it */
- if (csp->config->from == NULL)
+ const char * newval;
+
+ if ((csp->action->flags & ACTION_HIDE_FROM) == 0)
{
- log_error(LOG_LEVEL_HEADER, "crunch!");
- return(NULL);
+ return(strdup(s));
}
- if (*csp->config->from == '.')
+ newval = csp->action->string[ACTION_STRING_FROM];
+
+ /*
+ * Are we blocking referer?
+ */
+ if ((newval == NULL) || (0 == strcmpic(newval, "block")) )
{
- return(strdup(s));
+ log_error(LOG_LEVEL_HEADER, "crunch!");
+ return(NULL);
}
log_error(LOG_LEVEL_HEADER, " modified");
s = strsav( NULL, "From: " );
- s = strsav( s, csp->config->from );
+ s = strsav( s, newval );
return(s);
}
*********************************************************************/
char *client_send_cookie(const struct parsers *v, char *s, struct client_state *csp)
{
- if (csp->permissions & PERMIT_COOKIE_READ)
+ if ((csp->action->flags & ACTION_NO_COOKIE_READ) == 0)
{
enlist(csp->cookie_list, s + v->len + 1);
}
*********************************************************************/
char *client_x_forwarded(const struct parsers *v, char *s, struct client_state *csp)
{
- if (csp->config->add_forwarded)
+ if ((csp->action->flags & ACTION_HIDE_FORWARDED) == 0)
{
+ /* Save it so we can re-add it later */
csp->x_forwarded = strdup(s);
}
*********************************************************************/
void client_cookie_adder(struct client_state *csp)
{
- struct list *l;
+ struct list *lst;
char *tmp = NULL;
char *e;
- for (l = csp->cookie_list->next; l ; l = l->next)
+ for (lst = csp->cookie_list->next; lst ; lst = lst->next)
{
if (tmp)
{
tmp = strsav(tmp, "; ");
}
- tmp = strsav(tmp, l->str);
+ tmp = strsav(tmp, lst->str);
}
- for (l = csp->config->wafer_list->next; l ; l = l->next)
+ for (lst = csp->action->multi[ACTION_MULTI_WAFER]->next; lst ; lst = lst->next)
{
if (tmp)
{
tmp = strsav(tmp, "; ");
}
- if ((e = cookie_encode(l->str)))
+ if ((e = cookie_encode(lst->str)))
{
tmp = strsav(tmp, e);
freez(e);
*********************************************************************/
void client_xtra_adder(struct client_state *csp)
{
- struct list *l;
+ struct list *lst = csp->action->multi[ACTION_MULTI_ADD_HEADER];
- for (l = csp->config->xtra_list->next; l ; l = l->next)
+ for (lst = lst->next; lst ; lst = lst->next)
{
- log_error(LOG_LEVEL_HEADER, "addh: %s", l->str);
- enlist(csp->headers, l->str);
+ log_error(LOG_LEVEL_HEADER, "addh: %s", lst->str);
+ enlist(csp->headers, lst->str);
}
}
{
char *p = NULL;
- if (csp->config->add_forwarded == 0)
+ if ((csp->action->flags & ACTION_HIDE_FORWARDED) != 0)
{
return;
}
}
#endif /* def JAR_FILES */
- if (!(csp->permissions & PERMIT_COOKIE_SET))
+ if ((csp->action->flags & ACTION_NO_COOKIE_SET) != 0)
{
return(crumble(v, s, csp));
}
projects / privoxy.git / blobdiff