X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=killpopup.c;h=8a36e5847a02ae65d2f755289813beaf02d8a10c;hp=95dfabb62435df8049afa800a468a8aec4315492;hb=622f8b00129cfb6abeb0d90f095b5ca5dd9d6c35;hpb=2023965d8d80f4a273fa9e5ec00cd9dc27809005

diff --git a/killpopup.c b/killpopup.c
index 95dfabb6..8a36e584 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.8 2001/07/30 22:08:36 jongfoster Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/killpopup.c,v $
@@ -32,6 +32,28 @@ 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.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
  *
@@ -73,15 +95,11 @@ const char killpopup_rcs[] = "$Id: killpopup.c,v 1.3 2001/05/22 18:56:28 oes Exp
 #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
 
 /*********************************************************************
  *
@@ -90,67 +108,47 @@ const char killpopup_h_rcs[] = KILLPOPUP_H_VERSION;
  * 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
+ *                Remember not to change the content length (substitute char by char)
  *
  * Parameters  :
  *          1  :  buff = Buffer to scan and modify.  Null terminated.
- *          2  :  size = Buffer size, excluding null terminator.
  *
  * Returns     :  void
  *
  *********************************************************************/
-void filter_popups(char *buff, int size)
+void filter_popups(char *buff)
 {
    char *popup = NULL;
    char *close = NULL;
    char *p     = NULL;
-   char *q     = NULL; /* by BREITENB NEW! */
 
    while ((popup = strstr( buff, "window.open(" )) != NULL)
    {
-#ifdef POPUP_VERBOSE
-      fprintf(logfp, "Found start of window open" );
-#endif
-      close = strstr( popup+1, ");" );
-      if ( close )
+      if ( popup )
       {
-#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;
+         /*
+          * 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 (q>=buff)
+   }
+   
+   while ((popup = strstr( buff, ".resizeTo(" )) != NULL)
+   {
+      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, "<body");
    if (!popup) popup=strstr( buff, "<BODY");
    if (!popup) popup=strstr( buff, "<Body");
@@ -160,7 +158,7 @@ void filter_popups(char *buff, int size)
       close=strchr(popup,'>');
       if (close)
       {
-         /* we are now between <body and the ending > FIXME: No, we're anywhere! --oes*/
+         /* we are now between <body and the ending > FIXME: No, we're anywhere! --oes */
          p=strstr(popup, "onUnload");
          if (p)
          {
@@ -176,7 +174,7 @@ void filter_popups(char *buff, int size)
 
 }
 
-#endif /* def KILLPOPUPS */
+#endif /* def FEATURE_KILL_POPUPS */
 
 /*
   Local Variables: