From 4f714f74b7d1376746f807f600a89bb552628836 Mon Sep 17 00:00:00 2001 From: oes Date: Fri, 29 Jun 2001 13:22:44 +0000 Subject: [PATCH] - Cleaned up - Added new functions: default_exports(), make_menu(), error_response() etc, ranamed others and changed param and return types. - Removed HTTP/HTML snipplets - Removed logentry from cancelled commit --- cgi.h | 272 +++++++++------------------------------------------------- 1 file changed, 42 insertions(+), 230 deletions(-) diff --git a/cgi.h b/cgi.h index 8d7484ae..c76696a3 100644 --- a/cgi.h +++ b/cgi.h @@ -1,6 +1,6 @@ #ifndef _CGI_H #define _CGI_H -#define CGI_H_VERSION "$Id: cgi.h,v 1.3 2001/06/03 19:12:16 oes Exp $" +#define CGI_H_VERSION "$Id: cgi.h,v 1.4 2001/06/09 10:50:58 jongfoster Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/cgi.h,v $ @@ -38,64 +38,14 @@ * * Revisions : * $Log: cgi.h,v $ + * Revision 1.4 2001/06/09 10:50:58 jongfoster + * Changing "show URL info" handler to new style. + * Adding "extern" to some function prototypes. + * * Revision 1.3 2001/06/03 19:12:16 oes * introduced new cgi handling * - * Revision 1.1 2001/06/03 11:04:49 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 - * - * + * No revisions before 1.3 * **********************************************************************/ @@ -106,38 +56,55 @@ extern "C" { #endif -extern struct http_response *cgi_dispatch(struct client_state *csp); -extern int make_http_response(struct http_response *rsp); -extern void free_http_response(struct http_response *rsp); - -extern struct map *parse_cgi(char *argstring); -extern char *dump_map(struct map *map); +/* + * Dispatch & parameter parsing functions + */ +extern struct http_response *dispatch_cgi(struct client_state *csp); +extern struct map *parse_cgi_parameters(char *argstring); +/* + * CGI functions + */ extern int cgi_default(struct client_state *csp, struct http_response *rsp, - struct map *parameters); + struct map *parameters); extern int cgi_show_status(struct client_state *csp, struct http_response *rsp, - struct map *parameters); - + struct map *parameters); extern int cgi_show_url_info(struct client_state *csp, struct http_response *rsp, - struct map *parameters); - -extern char *redirect_url(struct http_request *http, struct client_state *csp); + struct map *parameters); extern int cgi_send_banner(struct client_state *csp, struct http_response *rsp, - struct map *parameters); + struct map *parameters); +/* Not exactly a CGI */ +extern struct http_response *error_response(struct client_state *csp, const char *template, int err); +/* + * CGI support functions + */ +extern struct http_response *finish_http_response(struct http_response *rsp); +extern void free_http_response(struct http_response *rsp); -#ifdef TRUST_FILES -extern char *ij_untrusted_url(struct http_request *http, struct client_state *csp); -#endif /* def TRUST_FILES */ +extern struct map *default_exports(struct client_state *csp, char *caller); +extern struct map *map_block_killer(struct map *map, char *name); +extern char *fill_template(struct client_state *csp, const char *template, struct map *exports); +/* + * Text generators + */ +extern char *make_menu(const char *self); +extern char *dump_map(struct map *map); #ifdef STATISTICS -extern char *add_stats(char *s); +extern struct map *add_stats(struct map *exports); #endif /* def STATISTICS */ -static const char CJBGIF[] = + +/* + * Hint: You can encode your own GIFs like that: + * perl -e 'while (read STDIN, $c, 1) { printf("\\%.3o,", unpack("C", $c)); }' + */ + +static const char JBGIF[] = "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" @@ -147,166 +114,11 @@ static const char CJBGIF[] = "\372\003S\275\274k2\354\254z\347?\335\274x\306^9\374\276" "\037Q\000\000;"; -static const char CBLANKGIF[] = +static const char BLANKGIF[] = "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 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 */ - - -static const char C_HOME_PAGE[] = - "\n" - "\n" - "Internet Junkbuster: Information\n" - "\n" - BODY - "

" - BANNER - "

\n" - "

JunkBuster web site

\n" - "

Proxy configuration

\n" - "

Look up a URL

\n" - "\n" - "\n"; - -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"; - -static const char CFAIL[] = - "HTTP/1.0 503 Connect failed\n" - "Content-Type: text/html\n\n" - "\n" - "\n" - "Internet Junkbuster: Connect failed\n" - "\n" - BODY - "

" - BANNER - "

" - "TCP connection to '%s' failed: %s.\n
" - "\n" - "\n"; - -static const char CNXDOM[] = - "HTTP/1.0 404 Non-existent domain\n" - "Content-Type: text/html\n\n" - "\n" - "\n" - "Internet Junkbuster: Non-existent domain\n" - "\n" - BODY - "

" - BANNER - "

" - "No such domain: %s\n" - "\n" - "\n"; - -static const char CNOBANNER[] = - "HTTP/1.0 200 No Banner\n" - "Content-Type: text/html\n\n" - "\n" - "\n" - "Internet Junkbuster: No Banner\n" - "\n" - BODY - "

" - BANNER - "

" - "You asked for a banner that this proxy can't produce because either configuration does not permit.\n
" - "or the URL didn't end with .gif\n" - "\n" - "\n"; - /* Revision control strings from this header and associated .c file */ extern const char cgi_rcs[]; -- 2.39.2