[Caja] [google-caja] r5036 committed - fix css regexp optimization...

[google-caja]

Revision: 5036
Author:   feli...@gmail.com
Date:     Tue Sep  4 17:29:58 2012
Log:      fix css regexp optimization
http://codereview.appspot.com/6494083
if you give "border: 1px solid rgb(0,0,0)" to the js css sanitizer,
it stripes out the rgb value, because of a bug in our regexp
optimizer.

the optimizer turns /foo{0}/ into /foo/ rather than //
so the pattern /(rgb...)(rgb...){0}/ becomes /(rgb...)(rgb...)/
which is the wrong thing to match.

this fixes https://code.google.com/p/google-caja/issues/detail?id=1517

R=metaw...@gmail.com

http://code.google.com/p/google-caja/source/detail?r=5036

Modified:
 /trunk/src/com/google/caja/lang/css/JSRE.java
 /trunk/tests/com/google/caja/lang/css/CssPropertyPatternsTest.java
 /trunk/tests/com/google/caja/plugin/sanitizecss_test.js

=======================================
--- /trunk/src/com/google/caja/lang/css/JSRE.java       Thu Jan 19 09:04:11 2012
+++ /trunk/src/com/google/caja/lang/css/JSRE.java       Tue Sep  4 17:29:58 2012
@@ -123,7 +123,8 @@
     JSRE optimize() {
       JSRE newBody = body.optimize();
       if (min == 1 && max == 1) { return newBody; }
-      if (newBody instanceof Noop || max == 0) { return newBody; }
+      if (newBody instanceof Noop) { return newBody; }
+      if (max == 0) { return new Noop(); }
       if (newBody instanceof Repetition) {
         Repetition r = (Repetition) newBody;
         if (r.max == 1) {
=======================================
--- /trunk/tests/com/google/caja/lang/css/CssPropertyPatternsTest.java	Thu  
Jan 19 09:04:11 2012
+++ /trunk/tests/com/google/caja/lang/css/CssPropertyPatternsTest.java	Tue  
Sep  4 17:29:58 2012
@@ -15,6 +15,7 @@
 package com.google.caja.lang.css;

 import com.google.caja.lang.css.CssPropertyPatterns;
+import com.google.caja.lang.css.CssPropertyPatterns.CssPropertyData;
 import com.google.caja.lang.css.CssSchema;
 import com.google.caja.lexer.FilePosition;
 import com.google.caja.parser.css.CssPropertySignature;
@@ -51,6 +52,15 @@
     assertPattern("[ foo | [ a || b || c || d ] | bar ]",
                   "/^\\s*(?:foo|[a-d](?:\\s+[a-d]){0,3}|bar)\\s*$/i");
   }
+
+  public final void testLiteralExtraction() {
+    CssPropertyPatterns pp = new CssPropertyPatterns(
+        CssSchema.getDefaultCss21Schema(mq));
+    String text = "[ foo || bar() ]";
+    CssPropertySignature sig = parseSignature(text);
+    CssPropertyData actual = pp.cssPropertyToPattern(sig, false);
+    assertEquals("/^ *\\s*bar\\( *\\) *$/i", actual.regex);
+  }

   public final void testReferencePattern() {
     assertPattern(
=======================================
--- /trunk/tests/com/google/caja/plugin/sanitizecss_test.js	Wed May  9  
16:01:22 2012
+++ /trunk/tests/com/google/caja/plugin/sanitizecss_test.js	Tue Sep  4  
17:29:58 2012
@@ -209,3 +209,13 @@
   }
   jsunit.pass();
 });
+
+jsunitRegister('testBorder',
+               function testBorder() {
+  var source = '1px solid rgb(0,0,0)';
+  var expect = '1px:solid:rgb( 0 , 0 , 0 )';
+  var tokens = lexCss(source);
+  sanitizeCssProperty('border', cssSchema['border'], tokens);
+  assertEquals(expect, tokens.join(':'));
+  jsunit.pass();
+});