Skip to content

Commit 0c618cc

Browse files
committed
Use openvas-omp gem for crud operations
MS-1718
1 parent 4478136 commit 0c618cc

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

plugins/openvas.rb

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ def cmd_openvas_target_create(*args)
222222

223223
if args?(args, 3)
224224
begin
225-
resp = @ov.target_create(args[0], args[1], args[2])
225+
resp = @ov.target_create('name' => args[0], 'hosts' => args[1], 'comment' => args[2])
226226
print_status(resp)
227227
cmd_openvas_target_list
228228
rescue OpenVASOMP::OMPError => e
@@ -279,7 +279,7 @@ def cmd_openvas_task_create(*args)
279279

280280
if args?(args, 4)
281281
begin
282-
resp = @ov.task_create(args[0], args[1], args[2], args[3])
282+
resp = @ov.task_create('name' => args[0], 'comment' => args[1], 'config' => args[2], 'target'=> args[3])
283283
print_status(resp)
284284
cmd_openvas_task_list
285285
rescue OpenVASOMP::OMPError => e
@@ -517,12 +517,14 @@ def cmd_openvas_report_download(*args)
517517

518518
if args?(args, 4)
519519
begin
520-
report = @ov.report_get_by_id(args[0], args[1])
520+
report = @ov.report_get_raw("report_id"=>args[0],"format"=>args[1])
521521
::FileUtils.mkdir_p(args[2])
522522
name = ::File.join(args[2], args[3])
523523
print_status("Saving report to #{name}")
524524
output = ::File.new(name, "w")
525-
output.puts(report)
525+
data = nil
526+
report.elements.each("//get_reports_response"){|r| data = r.to_s}
527+
output.puts(data)
526528
output.close
527529
rescue OpenVASOMP::OMPError => e
528530
print_error(e.to_s)
@@ -537,9 +539,11 @@ def cmd_openvas_report_import(*args)
537539

538540
if args?(args, 2)
539541
begin
540-
report = @ov.report_get_by_id(args[0], args[1])
542+
report = @ov.report_get_raw("report_id"=>args[0],"format"=>args[1])
543+
data = nil
544+
report.elements.each("//get_reports_response"){|r| data = r.to_s}
541545
print_status("Importing report to database.")
542-
framework.db.import({:data => report})
546+
framework.db.import({:data => data})
543547
rescue OpenVASOMP::OMPError => e
544548
print_error(e.to_s)
545549
end

0 commit comments

Comments
 (0)