1e99/pixelchat
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity

improve error handling, limit upload size

Browse source
This commit is contained in:
1e99 2024-12-16 18:10:18 +01:00
parent ef0d33aac4
commit 4ceec30e0c
2 changed files with 66 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
server/src/eu/e99/pixelchat/server/ImageHandler.java
View file

@ -19,34 +19,66 @@ public class ImageHandler {
private final Logger logger;
private final Storage storage;
private final TemporalAmount expireTime;
private final int maxImageSize;
public ImageHandler(Logger logger, Storage storage, TemporalAmount expireTime) {
public ImageHandler(Logger logger, Storage storage, TemporalAmount expireTime, int maxImageSize) {
this.logger = logger;
this.storage = storage;
this.expireTime = expireTime;
this.maxImageSize = maxImageSize;
}
public void uploadImage(Context ctx) throws IOException {
public void uploadImage(Context ctx) {
try {
InputStream body = ctx.bodyInputStream();
BufferedImage image = Imaging.getBufferedImage(body);
byte[] png = Imaging.writeImageToBytes(image, ImageFormats.PNG);
if (png.length > maxImageSize) {
ctx
.status(HttpStatus.CONTENT_TOO_LARGE)
.result("Image too large");
return;
}
Instant expiresAt = Instant.now().plus(this.expireTime);
String id = storage.put(png, expiresAt);
logger.info("Stored {} bytes as {}", png.length, id);
logger.info("Uploaded {} image bytes as {}", png.length, id);
ctx.
status(HttpStatus.CREATED).
contentType(ContentType.TEXT_PLAIN).
result(id);
} catch (IllegalArgumentException ignored) {
ctx
.status(HttpStatus.BAD_REQUEST)
.result("Unrecognized image format");
} catch (IOException e) {
ctx
.status(HttpStatus.INTERNAL_SERVER_ERROR)
.result("Internal Server Error");
this.logger.error("Failed to upload image", e);
} catch (OutOfMemoryError e) {
ctx
.status(HttpStatus.INSUFFICIENT_STORAGE)
.result("Insufficient storage on server");
this.logger.error("Out of memory", e);
}
}
public void downloadImage(Context ctx) throws IOException {
public void downloadImage(Context ctx) {
try {
String id = ctx.pathParam("id");
byte[] png = storage.get(id);
if (png == null) {
ctx.status(HttpStatus.NOT_FOUND);
ctx
.status(HttpStatus.NOT_FOUND)
.result("Image not found");
return;
}
@ -54,5 +86,12 @@ public class ImageHandler {
status(HttpStatus.OK).
contentType(ContentType.IMAGE_PNG).
result(png);
} catch (IOException e) {
ctx
.status(HttpStatus.INTERNAL_SERVER_ERROR)
.result("Internal Server Error");
this.logger.error("Failed to download image", e);
}
}
}

6
server/src/eu/e99/pixelchat/server/Main.java
View file

@ -17,15 +17,17 @@ public class Main {
new MemoryStorage(),
Duration.ofSeconds(5),
Duration.ofMinutes(2),
16 * 1024 * 1024, // 16 MiB
3000
);
}
private static void run(Logger logger, Storage storage, Duration clearTime, TemporalAmount expireTime, int port) {
private static void run(Logger logger, Storage storage, Duration clearTime, TemporalAmount expireTime, int maxImageSize, int port) {
ImageHandler handler = new ImageHandler(
logger,
storage,
expireTime
expireTime,
maxImageSize
);
Thread.ofVirtual().start(() -> {