From e30955dc472815457c4e10ed744fa7aa29ac4800 Mon Sep 17 00:00:00 2001 From: oes Date: Sun, 3 Jun 2001 19:12:00 +0000 Subject: [PATCH] extracted-CGI relevant stuff --- filters.c | 965 ++++++------------------------------------------------ filters.h | 78 ++++- 2 files changed, 157 insertions(+), 886 deletions(-) diff --git a/filters.c b/filters.c index 48506d57..e43ad99a 100644 --- a/filters.c +++ b/filters.c @@ -1,4 +1,4 @@ -const char filters_rcs[] = "$Id: filters.c,v 1.13 2001/05/31 21:21:30 jongfoster Exp $"; +const char filters_rcs[] = "$Id: filters.c,v 1.15 2001/06/03 11:03:48 oes Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/filters.c,v $ @@ -38,6 +38,63 @@ const char filters_rcs[] = "$Id: filters.c,v 1.13 2001/05/31 21:21:30 jongfoster * * Revisions : * $Log: filters.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 10:30:55 oes + * Added optional left-anchoring to domaincmp + * * Revision 1.13 2001/05/31 21:21:30 jongfoster * Permissionsfile / actions file changes: * - Changed "permission" to "action" throughout @@ -200,6 +257,7 @@ const char filters_rcs[] = "$Id: filters.c,v 1.13 2001/05/31 21:21:30 jongfoster #include "jbsockets.h" #include "miscutil.h" #include "actions.h" +#include "cgi.h" #ifdef _WIN32 #include "win32.h" @@ -217,60 +275,6 @@ const char filters_h_rcs[] = FILTERS_H_VERSION; #define ijb_isdigit(__X) isdigit((int)(unsigned char)(__X)) -static const char CBLOCK[] = -#ifdef AMIGA - "HTTP/1.0 403 Request for blocked URL\n" -#else /* ifndef AMIGA */ - "HTTP/1.0 202 Request for blocked URL\n" -#endif /* ndef AMIGA */ - "Pragma: no-cache\n" - "Last-Modified: Thu Jul 31, 1997 07:42:22 pm GMT\n" - "Expires: Thu Jul 31, 1997 07:42:22 pm GMT\n" - "Content-Type: text/html\n\n" - "\n" - "\n" - "Internet Junkbuster: Request for blocked URL\n" - "\n" - WHITEBG - "

" - BANNER - "

\n" - "

Your request for %s%s\n" - "was blocked.
See why" -#ifdef FORCE_LOAD - " or " - "go there anyway." -#endif /* def FORCE_LOAD */ - "

\n" - "\n" - "\n"; - -#ifdef TRUST_FILES -static const char CTRUST[] = -#ifdef AMIGA - "HTTP/1.0 403 Request for untrusted URL\n" -#else /* ifndef AMIGA */ - "HTTP/1.0 202 Request for untrusted URL\n" -#endif /* ndef AMIGA */ - "Pragma: no-cache\n" - "Last-Modified: Thu Jul 31, 1997 07:42:22 pm GMT\n" - "Expires: Thu Jul 31, 1997 07:42:22 pm GMT\n" - "Content-Type: text/html\n\n" - "\n" - "\n" - "Internet Junkbuster: Request for untrusted URL\n" - "\n" - WHITEBG - "
" - "" - BANNER - "" - "
" - "\n" - "\n"; -#endif /* def TRUST_FILES */ - - #ifdef ACL_FILES /********************************************************************* * @@ -495,70 +499,6 @@ int block_imageurl(struct http_request *http, struct client_state *csp) #endif /* def IMAGE_BLOCKING */ -#ifdef PCRS -/********************************************************************* - * - * Function : re_process_buffer - * - * Description : Apply all jobs from the joblist (aka. Perl regexp's) to - * the text buffer that's been accumulated in csp->iob->buf - * and set csp->content_length to the modified size. - * - * Parameters : - * 1 : csp = Current client state (buffers, headers, etc...) - * - * Returns : a pointer to the (newly allocated) modified buffer. - * - * - *********************************************************************/ -char *re_process_buffer(struct client_state *csp) -{ - int hits=0; - int size = csp->iob->eod - csp->iob->cur; - char *old=csp->iob->cur, *new = NULL; - pcrs_job *job, *joblist; - - struct file_list *fl; - struct re_filterfile_spec *b; - - /* Sanity first ;-) */ - if (size <= 0) - { - return(strdup("")); - } - - if ( ( NULL == (fl = csp->rlist) ) || ( NULL == (b = fl->f) ) ) - { - log_error(LOG_LEVEL_ERROR, "Unable to get current state of regexp filtering."); - return(strdup("")); - } - - joblist = b->joblist; - - - log_error(LOG_LEVEL_RE_FILTER, "re_filtering %s%s (size %d) ...", - csp->http->hostport, csp->http->path, size); - - /* Apply all jobs from the joblist */ - for (job = joblist; NULL != job; job = job->next) - { - hits += pcrs_exec_substitution(job, old, size, &new, &size); - if (old != csp->iob->cur) free(old); - old=new; - } - - log_error(LOG_LEVEL_RE_FILTER, " produced %d hits (new size %d).", hits, size); - - csp->content_length = size; - - /* fwiw, reset the iob */ - IOB_RESET(csp); - return(new); - -} -#endif /* def PCRS */ - - #ifdef TRUST_FILES /********************************************************************* * @@ -769,152 +709,69 @@ trust_url_not_trusted: #endif /* def TRUST_FILES */ -static const char C_HOME_PAGE[] = - "HTTP/1.0 200 OK\n" - "Pragma: no-cache\n" - "Expires: Thu Jul 31, 1997 07:42:22 pm GMT\n" - "Content-Type: text/html\n\n" - "\n" - "\n" - "Internet Junkbuster: Information\n" - "\n" - BODY - "

" - BANNER - "

\n" - "

JunkBuster web site

\n" - "

Proxy configuration

\n" - "

Look up a URL

\n" - "\n" - "\n"; - - +#ifdef PCRS /********************************************************************* * - * Function : intercept_url + * Function : re_process_buffer * - * Description : checks the URL `basename' against a list of URLs to - * snarf. If it matches, it calls the associated function - * which returns an HTML page to send back to the client. - * Right now, we snarf: - * "show-proxy-args", and - * "ij-untrusted-url" (optional w/TRUST_FILES) + * Description : Apply all jobs from the joblist (aka. Perl regexp's) to + * the text buffer that's been accumulated in csp->iob->buf + * and set csp->content_length to the modified size. * * Parameters : - * 1 : http = http_request request, check `basename's of blocklist - * 2 : csp = Current client state (buffers, headers, etc...) + * 1 : csp = Current client state (buffers, headers, etc...) * - * Returns : 1 if it intercepts & handles the request. + * Returns : a pointer to the (newly allocated) modified buffer. + * * *********************************************************************/ -int intercept_url(struct http_request *http, struct client_state *csp) +char *re_process_buffer(struct client_state *csp) { - char *basename = NULL; - const struct interceptors *v; - - if (0 == strcmpic(http->host,"i.j.b")) - { - /* - * Catch http://i.j.b/... - */ - basename = http->path; - } - else if ( ( (0 == strcmpic(http->host,"ijbswa.sourceforge.net")) - || (0 == strcmpic(http->host,"ijbswa.sf.net")) ) - && (0 == strncmpic(http->path,"/config", 7)) - && ((http->path[7] == '/') || (http->path[7] == '\0'))) - { - /* - * Catch http://ijbswa.sourceforge.net/config/... - * and http://ijbswa.sf.net/config/... - */ - basename = http->path + 7; - } - - if (!basename) - { - /* Don't want to intercept */ - return(0); - } + int hits=0; + int size = csp->iob->eod - csp->iob->cur; + char *old=csp->iob->cur, *new = NULL; + pcrs_job *job, *joblist; - /* We have intercepted it. */ + struct file_list *fl; + struct re_filterfile_spec *b; - /* remove any leading slash */ - if (*basename == '/') + /* Sanity first ;-) */ + if (size <= 0) { - basename++; + return(strdup("")); } - log_error(LOG_LEVEL_GPC, "%s%s intercepted!", http->hostport, http->path); - log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 200 3", - csp->ip_addr_str, http->cmd); - - for (v = intercept_patterns; v->str; v++) + if ( ( NULL == (fl = csp->rlist) ) || ( NULL == (b = fl->f) ) ) { - if (strncmp(basename, v->str, v->len) == 0) - { - char * p = ((v->interceptor)(http, csp)); - - if (p != NULL) - { - /* Send HTML redirection result */ - write_socket(csp->cfd, p, strlen(p)); - - freez(p); - } - return(1); - } + log_error(LOG_LEVEL_ERROR, "Unable to get current state of regexp filtering."); + return(strdup("")); } - write_socket(csp->cfd, C_HOME_PAGE, strlen(C_HOME_PAGE)); + joblist = b->joblist; - return(1); -} -#ifdef FAST_REDIRECTS -/********************************************************************* - * - * Function : redirect_url - * - * Description : Checks for redirection URLs and returns a HTTP redirect - * to the destination URL. - * - * Parameters : - * 1 : http = http_request request, check `basename's of blocklist - * 2 : csp = Current client state (buffers, headers, etc...) - * - * Returns : NULL if URL was clean, HTTP redirect otherwise. - * - *********************************************************************/ -char *redirect_url(struct http_request *http, struct client_state *csp) -{ - char *p, *q; - - p = q = csp->http->path; - log_error(LOG_LEVEL_REDIRECTS, "checking path: %s", p); + log_error(LOG_LEVEL_RE_FILTER, "re_filtering %s%s (size %d) ...", + csp->http->hostport, csp->http->path, size); - /* find the last URL encoded in the request */ - while (p = strstr(p, "http://")) + /* Apply all jobs from the joblist */ + for (job = joblist; NULL != job; job = job->next) { - q = p++; + hits += pcrs_exec_substitution(job, old, size, &new, &size); + if (old != csp->iob->cur) free(old); + old=new; } - /* if there was any, generate and return a HTTP redirect */ - if (q != csp->http->path) - { - log_error(LOG_LEVEL_REDIRECTS, "redirecting to: %s", q); + log_error(LOG_LEVEL_RE_FILTER, " produced %d hits (new size %d).", hits, size); - p = (char *)malloc(strlen(HTTP_REDIRECT_TEMPLATE) + strlen(q)); - sprintf(p, HTTP_REDIRECT_TEMPLATE, q); - return(p); - } - else - { - return(NULL); - } + csp->content_length = size; + + /* fwiw, reset the iob */ + IOB_RESET(csp); + return(new); } -#endif /* def FAST_REDIRECTS */ +#endif /* def PCRS */ + /********************************************************************* * @@ -1175,636 +1032,6 @@ int domaincmp(struct url_spec *pattern, struct url_spec *fqdn) } -/* intercept functions */ - -/********************************************************************* - * - * Function : show_proxy_args - * - * Description : This "crunch"es "http:/any.thing/show-proxy-args" and - * returns a web page describing the current status of IJB. - * - * Parameters : - * 1 : http = ignored - * 2 : csp = Current client state (buffers, headers, etc...) - * - * Returns : A string that contains the current status of IJB. - * - *********************************************************************/ -char *show_proxy_args(struct http_request *http, struct client_state *csp) -{ - char *s = NULL; - -#ifdef SPLIT_PROXY_ARGS - FILE * fp; - char buf[BUFSIZ]; - char * p; - const char * filename = NULL; - const char * file_description = NULL; - char * query_string = strrchr(http->path, '?'); - char which_file = '\0'; - - - if (query_string != NULL) - { - /* first char past the last '?' (maybe '\0')*/ - which_file = query_string[1]; - } - switch (which_file) - { - case 'p': - if (csp->actions_list) - { - filename = csp->actions_list->filename; - file_description = "Actions List"; - } - break; - case 'f': - if (csp->flist) - { - filename = csp->flist->filename; - file_description = "Forward List"; - } - break; - -#ifdef ACL_FILES - case 'a': - if (csp->alist) - { - filename = csp->alist->filename; - file_description = "Access Control List"; - } - break; -#endif /* def ACL_FILES */ - -#ifdef PCRS - case 'r': - if (csp->rlist) - { - filename = csp->rlist->filename; - file_description = "RE Filter List"; - } - break; -#endif /* def PCRS */ - -#ifdef TRUST_FILES - case 't': - if (csp->tlist) - { - filename = csp->tlist->filename; - file_description = "Trust List"; - } - break; -#endif /* def TRUST_FILES */ - } - - if (filename) - { - /* Display specified file */ - /* FIXME: Add HTTP headers so this isn't cached */ - s = strsav(s, - "HTTP/1.0 200 OK\n" - "Server: IJ/" VERSION "\n" - "Content-type: text/html\n" - "Pragma: no-cache\n" - "Last-Modified: Thu Jul 31, 1997 07:42:22 pm GMT\n" - "Expires: Thu Jul 31, 1997 07:42:22 pm GMT\n" - "\n" - - "" - "" - "Internet Junkbuster Proxy Status - "); - s = strsav(s, file_description); - s = strsav(s, - "" - "\n" - "\n" - "
\n" - "

" BANNER "\n"); - s = strsav(s, file_description); - s = strsav(s, - "

\n" - "

Back to proxy status

\n" - "

"); - s = strsav(s, file_description); - s = strsav(s, - "

\n" - "Contents of file ""); - p = html_encode(filename); - s = strsav(s, p); - freez(p); - s = strsav(s, - "":
\n" - "

\n" - "
");
-      
-      if ((fp = fopen(filename, "r")) == NULL)
-      {
-         s = strsav(s, "

ERROR OPENING FILE!

");
-      }
-      else
-      {
-         while (fgets(buf, sizeof(buf), fp))
-         {
-            p = html_encode(buf);
-            if (p)
-            {
-               s = strsav(s, p);
-               freez(p);
-               s = strsav(s, "
");
-            }
-         }
-         fclose(fp);
-      }
-
-      s = strsav(s,
-         "
\n" - "
\n" - "

Back to proxy status

\n" - "
\n" - "

\n" - "The " BANNER " Proxy - \n" - "" HOME_PAGE_URL "\n" - "" - "\n"); - return(s); - } -#endif /* def SPLIT_PROXY_ARGS */ - - s = strsav(s, csp->config->proxy_args_header); - s = strsav(s, csp->config->proxy_args_invocation); -#ifdef STATISTICS - s = add_stats(s); -#endif /* def STATISTICS */ - s = strsav(s, csp->config->proxy_args_gateways); - -#ifdef SPLIT_PROXY_ARGS - s = strsav(s, - "

The following files are in use:

\n" - "

(Click a filename to view it)

\n" - ""); - -#else /* ifndef SPLIT_PROXY_ARGS */ - if (csp->clist) - { - s = strsav(s, csp->clist->proxy_args); - } - - if (csp->flist) - { - s = strsav(s, csp->flist->proxy_args); - } - -#ifdef ACL_FILES - if (csp->alist) - { - s = strsav(s, csp->alist->proxy_args); - } -#endif /* def ACL_FILES */ - -#ifdef PCRS - if (csp->rlist) - { - s = strsav(s, csp->rlist->proxy_args); - } -#endif /* def PCRS */ - -#ifdef TRUST_FILES - if (csp->tlist) - { - s = strsav(s, csp->tlist->proxy_args); - } -#endif /* def TRUST_FILES */ - -#endif /* ndef SPLIT_PROXY_ARGS */ - - s = strsav(s, csp->config->proxy_args_trailer); - - return(s); - -} - - -static const char C_URL_INFO_HEADER[] = - "HTTP/1.0 200 OK\n" - "Pragma: no-cache\n" - "Expires: Thu Jul 31, 1997 07:42:22 pm GMT\n" - "Content-Type: text/html\n\n" - "\n" - "\n" - "Internet Junkbuster: URL Info\n" - "\n" - BODY - "

" - BANNER - "

\n" - "

Information for: http://%s

\n"; -static const char C_URL_INFO_FOOTER[] = - "\n

\n" - "\n" - "\n"; - -static const char C_URL_INFO_FORM[] = - "HTTP/1.0 200 OK\n" - "Pragma: no-cache\n" - "Expires: Thu Jul 31, 1997 07:42:22 pm GMT\n" - "Content-Type: text/html\n\n" - "\n" - "\n" - "Internet Junkbuster: URL Info\n" - "\n" - BODY - "

" - BANNER - "

\n" - "
\n" - "

Please enter a URL, without the leading "http://":

" - "

" - "

\n" - "
\n" - "\n" - "\n"; - - - /********************************************************************* - * - * Function : ijb_show_url_info - * - * Description : (please fill me in) - * - * Parameters : - * 1 : http = http_request request for crunched URL - * 2 : csp = Current client state (buffers, headers, etc...) - * - * Returns : ???FIXME - * - *********************************************************************/ -char *ijb_show_url_info(struct http_request *http, struct client_state *csp) -{ - char * query_string = strchr(http->path, '?'); - char * host = NULL; - - if (query_string != NULL) - { - query_string = url_decode(query_string + 1); - if (strncmpic(query_string, "url=", 4) == 0) - { - host = strdup(query_string + 4); - } - freez(query_string); - } - if (host != NULL) - { - char * result; - char * path; - char * s; - int port = 80; - struct file_list *fl; - struct url_actions *b; - struct url_spec url[1]; - struct current_action_spec action[1]; - - init_current_action(action); - - result = (char *)malloc(sizeof(C_URL_INFO_HEADER) + 2 * strlen(host)); - sprintf(result, C_URL_INFO_HEADER, host, host); - - s = current_action_to_text(action); - result = strsav(result, "

Defaults:

\n

{"); - result = strsav(result, s); - result = strsav(result, " }

\n

Patterns affecting the URL:

\n

\n"); - freez(s); - - s = strchr(host, '/'); - if (s != NULL) - { - path = strdup(s); - *s = '\0'; - } - else - { - path = strdup(""); - } - s = strchr(host, ':'); - if (s != NULL) - { - *s++ = '\0'; - port = atoi(s); - } - - if (((fl = csp->actions_list) == NULL) || ((b = fl->f) == NULL)) - { - freez(host); - freez(path); - result = strsav(result, C_URL_INFO_FOOTER); - return result; - } - - *url = dsplit(host); - - /* if splitting the domain fails, punt */ - if (url->dbuf == NULL) - { - freez(host); - freez(path); - result = strsav(result, C_URL_INFO_FOOTER); - return result; - } - - for (b = b->next; NULL != b; b = b->next) - { - if ((b->url->port == 0) || (b->url->port == port)) - { - if ((b->url->domain[0] == '\0') || (domaincmp(b->url, url) == 0)) - { - if ((b->url->path == NULL) || -#ifdef REGEX - (regexec(b->url->preg, path, 0, NULL, 0) == 0) -#else - (strncmp(b->url->path, path, b->url->pathlen) == 0) -#endif - ) - { - s = actions_to_text(b->action); - result = strsav(result, "{"); - result = strsav(result, s); - result = strsav(result, " }
\n"); - result = strsav(result, b->url->spec); - result = strsav(result, "
\n
\n"); - freez(s); - - merge_current_action(action, b->action); - } - } - } - } - - freez(url->dbuf); - freez(url->dvec); - - freez(host); - freez(path); - - s = current_action_to_text(action); - result = strsav(result, "

\n

Final Results:

\n

{"); - result = strsav(result, s); - result = strsav(result, " }
\n
\n"); - freez(s); - - free_current_action(action); - - result = strsav(result, C_URL_INFO_FOOTER); - return result; - } - else - { - return strdup(C_URL_INFO_FORM); - } -} - - -/********************************************************************* - * - * Function : ijb_send_banner - * - * Description : This "crunch"es "http://i.j.b/ijb-send-banner and - * sends the image. - * - * Parameters : - * 1 : http = http_request request for crunched URL - * 2 : csp = Current client state (buffers, headers, etc...) - * - * Returns : NULL, indicating that it has already sent the data. - * - *********************************************************************/ -char *ijb_send_banner(struct http_request *http, struct client_state *csp) -{ - write_socket(csp->cfd, JBGIF, sizeof(JBGIF)-1); - - return(NULL); -} - -#ifdef TRUST_FILES -/********************************************************************* - * - * Function : ij_untrusted_url - * - * Description : This "crunch"es "http:/any.thing/ij-untrusted-url" and - * returns a web page describing why it was untrusted. - * - * Parameters : - * 1 : http = http_request request for crunched URL - * 2 : csp = Current client state (buffers, headers, etc...) - * - * Returns : A string that contains why this was untrusted. - * - *********************************************************************/ -char *ij_untrusted_url(struct http_request *http, struct client_state *csp) -{ - int n; - char *hostport, *path, *refer, *p, *v[9]; - char buf[BUFSIZ]; - struct url_spec **tl, *t; - - - static const char format[] = - "HTTP/1.0 200 OK\r\n" - "Pragma: no-cache\n" - "Last-Modified: Thu Jul 31, 1997 07:42:22 pm GMT\n" - "Expires: Thu Jul 31, 1997 07:42:22 pm GMT\n" - "Content-Type: text/html\n\n" - "\n" - "\n" - "Internet Junkbuster: Request for untrusted URL\n" - "\n" - BODY - "

" - BANNER - "

" - "The " BANNER " Proxy " - "" - "(" HOME_PAGE_URL ") " - "intercepted the request for %s%s\n" - "because the URL is not trusted.\n" - "

\n"; - - if ((n = ssplit(http->path, "?+", v, SZ(v), 0, 0)) == 4) - { - hostport = url_decode(v[1]); - path = url_decode(v[2]); - refer = url_decode(v[3]); - } - else - { - hostport = strdup("undefined_host"); - path = strdup("/undefined_path"); - refer = strdup("undefined"); - } - - n = sizeof(format); - n += strlen(hostport); - n += strlen(path ); - - if ((p = (char *)malloc(n))) - { - sprintf(p, format, hostport, path); - } - - strsav(p, "The referrer in this request was "); - strsav(p, refer); - strsav(p, "
\n"); - - freez(hostport); - freez(path ); - freez(refer ); - - p = strsav(p, "

The following referrers are trusted

\n"); - - for (tl = csp->config->trust_list; (t = *tl) ; tl++) - { - sprintf(buf, "%s
\n", t->spec); - p = strsav(p, buf); - } - - if (csp->config->trust_info->next) - { - struct list *l; - - strcpy(buf, - "

" - "You can learn more about what this means " - "and what you may be able to do about it by " - "reading the following documents:
\n" - "

    \n" - ); - - p = strsav(p, buf); - - for (l = csp->config->trust_info->next; l ; l = l->next) - { - sprintf(buf, - "
  1. %s
    \n", - l->str, l->str); - p = strsav(p, buf); - } - - p = strsav(p, "
\n"); - } - - p = strsav(p, "\n" "\n"); - - return(p); - -} -#endif /* def TRUST_FILES */ - - -#ifdef STATISTICS -/********************************************************************* - * - * Function : add_stats - * - * Description : Statistics function of JB. Called by `show_proxy_args'. - * - * Parameters : - * 1 : s = string that holds the proxy args description page - * - * Returns : A pointer to the descriptive status web page. - * - *********************************************************************/ -char *add_stats(char *s) -{ - /* - * Output details of the number of requests rejected and - * accepted. This is switchable in the junkbuster config. - * Does nothing if this option is not enabled. - */ - - float perc_rej; /* Percentage of http requests rejected */ - char out_str[81]; - int local_urls_read = urls_read; - int local_urls_rejected = urls_rejected; - - /* - * Need to alter the stats not to include the fetch of this - * page. - * - * Can't do following thread safely! doh! - * - * urls_read--; - * urls_rejected--; * This will be incremented subsequently * - */ - - s = strsav(s,"

Statistics for this " BANNER ":

\n"); - - if (local_urls_read == 0) - { - - s = strsav(s,"No activity so far!\n"); - - } - else - { - - perc_rej = (float)local_urls_rejected * 100.0F / - (float)local_urls_read; - - sprintf(out_str, - "%d requests received, %d filtered " - "(%6.2f %%).", - local_urls_read, - local_urls_rejected, perc_rej); - - s = strsav(s,out_str); - } - - return(s); -} -#endif /* def STATISTICS */ - /* Local Variables: diff --git a/filters.h b/filters.h index a3e9474f..a113afad 100644 --- a/filters.h +++ b/filters.h @@ -1,6 +1,6 @@ #ifndef _FILTERS_H #define _FILTERS_H -#define FILTERS_H_VERSION "$Id: filters.h,v 1.6 2001/05/29 09:50:24 jongfoster Exp $" +#define FILTERS_H_VERSION "$Id: filters.h,v 1.8 2001/06/03 11:03:48 oes Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/filters.h,v $ @@ -40,6 +40,66 @@ * * Revisions : * $Log: filters.h,v $ + * Revision 1.8 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.7 2001/05/31 21:21:30 jongfoster + * Permissionsfile / actions file changes: + * - Changed "permission" to "action" throughout + * - changes to file format to allow string parameters + * - Moved helper functions to actions.c + * * Revision 1.6 2001/05/29 09:50:24 jongfoster * Unified blocklist/imagelist/permissionslist. * File format is still under discussion, but the internal changes @@ -159,9 +219,6 @@ extern char *block_url(struct http_request *http, struct client_state *csp); #ifdef TRUST_FILES extern char *trust_url(struct http_request *http, struct client_state *csp); #endif /* def TRUST_FILES */ -extern int intercept_url(struct http_request *http, struct client_state *csp); -extern char *redirect_url(struct http_request *http, struct client_state *csp); - #ifdef IMAGE_BLOCKING extern int block_imageurl(struct http_request *http, struct client_state *csp); #endif /* def IMAGE_BLOCKING */ @@ -177,19 +234,6 @@ extern const struct gateway *forward_url(struct http_request *http, struct clien extern struct url_spec dsplit(char *domain); extern int domaincmp(struct url_spec *pattern, struct url_spec *fqdn); -extern char *show_proxy_args(struct http_request *http, struct client_state *csp); -extern char *ijb_send_banner(struct http_request *http, struct client_state *csp); - -#ifdef TRUST_FILES -extern char *ij_untrusted_url(struct http_request *http, struct client_state *csp); -#endif /* def TRUST_FILES */ - -char *ijb_show_url_info(struct http_request *http, struct client_state *csp); - -#ifdef STATISTICS -extern char *add_stats(char *s); -#endif /* def STATISTICS */ - #ifdef PCRS extern char *re_process_buffer(struct client_state *csp); #endif /* def PCRS */ -- 2.39.2