2004-11-06 jrandom

* Expose a drop down on the /configclients.jsp to enter the outbound
      tunnel depth.
    * Improved *hosts.txt loading
    * Explicitly override the JVM's timezone settings to use GMT so that
      any client applications which use timezones won't leak sensitive
      data (thanks gott!)
    * Bundle sam.jar in the update (thanks duck!)
This commit is contained in:
jrandom
2004-11-07 02:25:13 +00:00
committed by zzz
parent 592e9dc3ff
commit 5f113f1610
8 changed files with 57 additions and 11 deletions

View File

@ -16,6 +16,7 @@ import java.util.Properties;
import java.util.StringTokenizer;
import net.i2p.I2PAppContext;
import net.i2p.data.DataHelper;
import net.i2p.data.Destination;
import net.i2p.util.Log;
@ -61,12 +62,10 @@ public class HostsTxtNamingService extends NamingService {
for (int i = 0; i < filenames.size(); i++) {
String hostsfile = (String)filenames.get(i);
Properties hosts = new Properties();
FileInputStream fis = null;
try {
File f = new File(hostsfile);
if ( (f.exists()) && (f.canRead()) ) {
fis = new FileInputStream(f);
hosts.load(fis);
DataHelper.loadProps(hosts, f);
String key = hosts.getProperty(hostname);
if ( (key != null) && (key.trim().length() > 0) ) {
@ -78,11 +77,6 @@ public class HostsTxtNamingService extends NamingService {
}
} catch (Exception ioe) {
_log.error("Error loading hosts file " + hostsfile, ioe);
} finally {
if (fis != null) try {
fis.close();
} catch (IOException ioe) { // nop
}
}
// not found, continue to the next file
}