diff options
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/ftp/ImageProcessor.java')
| -rw-r--r-- | src/main/java/org/openslx/imagemaster/ftp/ImageProcessor.java | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/src/main/java/org/openslx/imagemaster/ftp/ImageProcessor.java b/src/main/java/org/openslx/imagemaster/ftp/ImageProcessor.java index 20772ff..a9a7fc4 100644 --- a/src/main/java/org/openslx/imagemaster/ftp/ImageProcessor.java +++ b/src/main/java/org/openslx/imagemaster/ftp/ImageProcessor.java @@ -43,8 +43,6 @@ public class ImageProcessor DbImage.delete( dbImage.UUID ); log.info( "Deleted dbimage from db: " + dbImage.UUID + " due to timeout"); } else { - log.info( "Added user '" + dbImage.ftpUser + "' to list again." ); - // add image to process list again ImageData imageData = new ImageData( dbImage.UUID, dbImage.imageVersion, dbImage.imageName, dbImage.imageCreateTime.getTime(), dbImage.imageUpdateTime.getTime(), dbImage.imageOwner, dbImage.contentOperatingSystem, dbImage.isValid, dbImage.isDeleted, dbImage.shortDescription, dbImage.longDescription, dbImage.fileSize ); images.put( dbImage.ftpUser, imageData ); @@ -105,6 +103,13 @@ public class ImageProcessor public static void addImageDataToProcess( ImageData imageData, String username, String password ) throws ImageDataException { log.info( "Adding image to process list: " + imageData.imageName + ", submitted by " + username ); + + if ( imageData.uuid == null || imageData.imageName == null + || imageData.imageOwner == null || imageData.conentOperatingSystem == null + || imageData.imageShortDescription == null + || imageData.imageLongDescription == null ) { + throw new ImageDataException(ImageDataError.INVALID_DATA, "Missing arguments."); + } if ( imageData.uuid.isEmpty() || imageData.imageName.isEmpty() || imageData.imageOwner.isEmpty() || imageData.conentOperatingSystem.isEmpty() @@ -115,23 +120,13 @@ public class ImageProcessor if (!imageData.uuid.matches( "^[0-9a-f]{8}\\-[0-9a-f]{4}\\-[0-9a-f]{4}\\-[0-9a-f]{4}\\-[0-9a-f]{12}$" )) { throw new ImageDataException(ImageDataError.INVALID_DATA, "UUID not valid."); - } else if (!imageData.imageName.matches( "^[a-zA-Z0-9_\\-]{5,50}$" )) { + } else if (imageData.imageName.length() < 5 || imageData.imageName.length() > 50) { throw new ImageDataException(ImageDataError.INVALID_DATA, "ImageName not valid. (Length must be 5 to 50)"); } else if (DbUser.getUserIdByName( imageData.imageOwner ) != 0) { throw new ImageDataException(ImageDataError.INVALID_DATA, "ImageOwner not valid."); - } else if (!imageData.conentOperatingSystem.matches( "^[\\w][-0-9a-zA-Z]{3,20}$" )) { - throw new ImageDataException(ImageDataError.INVALID_DATA, "ContentOperatingSystem not valid. (Length must be 3 to 20)"); - } else if (!imageData.imageShortDescription.matches( "^[-\\w!\"§$%&/()=?+*#'^]$" )) { - throw new ImageDataException(ImageDataError.INVALID_DATA, "ImageShortDescription is not valid."); - } else if (!imageData.imageLongDescription.matches( "^[-\\w!\"§$%&/()=?+*#'^]$" )) { - throw new ImageDataException(ImageDataError.INVALID_DATA, "ImageLongDescription is not valid."); } else if ( imageData.fileSize <= 0 ) { throw new ImageDataException(ImageDataError.INVALID_DATA, "Filesize needs to be greater than 0."); - } - - - // TODO: check some more regex - + } if ( DbImage.exists( imageData ) ) { throw new ImageDataException( ImageDataError.INVALID_DATA, "Image with this UUID is already existing." ); |