Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(49)

Unified Diff: extensions/common/permissions/manifest_permission_set.cc

Issue 51433002: Enable permission warnings from ManifestHandlers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address code review comments. Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: extensions/common/permissions/manifest_permission_set.cc
diff --git a/extensions/common/permissions/manifest_permission_set.cc b/extensions/common/permissions/manifest_permission_set.cc
new file mode 100644
index 0000000000000000000000000000000000000000..821159f6a2591fa54261a9dae296fb801857dd40
--- /dev/null
+++ b/extensions/common/permissions/manifest_permission_set.cc
@@ -0,0 +1,93 @@
+// Copyright 2013 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 "extensions/common/permissions/manifest_permission_set.h"
+
+#include "base/logging.h"
+#include "base/strings/string_number_conversions.h"
+#include "base/values.h"
+#include "extensions/common/error_utils.h"
+#include "extensions/common/manifest_constants.h"
+#include "extensions/common/manifest_handler.h"
+#include "extensions/common/permissions/manifest_permission.h"
+
+namespace {
+
+using extensions::ErrorUtils;
+using extensions::ManifestPermission;
+using extensions::ManifestPermissionSet;
+using extensions::ManifestHandler;
+namespace errors = extensions::manifest_errors;
+
+bool CreateManifestPermission(
+ const std::string& permission_name,
+ const base::Value* permission_value,
+ ManifestPermissionSet* manifest_permissions,
+ string16* error,
+ std::vector<std::string>* unhandled_permissions) {
+
+ scoped_ptr<ManifestPermission> permission(
+ ManifestHandler::CreatePermission(permission_name));
+
+ if (!permission) {
+ if (unhandled_permissions)
+ unhandled_permissions->push_back(permission_name);
+ else
+ LOG(WARNING) << "Unknown permission[" << permission_name << "].";
+ return true;
+ }
+
+ if (!permission->FromValue(permission_value)) {
+ if (error) {
+ *error = ErrorUtils::FormatErrorMessageUTF16(
+ errors::kInvalidPermission, permission_name);
+ return false;
+ }
+ LOG(WARNING) << "Parse permission failed.";
+ return true;
+ } else {
+ manifest_permissions->insert(permission.release());
+ return true;
+ }
+}
+
+} // namespace
+
+namespace extensions {
+
+// static
+bool ManifestPermissionSet::ParseFromJSON(
+ const base::ListValue* permissions,
+ ManifestPermissionSet* manifest_permissions,
+ string16* error,
+ std::vector<std::string>* unhandled_permissions) {
+ for (size_t i = 0; i < permissions->GetSize(); ++i) {
+ std::string permission_name;
+ const base::Value* permission_value = NULL;
+ if (!permissions->GetString(i, &permission_name)) {
+ const base::DictionaryValue* dict = NULL;
+ // permission should be a string or a single key dict.
+ if (!permissions->GetDictionary(i, &dict) || dict->size() != 1) {
+ if (error) {
+ *error = ErrorUtils::FormatErrorMessageUTF16(
+ errors::kInvalidPermission, base::IntToString(i));
+ return false;
+ }
+ LOG(WARNING) << "Permission is not a string or single key dict.";
+ continue;
+ }
+ base::DictionaryValue::Iterator it(*dict);
+ permission_name = it.key();
+ permission_value = &it.value();
+ }
+
+ if (!CreateManifestPermission(permission_name, permission_value,
+ manifest_permissions, error,
+ unhandled_permissions))
+ return false;
+ }
+ return true;
+}
+
+} // namespace extensions

Powered by Google App Engine
This is Rietveld 408576698