YunoHost/dynette
1
0
Fork 0
mirror of https://github.com/YunoHost/dynette.git synced 2024-09-03 20:06:17 +02:00
Code Issues Projects Releases Packages Wiki Activity

[enh] allows to register a key with hmac-sha512 algo

Browse source
This commit is contained in:
Laurent Peuch 2017-09-18 19:48:07 +02:00
parent 5836772ef7
commit d94ecdc058
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
dynette.rb
View file

@ -114,10 +114,14 @@ end
before path do before path do
if params.has_key?("public_key") if params.has_key?("public_key")
public_key = Base64.decode64(params[:public_key].encode('ascii-8bit')) public_key = Base64.decode64(params[:public_key].encode('ascii-8bit'))
unless public_key.length == 24 # might be 88
unless public_key.length == 24 or public_key.length == 89
halt 400, { :error => "Key is invalid: #{public_key.to_s.encode('UTF-8', {:invalid => :replace, :undef => :replace, :replace => '?'})}" }.to_json halt 400, { :error => "Key is invalid: #{public_key.to_s.encode('UTF-8', {:invalid => :replace, :undef => :replace, :replace => '?'})}" }.to_json
end end
end end
if params.has_key?("key_algo") and not ["hmac-md5", "hmac-sha512"].include? params[:key_algo]
halt 400, { :error => "key_algo value is invalid: #{public_key}, it should be either 'hmac-sha512' or 'hmac-md5' (but you should **really** use 'hmac-sha512')" }.to_json
end
if params.has_key?("subdomain") if params.has_key?("subdomain")
unless params[:subdomain].match /^([a-z0-9]{1}([a-z0-9\-]*[a-z0-9])*)(\.[a-z0-9]{1}([a-z0-9\-]*[a-z0-9])*)*(\.[a-z]{1}([a-z0-9\-]*[a-z0-9])*)$/ unless params[:subdomain].match /^([a-z0-9]{1}([a-z0-9\-]*[a-z0-9])*)(\.[a-z0-9]{1}([a-z0-9\-]*[a-z0-9])*)*(\.[a-z]{1}([a-z0-9\-]*[a-z0-9])*)$/
halt 400, { :error => "Subdomain is invalid: #{params[:subdomain]}" }.to_json halt 400, { :error => "Subdomain is invalid: #{params[:subdomain]}" }.to_json
@ -183,8 +187,14 @@ post '/key/:public_key' do
recovery_password = "" recovery_password = ""
end end
if params.has_key?("key_algo")
key_algo = params[:key_algo]
else # default until we'll one day kill it
key_algo = "hmac-md5"
end
# Process # Process
entry = Entry.new(:public_key => params[:public_key], :subdomain => params[:subdomain], :current_ip => request.ip, :created_at => Time.now, :recovery_password => recovery_password) entry = Entry.new(:public_key => params[:public_key], :subdomain => params[:subdomain], :current_ip => request.ip, :created_at => Time.now, :recovery_password => recovery_password, :key_algo => key_algo)
entry.ips << Ip.create(:ip_addr => request.ip) entry.ips << Ip.create(:ip_addr => request.ip)
if entry.save if entry.save