zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-04-25 09:42:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

support for manifest files

Browse source
This commit is contained in:
Kyle Drake 2014-12-30 22:26:25 -06:00
parent 6c330666f2
commit 0de126d6b1
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
models/site.rb
View file

@ -31,7 +31,7 @@ class Site < Sequel::Model
} }
VALID_EXTENSIONS = %w{ VALID_EXTENSIONS = %w{
html htm txt text css js jpg jpeg png gif svg md markdown eot ttf woff woff2 json html htm txt text css js jpg jpeg png gif svg md markdown eot ttf woff woff2 json
geojson csv tsv mf ico pdf asc key pgp xml mid midi geojson csv tsv mf ico pdf asc key pgp xml mid midi manifest
} }
MINIMUM_PASSWORD_LENGTH = 5 MINIMUM_PASSWORD_LENGTH = 5
@ -66,7 +66,7 @@ class Site < Sequel::Model
SPAM_MATCH_REGEX = ENV['RACK_ENV'] == 'test' ? /pillz/ : /#{$config['spam_smart_filter'].join('|')}/i SPAM_MATCH_REGEX = ENV['RACK_ENV'] == 'test' ? /pillz/ : /#{$config['spam_smart_filter'].join('|')}/i
EMAIL_SANITY_REGEX = /.+@.+\..+/i EMAIL_SANITY_REGEX = /.+@.+\..+/i
EDITABLE_FILE_EXT = /html|htm|txt|js|css|md/i EDITABLE_FILE_EXT = /html|htm|txt|js|css|md|manifest/i
BANNED_TIME = 2592000 # 30 days in seconds BANNED_TIME = 2592000 # 30 days in seconds
TITLE_MAX = 100 TITLE_MAX = 100
@ -462,9 +462,16 @@ class Site < Sequel::Model
def self.valid_file_type?(uploaded_file) def self.valid_file_type?(uploaded_file)
mime_type = Magic.guess_file_mime_type uploaded_file[:tempfile].path mime_type = Magic.guess_file_mime_type uploaded_file[:tempfile].path
extname = File.extname uploaded_file[:filename]
return false unless (Site::VALID_MIME_TYPES.include?(mime_type) || mime_type =~ /text/) && if extname == ''
Site::VALID_EXTENSIONS.include?(File.extname(uploaded_file[:filename]).sub(/^./, '').downcase) extname = uploaded_file[:filename]
end
unless (Site::VALID_MIME_TYPES.include?(mime_type) || mime_type =~ /text/) &&
Site::VALID_EXTENSIONS.include?(extname.sub(/^./, '').downcase)
return false
end
# clamdscan doesn't work on travis for testing # clamdscan doesn't work on travis for testing
return true if ENV['TRAVIS'] == 'true' return true if ENV['TRAVIS'] == 'true'

6
tests/site_file_tests.rb
View file

@ -39,6 +39,12 @@ describe 'site_files' do
File.exists?(@site.files_path('invalidutf8.html')).must_equal true File.exists?(@site.files_path('invalidutf8.html')).must_equal true
end end
it 'works with manifest files' do
$debug = true
upload 'files[]' => Rack::Test::UploadedFile.new('./tests/files/.manifest', 'text/plain')
File.exists?(@site.files_path('.manifest')).must_equal true
end
it 'succeeds with index.html file' do it 'succeeds with index.html file' do
@site.site_changed.must_equal false @site.site_changed.must_equal false
upload 'files[]' => Rack::Test::UploadedFile.new('./tests/files/index.html', 'text/html') upload 'files[]' => Rack::Test::UploadedFile.new('./tests/files/index.html', 'text/html')