Plexus
/
Module-HTTPD
mirror of https://github.com/plexusorg/Module-HTTPD.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

uhhhh 

uhhhhhh 😳
This commit is contained in:
ayunami2000 2022-04-17 23:09:53 -04:00
parent 2117cf7041
commit f8bd688fa5
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/dev/plex/request/AbstractServlet.java
View File

@ -15,7 +15,6 @@ import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.text.CharacterIterator;
import java.text.StringCharacterIterator;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import lombok.Data;

26
src/main/java/dev/plex/request/SchematicUploadServlet.java
View File

@ -28,7 +28,7 @@ public class SchematicUploadServlet extends HttpServlet
return;
}
File[] schematics = worldeditFolder.listFiles();
Part uploadPart = null;
Part uploadPart;
try
{
uploadPart = req.getPart("file");
@ -39,19 +39,21 @@ public class SchematicUploadServlet extends HttpServlet
return;
}
String filename = uploadPart.getSubmittedFileName().replaceAll("[^a-zA-Z0-9'!,_ .-]", "_");
if (schemNameMatcher.matcher(filename).matches())
if (!schemNameMatcher.matcher(filename).matches())
{
boolean alreadyExists = schematics != null && Arrays.stream(schematics).anyMatch(file -> HTTPDModule.fileNameEquals(file.getName(), filename));
if (alreadyExists)
{
resp.getWriter().println(schematicUploadBadHTML("A schematic with the name <b>" + filename + "</b> already exists!"));
return;
}
InputStream inputStream = uploadPart.getInputStream();
Files.copy(inputStream, new File(worldeditFolder, filename).toPath(), StandardCopyOption.REPLACE_EXISTING);
inputStream.close();
resp.getWriter().println(schematicUploadGoodHTML("Successfully uploaded <b>" + filename + "."));
resp.getWriter().println(schematicUploadBadHTML("That is not a valid schematic filename!"));
return;
}
boolean alreadyExists = schematics != null && Arrays.stream(schematics).anyMatch(file -> HTTPDModule.fileNameEquals(file.getName(), filename));
if (alreadyExists)
{
resp.getWriter().println(schematicUploadBadHTML("A schematic with the name <b>" + filename + "</b> already exists!"));
return;
}
InputStream inputStream = uploadPart.getInputStream();
Files.copy(inputStream, new File(worldeditFolder, filename).toPath(), StandardCopyOption.REPLACE_EXISTING);
inputStream.close();
resp.getWriter().println(schematicUploadGoodHTML("Successfully uploaded <b>" + filename + "."));
}
private String schematicUploadBadHTML(String message)