kiosk: Add kiosk.required_platform_version manifest key

BUG=577779
TEST=KioskModeInfoManifestTest.RequiredPlatformVersion*

Review URL: https://codereview.chromium.org/1595483004

Cr-Commit-Position: refs/heads/master@{#370722}

extensions/common/api/_manifest_features.json

@@ -182,6 +182,14 @@
     "channel": "stable",
     "extension_types": "all"
   },
+  "kiosk": {
+    "channel": "dev",
+    "extension_types": ["platform_app"]
+  },
+  "kiosk.required_platform_version": {
+    "channel": "dev",
+    "extension_types": ["platform_app"]
+  },
   "kiosk_enabled": {
     "channel": "stable",
     "extension_types": [

extensions/common/manifest_constants.cc

@@ -66,9 +66,11 @@ const char kIsolation[] = "app.isolation";
 const char kJs[] = "js";
 const char kKey[] = "key";
 const char kKeycode[] = "keyCode";
+const char kKiosk[] = "kiosk";
 const char kKioskEnabled[] = "kiosk_enabled";
 const char kKioskOnly[] = "kiosk_only";
 const char kKioskMode[] = "kiosk_mode";
+const char kKioskRequiredPlatformVersion[] = "kiosk.required_platform_version";
 const char kKioskSecondaryApps[] = "kiosk_secondary_apps";
 const char kLanguage[] = "language";
 const char kLaunch[] = "app.launch";
@@ -466,6 +468,8 @@ const char kInvalidKioskOnly[] =
     "Invalid value for 'kiosk_only'.";
 const char kInvalidKioskOnlyButNotEnabled[] =
     "The 'kiosk_only' key is set, but 'kiosk_enabled' is not set.";
+const char kInvalidKioskRequiredPlatformVersion[] =
+    "Invalid value for 'kiosk.required_platform_version'";
 const char kInvalidKioskSecondaryApps[] =
     "Invalid value for 'kiosk_secondary_apps'";
 const char kInvalidKioskSecondaryAppsBadAppEntry[] =

extensions/common/manifest_constants.h

@@ -70,9 +70,11 @@ extern const char kIsolation[];
 extern const char kJs[];
 extern const char kKey[];
 extern const char kKeycode[];
+extern const char kKiosk[];
 extern const char kKioskEnabled[];
 extern const char kKioskOnly[];
 extern const char kKioskMode[];
+extern const char kKioskRequiredPlatformVersion[];
 extern const char kKioskSecondaryApps[];
 extern const char kLanguage[];
 extern const char kLaunch[];
@@ -129,6 +131,7 @@ extern const char kPluginsPath[];
 extern const char kPluginsPublic[];
 extern const char kPublicKey[];
 extern const char kRemoveButton[];
+extern const char kRequiredPlatformVersion[];
 extern const char kRequirements[];
 extern const char kRunAt[];
 extern const char kSandboxedPages[];
@@ -352,6 +355,7 @@ extern const char kInvalidKeyBindingUnknownPlatform[];
 extern const char kInvalidKioskEnabled[];
 extern const char kInvalidKioskOnly[];
 extern const char kInvalidKioskOnlyButNotEnabled[];
+extern const char kInvalidKioskRequiredPlatformVersion[];
 extern const char kInvalidKioskSecondaryApps[];
 extern const char kInvalidKioskSecondaryAppsBadAppEntry[];
 extern const char kInvalidKioskSecondaryAppsBadAppId[];

extensions/common/manifest_handlers/kiosk_mode_info.cc

@@ -9,9 +9,21 @@
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
+#include "base/version.h"
 #include "extensions/common/api/extensions_manifest_types.h"
 #include "extensions/common/manifest_constants.h"
 
+namespace {
+
+// Whether the given |version_string| is a valid ChromeOS platform version.
+// The acceptable format is major[.minor[.micro]].
+bool IsValidPlatformVersion(const std::string& version_string) {
+  const base::Version version(version_string);
+  return version.IsValid() && version.components().size() <= 3u;
+}
+
+}  // namespace
+
 namespace extensions {
 
 namespace keys = manifest_keys;
@@ -19,8 +31,11 @@ namespace keys = manifest_keys;
 using api::extensions_manifest_types::KioskSecondaryAppsType;
 
 KioskModeInfo::KioskModeInfo(KioskStatus kiosk_status,
-                             const std::vector<std::string>& secondary_app_ids)
-    : kiosk_status(kiosk_status), secondary_app_ids(secondary_app_ids) {}
+                             const std::vector<std::string>& secondary_app_ids,
+                             const std::string& required_platform_version)
+    : kiosk_status(kiosk_status),
+      secondary_app_ids(secondary_app_ids),
+      required_platform_version(required_platform_version) {}
 
 KioskModeInfo::~KioskModeInfo() {
 }
@@ -50,6 +65,7 @@ bool KioskModeInfo::HasSecondaryApps(const Extension* extension) {
 }
 
 KioskModeHandler::KioskModeHandler() {
+  supported_keys_.push_back(keys::kKiosk);
   supported_keys_.push_back(keys::kKioskEnabled);
   supported_keys_.push_back(keys::kKioskOnly);
   supported_keys_.push_back(keys::kKioskSecondaryApps);
@@ -93,11 +109,10 @@ bool KioskModeHandler::Parse(Extension* extension, base::string16* error) {
 
   // Kiosk secondary apps key is optional.
   std::vector<std::string> ids;
-  if (extension->manifest()->HasKey(keys::kKioskSecondaryApps)) {
+  if (manifest->HasKey(keys::kKioskSecondaryApps)) {
     const base::Value* secondary_apps = nullptr;
     const base::ListValue* list = nullptr;
-    if (!extension->manifest()->Get(keys::kKioskSecondaryApps,
-                                    &secondary_apps) ||
+    if (!manifest->Get(keys::kKioskSecondaryApps, &secondary_apps) ||
         !secondary_apps->GetAsList(&list)) {
       *error = base::ASCIIToUTF16(manifest_errors::kInvalidKioskSecondaryApps);
       return false;
@@ -115,8 +130,20 @@ bool KioskModeHandler::Parse(Extension* extension, base::string16* error) {
     }
   }
 
-  extension->SetManifestData(keys::kKioskMode,
-                             new KioskModeInfo(kiosk_status, ids));
+  // Optional kiosk.required_platform_version key.
+  std::string required_platform_version;
+  if (manifest->HasPath(keys::kKioskRequiredPlatformVersion) &&
+      (!manifest->GetString(keys::kKioskRequiredPlatformVersion,
+                            &required_platform_version) ||
+       !IsValidPlatformVersion(required_platform_version))) {
+    *error = base::ASCIIToUTF16(
+        manifest_errors::kInvalidKioskRequiredPlatformVersion);
+    return false;
+  }
+
+  extension->SetManifestData(
+      keys::kKioskMode,
+      new KioskModeInfo(kiosk_status, ids, required_platform_version));
 
   return true;
 }

extensions/common/manifest_handlers/kiosk_mode_info.h

@@ -24,7 +24,8 @@ struct KioskModeInfo : public Extension::ManifestData {
   };
 
   KioskModeInfo(KioskStatus kiosk_status,
-                const std::vector<std::string>& secondary_app_ids);
+                const std::vector<std::string>& secondary_app_ids,
+                const std::string& required_platform_version);
   ~KioskModeInfo() override;
 
   // Gets the KioskModeInfo for |extension|, or NULL if none was
@@ -44,6 +45,8 @@ struct KioskModeInfo : public Extension::ManifestData {
 
   // The IDs of the kiosk secondary apps.
   const std::vector<std::string> secondary_app_ids;
+
+  const std::string required_platform_version;
 };
 
 // Parses the "kiosk_enabled" and "kiosk_only" manifest keys.

extensions/common/manifest_handlers/kiosk_mode_info_unittest.cc

@@ -32,4 +32,25 @@ TEST_F(KioskModeInfoManifestTest, MultipleSecondaryApps) {
       std::equal(parsed_ids.begin(), parsed_ids.end(), expected_ids));
 }
 
+TEST_F(KioskModeInfoManifestTest, RequiredPlatformVersionOptional) {
+  scoped_refptr<Extension> extension(
+      LoadAndExpectSuccess("kiosk_required_platform_version_not_present.json"));
+  KioskModeInfo* info = KioskModeInfo::Get(extension.get());
+  EXPECT_TRUE(info->required_platform_version.empty());
+}
+
+TEST_F(KioskModeInfoManifestTest, RequiredPlatformVersion) {
+  scoped_refptr<Extension> extension(
+      LoadAndExpectSuccess("kiosk_required_platform_version.json"));
+  KioskModeInfo* info = KioskModeInfo::Get(extension.get());
+  EXPECT_EQ("1234.0.0", info->required_platform_version);
+}
+
+TEST_F(KioskModeInfoManifestTest, RequiredPlatformVersionInvalid) {
+  LoadAndExpectError("kiosk_required_platform_version_empty.json",
+                     manifest_errors::kInvalidKioskRequiredPlatformVersion);
+  LoadAndExpectError("kiosk_required_platform_version_invalid.json",
+                     manifest_errors::kInvalidKioskRequiredPlatformVersion);
+}
+
 }  // namespace extensions

extensions/test/data/manifest_tests/kiosk_required_platform_version.json

+{
+  "manifest_version": 2,
+  "name": "Kiosk app",
+  "version": "1",
+  "app": {
+    "background": {
+      "scripts": ["main.js"]
+    }
+  },
+  "kiosk_enabled": true,
+  "kiosk": {
+    "required_platform_version": "1234.0.0"
+  }
+}

extensions/test/data/manifest_tests/kiosk_required_platform_version_empty.json

+{
+  "manifest_version": 2,
+  "name": "Kiosk app",
+  "version": "1",
+  "app": {
+    "background": {
+      "scripts": ["main.js"]
+    }
+  },
+  "kiosk_enabled": true,
+  "kiosk": {
+    "required_platform_version": ""
+  }
+}
+

extensions/test/data/manifest_tests/kiosk_required_platform_version_invalid.json

+{
+  "manifest_version": 2,
+  "name": "Kiosk app",
+  "version": "1",
+  "app": {
+    "background": {
+      "scripts": ["main.js"]
+    }
+  },
+  "kiosk_enabled": true,
+  "kiosk": {
+    "required_platform_version": "bad.version"
+  }
+}
+

extensions/test/data/manifest_tests/kiosk_required_platform_version_not_present.json

+{
+  "manifest_version": 2,
+  "name": "Kiosk app",
+  "version": "1",
+  "app": {
+    "background": {
+      "scripts": ["main.js"]
+    }
+  },
+  "kiosk_enabled": true
+}