Author: ghuber
Date: Wed Jan 14 15:12:33 2015
New Revision: 1651697
URL: http://svn.apache.org/r1651697
Log:
Build fail debugging
Modified:
roller/trunk/app/pom.xml
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/FileContentManagerImpl.java
Modified: roller/trunk/app/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/pom.xml?rev=1651697&r1=1651696&r2=1651697&view=diff
==============================================================================
--- roller/trunk/app/pom.xml (original)
+++ roller/trunk/app/pom.xml Wed Jan 14 15:12:33 2015
@@ -356,7 +356,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
<configuration>
<attachClasses>true</attachClasses>
</configuration>
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/FileContentManagerImpl.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/FileContentManagerImpl.java?rev=1651697&r1=1651696&r2=1651697&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/FileContentManagerImpl.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/FileContentManagerImpl.java
Wed Jan 14 15:12:33 2015
@@ -35,88 +35,92 @@ import org.apache.roller.weblogger.pojos
import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.util.RollerMessages;
-
/**
- * Manages contents of the file uploaded to Roller weblogs.
+ * Manages contents of the file uploaded to Roller weblogs.
*
* This base implementation writes file content to a file system.
*/
public class FileContentManagerImpl implements FileContentManager {
-
+
private static Log log = LogFactory.getLog(FileContentManagerImpl.class);
-
+
private String storageDir = null;
/**
* Create file content manager.
*/
public FileContentManagerImpl() {
-
- String inStorageDir =
WebloggerConfig.getProperty("mediafiles.storage.dir");
-
+
+ String inStorageDir = WebloggerConfig
+ .getProperty("mediafiles.storage.dir");
+
// Note: System property expansion is now handled by WebloggerConfig.
-
+
if (inStorageDir == null || inStorageDir.trim().length() < 1) {
- inStorageDir = System.getProperty("user.home")
- + File.separator+"roller_data"+File.separator+"mediafiles";
+ inStorageDir = System.getProperty("user.home") + File.separator
+ + "roller_data" + File.separator + "mediafiles";
}
-
+
if (!inStorageDir.endsWith(File.separator)) {
inStorageDir += File.separator;
}
-
- this.storageDir = inStorageDir.replace('/',File.separatorChar);
- }
-
- public void initialize() {
+ this.storageDir = inStorageDir.replace('/', File.separatorChar);
+
+ System.out
+ .println(" ***** FileContentManager mediafiles.storage.dir : "
+ + inStorageDir);
}
+ public void initialize() {
+ }
/**
- * @see
org.apache.roller.weblogger.business.FileContentManager#getFileContent(Weblog,
String)
+ * @see
org.apache.roller.weblogger.business.FileContentManager#getFileContent(Weblog,
+ * String)
*/
- public FileContent getFileContent(Weblog weblog, String fileId)
+ public FileContent getFileContent(Weblog weblog, String fileId)
throws FileNotFoundException, FilePathException {
-
+
// get a reference to the file, checks that file exists & is readable
File resourceFile = this.getRealFile(weblog, fileId);
-
+
// make sure file is not a directory
- if(resourceFile.isDirectory()) {
- throw new FilePathException("Invalid file id ["+fileId+"], "+
- "path is a directory.");
+ if (resourceFile.isDirectory()) {
+ throw new FilePathException("Invalid file id [" + fileId + "], "
+ + "path is a directory.");
}
-
+
// everything looks good, return resource
return new FileContent(weblog, fileId, resourceFile);
}
-
+
/**
- * @see
org.apache.roller.weblogger.business.FileContentManager#saveFileContent(Weblog,
String,
- * java.io.InputStream)
+ * @see
org.apache.roller.weblogger.business.FileContentManager#saveFileContent(Weblog,
+ * String, java.io.InputStream)
*/
- public void saveFileContent(Weblog weblog,
- String fileId,
- InputStream is)
+ public void saveFileContent(Weblog weblog, String fileId, InputStream is)
throws FileNotFoundException, FilePathException, FileIOException {
-
+
// make sure uploads area exists for this weblog
File dirPath = this.getRealFile(weblog, null);
-
+
// create File that we are about to save
- File saveFile = new File(dirPath.getAbsolutePath() + File.separator +
fileId);
-
+ File saveFile = new File(dirPath.getAbsolutePath() + File.separator
+ + fileId);
+
byte[] buffer = new byte[RollerConstants.EIGHT_KB_IN_BYTES];
int bytesRead;
OutputStream bos = null;
try {
bos = new FileOutputStream(saveFile);
- while ((bytesRead = is.read(buffer, 0,
RollerConstants.EIGHT_KB_IN_BYTES)) != -1) {
+ while ((bytesRead = is.read(buffer, 0,
+ RollerConstants.EIGHT_KB_IN_BYTES)) != -1) {
bos.write(buffer, 0, bytesRead);
- }
- log.debug("The file has been written to
["+saveFile.getAbsolutePath()+"]");
+ }
+ log.debug("The file has been written to ["
+ + saveFile.getAbsolutePath() + "]");
} catch (Exception e) {
throw new FileIOException("ERROR uploading file", e);
} finally {
@@ -125,50 +129,52 @@ public class FileContentManagerImpl impl
bos.flush();
bos.close();
}
- } catch (Exception ignored) {}
+ } catch (Exception ignored) {
+ }
}
-
-
+
}
-
-
+
/**
- * @see
org.apache.roller.weblogger.business.FileContentManager#deleteFile(Weblog,
String)
+ * @see
org.apache.roller.weblogger.business.FileContentManager#deleteFile(Weblog,
+ * String)
*/
- public void deleteFile(Weblog weblog, String fileId)
+ public void deleteFile(Weblog weblog, String fileId)
throws FileNotFoundException, FilePathException, FileIOException {
-
+
// get path to delete file, checks that path exists and is readable
File delFile = this.getRealFile(weblog, fileId);
-
+
if (!delFile.delete()) {
- log.warn("Delete appears to have failed for ["+fileId+"]");
+ log.warn("Delete appears to have failed for [" + fileId + "]");
}
}
-
+
/**
* @inheritDoc
*/
public void deleteAllFiles(Weblog weblog) throws FileIOException {
// TODO: Implement
}
-
+
/**
* @see
org.apache.roller.weblogger.business.FileContentManager#overQuota(Weblog)
*/
public boolean overQuota(Weblog weblog) {
-
- String maxDir =
WebloggerRuntimeConfig.getProperty("uploads.dir.maxsize");
+
+ String maxDir = WebloggerRuntimeConfig
+ .getProperty("uploads.dir.maxsize");
// maxDirSize in megabytes
BigDecimal maxDirSize = new BigDecimal(maxDir);
- long maxDirBytes = (long)(RollerConstants.ONE_MB_IN_BYTES *
maxDirSize.doubleValue());
-
+ long maxDirBytes = (long) (RollerConstants.ONE_MB_IN_BYTES * maxDirSize
+ .doubleValue());
+
try {
File storageDirectory = this.getRealFile(weblog, null);
long weblogDirSize = this.getDirSize(storageDirectory, true);
-
+
return weblogDirSize > maxDirBytes;
} catch (Exception ex) {
// shouldn't ever happen, this means user's uploads dir is bad
@@ -176,44 +182,41 @@ public class FileContentManagerImpl impl
throw new RuntimeException(ex);
}
}
-
-
+
public void release() {
}
-
-
+
/**
- * @see org.apache.roller.weblogger.business.FileContentManager#canSave(
- * Weblog, String, String, long, RollerMessages)
+ * @see
org.apache.roller.weblogger.business.FileContentManager#canSave(Weblog,
+ * String, String, long, RollerMessages)
*/
- public boolean canSave(Weblog weblog,
- String fileName,
- String contentType,
- long size,
- RollerMessages messages) {
-
+ public boolean canSave(Weblog weblog, String fileName, String contentType,
+ long size, RollerMessages messages) {
+
// first check, is uploading enabled?
- if(!WebloggerRuntimeConfig.getBooleanProperty("uploads.enabled")) {
+ if (!WebloggerRuntimeConfig.getBooleanProperty("uploads.enabled")) {
messages.addError("error.upload.disabled");
return false;
}
-
+
// second check, does upload exceed max size for file?
BigDecimal maxFileMB = new BigDecimal(
WebloggerRuntimeConfig.getProperty("uploads.file.maxsize"));
- int maxFileBytes = (int)(RollerConstants.ONE_MB_IN_BYTES *
maxFileMB.doubleValue());
- log.debug("max allowed file size = "+maxFileBytes);
- log.debug("attempted save file size = "+size);
+ int maxFileBytes = (int) (RollerConstants.ONE_MB_IN_BYTES * maxFileMB
+ .doubleValue());
+ log.debug("max allowed file size = " + maxFileBytes);
+ log.debug("attempted save file size = " + size);
if (size > maxFileBytes) {
- String[] args = {fileName, maxFileMB.toString()};
+ String[] args = { fileName, maxFileMB.toString() };
messages.addError("error.upload.filemax", args);
return false;
}
-
+
// third check, does file cause weblog to exceed quota?
BigDecimal maxDirMB = new BigDecimal(
WebloggerRuntimeConfig.getProperty("uploads.dir.maxsize"));
- long maxDirBytes = (long)(RollerConstants.ONE_MB_IN_BYTES *
maxDirMB.doubleValue());
+ long maxDirBytes = (long) (RollerConstants.ONE_MB_IN_BYTES * maxDirMB
+ .doubleValue());
try {
File storageDirectory = this.getRealFile(weblog, null);
long userDirSize = getDirSize(storageDirectory, true);
@@ -222,33 +225,37 @@ public class FileContentManagerImpl impl
return false;
}
} catch (Exception ex) {
- // shouldn't ever happen, means the weblogs uploads dir is bad
somehow
+ // shouldn't ever happen, means the weblogs uploads dir is bad
+ // somehow
// rethrow as a runtime exception
throw new RuntimeException(ex);
}
-
+
// fourth check, is upload type allowed?
- String allows =
WebloggerRuntimeConfig.getProperty("uploads.types.allowed");
- String forbids =
WebloggerRuntimeConfig.getProperty("uploads.types.forbid");
- String[] allowFiles =
StringUtils.split(StringUtils.deleteWhitespace(allows), ",");
- String[] forbidFiles =
StringUtils.split(StringUtils.deleteWhitespace(forbids), ",");
+ String allows = WebloggerRuntimeConfig
+ .getProperty("uploads.types.allowed");
+ String forbids = WebloggerRuntimeConfig
+ .getProperty("uploads.types.forbid");
+ String[] allowFiles = StringUtils.split(
+ StringUtils.deleteWhitespace(allows), ",");
+ String[] forbidFiles = StringUtils.split(
+ StringUtils.deleteWhitespace(forbids), ",");
if (!checkFileType(allowFiles, forbidFiles, fileName, contentType)) {
- String[] args = {fileName, contentType};
+ String[] args = { fileName, contentType };
messages.addError("error.upload.forbiddenFile", args);
return false;
}
-
+
return true;
}
-
-
+
/**
* Get the size in bytes of given directory.
*
* Optionally works recursively counting subdirectories if they exist.
*/
private long getDirSize(File dir, boolean recurse) {
-
+
long size = 0;
if (dir.exists() && dir.isDirectory() && dir.canRead()) {
@@ -258,7 +265,7 @@ public class FileContentManagerImpl impl
for (File file : files) {
if (!file.isDirectory()) {
dirSize += file.length();
- } else if(recurse) {
+ } else if (recurse) {
// count a subdirectory
dirSize += getDirSize(file, recurse);
}
@@ -266,59 +273,58 @@ public class FileContentManagerImpl impl
}
size += dirSize;
}
-
+
return size;
}
-
-
+
/**
* Return true if file is allowed to be uplaoded given specified allowed
and
* forbidden file types.
*/
private boolean checkFileType(String[] allowFiles, String[] forbidFiles,
- String fileName, String contentType) {
-
+ String fileName, String contentType) {
+
// TODO: Atom Publishing Protocol figure out how to handle file
// allow/forbid using contentType.
// TEMPORARY SOLUTION: In the allow/forbid lists we will continue to
// allow user to specify file extensions (e.g. gif, png, jpeg) but will
// now also allow them to specify content-type rules (e.g. */*,
image/*,
// text/xml, etc.).
-
+
// if content type is invalid, reject file
- if (contentType == null || contentType.indexOf('/') == -1) {
+ if (contentType == null || contentType.indexOf('/') == -1) {
return false;
}
-
+
// default to false
boolean allowFile = false;
-
+
// if this person hasn't listed any allows, then assume they want
// to allow *all* filetypes, except those listed under forbid
- if(allowFiles == null || allowFiles.length < 1) {
+ if (allowFiles == null || allowFiles.length < 1) {
allowFile = true;
}
-
+
// First check against what is ALLOWED
-
+
// check file against allowed file extensions
if (allowFiles != null && allowFiles.length > 0) {
- for (int y=0; y<allowFiles.length; y++) {
+ for (int y = 0; y < allowFiles.length; y++) {
// oops, this allowed rule is a content-type, skip it
if (allowFiles[y].indexOf('/') != -1) {
continue;
}
- if (fileName.toLowerCase().endsWith(
- allowFiles[y].toLowerCase())) {
+ if (fileName.toLowerCase()
+ .endsWith(allowFiles[y].toLowerCase())) {
allowFile = true;
break;
}
}
}
-
+
// check file against allowed contentTypes
if (allowFiles != null && allowFiles.length > 0) {
- for (int y=0; y<allowFiles.length; y++) {
+ for (int y = 0; y < allowFiles.length; y++) {
// oops, this allowed rule is NOT a content-type, skip it
if (allowFiles[y].indexOf('/') == -1) {
continue;
@@ -329,12 +335,12 @@ public class FileContentManagerImpl impl
}
}
}
-
+
// First check against what is FORBIDDEN
-
+
// check file against forbidden file extensions, overrides any allows
if (forbidFiles != null && forbidFiles.length > 0) {
- for (int x=0; x<forbidFiles.length; x++) {
+ for (int x = 0; x < forbidFiles.length; x++) {
// oops, this forbid rule is a content-type, skip it
if (forbidFiles[x].indexOf('/') != -1) {
continue;
@@ -346,11 +352,10 @@ public class FileContentManagerImpl impl
}
}
}
-
-
+
// check file against forbidden contentTypes, overrides any allows
if (forbidFiles != null && forbidFiles.length > 0) {
- for (int x=0; x<forbidFiles.length; x++) {
+ for (int x = 0; x < forbidFiles.length; x++) {
// oops, this forbid rule is NOT a content-type, skip it
if (forbidFiles[x].indexOf('/') == -1) {
continue;
@@ -361,11 +366,10 @@ public class FileContentManagerImpl impl
}
}
}
-
+
return allowFile;
}
-
-
+
/**
* Super simple contentType range rule matching
*/
@@ -381,50 +385,50 @@ public class FileContentManagerImpl impl
if (ruleParts[0].equals(typeParts[0]) && ruleParts[1].equals("*")) {
return true;
}
-
+
return false;
}
-
-
+
/**
* Construct the full real path to a resource in a weblog's uploads area.
*/
- private File getRealFile(Weblog weblog, String fileId)
+ private File getRealFile(Weblog weblog, String fileId)
throws FileNotFoundException, FilePathException {
-
+
// make sure uploads area exists for this weblog
File weblogDir = new File(this.storageDir + weblog.getHandle());
- if(!weblogDir.exists()) {
+ if (!weblogDir.exists()) {
weblogDir.mkdirs();
}
-
+
// now form the absolute path
String filePath = weblogDir.getAbsolutePath();
if (fileId != null) {
filePath += File.separator + fileId;
}
-
+
// make sure path exists and is readable
File file = new File(filePath);
- if(!file.exists()) {
- throw new FileNotFoundException("Invalid path ["+filePath+"], "+
- "file does not exist.");
- } else if(!file.canRead()) {
- throw new FilePathException("Invalid path ["+filePath+"], "+
- "cannot read from path.");
+ if (!file.exists()) {
+ throw new FileNotFoundException("Invalid path [" + filePath + "], "
+ + "file does not exist.");
+ } else if (!file.canRead()) {
+ throw new FilePathException("Invalid path [" + filePath + "], "
+ + "cannot read from path.");
}
-
+
try {
// make sure someone isn't trying to sneek outside the uploads dir
-
if(!file.getCanonicalPath().startsWith(weblogDir.getCanonicalPath())) {
- throw new FilePathException("Invalid path "+filePath+"], "+
- "trying to get outside uploads dir.");
+ if (!file.getCanonicalPath().startsWith(
+ weblogDir.getCanonicalPath())) {
+ throw new FilePathException("Invalid path " + filePath + "], "
+ + "trying to get outside uploads dir.");
}
} catch (IOException ex) {
// rethrow as FilePathException
throw new FilePathException(ex);
}
-
+
return file;
}
