commit f4dd2faedc467ebe4d37bb21e54dc1afcc4c3bda
author Yves Arrouye <drcrash@google.com> Sun Dec 10 21:49:24 2017
committer chrome-bot <chrome-bot@chromium.org> Wed Dec 13 00:21:35 2017
tree 977f6c1f728023aa1488a8276374b12e0bf7d8ff
parent 28539714c316e47a3040777eeaaced1d5e9a7024

attestation: add a command line switch to specify the VA servers

One can use --va_server=default|test to specify the VA servers to use
when signing enterprise challenges.

BUG=chromium:793122
TEST=manual

Change-Id: I6d3651011e944621f44786505b3ff93fd9b836d3
Reviewed-on: https://chromium-review.googlesource.com/818633
Commit-Ready: Yves Arrouye <drcrash@chromium.org>
Tested-by: Yves Arrouye <drcrash@chromium.org>
Reviewed-by: Andrey Pronin <apronin@chromium.org>

attestation/client/main.cc

diff --git a/attestation/client/main.cc b/attestation/client/main.cc
index 2439eef..93d3cdd 100644
--- a/attestation/client/main.cc
+++ b/attestation/client/main.cc
@@ -117,9 +117,9 @@
   finish_cert_request [--user=<user>] [--label=<label>] --input=<input_file>
       Finishes certificate request for |user| using CA response from
       |input_file|, and stores it in the key with the specified |label|.
-  sign_challenge [--enterprise] [--user=<user>] [--label=<label>]
-          [--domain=<domain>] [--device_id=<device_id>] [--spkac]
-          --input=<input_file> [--output=<output_file>]
+  sign_challenge [--enterprise [--va_server=default|test]] [--user=<user>]
+          [--label=<label>] [--domain=<domain>] [--device_id=<device_id>]
+          [--spkac] --input=<input_file> [--output=<output_file>]
       Signs a challenge (EnterpriseChallenge, if |enterprise| flag is given,
         otherwise a SimpleChallenge) provided in the |input_file|. Stores
         the response in the |output_file|, if specified.
@@ -383,9 +383,19 @@
         return EX_NOINPUT;
       }
       if (command_line->HasSwitch("enterprise")) {
+        VAType va_type = DEFAULT_VA;
+        std::string va_server(command_line->GetSwitchValueASCII("va_server"));
+          va_type = DEFAULT_VA;
+        if (va_server == "test") {
+          va_type = TEST_VA;
+        } if (va_server != "" && va_server != "default") {
+          LOG(ERROR) << "Invalid va_server value: " << va_server;
+          return EX_USAGE;
+        }
         task = base::Bind(
             &ClientLoop::CallSignEnterpriseChallenge,
             weak_factory_.GetWeakPtr(),
+            va_type,
             input,
             command_line->GetSwitchValueASCII("label"),
             command_line->GetSwitchValueASCII("user"),
@@ -717,13 +727,15 @@
         weak_factory_.GetWeakPtr()));
   }
 
-  void CallSignEnterpriseChallenge(const std::string& input,
+  void CallSignEnterpriseChallenge(VAType va_type,
+                                   const std::string& input,
                                    const std::string& label,
                                    const std::string& username,
                                    const std::string& domain,
                                    const std::string& device_id,
                                    bool include_spkac) {
     SignEnterpriseChallengeRequest request;
+    request.set_va_type(va_type);
     request.set_key_label(label);
     request.set_username(username);
     request.set_domain(domain);