Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[stable-3.30] Simplify FileNameValidator Check #13668

Merged
merged 1 commit into from
Oct 2, 2024
Merged

[stable-3.30] Simplify FileNameValidator Check #13668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/java/com/nextcloud/utils/extensions/OCCapabilityExtensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ fun OCCapability.forbiddenFilenames(): List<String> = jsonToList(forbiddenFilena

fun OCCapability.forbiddenFilenameCharacters(): List<String> = jsonToList(forbiddenFilenameCharactersJson)

fun OCCapability.forbiddenFilenameExtension(): List<String> = jsonToList(forbiddenFilenameExtensionJson)
fun OCCapability.forbiddenFilenameExtensions(): List<String> = jsonToList(forbiddenFilenameExtensionJson)

fun OCCapability.forbiddenFilenameBaseNames(): List<String> = jsonToList(forbiddenFilenameBaseNamesJson)

Expand Down
74 changes: 32 additions & 42 deletions app/src/main/java/com/nextcloud/utils/fileNameValidator/FileNameValidator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import android.text.TextUtils
import com.nextcloud.utils.extensions.StringConstants
import com.nextcloud.utils.extensions.forbiddenFilenameBaseNames
import com.nextcloud.utils.extensions.forbiddenFilenameCharacters
import com.nextcloud.utils.extensions.forbiddenFilenameExtension
import com.nextcloud.utils.extensions.forbiddenFilenameExtensions
import com.nextcloud.utils.extensions.forbiddenFilenames
import com.nextcloud.utils.extensions.removeFileExtension
import com.owncloud.android.R
Expand Down Expand Up @@ -49,54 +49,44 @@ object FileNameValidator {
}
}

if (capability.version.isNewerOrEqual(NextcloudVersion.nextcloud_30)) {
checkInvalidCharacters(filename, capability, context)?.let {
return it
}
if (!capability.version.isNewerOrEqual(NextcloudVersion.nextcloud_30)) {
return null
}

capability.run {
val filenameVariants = setOf(filename.lowercase(), filename.removeFileExtension().lowercase())
checkInvalidCharacters(filename, capability, context)?.let { return it }

forbiddenFilenameBaseNames().let {
val forbiddenBaseNames = forbiddenFilenameBaseNames().map { it.lowercase() }
val filenameVariants = setOf(filename.lowercase(), filename.removeFileExtension().lowercase())

for (forbiddenBaseName in forbiddenBaseNames) {
if (forbiddenBaseName in filenameVariants) {
return context.getString(
R.string.file_name_validator_error_reserved_names,
forbiddenBaseName
)
}
}
with(capability) {
forbiddenFilenameBaseNamesJson?.let {
forbiddenFilenameBaseNames().find { it.lowercase() in filenameVariants }?.let { forbiddenBaseFilename ->
return context.getString(R.string.file_name_validator_error_reserved_names, forbiddenBaseFilename)
}
}

forbiddenFilenamesJson?.let {
val forbiddenFilenames = forbiddenFilenames().map { it.lowercase() }

for (forbiddenFilename in forbiddenFilenames) {
if (forbiddenFilename in filenameVariants) {
return context.getString(
R.string.file_name_validator_error_reserved_names,
forbiddenFilename
)
}
}
forbiddenFilenamesJson?.let {
forbiddenFilenames().find { it.lowercase() in filenameVariants }?.let { forbiddenFilename ->
return context.getString(R.string.file_name_validator_error_reserved_names, forbiddenFilename)
}
}

forbiddenFilenameExtensionJson?.let {
for (forbiddenExtension in forbiddenFilenameExtension()) {
if (filename.endsWith(forbiddenExtension, ignoreCase = true)) {
return if (forbiddenExtension == StringConstants.SPACE) {
context.getString(
R.string.file_name_validator_error_forbidden_space_character_extensions
)
} else {
context.getString(
R.string.file_name_validator_error_forbidden_file_extensions,
forbiddenExtension
)
}
}
forbiddenFilenameExtensionJson?.let {
forbiddenFilenameExtensions().find { extension ->
when {
extension == StringConstants.SPACE ->
filename.startsWith(extension, ignoreCase = true) ||
filename.endsWith(extension, ignoreCase = true)

else -> filename.endsWith(extension, ignoreCase = true)
}
}?.let { forbiddenExtension ->
return if (forbiddenExtension == StringConstants.SPACE) {
context.getString(R.string.file_name_validator_error_forbidden_space_character_extensions)
} else {
context.getString(
R.string.file_name_validator_error_forbidden_file_extensions,
forbiddenExtension
)
}
}
}
Expand Down
Loading