[Chromoting] Factor out common code for pin hashing.

remoting/host/plugin/host_script_object.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 "remoting/host/plugin/host_script_object.h"
 
-#include "base/base64.h"
 #include "base/bind.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/sys_string_conversions.h"
 #include "base/threading/platform_thread.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "net/base/net_util.h"
 #include "remoting/base/auth_token_util.h"
 #include "remoting/host/chromoting_host.h"
 #include "remoting/host/chromoting_host_context.h"
 #include "remoting/host/desktop_environment.h"
 #include "remoting/host/host_config.h"
 #include "remoting/host/host_key_pair.h"
 #include "remoting/host/host_secret.h"
 #include "remoting/host/it2me_host_user_interface.h"
+#include "remoting/host/pin_hash.h"
 #include "remoting/host/plugin/daemon_controller.h"
 #include "remoting/host/plugin/host_log_handler.h"
 #include "remoting/host/policy_hack/nat_policy.h"
 #include "remoting/host/register_support_host_request.h"
 #include "remoting/jingle_glue/xmpp_signal_strategy.h"
-#include "remoting/protocol/authentication_method.h"
 #include "remoting/protocol/it2me_host_authenticator_factory.h"
 
 namespace remoting {
 
 namespace {
 
 const char* kAttrNameAccessCode = "accessCode";
 const char* kAttrNameAccessCodeLifetime = "accessCodeLifetime";
 const char* kAttrNameClient = "client";
 const char* kAttrNameDaemonState = "daemonState";
@@ skipping 567 matching lines @@
                                      NPVariant* result) {
   if (arg_count != 0) {
     SetException("getHostName: bad number of arguments");
     return false;
   }
   DCHECK(result);
   *result = NPVariantFromString(net::GetHostName());
   return true;
 }
 
 bool HostNPScriptObject::GetPinHash(const NPVariant* args,

[Wez, 2012/04/30 23:13:57]

As for the underlying method, we should have a better name for this, e.g.
MakePinHash().

[simonmorris, 2012/05/01 00:25:55]

I think that's out of scope for this CL.

[Wez, 2012/05/01 01:02:36]

My thinking was that since the API return value is changing, it's name also can,
but of course it's bundled, so version breaks don't apply.

                                     uint32_t arg_count,
                                     NPVariant* result) {
   if (arg_count != 2) {
     SetException("getPinHash: bad number of arguments");
     return false;
   }
 
   std::string host_id = StringFromNPVariant(args[0]);
   if (host_id.empty()) {
     SetException("getPinHash: bad hostId parameter");
     return false;
   }
 
   if (!NPVARIANT_IS_STRING(args[1])) {
     SetException("getPinHash: bad pin parameter");
     return false;
   }
   std::string pin = StringFromNPVariant(args[1]);
 
-  std::string hash = protocol::AuthenticationMethod::ApplyHashFunction(
-      protocol::AuthenticationMethod::HMAC_SHA256, host_id, pin);
-  std::string hash_base64;
-  bool base64_result = base::Base64Encode(hash, &hash_base64);
-  if (!base64_result) {
-    LOG(FATAL) << "Base64Encode failed";
-  }
-
-  *result = NPVariantFromString(hash_base64);
+  *result = NPVariantFromString(remoting::GetPinHash(host_id, pin));
 
   return true;
 }
 
 bool HostNPScriptObject::GenerateKeyPair(const NPVariant* args,
                                          uint32_t arg_count,
                                          NPVariant* result) {
   if (arg_count != 1) {
     SetException("generateKeyPair: bad number of arguments");
     return false;
@@ skipping 465 matching lines @@
   return is_good;
 }
 
 void HostNPScriptObject::SetException(const std::string& exception_string) {
   DCHECK(plugin_message_loop_proxy_->BelongsToCurrentThread());
   g_npnetscape_funcs->setexception(parent_, exception_string.c_str());
   LOG(INFO) << exception_string;
 }
 
 }  // namespace remoting