Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hardcode limited MIME Types for the swap webserver

Browse Source 
The MIME Types only need to be set on files that we are actually using to
display in the browser.  All others should not be set so that they cannot
be abused.
This commit is contained in:
Hans-Christoph Steiner 2018-08-06 16:22:21 +02:00
parent e4c9d1d522
commit f1e5653601
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/full/java/org/fdroid/fdroid/net/LocalHTTPD.java
View File

@ -4,7 +4,6 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.util.Log; import android.util.Log;
import android.webkit.MimeTypeMap;
import fi.iki.elonen.NanoHTTPD; import fi.iki.elonen.NanoHTTPD;
import org.fdroid.fdroid.BuildConfig; import org.fdroid.fdroid.BuildConfig;
import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.Utils;
@ -40,6 +39,11 @@ public class LocalHTTPD extends NanoHTTPD {
if (useHttps) { if (useHttps) {
enableHTTPS(); enableHTTPS();
} }
MIME_TYPES = new HashMap<>(); // ignore nanohttpd's list
MIME_TYPES.put("apk", "application/vnd.android.package-archive");
MIME_TYPES.put("html", "text/html");
MIME_TYPES.put("png", "image/png");
MIME_TYPES.put("xml", "application/xml");
} }
/** /**
@ -296,16 +300,6 @@ public class LocalHTTPD extends NanoHTTPD {
return res; return res;
} }
private static String getAndroidMimeTypeForFile(String uri) {
String type = null;
String extension = MimeTypeMap.getFileExtensionFromUrl(uri);
if (extension != null) {
MimeTypeMap mime = MimeTypeMap.getSingleton();
type = mime.getMimeTypeFromExtension(extension);
}
return type;
}
private String findIndexFileInDirectory(File directory) { private String findIndexFileInDirectory(File directory) {
String indexFileName = "index.html"; String indexFileName = "index.html";
File indexFile = new File(directory, indexFileName); File indexFile = new File(directory, indexFileName);