syncthing/syncthing-lite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Path validation (#122)

Browse Source 
* Remove isTrimmed path validation rule

* Include exact reason in path validation exceptions
This commit is contained in:
l-jonas
2018-12-09 12:00:40 +01:00
committed by GitHub
parent 5d09d011b1
commit b115a99907
1 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
syncthing-core/src/main/kotlin/net/syncthing/java/core/utils/PathUtils.kt
+31 -16
View File
@@ -34,42 +34,57 @@ object PathUtils {
return pathSegments.contains(PARENT_PATH) or pathSegments.contains(CURRENT_PATH)
}
private fun isTrimmed(value: String) = value.trim() == value
private fun containsWindowsPathSeparator(path: String) = path.contains(PATH_SEPARATOR_WIN)
private fun startsWithPathSeperator(path: String) = path.startsWith(PATH_SEPARATOR)
private fun isValidPath(path: String) = (!containsRelativeElements(path)) and
(!containsWindowsPathSeparator(path)) and
path.isNotEmpty() and
(!startsWithPathSeperator(path)) and
isTrimmed(path)
private fun startsWithPathSeparator(path: String) = path.startsWith(PATH_SEPARATOR)
private fun containsPathSeparator(file: String) = file.contains(PATH_SEPARATOR) or file.contains(PATH_SEPARATOR_WIN)
private fun isFilenameValid(file: String) = file.isNotBlank() and
(!containsPathSeparator(file)) and
isTrimmed(file)
private fun assertPathValid(path: String) {
if (!isValidPath(path)) {
fun throwException(reason: String) {
throw ExceptionDetailException(
IllegalArgumentException("provided path is invalid"),
IllegalArgumentException("provided path is invalid because it $reason"),
ExceptionDetails(
component = "PathUtils",
details = "processed path: $path"
details = "processed path: \"$path\""
)
)
}
if (containsRelativeElements(path)) {
throwException("contains relative path elements")
}
if (containsWindowsPathSeparator(path)) {
throwException("contains windows path separators")
}
if (path.isEmpty()) {
throwException("is empty")
}
if (startsWithPathSeparator(path)) {
throwException("starts with a path separator")
}
}
private fun assertFilenameValid(filename: String) {
if (!isFilenameValid(filename)) {
fun throwException(reason: String) {
throw ExceptionDetailException(
IllegalArgumentException("provided filename is invalid"),
IllegalArgumentException("provided filename is invalid because the filename $reason"),
ExceptionDetails(
component = "PathUtils",
details = "processed filename: $filename"
details = "processed filename: \"$filename\""
)
)
}
if (filename.isBlank()) {
throwException("is blank")
}
if (containsPathSeparator(filename)) {
throwException("contains a path separator")
}
}
fun isParent(path: String): Boolean {