ziver/zutil
1
0
Fork 0
Code Issues Pull requests Activity Actions

Bugfix

Browse source
This commit is contained in:
Ziver Koc 2010-12-26 18:38:48 +00:00
parent d2bf44365c
commit 7aa180f512
2 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/zutil/jee/upload/AjaxFileUpload.java
View file

@ -101,10 +101,13 @@ public abstract class AjaxFileUpload extends HttpServlet {
// Read allowed file types // Read allowed file types
if(config.getInitParameter("ALLOWED_EXTENSIONS") != null){ if(config.getInitParameter("ALLOWED_EXTENSIONS") != null){
String[] tmp = config.getInitParameter("TEMP_PATH").split(","); String[] tmp = config.getInitParameter("ALLOWED_EXTENSIONS").split(",");
StringBuilder ext_log = new StringBuilder("Allowed extensions: ");
for( String ext : tmp ){ for( String ext : tmp ){
ALLOWED_EXTENSIONS.add(ext.trim()); ALLOWED_EXTENSIONS.add(ext.trim());
ext_log.append(ext).append(", ");
} }
logger.info( ext_log.toString() );
} }
} catch (IOException e) { } catch (IOException e) {
@ -190,8 +193,15 @@ public abstract class AjaxFileUpload extends HttpServlet {
FileItemIterator it = upload.getItemIterator( request ); FileItemIterator it = upload.getItemIterator( request );
while( it.hasNext() ) { while( it.hasNext() ) {
FileItemStream item = it.next(); FileItemStream item = it.next();
if( !ALLOWED_EXTENSIONS.contains( FileUtil.fileExtension(item.getName()) )) // Is the file type allowed?
throw new Exception("Filetype "+FileUtil.fileExtension(item.getName())+" not allowed!"); if( !item.isFormField() && !ALLOWED_EXTENSIONS.contains( FileUtil.fileExtension(item.getName()) )){
String msg = "Filetype "+FileUtil.fileExtension(item.getName())+" is not allowed!";
logger.warning( msg );
listener.setStatus(Status.Error);
listener.setFileName( item.getName() );
listener.setMessage( msg );
return;
}
listener.setFileName( item.getName() ); listener.setFileName( item.getName() );
FileItem fileItem = factory.createItem(item.getFieldName(), FileItem fileItem = factory.createItem(item.getFieldName(),
item.getContentType(), item.isFormField(), item.getName()); item.getContentType(), item.isFormField(), item.getName());
@ -217,7 +227,7 @@ public abstract class AjaxFileUpload extends HttpServlet {
// Done // Done
listener.setStatus( Status.Done ); listener.setStatus( Status.Done );
} catch (Exception e) { } catch (Exception e) {
logger.log(Level.WARNING, null, e); logger.log(Level.SEVERE, null, e);
listener.setStatus(Status.Error); listener.setStatus(Status.Error);
listener.setFileName(""); listener.setFileName("");
listener.setMessage( e.getMessage() ); listener.setMessage( e.getMessage() );

6
src/zutil/jee/upload/AjaxFileUpload.js
View file

@ -88,7 +88,11 @@ function updateUploadStatus(){
jQuery("#UploadQueue #"+item.id).delay(5000).fadeOut("slow", function(){ jQuery("#UploadQueue #"+item.id).delay(5000).fadeOut("slow", function(){
jQuery(this).remove(); jQuery(this).remove();
}); });
//jQuery("#UploadQueue #"+item.id).attr("id", "del"); }
else if( item.status == "Error" ){
jQuery("#UploadQueue #"+item.id).delay(30000).fadeOut("slow", function(){
jQuery(this).remove();
});
} }
}); });
}, },