diff options
author | idanan@chromium.org <idanan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-23 18:02:23 +0000 |
---|---|---|
committer | idanan@chromium.org <idanan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-23 18:02:23 +0000 |
commit | eaadd905fd0d3e3e0496f229a5aaa3e3982002a4 (patch) | |
tree | 7174b1009f01eb2ee982c1d834c4d052ff916904 /chrome/browser/privacy_blacklist | |
parent | c86d472e35440254cf860f40c40aaaf45992bfdc (diff) | |
download | chromium_src-eaadd905fd0d3e3e0496f229a5aaa3e3982002a4.zip chromium_src-eaadd905fd0d3e3e0496f229a5aaa3e3982002a4.tar.gz chromium_src-eaadd905fd0d3e3e0496f229a5aaa3e3982002a4.tar.bz2 |
Privacy Blacklist SketelonAdded code hooks to serve as place holders for the implementationof the privacy blacklist. The --privacy-blacklist option was addedwhich will eventually is used to activate the code.This is work-in-progress code which effectively makes a couple morepointer-checks when the --privacy-blacklist is not specified. Whenit is specified, some of the blacklist code is executed but theblacklist is always empty and therefore has no impact on browsing.
BUG=none
TEST=Blacklist*
Review URL: http://codereview.chromium.org/119313
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19033 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/privacy_blacklist')
-rw-r--r-- | chrome/browser/privacy_blacklist/blacklist.cc | 72 | ||||
-rw-r--r-- | chrome/browser/privacy_blacklist/blacklist.h | 130 | ||||
-rw-r--r-- | chrome/browser/privacy_blacklist/blacklist_unittest.cc | 29 |
3 files changed, 231 insertions, 0 deletions
diff --git a/chrome/browser/privacy_blacklist/blacklist.cc b/chrome/browser/privacy_blacklist/blacklist.cc new file mode 100644 index 0000000..8b575a8 --- /dev/null +++ b/chrome/browser/privacy_blacklist/blacklist.cc @@ -0,0 +1,72 @@ +// Copyright (c) 2009 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/privacy_blacklist/blacklist.h" + +#include <algorithm> +#include <string> + +namespace { + +bool matches(std::string pattern, std::string url) { + return url.find(pattern) != std::string::npos; +} + +} + +// Value is not important, here just that the object has an address. +const void* const Blacklist::kRequestDataKey = 0; + +bool Blacklist::Entry::MatchType(const std::string& type) const { + return std::find(types_->begin(), types_->end(), type) != types_->end(); +} + +bool Blacklist::Entry::IsBlocked(const GURL& url) const { + return (attributes_ & kBlockAll) || + ((attributes_ & kBlockUnsecure) && !url.SchemeIsSecure()); +} + +Blacklist::Entry::Entry(const std::string& pattern, unsigned int attributes) + : pattern_(pattern), attributes_(attributes) {} + +void Blacklist::Entry::AddType(const std::string& type) { + types_->push_back(type); +} + +Blacklist::Blacklist(const FilePath& file) { + // TODO(idanan): Do something here. +} + +Blacklist::~Blacklist() { + for (std::vector<Entry*>::iterator i = blacklist_.begin(); + i != blacklist_.end(); ++i) + delete *i; +} + +// Returns a pointer to the Blacklist-owned entry which matches the given +// URL. If no matching Entry is found, returns null. +const Blacklist::Entry* Blacklist::findMatch(const GURL& url) const { + for (std::vector<Entry*>::const_iterator i = blacklist_.begin(); + i != blacklist_.end(); ++i) + if (matches((*i)->pattern(), url.spec())) + return *i; + return 0; +} + +std::string Blacklist::StripCookies(const std::string& header) { + // TODO(idanan): Implement this. + return header; +} + +std::string Blacklist::StripCookieExpiry(const std::string& cookie) { + std::string::size_type start = cookie.find("; expires="); + if (start != std::string::npos) { + std::string::size_type finish = cookie.find(";", start+1); + std::string session_cookie(cookie, 0, start); + if (finish != std::string::npos) + session_cookie.append(cookie.substr(finish)); + return session_cookie; + } + return cookie; +} diff --git a/chrome/browser/privacy_blacklist/blacklist.h b/chrome/browser/privacy_blacklist/blacklist.h new file mode 100644 index 0000000..f3f49ea --- /dev/null +++ b/chrome/browser/privacy_blacklist/blacklist.h @@ -0,0 +1,130 @@ +// Copyright (c) 2009 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_BROWSER_PRIVACY_BLACKLIST_BLACKLIST_H_ +#define CHROME_BROWSER_PRIVACY_BLACKLIST_BLACKLIST_H_ + +#include <string> +#include <vector> + +#include "base/basictypes.h" +#include "base/scoped_ptr.h" +#include "googleurl/src/gurl.h" +#include "net/url_request/url_request.h" + +class FilePath; + +//////////////////////////////////////////////////////////////////////////////// +// +// Blacklist Class +// +// Represents a blacklist used to protect user from privacy and annoyances. +// A blacklist is essentially a map from resource-match patterns to filter- +// attributes. Each time a resources matches a pattern the filter-attributes +// are used to determine how the browser handles the matching resource. +// +// TODO(idanan): Implement this efficiently. +// To get things started, the initial implementation is as simple as +// it gets and cannot scale to large blacklists but it should be enough +// for testing on the order of a hundred or so entries. +// +//////////////////////////////////////////////////////////////////////////////// +class Blacklist { + public: + // Filter attributes (more to come): + static const unsigned int kBlockAll = 1; + static const unsigned int kDontSendCookies = 1 << 1; + static const unsigned int kDontStoreCookies = 1 << 2; + static const unsigned int kDontPersistCookies = 1 << 3; + static const unsigned int kDontSendReferrer = 1 << 4; + static const unsigned int kDontSendUserAgent = 1 << 5; + static const unsigned int kBlockByType = 1 << 6; + static const unsigned int kBlockUnsecure = 1 << 7; + + // Aggregate filter types: + static const unsigned int kBlockRequest = kBlockAll | kBlockUnsecure; + static const unsigned int kBlockResponse = kBlockByType; + static const unsigned int kModifySentHeaders = + kDontSendCookies | kDontSendUserAgent | kDontSendReferrer; + static const unsigned int kModifyReceivedHeaders = + kDontPersistCookies | kDontStoreCookies; + static const unsigned int kFilterByHeaders = kModifyReceivedHeaders | + kBlockByType; + + // Key used to access data attached to URLRequest objects. + static const void* const kRequestDataKey; + + // A single blacklist entry which is returned when a URL matches one of + // the patterns. Entry objects are owned by the Blacklist that stores them. + class Entry { + public: + // Returns the pattern which this entry matches. + const std::string& pattern() const { return pattern_; } + + // Bitfield of filter-attributes matching the pattern. + unsigned int attributes() const { return attributes_; } + + // Returns true if the given type matches one of the types for which + // the filter-attributes of this pattern apply. This needs only to be + // checked for content-type specific rules, as determined by calling + // attributes(). + bool MatchType(const std::string&) const; + + // Returns true of the given URL is blocked, assumes it matches the + // pattern of this entry. + bool IsBlocked(const GURL&) const; + + private: + Entry(const std::string& pattern, unsigned int attributes); + void AddType(const std::string& type); + + std::string pattern_; + unsigned int attributes_; + scoped_ptr< std::vector<std::string> > types_; + + friend class Blacklist; // Only Blacklist can create an entry. + }; + + // When a request matches a Blacklist rule but the rule must be applied + // after the request has started, we tag it with this user data to + // avoid doing lookups more than once per request. The Entry is owned + // be the blacklist, so this indirection makes sure that it does not + // get destroyed by the Blacklist. + class RequestData : public URLRequest::UserData { + public: + explicit RequestData(const Entry* entry) : entry_(entry) {} + const Entry* entry() const { return entry_; } + private: + const Entry* const entry_; + }; + + // Constructs a Blacklist given the filename of the persistent version. + // + // For startup efficiency, and because the blacklist must be available + // before any http request is made (including the homepage, if one is + // set to be loaded at startup), it is important to load the blacklist + // from a local source as efficiently as possible. For this reason, the + // combined rules from all active blacklists are stored in one local file. + explicit Blacklist(const FilePath& path); + + // Destructor. + ~Blacklist(); + + // Returns a pointer to the Blacklist-owned entry which matches the given + // URL. If no matching Entry is found, returns null. + const Entry* findMatch(const GURL&) const; + + // Helper to remove cookies from a header. + static std::string StripCookies(const std::string&); + + // Helper to remove cookie expiration from a header. + static std::string StripCookieExpiry(const std::string&); + + private: + std::vector<Entry*> blacklist_; + + DISALLOW_COPY_AND_ASSIGN(Blacklist); +}; + +#endif diff --git a/chrome/browser/privacy_blacklist/blacklist_unittest.cc b/chrome/browser/privacy_blacklist/blacklist_unittest.cc new file mode 100644 index 0000000..ad363ad --- /dev/null +++ b/chrome/browser/privacy_blacklist/blacklist_unittest.cc @@ -0,0 +1,29 @@ +// Copyright (c) 2009 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/privacy_blacklist/blacklist.h" +#include "base/file_path.h" +#include "testing/gtest/include/gtest/gtest.h" + +TEST(BlacklistTest, Generic) { + FilePath path; + Blacklist blacklist(path); + + // Empty blacklist should not match any URL. + EXPECT_FALSE(blacklist.findMatch(GURL())); + EXPECT_FALSE(blacklist.findMatch(GURL("http://www.google.com"))); + + std::string cookie1( + "PREF=ID=14a549990453e42a:TM=1245183232:LM=1245183232:S=Occ7khRVIEE36Ao5;" + " expires=Thu, 16-Jun-2011 20:13:52 GMT; path=/; domain=.google.com"); + std::string cookie2( + "PREF=ID=14a549990453e42a:TM=1245183232:LM=1245183232:S=Occ7khRVIEE36Ao5;" + " path=/; domain=.google.com"); + + // No expiry, should be equal to itself after stripping. + EXPECT_TRUE(cookie2 == Blacklist::StripCookieExpiry(cookie2)); + + // Expiry, should be equal to non-expiry version after stripping. + EXPECT_TRUE(cookie2 == Blacklist::StripCookieExpiry(cookie1)); +} |