Put Kiosk App parameters into device settings.

chrome/browser/chromeos/login/user_manager.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 "chrome/browser/chromeos/login/user_manager.h"
 
 #include "base/logging.h"
+#include "base/string_util.h"

[bartfab (slow), 2013/04/25 11:17:28]

Nit: Not used.

[Mattias Nissler (ping if slow), 2013/04/26 09:10:05]

Done.

 #include "chrome/browser/chromeos/login/user_manager_impl.h"
+#include "chrome/common/extensions/extension.h"
+#include "google_apis/gaia/gaia_auth_util.h"
 
 namespace chromeos {
 
 // static
 const char UserManager::kStubUser[] = "stub-user@example.com";
 
 // static
 const char UserManager::kLocallyManagedUserDomain[] =
     "locally-managed.localhost";
 
@@ skipping 28 matching lines @@
 UserManager::~UserManager() {
 }
 
 // static
 UserManager* UserManager::SetForTesting(UserManager* user_manager) {
   UserManager* previous_user_manager = g_user_manager;
   g_user_manager = user_manager;
   return previous_user_manager;
 }
 
+// static
+bool UserManager::ParseKioskAppUserId(const std::string& user_id,
+                                      std::string* app_id) {
+  if (gaia::ExtractDomainName(user_id) == kKioskAppUserDomain) {
+    const std::string candidate_app_id(
+        user_id.substr(0, user_id.size() - arraysize(kKioskAppUserDomain)));

[bartfab (slow), 2013/04/25 11:17:28]

Will that not leave a dangling "@" at the end of |candidate_app_id|?

[xiyuan, 2013/04/25 17:26:32]

I had the same question when looking at this. Then I found out that it won't
because arraysize include the NULL terminator. But think we might want to
document it.

[Mattias Nissler (ping if slow), 2013/04/26 09:10:05]

Obsolete

+    if (extensions::Extension::IdIsValid(candidate_app_id)) {

[bartfab (slow), 2013/04/25 11:17:28]

Since you are explicitly storing the app ID in a different place now, why does
the local part of the user ID still have to be a vaild app ID? Should this not
just be an opaque identifier?

[xiyuan, 2013/04/25 17:26:32]

I don't see the the benefit of using an opaque identifier here. Right now the
kiosk app mechanism depends on this to be an app id. On crash restarting, the
login-user is the only thing we have and we derive the app id from that. This
might be wrong and we might want to change it later. But that's how it is works
now.

Are you concerning this will be inconsistent with the separately stored app id?

[Mattias Nissler (ping if slow), 2013/04/26 09:10:05]

Obsolete

[Mattias Nissler (ping if slow), 2013/04/26 09:10:05]

Some background from an offline discussion I had with Bartosz: The concern here
is tying too many systems together which use the same ID for different purposes.
In particular:

- UserManager and the login code use user@domain ids for identifying users
- Device settings use the ID for distinguishing device-local accounts
- For public sessions, the same identifier is used to fetch policy
- For device policy, the identifier gets assigned by the server

So, keep all these uses reasonably separated (so we can iterate them), the plan
Bartosz and me are following now is this:

- UserManager and the login code continue to use the user@domain scheme
- These identifiers are not persisted directly to device settings. Instead, we
have some code that constructs the appropriate format used by UserManager when
reading device-local accounts from UserManager. That way, we can change the
naming scheme for local users in the login code without having to worry about
migrating data.
- For device policy, the server can use any identifier scheme in the
DeviceLocalAcccountInfoProto.id field, and that won't affect how these users
appear in Chrome. Instead, we put the appropriate user type in a separate field.

Hope this makes sense!
- 

+      *app_id = candidate_app_id;
+      return true;
+    }
+  }
+
+  return false;
+}
+
+// static
+std::string UserManager::FormatKioskAppUserId(const std::string& app_id) {
+  DCHECK(extensions::Extension::IdIsValid(app_id));

[bartfab (slow), 2013/04/25 11:17:28]

Same as above: Why does the local part need to be a valid app ID?

[Mattias Nissler (ping if slow), 2013/04/26 09:10:05]

Obsolete

+  return app_id + '@' + kKioskAppUserDomain;
+}
+
 ScopedUserManagerEnabler::ScopedUserManagerEnabler(UserManager* user_manager)
     : previous_user_manager_(UserManager::SetForTesting(user_manager)) {
 }
 
 ScopedUserManagerEnabler::~ScopedUserManagerEnabler() {
   UserManager::Get()->Shutdown();
   UserManager::Destroy();
   UserManager::SetForTesting(previous_user_manager_);
 }
 
 ScopedTestUserManager::ScopedTestUserManager()
     : initialized_user_manager_(false) {
   if (!UserManager::IsInitialized()) {
     UserManager::Initialize();
     initialized_user_manager_ = true;
   }
 }
 
 ScopedTestUserManager::~ScopedTestUserManager() {
   if (initialized_user_manager_) {
     UserManager::Get()->Shutdown();
     UserManager::Destroy();
   }
 }
 
 }  // namespace chromeos