Implement PreauthorizePermission

android_webview/native/permission/permission_request_handler.cc

 // Copyright 2014 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 "android_webview/native/permission/permission_request_handler.h"
 
 #include "android_webview/native/permission/aw_permission_request.h"
 #include "android_webview/native/permission/aw_permission_request_delegate.h"
 #include "android_webview/native/permission/permission_request_handler_client.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/bind.h"
 
 using base::android::ScopedJavaLocalRef;
 
 namespace android_webview {
 
 PermissionRequestHandler::PermissionRequestHandler(
     PermissionRequestHandlerClient* client)
     : client_(client) {
 }
 
 PermissionRequestHandler::~PermissionRequestHandler() {
   for (RequestIterator i = requests_.begin(); i != requests_.end(); ++i)
     CancelRequest(i);
 }
 
 void PermissionRequestHandler::SendRequest(
     scoped_ptr<AwPermissionRequestDelegate> request) {
+  if (Preauthorized(request->GetOrigin(), request->GetResources())) {
+    request->NotifyRequestResult(true);
+    return;
+  }

[michaelbai, 2014/05/06 23:09:50]

Note, the all resources will passed to permission callback even if requested
resources are partially preauthorized,  

+
   AwPermissionRequest* aw_request = new AwPermissionRequest(request.Pass());
   requests_.push_back(
       base::WeakPtr<AwPermissionRequest>(aw_request->GetWeakPtr()));
   client_->OnPermissionRequest(aw_request);
   PruneRequests();
 }
 
 void PermissionRequestHandler::CancelRequest(const GURL& origin,
                                              int64 resources) {
   // The request list might have multiple requests with same origin and
   // resources.
   RequestIterator i = FindRequest(origin, resources);
   while (i != requests_.end()) {
     CancelRequest(i);
     requests_.erase(i);
     i = FindRequest(origin, resources);
   }
 }
 
+void PermissionRequestHandler::PreauthorizePermission(const GURL& origin,
+                                                      int64 resources) {
+  if (!resources)
+    return;
+
+  std::string key = origin.GetOrigin().spec();
+  if (key.empty())

[mkosiba (inactive), 2014/05/07 17:25:50]

ok, so if we get here the user managed to create a Uri that GURL doesn't like. I
think we should LOG(ERROR). Experience shows that silently dropping things on
the floor leads to very unhappy developers.

[michaelbai, 2014/05/07 19:22:25]

Done.

+    return;
+
+  preauthorized_permission_[key] |= resources;

[benm (inactive), 2014/05/07 17:01:21]

I think you need to initialise this mapped value in the case that they key
doesn't exist yet?

[michaelbai, 2014/05/07 19:22:25]

In this case, the default value is 0, we can use it directly.

On 2014/05/07 17:01:21, benm wrote:

+}
+
 PermissionRequestHandler::RequestIterator
 PermissionRequestHandler::FindRequest(const GURL& origin,
                                       int64 resources) {
   RequestIterator i;
   for (i = requests_.begin(); i != requests_.end(); ++i) {
     if (i->get() && i->get()->GetOrigin() == origin &&
         i->get()->GetResources() == resources) {
       break;
     }
   }
@@ skipping 12 matching lines @@
 
 void PermissionRequestHandler::PruneRequests() {
   for (RequestIterator i = requests_.begin(); i != requests_.end();) {
     if (!i->get())
       i = requests_.erase(i);
     else
       ++i;
   }
 }
 
+bool PermissionRequestHandler::Preauthorized(const GURL& origin,
+                                              int64 resources) {
+  std::map<std::string, int64>::iterator i =
+      preauthorized_permission_.find(origin.GetOrigin().spec());

[mkosiba (inactive), 2014/05/07 17:25:50]

I'm paranoid so I'd suggest doing the same thing you do in line 58:

std::string key = ...
if (key.empty())
  return false;

[michaelbai, 2014/05/07 19:22:25]

I would like to make you happy, but I need to check whether the value is found
anyway, I'd prefer not to check key here :)


On 2014/05/07 17:25:50, mkosiba wrote:

+  return (resources & i->second) == resources;

[mkosiba (inactive), 2014/05/07 17:25:50]

what if we don't find the origin in the map? you'll reference uninitialized
memory

[michaelbai, 2014/05/07 19:22:25]

Oops, I were checking it there, it was removed with log by accident.


On 2014/05/07 17:25:50, mkosiba wrote:

+}
+
 }  // namespace android_webivew