Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4444 from cpradio/fix-backup-validation 

FIX: Backup validation wasn't escaping hyphens
This commit is contained in:
Régis Hanol 2016-09-17 01:08:45 +02:00 committed by GitHub
parent 48e4f88b08 2eddeab66b
commit 6162768a3b
2 changed files with 2 additions and 2 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)

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

@ -212,7 +212,7 @@ describe Admin::BackupsController do
described_class.any_instance.expects(:has_enough_space_on_disk?).returns(true) described_class.any_instance.expects(:has_enough_space_on_disk?).returns(true)
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',