-const char jcc_rcs[] = "$Id: jcc.c,v 1.15 2001/05/31 21:24:47 jongfoster Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.18 2001/06/03 19:12:16 oes Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jcc.c,v $
*
* Revisions :
* $Log: jcc.c,v $
+ * Revision 1.18 2001/06/03 19:12:16 oes
+ * introduced new cgi handling
+ *
+ * Revision 1.18 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.17 2001/06/01 20:07:23 jongfoster
+ * Now uses action +image-blocker{} rather than config->tinygif
+ *
+ * Revision 1.16 2001/06/01 18:49:17 jongfoster
+ * Replaced "list_share" with "list" - the tiny memory gain was not
+ * worth the extra complexity.
+ *
* Revision 1.15 2001/05/31 21:24:47 jongfoster
* Changed "permission" to "action" throughout.
* Removed DEFAULT_USER_AGENT - it must now be specified manually.
#include "jbsockets.h"
#include "gateway.h"
#include "actions.h"
+#include "cgi.h"
const char jcc_h_rcs[] = JCC_H_VERSION;
const char project_h_rcs[] = PROJECT_H_VERSION;
#endif /* ndef TOGGLE */
#ifdef FORCE_LOAD
# define IS_NOT_FORCED_AND (!csp->force) &&
-#else /* ifndef TOGGLE */
+#else /* ifndef FORCE_LOAD */
# define IS_NOT_FORCED_AND
#endif /* def FORCE_LOAD */
-#define IS_ENABLED_AND IS_TOGGLED_ON_AND IS_NOT_FORCED_AND
+#define IS_ENABLED_AND IS_TOGGLED_ON_AND IS_NOT_FORCED_AND
char buf[BUFSIZ], *hdr, *p, *req;
char *err = NULL;
int n, maxfd, server_body;
int ms_iis5_hack = 0;
int byte_count = 0;
- const struct gateway *gw;
+ const struct forward_spec * fwd;
struct http_request *http;
#ifdef KILLPOPUPS
int block_popups; /* bool, 1==will block popups */
int pcrs_filter; /* bool, 1==will filter through pcrs */
int filtering = 0; /* bool, 1==currently filtering through pcrs */
#endif /* def PCRS */
+ struct http_response *rsp;
http = csp->http;
/* decide how to route the HTTP request */
- if ((gw = forward_url(http, csp)) == NULL)
+ if ((fwd = forward_url(http, csp)) == NULL)
{
log_error(LOG_LEVEL_FATAL, "gateway spec is NULL!?!? This can't happen!");
/* Never get here - LOG_LEVEL_FATAL causes program exit */
*
*/
- if (gw->forward_host)
+ if (fwd->forward_host)
{
/* if forwarding, just pass the request as is */
enlist(csp->headers, http->cmd);
* we're toggled off or in force mode.
*/
- if (intercept_url(http, csp))
+ if (NULL != (rsp = cgi_dispatch(csp)))
{
- /*
- * The interceptor will write out the data.
- * We don't need to do anything else
- */
+ if(0 != (n = make_http_response(rsp)))
+ {
+ if ((write_socket(csp->cfd, rsp->head, n) != n)
+ || (write_socket(csp->cfd, rsp->body, rsp->content_length) != rsp->content_length))
+ {
+ log_error(LOG_LEVEL_ERROR, "write to: %s failed: %E", http->host);
+ }
+ }
+
#ifdef STATISTICS
csp->rejected = 1;
#endif /* def STATISTICS */
+ free_http_response(rsp);
freez(hdr);
return;
}
#ifdef IMAGE_BLOCKING
/* Block as image? */
- if ( (csp->config->tinygif > 0) && block_imageurl(http, csp) )
+ if ( ((csp->action->flags & ACTION_IMAGE_BLOCKER) != 0)
+ && block_imageurl(http, csp) )
{
/* Send "blocked" image */
- log_error(LOG_LEVEL_GPC, "%s%s image crunch!",
- http->hostport, http->path);
+ const char * blocker = csp->action->string[ACTION_STRING_IMAGE_BLOCKER];
- if (csp->config->tinygif == 1)
- {
- write_socket(csp->cfd, BLANKGIF, sizeof(BLANKGIF)-1);
- }
- else if (csp->config->tinygif == 2)
+ log_error(LOG_LEVEL_GPC, "%s%s image crunch! --> %s",
+ http->hostport, http->path, (blocker ? blocker : "logo"));
+
+ if ((blocker == NULL) || (0 == strcmpic(blocker, "logo")))
{
write_socket(csp->cfd, JBGIF, sizeof(JBGIF)-1);
}
- else if ((csp->config->tinygif == 3) && (csp->config->tinygifurl))
+ else if (0 == strcmpic(blocker, "blank"))
{
- freez(p);
- p = (char *)malloc(sizeof(HTTP_REDIRECT_TEMPLATE)
- + strlen(csp->config->tinygifurl));
- sprintf(p, HTTP_REDIRECT_TEMPLATE, csp->config->tinygifurl);
- write_socket(csp->cfd, p, strlen(p));
+ write_socket(csp->cfd, BLANKGIF, sizeof(BLANKGIF)-1);
}
else
{
- /* Should never happen */
- write_socket(csp->cfd, JBGIF, sizeof(JBGIF)-1);
+ freez(p);
+ p = (char *)malloc(sizeof(HTTP_REDIRECT_TEMPLATE) + strlen(blocker));
+ sprintf(p, HTTP_REDIRECT_TEMPLATE, blocker);
+ write_socket(csp->cfd, p, strlen(p));
}
}
else
#endif /* def IMAGE_BLOCKING */
/* Block as HTML */
{
- /* Send HTML "blocked" message, interception, or redirection result */
+ /* Send HTML "blocked" message */
write_socket(csp->cfd, p, strlen(p));
}
log_error(LOG_LEVEL_GPC, "%s%s", http->hostport, http->path);
- if (gw->forward_host)
+ if (fwd->forward_host)
{
log_error(LOG_LEVEL_CONNECT, "via %s:%d to: %s",
- gw->forward_host, gw->forward_port, http->hostport);
+ fwd->forward_host, fwd->forward_port, http->hostport);
}
else
{
/* here we connect to the server, gateway, or the forwarder */
- csp->sfd = (gw->conn)(gw, http, csp);
+ csp->sfd = forwarded_connect(fwd, http, csp);
if (csp->sfd < 0)
{
log_error(LOG_LEVEL_CONNECT, "OK");
- if (gw->forward_host || (http->ssl == 0))
+ if (fwd->forward_host || (http->ssl == 0))
{
/* write the client's (modified) header to the server
* (along with anything else that may be in the buffer)
projects / privoxy.git / blobdiff