GTK: improve app mode .desktop file creation....

chrome/browser/shell_integration_linux.cc

 // Copyright (c) 2006-2009 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 "chrome/browser/shell_integration.h"
 
 #include <fcntl.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
@@ skipping 11 matching lines @@
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/scoped_temp_dir.h"
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
 #include "base/task.h"
 #include "base/thread.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
+#include "chrome/common/chrome_plugin_util.h"
 #include "chrome/common/chrome_switches.h"
 #include "googleurl/src/gurl.h"
 
 namespace {
 
 const char* GetDesktopName() {
 #if defined(GOOGLE_CHROME_BUILD)
   return "google-chrome.desktop";
 #else  // CHROMIUM_BUILD
   static const char* name = NULL;
@@ skipping 72 matching lines @@
   }
 
   virtual void Run() {
     // TODO(phajdan.jr): Report errors from this function, possibly as infobars.
     std::string template_contents;
     if (!GetDesktopShortcutTemplate(&template_contents))
       return;
 
     FilePath shortcut_filename =
         ShellIntegration::GetDesktopShortcutFilename(shortcut_info_.url);
+    if (shortcut_filename.empty())
+      return;
 
     std::string icon_name = CreateIcon(shortcut_filename);
 
     std::string contents = ShellIntegration::GetDesktopFileContents(
         template_contents, shortcut_info_.url, shortcut_info_.title,
         icon_name);
 
     if (shortcut_info_.create_on_desktop)
       CreateOnDesktop(shortcut_filename, contents);
 
@@ skipping 152 matching lines @@
   argv.push_back("default-web-browser");
 
   std::string browser;
   // We don't care about the return value here.
   base::GetAppOutput(CommandLine(argv), &browser);
   return browser.find("irefox") != std::string::npos;
 }
 
 FilePath ShellIntegration::GetDesktopShortcutFilename(const GURL& url) {
   // Use a prefix, because xdg-desktop-menu requires it.
-  std::wstring filename = std::wstring(chrome::kBrowserProcessExecutableName) +
-      L"-" + UTF8ToWide(url.spec()) + L".desktop";
-  file_util::ReplaceIllegalCharacters(&filename, '_');
+  std::wstring filename_wide =
+      std::wstring(chrome::kBrowserProcessExecutableName) + L"-" +
+      UTF8ToWide(url.spec());
+  file_util::ReplaceIllegalCharacters(&filename_wide, '_');
 
-  // Return BaseName to be absolutely sure we're not vulnerable to a directory
-  // traversal attack.
-  return FilePath::FromWStringHack(filename).BaseName();
+  FilePath desktop_path;
+  if (!PathService::Get(chrome::DIR_USER_DESKTOP, &desktop_path))
+    return FilePath();
+
+  FilePath filepath = desktop_path.Append(
+      FilePath::FromWStringHack(filename_wide));
+  FilePath alternative_filepath(filepath.value() + ".desktop");
+  for (size_t i = 1; i < 100; ++i) {
+    if (file_util::PathExists(FilePath(alternative_filepath))) {
+      alternative_filepath = FilePath(filepath.value() + "_" + IntToString(i) +
+                                      ".desktop");
+    } else {
+      return FilePath(alternative_filepath).BaseName();
+    }
+  }
+
+  return FilePath();
 }
 
 std::string ShellIntegration::GetDesktopFileContents(
     const std::string& template_contents, const GURL& url,
     const string16& title, const std::string& icon_name) {
   // See http://standards.freedesktop.org/desktop-entry-spec/latest/
   // Although not required by the spec, Nautilus on Ubuntu Karmic creates its
   // launchers with an xdg-open shebang. Follow that convention.
   std::string output_buffer("#!/usr/bin/env xdg-open\n");
   StringTokenizer tokenizer(template_contents, "\n");
   while (tokenizer.GetNext()) {
     if (tokenizer.token().substr(0, 5) == "Exec=") {
       std::string exec_path = tokenizer.token().substr(5);
       StringTokenizer exec_tokenizer(exec_path, " ");
       std::string final_path;
       while (exec_tokenizer.GetNext()) {
         if (exec_tokenizer.token() != "%U")
           final_path += exec_tokenizer.token() + " ";
       }
-      std::wstring app_switch_wide(switches::kApp);
-      std::string app_switch(StringPrintf("\"--%s=%s\"",
-                                          WideToUTF8(app_switch_wide).c_str(),
-                                          url.spec().c_str()));
-      // Sanitize the command line string.
-      ReplaceSubstringsAfterOffset(&app_switch, 0, "%", "%%");
-      ReplaceSubstringsAfterOffset(&app_switch, 0, ";", "");
-      ReplaceSubstringsAfterOffset(&app_switch, 0, "$", "");
-      output_buffer += std::string("Exec=") + final_path + app_switch + "\n";
+      std::string switches;
+      CPB_GetCommandLineArgumentsCommon(url.spec().c_str(), &switches);
+      output_buffer += std::string("Exec=") + final_path + switches + "\n";
     } else if (tokenizer.token().substr(0, 5) == "Name=") {
       std::string final_title = UTF16ToUTF8(title);
       // Make sure no endline characters can slip in and possibly introduce
       // additional lines (like Exec, which makes it a security risk). Also
       // use the URL as a default when the title is empty.
       if (final_title.empty() ||
           final_title.find("\n") != std::string::npos ||
           final_title.find("\r") != std::string::npos) {
         final_title = url.spec();
       }
@@ skipping 10 matching lines @@
     }
   }
   return output_buffer;
 }
 
 void ShellIntegration::CreateDesktopShortcut(
     const ShortcutInfo& shortcut_info) {
   g_browser_process->file_thread()->message_loop()->PostTask(FROM_HERE,
       new CreateDesktopShortcutTask(shortcut_info));
 }