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 <openssl/curve25519.h>

[davidben, 2016/01/11 20:18:57]

Nit: I believe this should be

#include <openssl/curve25519.h>

#include <vector>

since it's a C header. (Actually, I want to switch us to including BoringSSL
headers as #include "third_party/blah", but I'll do that separately.)

[iclelland, 2016/01/12 14:52:49]

Thanks, done.
(Yeah, I tried that, but DEPS said no. :( )

[davidben, 2016/01/13 20:50:39]

Yeah, part of my motivation for switching it to the other one is so we can
actually start putting third_party/boringssl into DEPS files. Right now it just
doesn't enforce anything because it thinks it's a system header.

(Not as something for you to do now. This is a thing that's in my queue.)

[iclelland, 2016/01/13 21:30:11]

Acknowledged.

 
 #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 {
 
+// This is the default public key used for validating signatures.
+// TODO(iclelland): Move this to the embedder, and provide a mechanism to allow
+// for multiple signing keys. https://crbug.com/543220
+static const uint8_t kPublicKey[] = {
+    0x7c, 0xc4, 0xb8, 0x9a, 0x93, 0xba, 0x6e, 0xe2, 0xd0, 0xfd, 0x03,
+    0x1d, 0xfb, 0x32, 0x66, 0xc7, 0x3b, 0x72, 0xfd, 0x54, 0x3a, 0x07,
+    0x51, 0x14, 0x66, 0xaa, 0x02, 0x53, 0x4e, 0x33, 0xa1, 0x15,
+};
+
 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 27 matching lines @@
       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);
+  return ValidateDate(now) && ValidateSignature(kPublicKey);
 }
 
 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;
 }
 
+bool ApiKey::ValidateSignature(const uint8_t* public_key) const {
+  return ValidateSignature(signature_, data_, public_key);
+}
+
+// static
+bool ApiKey::ValidateSignature(const std::string& signature_text,
+                               const std::string& data,
+                               const uint8_t* public_key) {
+  std::string signature;
+  // signature is base64-encoded
+  if (!base::Base64Decode(signature_text, &signature)) {
+    return false;
+  }
+
+  // TODO: verify signature length is 64

[davidben, 2016/01/11 20:18:57]

That seems pretty important to do. Otherwise you'll read past the end of some
buffer. :-)

[iclelland, 2016/01/12 14:52:49]

Done.

+  int result = ED25519_verify(
+      reinterpret_cast<const uint8_t*>(data.data()), data.length(),
+      reinterpret_cast<const uint8_t*>(signature.data()), public_key);
+  return (result != 0);
+}
+
 }  // namespace content