Implement web app definition parsing.

chrome/common/web_apps.cc

Index: chrome/common/web_apps.cc
diff --git a/chrome/common/web_apps.cc b/chrome/common/web_apps.cc
new file mode 100644
index 0000000000000000000000000000000000000000..ed5084b86e249e830dd0eef5abb138e84fd2bf78
--- /dev/null
+++ b/chrome/common/web_apps.cc
@@ -0,0 +1,316 @@
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/common/web_apps.h"
+
+#include <string>
+#include <vector>
+
+#include "app/l10n_util.h"
+#include "app/resource_bundle.h"
+#include "base/json/json_reader.h"
+#include "base/string16.h"
+#include "base/string_number_conversions.h"
+#include "base/string_split.h"
+#include "base/utf_string_conversions.h"
+#include "base/values.h"
+#include "chrome/common/json_schema_validator.h"
+#include "gfx/size.h"
+#include "googleurl/src/gurl.h"
+#include "grit/common_resources.h"
+#include "grit/generated_resources.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebDocument.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebElement.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebNode.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebNodeList.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebString.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebURL.h"
+#include "webkit/glue/dom_operations.h"
+
+using WebKit::WebDocument;
+using WebKit::WebElement;
+using WebKit::WebFrame;
+using WebKit::WebNode;
+using WebKit::WebNodeList;
+using WebKit::WebString;
+
+namespace {
+
+// Sizes a single size (the width or height) from a 'sizes' attribute. A size
+// matches must match the following regex: [1-9][0-9]*.
+static int ParseSingleIconSize(const string16& text) {
+  // Size must not start with 0, and be between 0 and 9.
+  if (text.empty() || !(text[0] >= L'1' && text[0] <= L'9'))
+    return 0;

[Erik does not do reviews, 2010/11/15 19:45:36]

the header indicates a size < 0 if it's invalid

[Aaron Boodman, 2010/11/15 19:52:34]

I forgot to mention this in the review, but ParseSingleIconSize, AddInstallIcon,
and AddIconSizes were just moved directly from dom_operations.cc. I just moved
them here for consistency (if ParseWebAppFromDefinitionFile is here, it makes
sense to me that ParseWebAppFromDocument also is).

But we don't actually use any of these functions in the definition file branch.
They are only used in the case where the user selects tools > install as web
app.

[Aaron Boodman, 2010/11/16 03:44:45]

Not my code, but fixed.

+  // Make sure all chars are from 0-9.

[Erik does not do reviews, 2010/11/15 19:45:36]

nit: newline above comment

[Aaron Boodman, 2010/11/16 03:44:45]

Done.

+  for (size_t i = 1; i < text.length(); ++i) {
+    if (!(text[i] >= L'0' && text[i] <= L'9'))
+      return 0;
+  }
+  int output;
+  if (!base::StringToInt(text, &output))
+    return 0;
+  return output;

[Erik does not do reviews, 2010/11/15 19:45:36]

do we want a min/max value for icon sizes?

[Aaron Boodman, 2010/11/16 03:44:45]

<shrug> -- this code is only used by the create application shortcuts feature. I
don't really want to change its behavior in this CL.

+}
+
+void AddInstallIcon(const WebElement& link,
+                    std::vector<WebApplicationInfo::IconInfo>* icons) {
+  WebString href = link.getAttribute("href");
+  if (href.isNull() || href.isEmpty())
+    return;
+
+  // Get complete url.
+  GURL url = link.document().completeURL(href);
+  if (!url.is_valid())
+    return;
+
+  if (!link.hasAttribute("sizes"))
+    return;
+
+  bool is_any = false;
+  std::vector<gfx::Size> icon_sizes;
+  if (!ParseIconSizes(link.getAttribute("sizes"), &icon_sizes, &is_any) ||
+      is_any ||
+      icon_sizes.size() != 1) {

[Erik does not do reviews, 2010/11/15 19:45:36]

so this means we're explicitly not allowing things like .ico files with multiple
sizes?

[Aaron Boodman, 2010/11/16 03:44:45]

Also only used by create application shortcuts feature. To answer the question,
our initial implementation won't support formats like ico that contain multiple
sizes.

+    return;
+  }
+  WebApplicationInfo::IconInfo icon_info;
+  icon_info.width = icon_sizes[0].width();
+  icon_info.height = icon_sizes[0].height();
+  icon_info.url = url;
+  icons->push_back(icon_info);
+}
+
+}
+
+const char WebApplicationInfo::kInvalidDefinitionURL[] =
+    "Invalid application definition URL. Must be a valid relative URL or "
+    "an absolute URL with the same origin as the document.";
+const char WebApplicationInfo::kInvalidLaunchURL[] =
+    "Invalid value for property 'launch_url'. Must be a valid relative URL or "
+    "an absolute URL with the same origin as the application definition.";
+const char WebApplicationInfo::kInvalidURL[] =
+    "Invalid value for property 'urls[*]'. Must be a valid relative URL or "
+    "an absolute URL with the same origin as the application definition.";
+const char WebApplicationInfo::kInvalidIconURL[] =
+    "Invalid value for property 'icons.*'. Must be a valid relative URL or "
+    "an absolute URL with the same origin as the application definition.";
+
+WebApplicationInfo::WebApplicationInfo() {
+}
+
+WebApplicationInfo::~WebApplicationInfo() {
+}
+
+gfx::Size ParseIconSize(const string16& text) {
+  std::vector<string16> sizes;
+  base::SplitStringDontTrim(text, L'x', &sizes);
+  if (sizes.size() != 2)
+    return gfx::Size();
+
+  return gfx::Size(ParseSingleIconSize(sizes[0]),
+                   ParseSingleIconSize(sizes[1]));
+}
+
+bool ParseIconSizes(const string16& text,
+                    std::vector<gfx::Size>* sizes,
+                    bool* is_any) {
+  *is_any = false;
+  std::vector<string16> size_strings;
+  SplitStringAlongWhitespace(text, &size_strings);
+  for (size_t i = 0; i < size_strings.size(); ++i) {
+    if (EqualsASCII(size_strings[i], "any")) {
+      *is_any = true;
+    } else {
+      gfx::Size size = ParseIconSize(size_strings[i]);
+      if (size.width() <= 0 || size.height() <= 0)
+        return false;  // Bogus size.
+      sizes->push_back(size);
+    }
+  }
+  if (*is_any && !sizes->empty()) {
+    // If is_any is true, it must occur by itself.

[Erik does not do reviews, 2010/11/15 19:45:36]

Without displaying error messages to the developer, these errors may wind up
being hard to debug.  Maybe this function should take an error out param?

[Aaron Boodman, 2010/11/16 03:44:45]

This is only used by the create application shortcuts feature. I don't want to
make changes to that functionality in this CL.

+    return false;
+  }
+  return (*is_any || !sizes->empty());
+}
+
+bool ParseWebAppFromWebDocument(WebFrame* frame,
+                                WebApplicationInfo* app_info,
+                                string16* error) {
+  WebDocument document = frame->document();
+  if (document.isNull())
+    return true;
+
+  WebElement head = document.head();
+  if (head.isNull())
+    return true;
+
+  GURL frame_url = frame->url();
+  WebNodeList children = head.childNodes();
+  for (unsigned i = 0; i < children.length(); ++i) {
+    WebNode child = children.item(i);
+    if (!child.isElementNode())
+      continue;
+    WebElement elem = child.to<WebElement>();
+
+    if (elem.hasTagName("link")) {
+      std::string rel = elem.getAttribute("rel").utf8();
+      // "rel" attribute may use either "icon" or "shortcut icon".
+      // see also
+      //   <http://en.wikipedia.org/wiki/Favicon>
+      //   <http://dev.w3.org/html5/spec/Overview.html#rel-icon>
+      if (LowerCaseEqualsASCII(rel, "icon") ||
+          LowerCaseEqualsASCII(rel, "shortcut icon")) {
+        AddInstallIcon(elem, &app_info->icons);
+      } else if (LowerCaseEqualsASCII(rel, "chrome-application-definition")) {
+        std::string definition_url_string(elem.getAttribute("href").utf8());
+        GURL definition_url;
+        if (!(definition_url =
+              frame_url.Resolve(definition_url_string)).is_valid() ||
+            definition_url.GetOrigin() != frame_url.GetOrigin()) {
+          *error = UTF8ToUTF16(WebApplicationInfo::kInvalidDefinitionURL);
+          return false;
+        }
+
+        // If there is a definition file, all attributes come from it.
+        *app_info = WebApplicationInfo();
+        app_info->manifest_url = definition_url;
+        return true;
+      }
+    } else if (elem.hasTagName("meta") && elem.hasAttribute("name")) {
+      std::string name = elem.getAttribute("name").utf8();
+      WebString content = elem.getAttribute("content");
+      if (name == "application-name") {
+        app_info->title = content;
+      } else if (name == "description") {
+        app_info->description = content;
+      } else if (name == "application-url") {
+        std::string url = content.utf8();
+        app_info->app_url = frame_url.is_valid() ?
+            frame_url.Resolve(url) : GURL(url);
+        if (!app_info->app_url.is_valid())
+          app_info->app_url = GURL();
+      }
+    }
+  }
+
+  return true;
+}
+
+bool ParseWebAppFromDefinitionFile(const DictionaryValue& definition,
+                                   WebApplicationInfo* web_app,
+                                   string16* error) {
+  CHECK(web_app->manifest_url.is_valid());
+
+  int error_code = 0;
+  std::string error_message;
+  scoped_ptr<Value> schema(
+      base::JSONReader::ReadAndReturnError(
+          ResourceBundle::GetSharedInstance().GetRawDataResource(
+              IDR_WEB_APP_SCHEMA).as_string(),
+          false,  // disallow trailing comma
+          &error_code,
+          &error_message));
+  CHECK(schema.get())
+      << "Error parsing JSON schema: " << error_code << ": " << error_message;
+  CHECK(schema->IsType(Value::TYPE_DICTIONARY))
+      << "schema root must be dictionary.";
+
+  JSONSchemaValidator validator(static_cast<DictionaryValue*>(schema.get()));
+
+  // We allow extra properties in the schema for easy compat with other systems,
+  // and for forward compat with ourselves.
+  validator.set_default_allow_additional_properties(true);
+
+  if (!validator.Validate(const_cast<DictionaryValue*>(&definition))) {
+    *error = UTF8ToUTF16(
+        validator.errors()[0].path + ": " + validator.errors()[0].message);
+    return false;
+  }
+
+  // Parse launch URL. It must be a valid URL in the same origin as the
+  // manifest.
+  std::string app_url_string;
+  GURL app_url;
+  CHECK(definition.GetString("launch_url", &app_url_string));
+  if (!(app_url = web_app->manifest_url.Resolve(app_url_string)).is_valid() ||
+      app_url.GetOrigin() != web_app->manifest_url.GetOrigin()) {
+    *error = UTF8ToUTF16(WebApplicationInfo::kInvalidLaunchURL);
+    return false;
+  }
+
+  // Parse out the privileges if present.
+  std::vector<std::string> privileges;
+  ListValue* privileges_value = NULL;
+  if (definition.GetList("privileges", &privileges_value)) {
+    for (size_t i = 0; i < privileges_value->GetSize(); ++i) {
+      std::string privilege;
+      CHECK(privileges_value->GetString(i, &privilege));

[Erik does not do reviews, 2010/11/15 19:45:36]

isn't this covered by the schema validation?

[Aaron Boodman, 2010/11/16 03:44:45]

The CHECK is just a quick assertion. I prefer that we crash with a backtrace
rather than end up with bad data persisted forever.

+      privileges.push_back(privilege);
+    }
+  }
+
+  // Parse out the URLs if present.
+  std::vector<GURL> urls;
+  ListValue* urls_value = NULL;
+  if (definition.GetList("urls", &urls_value)) {
+    for (size_t i = 0; i < urls_value->GetSize(); ++i) {
+      std::string url_string;
+      GURL url;
+      CHECK(urls_value->GetString(i, &url_string));

[Erik does not do reviews, 2010/11/15 19:45:36]

again, is this redundant?

+      if (!(url = web_app->manifest_url.Resolve(url_string)).is_valid() ||
+          url.GetOrigin() != web_app->manifest_url.GetOrigin()) {
+        *error = UTF8ToUTF16(
+            JSONSchemaValidator::FormatErrorMessage(
+                WebApplicationInfo::kInvalidURL, base::UintToString(i)));
+        return false;
+      }
+      urls.push_back(url);
+    }
+  }
+
+  // Parse out the icons if present.
+  std::vector<WebApplicationInfo::IconInfo> icons;
+  DictionaryValue* icons_value = NULL;
+  if (definition.GetDictionary("icons", &icons_value)) {
+    for (DictionaryValue::key_iterator iter = icons_value->begin_keys();
+         iter != icons_value->end_keys(); ++iter) {
+      // Ignore unknown properties. Better for forward compat.
+      int size = 0;
+      if (!base::StringToInt(*iter, &size) || size < 0 || size > 128)

[Erik does not do reviews, 2010/11/15 19:45:36]

128 seems too small as a max.  512 is pretty standard as a large size (e.g.
apple and win7).  Also, it looks like this restriction isn't put on the link
rel=icon tag.

[Aaron Boodman, 2010/11/16 03:44:45]

The extension system doesn't currently support any larger than 128, so I thought
it did not make sense to download any sizes larger than that. Do you think that
we should, just so that we have them for future applications..? That would
require some other changes in extensions land.

[Erik does not do reviews, 2010/11/16 23:43:02]

I forgot that we had that hard-coded.  I'll file a separate bug for supporting
512 icons in the extensions system.

+        continue;
+
+      std::string icon_url_string;
+      GURL icon_url;
+      if (!icons_value->GetString(*iter, &icon_url_string) ||
+          !(icon_url = web_app->manifest_url.Resolve(
+              icon_url_string)).is_valid()) {
+        *error = UTF8ToUTF16(
+            JSONSchemaValidator::FormatErrorMessage(
+                WebApplicationInfo::kInvalidIconURL, base::IntToString(size)));
+        return false;
+      }
+
+      WebApplicationInfo::IconInfo icon;
+      icon.url = icon_url;
+      icon.width = size;
+      icon.height = size;
+
+      icons.push_back(icon);
+    }
+  }
+
+  CHECK(definition.GetString("name", &web_app->title));
+  definition.GetString("description", &web_app->description);
+  definition.GetString("launch_container", &web_app->launch_container);
+  web_app->app_url = app_url;
+  web_app->urls = urls;
+  web_app->privileges = privileges;
+  web_app->icons = icons;
+
+  return true;
+
+}