Fix whitelisting issues

src/org/adblockplus/android/AdblockPlus.java

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2013 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 43 matching lines @@
 import android.util.Log;
 
 public class AdblockPlus extends Application
 {
   private final static String TAG = "Application";
 
   private final static Pattern RE_JS = Pattern.compile(".*\\.js$", Pattern.CASE_INSENSITIVE);
   private final static Pattern RE_CSS = Pattern.compile(".*\\.css$", Pattern.CASE_INSENSITIVE);
   private final static Pattern RE_IMAGE = Pattern.compile(".*\\.(?:gif|png|jpe?g|bmp|ico)$", Pattern.CASE_INSENSITIVE);
   private final static Pattern RE_FONT = Pattern.compile(".*\\.(?:ttf|woff)$", Pattern.CASE_INSENSITIVE);
+  private final static Pattern RE_HTML = Pattern.compile(".*\\.html?$", Pattern.CASE_INSENSITIVE);
 
   /**
    * Broadcasted when filtering is enabled or disabled.
    */
   public static final String BROADCAST_FILTERING_CHANGE = "org.adblockplus.android.filtering.status";
   /**
    * Broadcasted when subscription status changes.
    */
   public final static String BROADCAST_SUBSCRIPTION_STATUS = "org.adblockplus.android.subscription.status";
   /**
@@ skipping 290 matching lines @@
    *          Request query string
    * @param referrer
    *          Request referrer header
    * @param accept
    *          Request accept header
    * @return true if matched filter was found
    * @throws Exception
    */
   public boolean matches(String url, String query, String referrer, String accept)
   {
+    final String fullUrl = !"".equals(query) ? url + "?" + query : url;
     if (referrer != null)
-      referrerMapping.put(url, referrer);
+      referrerMapping.put(fullUrl, referrer);
 
     if (!filteringEnabled)
       return false;
     
     String contentType = null;
 
     if (accept != null)
     {
       if (accept.contains("text/css"))
         contentType = "STYLESHEET";
       else if (accept.contains("image/*"))
         contentType = "IMAGE";
+      else if (accept.contains("text/html"))
+        contentType = "SUBDOCUMENT";
     }
 
     if (contentType == null)
     {
       if (RE_JS.matcher(url).matches())
         contentType = "SCRIPT";
       else if (RE_CSS.matcher(url).matches())
         contentType = "STYLESHEET";
       else if (RE_IMAGE.matcher(url).matches())
         contentType = "IMAGE";
       else if (RE_FONT.matcher(url).matches())
         contentType = "FONT";
+      else if (RE_HTML.matcher(url).matches())
+        contentType = "SUBDOCUMENT";
     }
     if (contentType == null)
       contentType = "OTHER";
 
-    if (!"".equals(query))
-      url = url + "?" + query;
-
     final List<String> referrerChain = buildReferrerChain(referrer);
-    Log.d("Referrer chain", url + ": " + referrerChain.toString());
+    Log.d("Referrer chain", fullUrl + ": " + referrerChain.toString());
     String[] referrerChainArray = referrerChain.toArray(new String[referrerChain.size()]);
-    return abpEngine.matches(url, contentType, referrerChainArray);
+    return abpEngine.matches(fullUrl, contentType, referrerChainArray);
   }
 
   private List<String> buildReferrerChain(String url)
   {
     final List<String> referrerChain = new ArrayList<String>();
     // We need to limit the chain length to ensure we don't block indefinitely if there's
     // a referrer loop.
     final int maxChainLength = 10;
     for (int i = 0; i < maxChainLength && url != null; i++)
     {
-      referrerChain.add(url);
+      referrerChain.add(0, url);
       url = referrerMapping.get(url);
     }
     return referrerChain;
   }
 
   /**
    * Checks if filtering is enabled.
    */
   public boolean isFilteringEnabled()
   {
@@ skipping 117 matching lines @@
       Log.e(TAG, e.getMessage(), e);
     }
 
     // Set crash handler
     Thread.setDefaultUncaughtExceptionHandler(new CrashHandler(this));
 
     // Initiate update check
     scheduleUpdater(0);
   }
 }