echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* DataHelper: Sanity checks in storeProps(), use

Browse Source 
storeProps() for router config again
This commit is contained in:
zzz
2012-10-05 13:00:52 +00:00
parent 1d174d6797
commit 090d59fcb7
2 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/java/src/net/i2p/data/DataHelper.java
View File

@ -388,8 +388,6 @@ public class DataHelper {
* - Leading whitespace is not trimmed
* - '=' is the only key-termination character (not ':' or whitespace)
*
* Note that the escaping of \r or \n was probably a mistake and should be taken out.
*
*/
public static void loadProps(Properties props, File file) throws IOException {
loadProps(props, file, false);
@ -448,20 +446,40 @@ public class DataHelper {
* Writes the props to the file, unsorted (unless props is an OrderedProperties)
* Note that this does not escape the \r or \n that are unescaped in loadProps() above.
* As of 0.8.1, file will be mode 600.
*
* Leading or trailing whitespace in values is not checked but
* will be trimmed by loadProps()
*
* @throws IllegalArgumentException if a key contains any of "#=\n" or starts with ';',
* or a value contains '#' or '\n'
*/
public static void storeProps(Properties props, File file) throws IOException {
PrintWriter out = null;
IllegalArgumentException iae = null;
try {
out = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new SecureFileOutputStream(file), "UTF-8")));
out.println("# NOTE: This I2P config file must use UTF-8 encoding");
for (Map.Entry entry : props.entrySet()) {
String name = (String) entry.getKey();
String val = (String) entry.getValue();
if (name.contains("#") ||
name.contains("=") ||
name.contains("\n") ||
name.startsWith(";") ||
val.contains("#") ||
val.contains("\n")) {
if (iae == null)
iae = new IllegalArgumentException("Invalid character (one of \"#;=\\n\") in key or value: \"" +
name + "\" = \"" + val + '\"');
continue;
}
out.println(name + "=" + val);
}
} finally {
if (out != null) out.close();
}
if (iae != null)
throw iae;
}
/**