/hg/icedtea-web: fix PR592: netx can create invalid desktop entr...

[omajid at icedtea.classpath.org]

changeset 87624fe05628 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=87624fe05628
author: Omair Majid <omajid at redhat.com>
date: Wed Nov 24 13:12:52 2010 -0500

	fix PR592: netx can create invalid desktop entry files

	2010-11-24 Omair Majid <omajid at redhat.com>

	 Fix PR592.
	    * netx/net/sourceforge/jnlp/util/XDesktopEntry.java
	(getContentsAsReader): Sanitize information before adding to desktop
	file. (sanitize): New method. Ensure that there are no newlines
	in input.


diffstat:

2 files changed, 26 insertions(+), 3 deletions(-)
ChangeLog                                         |    7 ++++++
netx/net/sourceforge/jnlp/util/XDesktopEntry.java |   22 ++++++++++++++++++---

diffs (61 lines):

diff -r 476a91d02140 -r 87624fe05628 ChangeLog
--- a/ChangeLog	Wed Nov 24 10:55:50 2010 -0500
+++ b/ChangeLog	Wed Nov 24 13:12:52 2010 -0500
@@ -1,3 +1,10 @@ 2010-11-24  Omair Majid  <omajid at redhat.
+2010-11-24  Omair Majid  <omajid at redhat.com>
+
+	Fix PR592.
+	* netx/net/sourceforge/jnlp/util/XDesktopEntry.java
+	(getContentsAsReader): Sanitize information before adding to desktop file.
+	(sanitize): New method. Ensure that there are no newlines in input.
+
 2010-11-24  Omair Majid  <omajid at redhat.com>
 
 	* netx/net/sourceforge/jnlp/resources/Messages.properties: Add
diff -r 476a91d02140 -r 87624fe05628 netx/net/sourceforge/jnlp/util/XDesktopEntry.java
--- a/netx/net/sourceforge/jnlp/util/XDesktopEntry.java	Wed Nov 24 10:55:50 2010 -0500
+++ b/netx/net/sourceforge/jnlp/util/XDesktopEntry.java	Wed Nov 24 13:12:52 2010 -0500
@@ -80,9 +80,9 @@ public class XDesktopEntry {
 
         String fileContents = "[Desktop Entry]\n";
         fileContents += "Version=1.0\n";
-        fileContents += "Name=" + file.getTitle() + "\n";
+        fileContents += "Name=" + sanitize(file.getTitle()) + "\n";
         fileContents += "GenericName=Java Web Start Application\n";
-        fileContents += "Comment=" + file.getInformation().getDescription() + "\n";
+        fileContents += "Comment=" + sanitize(file.getInformation().getDescription()) + "\n";
         fileContents += "Type=Application\n";
         if (iconLocation != null) {
             fileContents += "Icon=" + iconLocation + "\n";
@@ -91,7 +91,7 @@ public class XDesktopEntry {
 
         }
         if (file.getInformation().getVendor() != null) {
-            fileContents += "Vendor=" + file.getInformation().getVendor() + "\n";
+            fileContents += "Vendor=" + sanitize(file.getInformation().getVendor()) + "\n";
         }
 
         //Shortcut executes the jnlp from cache and system preferred java..
@@ -99,6 +99,22 @@ public class XDesktopEntry {
 
         return new StringReader(fileContents);
 
+    }
+
+    /**
+     * Sanitizes a string so that it can be used safely in a key=value pair in a
+     * desktop entry file.
+     *
+     * @param input a String to sanitize
+     * @return a string safe to use as either the key or the value in the
+     * key=value pair in a desktop entry file
+     */
+    private static String sanitize(String input) {
+        if (input == null) {
+            return "";
+        }
+        /* key=value pairs must be a single line */
+        return input.split("\n")[0];
     }
 
     /**