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

Reduce site record lookups needed for auth, webdav

Browse source
This commit is contained in:
Kyle Drake 2017-04-02 12:25:34 -07:00
parent 11f6367e55
commit 746f0b48e0
2 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
config.ru
View file

@ -13,25 +13,24 @@ end
map '/webdav' do map '/webdav' do
use Rack::Auth::Basic do |username, password| use Rack::Auth::Basic do |username, password|
Site.valid_login? username, password @site = Site.get_site_from_login username, password
@site ? true : false
end end
run lambda {|env| run lambda {|env|
site = Site[username: env['REMOTE_USER']]
if env['REQUEST_METHOD'] == 'PUT' if env['REQUEST_METHOD'] == 'PUT'
path = env['PATH_INFO'] path = env['PATH_INFO']
tmpfile = Tempfile.new 'davfile', encoding: 'binary' tmpfile = Tempfile.new 'davfile', encoding: 'binary'
tmpfile.write env['rack.input'].read tmpfile.write env['rack.input'].read
tmpfile.close tmpfile.close
if site.file_size_too_large? tmpfile.size if @site.file_size_too_large? tmpfile.size
return [507, {}, ['']] return [507, {}, ['']]
end end
# if Site.valid_file_type?(filename: path, tempfile: tmpfile) # if Site.valid_file_type?(filename: path, tempfile: tmpfile)
if site.okay_to_upload? filename: path, tempfile: tmpfile if @site.okay_to_upload? filename: path, tempfile: tmpfile
site.store_files [{filename: path, tempfile: tmpfile}] @site.store_files [{filename: path, tempfile: tmpfile}]
return [201, {}, ['']] return [201, {}, ['']]
else else
return [415, {}, ['']] return [415, {}, ['']]
@ -39,7 +38,7 @@ map '/webdav' do
end end
if env['REQUEST_METHOD'] == 'MKCOL' if env['REQUEST_METHOD'] == 'MKCOL'
site.create_directory env['PATH_INFO'] @site.create_directory env['PATH_INFO']
return [201, {}, ['']] return [201, {}, ['']]
end end
@ -52,20 +51,20 @@ map '/webdav' do
FileUtils.cp site.files_path(env['PATH_INFO']), tmpfile.path FileUtils.cp site.files_path(env['PATH_INFO']), tmpfile.path
DB.transaction do DB.transaction do
site.store_files [{filename: destination, tempfile: tmpfile}] @site.store_files [{filename: destination, tempfile: tmpfile}]
site.delete_file env['PATH_INFO'] @site.delete_file env['PATH_INFO']
end end
return [201, {}, ['']] return [201, {}, ['']]
end end
if env['REQUEST_METHOD'] == 'DELETE' if env['REQUEST_METHOD'] == 'DELETE'
site.delete_file env['PATH_INFO'] @site.delete_file env['PATH_INFO']
return [201, {}, ['']] return [201, {}, ['']]
end end
res = DAV4Rack::Handler.new( res = DAV4Rack::Handler.new(
root: Site.select(:username).where(username: env['REMOTE_USER']).first.files_path, root: @site.files_path,
root_uri_path: '/webdav' root_uri_path: '/webdav'
).call(env) ).call(env)
} }

15
models/site.rb
View file

@ -275,11 +275,16 @@ class Site < Sequel::Model
end end
def valid_login?(username_or_email, plaintext) def valid_login?(username_or_email, plaintext)
get_site_from_login(username_or_email, plaintext) ? true : false
end
def get_site_from_login(username_or_email, plaintext)
site = get_with_identifier username_or_email site = get_with_identifier username_or_email
return false if site.nil? return false if site.nil?
return false if site.is_deleted return false if site.is_deleted
site.valid_password? plaintext return false if site.is_banned
site.valid_password?(plaintext) ? site : nil
end end
def bcrypt_cost def bcrypt_cost
@ -371,14 +376,14 @@ class Site < Sequel::Model
end end
def valid_password?(plaintext) def valid_password?(plaintext)
valid = BCrypt::Password.new(owner.values[:password]) == plaintext is_valid_password = BCrypt::Password.new(owner.values[:password]) == plaintext
if !valid? unless is_valid_password
return false if values[:password].nil? return false if values[:password].nil?
valid = BCrypt::Password.new(values[:password]) == plaintext is_valid_password = BCrypt::Password.new(values[:password]) == plaintext
end end
valid is_valid_password
end end
def password=(plaintext) def password=(plaintext)