github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-12-16 06:03:46 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Backup validation wasn't escaping hyphens

Browse Source 
Conflicts:
	spec/controllers/admin/backups_controller_spec.rb
This commit is contained in:
cpradio 2016-09-16 15:20:42 -04:00 committed by Guo Xiang Tan
parent cbe623aaee
commit 69691fa7a6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/backups_controller.rb
View File

@ -119,7 +119,7 @@ class Admin::BackupsController < Admin::AdminController
return render status: 415, text: I18n.t("backup.backup_file_should_be_tar_gz") unless /\.(tar\.gz|t?gz)$/i =~ filename return render status: 415, text: I18n.t("backup.backup_file_should_be_tar_gz") unless /\.(tar\.gz|t?gz)$/i =~ filename
return render status: 415, text: I18n.t("backup.not_enough_space_on_disk") unless has_enough_space_on_disk?(total_size) return render status: 415, text: I18n.t("backup.not_enough_space_on_disk") unless has_enough_space_on_disk?(total_size)
return render status: 415, text: I18n.t("backup.invalid_filename") unless !!(/^[a-zA-Z0-9\.-_]+$/ =~ filename) return render status: 415, text: I18n.t("backup.invalid_filename") unless !!(/^[a-zA-Z0-9\._-]+$/ =~ filename)
file = params.fetch(:file) file = params.fetch(:file)
identifier = params.fetch(:resumableIdentifier) identifier = params.fetch(:resumableIdentifier)

4
spec/controllers/admin/backups_controller_spec.rb
View File

@ -209,8 +209,8 @@ describe Admin::BackupsController do
describe "when filename is valid" do describe "when filename is valid" do
it "should upload the file successfully" do it "should upload the file successfully" do
xhr :post, :upload_backup_chunk, xhr :post, :upload_backup_chunk,
resumableFilename: 'test.tar.gz', resumableFilename: 'test_Site-0123456789.tar.gz',
resumableTotalSize: '1', resumableTotalSize: 1,
resumableIdentifier: 'test', resumableIdentifier: 'test',
resumableChunkNumber: '1', resumableChunkNumber: '1',
resumableChunkSize: '1', resumableChunkSize: '1',