X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=pcrs.c;h=0cff5f8307d8ddd90b580930ef89b6f8a7705256;hp=cd0c94a8a181feb661df53e9839ec4de2e97eb14;hb=943b493f74871337f51ffa3b3d94b0c98173b0fe;hpb=c75584ebcc79f939fb4ec9c8f842cef6692640c7 diff --git a/pcrs.c b/pcrs.c index cd0c94a8..0cff5f83 100644 --- a/pcrs.c +++ b/pcrs.c @@ -1,18 +1,17 @@ -const char pcrs_rcs[] = "$Id: pcrs.c,v 1.1 2001/05/13 21:57:07 administrator Exp $"; +const char pcrs_rcs[] = "$Id: pcrs.c,v 1.3 2001/05/25 11:03:55 oes Exp $"; /********************************************************************* * - * File : $Source: /home/administrator/cvs/ijb/pcrs.c,v $ + * File : $Source: /cvsroot/ijbswa/current/pcrs.c,v $ * - * Purpose : This is the pre-pre-alpha realease of libpcrs. It is only - * published at this (ugly) stage of development, because it is + * Purpose : This is the alpha release of libpcrs. It is only published + * at this early stage of development, because it is * needed for a new feature in JunkBuster. * - * Apart from the code being quite a mess, no inconsistencies, - * memory leaks or functional bugs **should** be present. - * - * While you ROTFL at the code, you could just as well mail me - * (andreas@oesterhelt.org) with advice for improvement. + * While no inconsistencies, memory leaks or functional bugs + * are known at this time, there *could* be plenty ;-). Also, + * Many pcre-specific options are not yet supported, and + * error handling needs improvement. * * pcrs is a supplement to the brilliant pcre library by Philip * Hazel (ph10@cam.ac.uk) and adds Perl-style substitution. That @@ -21,10 +20,79 @@ const char pcrs_rcs[] = "$Id: pcrs.c,v 1.1 2001/05/13 21:57:07 administrator Exp * Currently, there's no documentation besides comments and the * source itself ;-) * - * Copyright : Written and copyright by andreas@oesterhelt.org + * Copyright : Written and Copyright (C) 2000 by Andreas Oesterhelt + * + * + * This program is free software; you can redistribute it + * and/or modify it under the terms of the GNU General + * Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at + * your option) any later version. + * + * This program is distributed in the hope that it will + * be useful, but WITHOUT ANY WARRANTY; without even the + * implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public + * License for more details. + * + * The GNU General Public License should be included with + * this file. If not, you can view it at + * http://www.gnu.org/copyleft/gpl.html + * or write to the Free Software Foundation, Inc., 59 + * Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * Revisions : * $Log: pcrs.c,v $ + * Revision 1.3 2001/05/25 11:03:55 oes + * Added sanity check for NULL jobs to pcrs_exec_substitution + * + * Revision 1.2 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.1.1.1 2001/05/15 13:59:02 oes + * Initial import of version 2.9.3 source tree + * * *********************************************************************/ @@ -121,6 +189,7 @@ int pcrs_compile_perl_options(char *optstring, int *globalflag) case 'o': break; case 's': rc |= PCRE_DOTALL; break; case 'x': rc |= PCRE_EXTENDED; break; + case 'U': rc |= PCRE_UNGREEDY; break; default: break; } } @@ -321,7 +390,7 @@ pcrs_job *pcrs_make_job(char *command, int *errptr) { switch (i) { - /* We don't care about the command and assume 's' */ + /* We don't care about the command and assume 's' */ case 0: break; @@ -332,13 +401,15 @@ pcrs_job *pcrs_make_job(char *command, int *errptr) /* The substitute */ case 2: - newjob->substitute = pcrs_compile_replacement(token, errptr); - if (newjob->substitute == NULL) + if ((newjob->substitute = pcrs_compile_replacement(token, errptr)) == NULL) { pcrs_free_job(newjob); return NULL; } - break; + else + { + break; + } /* The options */ case 3: @@ -356,6 +427,14 @@ pcrs_job *pcrs_make_job(char *command, int *errptr) } free(token); + /* We have a valid substitute? */ + if (newjob->substitute == NULL) + { + *errptr = PCRS_ERR_CMDSYNTAX; + pcrs_free_job(newjob); + return NULL; + } + /* Compile the pattern */ newjob->pattern = pcre_compile(dummy, newjob->options, &error, errptr, NULL); if (newjob->pattern == NULL) @@ -453,6 +532,13 @@ int pcrs_exec_substitution(pcrs_job *job, char *subject, int subject_length, cha pcrs_match matches[PCRS_MAX_MATCHES]; char *result_offset; + /* Sanity first */ + if (job == NULL || job->pattern == NULL || job->substitute == NULL) + { + *result = NULL; + return(PCRS_ERR_BADJOB); + } + newsize=subject_length; /* Find.. */