X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=killpopup.c;h=92b646e480c6e3cafb71486453ab31e47f1ed497;hp=95dfabb62435df8049afa800a468a8aec4315492;hb=6484fffbf977dbc3945ac7c53b6acd3d4db79266;hpb=2023965d8d80f4a273fa9e5ec00cd9dc27809005 diff --git a/killpopup.c b/killpopup.c index 95dfabb6..92b646e4 100644 --- a/killpopup.c +++ b/killpopup.c @@ -1,4 +1,4 @@ -const char killpopup_rcs[] = "$Id: killpopup.c,v 1.3 2001/05/22 18:56:28 oes Exp $"; +const char killpopup_rcs[] = "$Id: killpopup.c,v 1.13 2001/11/13 00:16:40 jongfoster Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/killpopup.c,v $ @@ -9,10 +9,10 @@ const char killpopup_rcs[] = "$Id: killpopup.c,v 1.3 2001/05/22 18:56:28 oes Exp * IJBSWA team. http://ijbswa.sourceforge.net * * 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,48 @@ const char killpopup_rcs[] = "$Id: killpopup.c,v 1.3 2001/05/22 18:56:28 oes Exp * * Revisions : * $Log: killpopup.c,v $ + * 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 + * 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 * @@ -61,122 +103,102 @@ const char killpopup_rcs[] = "$Id: killpopup.c,v 1.3 2001/05/22 18:56:28 oes Exp #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; -#ifdef KILLPOPUPS - -/* Change these for debug output. *lots*. */ -/*#define POPUP_VERBOSE 1*/ -#undef POPUP_VERBOSE - +#ifdef FEATURE_KILL_POPUPS /********************************************************************* * * 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. - * FIXME: Should use the replacements proposed by Guy + * 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; - char *q = NULL; /* by BREITENB NEW! */ - 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) { -#ifdef POPUP_VERBOSE - fprintf(logfp, "Found start of window open" ); -#endif - close = strstr( popup+1, ");" ); - if ( close ) + if (start_p) { -#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 = '/'; + strncpy(start_p, "1;''.concat(", 12); + log_error(LOG_LEVEL_POPUPS, "Blocked popup window open"); + csp->flags |= CSP_FLAG_MODIFIED; } + } - - q=popup; /* by BREITENB NEW! */ - while (q>=buff) - { - if (*q==' ' || *q=='\t') - q--; - else break; - } - if (q>=buff) + /* + * replace the .resizeTo( with a harmless JavaScript replacement + */ + while ((start_p = strstr(buff, ".resizeTo(")) != NULL) + { + if (start_p) { - if (*q=='=') *++q='1'; - /* result of popup is assigned to a variable! ensure success. hehehe. */ + 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; } } } } -#endif /* def KILLPOPUPS */ +#endif /* def FEATURE_KILL_POPUPS */ /* Local Variables: