Handle paths and ports in verified domains in inline install.

chrome/browser/extensions/webstore_inline_installer.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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/browser/extensions/webstore_inline_installer.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_install_dialog.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_utility_messages.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/url_pattern.h"
+#include "chrome/common/url_constants.h"
 #include "content/browser/utility_process_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_fetcher.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_request_status.h"
 
 using content::BrowserThread;
 using content::OpenURLParams;
 using content::WebContents;
@@ skipping 264 matching lines @@
   // Verified site is required
   if (webstore_data->HasKey(kVerifiedSiteKey)) {
     std::string verified_site_domain;
     if (!webstore_data->GetString(kVerifiedSiteKey, &verified_site_domain)) {
       CompleteInstall(kInvalidWebstoreResponseError);
       return;
     }
 
     URLPattern verified_site_pattern(URLPattern::SCHEME_ALL);
     verified_site_pattern.SetScheme("*");
-    verified_site_pattern.SetHost(verified_site_domain);

[jstritar, 2012/01/23 21:37:28]

URLPattern already handles a lot of this if you use Parse. Maybe something like
this?

if (success != verified_site_pattern.Parse(StringPrintF("http://*.%s/*",
domain)))
  error
verified_site_pattern.SetScheme("*")

[Mihai Parparita -not on Chrome, 2012/01/25 00:53:24]

Yeah, that ended up being easier, especially since it turned out that verified
sites can have paths too.

Also added a unit test for this, since that was much easier than additional
browser tests.

+    // Verified domains can have ports, so we have to parse them out.
+    size_t host_end_pos = verified_site_domain.find(':');
+    if (host_end_pos == std::string::npos) {
+      verified_site_pattern.SetHost(verified_site_domain);
+    } else {
+      std::string verified_site_port =
+          verified_site_domain.substr(host_end_pos + 1);
+      // We temporarily set the scheme to be HTTP, since URLPattern doesn't
+      // allow specific ports unless the scheme has a default port.

[jstritar, 2012/01/23 21:37:28]

Hm, strange, is this a bug?

[Mihai Parparita -not on Chrome, 2012/01/25 00:53:24]

It appears to be intentional behavior (see IsValidPortForScheme in
url_pattern.cc).

+      verified_site_pattern.SetScheme(chrome::kHttpScheme);
+      if (!verified_site_pattern.SetPort(verified_site_port)) {
+        CompleteInstall(kInvalidWebstoreResponseError);
+        return;
+      }
+      verified_site_pattern.SetScheme("*");
+      verified_site_pattern.SetHost(
+          verified_site_domain.substr(0, host_end_pos));
+    }
     verified_site_pattern.SetMatchSubdomains(true);
     verified_site_pattern.SetPath("/*");
 
     if (!verified_site_pattern.MatchesURL(requestor_url_)) {
       CompleteInstall(kNotFromVerifiedSiteError);
       return;
     }
   } else {
     CompleteInstall(kNoVerifiedSiteError);
     return;
@@ skipping 114 matching lines @@
   if (web_contents()) {
     if (error.empty()) {
       delegate_->OnInlineInstallSuccess(install_id_);
     } else {
       delegate_->OnInlineInstallFailure(install_id_, error);
     }
   }
 
   Release(); // Matches the AddRef in BeginInstall.
 }