mirror of
https://github.com/neocities/neocities.git
synced 2025-04-25 01:32:36 +02:00
api: add upload_hash for checking file hash before uploading
This commit is contained in:
parent
7d17202f39
commit
4a2926508e
3 changed files with 55 additions and 0 deletions
16
app/api.rb
16
app/api.rb
|
@ -5,6 +5,22 @@ get '/api' do
|
||||||
erb :'api'
|
erb :'api'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
post '/api/upload_hash' do
|
||||||
|
require_api_credentials
|
||||||
|
|
||||||
|
res = {}
|
||||||
|
|
||||||
|
if params[:files].blank? || !params[:files].is_a?(Hash)
|
||||||
|
api_error 400, 'no_file_hashes_provided', 'no file hashes provided'
|
||||||
|
end
|
||||||
|
|
||||||
|
params[:files].each do |k,v|
|
||||||
|
res[k] = current_site.sha1_hash_match? k, v
|
||||||
|
end
|
||||||
|
|
||||||
|
api_success files: res
|
||||||
|
end
|
||||||
|
|
||||||
get '/api/list' do
|
get '/api/list' do
|
||||||
require_api_credentials
|
require_api_credentials
|
||||||
|
|
||||||
|
|
|
@ -1512,6 +1512,12 @@ class Site < Sequel::Model
|
||||||
save_changes validate: false
|
save_changes validate: false
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def sha1_hash_match?(path, sha1_hash)
|
||||||
|
relative_path = scrubbed_path path
|
||||||
|
site_file = site_files_dataset.where(path: relative_path, sha1_hash: sha1_hash).first
|
||||||
|
!site_file.nil?
|
||||||
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def store_file(path, uploaded, opts={})
|
def store_file(path, uploaded, opts={})
|
||||||
|
|
|
@ -222,6 +222,39 @@ describe 'api key' do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe 'api upload hash' do
|
||||||
|
it 'succeeds' do
|
||||||
|
create_site
|
||||||
|
basic_authorize @user, @pass
|
||||||
|
test_hash = Digest::SHA1.file('./tests/files/test.jpg').hexdigest
|
||||||
|
|
||||||
|
post '/api/upload', {
|
||||||
|
'test.jpg' => Rack::Test::UploadedFile.new('./tests/files/test.jpg', 'image/jpeg'),
|
||||||
|
'test2.jpg' => Rack::Test::UploadedFile.new('./tests/files/test.jpg', 'image/jpeg')
|
||||||
|
}
|
||||||
|
|
||||||
|
post '/api/upload_hash', "files[test.jpg]" => test_hash, "files[test2.jpg]" => Digest::SHA1.hexdigest('herpderp')
|
||||||
|
|
||||||
|
res[:result].must_equal 'success'
|
||||||
|
res[:files][:'test.jpg'].must_equal true
|
||||||
|
res[:files][:'test2.jpg'].must_equal false
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'throws error for missing data' do
|
||||||
|
create_site
|
||||||
|
basic_authorize @user, @pass
|
||||||
|
post '/api/upload_hash'
|
||||||
|
res[:error_type].must_equal 'no_file_hashes_provided'
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'throws errors for weird data' do
|
||||||
|
create_site
|
||||||
|
basic_authorize @user, @pass
|
||||||
|
post '/api/upload_hash', 'files[]' => 'DUMPSTER FIRE'
|
||||||
|
res[:error_type].must_equal 'no_file_hashes_provided'
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
describe 'api upload' do
|
describe 'api upload' do
|
||||||
it 'fails with no auth' do
|
it 'fails with no auth' do
|
||||||
post '/api/upload'
|
post '/api/upload'
|
||||||
|
|
Loading…
Add table
Reference in a new issue