Enforce Capability Filter provided in manifest

mojo/services/package_manager/package_manager.cc

 // Copyright 2016 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 "mojo/services/package_manager/package_manager.h"
 
 #include "base/bind.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/task_runner_util.h"
 #include "mojo/common/mojo_scheme_register.h"
@@ skipping 133 matching lines @@
 }
 
 void PackageManager::ResolveMojoURL(const mojo::String& mojo_url,
                                     const ResolveMojoURLCallback& callback) {
   GURL resolved_url = mojo_url.To<GURL>();
   auto alias_iter = mojo_url_aliases_.find(mojo_url);
   std::string qualifier;
   if (alias_iter != mojo_url_aliases_.end()) {
     resolved_url = GURL(alias_iter->second.first);
     qualifier = alias_iter->second.second;
+  } else {
+    qualifier = resolved_url.host();
   }
 
   EnsureURLInCatalog(resolved_url, qualifier, callback);
 }
 
 void PackageManager::GetEntries(
     mojo::Array<mojo::String> urls,
     const GetEntriesCallback& callback) {
   mojo::Map<mojo::String, mojom::CatalogEntryPtr> entries;
   std::vector<mojo::String> urls_vec = urls.PassStorage();
@@ skipping 22 matching lines @@
     file_url = system_package_dir_.Resolve(host + "/" + host + ".mojo");
   } else if (resolved_url.SchemeIs("exe")) {
 #if defined OS_WIN
     std::string extension = ".exe";
 #else
     std::string extension;
 #endif
     file_url = system_package_dir_.Resolve(resolved_url.host() + extension);
   }
 
-  // TODO(beng): Use the actual capability filter from |info|!
   mojo::shell::mojom::CapabilityFilterPtr filter(
       mojo::shell::mojom::CapabilityFilter::New());
-  mojo::Array<mojo::String> all_interfaces;
-  all_interfaces.push_back("*");
-  filter->filter.insert("*", std::move(all_interfaces));
-
+  filter->filter = mojo::Map<mojo::String, mojo::Array<mojo::String>>();
+  for (const auto& entry : info_iter->second.base_filter) {
+    mojo::Array<mojo::String> interfaces;
+    for (auto interface_name : entry.second)
+      interfaces.push_back(interface_name);
+    filter->filter.insert(entry.first, std::move(interfaces));
+  }
   callback.Run(resolved_url.spec(), qualifier, std::move(filter),
                file_url.spec());
 }
 
 bool PackageManager::IsURLInCatalog(const GURL& url) const {
   return catalog_.find(url.spec()) != catalog_.end();
 }
 
 void PackageManager::EnsureURLInCatalog(
     const GURL& url,
@@ skipping 109 matching lines @@
     ApplicationInfo info;
     info.url = url.spec();
     info.name = url.spec();
     catalog_[info.url] = info;
   }
   SerializeCatalog();
   CompleteResolveMojoURL(url, qualifier, callback);
 }
 
 }  // namespace package_manager