Fixed refrence of module in site credentials

lib/nexpose/credential.rb

@@ -129,36 +129,36 @@ def _to_param(target, engine_id, port, siteid)
     def set_cvs_service(username = nil, password = nil)
       @user_name = username
       @password = password
-      @service = Service.CVS
+      @service = Service::CVS
     end
 
     # sets the DB2 service
     def set_db2_service(database = nil, username = nil, password = nil)
       @database = database
       @user_name = username
       @password = password
-      @service = Service.DB2
+      @service = Service::DB2
     end
 
     # sets the File Transfer Protocol (FTP) service
     def set_ftp_service(username = nil, password = nil)
       @user_name = username
       @password = password
-      @service = Service.FTP
+      @service = Service::FTP
     end
 
     # sets the IBM AS/400 service.
     def set_as400_service(domain = nil, username = nil, password = nil)
       @domain = domain
       @user_name = username
       @password = password
-      @service = Service.AS400
+      @service = Service::AS400
     end
 
     # sets the Lotus Notes/Domino service.
     def set_notes_service(password = nil)
       @notes_id_password = password
-      @service = Service.NOTES
+      @service = Service::NOTES
     end
 
     # sets the Microsoft SQL Server service.
@@ -168,98 +168,98 @@ def set_tds_service(database = nil, domain = nil, username = nil, password = nil
       @use_windows_auth = domain.nil?
       @user_name = username
       @password = password
-      @service = Service.TDS
+      @service = Service::TDS
     end
 
     # sets the Microsoft Windows/Samba (SMB/CIFS) service.
     def set_cifs_service(domain = nil, username = nil, password = nil)
       @domain = domain
       @user_name = username
       @password = password
-      @service = Service.CIFS
+      @service = Service::CIFS
     end
 
     # sets the Microsoft Windows/Samba LM/NTLM Hash (SMB/CIFS) service.
     def set_cifshash_service(domain = nil, username = nil, password = nil)
       @domain = domain
       @user_name = username
       @password = password
-      @service = Service.CIFSHASH
+      @service = Service::CIFSHASH
     end
 
     # sets the MySQL Server service.
     def set_mysql_service(database = nil, username = nil, password = nil)
       @database = database
       @user_name = username
       @password = password
-      @service = Service.MYSQL
+      @service = Service::MYSQL
     end
 
     # sets the Oracle service.
     def set_oracle_service(sid = nil, username = nil, password = nil)
       @sid = sid
       @user_name = username
       @password = password
-      @service = Service.ORACLE
+      @service = Service::ORACLE
     end
 
     # sets the Post Office Protocol (POP) service.
     def set_pop_service(username = nil, password = nil)
       @user_name = username
       @password = password
-      @service = Service.POP
+      @service = Service::POP
     end
 
     # sets the PostgreSQL service.
     def set_postgresql_service(database = nil, username = nil, password = nil)
       @database = database
       @user_name = username
       @password = password
-      @service = Service.POSTGRESQL
+      @service = Service::POSTGRESQL
     end
 
     # sets the Remote Execution service.
     def set_remote_execution_service(username = nil, password = nil)
       @user_name = username
       @password = password
-      @service = Service.REMOTE_EXECUTION
+      @service = Service::REMOTE_EXECUTION
     end
 
     # sets the Secure Shell (SSH) service.
-    def set_ssh_service(username = nil, password = nil, elevation_type = ElevationType.NONE, elevation_user = nil, elevation_password = nil)
+    def set_ssh_service(username = nil, password = nil, elevation_type = ElevationType::NONE, elevation_user = nil, elevation_password = nil)
       @user_name = username
       @password = password
       @permission_elevation_type = elevation_type
       @permission_elevation_user = elevation_user
       @permission_elevation_password = elevation_password
-      @service = Service.SSH
+      @service = Service::SSH
     end
 
     # sets the Secure Shell (SSH) Public Key service.
-    def set_ssh_key_service(username, pemkey,  password = nil, elevation_type = ElevationType.NONE, elevation_user = nil, elevation_password = nil)
+    def set_ssh_key_service(username, pemkey,  password = nil, elevation_type = ElevationType::NONE, elevation_user = nil, elevation_password = nil)
       @user_name = username
       @password = password
       @pem_format_private_key = pemkey
       @permission_elevation_type = elevation_type
       @permission_elevation_user = elevation_user
       @permission_elevation_password = elevation_password
-      @service = Service.SSH_KEY
+      @service = Service::SSH_KEY
     end
 
     # sets the Simple Network Management Protocol v1/v2c service.
     def set_snmp_service(community_name = nil)
       @community_name = community_name
-      @service = Service.SNMP
+      @service = Service::SNMP
     end
 
     # sets the Simple Network Management Protocol v3 service.
-    def set_snmpv3_service(authentication_type = AuthenticationType.NOAUTH, username = nil, password = nil, privacy_type = PrivacyType.NOPRIV, privacy_password = nil)
+    def set_snmpv3_service(authentication_type = AuthenticationType::NOAUTH, username = nil, password = nil, privacy_type = PrivacyType::NOPRIV, privacy_password = nil)
       @authentication_type = authentication_type
       @user_name = username
       @password = password
       @privacy_type = privacy_type
       @privacy_password = privacy_password
-      @service = Service.SNMPV3
+      @service = Service::SNMPV3
     end
 
     # sets the Sybase SQL Server service.
@@ -269,22 +269,22 @@ def set_sybase_service(database = nil, domain = nil, username = nil, password =
       @use_windows_auth = domain.nil?
       @user_name = username
       @password = password
-      @service = Service.SYBASE
+      @service = Service::SYBASE
     end
 
     # sets the Telnet service.
     def set_telnet_service(username = nil, password = nil)
       @user_name = username
       @password = password
-      @service = Service.TELNET
+      @service = Service::TELNET
     end
 
     # sets the Web Site HTTP Authentication service.
     def set_http_service(domain = nil, username = nil, password = nil)
       @domain = domain
       @user_name = username
       @password = password
-      @service = Service.HTTP
+      @service = Service::HTTP
     end
   end
 

lib/nexpose/site.rb

@@ -118,6 +118,9 @@ class Site < APIObject
     # [Array] Collection of shared credentials associated with this site.
     attr_accessor :shared_credentials
 
+    # [Array] Collection of web credentials associated with the site.
+    attr_accessor :web_credentials
+
     # [Array] Collection of real-time alerts.
     # @see Alert
     # @see SMTPAlert
@@ -164,6 +167,7 @@ def initialize(name = nil, scan_template_id = 'full-audit-without-web-spider')
       @excluded_scan_targets = { addresses: [], asset_groups: [] }
       @site_credentials = []
       @shared_credentials = []
+      @web_credentials = []
       @alerts = []
       @users = []
       @tags = []
@@ -513,7 +517,7 @@ def self.load(nsc, id)
       site = self.json_initializer(hash).deserialize(hash)
 
       #site = new(hash[:name], hash[:scan_template_id])
-      site_credentials = hash[:site_credentials].map {|cred| Nexpose::SiteCredentials.new.object_from_hash(nsc,cred)}
+      site.site_credentials = hash[:site_credentials].map {|cred| Nexpose::SiteCredentials.new.object_from_hash(nsc,cred)}
       site.shared_credentials = hash[:shared_credentials].map {|cred| Nexpose::SiteCredentials.new.object_from_hash(nsc,cred)}
       site.discovery_config = Nexpose::DiscoveryConfig.new.object_from_hash(nsc, hash[:discovery_config]) unless hash[:discovery_config].nil?
       site.search_criteria = Nexpose::DiscoveryConfig::Criteria.parseHash(hash[:search_criteria]) unless hash[:search_criteria].nil?