X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FUploadImagePage.java;h=2c7b0a9a55ff55865de54386704b524944d5e880;hp=d938641f6384cd3788836b7ffc8f10f85e34586d;hb=6b65a32a69b0e3721c58b4501a6b58fa4989f162;hpb=1360e42f232e2f0fd2ae0cb1308b2c3fe1f57ce7

diff --git a/src/main/java/net/pterodactylus/sone/web/UploadImagePage.java b/src/main/java/net/pterodactylus/sone/web/UploadImagePage.java
index d938641..2c7b0a9 100644
--- a/src/main/java/net/pterodactylus/sone/web/UploadImagePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/UploadImagePage.java
@@ -17,6 +17,9 @@
 
 package net.pterodactylus.sone.web;
 
+import static com.google.common.base.Optional.fromNullable;
+import static java.util.logging.Logger.getLogger;
+
 import java.awt.Image;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -31,12 +34,13 @@ import javax.imageio.ImageReader;
 import javax.imageio.stream.ImageInputStream;
 
 import net.pterodactylus.sone.data.Album;
+import net.pterodactylus.sone.data.IdBuilder;
+import net.pterodactylus.sone.data.Image.Modifier.ImageTitleMustNotBeEmpty;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.data.TemporaryImage;
 import net.pterodactylus.sone.text.TextFilter;
 import net.pterodactylus.sone.web.page.FreenetRequest;
 import net.pterodactylus.util.io.Closer;
-import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.template.Template;
 import net.pterodactylus.util.template.TemplateContext;
 import net.pterodactylus.util.web.Method;
@@ -53,8 +57,8 @@ import freenet.support.api.HTTPUploadedFile;
  */
 public class UploadImagePage extends SoneTemplatePage {
 
-	/** The logger. */
-	private static final Logger logger = Logging.getLogger(UploadImagePage.class);
+	private static final Logger logger = getLogger(UploadImagePage.class.getName());
+	private static final String UNKNOWN_MIME_TYPE = "application/octet-stream";
 
 	/**
 	 * Creates a new “upload image” page.
@@ -80,7 +84,7 @@ public class UploadImagePage extends SoneTemplatePage {
 		super.processTemplate(request, templateContext);
 		if (request.getMethod() == Method.POST) {
 			Sone currentSone = getCurrentSone(request.getToadletContext());
-			String parentId = request.getHttpRequest().getPartAsStringFailsafe("parent", 36);
+			String parentId = request.getHttpRequest().getPartAsStringFailsafe("parent", IdBuilder.ID_STRING_LENGTH);
 			Album parent = webInterface.getCore().getAlbum(parentId);
 			if (parent == null) {
 				throw new RedirectException("noPermission.html");
@@ -124,6 +128,8 @@ public class UploadImagePage extends SoneTemplatePage {
 			} catch (IOException ioe1) {
 				logger.log(Level.WARNING, "Could not read uploaded image!", ioe1);
 				return;
+			} catch (ImageTitleMustNotBeEmpty itmnbe) {
+				throw new RedirectException("emptyImageTitle.html");
 			} finally {
 				Closer.close(imageDataInputStream);
 				Closer.flush(uploadedImage);
@@ -150,12 +156,13 @@ public class UploadImagePage extends SoneTemplatePage {
 			ImageInputStream imageInputStream = ImageIO.createImageInputStream(imageDataInputStream);
 			Iterator<ImageReader> imageReaders = ImageIO.getImageReaders(imageInputStream);
 			if (imageReaders.hasNext()) {
-				return imageReaders.next().getOriginatingProvider().getMIMETypes()[0];
+				return fromNullable(imageReaders.next().getOriginatingProvider().getMIMETypes())
+						.or(new String[] { UNKNOWN_MIME_TYPE })[0];
 			}
 		} catch (IOException ioe1) {
 			logger.log(Level.FINE, "Could not detect MIME type for image.", ioe1);
 		}
-		return "application/octet-stream";
+		return UNKNOWN_MIME_TYPE;
 	}
 
 }