tim/fluke
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

fix creating new keys

Browse Source
This commit is contained in:
Anton Chuchkalov 2015-07-06 16:09:48 +04:00
parent 699f45d753
commit ecbb40ce07
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devops-service/db/validators/key/scope.rb
View File

@ -2,7 +2,7 @@ module Validators
class Key::Scope < Base class Key::Scope < Base
def valid? def valid?
[::Key::SYSTEM, ::Key::USER].include?(@model.scope) [Devops::Model::Key::SYSTEM, Devops::Model::Key::USER].include?(@model.scope)
end end
def message def message

4
devops-service/routes/v2.0/handlers/key.rb
View File

@ -19,14 +19,14 @@ module Devops
fname = check_filename(key["file_name"], "Parameter 'file_name' must be a not empty string") fname = check_filename(key["file_name"], "Parameter 'file_name' must be a not empty string")
kname = check_string(key["key_name"], "Parameter 'key_name' should be a not empty string") kname = check_string(key["key_name"], "Parameter 'key_name' should be a not empty string")
content = check_string(key["content"], "Parameter 'content' should be a not empty string") content = check_string(key["content"], "Parameter 'content' should be a not empty string")
file_name = File.join(DevopsService.config[:keys_dir], fname) file_name = File.join(settings.keys_dir, fname)
halt(400, "File '#{fname}' already exist") if File.exists?(file_name) halt(400, "File '#{fname}' already exist") if File.exists?(file_name)
File.open(file_name, "w") do |f| File.open(file_name, "w") do |f|
f.write(content) f.write(content)
f.chmod(0400) f.chmod(0400)
end end
key = Key.new({"path" => file_name, "id" => kname}) key = Devops::Model::Key.new({"path" => file_name, "id" => kname})
settings.mongo.key_insert key settings.mongo.key_insert key
create_response("Created", nil, 201) create_response("Created", nil, 201)
} }