infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Land #11187, Conform LoginServlet to API standards

GSoC/Meterpreter_Web_Console
James Barnett 2019-01-07 17:03:39 -06:00
parent f23142c19c 05d810ac23
commit 69ee3a4a26
No known key found for this signature in database
GPG Key ID: 647983861A4EC5EA
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/msf/core/web_services/servlet/login_servlet.rb
View File

@ -9,7 +9,7 @@ module LoginServlet
end
def self.registered(app)
app.get LoginServlet.api_path, &get_logins
app.get LoginServlet.api_path_with_id, &get_logins
app.post LoginServlet.api_path, &create_login
app.put LoginServlet.api_path_with_id, &update_login
app.delete LoginServlet.api_path, &delete_logins
@ -26,7 +26,7 @@ module LoginServlet
sanitized_params = sanitize_params(params, env['rack.request.query_hash'])
data = get_db.logins(sanitized_params)
data = data.first if is_single_object?(data, sanitized_params)
set_json_response(data)
set_json_data_response(response: data)
rescue => e
print_error_and_create_response(error: e, message: 'There was an error retrieving logins:', code: 500)
end
@ -40,8 +40,8 @@ module LoginServlet
opts = parse_json_request(request, false)
opts[:core][:workspace] = get_db.workspaces(id: opts[:workspace_id]).first
opts[:core] = get_db.creds(opts[:core]).first
response = get_db.create_credential_login(opts)
set_json_response(response)
data = get_db.create_credential_login(opts)
set_json_data_response(response: data)
rescue => e
print_error_and_create_response(error: e, message: 'There was an error creating the login:', code: 500)
end
@ -56,7 +56,7 @@ module LoginServlet
tmp_params = sanitize_params(params)
opts[:id] = tmp_params[:id] if tmp_params[:id]
data = get_db.update_login(opts)
set_json_response(data)
set_json_data_response(response: data)
rescue => e
print_error_and_create_response(error: e, message: 'There was an error updating the login:', code: 500)
end
@ -69,7 +69,7 @@ module LoginServlet
begin
opts = parse_json_request(request, false)
data = get_db.delete_logins(opts)
set_json_response(data)
set_json_data_response(response: data)
rescue => e
print_error_and_create_response(error: e, message: 'There was an error deleting the logins:', code: 500)
end