summaryrefslogtreecommitdiffstats
path: root/components/resource_provider
diff options
context:
space:
mode:
authorben <ben@chromium.org>2016-02-22 23:28:46 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-23 07:30:04 +0000
commit7569dae2853e09aa469900f354c9121ef0a09b92 (patch)
treec00b851eecf6817642ee781e118901ee11a80546 /components/resource_provider
parentbcc5607abeaa243d7b7e25a25aaee4c95f1f65e0 (diff)
downloadchromium_src-7569dae2853e09aa469900f354c9121ef0a09b92.zip
chromium_src-7569dae2853e09aa469900f354c9121ef0a09b92.tar.gz
chromium_src-7569dae2853e09aa469900f354c9121ef0a09b92.tar.bz2
This enforces the capability filter specified in an application manifest.
Note that this is mostly set to permissive right now because the capability filters as currently specified are a PITA to use. I'm going to be working with some of the security folk to devise a way to simplify this. Review URL: https://codereview.chromium.org/1716793003 Cr-Commit-Position: refs/heads/master@{#376940}
Diffstat (limited to 'components/resource_provider')
-rw-r--r--components/resource_provider/BUILD.gn6
-rw-r--r--components/resource_provider/apptest_manifest.json5
-rw-r--r--components/resource_provider/manifest.json2
3 files changed, 12 insertions, 1 deletions
diff --git a/components/resource_provider/BUILD.gn b/components/resource_provider/BUILD.gn
index e8bd971..6a7a7e5 100644
--- a/components/resource_provider/BUILD.gn
+++ b/components/resource_provider/BUILD.gn
@@ -140,6 +140,7 @@ mojo_native_application("apptests") {
]
deps = [
+ ":apptest_manifest",
"//base",
"//base/test:test_config",
"//components/resource_provider/public/cpp",
@@ -152,3 +153,8 @@ mojo_native_application("apptests") {
":resource_provider",
]
}
+
+mojo_application_manifest("apptest_manifest") {
+ application_name = "resource_provider_apptests"
+ source = "apptest_manifest.json"
+}
diff --git a/components/resource_provider/apptest_manifest.json b/components/resource_provider/apptest_manifest.json
new file mode 100644
index 0000000..f5bd1e8
--- /dev/null
+++ b/components/resource_provider/apptest_manifest.json
@@ -0,0 +1,5 @@
+{
+ "url": "mojo://resource_provider_apptests/",
+ "name": "Resource Provider Apptests",
+ "capabilities": { "*": [ "*" ] }
+}
diff --git a/components/resource_provider/manifest.json b/components/resource_provider/manifest.json
index a341aae..58b801a 100644
--- a/components/resource_provider/manifest.json
+++ b/components/resource_provider/manifest.json
@@ -1,5 +1,5 @@
{
"url": "mojo://resource_provider/",
"name": "Resource Provider",
- "capabilities": { }
+ "capabilities": { "*": [ "*" ] }
}