Use correct cookie date parsing for cookie 'expires' field.

runtime/bin/http_utils.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 class _HttpUtils {
   static String decodeUrlEncodedString(String urlEncoded) {
     // First check the string for any encoding.
     int index = 0;
     bool encoded = false;
     while (!encoded && index < urlEncoded.length) {
@@ skipping 99 matching lines @@
     d.hour < 9 ? sb.add(" 0") : sb.add(" ");
     sb.add(d.hour.toString());
     d.minute < 9 ? sb.add(":0") : sb.add(":");
     sb.add(d.minute.toString());
     d.second < 9 ? sb.add(":0") : sb.add(":");
     sb.add(d.second.toString());
     sb.add(" GMT");
     return sb.toString();
   }
 
-  static Date parseDate(String date, [bool strict = true]) {
+  static Date parseDate(String date) {
     final int SP = 32;
     List wkdays = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"];
     List weekdays = ["Monday", "Tuesday", "Wednesday", "Thursday",
                      "Friday", "Saturday", "Sunday"];
     List months = ["Jan", "Feb", "Mar", "Apr", "May", "Jun",
                    "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
     List wkdaysLowerCase = ["mon", "tue", "wed", "thu", "fri", "sat", "sun"];
     List weekdaysLowerCase = ["monday", "tuesday", "wednesday", "thursday",
                               "friday", "saturday", "sunday"];
     List monthsLowerCase = ["jan", "feb", "mar", "apr", "may", "jun",
                             "jul", "aug", "sep", "oct", "nov", "dec"];
 
     final int formatRfc1123 = 0;
     final int formatRfc850 = 1;
     final int formatAsctime = 2;
 
     int index = 0;
     String tmp;
     int format;
 
     void expect(String s) {
       if (date.length - index < s.length) {
         throw new HttpException("Invalid HTTP date $date");
       }
       String tmp = date.substring(index, index + s.length);
-      if (strict) {
-        if (tmp != s) {
-          throw new HttpException("Invalid HTTP date $date");
-        }
-      } else {
-        if (tmp.toLowerCase() != s.toLowerCase()) {
-          throw new HttpException("Invalid HTTP date $date");
-        }
+      if (tmp != s) {
+        throw new HttpException("Invalid HTTP date $date");
       }
       index += s.length;
     }
 
     int expectWeekday() {
       int weekday;
       // The formatting of the weekday signals the format of the date string.
       int pos = date.indexOf(",", index);
       if (pos == -1) {
         int pos = date.indexOf(" ", index);
         if (pos == -1) throw new HttpException("Invalid HTTP date $date");
         tmp = date.substring(index, pos);
         index = pos + 1;
-        weekday = strict ? wkdays.indexOf(tmp)
-                         : wkdaysLowerCase.indexOf(tmp.toLowerCase());
+        weekday = wkdays.indexOf(tmp);
         if (weekday != -1) {
           format = formatAsctime;
           return weekday;
         }
       } else {
         tmp = date.substring(index, pos);
         index = pos + 1;
-        weekday = strict ? wkdays.indexOf(tmp)
-                         : wkdaysLowerCase.indexOf(tmp.toLowerCase());
+        weekday = wkdays.indexOf(tmp);
         if (weekday != -1) {
           format = formatRfc1123;
           return weekday;
         }
-        weekday = strict ? weekdays.indexOf(tmp)
-                         : weekdaysLowerCase.indexOf(tmp.toLowerCase());
+        weekday = weekdays.indexOf(tmp);
         if (weekday != -1) {
           format = formatRfc850;
           return weekday;
         }
       }
       throw new HttpException("Invalid HTTP date $date");
     }
 
     int expectMonth(String separator) {
       int pos = date.indexOf(separator, index);
       if (pos - index != 3) throw new HttpException("Invalid HTTP date $date");
       tmp = date.substring(index, pos);
       index = pos + 1;
-      int month = strict ? months.indexOf(tmp)
-                         : monthsLowerCase.indexOf(tmp.toLowerCase());
+      int month = months.indexOf(tmp);
       if (month != -1) return month;
       throw new HttpException("Invalid HTTP date $date");
     }
 
     int expectNum(String separator) {
       int pos;
       if (separator.length > 0) {
         pos = date.indexOf(separator, index);
       } else {
         pos = date.length;
@@ skipping 36 matching lines @@
       year = expectNum(" ");
       hours = expectNum(":");
       minutes = expectNum(":");
       seconds = expectNum(" ");
       expect("GMT");
     }
     expectEnd();
     return new Date(
         year, month + 1, day, hours, minutes, seconds, 0, isUtc: true);
   }
+
+  static Date parseCookieDate(String date) {
+    List monthsLowerCase = ["jan", "feb", "mar", "apr", "may", "jun",
+                            "jul", "aug", "sep", "oct", "nov", "dec"];
+
+    int position = 0;
+
+    void error() {
+      throw new HttpException("Invalid HTTP date $date");

[Søren Gjesse, 2012/09/04 06:51:57]

HTTP -> cookie

[Anders Johnsen, 2012/09/04 07:03:13]

Done.

+    }
+
+    bool isEnd() {
+      return position >= date.length;

[Søren Gjesse, 2012/09/04 06:51:57]

Shouldn't this be just ==?

[Anders Johnsen, 2012/09/04 07:03:13]

In theory, yes. I'll change. If we crash without it would expose a bug - better
to actually show that then just ignore.

+    }
+
+    bool isDelimiter(String s) {

[Søren Gjesse, 2012/09/04 06:51:57]

How about passing the index here and use s.charCodeAt(index) instead of creating
single character substrings.

[Anders Johnsen, 2012/09/04 07:03:13]

Keeping, as discussed off-list.

+      int char = s.charCodeAt(0);
+      if (char === 0x09) return true;
+      if (char >= 0x20 && char <= 0x2F) return true;
+      if (char >= 0x3B && char <= 0x40) return true;
+      if (char >= 0x5B && char <= 0x60) return true;
+      if (char >= 0x7B && char <= 0x7E) return true;
+      return false;
+    }
+
+    bool isNonDelimiter(String s) {
+      int char = s.charCodeAt(0);
+      if (char >= 0x00 && char <= 0x08) return true;
+      if (char >= 0x0A && char <= 0x1F) return true;
+      if (char >= 0x30 && char <= 0x39) return true;  // Digit
+      if (char == 0x3A) return true;  // ':'
+      if (char >= 0x41 && char <= 0x5A) return true;  // Alpha
+      if (char >= 0x61 && char <= 0x7A) return true;  // Alpha
+      if (char >= 0x7F && char <= 0xFF) return true;  // Alpha
+      return false;
+    }
+
+    bool isDigit(String s) {
+      int char = s.charCodeAt(0);
+      if (char > 0x2F && char < 0x3A) return true;
+      return false;
+    }
+
+    int getMonth(String month) {
+      if (month.length < 3) return -1;
+      return monthsLowerCase.indexOf(month.substring(0, 3));
+    }
+
+    int toInt(String s) {
+      int index = 0;
+      for (; index < s.length && isDigit(s[index]); index++);
+      return parseInt(s.substring(0, index));
+    }
+
+    var tokens = [];
+    while (!isEnd()) {
+      while (!isEnd() && isDelimiter(date[position])) position++;
+
+      var word = "";
+      while (!isEnd() && isNonDelimiter(date[position])) {

[Søren Gjesse, 2012/09/04 06:51:57]

How about saving position before the loop, just incrementing position in the
loop and making a substring after the loop?

[Anders Johnsen, 2012/09/04 07:03:13]

Done.

+        word = "$word${date[position++]}";
+      }
+      while (!isEnd() && isDelimiter(date[position])) position++;
+      tokens.add(word.toLowerCase());
+    }
+
+    String timeStr;
+    String dayOfMonthStr;
+    String monthStr;
+    String yearStr;
+
+    for (var token in tokens) {
+      if (token.length < 1) return null;

[Søren Gjesse, 2012/09/04 06:51:57]

Shouldn't this be a continue instead of return null?

[Anders Johnsen, 2012/09/04 07:03:13]

That is a very good point! Changed.

+      if (timeStr === null && token.length >= 5 && isDigit(token[0]) &&
+          (token[1] == ":" || (isDigit(token[1]) && token[2] == ":"))) {
+        timeStr = token;
+      } else if (dayOfMonthStr === null && isDigit(token[0])) {
+        dayOfMonthStr = token;
+      } else if (monthStr === null && getMonth(token) >= 0) {
+        monthStr = token;
+      } else if (yearStr === null && token.length >= 2 &&
+                 isDigit(token[0]) && isDigit(token[1])) {
+        yearStr = token;
+      }
+    }
+
+    if (timeStr === null || dayOfMonthStr === null ||
+        monthStr === null || yearStr === null) error();
+
+    int year = toInt(yearStr);
+    if (year >= 70 && year <= 99) year += 1900;
+    else if (year >= 0 && year <= 69) year += 2000;
+    if (year < 1601) error();
+
+    int dayOfMonth = toInt(dayOfMonthStr);
+    if (dayOfMonth < 1 || dayOfMonth > 31) error();
+
+    int month = getMonth(monthStr) + 1;
+
+    var timeList = timeStr.split(":");
+    if (timeList.length !== 3) error();
+    int hour = toInt(timeList[0]);
+    int minute = toInt(timeList[1]);
+    int second = toInt(timeList[2]);
+    if (hour > 23) error();
+    if (minute > 59) error();
+    if (second > 59) error();
+
+    return new Date(year, month, dayOfMonth, hour, minute, second, 0, true);
+  }
 }