-const char jcc_rcs[] = "$Id: jcc.c,v 1.3 2001/05/20 01:21:20 jongfoster Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.9 2001/05/26 00:28:36 jongfoster Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jcc.c,v $
*
* Revisions :
* $Log: jcc.c,v $
+ * Revision 1.9 2001/05/26 00:28:36 jongfoster
+ * Automatic reloading of config file.
+ * Removed obsolete SIGHUP support (Unix) and Reload menu option (Win32).
+ * Most of the global variables have been moved to a new
+ * struct configuration_spec, accessed through csp->config->globalname
+ * Most of the globals remaining are used by the Win32 GUI.
+ *
+ * Revision 1.8 2001/05/25 22:43:18 jongfoster
+ * Fixing minor memory leak and buffer overflow.
+ *
+ * Revision 1.7 2001/05/25 22:34:30 jongfoster
+ * Hard tabs->Spaces
+ *
+ * Revision 1.6 2001/05/23 00:13:58 joergs
+ * AmigaOS support fixed.
+ *
+ * Revision 1.5 2001/05/22 18:46:04 oes
+ *
+ * - Enabled filtering banners by size rather than URL
+ * by adding patterns that replace all standard banner
+ * sizes with the "Junkbuster" gif to the re_filterfile
+ *
+ * - Enabled filtering WebBugs by providing a pattern
+ * which kills all 1x1 images
+ *
+ * - Added support for PCRE_UNGREEDY behaviour to pcrs,
+ * which is selected by the (nonstandard and therefore
+ * capital) letter 'U' in the option string.
+ * It causes the quantifiers to be ungreedy by default.
+ * Appending a ? turns back to greedy (!).
+ *
+ * - Added a new interceptor ijb-send-banner, which
+ * sends back the "Junkbuster" gif. Without imagelist or
+ * MSIE detection support, or if tinygif = 1, or the
+ * URL isn't recognized as an imageurl, a lame HTML
+ * explanation is sent instead.
+ *
+ * - Added new feature, which permits blocking remote
+ * script redirects and firing back a local redirect
+ * to the browser.
+ * The feature is conditionally compiled, i.e. it
+ * can be disabled with --disable-fast-redirects,
+ * plus it must be activated by a "fast-redirects"
+ * line in the config file, has its own log level
+ * and of course wants to be displayed by show-proxy-args
+ * Note: Boy, all the #ifdefs in 1001 locations and
+ * all the fumbling with configure.in and acconfig.h
+ * were *way* more work than the feature itself :-(
+ *
+ * - Because a generic redirect template was needed for
+ * this, tinygif = 3 now uses the same.
+ *
+ * - Moved GIFs, and other static HTTP response templates
+ * to project.h
+ *
+ * - Some minor fixes
+ *
+ * - Removed some >400 CRs again (Jon, you really worked
+ * a lot! ;-)
+ *
+ * Revision 1.4 2001/05/21 19:34:01 jongfoster
+ * Made failure to bind() a fatal error.
+ *
* Revision 1.3 2001/05/20 01:21:20 jongfoster
* Version 2.9.4 checkin.
* - Merged popupfile and cookiefile, and added control over PCRS
static void listen_loop(void);
static void chat(struct client_state *csp);
+#ifdef AMIGA
+void serve(struct client_state *csp);
+#else /* ifndef AMIGA */
static void serve(struct client_state *csp);
+#endif /* def AMIGA */
+
#ifdef __BEOS__
static int32 server_thread(void *data);
#endif /* def __BEOS__ */
-
-#define BODY "<body bgcolor=\"#f8f8f0\" link=\"#000078\" alink=\"#ff0022\" vlink=\"#787878\">\n"
-
-static const char CFAIL[] =
- "HTTP/1.0 503 Connect failed\n"
- "Content-Type: text/html\n\n"
- "<html>\n"
- "<head>\n"
- "<title>Internet Junkbuster: Connect failed</title>\n"
- "</head>\n"
- BODY
- "<h1><center>"
- BANNER
- "</center></h1>"
- "TCP connection to '%s' failed: %s.\n<br>"
- "</body>\n"
- "</html>\n";
-
-static const char CNXDOM[] =
- "HTTP/1.0 404 Non-existent domain\n"
- "Content-Type: text/html\n\n"
- "<html>\n"
- "<head>\n"
- "<title>Internet Junkbuster: Non-existent domain</title>\n"
- "</head>\n"
- BODY
- "<h1><center>"
- BANNER
- "</center></h1>"
- "No such domain: %s\n"
- "</body>\n"
- "</html>\n";
-
-static const char CSUCCEED[] =
- "HTTP/1.0 200 Connection established\n"
- "Proxy-Agent: IJ/" VERSION "\n\n";
-
-static const char CHEADER[] =
- "HTTP/1.0 400 Invalid header received from browser\n\n";
-
-static const char SHEADER[] =
- "HTTP/1.0 502 Invalid header received from server\n\n";
-
-#if defined(DETECT_MSIE_IMAGES) || defined(USE_IMAGE_LIST)
-
-/*
- * Hint: You can encode your own GIFs like that:
- * perl -e 'while (read STDIN, $c, 1) { printf("\\%.3o,", unpack("C", $c)); }'
- */
-
-static const char BLANKGIF[] =
- "HTTP/1.0 200 OK\r\n"
- "Pragma: no-cache\r\n"
- "Last-Modified: Thu Jul 31, 1997 07:42:22 pm GMT\r\n"
- "Expires: Thu Jul 31, 1997 07:42:22 pm GMT\r\n"
- "Content-type: image/gif\r\n\r\n"
- "GIF89a\001\000\001\000\200\000\000\377\377\377\000\000"
- "\000!\371\004\001\000\000\000\000,\000\000\000\000\001"
- "\000\001\000\000\002\002D\001\000;";
-
-static const char JBGIF[] =
- "HTTP/1.0 200 OK\r\n"
- "Pragma: no-cache\r\n"
- "Last-Modified: Thu Jul 31, 1997 07:42:22 pm GMT\r\n"
- "Expires: Thu Jul 31, 1997 07:42:22 pm GMT\r\n"
- "Content-type: image/gif\r\n\r\n"
- "GIF89aD\000\013\000\360\000\000\000\000\000\377\377\377!"
- "\371\004\001\000\000\001\000,\000\000\000\000D\000\013\000"
- "\000\002a\214\217\251\313\355\277\000\200G&K\025\316hC\037"
- "\200\234\230Y\2309\235S\230\266\206\372J\253<\3131\253\271"
- "\270\215\342\254\013\203\371\202\264\334P\207\332\020o\266"
- "N\215I\332=\211\312\3513\266:\026AK)\364\370\365aobr\305"
- "\372\003S\275\274k2\354\254z\347?\335\274x\306^9\374\276"
- "\037Q\000\000;";
-
-static const char FWGIF[] =
- "HTTP/1.0 302 Blocked Advert\r\n"
- "Pragma: no-cache\r\n"
- "Last-Modified: Thu Jul 31, 1997 07:42:22 pm GMT\r\n"
- "Expires: Thu Jul 31, 1997 07:42:22 pm GMT\r\n"
- "Location: ";
-
-#endif /* defined(DETECT_MSIE_IMAGES) || defined(USE_IMAGE_LIST) */
-
#ifdef _WIN32
#define sleep(N) Sleep(((N) * 1000))
#endif
*********************************************************************/
static void chat(struct client_state *csp)
{
-/* This next line is a little ugly, but it simplifies the if statement below. */\r
-/* Basically if TOGGLE, then we want the if to test "csp->toggled_on", else we don't */\r
-#ifdef TOGGLE\r
-# define IS_TOGGLED_ON csp->toggled_on &&\r
-#else /* ifndef TOGGLE */\r
-# define IS_TOGGLED_ON\r
-#endif /* ndef TOGGLE */\r
-\r
-/* This next line is a little ugly, but it simplifies the if statement below. */\r
-/* Basically if TRUST_FILES, then we want the if to call "trust_url", else we don't */\r
-#ifdef TRUST_FILES\r
-# define IS_TRUSTED_URL (p = trust_url(http, csp)) ||\r
-#else /* ifndef TRUST_FILES */\r
-# define IS_TRUSTED_URL\r
-#endif /* ndef TRUST_FILES */\r
-\r
- \r
+/* This next line is a little ugly, but it simplifies the if statement below. */
+/* Basically if TOGGLE, then we want the if to test "csp->toggled_on", else we don't */
+#ifdef TOGGLE
+# define IS_TOGGLED_ON csp->toggled_on &&
+#else /* ifndef TOGGLE */
+# define IS_TOGGLED_ON
+#endif /* ndef TOGGLE */
+
+/* This next line is a little ugly, but it simplifies the if statement below. */
+/* Basically if TRUST_FILES, then we want the if to call "trust_url", else we don't */
+#ifdef TRUST_FILES
+# define IS_TRUSTED_URL (p = trust_url(http, csp)) ||
+#else /* ifndef TRUST_FILES */
+# define IS_TRUSTED_URL
+#endif /* ndef TRUST_FILES */
+
char buf[BUFSIZ], *hdr, *p, *req;
char *err = NULL;
char *eno;
fd_set rfds;
int n, maxfd, server_body, ms_iis5_hack = 0;
const struct gateway *gw;
- struct http_request *http;\r
-#ifdef KILLPOPUPS\r
- int block_popups; /* bool, 1==will block popups */\r
- int block_popups_now = 0; /* bool, 1==currently blocking popups */\r
-#endif /* def KILLPOPUPS */\r
+ struct http_request *http;
+#ifdef KILLPOPUPS
+ int block_popups; /* bool, 1==will block popups */
+ int block_popups_now = 0; /* bool, 1==currently blocking popups */
+#endif /* def KILLPOPUPS */
#ifdef PCRS
- int pcrs_filter; /* bool, 1==will filter through pcrs */\r
+ int pcrs_filter; /* bool, 1==will filter through pcrs */
int filtering = 0; /* bool, 1==currently filtering through pcrs */
#endif /* def PCRS */
#ifdef FORCE_LOAD
/* If this request contains the FORCE_PREFIX,
- * better get rid of it now and set the force flag --oes
+ * better get rid of it now and set the force flag --oes
*/
- if(strstr(req, FORCE_PREFIX))
+ if (strstr(req, FORCE_PREFIX))
{
- strclean(req, FORCE_PREFIX);
- log_error(LOG_LEVEL_FORCE, "Enforcing request \"%s\".\n", req);
- csp->force = 1;
- }
+ strclean(req, FORCE_PREFIX);
+ log_error(LOG_LEVEL_FORCE, "Enforcing request \"%s\".\n", req);
+ csp->force = 1;
+ }
else
{
- csp->force = 0;
- }
+ csp->force = 0;
+ }
#endif /* def FORCE_LOAD */
parse_http_request(req, http, csp);
if ((gw = 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 */\r
+ /* Never get here - LOG_LEVEL_FATAL causes program exit */
}
/* build the http request to send to the server
freez(p);
}
}
-\r
+
/* decide what we're to do with cookies */
-\r
-#ifdef TOGGLE\r
- if (!csp->toggled_on)\r
- {\r
- /* Most compatible set of permissions */\r
- csp->permissions = PERMIT_COOKIE_SET | PERMIT_COOKIE_READ | PERMIT_POPUPS;\r
- }\r
- else\r
- {\r
- csp->permissions = url_permissions(http, csp);\r
- }\r
-#else /* ifndef TOGGLE */\r
- csp->permissions = url_permissions(http, csp);\r
-#endif /* ndef TOGGLE */\r
-\r
-#ifdef KILLPOPUPS\r
- block_popups = ((csp->permissions & PERMIT_POPUPS) == 0);\r
-#endif /* def KILLPOPUPS */\r
-#ifdef PCRS\r
- pcrs_filter = (csp->rlist != NULL) && /* There are expressions to be used */\r
+
+#ifdef TOGGLE
+ if (!csp->toggled_on)
+ {
+ /* Most compatible set of permissions */
+ csp->permissions = PERMIT_COOKIE_SET | PERMIT_COOKIE_READ | PERMIT_POPUPS;
+ }
+ else
+ {
+ csp->permissions = url_permissions(http, csp);
+ }
+#else /* ifndef TOGGLE */
+ csp->permissions = url_permissions(http, csp);
+#endif /* ndef TOGGLE */
+
+#ifdef KILLPOPUPS
+ block_popups = ((csp->permissions & PERMIT_POPUPS) == 0);
+#endif /* def KILLPOPUPS */
+#ifdef PCRS
+ pcrs_filter = (csp->rlist != NULL) && /* There are expressions to be used */
((csp->permissions & PERMIT_RE_FILTER) != 0);
-#endif /* def PCRS */\r
-\r
+#endif /* def PCRS */
+
/* grab the rest of the client's headers */
destroy_list(csp->headers);
-
- /*\r
- * by haroon - most of credit to srt19170\r
- * if toggled_on flag is true then IJB is enabled, do the usual\r
- * otherwise avoid crunching\r
- */\r
-
- /* Check the request against all rules, unless
- * we're disabled or in force mode.
+ /* Check the request against all rules, unless
+ * we're toggled off or in force mode.
*/
if (IS_TOGGLED_ON
#endif /* def FORCE_LOAD */
( (p = intercept_url(http, csp)) ||
IS_TRUSTED_URL
- (p = block_url(http, csp)) ))
+ (p = block_url(http, csp))
+#ifdef FAST_REDIRECTS
+ || (csp->config->fast_redirects && (p = redirect_url(http, csp)))
+#endif /* def FAST_REDIRECTS */
+ ))
{
#ifdef STATISTICS
csp->rejected = 1;
log_error(LOG_LEVEL_GPC, "%s%s crunch!", http->hostport, http->path);
#if defined(DETECT_MSIE_IMAGES) || defined(USE_IMAGE_LIST)
- /* now use block_imageurl */
- if ( (tinygif > 0) && block_imageurl(http, csp) )
+ /* 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 (tinygif == 1)
+ if ((csp->config->tinygif == 2) || strstr(http->path, "ijb-send-banner"))
+ {
+ write_socket(csp->cfd, JBGIF, sizeof(JBGIF)-1);
+ }
+ else if (csp->config->tinygif == 1)
{
write_socket(csp->cfd, BLANKGIF, sizeof(BLANKGIF)-1);
}
- else if ((tinygif == 3) && (tinygifurl))
+ else if ((csp->config->tinygif == 3) && (csp->config->tinygifurl))
{
- write_socket(csp->cfd, FWGIF, sizeof(FWGIF)-1);
- write_socket(csp->cfd, tinygifurl, strlen(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
{
}
else
#endif /* defined(DETECT_MSIE_IMAGES) || defined(USE_IMAGE_LIST) */
+ /* Block as HTML */
{
- /* Send HTML "blocked" message */
+ /* Send HTML "blocked" message, interception, or redirection result */
write_socket(csp->cfd, p, strlen(p));
}
* the client (along with anything else that
* may be in the buffer)
*/
-\r
-#ifdef KILLPOPUPS\r
- /* Start blocking popups if appropriate. */\r
-\r
- if (csp->is_text && /* It's a text / * MIME-Type */\r
- !http->ssl && /* We talk plaintext */\r
- block_popups)\r
- {\r
- block_popups_now = 1;\r
- }\r
-\r
-#endif /* def KILLPOPUPS */\r
-\r
+
+#ifdef KILLPOPUPS
+ /* Start blocking popups if appropriate. */
+
+ if (csp->is_text && /* It's a text / * MIME-Type */
+ !http->ssl && /* We talk plaintext */
+ block_popups)
+ {
+ block_popups_now = 1;
+ }
+
+#endif /* def KILLPOPUPS */
+
#ifdef PCRS
/* Start re_filtering this if appropriate. */
-\r
+
if (csp->is_text && /* It's a text / * MIME-Type */
- !http->ssl && /* We talk plaintext */\r
+ !http->ssl && /* We talk plaintext */
pcrs_filter) /* Policy allows */
{
filtering = 1;
* Returns : N/A
*
*********************************************************************/
+#ifdef AMIGA
+void serve(struct client_state *csp)
+#else /* ifndef AMIGA */
static void serve(struct client_state *csp)
+#endif /* def AMIGA */
{
chat(csp);
close_socket(csp->cfd);
#endif
{
configfile =
-#ifndef _WIN32
+#ifdef AMIGA
+ "AmiTCP:db/junkbuster.config"
+#elif !defined(_WIN32)
"config"
#else
"junkbstr.txt"
}
#endif /* !defined(_WIN32) || defined(_WIN_CONSOLE) */
+#ifdef AMIGA
+ InitAmiga();
+#endif
+
Argc = argc;
Argv = argv;
configfile = argv[1];
}
- remove_all_loaders();
- memset( proxy_args, 0, sizeof( proxy_args ) );
files->next = NULL;
- load_config( 0 );
-
- /*
- * Since load_config acts as a signal handler too, it returns
- * its status in configret. Check it for an error in loading.
- */
- if ( 0 != configret )
- {
- /* load config failed! Exit with error. */
- return( 1 );
- }
-
#ifdef _WIN32
InitWin32();
#endif
#ifndef _WIN32
signal(SIGPIPE, SIG_IGN);
signal(SIGCHLD, SIG_IGN);
- signal(SIGHUP, load_config);
#else /* ifdef _WIN32 */
# ifdef _WIN_CONSOLE
{
struct client_state *csp = NULL;
int bfd;
+ struct configuration_spec * config;
+
+ config = load_config();
log_error(LOG_LEVEL_CONNECT, "bind (%s, %d)",
- haddr ? haddr : "INADDR_ANY", hport);
+ config->haddr ? config->haddr : "INADDR_ANY", config->hport);
- bfd = bind_port(haddr, hport);
- config_changed = 0;
+ bfd = bind_port(config->haddr, config->hport);
if (bfd < 0)
{
log_error(LOG_LEVEL_FATAL, "can't bind %s:%d: %E "
"- There may be another junkbuster or some other "
"proxy running on port %d",
- (NULL != haddr) ? haddr : "INADDR_ANY", hport, hport
- );\r
+ (NULL != config->haddr) ? config->haddr : "INADDR_ANY",
+ config->hport, config->hport
+ );
/* shouldn't get here */
return;
}
+ config->need_bind = 0;
+
while (FOREVER)
{
csp->active = 1;
csp->sfd = -1;
- if ( config_changed )
+ csp->config = config = load_config();
+
+ if ( config->need_bind )
{
/*
* Since we were listening to the "old port", we will not see
* request. This should not be a so common of an operation
* that this will hurt people's feelings.
*/
+
close_socket(bfd);
log_error(LOG_LEVEL_CONNECT, "bind (%s, %d)",
- haddr ? haddr : "INADDR_ANY", hport);
- bfd = bind_port(haddr, hport);
+ config->haddr ? config->haddr : "INADDR_ANY", config->hport);
+ bfd = bind_port(config->haddr, config->hport);
+
+ if (bfd < 0)
+ {
+ log_error(LOG_LEVEL_FATAL, "can't bind %s:%d: %E "
+ "- There may be another junkbuster or some other "
+ "proxy running on port %d",
+ (NULL != config->haddr) ? config->haddr : "INADDR_ANY",
+ config->hport, config->hport
+ );
+ /* shouldn't get here */
+ return;
+ }
- config_changed = 0;
+ config->need_bind = 0;
}
log_error(LOG_LEVEL_CONNECT, "accept connection ... ");
{
exit(1);
}
-#endif
+#endif\r
+ freez(csp);
continue;
}
else
{
log_error(LOG_LEVEL_CONNECT, "OK");
- }
+ }\r
#if defined(TOGGLE)
/* by haroon - most of credit to srt19170 */
csp->toggled_on = g_bToggleIJB;
#endif
- /* add it to the list of clients */
- csp->next = clients->next;
- clients->next = csp;
-
if (run_loader(csp))
{
- log_error(LOG_LEVEL_FATAL, "a loader failed - must exit");\r
+ log_error(LOG_LEVEL_FATAL, "a loader failed - must exit");
/* Never get here - LOG_LEVEL_FATAL causes program exit */
}
-
- if (multi_threaded)
+\r
+ if (block_acl(NULL,csp))\r
+ {\r
+ log_error(LOG_LEVEL_CONNECT, "Connection dropped due to ACL");\r
+ close_socket(csp->cfd);\r
+ freez(csp);\r
+ continue;\r
+ }\r
+
+ /* add it to the list of clients */\r
+ csp->next = clients->next;\r
+ clients->next = csp;\r
+\r
+ if (config->multi_threaded)
{
int child_id;