nessus_rest 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/examples/backup-reports.rb

@@ -2,22 +2,22 @@
 
 require 'nessus_rest'
 
-n=NessusREST::Client.new ({:url=>'https://localhost:8834', :username=>'user', :password=> 'password'})
+n=NessusREST::Client.new({:url=>'https://localhost:8834', :username=>'user', :password=> 'password'})
 
 formats=["nessus","csv","html"]
 folders_id=Hash.new
 
 sl["folders"].each do |f|
-        folders_id[f['id']]=f['name']
+  folders_id[f['id']]=f['name']
 end
 
 sl["scans"].each do |s|
-        puts "backing up: "+s["name"]+":"+s["uuid"].to_s 
-        formats.each do |format|
-		# fn = folder__name__scanid.format
-		outputfn=folders_id[s['folder_id']]+'__'+s['name']+'__'+s['id'].to_s+'.'+format
-                puts "-> Format: #{format"} Filename: #{outputfn}"
-                n.report_download_file(s['id'],format,outputfn)
-        end
-end
+  puts "backing up: "+s["name"]+":"+s["uuid"].to_s
+  formats.each do |format|
+    # fn = folder__name__scanid.format
+    outputfn=folders_id[s['folder_id']]+'__'+s['name']+'__'+s['id'].to_s+'.'+format
+    puts "-> Format: #{format} Filename: #{outputfn}"
+    n.report_download_file(s['id'],format,outputfn)
+  end # formats
+end # scans
 

data/examples/serial-scan.rb

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+
+require 'nessus_rest'
+
+subnets_to_scan=[
+  {:name=>'lan1', :targets=>'192.168.1.0/24'},
+  {:name=>'lan2', :targets=>'10.1.1.0/24'}
+]
+
+n=NessusREST::Client.new(:url=>'https://localhost:8834', :username=>'user', :password=> 'password')
+
+subnets_to_scan.each do |subnet|
+  scanname='myscan-'+subnet[:name]
+  puts "Scanning: "+scanname
+  # you have to specify your own scan policy instead of ping-safe
+  qs=n.scan_quick_policy('ping-safe',scanname,subnet[:targets])
+  scanid=qs['scan']['id']
+  puts "Waiting to finish"
+  n.scan_wait4finish(scanid)
+  n.report_download_file(scanid,'nessus',scanname+'.nessus')
+end
+

data/examples/simple.rb

@@ -2,7 +2,7 @@
 
 require 'nessus_rest'
 
-n=NessusREST::Client.new ({:url=>'https://localhost:8834', :username=>'user', :password=> 'password'})
+n=NessusREST::Client.new({:url=>'https://localhost:8834', :username=>'user', :password=> 'password'})
 qs=n.scan_quick_template('basic','name-of-scan','localhost')
 scanid=qs['scan']['id']
 n.scan_wait4finish(scanid)

data/lib/nessus_rest.rb

@@ -122,10 +122,29 @@ module NessusREST
     def authenticate(username, password)
       @username = username
       @password = password
+      authdefault
+    end
+    alias_method :login, :authenticate
+
+    # Tries to authenticate to the Nessus REST JSON interface
+    #
+    # returns: true if logged in, false if not
+    #
+    # Usage:
+    #
+    #  n=NessusREST::Client.new (:url=>'https://localhost:8834', :autologin=>false, 
+    #     :username=>'nessususer', :password=>'nessuspassword')
+    #  if n.authdefault
+    #	puts "Logged in"
+    #  else
+    #	puts "Error"
+    #  end
+    def authdefault
       payload = {
-        :username => @username, 
-        :password => @password, 
-        :json => 1
+        :username => @username,
+        :password => @password,
+        :json => 1,
+        :authenticationmethod => true
       }
       res = http_post(:uri=>"/session", :data=>payload)
       if res['token']
@@ -136,7 +155,6 @@ module NessusREST
         false
       end
     end
-    alias_method :login, :authenticate
 
     # checks if we're logged in correctly
     #
@@ -586,6 +604,17 @@ module NessusREST
     #  res = n.http_put(:uri=>"/users/#{user_id}/chpasswd", :data=>payload, :fields=>n.x_cookie)
     #  puts res.code 
     def http_put(opts={})
+      ret=http_put_low(opts)
+      if ret.is_a?(Hash) and ret.has_key?('error') and ret['error']=='Invalid Credentials' then
+	authdefault
+	ret=http_put_low(opts)
+	return ret
+      else
+	return ret
+      end
+    end
+
+    def http_put_low(opts={})
       uri    = opts[:uri]
       data   = opts[:data]
       fields = opts[:fields] || {}
@@ -625,6 +654,17 @@ module NessusREST
     #  res = n.http_delete(:uri=>"/session", :fields=>n.x_cookie)
     #  puts res.code
     def http_delete(opts={})
+      ret=http_delete_low(opts)
+      if ret.is_a?(Hash) and ret.has_key?('error') and ret['error']=='Invalid Credentials' then
+	authdefault
+	ret=http_delete_low(opts)
+	return ret
+      else
+	return ret
+      end
+    end
+
+    def http_delete_low(opts={})
       uri    = opts[:uri]
       fields = opts[:fields] || {}
       res    = nil
@@ -662,6 +702,22 @@ module NessusREST
     #  n=NessusREST::Client.new (:url=>'https://localhost:8834', :username=>'user', :password=> 'password')
     #  pp n.http_get(:uri=>"/users", :fields=>n.x_cookie)
     def http_get(opts={})
+      raw_content = opts[:raw_content] || false
+      ret=http_get_low(opts)
+      if !raw_content then
+	if ret.is_a?(Hash) and ret.has_key?('error') and ret['error']=='Invalid Credentials' then
+          authdefault
+          ret=http_get_low(opts)
+          return ret
+        else
+          return ret
+	end
+      else
+	return ret
+      end
+    end
+
+    def http_get_low(opts={})
       uri    = opts[:uri]
       fields = opts[:fields] || {}
       raw_content = opts[:raw_content] || false
@@ -702,6 +758,24 @@ module NessusREST
     #  n=NessusREST::Client.new (:url=>'https://localhost:8834', :username=>'user', :password=> 'password')
     #  pp n.http_post(:uri=>"/scans/#{scan_id}/launch", :fields=>n.x_cookie)
     def http_post(opts={})
+      if opts.has_key?(:authenticationmethod) then
+        # i know authzmethod = opts.delete(:authorizationmethod) is short, but not readable
+        authzmethod = opts[:authenticationmethod]
+        opts.delete(:authenticationmethod)
+      end
+      ret=http_post_low(opts)
+      if ret.is_a?(Hash) and ret.has_key?('error') and ret['error']=='Invalid Credentials' then
+	if not authzmethod
+          authdefault
+	  ret=http_post_low(opts)
+	  return ret
+        end
+      else
+	return ret
+      end
+    end
+
+    def http_post_low(opts={})
       uri    = opts[:uri]
       data   = opts[:data]
       fields = opts[:fields] || {}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nessus_rest
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-27 00:00:00.000000000 Z
+date: 2016-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -92,6 +92,7 @@ files:
 - Rakefile
 - VERSION
 - examples/backup-reports.rb
+- examples/serial-scan.rb
 - examples/simple.rb
 - lib/nessus_rest.rb
 - nessus_rest.gemspec