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

Side by Side Diff: chrome/common/extensions/permissions/permissions_data.cc

Issue 51433002: Enable permission warnings from ManifestHandlers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix unit test and clang presubmit errors. 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/common/extensions/permissions/permissions_data.h" 5 #include "chrome/common/extensions/permissions/permissions_data.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/strings/string16.h" 9 #include "base/strings/string16.h"
10 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
11 #include "base/strings/stringprintf.h" 11 #include "base/strings/stringprintf.h"
12 #include "base/strings/utf_string_conversions.h" 12 #include "base/strings/utf_string_conversions.h"
13 #include "base/values.h" 13 #include "base/values.h"
14 #include "chrome/common/extensions/extension.h" 14 #include "chrome/common/extensions/extension.h"
15 #include "chrome/common/extensions/extension_constants.h"
15 #include "content/public/common/url_constants.h" 16 #include "content/public/common/url_constants.h"
16 #include "extensions/common/constants.h" 17 #include "extensions/common/constants.h"
17 #include "extensions/common/error_utils.h" 18 #include "extensions/common/error_utils.h"
18 #include "extensions/common/extensions_client.h" 19 #include "extensions/common/extensions_client.h"
19 #include "extensions/common/features/feature.h" 20 #include "extensions/common/features/feature.h"
20 #include "extensions/common/features/feature_provider.h" 21 #include "extensions/common/features/feature_provider.h"
21 #include "extensions/common/manifest.h" 22 #include "extensions/common/manifest.h"
22 #include "extensions/common/manifest_constants.h" 23 #include "extensions/common/manifest_constants.h"
24 #include "extensions/common/manifest_handler.h"
23 #include "extensions/common/permissions/api_permission_set.h" 25 #include "extensions/common/permissions/api_permission_set.h"
24 #include "extensions/common/permissions/permission_message_provider.h" 26 #include "extensions/common/permissions/permission_message_provider.h"
25 #include "extensions/common/permissions/permission_set.h" 27 #include "extensions/common/permissions/permission_set.h"
26 #include "extensions/common/permissions/permissions_info.h" 28 #include "extensions/common/permissions/permissions_info.h"
27 #include "extensions/common/switches.h" 29 #include "extensions/common/switches.h"
28 #include "extensions/common/url_pattern_set.h" 30 #include "extensions/common/url_pattern_set.h"
29 #include "extensions/common/user_script.h" 31 #include "extensions/common/user_script.h"
30 #include "url/gurl.h" 32 #include "url/gurl.h"
31 33
32 namespace extensions { 34 namespace extensions {
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 // Returns true if this extension id is from a trusted provider. 239 // Returns true if this extension id is from a trusted provider.
238 bool IsTrustedId(const std::string& extension_id) { 240 bool IsTrustedId(const std::string& extension_id) {
239 // See http://b/4946060 for more details. 241 // See http://b/4946060 for more details.
240 return extension_id == std::string("nckgahadagoaajjgafhacjanaoiihapd"); 242 return extension_id == std::string("nckgahadagoaajjgafhacjanaoiihapd");
241 } 243 }
242 244
243 } // namespace 245 } // namespace
244 246
245 struct PermissionsData::InitialPermissions { 247 struct PermissionsData::InitialPermissions {
246 APIPermissionSet api_permissions; 248 APIPermissionSet api_permissions;
249 ManifestPermissionSet manifest_permissions;
247 URLPatternSet host_permissions; 250 URLPatternSet host_permissions;
248 URLPatternSet scriptable_hosts; 251 URLPatternSet scriptable_hosts;
249 }; 252 };
250 253
251 PermissionsData::PermissionsData() { 254 PermissionsData::PermissionsData() {
252 } 255 }
253 256
254 PermissionsData::~PermissionsData() { 257 PermissionsData::~PermissionsData() {
255 } 258 }
256 259
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after
586 keys::kOptionalPermissions, 589 keys::kOptionalPermissions,
587 &initial_optional_permissions_->api_permissions, 590 &initial_optional_permissions_->api_permissions,
588 &initial_optional_permissions_->host_permissions, 591 &initial_optional_permissions_->host_permissions,
589 error)) { 592 error)) {
590 return false; 593 return false;
591 } 594 }
592 595
593 return true; 596 return true;
594 } 597 }
595 598
599 void PermissionsData::InitializeManifestPermissions(Extension* extension) {
600 ManifestHandler::AddExtensionInitialRequiredPermissions(
601 extension, &initial_required_permissions_->manifest_permissions);
602 }
603
596 void PermissionsData::FinalizePermissions(Extension* extension) { 604 void PermissionsData::FinalizePermissions(Extension* extension) {
597 active_permissions_ = new PermissionSet( 605 active_permissions_ = new PermissionSet(
598 initial_required_permissions_->api_permissions, 606 initial_required_permissions_->api_permissions,
607 initial_required_permissions_->manifest_permissions,
599 initial_required_permissions_->host_permissions, 608 initial_required_permissions_->host_permissions,
600 initial_required_permissions_->scriptable_hosts); 609 initial_required_permissions_->scriptable_hosts);
601 610
602 required_permission_set_ = new PermissionSet( 611 required_permission_set_ = new PermissionSet(
603 initial_required_permissions_->api_permissions, 612 initial_required_permissions_->api_permissions,
613 initial_required_permissions_->manifest_permissions,
604 initial_required_permissions_->host_permissions, 614 initial_required_permissions_->host_permissions,
605 initial_required_permissions_->scriptable_hosts); 615 initial_required_permissions_->scriptable_hosts);
606 616
607 optional_permission_set_ = new PermissionSet( 617 optional_permission_set_ = new PermissionSet(
608 initial_optional_permissions_->api_permissions, 618 initial_optional_permissions_->api_permissions,
619 initial_optional_permissions_->manifest_permissions,
609 initial_optional_permissions_->host_permissions, 620 initial_optional_permissions_->host_permissions,
610 URLPatternSet()); 621 URLPatternSet());
611 622
612 initial_required_permissions_.reset(); 623 initial_required_permissions_.reset();
613 initial_optional_permissions_.reset(); 624 initial_optional_permissions_.reset();
614 } 625 }
615 626
616 } // namespace extensions 627 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698