X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=killpopup.c;h=8a36e5847a02ae65d2f755289813beaf02d8a10c;hp=7004962de5b21be44f824dc06e22d5ab2a785fc4;hb=622f8b00129cfb6abeb0d90f095b5ca5dd9d6c35;hpb=c75584ebcc79f939fb4ec9c8f842cef6692640c7 diff --git a/killpopup.c b/killpopup.c index 7004962d..8a36e584 100644 --- a/killpopup.c +++ b/killpopup.c @@ -1,7 +1,7 @@ -const char killpopup_rcs[] = "$Id: killpopup.c,v 1.1 2001/05/13 21:57:06 administrator Exp $"; +const char killpopup_rcs[] = "$Id: killpopup.c,v 1.8 2001/07/30 22:08:36 jongfoster Exp $"; /********************************************************************* * - * File : $Source: /home/administrator/cvs/ijb/killpopup.c,v $ + * File : $Source: /cvsroot/ijbswa/current/killpopup.c,v $ * * Purpose : Handles the filtering of popups. * @@ -32,6 +32,47 @@ const char killpopup_rcs[] = "$Id: killpopup.c,v 1.1 2001/05/13 21:57:06 adminis * * Revisions : * $Log: killpopup.c,v $ + * Revision 1.8 2001/07/30 22:08:36 jongfoster + * Tidying up #defines: + * - All feature #defines are now of the form FEATURE_xxx + * - Permanently turned off WIN_GUI_EDIT + * - Permanently turned on WEBDAV and SPLIT_PROXY_ARGS + * + * Revision 1.7 2001/07/20 19:29:25 haroon + * - In v1.5 forgot to add that I implemented LOG_LEVEL_POPUPS in errlog.c, + * errlog.h and killpopup.c. In that case, it is superfluous to have define for + * POPUP_VERBOSE, so I removed the defines and logging is now done + * via log_error(LOG_LEVEL_POPUPS, ....) + * + * Revision 1.6 2001/07/19 19:11:35 haroon + * - Implemented Guy's idea of replacing window.open( with 1;''.concat( + * - Implemented Guy's idea of replacing .resizeTo( with .scrollTo( + * + * Revision 1.5 2001/07/18 15:02:52 haroon + * improved nuking of window.open + * + * Revision 1.4 2001/06/29 13:29:55 oes + * Added FIXMEs (and didn't repair, hehe) + * + * Revision 1.3 2001/05/22 18:56:28 oes + * CRLF -> LF + * + * Revision 1.2 2001/05/20 01:21:20 jongfoster + * Version 2.9.4 checkin. + * - Merged popupfile and cookiefile, and added control over PCRS + * filtering, in new "permissionsfile". + * - Implemented LOG_LEVEL_FATAL, so that if there is a configuration + * file error you now get a message box (in the Win32 GUI) rather + * than the program exiting with no explanation. + * - Made killpopup use the PCRS MIME-type checking and HTTP-header + * skipping. + * - Removed tabs from "config" + * - Moved duplicated url parsing code in "loaders.c" to a new funcition. + * - Bumped up version number. + * + * Revision 1.1.1.1 2001/05/15 13:58:58 oes + * Initial import of version 2.9.3 source tree + * * *********************************************************************/ @@ -54,173 +95,70 @@ const char killpopup_rcs[] = "$Id: killpopup.c,v 1.1 2001/05/13 21:57:06 adminis #include "project.h" #include "killpopup.h" #include "jcc.h" +#include "errlog.h" const char killpopup_h_rcs[] = KILLPOPUP_H_VERSION; -#ifdef KILLPOPUPS - -/* Change these for debug output. *lots*. */ -/*#define POPUP_VERBOSE 1*/ -/* CHANGED - added the below and shifted the more spammy stuff into it ;-) */ -#undef POPUP_VERY_VERBOSE -#undef POPUP_VERBOSE - +#ifdef FEATURE_KILL_POPUPS /********************************************************************* * * Function : filter_popups * * Description : Filter the block of data that's been read from the server. - * IF NECESSARY. + * Caller is responsible for checking permissons list + * to determine if this function should be called. + * Remember not to change the content length (substitute char by char) * * Parameters : - * 1 : csp = Client state - * 2 : host_name = hostname of originating web page to - * look up on blocklist - * 3 : buff = Buffer to scan and modify. Null terminated. - * 4 : size = Buffer size, excluding null terminator. + * 1 : buff = Buffer to scan and modify. Null terminated. * * Returns : void * *********************************************************************/ -void filter_popups(struct client_state *csp, char *host_name, char *buff, int size) +void filter_popups(char *buff) { - struct popup_settings * data; - struct popup_blocklist * cur; - int i; - int found = 0; char *popup = NULL; char *close = NULL; char *p = NULL; - char *q = NULL; /* by BREITENB NEW! */ - - if ( (!csp->plist) || ((data = csp->plist->f) == NULL) ) - { - /* Disabled. */ - return; - } - - /* If the hostname is on our list for blocking then mark it - * as a host to block from. (This may be later changed if the - * host is also on the list-to-allow list). - */ - - for (i=0; (i < 50) && (i < size); i++) /* avoid scanning binary data! */ - { - if ((unsigned int)(buff[i])>127) - { -#ifdef POPUP_VERBOSE - fprintf(logfp, "I'm not scanning binary stuff! (%i)\n",buff[i]); -#endif - return; - } - } - - - for (cur = data->blocked ; cur ; cur = cur->next) - { - if ( host_name != 0 ) - { - if ( strcmp( cur->host_name, host_name ) == 0 ) - { -#ifdef POPUP_VERBOSE - fprintf(logfp, "Blocking %s\n", host_name ); -#endif - found = 1; - } - } - } - /* Force match if we're supposed to nuke _all_ popups, globally. */ - if ( kill_all_popups != 0 ) - { -#ifdef POPUP_VERBOSE - fprintf(logfp, "Indescriminatly nuking popups..\n" ); -#endif - found = 1; - } - /* an exception-from blocking should still be an exception! by BREITENB NEW! */ - - - /* Now, if its allowed adjust the filtering, so it _doesn't_ happen. */ - for (cur = data->allowed ; cur ; cur = cur->next) + while ((popup = strstr( buff, "window.open(" )) != NULL) { - if ( host_name != 0 ) + if ( popup ) { - if ( strcmp( cur->host_name, host_name ) == 0 ) - { -#ifdef POPUP_VERBOSE - fprintf(logfp, "Reversing block decision for %s\n", host_name ); -#endif - found = 0; - } + /* + * replace the window.open( with a harmless JavaScript replacement (notice the two single quotes) + * Guy's idea (thanks) + */ + strncpy(popup, "1;''.concat(", 12); + log_error(LOG_LEVEL_POPUPS, "Blocked popup window open"); } } - - if ( found == 0) - { -#ifdef POPUP_VERBOSE - fprintf(logfp, "Allowing %s\n", host_name ); -#endif - return; - } - - while ((popup = strstr( buff, "window.open(" )) != NULL) - /* if ( popup ) by BREITENB filter ALL popups! NEW! */ + + while ((popup = strstr( buff, ".resizeTo(" )) != NULL) { -#ifdef POPUP_VERBOSE - fprintf(logfp, "Found start of window open" ); -#endif - close = strstr( popup+1, ");" ); - if ( close ) - { -#ifdef POPUP_VERBOSE - fprintf(logfp, "Found end of window open" ); -#endif - for ( p = popup; p != (close+1); p++ ) - { - *p = ' '; - } -#ifdef POPUP_VERBOSE - fprintf(logfp, "Blocked %s\n", host_name ); -#endif - } - else - { -#ifdef POPUP_VERBOSE - fprintf(logfp, "Couldn't find end, turned into comment. Read boundary?\n" ); -#endif - *popup = '/'; - popup++; - *popup = '/'; - } - - - q=popup; /* by BREITENB NEW! */ - while (q>=buff) - { - if (*q==' ' || *q=='\t') - q--; - else break; - } - if (q>=buff) + if ( popup ) { - if (*q=='=') *++q='1'; - /* result of popup is assigned to a variable! ensure success. hehehe. */ + /* + * replace the .resizeTo( with a harmless JavaScript replacement + * Guy's idea (thanks) + */ + strncpy(popup, ".scrollTo(", 10); + log_error(LOG_LEVEL_POPUPS, "Blocked popup window resize"); } } - /* Filter all other crap like onUnload onExit etc. (by BREITENB) NEW!*/ + /* Filter onUnload and onExit */ popup=strstr( buff, "'); - if (q) + close=strchr(popup,'>'); + if (close) { - /* we are now between */ + /* we are now between FIXME: No, we're anywhere! --oes */ p=strstr(popup, "onUnload"); if (p) { @@ -236,7 +174,7 @@ void filter_popups(struct client_state *csp, char *host_name, char *buff, int si } -#endif /* def KILLPOPUPS */ +#endif /* def FEATURE_KILL_POPUPS */ /* Local Variables: