Add public key and signature verification to browser-side API keys

content/common/experiments/api_key.cc

 // Copyright 2015 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 "content/common/experiments/api_key.h"
 
 #include <vector>
 
 #include "base/base64.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "url/origin.h"
 
 namespace content {
 
 namespace {
 
 const char* kApiKeyFieldSeparator = "|";
-}
+
+}  // namespace
 
 ApiKey::~ApiKey() {}
 
 scoped_ptr<ApiKey> ApiKey::Parse(const std::string& key_text) {
   if (key_text.empty()) {
     return nullptr;
   }
 
   // API Key should resemble:
   // signature|origin|api_name|expiry_timestamp
+  // TODO(iclelland): Add version code to API key format to identify key algo
+  // https://crbug.com/570684
   std::vector<std::string> parts =
       SplitString(key_text, kApiKeyFieldSeparator, base::KEEP_WHITESPACE,
                   base::SPLIT_WANT_ALL);
   if (parts.size() != 4) {
     return nullptr;
   }
 
   const std::string& signature = parts[0];
   const std::string& origin_string = parts[1];
   const std::string& api_name = parts[2];
@@ skipping 26 matching lines @@
       data_(data),
       origin_(origin),
       api_name_(api_name),
       expiry_timestamp_(expiry_timestamp) {}
 
 bool ApiKey::IsAppropriate(const std::string& origin,
                            const std::string& api_name) const {
   return ValidateOrigin(origin) && ValidateApiName(api_name);
 }
 
-bool ApiKey::IsValid(const base::Time& now) const {
-  // TODO(iclelland): Validate signature on key data here as well.
-  // https://crbug.com/543215
-  return ValidateDate(now);
-}
-
 bool ApiKey::ValidateOrigin(const std::string& origin) const {
   return GURL(origin) == origin_;
 }
 
 bool ApiKey::ValidateApiName(const std::string& api_name) const {
   return base::EqualsCaseInsensitiveASCII(api_name, api_name_);
 }
 
 bool ApiKey::ValidateDate(const base::Time& now) const {
   base::Time expiry_time = base::Time::FromDoubleT((double)expiry_timestamp_);
   return expiry_time > now;
 }
 
 }  // namespace content