Consider the origin when computing extension permissions

chrome/common/extensions/extension_set.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_COMMON_EXTENSIONS_EXTENSION_SET_H_
 #define CHROME_COMMON_EXTENSIONS_EXTENSION_SET_H_
 #pragma once
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/common/extensions/extension.h"
 #include "googleurl/src/gurl.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
 
 // The one true extension container. Extensions are identified by their id.
 // Only one extension can be in the set with a given ID.
 class ExtensionSet {
  public:
   typedef std::pair<FilePath, std::string> ExtensionPathAndDefaultLocale;
   typedef std::map<std::string, scoped_refptr<const Extension> > ExtensionMap;
   typedef ExtensionMap::const_iterator const_iterator;
 
   ExtensionSet();
@@ skipping 11 matching lines @@
 
   // Adds the specified extension to the set. The set becomes an owner. Any
   // previous extension with the same ID is removed.
   void Insert(const scoped_refptr<const Extension>& extension);
 
   // Removes the specified extension.
   void Remove(const std::string& id);
 
   // Returns the extension ID that the given URL is a part of, or empty if
   // none. This includes web URLs that are part of an extension's web extent.
-  std::string GetIdByURL(const GURL& url) const;
+  std::string GetIdByURL(WebKit::WebSecurityOrigin origin,

[Aaron Boodman, 2011/11/30 02:01:31]

What about defining an ExtensionURLInfo struct or something to encapsulate this
weirdness? That would also provide a convenient place to explain why we need it.

[Aaron Boodman, 2011/11/30 02:04:45]

And would at least ensure people think twice when looking up extensions by URL.

[abarth-chromium, 2011/11/30 02:04:49]

Will do.

+                        const GURL& url) const;
 
   // Returns the Extension that the given URL is a part of, or NULL if none.
   // This includes web URLs that are part of an extension's web extent.
   // NOTE: This can return NULL if called before UpdateExtensions receives
   // bulk extension data (e.g. if called from
   // EventBindings::HandleContextCreated)
-  const Extension* GetByURL(const GURL& url) const;
+  const Extension* GetByURL(WebKit::WebSecurityOrigin origin,
+                            const GURL& url) const;
+
+  const Extension* GetByURLWithoutSecurityCheck(const GURL& url) const;

[Aaron Boodman, 2011/11/30 02:01:31]

ExtensionURLInfo could have a constructor that just takes a URL and has a
warning.

 
   // Returns true if |new_url| is in the extent of the same extension as
   // |old_url|.  Also returns true if neither URL is in an app.
   bool InSameExtent(const GURL& old_url, const GURL& new_url) const;
 
   // Look up an Extension object by id.
   const Extension* GetByID(const std::string& id) const;
 
   // Returns true if |url| should get extension api bindings and be permitted
   // to make api calls. Note that this is independent of what extension
   // permissions the given extension has been granted.
-  bool ExtensionBindingsAllowed(const GURL& url) const;
+  bool ExtensionBindingsAllowed(WebKit::WebSecurityOrigin origin,
+                                const GURL& url) const;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(ExtensionSetTest, ExtensionSet);
 
   ExtensionMap extensions_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionSet);
 };
 
 #endif  // CHROME_COMMON_EXTENSIONS_EXTENSION_SET_H_