Sulkta-OSS/dynmap-neoforge
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions 1

Disallow .. in file path. Also logging, imports

Browse source
This commit is contained in:
zeeZ 2011-06-27 21:23:39 +08:00 • committed by mikeprimm
parent ca5b6bb13b
commit ca705ca6d2
3 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/main/java/org/dynmap/regions/RegionHandler.java
View file

@ -1,24 +1,24 @@
package org.dynmap.regions; package org.dynmap.regions;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File; import java.io.File;
import java.util.List;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.Collection; import java.util.Collection;
import java.util.Map;
import java.util.HashSet; import java.util.HashSet;
import java.util.logging.Level; import java.util.List;
import java.util.Map;
import org.bukkit.util.config.Configuration; import org.bukkit.util.config.Configuration;
import org.dynmap.ConfigurationNode; import org.dynmap.ConfigurationNode;
import org.dynmap.Log;
import org.dynmap.web.HttpRequest; import org.dynmap.web.HttpRequest;
import org.dynmap.web.HttpResponse; import org.dynmap.web.HttpResponse;
import org.dynmap.web.Json; import org.dynmap.web.Json;
import org.dynmap.web.handlers.FileHandler; import org.dynmap.web.handlers.FileHandler;
import java.io.ByteArrayOutputStream;
import java.io.ByteArrayInputStream;
public class RegionHandler extends FileHandler { public class RegionHandler extends FileHandler {
private ConfigurationNode regions; private ConfigurationNode regions;
public RegionHandler(ConfigurationNode regions) { public RegionHandler(ConfigurationNode regions) {
@ -81,9 +81,9 @@ public class RegionHandler extends FileHandler {
fos.close(); fos.close();
return new ByteArrayInputStream(fos.toByteArray()); return new ByteArrayInputStream(fos.toByteArray());
} catch (FileNotFoundException ex) { } catch (FileNotFoundException ex) {
log.log(Level.SEVERE, "Exception while writing JSON-file.", ex); Log.severe("Exception while writing JSON-file.", ex);
} catch (IOException ioe) { } catch (IOException ioe) {
log.log(Level.SEVERE, "Exception while writing JSON-file.", ioe); Log.severe("Exception while writing JSON-file.", ioe);
} }
return null; return null;
} }

5
src/main/java/org/dynmap/web/handlers/FileHandler.java
View file

@ -6,7 +6,6 @@ import java.io.OutputStream;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.Map; import java.util.Map;
import java.util.logging.Logger;
import org.dynmap.web.HttpField; import org.dynmap.web.HttpField;
import org.dynmap.web.HttpHandler; import org.dynmap.web.HttpHandler;
@ -15,8 +14,6 @@ import org.dynmap.web.HttpResponse;
import org.dynmap.web.HttpStatus; import org.dynmap.web.HttpStatus;
public abstract class FileHandler implements HttpHandler { public abstract class FileHandler implements HttpHandler {
protected static final Logger log = Logger.getLogger("Minecraft");
protected static final String LOG_PREFIX = "[dynmap] ";
//BUG-this breaks re-entrancy of this handler, which is called from multiple threads (one per request) //BUG-this breaks re-entrancy of this handler, which is called from multiple threads (one per request)
//private byte[] readBuffer = new byte[40960]; //private byte[] readBuffer = new byte[40960];
//Replace with pool of buffers //Replace with pool of buffers
@ -59,7 +56,7 @@ public abstract class FileHandler implements HttpHandler {
if (qmark >= 0) if (qmark >= 0)
path = path.substring(0, qmark); path = path.substring(0, qmark);
if (path.startsWith("/") || path.startsWith(".")) if (path.startsWith("/") || path.startsWith(".") || path.contains(".."))
return null; return null;
if (path.length() == 0) if (path.length() == 0)
path = getDefaultFilename(path); path = getDefaultFilename(path);

3
src/main/java/org/dynmap/web/handlers/FilesystemHandler.java
View file

@ -21,6 +21,9 @@ public class FilesystemHandler extends FileHandler {
} }
@Override @Override
protected InputStream getFileInput(String path, HttpRequest request, HttpResponse response) { protected InputStream getFileInput(String path, HttpRequest request, HttpResponse response) {
if(path == null)
return null;
File file = new File(root, path); File file = new File(root, path);
FileLockManager.getReadLock(file); FileLockManager.getReadLock(file);
if (file.getAbsolutePath().startsWith(root.getAbsolutePath()) && file.isFile()) { if (file.getAbsolutePath().startsWith(root.getAbsolutePath()) && file.isFile()) {