You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by lr...@apache.org on 2009/06/30 21:31:22 UTC

svn commit: r789892 - /incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssSanitizer.java

Author: lryan
Date: Tue Jun 30 19:31:21 2009
New Revision: 789892

URL: http://svn.apache.org/viewvc?rev=789892&view=rev
Log:
Fix for test failure caused by image sanitization in CSS change.

Modified:
    incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssSanitizer.java

Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssSanitizer.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssSanitizer.java?rev=789892&r1=789891&r2=789892&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssSanitizer.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssSanitizer.java Tue Jun 30 19:31:21 2009
@@ -142,39 +142,48 @@
           }
         } else if (ancestorChain.node instanceof CssTree.UriLiteral &&
             !(ancestorChain.getParentNode() instanceof CssTree.Import)) {
-          boolean validUri = false;
           String uri = ((CssTree.UriLiteral)ancestorChain.node).getValue();
-          try {
-            String scheme = Uri.parse(uri).getScheme();
-            validUri = StringUtils.isEmpty(scheme) ||
-                ALLOWED_URI_SCHEMES.contains(scheme.toLowerCase());
-          } catch (RuntimeException re) {
-            if (logger.isLoggable(Level.FINE)) {
-              logger.log(Level.FINE, "Failed to parse URI in CSS " + uri, re);
-            }
-          }
-          if (!validUri) {
+          if (isValidUri(uri)) {
+            // Assume the URI is for an image. Rewrite it using the image link rewriter
+            ((CssTree.UriLiteral)ancestorChain.node).setValue(
+                imageRewriter.rewrite(uri, linkContext));
+          } else {
             // Remove offending node
             if (logger.isLoggable(Level.FINE)) {
-              logger.log(Level.FINE, "Removing invalid URI "
-                  + ((CssTree.UriLiteral) ancestorChain.node).getValue());
+              logger.log(Level.FINE, "Removing invalid URI " + uri);
             }
             clean(ancestorChain);
-          } else {
-            // Assume the URI is for an image. Rewrite it using the image link rewriter
-            ((CssTree.UriLiteral)ancestorChain.node).setValue(
-                imageRewriter.rewrite(uri, linkContext));
           }
         } else if (ancestorChain.node instanceof CssTree.Import) {
           CssTree.Import importDecl = (CssTree.Import) ancestorChain.node;
-          importDecl.getUri()
-              .setValue(importRewriter.rewrite(importDecl.getUri().getValue(), linkContext));
+          String uri = importDecl.getUri().getValue();
+          if (isValidUri(uri)) {
+            importDecl.getUri().setValue(importRewriter.rewrite(uri, linkContext));
+          } else {
+            if (logger.isLoggable(Level.FINE)) {
+              logger.log(Level.FINE, "Removing invalid URI " + uri);
+            }
+            clean(ancestorChain);
+          }
         }
         return true;
       }
     }, null);
   }
 
+  private boolean isValidUri(String uri) {
+    try {
+      String scheme = Uri.parse(uri).getScheme();
+      return StringUtils.isEmpty(scheme) ||
+          ALLOWED_URI_SCHEMES.contains(scheme.toLowerCase());
+    } catch (RuntimeException re) {
+      if (logger.isLoggable(Level.FINE)) {
+        logger.log(Level.FINE, "Failed to parse URI in CSS " + uri, re);
+      }
+    }
+    return false;
+  }
+
   /**
    * recurse up through chain to find a safe clean point
    * @param chain chain of nodes