Wire in OAuth2 support into non-sandboxed connections in libjingle.

remoting/host/host_plugin.cc

 // Copyright (c) 2011 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 <stdio.h>
 #include <string.h>
 
 #include <string>
 #include <vector>
 
 #include "base/at_exit.h"
 #include "base/base_paths.h"
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/rand_util.h"
 #include "base/stringize_macros.h"
 #include "base/task.h"
 #include "base/threading/platform_thread.h"
 #include "base/threading/thread.h"
 #if defined(OS_MACOSX)
 #include "base/mac/foundation_util.h"
 #endif
 #include "media/base/media.h"
+#include "remoting/base/auth_token_util.h"
 #include "remoting/host/chromoting_host.h"
 #include "remoting/host/chromoting_host_context.h"
 #include "remoting/host/host_config.h"
 #include "remoting/host/host_key_pair.h"
 #include "remoting/host/in_memory_host_config.h"
 #include "remoting/host/register_support_host_request.h"
 #include "remoting/host/support_access_verifier.h"
 #include "third_party/npapi/bindings/npapi.h"
 #include "third_party/npapi/bindings/npfunctions.h"
 #include "third_party/npapi/bindings/npruntime.h"
@@ skipping 13 matching lines @@
      DISCONNECTED,
      REQUESTED_ACCESS_CODE,
      RECEIVED_ACCESS_CODE,
      CONNECTED,
      AFFIRMING_CONNECTION,
      ERROR,
  }
 
  attribute Function void onStateChanged();
 
- void connect(string uid, string auth_token);
+ // The |auth_service_with_token| parametershould be in the format
+ // "auth_service:auth_token".  An example would be "oauth2:1/2a3912vd".
+ void connect(string uid, string auth_service_with_token);
  void disconnect();
 */
 
 namespace {
 
 // Global netscape functions initialized in NP_Initialize.
 NPNetscapeFuncs* g_npnetscape_funcs = NULL;
 
 // The name and description are returned by GetValue, but are also
 // combined with the MIME type to satisfy GetMIMEDescription, so we
@@ skipping 309 matching lines @@
     SetException("connect: bad number of arguments");
     return false;
   }
 
   std::string uid = StringFromNPVariant(args[0]);
   if (uid.empty()) {
     SetException("connect: bad uid argument");
     return false;
   }
 
-  std::string auth_token = StringFromNPVariant(args[1]);
+  std::string auth_service_with_token = StringFromNPVariant(args[1]);
+  std::string auth_token;
+  std::string auth_service;
+  remoting::ParseAuthTokenWithService(auth_service_with_token, &auth_token,
+                                      &auth_service);
   if (auth_token.empty()) {
-    SetException("connect: bad auth_token argument");
+    SetException("connect: auth_service_with_token argument has empty token");
     return false;
   }
 
   // TODO(wez): Load the media libraries to get the VP8 encoder.
   // This won't be needed once we link libvpx in statically.
   FilePath media_path;
 #if defined(OS_MACOSX)
   // MainAppBundlePath returns the Chromium Helper bundle, which in dev builds
   // sits alongside the Framework bundle, which contains the Libraries we need.
   media_path = base::mac::MainAppBundlePath();
@@ skipping 11 matching lines @@
   if (!media::InitializeMediaLibrary(media_path)) {
     SetException("Failed to load media library");
     return false;
   }
 
   // Store the supplied user ID and token to the Host configuration.
   scoped_refptr<remoting::MutableHostConfig> host_config =
       new remoting::InMemoryHostConfig;
   host_config->SetString(remoting::kXmppLoginConfigPath, uid);
   host_config->SetString(remoting::kXmppAuthTokenConfigPath, auth_token);
+  host_config->SetString(remoting::kXmppAuthServiceConfigPath, auth_service);
 
   // Create an access verifier and fetch the host secret.
   scoped_ptr<remoting::SupportAccessVerifier> access_verifier;
   access_verifier.reset(new remoting::SupportAccessVerifier);
   if (!access_verifier->Init()) {
     SetException("connect: SupportAccessVerifier::Init failed");
     return false;
   }
 
   // Generate a key pair for the Host to use.
@@ skipping 504 matching lines @@
   return STRINGIZE(HOST_PLUGIN_MIME_TYPE) ":"
       HOST_PLUGIN_NAME ":"
       HOST_PLUGIN_DESCRIPTION;
 }
 
 OSCALL NPError NP_GetValue(void* npp, NPPVariable variable, void* value) {
   return GetValue((NPP)npp, variable, value);
 }
 
 }  // extern "C"