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

remoting/client/client_util.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 "remoting/client/client_util.h"
 
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/string_util.h"
+#include "remoting/base/constants.h"
 #include "remoting/client/client_config.h"
 
 using std::string;
 using std::vector;
 
 namespace remoting {
 
 // Get host JID from command line arguments, or stdin if not specified.
 bool GetLoginInfoFromArgs(int argc, char** argv, ClientConfig* config) {
   bool found_host_jid = false;
   bool found_jid = false;
   bool found_auth_token = false;
   string host_jid;
   string username;
   string auth_token;
+  string auth_service(kChromotingTokenDefaultServiceName);
 
   for (int i = 1; i < argc; i++) {
     std::string arg = argv[i];
     if (arg == "--host_jid") {
       if (++i >= argc) {
         LOG(WARNING) << "Expected Host JID to follow --host_jid option";
       } else {
         found_host_jid = true;
         host_jid = argv[i];
       }
     } else if (arg == "--jid") {
       if (++i >= argc) {
         LOG(WARNING) << "Expected JID to follow --jid option";
       } else {
         found_jid = true;
         username = argv[i];
       }
     } else if (arg == "--token") {
       if (++i >= argc) {
         LOG(WARNING) << "Expected Auth token to follow --token option";
       } else {
         found_auth_token = true;
         auth_token = argv[i];
       }
+    } else if (arg == "--service") {

[Jamie, 2011/05/25 17:04:52]

Would it be more consistent to use the colon-separated form as the value for
--token?

Actually, come to think of it, why are we using a colon-separated string anyway?
Why not specify the service as a separate parameter in the connect() API as
well?

[awong, 2011/05/25 18:00:02]

Yes...I just wasn't clear on what script might be using this, etc.  So I didn't
want to change the existing API yet.
 
I thought about it, but decided that since we hadn't really settled on a plan
for the connect() API call, to do it this way for now.  This maintains backwards
compat for the time being.

+      if (++i >= argc) {
+        LOG(WARNING) << "Expected service name to follow --service option";
+      } else {
+        auth_service = argv[i];
+      }
     } else {
       LOG(WARNING) << "Unrecognized option: " << arg;
     }
   }
 
   if (!found_host_jid)
     return false;
 
   // Validate the chromoting host JID.
   if ((host_jid.find("/chromoting") == std::string::npos) || !found_jid ||
       !found_auth_token)
     return false;
 
   NOTIMPLEMENTED() << "Nonce ignored.";
 
   config->host_jid = host_jid;
   config->username = username;
   config->auth_token = auth_token;
+  config->auth_service = auth_service;
   return true;
 }
 
 }  // namespace remoting