Make rawdatastore API safer for writing filters.

service/rawdatastore/datastore_key.go

 // 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.
 
 // adapted from github.com/golang/appengine/datastore
 
 package rawdatastore
 
 import (
         "bytes"
@@ skipping 102 matching lines @@
         return
 }
 
 // KeyIncomplete returns true iff k doesn't have an id yet.
 func KeyIncomplete(k Key) bool {
         return k != nil && k.StringID() == "" && k.IntID() == 0
 }
 
 // KeyValid determines if a key is valid, according to a couple rules:
 //   - k is not nil
-//   - k's namespace matches ns
 //   - every token of k:
 //     - (if !allowSpecial) token's kind doesn't start with '__'
 //     - token's kind and appid are non-blank
 //     - token is not incomplete
 //   - all tokens have the same namespace and appid
-func KeyValid(k Key, ns string, allowSpecial bool) bool {
+func KeyValid(k Key, allowSpecial bool, aid, ns string) bool {
         if k == nil {
                 return false
         }
-        // since we do "client-side" validation of namespaces in local
-        // implementations, it's convenient to check this here.
-        if k.Namespace() != ns {
+        if aid != k.AppID() || ns != k.Namespace() {
                 return false
         }
         for ; k != nil; k = k.Parent() {
                 if !allowSpecial && len(k.Kind()) >= 2 && k.Kind()[:2] == "__" {
                         return false
                 }
                 if k.Kind() == "" || k.AppID() == "" {
                         return false
                 }
                 if k.StringID() != "" && k.IntID() != 0 {
@@ skipping 80 matching lines @@
         for i := k; i != nil; i = i.Parent() {
                 n--
                 toks[n].IntID = i.IntID()
                 toks[n].StringID = i.StringID()
                 toks[n].Kind = i.Kind()
         }
         appID = k.AppID()
         namespace = k.Namespace()
         return
 }