Changeset 4200 in josm

Timestamp:

Jul 3, 2011 8:08:43 PM (23 months ago)

Author:

jttt

Message:

Fix #4667 Make preferences file only readable by the owner

File:

• trunk/src/org/openstreetmap/josm/data/Preferences.java (modified) (12 diffs)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -25 +25 @@
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.SortedMap;
 import java.util.TreeMap;
-import java.util.Map.Entry;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.regex.Matcher;
@@ -35 +35 @@
 import javax.swing.JOptionPane;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.io.XmlWriter;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.tools.ColorHelper;
 import org.openstreetmap.josm.tools.Utils;
@@ -365 +365 @@
         if(Main.applet)
             return;
-        File prefFile = new File(getPreferencesDirFile(), "preferences");
+
+        File prefFile = getPreferenceFile();
+        File backupFile = new File(prefFile + "_backup");
 
         // Backup old preferences if there are old preferences
         if(prefFile.exists()) {
-            copyFile(prefFile, new File(prefFile + "_backup"));
+            copyFile(prefFile, backupFile);
         }
 
@@ -386 +388 @@
         copyFile(tmpFile, prefFile);
         tmpFile.delete();
+
+        setCorrectPermissions(prefFile);
+        setCorrectPermissions(backupFile);
+    }
+
+
+    private void setCorrectPermissions(File file) {
+        file.setReadable(false, false);
+        file.setWritable(false, false);
+        file.setExecutable(false, false);
+        file.setReadable(true, true);
+        file.setWritable(true, true);
     }
 
@@ -560 +574 @@
     synchronized public Color getColor(String colName, String specName, Color def) {
         String colKey = colName.toLowerCase().replaceAll("[^a-z0-9]+",".");
-        if(!colKey.equals(colName))
+        if(!colKey.equals(colName)) {
             colornames.put(colKey, colName);
+        }
         putDefault("color."+colKey, ColorHelper.color2html(def));
         String colStr = specName != null ? get("color."+specName) : "";
@@ -709 +724 @@
      * Used to read a 2-dimensional array of strings from the preference file.
      * If not a single entry could be found, def is returned.
-     */ 
+     */
     synchronized public Collection<Collection<String>> getArray(String key,
             Collection<Collection<String>> def)
-    {
-        if(def != null)
+            {
+        if(def != null) {
             putArrayDefault(key, def);
+        }
         key += ".";
         int num = 0;
@@ -722 +738 @@
         }
         return num == 0 ? def : col;
-    }
-    
+            }
+
     synchronized public boolean putArray(String key, Collection<Collection<String>> val) {
         boolean changed = false;
@@ -796 +812 @@
     public <T> List<T> getListOfStructs(String key, Collection<T> def, Class<T> klass) {
         Collection<Collection<String>> array =
-                getArray(key, def == null ? null : serializeListOfStructs(def, klass));
+            getArray(key, def == null ? null : serializeListOfStructs(def, klass));
         if (array == null)
             return def == null ? null : new ArrayList<T>(def);
@@ -829 +845 @@
         Collection<Collection<String>> vals = new ArrayList<Collection<String>>();
         for (T struct : l) {
-            if (struct == null)
+            if (struct == null) {
                 continue;
+            }
             vals.add(serializeStruct(struct, klass));
         }
@@ -937 +954 @@
      */
     private final static String[] DEFAULT_PLUGIN_SITE = {
-        "http://josm.openstreetmap.de/plugin%<?plugins=>"};
+    "http://josm.openstreetmap.de/plugin%<?plugins=>"};
 
     /**
@@ -973 +990 @@
         parser.map("collection", XMLCollection.class);
         parser.startWithValidation(in,
-        "http://josm.openstreetmap.de/preferences-1.0", "resource://data/preferences.xsd");
+                "http://josm.openstreetmap.de/preferences-1.0", "resource://data/preferences.xsd");
         LinkedList<String> vals = new LinkedList<String>();
         while(parser.hasNext()) {
@@ -990 +1007 @@
     public String toXML(boolean nopass) {
         StringBuilder b = new StringBuilder(
-        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+                "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
         "<preferences xmlns=\"http://josm.openstreetmap.de/preferences-1.0\">\n");
         for (Entry<String, String> p : properties.entrySet()) {