Simple multi-url support for mojo apps

shell/application_manager/application_manager.cc

 // Copyright 2014 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 "shell/application_manager/application_manager.h"
 
 #include <stdio.h>
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/stl_util.h"
+#include "base/strings/string_util.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/error_handler.h"
 #include "mojo/public/interfaces/application/shell.mojom.h"
 #include "mojo/services/content_handler/public/interfaces/content_handler.mojom.h"
 #include "shell/application_manager/fetcher.h"
 #include "shell/application_manager/local_fetcher.h"
 #include "shell/application_manager/network_fetcher.h"
 
 namespace mojo {
 
 namespace {
 // Used by TestAPI.
 bool has_created_instance = false;
+
+GURL StripQueryFromURL(const GURL& url) {
+  GURL::Replacements repl;
+  repl.SetQueryStr("");
+  std::string result = url.ReplaceComponents(repl).spec();
+
+  // Remove the dangling '?' because it's ugly.
+  base::ReplaceChars(result, "?", "", &result);
+  return GURL(result);
+}
+
 }  // namespace
 
 ApplicationManager::Delegate::~Delegate() {
 }
 
 void ApplicationManager::Delegate::OnApplicationError(const GURL& url) {
   LOG(ERROR) << "Communication error with application: " << url.spec();
 }
 
 GURL ApplicationManager::Delegate::ResolveURL(const GURL& url) {
@@ skipping 68 matching lines @@
 void ApplicationManager::ConnectToApplication(
     const GURL& requested_url,
     const GURL& requestor_url,
     InterfaceRequest<ServiceProvider> services,
     ServiceProviderPtr exposed_services) {
   DCHECK(requested_url.is_valid());
 
   // We check both the mapped and resolved urls for existing shell_impls because
   // external applications can be registered for the unresolved mojo:foo urls.
 
   GURL mapped_url = delegate_->ResolveMappings(requested_url);

[qsr, 2015/02/27 17:17:43]

Don't you need to modify those methods to keep the query string, or does this
already works perfectly fine?

[Aaron Boodman, 2015/02/28 19:08:23]

I don't follow you.

[qsr, 2015/03/02 08:51:31]

 I think URLResolver::ApplyMappings needs to be updated. Right now it looks if
the URL is in its known mapping, and I think it should do the match without the
query string, and if it found one, should add the query string on it.

 Also, URLResolver::ResolveMojoURL seens correct, but you might want to check if
you agree with me.

[Aaron Boodman, 2015/03/02 15:36:36]

Perhaps. I think that should be a separate change though. The existing cl allows
people's scripts to continue working as they are.

-  if (ConnectToRunningApplication(mapped_url, requestor_url, &services,
-                                  &exposed_services)) {
+  if (ConnectToRunningApplication(mapped_url, requestor_url,
+                                  &services, &exposed_services)) {
     return;
   }
 
   GURL resolved_url = delegate_->ResolveURL(mapped_url);
-  if (ConnectToRunningApplication(resolved_url, requestor_url, &services,
-                                  &exposed_services)) {
+  if (ConnectToRunningApplication(resolved_url, requestor_url,
+                                  &services, &exposed_services)) {
     return;
   }
 
   if (ConnectToApplicationWithLoader(requested_url, mapped_url, requestor_url,
                                      &services, &exposed_services,
                                      GetLoaderForURL(mapped_url))) {
     return;
   }
 
   if (ConnectToApplicationWithLoader(requested_url, resolved_url, requestor_url,
@@ skipping 20 matching lines @@
   }
 
   if (!network_service_)
     ConnectToService(GURL("mojo:network_service"), &network_service_);
 
   new NetworkFetcher(disable_cache_, resolved_url, network_service_.get(),
                      base::Bind(callback, NativeRunner::DeleteAppPath));
 }
 
 bool ApplicationManager::ConnectToRunningApplication(
-    const GURL& application_url,
+    const GURL& resolved_url,
     const GURL& requestor_url,
     InterfaceRequest<ServiceProvider>* services,
     ServiceProviderPtr* exposed_services) {
+  GURL application_url = StripQueryFromURL(resolved_url);
   ShellImpl* shell_impl = GetShellImpl(application_url);
   if (!shell_impl)
     return false;
 
-  ConnectToClient(shell_impl, application_url, requestor_url, services->Pass(),
-                  exposed_services->Pass());
+  ConnectToClient(shell_impl, resolved_url, requestor_url,
+                  services->Pass(), exposed_services->Pass());
   return true;
 }
 
 bool ApplicationManager::ConnectToApplicationWithLoader(
     const GURL& requested_url,
     const GURL& resolved_url,
     const GURL& requestor_url,
     InterfaceRequest<ServiceProvider>* services,
     ServiceProviderPtr* exposed_services,
     ApplicationLoader* loader) {
   if (!loader)
     return false;
 
   loader->Load(resolved_url,
                RegisterShell(requested_url, resolved_url, requestor_url,
                              services->Pass(), exposed_services->Pass()));
   return true;
 }
 
 InterfaceRequest<Application> ApplicationManager::RegisterShell(
     const GURL& requested_url,
-    const GURL& resolved_url,
+    GURL resolved_url,
     const GURL& requestor_url,
     InterfaceRequest<ServiceProvider> services,
     ServiceProviderPtr exposed_services) {
+  resolved_url = StripQueryFromURL(resolved_url);
+
   ApplicationPtr application;
   InterfaceRequest<Application> application_request = GetProxy(&application);
   ShellImpl* shell =
       new ShellImpl(application.Pass(), this, requested_url, resolved_url);
   url_to_shell_impl_[resolved_url] = shell;
   shell->InitializeApplication(GetArgsForURL(requested_url));
-  ConnectToClient(shell, resolved_url, requestor_url, services.Pass(),
-                  exposed_services.Pass());
+  ConnectToClient(shell, resolved_url, requestor_url,
+                  services.Pass(), exposed_services.Pass());
   return application_request.Pass();
 }
 
 ShellImpl* ApplicationManager::GetShellImpl(const GURL& url) {
   const auto& shell_it = url_to_shell_impl_.find(url);
   if (shell_it != url_to_shell_impl_.end())
     return shell_it->second;
   return nullptr;
 }
 
 void ApplicationManager::ConnectToClient(
     ShellImpl* shell_impl,
-    const GURL& url,
+    const GURL& resolved_url,
     const GURL& requestor_url,
     InterfaceRequest<ServiceProvider> services,
     ServiceProviderPtr exposed_services) {
-  shell_impl->ConnectToClient(requestor_url, services.Pass(),
+  shell_impl->ConnectToClient(resolved_url, requestor_url, services.Pass(),
                               exposed_services.Pass());
 }
 
 void ApplicationManager::HandleFetchCallback(
     const GURL& requested_url,
     const GURL& requestor_url,
     InterfaceRequest<ServiceProvider> services,
     ServiceProviderPtr exposed_services,
     NativeRunner::CleanupBehavior cleanup_behavior,
     scoped_ptr<Fetcher> fetcher) {
   if (!fetcher) {
     // Network error. Drop |application_request| to tell requestor.
     return;
   }
 
   GURL redirect_url = fetcher->GetRedirectURL();
   if (!redirect_url.is_empty()) {
     // And around we go again... Whee!
     ConnectToApplication(redirect_url, requestor_url, services.Pass(),
                          exposed_services.Pass());
     return;
   }
 
   // We already checked if the application was running before we fetched it, but
   // it might have started while the fetch was outstanding. We don't want to
   // have two copies of the app running, so check again.
   //
   // Also, it's possible the original URL was redirected to an app that is
   // already running.
-  if (ConnectToRunningApplication(fetcher->GetURL(), requestor_url, &services,
+  if (ConnectToRunningApplication(fetcher->GetURL(),
+                                  requestor_url, &services,
                                   &exposed_services)) {
     return;
   }
 
-  InterfaceRequest<Application> application_request(
+  InterfaceRequest<Application> request(
       RegisterShell(requested_url, fetcher->GetURL(), requestor_url,
                     services.Pass(), exposed_services.Pass()));
 
   // If the response begins with a #!mojo <content-handler-url>, use it.
   GURL content_handler_url;
   std::string shebang;
   if (fetcher->PeekContentHandler(&shebang, &content_handler_url)) {
     LoadWithContentHandler(
-        content_handler_url, application_request.Pass(),
+        content_handler_url, request.Pass(),
         fetcher->AsURLResponse(blocking_pool_,
                                static_cast<int>(shebang.size())));
     return;
   }
 
   MimeTypeToURLMap::iterator iter = mime_type_to_url_.find(fetcher->MimeType());
   if (iter != mime_type_to_url_.end()) {
-    LoadWithContentHandler(iter->second, application_request.Pass(),
+    LoadWithContentHandler(iter->second, request.Pass(),
                            fetcher->AsURLResponse(blocking_pool_, 0));
     return;
   }
 
   // TODO(aa): Sanity check that the thing we got looks vaguely like a mojo
   // application. That could either mean looking for the platform-specific dll
   // header, or looking for some specific mojo signature prepended to the
   // library.
 
-  fetcher->AsPath(blocking_pool_,
-                  base::Bind(&ApplicationManager::RunNativeApplication,
-                             weak_ptr_factory_.GetWeakPtr(),
-                             base::Passed(application_request.Pass()),
-                             cleanup_behavior, base::Passed(fetcher.Pass())));
+  fetcher->AsPath(
+      blocking_pool_,
+      base::Bind(&ApplicationManager::RunNativeApplication,
+                 weak_ptr_factory_.GetWeakPtr(), base::Passed(request.Pass()),
+                 cleanup_behavior, base::Passed(fetcher.Pass())));
 }
 
 void ApplicationManager::RunNativeApplication(
     InterfaceRequest<Application> application_request,
     NativeRunner::CleanupBehavior cleanup_behavior,
     scoped_ptr<Fetcher> fetcher,
     const base::FilePath& path,
     bool path_exists) {
   // We only passed fetcher to keep it alive. Done with it now.
   fetcher.reset();
@@ skipping 123 matching lines @@
     return Array<String>::From(args_it->second);
   return Array<String>();
 }
 
 void ApplicationManager::CleanupRunner(NativeRunner* runner) {
   native_runners_.erase(
       std::find(native_runners_.begin(), native_runners_.end(), runner));
 }
 
 }  // namespace mojo