Add credential parameters to Mount

Adds credential parameters to Mount in SmbProviderClient

Bug: chromium:757625
Change-Id: Ie5a2abcb6cb7fd90711d6ccabed53bf7de973f6a
Reviewed-on: https://chromium-review.googlesource.com/1020415Reviewed-by: Zentaro Kavanagh <zentaro@chromium.org>
Commit-Queue: Allen Vicencio <allenvic@chromium.org>
Cr-Commit-Position: refs/heads/master@{#553996}

chrome/browser/chromeos/smb_client/smb_service.cc

@@ -11,6 +11,7 @@
 #include "chrome/browser/chromeos/smb_client/smb_file_system_id.h"
 #include "chrome/browser/chromeos/smb_client/smb_provider.h"
 #include "chrome/browser/chromeos/smb_client/smb_service_factory.h"
+#include "chrome/browser/chromeos/smb_client/temp_file_manager.h"
 #include "chrome/common/chrome_features.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/smb_provider_client.h"
@@ -39,9 +40,13 @@ SmbService* SmbService::Get(content::BrowserContext* context) {
 void SmbService::Mount(const file_system_provider::MountOptions& options,
                        const base::FilePath& share_path,
                        MountResponse callback) {
+  // TODO(allenvic): Implement passing of credentials. This currently passes
+  // empty credentials to SmbProvider.
   GetSmbProviderClient()->Mount(
-      share_path, base::BindOnce(&SmbService::OnMountResponse, AsWeakPtr(),
-                                 base::Passed(&callback), options, share_path));
+      share_path, "" /* workgroup */, "" /* username */,
+      temp_file_manager_.CreatePasswordFile("" /* password */),
+      base::BindOnce(&SmbService::OnMountResponse, AsWeakPtr(),
+                     base::Passed(&callback), options, share_path));
 }
 
 void SmbService::OnMountResponse(

chrome/browser/chromeos/smb_client/smb_service.h

@@ -14,6 +14,7 @@
 #include "chrome/browser/chromeos/file_system_provider/provided_file_system_info.h"
 #include "chrome/browser/chromeos/file_system_provider/provider_interface.h"
 #include "chrome/browser/chromeos/file_system_provider/service.h"
+#include "chrome/browser/chromeos/smb_client/temp_file_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chromeos/dbus/smb_provider_client.h"
 #include "components/keyed_service/core/keyed_service.h"
@@ -84,6 +85,7 @@ class SmbService : public KeyedService,
 
   const ProviderId provider_id_;
   Profile* profile_;
+  TempFileManager temp_file_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(SmbService);
 };

chromeos/dbus/fake_smb_provider_client.cc

@@ -19,6 +19,9 @@ FakeSmbProviderClient::~FakeSmbProviderClient() {}
 void FakeSmbProviderClient::Init(dbus::Bus* bus) {}
 
 void FakeSmbProviderClient::Mount(const base::FilePath& share_path,
+                                  const std::string& workgroup,
+                                  const std::string& username,
+                                  base::ScopedFD password_fd,
                                   MountCallback callback) {
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::BindOnce(std::move(callback), smbprovider::ERROR_OK, 1));

chromeos/dbus/fake_smb_provider_client.h

@@ -19,7 +19,12 @@ class CHROMEOS_EXPORT FakeSmbProviderClient : public SmbProviderClient {
   void Init(dbus::Bus* bus) override;
 
   // SmbProviderClient override.
-  void Mount(const base::FilePath& share_path, MountCallback callback) override;
+  void Mount(const base::FilePath& share_path,
+             const std::string& workgroup,
+             const std::string& username,
+             base::ScopedFD password_fd,
+             MountCallback callback) override;
+
   void Remount(const base::FilePath& share_path,
                int32_t mount_id,
                StatusCallback callback) override;

chromeos/dbus/smb_provider_client.cc

@@ -63,11 +63,22 @@ class SmbProviderClientImpl : public SmbProviderClient {
   ~SmbProviderClientImpl() override {}
 
   void Mount(const base::FilePath& share_path,
+             const std::string& workgroup,
+             const std::string& username,
+             base::ScopedFD password_fd,
              MountCallback callback) override {
     smbprovider::MountOptionsProto options;
     options.set_path(share_path.value());
-    CallMethod(smbprovider::kMountMethod, options,
-               &SmbProviderClientImpl::HandleMountCallback, &callback);
+    options.set_workgroup(workgroup);
+    options.set_username(username);
+
+    dbus::MethodCall method_call(smbprovider::kSmbProviderInterface,
+                                 smbprovider::kMountMethod);
+    dbus::MessageWriter writer(&method_call);
+    writer.AppendProtoAsArrayOfBytes(options);
+    writer.AppendFileDescriptor(password_fd.release());
+    CallMethod(&method_call, &SmbProviderClientImpl::HandleMountCallback,
+               &callback);
   }
 
   void Remount(const base::FilePath& share_path,

chromeos/dbus/smb_provider_client.h

@@ -48,9 +48,13 @@ class CHROMEOS_EXPORT SmbProviderClient
   static SmbProviderClient* Create();
 
   // Calls Mount. It runs OpenDirectory() on |share_path| to check that it is a
-  // valid share. |callback| is called after getting (or failing to get) D-BUS
-  // response.
+  // valid share. |workgroup|, |username|, and |password_fd| will be used as
+  // credentials to access the mount. |callback| is called after getting (or
+  // failing to get) D-BUS response.
   virtual void Mount(const base::FilePath& share_path,
+                     const std::string& workgroup,
+                     const std::string& username,
+                     base::ScopedFD password_fd,
                      MountCallback callback) = 0;
 
   // Calls Remount. This attempts to remount the share at |share_path| with its