X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=killpopup.c;h=34653738784ccd3a3439351bd43fa58b4c36c97f;hp=77126ce62dceec14bc77e0141c2a27809ede1f0a;hb=21b44eb27380c25ba0a50f1b95b555edb84db337;hpb=536a88ebe11300228987eaa39ef4bbd63cd0e1ba diff --git a/killpopup.c b/killpopup.c index 77126ce6..34653738 100644 --- a/killpopup.c +++ b/killpopup.c @@ -1,4 +1,4 @@ -const char killpopup_rcs[] = "$Id: killpopup.c,v 1.7 2001/07/20 19:29:25 haroon Exp $"; +const char killpopup_rcs[] = "$Id: killpopup.c,v 1.15 2002/03/24 13:25:43 swa Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/killpopup.c,v $ @@ -6,13 +6,13 @@ const char killpopup_rcs[] = "$Id: killpopup.c,v 1.7 2001/07/20 19:29:25 haroon * Purpose : Handles the filtering of popups. * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * IJBSWA team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written - * by and Copyright (C) 1997 Anonymous Coders and + * by and Copyright (C) 1997 Anonymous Coders and * Junkbusters Corporation. http://www.junkbusters.com * - * This program is free software; you can redistribute it + * 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 @@ -32,6 +32,38 @@ const char killpopup_rcs[] = "$Id: killpopup.c,v 1.7 2001/07/20 19:29:25 haroon * * Revisions : * $Log: killpopup.c,v $ + * Revision 1.15 2002/03/24 13:25:43 swa + * name change related issues + * + * Revision 1.14 2002/03/07 03:46:53 oes + * Fixed compiler warnings etc + * + * Revision 1.13 2001/11/13 00:16:40 jongfoster + * Replacing references to malloc.h with the standard stdlib.h + * (See ANSI or K&R 2nd Ed) + * + * Revision 1.12 2001/10/25 03:40:48 david__schmidt + * Change in porting tactics: OS/2's EMX porting layer doesn't allow multiple + * threads to call select() simultaneously. So, it's time to do a real, live, + * native OS/2 port. See defines for __EMX__ (the porting layer) vs. __OS2__ + * (native). Both versions will work, but using __OS2__ offers multi-threading. + * + * Revision 1.11 2001/10/07 15:42:41 oes + * filter_popups now gets a csp pointer so it can raise the new + * CSP_FLAG_MODIFIED flag. + * + * Revision 1.10 2001/09/22 16:34:44 jongfoster + * Removing unneeded #includes + * + * Revision 1.9 2001/07/31 14:44:22 oes + * Deleted unused size parameter from filter_popups() + * + * 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 @@ -77,18 +109,16 @@ const char killpopup_rcs[] = "$Id: killpopup.c,v 1.7 2001/07/20 19:29:25 haroon #include #include #include -#include #include #include #include -#ifndef _WIN32 +#if !defined(_WIN32) && !defined(__OS2__) #include #endif #include "project.h" #include "killpopup.h" -#include "jcc.h" #include "errlog.h" const char killpopup_h_rcs[] = KILLPOPUP_H_VERSION; @@ -99,70 +129,75 @@ const char killpopup_h_rcs[] = KILLPOPUP_H_VERSION; * * Function : filter_popups * - * Description : Filter the block of data that's been read from the server. - * 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) + * Description : Filter the block of data that's been read from the server + * for javascript popup code and replace by syntactically + * neutral code of the same size. + * Raise the CSP_FLAG_MODIFIED flag on success. * * Parameters : * 1 : buff = Buffer to scan and modify. Null terminated. - * 2 : size = Buffer size, excluding null terminator. + * 2 : csp = Client state pointer * * Returns : void * *********************************************************************/ -void filter_popups(char *buff, int size) +void filter_popups(char *buff, struct client_state *csp) { - char *popup = NULL; - char *close = NULL; + char *start_p = NULL; + char *close_p = NULL; char *p = NULL; - while ((popup = strstr( buff, "window.open(" )) != NULL) + /* + * replace the window.open( with a harmless JavaScript replacement + * (notice the two single quotes) + */ + while ((start_p = strstr(buff, "window.open(")) != NULL) { - if ( popup ) + if (start_p) { - /* - * replace the window.open( with a harmless JavaScript replacement (notice the two single quotes) - * Guy's idea (thanks) - */ - strncpy(popup, "1;''.concat(", 12); + strncpy(start_p, "1;''.concat(", 12); log_error(LOG_LEVEL_POPUPS, "Blocked popup window open"); + csp->flags |= CSP_FLAG_MODIFIED; } } - - while ((popup = strstr( buff, ".resizeTo(" )) != NULL) + + /* + * replace the .resizeTo( with a harmless JavaScript replacement + */ + while ((start_p = strstr(buff, ".resizeTo(")) != NULL) { - if ( popup ) + if (start_p) { - /* - * replace the .resizeTo( with a harmless JavaScript replacement - * Guy's idea (thanks) - */ - strncpy(popup, ".scrollTo(", 10); + strncpy(start_p, ".scrollTo(", 10); log_error(LOG_LEVEL_POPUPS, "Blocked popup window resize"); + csp->flags |= CSP_FLAG_MODIFIED; } } - /* Filter all other crap like onUnload onExit etc. (by BREITENB) NEW!*/ - popup=strstr( buff, "'); - if (close) + close_p = strchr(start_p, '>'); + if (close_p) { - /* we are now between FIXME: No, we're anywhere! --oes*/ - p=strstr(popup, "onUnload"); + /* we are now between */ + p = strstr(start_p, "onUnload"); if (p) { - strncpy(p,"_nU_",4); + strncpy(p, "_nU_", 4); + csp->flags |= CSP_FLAG_MODIFIED; } - p=strstr(popup, "onExit"); + p = strstr(start_p, "onExit"); if (p) { - strncpy(p,"_nE_",4); + strncpy(p, "_nE_", 4); + csp->flags |= CSP_FLAG_MODIFIED; } } }