Supports DevTools socket access authentication based on Android permissions.

chrome/browser/android/dev_tools_server.cc

 // Copyright (c) 2012 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/android/dev_tools_server.h"
 
 #include <pwd.h>
 #include <cstring>
 
 #include "base/android/jni_string.h"
@@ skipping 59 matching lines @@
 const char kTargetTypeOther[] = "other";
 
 static GURL GetFaviconURLForContents(WebContents* web_contents) {
   content::NavigationController& controller = web_contents->GetController();
   content::NavigationEntry* entry = controller.GetActiveEntry();
   if (entry != NULL && entry->GetURL().is_valid())
     return entry->GetFavicon().url;
   return GURL();
 }
 
+bool AuthenticateSocketAccess(pid_t pid, uid_t uid, gid_t gid) {
+  JNIEnv* env = base::android::AttachCurrentThread();
+  return Java_DevToolsServer_checkPermission(env, pid, uid) ||
+         content::CanUserConnectToDevTools(pid, uid, gid);

[byungchul, 2014/08/01 16:45:16]

wrong indentation, 4 whitespaces.

[SeRya, 2014/08/04 10:47:03]

Done.

+}
+
 class TargetBase : public content::DevToolsTarget {
  public:
   // content::DevToolsTarget implementation:
   virtual std::string GetParentId() const OVERRIDE { return std::string(); }
 
   virtual std::string GetTitle() const OVERRIDE { return title_; }
 
   virtual std::string GetDescription() const OVERRIDE { return std::string(); }
 
   virtual GURL GetURL() const OVERRIDE { return url_; }
@@ skipping 274 matching lines @@
   virtual scoped_ptr<net::StreamListenSocket> CreateSocketForTethering(
       net::StreamListenSocket::Delegate* delegate,
       std::string* name) OVERRIDE {
     *name = base::StringPrintf(
         kTetheringSocketName, getpid(), ++last_tethering_socket_);
     return net::deprecated::UnixDomainListenSocket::
         CreateAndListenWithAbstractNamespace(
             *name,
             "",
             delegate,
-            base::Bind(&content::CanUserConnectToDevTools))
+            base::Bind(&AuthenticateSocketAccess))
         .PassAs<net::StreamListenSocket>();
   }
 
  private:
   static void PopulatePageThumbnails() {
     Profile* profile =
         ProfileManager::GetLastUsedProfile()->GetOriginalProfile();
     history::TopSites* top_sites = profile->GetTopSites();
     if (top_sites)
       top_sites->SyncWithHistory();
@@ skipping 35 matching lines @@
 }
 
 void DevToolsServer::Start() {
   if (protocol_handler_)
     return;
 
   protocol_handler_ = content::DevToolsHttpHandler::Start(
       new net::deprecated::UnixDomainListenSocketWithAbstractNamespaceFactory(
           socket_name_,
           base::StringPrintf("%s_%d", socket_name_.c_str(), getpid()),
-          base::Bind(&content::CanUserConnectToDevTools)),
+          base::Bind(&AuthenticateSocketAccess)),
       base::StringPrintf(kFrontEndURL, content::GetWebKitRevision().c_str()),
       new DevToolsServerDelegate(),
       base::FilePath());
 }
 
 void DevToolsServer::Stop() {
   if (!protocol_handler_)
     return;
   // Note that the call to Stop() below takes care of |protocol_handler_|
   // deletion.
@@ skipping 31 matching lines @@
                                       jobject obj,
                                       jlong server,
                                       jboolean enabled) {
   DevToolsServer* devtools_server = reinterpret_cast<DevToolsServer*>(server);
   if (enabled) {
     devtools_server->Start();
   } else {
     devtools_server->Stop();
   }
 }