Commit 6ab97e9

committed

Filename validation tweak

1 parent 53541da commit 6ab97e9Copy full SHA for 6ab97e9

File tree

-4

lines changed

-4

lines changed

Lines changed: 6 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,12 @@ def self.find_by_file_name(file_name)`
`15`	`15`	`def validate`
`16`	`16`	`if file_name`
`17`	`17`	`if ! WikiFile.is_valid?(file_name)`
`18`		`- errors.add("file_name", "is invalid. Only latin characters, digits, dots, underscores, " +`
	`18`	`+ if ['.', '..'].include? file_name`
	`19`	`+ errors.add("file_name", "cannot be '.' or '..'")`
	`20`	`+ else`
	`21`	`+ errors.add("file_name", "is invalid. Only latin characters, digits, dots, underscores, " +`
`19`	`22`	`"dashes and spaces are accepted")`
`20`		`- elsif file_name == '.' or file_name == '..'`
`21`		`- errors.add("file_name", "cannot be '.' or '..'")`
	`23`	`+ end`
`22`	`24`	`end`
`23`	`25`	`end`
`24`	`26`
`@@ -60,7 +62,7 @@ def delete_content_file`
`60`	`62`
`61`	`63`	`SANE_FILE_NAME = /^[a-zA-Z0-9\-_\. ]*$/`
`62`	`64`	`def self.is_valid?(name)`
`63`		`- name =~ SANE_FILE_NAME`
	`65`	`+ name =~ SANE_FILE_NAMEand not ['.','..'].include?name`
`64`	`66`	`end`
`65`	`67`
`66`	`68`	`end`

Comments

(0)