diff options
| author | Nils Schwabe | 2014-05-05 17:28:50 +0200 |
|---|---|---|
| committer | Nils Schwabe | 2014-05-05 17:28:50 +0200 |
| commit | 8b08e5de3c80b93bce50544f123070761e53a3f7 (patch) | |
| tree | 1a5964cba894b04bc0b1874fc12624d2c173f682 /src/main/java/org/openslx/imagemaster/ftp | |
| parent | Updated .gitignore (diff) | |
| download | masterserver-8b08e5de3c80b93bce50544f123070761e53a3f7.tar.gz masterserver-8b08e5de3c80b93bce50544f123070761e53a3f7.tar.xz masterserver-8b08e5de3c80b93bce50544f123070761e53a3f7.zip | |
Add some regex
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/ftp')
| -rw-r--r-- | src/main/java/org/openslx/imagemaster/ftp/ImageProcessor.java | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/main/java/org/openslx/imagemaster/ftp/ImageProcessor.java b/src/main/java/org/openslx/imagemaster/ftp/ImageProcessor.java index b7e96a4..62475e9 100644 --- a/src/main/java/org/openslx/imagemaster/ftp/ImageProcessor.java +++ b/src/main/java/org/openslx/imagemaster/ftp/ImageProcessor.java @@ -112,7 +112,18 @@ public class ImageProcessor return false; } - // TODO: check some regex? + if (!imageData.uuid.matches( "^[0-9a-f]{8}\\-[0-9a-f]{4}\\-[0-9a-f]{4}\\-[0-9a-f]{4}\\-[0-9a-f]{12}$" )) { + log.debug("UUID not valid"); + return false; + } else if (!imageData.imageName.matches( "^[a-zA-Z0-9_\\-]{50}$" )) { + log.debug("ImageName not valid"); + return false; + } else if (!imageData.imageOwner.matches( "^[0-9]*$" )) { + log.debug("ImageOwner not valid"); + return false; + } + // TODO: check some more regex + if ( DbImage.exists( imageData ) ) { return false; |