diff options
| author | Nils Schwabe | 2014-05-05 18:23:02 +0200 |
|---|---|---|
| committer | Nils Schwabe | 2014-05-05 18:23:02 +0200 |
| commit | 01970c0672f9b8f4dbf9a35f40e8b0d3d67c0554 (patch) | |
| tree | 1ef7c480d0a548eeb8daf3d6a46e9981e9b7c5ab /src/main/java/org/openslx/imagemaster/ftp | |
| parent | Add some regex (diff) | |
| download | masterserver-01970c0672f9b8f4dbf9a35f40e8b0d3d67c0554.tar.gz masterserver-01970c0672f9b8f4dbf9a35f40e8b0d3d67c0554.tar.xz masterserver-01970c0672f9b8f4dbf9a35f40e8b0d3d67c0554.zip | |
Fix message signing
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/ftp')
| -rw-r--r-- | src/main/java/org/openslx/imagemaster/ftp/ImageProcessor.java | 5 | ||||
| -rw-r--r-- | src/main/java/org/openslx/imagemaster/ftp/MasterFtpServer.java | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/main/java/org/openslx/imagemaster/ftp/ImageProcessor.java b/src/main/java/org/openslx/imagemaster/ftp/ImageProcessor.java index 62475e9..05b8101 100644 --- a/src/main/java/org/openslx/imagemaster/ftp/ImageProcessor.java +++ b/src/main/java/org/openslx/imagemaster/ftp/ImageProcessor.java @@ -115,12 +115,9 @@ 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}$" )) { log.debug("UUID not valid"); return false; - } else if (!imageData.imageName.matches( "^[a-zA-Z0-9_\\-]{50}$" )) { + } else if (!imageData.imageName.matches( "^[a-zA-Z0-9_\\-]{5,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 diff --git a/src/main/java/org/openslx/imagemaster/ftp/MasterFtpServer.java b/src/main/java/org/openslx/imagemaster/ftp/MasterFtpServer.java index e3514f6..0f5267f 100644 --- a/src/main/java/org/openslx/imagemaster/ftp/MasterFtpServer.java +++ b/src/main/java/org/openslx/imagemaster/ftp/MasterFtpServer.java @@ -46,9 +46,9 @@ public class MasterFtpServer implements Runnable // config ssl SslConfigurationFactory sslConfigFactory = new SslConfigurationFactory(); - sslConfigFactory.setKeystoreFile( new File( Globals.getPropertyString( PropString.KEYSTOREFILE ) ) ); - sslConfigFactory.setKeyAlias( Globals.getPropertyString( PropString.KEYSTOREALIAS ) ); - sslConfigFactory.setKeystorePassword( Globals.getPropertyString( PropString.KEYSTOREPASSWORD ) ); + sslConfigFactory.setKeystoreFile( new File( Globals.getPropertyString( PropString.FTPKEYSTOREFILE ) ) ); + sslConfigFactory.setKeyAlias( Globals.getPropertyString( PropString.FTPKEYSTOREALIAS ) ); + sslConfigFactory.setKeystorePassword( Globals.getPropertyString( PropString.FTPKEYSTOREPASSWORD ) ); // set the port of the listener factory.setPort( port ); |