Allows client to access auth token from command line specified file.

blimp/client/session/assignment_source.cc

 // Copyright 2016 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 "blimp/client/session/assignment_source.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/location.h"
 #include "base/memory/ref_counted.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/task_runner_util.h"
+#include "base/threading/thread_restrictions.h"
 #include "base/values.h"
 #include "blimp/client/app/blimp_client_switches.h"
+#include "blimp/common/get_client_token.h"
 #include "blimp/common/protocol_version.h"
 #include "components/safe_json/safe_json_parser.h"
 #include "net/base/ip_address.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_status_code.h"
 #include "net/proxy/proxy_config_service.h"
 #include "net/proxy/proxy_service.h"
 #include "net/url_request/url_fetcher.h"
@@ skipping 62 matching lines @@
 
 bool IsValidIpPortNumber(unsigned port) {
   return port > 0 && port <= 65535;
 }
 
 // Populates an Assignment using command-line parameters, if provided.
 // Returns a null Assignment if no parameters were set.
 // Must be called on a thread suitable for file IO.
 Assignment GetAssignmentFromCommandLine() {
   Assignment assignment;
-  assignment.client_token = kDummyClientToken;
+
+  const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
+  assignment.client_token = GetClientToken(*cmd_line);
+  CHECK_NE(assignment.client_token, "");

[Kevin M, 2016/05/11 00:39:56]

suggestion:

CHECK(!client_token.empty()) << "No client token provided.";

 
   unsigned port_parsed = 0;
   if (!base::StringToUint(
-          base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-              switches::kEnginePort),
-          &port_parsed) ||
-      !IsValidIpPortNumber(port_parsed)) {
+          cmd_line->GetSwitchValueASCII(switches::kEnginePort),
+          &port_parsed) || !IsValidIpPortNumber(port_parsed)) {
     DLOG(FATAL) << "--engine-port must be a value between 1 and 65535.";
     return Assignment();
   }
 
   net::IPAddress ip_address;
-  std::string ip_str =
-      base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-          switches::kEngineIP);
+  std::string ip_str = cmd_line->GetSwitchValueASCII(switches::kEngineIP);
   if (!ip_address.AssignFromIPLiteral(ip_str)) {
     DLOG(FATAL) << "Invalid engine IP " << ip_str;
     return Assignment();
   }
   assignment.engine_endpoint =
       net::IPEndPoint(ip_address, base::checked_cast<uint16_t>(port_parsed));
 
   std::string transport_str =
-      base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-          switches::kEngineTransport);
+      cmd_line->GetSwitchValueASCII(switches::kEngineTransport);
   if (transport_str == kSSLTransportValue) {
     assignment.transport_protocol = Assignment::TransportProtocol::SSL;
   } else if (transport_str == kTCPTransportValue) {
     assignment.transport_protocol = Assignment::TransportProtocol::TCP;
   } else {
     DLOG(FATAL) << "Invalid engine transport " << transport_str;
     return Assignment();
   }
 
   scoped_refptr<net::X509Certificate> cert;
   if (assignment.transport_protocol == Assignment::TransportProtocol::SSL) {
     base::FilePath cert_path =
-        base::CommandLine::ForCurrentProcess()->GetSwitchValuePath(
-            switches::kEngineCertPath);
+        cmd_line->GetSwitchValuePath(switches::kEngineCertPath);
     if (cert_path.empty()) {
       DLOG(FATAL) << "Missing required parameter --"
                   << switches::kEngineCertPath << ".";
       return Assignment();
     }
     std::string cert_str;
     if (!base::ReadFileToString(cert_path, &cert_str)) {
       DLOG(FATAL) << "Couldn't read from file: "
                   << cert_path.LossyDisplayName();
       return Assignment();
@@ skipping 220 matching lines @@
 }
 
 void AssignmentSource::OnJsonParseError(const std::string& error) {
   DLOG(ERROR) << "Error while parsing assigner JSON: " << error;
   base::ResetAndReturn(&callback_)
       .Run(AssignmentSource::Result::RESULT_BAD_RESPONSE, Assignment());
 }
 
 }  // namespace client
 }  // namespace blimp