-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.22 2001/06/29 21:45:41 oes Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jcc.c,v $
*
* Revisions :
* $Log: jcc.c,v $
+ * Revision 1.22 2001/06/29 21:45:41 oes
+ * Indentation, CRLF->LF, Tab-> Space
+ *
+ * Revision 1.21 2001/06/29 13:29:36 oes
+ * - Cleaned up, improved comments
+ * - Unified all possible interceptors (CGI,
+ * block, trust, fast_redirect) in one
+ * place, with one (CGI) answer generation
+ * mechansim. Much clearer now.
+ * - Removed the GIF image generation, which
+ * is now done in filters.c:block_url()
+ * - Made error conditions like domain lookup
+ * failiure or (various) problems while talking
+ * to the server use cgi.c:error_response()
+ * instead of generating HTML/HTTP in chat() (yuck!)
+ * - Removed logentry from cancelled commit
+ *
+ * Revision 1.20 2001/06/09 10:55:28 jongfoster
+ * Changing BUFSIZ ==> BUFFER_SIZE
+ *
+ * Revision 1.19 2001/06/07 23:12:52 jongfoster
+ * Replacing function pointer in struct gateway with a directly
+ * called function forwarded_connect().
+ * Replacing struct gateway with struct forward_spec
+ *
+ * Revision 1.18 2001/06/03 19:12:16 oes
+ * introduced new cgi handling
+ *
+ * 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 buf[BUFFER_SIZE];
+ char *hdr, *p, *req;
char *err = NULL;
- char *eno;
fd_set rfds;
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);
freez(p);
}
- /* filter it as required */
+ /* We have a request. */
hdr = sed(client_patterns, add_client_headers, csp);
-
destroy_list(csp->headers);
- /* Check the request against all rules, unless
- * we're toggled off or in force mode.
+ /*
+ * Now, check to see if we need to intercept it, i.e.
+ * If
*/
- if (intercept_url(http, csp))
- {
- /*
- * The interceptor will write out the data.
- * We don't need to do anything else
- */
+ if (
+ /* a CGI call was detected and answered */
+ (NULL != (rsp = dispatch_cgi(csp)))
-#ifdef STATISTICS
- csp->rejected = 1;
-#endif /* def STATISTICS */
+ /* or we are enabled and... */
+ || (IS_ENABLED_AND (
- freez(hdr);
- return;
- }
+ /* ..the request was blocked */
+ ( NULL != (rsp = block_url(csp)))
-#ifdef FAST_REDIRECTS
- else if (IS_ENABLED_AND
- ((csp->action->flags & ACTION_FAST_REDIRECTS) != 0) &&
- (p = redirect_url(http, csp)))
- {
- /* This must be blocked as HTML */
-#ifdef STATISTICS
- csp->rejected = 1;
-#endif /* def STATISTICS */
-
- log_error(LOG_LEVEL_GPC, "%s%s crunch!", http->hostport, http->path);
-
- log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 200 3",
- csp->ip_addr_str, http->cmd);
-
- /* Send HTML redirection result */
- write_socket(csp->cfd, p, strlen(p));
+ /* ..or untrusted */
+#ifdef TRUST_FILES
+ || ( NULL != (rsp = trust_url(csp)))
+#endif
- freez(p);
- freez(hdr);
- return;
- }
+ /* ..or a fast redirect kicked in */
+#ifdef FAST_REDIRECTS
+ || (((csp->action->flags & ACTION_FAST_REDIRECTS) != 0) &&
+ (NULL != (rsp = redirect_url(csp))))
#endif /* def FAST_REDIRECTS */
-
- else if (IS_ENABLED_AND (
-#ifdef TRUST_FILES
- (p = trust_url(http, csp)) ||
-#endif /* def TRUST_FILES */
- (p = block_url(http, csp)) ))
+ ))
+ )
{
- /* Block as HTML or image */
+ /* Write the answer to the client */
+ if ((write_socket(csp->cfd, rsp->head, rsp->head_length) != rsp->head_length)
+ || (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
+ /* Count as a rejected request */
csp->rejected = 1;
#endif /* def STATISTICS */
+ /* Log (FIXME: All intercept reasons apprear as "crunch" with Status 200) */
log_error(LOG_LEVEL_GPC, "%s%s crunch!", http->hostport, http->path);
+ log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 200 3", csp->ip_addr_str, http->cmd);
- log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 200 1",
- csp->ip_addr_str, http->cmd);
-
-#ifdef IMAGE_BLOCKING
- /* Block as image? */
- if ( (csp->config->tinygif > 0) && block_imageurl(http, csp) )
- {
- /* Send "blocked" image */
- log_error(LOG_LEVEL_GPC, "%s%s image crunch!",
- http->hostport, http->path);
-
- if (csp->config->tinygif == 1)
- {
- write_socket(csp->cfd, BLANKGIF, sizeof(BLANKGIF)-1);
- }
- else if (csp->config->tinygif == 2)
- {
- write_socket(csp->cfd, JBGIF, sizeof(JBGIF)-1);
- }
- else if ((csp->config->tinygif == 3) && (csp->config->tinygifurl))
- {
- 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));
- }
- else
- {
- /* Should never happen */
- write_socket(csp->cfd, JBGIF, sizeof(JBGIF)-1);
- }
- }
- else
-#endif /* def IMAGE_BLOCKING */
- /* Block as HTML */
- {
- /* Send HTML "blocked" message, interception, or redirection result */
- write_socket(csp->cfd, p, strlen(p));
- }
-
- freez(p);
+ /* Clean up and return */
+ free_http_response(rsp);
freez(hdr);
return;
}
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)
{
if (errno == EINVAL)
{
- err = zalloc(strlen(CNXDOM) + strlen(http->host));
- sprintf(err, CNXDOM, http->host);
+ rsp = error_response(csp, "no-such-domain", errno);
log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 404 0",
csp->ip_addr_str, http->cmd);
}
else
{
- eno = safe_strerror(errno);
- err = zalloc(strlen(CFAIL) + strlen(http->hostport) + strlen(eno));
- sprintf(err, CFAIL, http->hostport, eno);
+ rsp = error_response(csp, "connect-failed", errno);
log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 503 0",
csp->ip_addr_str, http->cmd);
}
- write_socket(csp->cfd, err, strlen(err));
+ /* Write the answer to the client */
+ if(rsp)
+ {
+ if ((write_socket(csp->cfd, rsp->head, rsp->head_length) != rsp->head_length)
+ || (write_socket(csp->cfd, rsp->body, rsp->content_length) != rsp->content_length))
+ {
+ log_error(LOG_LEVEL_ERROR, "write to: %s failed: %E", http->host);
+ }
+ }
- freez(err);
+ free_http_response(rsp);
freez(hdr);
return;
}
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)
log_error(LOG_LEVEL_CONNECT, "write header to: %s failed: %E",
http->hostport);
- eno = safe_strerror(errno);
- err = zalloc(strlen(CFAIL) + strlen(http->hostport) + strlen(eno));
- sprintf(err, CFAIL, http->hostport, eno);
- write_socket(csp->cfd, err, strlen(err));
-
log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 503 0",
csp->ip_addr_str, http->cmd);
- freez(err);
+ rsp = error_response(csp, "connect-failed", errno);
+
+ if(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);
+ }
+ }
+
+ free_http_response(rsp);
freez(hdr);
return;
}
{
log_error(LOG_LEVEL_ERROR, "read from: %s failed: %E", http->host);
- eno = safe_strerror(errno);
- sprintf(buf, CFAIL, http->hostport, eno);
- freez(eno);
-
log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 503 0",
csp->ip_addr_str, http->cmd);
- write_socket(csp->cfd, buf, strlen(buf));
+ rsp = error_response(csp, "connect-failed", errno);
+
+ if(rsp)
+ {
+ if ((write_socket(csp->cfd, rsp->head, rsp->head_length) != rsp->head_length)
+ || (write_socket(csp->cfd, rsp->body, rsp->content_length) != rsp->content_length))
+ {
+ log_error(LOG_LEVEL_ERROR, "write to: %s failed: %E", http->host);
+ }
+ }
+
+ free_http_response(rsp);
return;
}
#ifdef __BEOS__
-
/*********************************************************************
*
* Function : server_thread
return 0;
}
-
#endif
/* Never get here - LOG_LEVEL_FATAL causes program exit */
}
+#ifdef ACL_FILES
if (block_acl(NULL,csp))
{
log_error(LOG_LEVEL_CONNECT, "Connection dropped due to ACL");
freez(csp);
continue;
}
+#endif /* def ACL_FILES */
/* add it to the list of clients */
csp->next = clients->next;
if (child_id < 0) /* failed */
{
- char buf[BUFSIZ];
+ char buf[BUFFER_SIZE];
log_error(LOG_LEVEL_ERROR, "can't fork: %E");
projects / privoxy.git / blobdiff