Browse Source

handle Ruby 2.4 Fixnum/Bignum -> Integer deprecations

Brent Cook 3 years ago
parent
commit
f69b4a330e
100 changed files with 457 additions and 447 deletions
  1. 2
    2
      lib/metasm/metasm/main.rb
  2. 1
    1
      lib/metasploit/framework/jtr/cracker.rb
  3. 6
    6
      lib/metasploit/framework/login_scanner/base.rb
  4. 1
    1
      lib/metasploit/framework/login_scanner/ftp.rb
  5. 6
    6
      lib/metasploit/framework/login_scanner/http.rb
  6. 1
    1
      lib/metasploit/framework/login_scanner/result.rb
  7. 1
    1
      lib/metasploit/framework/login_scanner/snmp.rb
  8. 2
    2
      lib/metasploit/framework/login_scanner/telnet.rb
  9. 2
    2
      lib/metasploit/framework/login_scanner/wordpress_multicall.rb
  10. 4
    4
      lib/metasploit/framework/ntds/account.rb
  11. 2
    2
      lib/metasploit/framework/tcp/client.rb
  12. 4
    4
      lib/msf/core/auxiliary/fuzzer.rb
  13. 1
    1
      lib/msf/core/auxiliary/nmap.rb
  14. 2
    2
      lib/msf/core/auxiliary/report.rb
  15. 1
    1
      lib/msf/core/db_export.rb
  16. 1
    1
      lib/msf/core/db_manager/ip_address.rb
  17. 3
    3
      lib/msf/core/exploit/browser_autopwn2.rb
  18. 13
    13
      lib/msf/core/exploit/java/rmi/builder.rb
  19. 5
    5
      lib/msf/core/exploit/java/rmi/client.rb
  20. 1
    1
      lib/msf/core/exploit/java/rmi/client/registry.rb
  21. 4
    4
      lib/msf/core/exploit/java/rmi/util.rb
  22. 4
    4
      lib/msf/core/exploit/kerberos/client.rb
  23. 7
    7
      lib/msf/core/exploit/kerberos/client/as_request.rb
  24. 1
    1
      lib/msf/core/exploit/kerberos/client/as_response.rb
  25. 4
    4
      lib/msf/core/exploit/kerberos/client/base.rb
  26. 14
    14
      lib/msf/core/exploit/kerberos/client/cache_credential.rb
  27. 4
    4
      lib/msf/core/exploit/kerberos/client/pac.rb
  28. 12
    12
      lib/msf/core/exploit/kerberos/client/tgs_request.rb
  29. 3
    3
      lib/msf/core/exploit/oracle.rb
  30. 2
    2
      lib/msf/core/exploit/postgres.rb
  31. 4
    4
      lib/msf/core/exploit/smb/server/share.rb
  32. 2
    2
      lib/msf/core/exploit/smb/server/share/command/close.rb
  33. 12
    12
      lib/msf/core/exploit/smb/server/share/command/negotiate.rb
  34. 8
    8
      lib/msf/core/exploit/smb/server/share/command/nt_create_andx.rb
  35. 5
    5
      lib/msf/core/exploit/smb/server/share/command/read_andx.rb
  36. 7
    7
      lib/msf/core/exploit/smb/server/share/command/session_setup_andx.rb
  37. 2
    2
      lib/msf/core/exploit/smb/server/share/command/trans2.rb
  38. 1
    1
      lib/msf/core/exploit/smb/server/share/command/trans2/find_first2.rb
  39. 1
    1
      lib/msf/core/exploit/smb/server/share/command/trans2/query_file_information.rb
  40. 1
    1
      lib/msf/core/exploit/smb/server/share/command/trans2/query_path_information.rb
  41. 21
    21
      lib/msf/core/exploit/smb/server/share/information_level/find.rb
  42. 22
    22
      lib/msf/core/exploit/smb/server/share/information_level/query.rb
  43. 1
    1
      lib/msf/core/module/ui/message.rb
  44. 1
    1
      lib/msf/core/payload/linux/bind_tcp.rb
  45. 1
    1
      lib/msf/core/payload/linux/reverse_tcp.rb
  46. 4
    4
      lib/msf/core/payload/uuid.rb
  47. 1
    1
      lib/msf/core/payload/uuid/options.rb
  48. 1
    1
      lib/msf/core/payload/windows/bind_tcp.rb
  49. 3
    3
      lib/msf/core/payload/windows/reverse_http.rb
  50. 2
    2
      lib/msf/core/payload/windows/reverse_tcp.rb
  51. 2
    2
      lib/msf/core/payload/windows/reverse_tcp_dns.rb
  52. 1
    1
      lib/msf/core/payload/windows/reverse_tcp_rc4.rb
  53. 2
    2
      lib/msf/core/payload/windows/reverse_winhttp.rb
  54. 1
    1
      lib/msf/core/payload/windows/x64/bind_tcp.rb
  55. 3
    3
      lib/msf/core/payload/windows/x64/reverse_http.rb
  56. 1
    1
      lib/msf/core/payload/windows/x64/reverse_tcp.rb
  57. 2
    2
      lib/msf/core/payload/windows/x64/reverse_winhttp.rb
  58. 8
    8
      lib/msf/core/payload_generator.rb
  59. 1
    1
      lib/msf/core/post.rb
  60. 1
    1
      lib/msf/core/post/file.rb
  61. 2
    2
      lib/msf/core/post/windows/accounts.rb
  62. 5
    5
      lib/msf/core/post/windows/ldap.rb
  63. 2
    2
      lib/msf/core/post/windows/process.rb
  64. 1
    1
      lib/msf/core/post/windows/reflective_dll_injection.rb
  65. 5
    5
      lib/msf/core/post/windows/services.rb
  66. 3
    3
      lib/msf/core/post_mixin.rb
  67. 2
    2
      lib/msf/core/reflective_dll_loader.rb
  68. 2
    2
      lib/msf/core/rpc/v10/constants.rb
  69. 1
    1
      lib/msf/core/rpc/v10/rpc_base.rb
  70. 9
    9
      lib/msf/core/rpc/v10/rpc_console.rb
  71. 19
    19
      lib/msf/core/rpc/v10/rpc_core.rb
  72. 54
    54
      lib/msf/core/rpc/v10/rpc_db.rb
  73. 4
    4
      lib/msf/core/rpc/v10/rpc_job.rb
  74. 4
    4
      lib/msf/core/rpc/v10/rpc_module.rb
  75. 23
    23
      lib/msf/core/rpc/v10/rpc_session.rb
  76. 1
    1
      lib/msf/ui/console/command_dispatcher/db.rb
  77. 1
    1
      lib/msf/util/exe.rb
  78. 3
    3
      lib/msf/util/payload_cached_size.rb
  79. 3
    3
      lib/net/dns/rr/classes.rb
  80. 3
    3
      lib/net/dns/rr/types.rb
  81. 5
    5
      lib/rex/payloads/meterpreter/uri_checksum.rb
  82. 2
    2
      lib/rex/post/meterpreter/extensions/kiwi/kiwi.rb
  83. 12
    6
      lib/rex/post/meterpreter/extensions/stdapi/railgun/dll.rb
  84. 2
    4
      lib/rex/post/meterpreter/extensions/stdapi/railgun/dll_helper.rb
  85. 11
    5
      lib/rex/post/meterpreter/extensions/stdapi/railgun/multicall.rb
  86. 1
    1
      lib/rex/post/meterpreter/extensions/stdapi/railgun/type/pointer_util.rb
  87. 1
    1
      lib/rex/post/meterpreter/extensions/stdapi/railgun/util.rb
  88. 1
    1
      lib/rex/post/meterpreter/packet.rb
  89. 2
    2
      lib/rex/post/meterpreter/packet_dispatcher.rb
  90. 2
    2
      lib/rex/post/meterpreter/packet_response_waiter.rb
  91. 17
    17
      lib/rex/proto/dcerpc/svcctl/packet.rb
  92. 2
    2
      lib/rex/proto/http/client.rb
  93. 4
    4
      lib/rex/proto/kerberos/client.rb
  94. 1
    1
      lib/rex/proto/kerberos/credential_cache/cache.rb
  95. 2
    2
      lib/rex/proto/kerberos/credential_cache/credential.rb
  96. 2
    2
      lib/rex/proto/kerberos/credential_cache/key_block.rb
  97. 1
    1
      lib/rex/proto/kerberos/credential_cache/principal.rb
  98. 4
    4
      lib/rex/proto/kerberos/credential_cache/time.rb
  99. 2
    2
      lib/rex/proto/kerberos/crypto/rc4_hmac.rb
  100. 0
    0
      lib/rex/proto/kerberos/model/ap_req.rb

+ 2
- 2
lib/metasm/metasm/main.rb View File

@@ -1128,11 +1128,11 @@ class EncodedData
1128 1128
     ((val + len - 1) / len).to_i * len
1129 1129
   end
1130 1130
 
1131
-  # concatenation of another +EncodedData+ (or nil/Fixnum/anything supporting String#<<)
1131
+  # concatenation of another +EncodedData+ (or nil/Integer/anything supporting String#<<)
1132 1132
   def <<(other)
1133 1133
     case other
1134 1134
     when nil
1135
-    when ::Fixnum
1135
+    when ::Integer
1136 1136
       fill
1137 1137
       @data = @data.to_str if not @data.kind_of? String
1138 1138
       @data << other

+ 1
- 1
lib/metasploit/framework/jtr/cracker.rb View File

@@ -33,7 +33,7 @@ module Metasploit
33 33
         attr_accessor :john_path
34 34
 
35 35
         # @!attribute max_runtime
36
-        #   @return [Fixnum] An optional maximum duration of the cracking attempt in seconds
36
+        #   @return [Integer] An optional maximum duration of the cracking attempt in seconds
37 37
         attr_accessor :max_runtime
38 38
 
39 39
         # @!attribute pot

+ 6
- 6
lib/metasploit/framework/login_scanner/base.rb View File

@@ -19,7 +19,7 @@ module Metasploit
19 19
           #   @return [Object] The framework module caller, if availale
20 20
           attr_accessor :framework_module
21 21
           # @!attribute connection_timeout
22
-          #   @return [Fixnum] The timeout in seconds for a single SSH connection
22
+          #   @return [Integer] The timeout in seconds for a single SSH connection
23 23
           attr_accessor :connection_timeout
24 24
           # @!attribute cred_details
25 25
           #   @return [CredentialCollection] Collection of Credential objects
@@ -28,13 +28,13 @@ module Metasploit
28 28
           #   @return [String] The IP address or hostname to connect to
29 29
           attr_accessor :host
30 30
           # @!attribute port
31
-          #   @return [Fixnum] The port to connect to
31
+          #   @return [Integer] The port to connect to
32 32
           attr_accessor :port
33 33
           # @!attribute host
34 34
           #   @return [String] The local host for outgoing connections
35 35
           attr_accessor :local_host
36 36
           # @!attribute port
37
-          #   @return [Fixnum] The local port for outgoing connections
37
+          #   @return [Integer] The local port for outgoing connections
38 38
           attr_accessor :local_port
39 39
           # @!attribute proxies
40 40
           #   @return [String] The proxy directive to use for the socket
@@ -43,7 +43,7 @@ module Metasploit
43 43
           #   @return [Boolean] Whether the scanner should stop when it has found one working Credential
44 44
           attr_accessor :stop_on_success
45 45
           # @!attribute bruteforce_speed
46
-          #   @return [Fixnum] The desired speed, with 5 being 'fast' and 0 being 'slow.'
46
+          #   @return [Integer] The desired speed, with 5 being 'fast' and 0 being 'slow.'
47 47
           attr_accessor :bruteforce_speed
48 48
 
49 49
           validates :connection_timeout,
@@ -115,7 +115,7 @@ module Metasploit
115 115
           # overridden, the override should probably do something sensible
116 116
           # with {#bruteforce_speed}
117 117
           #
118
-          # @return [Fixnum] a number of seconds to sleep between attempts
118
+          # @return [Integer] a number of seconds to sleep between attempts
119 119
           def sleep_time
120 120
             case bruteforce_speed
121 121
               when 0; 60 * 5
@@ -129,7 +129,7 @@ module Metasploit
129 129
 
130 130
           # A threadsafe sleep method
131 131
           #
132
-          # @param time [Fixnum] number of seconds (can be a Float), defaults
132
+          # @param time [Integer] number of seconds (can be a Float), defaults
133 133
           # to {#sleep_time}
134 134
           #
135 135
           # @return [void]

+ 1
- 1
lib/metasploit/framework/login_scanner/ftp.rb View File

@@ -21,7 +21,7 @@ module Metasploit
21 21
         REALM_KEY           = nil
22 22
 
23 23
         # @!attribute ftp_timeout
24
-        #   @return [Fixnum] The timeout in seconds to wait for a response to an FTP command
24
+        #   @return [Integer] The timeout in seconds to wait for a response to an FTP command
25 25
         attr_accessor :ftp_timeout
26 26
 
27 27
         validates :ftp_timeout,

+ 6
- 6
lib/metasploit/framework/login_scanner/http.rb View File

@@ -46,11 +46,11 @@ module Metasploit
46 46
         attr_accessor :evade_uri_full_url
47 47
 
48 48
         # @!attribute evade_pad_method_uri_count
49
-        #   @return [Fixnum] How many whitespace characters to use between the method and uri
49
+        #   @return [Integer] How many whitespace characters to use between the method and uri
50 50
         attr_accessor :evade_pad_method_uri_count
51 51
 
52 52
         # @!attribute evade_pad_uri_version_count
53
-        #   @return [Fixnum] How many whitespace characters to use between the uri and version
53
+        #   @return [Integer] How many whitespace characters to use between the uri and version
54 54
         attr_accessor :evade_pad_uri_version_count
55 55
 
56 56
         # @!attribute evade_pad_method_uri_type
@@ -98,7 +98,7 @@ module Metasploit
98 98
         attr_accessor :evade_pad_fake_headers
99 99
 
100 100
         # @!attribute evade_pad_fake_headers_count
101
-        #   @return [Fixnum] How many fake headers to insert into the HTTP request
101
+        #   @return [Integer] How many fake headers to insert into the HTTP request
102 102
         attr_accessor :evade_pad_fake_headers_count
103 103
 
104 104
         # @!attribute evade_pad_get_params
@@ -106,7 +106,7 @@ module Metasploit
106 106
         attr_accessor :evade_pad_get_params
107 107
 
108 108
         # @!attribute evade_pad_get_params_count
109
-        #   @return [Fixnum] How many fake query string variables to insert into the request
109
+        #   @return [Integer] How many fake query string variables to insert into the request
110 110
         attr_accessor :evade_pad_get_params_count
111 111
 
112 112
         # @!attribute evade_pad_post_params
@@ -114,7 +114,7 @@ module Metasploit
114 114
         attr_accessor :evade_pad_post_params
115 115
 
116 116
         # @!attribute evade_pad_post_params_count
117
-        #   @return [Fixnum] How many fake post variables to insert into the request
117
+        #   @return [Integer] How many fake post variables to insert into the request
118 118
         attr_accessor :evade_pad_post_params_count
119 119
 
120 120
         # @!attribute evade_uri_fake_end
@@ -207,7 +207,7 @@ module Metasploit
207 207
         #
208 208
         # @param [Hash] opts native support includes the following (also see Rex::Proto::Http::Request#request_cgi)
209 209
         # @option opts [String] 'host' The remote host
210
-        # @option opts [Fixnum] 'port' The remote port
210
+        # @option opts [Integer] 'port' The remote port
211 211
         # @option opts [Boolean] 'ssl' The SSL setting, TrueClass or FalseClass
212 212
         # @option opts [String]  'proxies' The proxies setting
213 213
         # @option opts [Credential] 'credential' A credential object

+ 1
- 1
lib/metasploit/framework/login_scanner/result.rb View File

@@ -18,7 +18,7 @@ module Metasploit
18 18
         #   @return [String] the addess of the target host for this result
19 19
         attr_accessor :host
20 20
         # @!attribute port
21
-        #   @return [Fixnum] the port number of the service for this result
21
+        #   @return [Integer] the port number of the service for this result
22 22
         attr_accessor :port
23 23
         # @!attribute proof
24 24
         #   @return [#to_s] the proof of the login's success or failure

+ 1
- 1
lib/metasploit/framework/login_scanner/snmp.rb View File

@@ -31,7 +31,7 @@ module Metasploit
31 31
         attr_accessor :version
32 32
 
33 33
         # The number of logins to try in each batch
34
-        # @return [Fixnum]
34
+        # @return [Integer]
35 35
         attr_accessor :queue_size
36 36
 
37 37
         validates :version,

+ 2
- 2
lib/metasploit/framework/login_scanner/telnet.rb View File

@@ -24,13 +24,13 @@ module Metasploit
24 24
         # @!attribute verbosity
25 25
         #   The timeout to wait for the telnet banner.
26 26
         #
27
-        #   @return [Fixnum]
27
+        #   @return [Integer]
28 28
         attr_accessor :banner_timeout
29 29
 
30 30
         # @!attribute verbosity
31 31
         #   The timeout to wait for the response from a telnet command.
32 32
         #
33
-        #   @return [Fixnum]
33
+        #   @return [Integer]
34 34
         attr_accessor :telnet_timeout
35 35
 
36 36
         # @!attribute verbosity

+ 2
- 2
lib/metasploit/framework/login_scanner/wordpress_multicall.rb View File

@@ -12,11 +12,11 @@ module Metasploit
12 12
         attr_accessor :passwords
13 13
 
14 14
         # @!attribute chunk_size, limits number of passwords per XML request
15
-        # @return [Fixnum]
15
+        # @return [Integer]
16 16
         attr_accessor :chunk_size
17 17
 
18 18
         # @!attribute block_wait, time to wait if got blocked by the target
19
-        # @return [Fixnum]
19
+        # @return [Integer]
20 20
         attr_accessor :block_wait
21 21
 
22 22
         # @!attribute base_uri

+ 4
- 4
lib/metasploit/framework/ntds/account.rb View File

@@ -30,11 +30,11 @@ module Metasploit
30 30
         attr_accessor :lm_hash
31 31
         #@return [Array<String>] The LM hashes for previous passwords, up to 24
32 32
         attr_accessor :lm_history
33
-        #@return [Fixnum] The count of historical LM hashes
33
+        #@return [Integer] The count of historical LM hashes
34 34
         attr_accessor :lm_history_count
35 35
         #@return [Boolean] If the AD account is locked
36 36
         attr_accessor :locked
37
-        #@return [Fixnum] The number of times this account has logged in
37
+        #@return [Integer] The number of times this account has logged in
38 38
         attr_accessor :logon_count
39 39
         #@return [String] Human Readable Date for the last time the account logged in
40 40
         attr_accessor :logon_date
@@ -50,13 +50,13 @@ module Metasploit
50 50
         attr_accessor :nt_hash
51 51
         #@return [Array<String>] The NT hashes for previous passwords, up to 24
52 52
         attr_accessor :nt_history
53
-        #@return [Fixnum] The count of historical NT hashes
53
+        #@return [Integer] The count of historical NT hashes
54 54
         attr_accessor :nt_history_count
55 55
         #@return [String] Human Readable Date for the last password change
56 56
         attr_accessor :pass_date
57 57
         #@return [String] Human Readable Time for the last password change
58 58
         attr_accessor :pass_time
59
-        #@return [Fixnum] The Relative ID of the account
59
+        #@return [Integer] The Relative ID of the account
60 60
         attr_accessor :rid
61 61
         #@return [String] Byte String for the Account's SID
62 62
         attr_accessor :sid

+ 2
- 2
lib/metasploit/framework/tcp/client.rb View File

@@ -43,10 +43,10 @@ module Metasploit
43 43
         extend ActiveSupport::Concern
44 44
 
45 45
         # @!attribute max_send_size
46
-        #   @return [Fixnum] The max size of the data to encapsulate in a single packet
46
+        #   @return [Integer] The max size of the data to encapsulate in a single packet
47 47
         attr_accessor :max_send_size
48 48
         # @!attribute send_delay
49
-        #   @return [Fixnum] The delay between sending packets
49
+        #   @return [Integer] The delay between sending packets
50 50
         attr_accessor :send_delay
51 51
 
52 52
         included do

+ 4
- 4
lib/msf/core/auxiliary/fuzzer.rb View File

@@ -21,7 +21,7 @@ module Auxiliary::Fuzzer
21 21
   # Will return or yield numbers based on the presence of a block.
22 22
   #
23 23
   # @return [Array<Array>] Returns an array of arrays of numbers if there is no block given
24
-  # @yield [Array<Fixnum>] Yields an array of numbers if there is a block given
24
+  # @yield [Array<Integer>] Yields an array of numbers if there is a block given
25 25
   # @see #fuzzer_number_power2
26 26
 
27 27
   def fuzz_numbers
@@ -51,7 +51,7 @@ module Auxiliary::Fuzzer
51 51
   # Modifies each byte of the string from beginning to end, packing each element as an 8 bit character.
52 52
   #
53 53
   # @param str [String] The string the mutation will be based on.
54
-  # @param max [Fixnum, NilClass] Max string size.
54
+  # @param max [Integer, NilClass] Max string size.
55 55
   # @return [Array] Returns an array of an array of strings
56 56
   # @see #fuzzer_string_format
57 57
 
@@ -71,7 +71,7 @@ module Auxiliary::Fuzzer
71 71
   # Modifies each byte of the string from beginning to end, packing each element as an 8 bit character.
72 72
   #
73 73
   # @param str [String] The string the mutation will be based on.
74
-  # @param max [Fixnum, NilClass] Max string size.
74
+  # @param max [Integer, NilClass] Max string size.
75 75
   # @return [Array] Returns an array of an array of strings
76 76
   # @see fuzzer_string_format
77 77
 
@@ -150,7 +150,7 @@ module Auxiliary::Fuzzer
150 150
   # Generates a fuzz string If no block is set, it will retrive characters from the
151 151
   # FuzzChar datastore option.
152 152
   #
153
-  # @param len [Fixnum] String size.
153
+  # @param len [Integer] String size.
154 154
   # @return [String] Returns a string of size 1024 * 512 specified by the user
155 155
 
156 156
   def fuzzer_gen_string(len)

+ 1
- 1
lib/msf/core/auxiliary/nmap.rb View File

@@ -181,7 +181,7 @@ end
181 181
 # and combinations thereof.
182 182
 def nmap_validate_rports
183 183
   # If there's an RPORT specified, use that instead.
184
-  if datastore['RPORT'] && (datastore['RPORT'].kind_of?(Fixnum) || !datastore['RPORT'].empty?)
184
+  if datastore['RPORT'] && (datastore['RPORT'].kind_of?(Integer) || !datastore['RPORT'].empty?)
185 185
     return true
186 186
   end
187 187
   if rports.nil? || rports.empty?

+ 2
- 2
lib/msf/core/auxiliary/report.rb View File

@@ -70,7 +70,7 @@ module Auxiliary::Report
70 70
   # This method safely get the workspace ID. It handles if the db is not active
71 71
   #
72 72
   # @return [NilClass] if there is no DB connection
73
-  # @return [Fixnum] the ID of the current Mdm::Workspace
73
+  # @return [Integer] the ID of the current Mdm::Workspace
74 74
   def myworkspace_id
75 75
     if framework.db.active
76 76
       myworkspace.id
@@ -170,7 +170,7 @@ module Auxiliary::Report
170 170
   #
171 171
   # @param opts [Hash] the option hash
172 172
   # @option opts [String] :host the address of the host (also takes a Mdm::Host)
173
-  # @option opts [Fixnum] :port the port of the connected service
173
+  # @option opts [Integer] :port the port of the connected service
174 174
   # @option opts [Mdm::Service] :service an optional Service object to build the cred for
175 175
   # @option opts [String] :type What type of private credential this is (e.g. "password", "hash", "ssh_key")
176 176
   # @option opts [String] :proto Which transport protocol the service uses

+ 1
- 1
lib/msf/core/db_export.rb View File

@@ -171,7 +171,7 @@ class Export
171 171
     case obj
172 172
     when String
173 173
       obj.strip
174
-    when TrueClass, FalseClass, Float, Fixnum, Bignum, Time
174
+    when TrueClass, FalseClass, Float, Integer, Time
175 175
       obj.to_s.strip
176 176
     when BigDecimal
177 177
       obj.to_s("F")

+ 1
- 1
lib/msf/core/db_manager/ip_address.rb View File

@@ -35,7 +35,7 @@ module Msf::DBManager::IPAddress
35 35
       else
36 36
         raise ArgumentError, "Invalid IP address: #{ip.inspect}"
37 37
       end
38
-    when Fixnum
38
+    when Integer
39 39
       if (0..2**32-1).include? ip
40 40
         ip_x = Rex::Socket.addr_itoa(ip)
41 41
         ip_i = ip

+ 3
- 3
lib/msf/core/exploit/browser_autopwn2.rb View File

@@ -282,7 +282,7 @@ module Msf
282 282
     # Returns the selected payload's LPORT.
283 283
     #
284 284
     # @param platform [Symbol]
285
-    # @return [Fixnum]
285
+    # @return [Integer]
286 286
     def get_selected_payload_lport(platform)
287 287
       datastore["PAYLOAD_#{platform.to_s.upcase}_LPORT"]
288 288
     end
@@ -353,7 +353,7 @@ module Msf
353 353
 
354 354
     # Returns the human-readable version of the rank.
355 355
     #
356
-    # @param rank [Fixnum]
356
+    # @param rank [Integer]
357 357
     # @return [String]
358 358
     def parse_rank(rank)
359 359
       RankingName[rank].to_s.capitalize
@@ -716,7 +716,7 @@ module Msf
716 716
 
717 717
     # Returns a number of sessions obtained by BAP's payload handlers.
718 718
     #
719
-    # @return [Fixnum] A session count.
719
+    # @return [Integer] A session count.
720 720
     def session_count
721 721
       total = 0
722 722
 

+ 13
- 13
lib/msf/core/exploit/java/rmi/builder.rb View File

@@ -10,10 +10,10 @@ module Msf
10 10
           module Builder
11 11
             # Builds a RMI header stream
12 12
             #
13
-            # @param opts [Hash{Symbol => <String, Fixnum>}]
13
+            # @param opts [Hash{Symbol => <String, Integer>}]
14 14
             # @option opts [String] :signature
15
-            # @option opts [Fixnum] :version
16
-            # @option opts [Fixnum] :protocol
15
+            # @option opts [Integer] :version
16
+            # @option opts [Integer] :protocol
17 17
             # @return [Rex::Proto::Rmi::Model::OutputHeader]
18 18
             def build_header(opts = {})
19 19
               signature = opts[:signature] || Rex::Proto::Rmi::Model::SIGNATURE
@@ -30,16 +30,16 @@ module Msf
30 30
 
31 31
             # Builds a RMI call stream
32 32
             #
33
-            # @param opts [Hash{Symbol => <Fixnum, Array>}]
34
-            # @option opts [Fixnum] :message_id
35
-            # @option opts [Fixnum] :object_number Random to identify the object.
36
-            # @option opts [Fixnum] :uid_number Identifies the VM where the object was generated.
37
-            # @option opts [Fixnum] :uid_time Time where the object was generated.
38
-            # @option opts [Fixnum] :uid_count Identifies different instance of the same object generated from the same VM
33
+            # @param opts [Hash{Symbol => <Integer, Array>}]
34
+            # @option opts [Integer] :message_id
35
+            # @option opts [Integer] :object_number Random to identify the object.
36
+            # @option opts [Integer] :uid_number Identifies the VM where the object was generated.
37
+            # @option opts [Integer] :uid_time Time where the object was generated.
38
+            # @option opts [Integer] :uid_count Identifies different instance of the same object generated from the same VM
39 39
             #   at the same time.
40
-            # @option opts [Fixnum] :operation On JDK 1.1 stub protocol the operation index in the interface. On JDK 1.2
40
+            # @option opts [Integer] :operation On JDK 1.1 stub protocol the operation index in the interface. On JDK 1.2
41 41
             #   it is -1.
42
-            # @option opts [Fixnum] :hash On JDK 1.1 stub protocol the stub's interface hash. On JDK1.2 is a hash
42
+            # @option opts [Integer] :hash On JDK 1.1 stub protocol the stub's interface hash. On JDK1.2 is a hash
43 43
             #   representing the method to call.
44 44
             # @option opts [Array] :arguments
45 45
             # @return [Rex::Proto::Rmi::Model::Call]
@@ -77,8 +77,8 @@ module Msf
77 77
 
78 78
             # Builds a RMI dgc ack stream
79 79
             #
80
-            # @param opts [Hash{Symbol => <Fixnum, String>}]
81
-            # @option opts [Fixnum] :stream_id
80
+            # @param opts [Hash{Symbol => <Integer, String>}]
81
+            # @option opts [Integer] :stream_id
82 82
             # @option opts [String] :unique_identifier
83 83
             # @return [Rex::Proto::Rmi::Model::DgcAck]
84 84
             def build_dgc_ack(opts = {})

+ 5
- 5
lib/msf/core/exploit/java/rmi/client.rb View File

@@ -32,7 +32,7 @@ module Msf
32 32
 
33 33
             # Returns the timeout to wait for data between read iterations
34 34
             #
35
-            # @return [Fixnum]
35
+            # @return [Integer]
36 36
             def read_loop_timeout
37 37
               datastore['RmiReadLoopTimeout'] || 1
38 38
             end
@@ -46,7 +46,7 @@ module Msf
46 46
 
47 47
             # Returns the target port
48 48
             #
49
-            # @return [Fixnum]
49
+            # @return [Integer]
50 50
             def rport
51 51
               datastore['RPORT']
52 52
             end
@@ -56,7 +56,7 @@ module Msf
56 56
             #
57 57
             # @param opts [Hash]
58 58
             # @option opts [Rex::Socket::Tcp] :sock
59
-            # @return [Fixnum] the number of bytes sent
59
+            # @return [Integer] the number of bytes sent
60 60
             # @see Msf::Rmi::Client::Streams#build_header
61 61
             def send_header(opts = {})
62 62
               nsock = opts[:sock] || sock
@@ -69,7 +69,7 @@ module Msf
69 69
             # @param opts [Hash]
70 70
             # @option opts [Rex::Socket::Tcp] :sock
71 71
             # @option opts [Rex::Proto::Rmi::Model::Call] :call
72
-            # @return [Fixnum] the number of bytes sent
72
+            # @return [Integer] the number of bytes sent
73 73
             # @see Msf::Rmi::Client::Streams#build_call
74 74
             def send_call(opts = {})
75 75
               nsock = opts[:sock] || sock
@@ -81,7 +81,7 @@ module Msf
81 81
             #
82 82
             # @param opts [Hash]
83 83
             # @option opts [Rex::Socket::Tcp] :sock
84
-            # @return [Fixnum] the number of bytes sent
84
+            # @return [Integer] the number of bytes sent
85 85
             # @see Msf::Rmi::Client::Streams#build_dgc_ack
86 86
             def send_dgc_ack(opts = {})
87 87
               nsock = opts[:sock] || sock

+ 1
- 1
lib/msf/core/exploit/java/rmi/client/registry.rb View File

@@ -91,7 +91,7 @@ module Msf
91 91
               # Calculates the hash to make RMI calls for the
92 92
               # java/rmi/registry/RegistryImpl_Stub interface
93 93
               #
94
-              # @return [Fixnum] The interface's hash
94
+              # @return [Integer] The interface's hash
95 95
               def registry_interface_hash
96 96
                 hash = calculate_interface_hash(
97 97
                   [

+ 4
- 4
lib/msf/core/exploit/java/rmi/util.rb View File

@@ -12,7 +12,7 @@ module Msf
12 12
             #
13 13
             # @param signature [String] The remote method signature as specified by the JDK 1.2,
14 14
             #   method name + method descriptor (as explained in the Java Virtual Machine Specification)
15
-            # @return [Fixnum] The method hash
15
+            # @return [Integer] The method hash
16 16
             # @see http://docs.oracle.com/javase/8/docs/platform/rmi/spec/rmi-stubs24.html The RemoteRef Interface documentation to understand how method hashes are calculated
17 17
             def calculate_method_hash(signature)
18 18
               utf = Rex::Java::Serialization::Model::Utf.new(nil, signature)
@@ -24,7 +24,7 @@ module Msf
24 24
             # Calculates an interface hash to make RMI calls as defined by the JDK 1.1
25 25
             #
26 26
             # @param methods [Array] set of method names and their descriptors
27
-            # @return [Fixnum] The interface hash
27
+            # @return [Integer] The interface hash
28 28
             # @see http://docs.oracle.com/javase/8/docs/platform/rmi/spec/rmi-stubs24.html The RemoteRef Interface documentation to understand how interface hashes are calculated
29 29
             def calculate_interface_hash(methods)
30 30
               stream = ''
@@ -68,7 +68,7 @@ module Msf
68 68
             # Extracts an int from an IO
69 69
             #
70 70
             # @param io [IO] the io to extract the int from
71
-            # @return [Fixnum, nil] the extracted int if success, nil otherwise
71
+            # @return [Integer, nil] the extracted int if success, nil otherwise
72 72
             def extract_int(io)
73 73
               int_raw = io.read(4)
74 74
               unless int_raw && int_raw.length == 4
@@ -82,7 +82,7 @@ module Msf
82 82
             # Extracts a long from an IO
83 83
             #
84 84
             # @param io [IO] the io to extract the long from
85
-            # @return [Fixnum, nil] the extracted int if success, nil otherwise
85
+            # @return [Integer, nil] the extracted int if success, nil otherwise
86 86
             def extract_long(io)
87 87
               int_raw = io.read(8)
88 88
               unless int_raw && int_raw.length == 8

+ 4
- 4
lib/msf/core/exploit/kerberos/client.rb View File

@@ -47,14 +47,14 @@ module Msf
47 47
 
48 48
           # Returns the remote port
49 49
           #
50
-          # @return [Fixnum]
50
+          # @return [Integer]
51 51
           def rport
52 52
             datastore['RPORT']
53 53
           end
54 54
 
55 55
           # Returns the TCP timeout
56 56
           #
57
-          # @return [Fixnum]
57
+          # @return [Integer]
58 58
           def timeout
59 59
             datastore['Timeout']
60 60
           end
@@ -68,9 +68,9 @@ module Msf
68 68
 
69 69
           # Creates a kerberos connection
70 70
           #
71
-          # @param opts [Hash{Symbol => <String, Fixnum>}]
71
+          # @param opts [Hash{Symbol => <String, Integer>}]
72 72
           # @option opts [String] :rhost
73
-          # @option opts [<String, Fixnum>] :rport
73
+          # @option opts [<String, Integer>] :rport
74 74
           # @return [Rex::Proto::Kerberos::Client]
75 75
           def connect(opts={})
76 76
             kerb_client = Rex::Proto::Kerberos::Client.new(

+ 7
- 7
lib/msf/core/exploit/kerberos/client/as_request.rb View File

@@ -32,10 +32,10 @@ module Msf
32 32
 
33 33
             # Builds a kerberos PA-ENC-TIMESTAMP pre authenticated structure
34 34
             #
35
-            # @param opts [Hash{Symbol => <Time, Fixnum, String>}]
35
+            # @param opts [Hash{Symbol => <Time, Integer, String>}]
36 36
             # @option opts [Time] :time_stamp
37
-            # @option opts [Fixnum] :pausec
38
-            # @option opts [Fixnum] :etype
37
+            # @option opts [Integer] :pausec
38
+            # @option opts [Integer] :etype
39 39
             # @option opts [String] :key
40 40
             # @return [Rex::Proto::Kerberos::Model::PreAuthData]
41 41
             # @see Rex::Proto::Kerberos::Model::PreAuthEncTimeStamp
@@ -67,13 +67,13 @@ module Msf
67 67
 
68 68
             # Builds a kerberos AS request body
69 69
             #
70
-            # @param opts [Hash{Symbol => <Fixnum, Time, String, Rex::Proto::Kerberos::Model::PrincipalName>}]
71
-            # @option opts [Fixnum] :options
70
+            # @param opts [Hash{Symbol => <Integer, Time, String, Rex::Proto::Kerberos::Model::PrincipalName>}]
71
+            # @option opts [Integer] :options
72 72
             # @option opts [Time] :from
73 73
             # @option opts [Time] :till
74 74
             # @option opts [Time] :rtime
75
-            # @option opts [Fixnum] :nonce
76
-            # @option opts [Fixnum] :etype
75
+            # @option opts [Integer] :nonce
76
+            # @option opts [Integer] :etype
77 77
             # @option opts [Rex::Proto::Kerberos::Model::PrincipalName] :cname
78 78
             # @option opts [String] :realm
79 79
             # @option opts [Rex::Proto::Kerberos::Model::PrincipalName] :sname

+ 1
- 1
lib/msf/core/exploit/kerberos/client/as_response.rb View File

@@ -28,7 +28,7 @@ module Msf
28 28
             #
29 29
             # @param res [Rex::Proto::Kerberos::Model::KdcResponse]
30 30
             # @param key [String]
31
-            # @return [Fixnum]
31
+            # @return [Integer]
32 32
             # @see Rex::Proto::Kerberos::Model::KdcResponse
33 33
             # @see Rex::Proto::Kerberos::Model::EncryptedData.decrypt
34 34
             # @see Rex::Proto::Kerberos::Model::EncKdcResponse

+ 4
- 4
lib/msf/core/exploit/kerberos/client/base.rb View File

@@ -9,9 +9,9 @@ module Msf
9 9
 
10 10
             # Builds a kerberos Client Name Principal
11 11
             #
12
-            # @param opts [Hash{Symbol => <String, Fixnum>}]
12
+            # @param opts [Hash{Symbol => <String, Integer>}]
13 13
             # @option opts [String] :client_name the client's name
14
-            # @option opts [Fixnum] :client_type the client's name type
14
+            # @option opts [Integer] :client_type the client's name type
15 15
             # @return [Rex::Proto::Kerberos::Model::PrincipalName]
16 16
             # @see Rex::Proto::Kerberos::Model::PrincipalName
17 17
             def build_client_name(opts = {})
@@ -26,9 +26,9 @@ module Msf
26 26
 
27 27
             # Builds a kerberos Server Name Principal
28 28
             #
29
-            # @param opts [Hash{Symbol => <String, Fixnum>}]
29
+            # @param opts [Hash{Symbol => <String, Integer>}]
30 30
             # @option opts [String] :server_name the server's name
31
-            # @option opts [Fixnum] :server_type the server's name type
31
+            # @option opts [Integer] :server_type the server's name type
32 32
             # @return [Rex::Proto::Kerberos::Model::PrincipalName]
33 33
             # @see Rex::Proto::Kerberos::Model::PrincipalName
34 34
             def build_server_name(opts = {})

+ 14
- 14
lib/msf/core/exploit/kerberos/client/cache_credential.rb View File

@@ -10,8 +10,8 @@ module Msf
10 10
 
11 11
             # Builds a MIT Credential Cache
12 12
             #
13
-            # @param opts [Hash{Symbol => <Fixnum, Array<String>, Rex::Proto::Kerberos::CredentialCache::Principal, Array<Rex::Proto::Kerberos::CredentialCache::Credential>>}]
14
-            # @option opts [Fixnum] :version
13
+            # @param opts [Hash{Symbol => <Integer, Array<String>, Rex::Proto::Kerberos::CredentialCache::Principal, Array<Rex::Proto::Kerberos::CredentialCache::Credential>>}]
14
+            # @option opts [Integer] :version
15 15
             # @option opts [Array<String>] :headers
16 16
             # @option opts [Rex::Proto::Kerberos::CredentialCache::Principal] :primary_principal
17 17
             # @option opts [Array<Rex::Proto::Kerberos::CredentialCache::Credential>] :credentials
@@ -35,8 +35,8 @@ module Msf
35 35
 
36 36
             # Builds a MIT Credential Cache principal
37 37
             #
38
-            # @param opts [Hash<{Symbol => <Fixnum, String, Array<String>>}>]
39
-            # @option opts [Fixnum] :name_type
38
+            # @param opts [Hash<{Symbol => <Integer, String, Array<String>>}>]
39
+            # @option opts [Integer] :name_type
40 40
             # @option opts [String] :realm
41 41
             # @option opts [Array<String>] :components
42 42
             # @return [Rex::Proto::Kerberos::CredentialCache::Principal]
@@ -57,9 +57,9 @@ module Msf
57 57
 
58 58
             # Builds a MIT Credential Cache key block
59 59
             #
60
-            # @param opts [Hash<{Symbol => <Fixnum, String>}>]
61
-            # @option opts [Fixnum] :key_type
62
-            # @option opts [Fixnum] :e_type
60
+            # @param opts [Hash<{Symbol => <Integer, String>}>]
61
+            # @option opts [Integer] :key_type
62
+            # @option opts [Integer] :e_type
63 63
             # @option opts [String] :key_value
64 64
             # @return [Rex::Proto::Kerberos::CredentialCache::KeyBlock]
65 65
             # @see Rex::Proto::Kerberos::CredentialCache::KeyBlock
@@ -79,11 +79,11 @@ module Msf
79 79
 
80 80
             # Builds a times structure linked to a credential in a MIT Credential Cache
81 81
             #
82
-            # @param opts [Hash<{Symbol => Fixnum}>]
83
-            # @option opts [Fixnum] auth_time
84
-            # @option opts [Fixnum] start_time
85
-            # @option opts [Fixnum] end_time
86
-            # @option opts [Fixnum] renew_till
82
+            # @param opts [Hash<{Symbol => Integer}>]
83
+            # @option opts [Integer] auth_time
84
+            # @option opts [Integer] start_time
85
+            # @option opts [Integer] end_time
86
+            # @option opts [Integer] renew_till
87 87
             # @return [Rex::Proto::Kerberos::CredentialCache::Time]
88 88
             # @see Rex::Proto::Kerberos::CredentialCache::Time
89 89
             def create_cache_times(opts = {})
@@ -109,8 +109,8 @@ module Msf
109 109
             # @option opts [Rex::Proto::Kerberos::CredentialCache::Principal] server
110 110
             # @option opts [Rex::Proto::Kerberos::CredentialCache::KeyBlock] key
111 111
             # @option opts [Rex::Proto::Kerberos::CredentialCache::Time] time
112
-            # @option opts [Fixnum] is_key
113
-            # @option opts [Fixnum] flags
112
+            # @option opts [Integer] is_key
113
+            # @option opts [Integer] flags
114 114
             # @option opts [Array] addrs
115 115
             # @option opts [Array] auth_data
116 116
             # @option opts [String] ticket

+ 4
- 4
lib/msf/core/exploit/kerberos/client/pac.rb View File

@@ -28,11 +28,11 @@ module Msf
28 28
 
29 29
             # Builds a kerberos PACTYPE structure
30 30
             #
31
-            # @param opts [Hash{Symbol => <String, Fixnum, Array, Time>}]
31
+            # @param opts [Hash{Symbol => <String, Integer, Array, Time>}]
32 32
             # @option opts [String] :client_name
33
-            # @option opts [Fixnum] :user_id the user SID Ex: 1000
34
-            # @option opts [Fixnum] :group_id Ex: 513 for 'Domain Users'
35
-            # @option opts [Array<Fixnum>] :group_ids
33
+            # @option opts [Integer] :user_id the user SID Ex: 1000
34
+            # @option opts [Integer] :group_id Ex: 513 for 'Domain Users'
35
+            # @option opts [Array<Integer>] :group_ids
36 36
             # @option opts [String] :realm
37 37
             # @option opts [String] :domain_id the domain SID Ex: S-1-5-21-1755879683-3641577184-3486455962
38 38
             # @option opts [Time] :logon_time

+ 12
- 12
lib/msf/core/exploit/kerberos/client/tgs_request.rb View File

@@ -113,10 +113,10 @@ module Msf
113 113
 
114 114
             # Builds a KRB_AP_REQ message
115 115
             #
116
-            # @param opts [Hash{Symbol => <Fixnum, Rex::Proto::Kerberos::Model::Ticket, Rex::Proto::Kerberos::Model::EncryptedData, Rex::Proto::Kerberos::Model::EncryptionKey>}]
117
-            # @option opts [Fixnum] :pvno
118
-            # @option opts [Fixnum] :msg_type
119
-            # @option opts [Fixnum] :ap_req_options
116
+            # @param opts [Hash{Symbol => <Integer, Rex::Proto::Kerberos::Model::Ticket, Rex::Proto::Kerberos::Model::EncryptedData, Rex::Proto::Kerberos::Model::EncryptionKey>}]
117
+            # @option opts [Integer] :pvno
118
+            # @option opts [Integer] :msg_type
119
+            # @option opts [Integer] :ap_req_options
120 120
             # @option opts [Rex::Proto::Kerberos::Model::Ticket] :ticket
121 121
             # @option opts [Rex::Proto::Kerberos::Model::EncryptedData] :authenticator
122 122
             # @option opts [Rex::Proto::Kerberos::Model::EncryptionKey] :session_key
@@ -159,7 +159,7 @@ module Msf
159 159
             # @option opts [Rex::Proto::Kerberos::Model::PrincipalName] :cname
160 160
             # @option opts [String] :realm
161 161
             # @option opts [Time] :ctime
162
-            # @option opts [Fixnum] :cusec
162
+            # @option opts [Integer] :cusec
163 163
             # @option opts [Rex::Proto::Kerberos::Model::Checksum] :checksum
164 164
             # @option opts [Rex::Proto::Kerberos::Model::EncryptionKey] :subkey
165 165
             # @return [Rex::Proto::Kerberos::Model::Authenticator]
@@ -190,8 +190,8 @@ module Msf
190 190
 
191 191
             # Builds an encryption key to protect the data sent in the TGS request.
192 192
             #
193
-            # @param opts [Hash{Symbol => <Fixnum, String>}]
194
-            # @option opts [Fixnum] :subkey_type
193
+            # @param opts [Hash{Symbol => <Integer, String>}]
194
+            # @option opts [Integer] :subkey_type
195 195
             # @option opts [String] :subkey_value
196 196
             # @return [Rex::Proto::Kerberos::Model::EncryptionKey]
197 197
             # @see Rex::Proto::Kerberos::Model::EncryptionKey
@@ -210,13 +210,13 @@ module Msf
210 210
 
211 211
             # Builds a kerberos TGS request body
212 212
             #
213
-            # @param opts [Hash{Symbol => <Fixnum, Time, String, Rex::Proto::Kerberos::Model::PrincipalName, Rex::Proto::Kerberos::Model::EncryptedData>}]
214
-            # @option opts [Fixnum] :options
213
+            # @param opts [Hash{Symbol => <Integer, Time, String, Rex::Proto::Kerberos::Model::PrincipalName, Rex::Proto::Kerberos::Model::EncryptedData>}]
214
+            # @option opts [Integer] :options
215 215
             # @option opts [Time] :from
216 216
             # @option opts [Time] :till
217 217
             # @option opts [Time] :rtime
218
-            # @option opts [Fixnum] :nonce
219
-            # @option opts [Fixnum] :etype
218
+            # @option opts [Integer] :nonce
219
+            # @option opts [Integer] :etype
220 220
             # @option opts [Rex::Proto::Kerberos::Model::PrincipalName] :cname
221 221
             # @option opts [String] :realm
222 222
             # @option opts [Rex::Proto::Kerberos::Model::PrincipalName] :sname
@@ -254,7 +254,7 @@ module Msf
254 254
 
255 255
             # Builds a Kerberos TGS Request body checksum
256 256
             #
257
-            # @param opts [Hash{Symbol => <Rex::Proto::Kerberos::Model::KdcRequestBody, Fixnum>}]
257
+            # @param opts [Hash{Symbol => <Rex::Proto::Kerberos::Model::KdcRequestBody, Integer>}]
258 258
             # @option opts [Rex::Proto::Kerberos::Model::KdcRequestBody] :body
259 259
             # @return [Rex::Proto::Kerberos::Model::Checksum]
260 260
             # @see #build_tgs_request_body

+ 3
- 3
lib/msf/core/exploit/oracle.rb View File

@@ -134,19 +134,19 @@ module Exploit::ORACLE
134 134
     when 2, :update_stmt
135 135
       connect.commit
136 136
 
137
-      # If we were successful our return should be a Fixnum with the number of rows updated
137
+      # If we were successful our return should be a Integer with the number of rows updated
138 138
       result = ['UPDATE Successful ' + sploit.row_count.to_s + ' Rows Updated']
139 139
       return result
140 140
     # Delete Queries
141 141
     when 3, :delete_stmt
142 142
       connect.commit
143
-      # If we were successful our return should be a Fixnum with the number of rows updated
143
+      # If we were successful our return should be a Integer with the number of rows updated
144 144
       result = ['DELETE Successful ' + sploit.row_count.to_s + ' Rows Deleted']
145 145
       return result
146 146
     # Insert Queries
147 147
     when 4, :insert_stmt
148 148
       connect.commit
149
-      # If we were successful our return should be a Fixnum with the number of rows updated
149
+      # If we were successful our return should be a Integer with the number of rows updated
150 150
       result = ['INSERT Successful ' + sploit.row_count.to_s + ' Rows Inserted']
151 151
       return result
152 152
     # Create Queries

+ 2
- 2
lib/msf/core/exploit/postgres.rb View File

@@ -48,7 +48,7 @@ module Exploit::Remote::Postgres
48 48
   # @return [String] IP address of the target
49 49
   def rhost; datastore['RHOST']; end
50 50
   # Return the datastore value of the same name
51
-  # @return [Fixnum] TCP port where the target service is running
51
+  # @return [Integer] TCP port where the target service is running
52 52
   def rport; datastore['RPORT']; end
53 53
   # Return the datastore value of the same name
54 54
   # @return [String] Username for authentication
@@ -82,7 +82,7 @@ module Exploit::Remote::Postgres
82 82
   # @option opts [String] :username The username
83 83
   # @option opts [String] :username The username
84 84
   # @option opts [String] :server IP address or hostname of the target server
85
-  # @option opts [Fixnum] :port TCP port on :server
85
+  # @option opts [Integer] :port TCP port on :server
86 86
   #
87 87
   # @return [:error_database] if user/pass are correct but database is wrong
88 88
   # @return [:error_credentials] if user/pass are wrong

+ 4
- 4
lib/msf/core/exploit/smb/server/share.rb View File

@@ -182,10 +182,10 @@ module Msf
182 182
       #   @return [String] The file name of the provided UNC.
183 183
       attr_accessor :file_name
184 184
       # @!attribute hi
185
-      #   @return [Fixnum] The high 4 bytes for the file 'created time'.
185
+      #   @return [Integer] The high 4 bytes for the file 'created time'.
186 186
       attr_accessor :hi
187 187
       # @!attribute lo
188
-      #   @return [Fixnum] The low 4 bytes for the file 'created time'.
188
+      #   @return [Integer] The low 4 bytes for the file 'created time'.
189 189
       attr_accessor :lo
190 190
       # @!attribute file_contents
191 191
       #   @return [String] The contents of the provided file
@@ -271,10 +271,10 @@ module Msf
271 271
       # Main dispatcher function. Takes the client data and performs a case switch
272 272
       # on the command (e.g. Negotiate, Session Setup, Read file, etc.)
273 273
       #
274
-      # @param cmd [Fixnum] The SMB Command requested.
274
+      # @param cmd [Integer] The SMB Command requested.
275 275
       # @param c [Socket] The client to answer.
276 276
       # @param buff [String] The data including the client request.
277
-      # @return [Fixnum] The number of bytes returned to the client as response.
277
+      # @return [Integer] The number of bytes returned to the client as response.
278 278
       def smb_cmd_dispatch(cmd, c, buff)
279 279
         smb = @state[c]
280 280
 

+ 2
- 2
lib/msf/core/exploit/smb/server/share/command/close.rb View File

@@ -11,7 +11,7 @@ module Msf
11 11
           #
12 12
           # @param c [Socket] The client sending the request.
13 13
           # @param buff [String] The data including the client request.
14
-          # @return [Fixnum] The number of bytes returned to the client as response.
14
+          # @return [Integer] The number of bytes returned to the client as response.
15 15
           def smb_cmd_close(c, buff)
16 16
             send_close_res(c)
17 17
           end
@@ -19,7 +19,7 @@ module Msf
19 19
           # Builds and sends an SMB_COM_CLOSE response.
20 20
           #
21 21
           # @param c [Socket] The client to answer.
22
-          # @return [Fixnum] The number of bytes returned to the client as response.
22
+          # @return [Integer] The number of bytes returned to the client as response.
23 23
           def send_close_res(c)
24 24
             pkt = CONST::SMB_CLOSE_RES_PKT.make_struct
25 25
             smb_set_defaults(c, pkt)

+ 12
- 12
lib/msf/core/exploit/smb/server/share/command/negotiate.rb View File

@@ -11,7 +11,7 @@ module Msf
11 11
           #
12 12
           # @param c [Socket] The client sending the request.
13 13
           # @param buff [String] The data including the client request.
14
-          # @return [Fixnum] The number of bytes returned to the client as response.
14
+          # @return [Integer] The number of bytes returned to the client as response.
15 15
           def smb_cmd_negotiate(c, buff)
16 16
             pkt = CONST::SMB_NEG_PKT.make_struct
17 17
             pkt.from_s(buff)
@@ -36,18 +36,18 @@ module Msf
36 36
           # Builds and sends an SMB_COM_CLOSE response.
37 37
           #
38 38
           # @param c [Socket] The client to answer.
39
-          # @param opts [Hash{Symbol => <String, Fixnum>}] Response custom values.
40
-          # @option opts [Fixnum] :dialect The index of the dialect selected by the server from the request.
41
-          # @option opts [Fixnum] :security_mode Security modes supported or required by the server.
42
-          # @option opts [Fixnum] :max_mpx The maximum number of outstanding SMB operations that the server supports.
43
-          # @option opts [Fixnum] :max_vcs The maximum number of virtual circuits between the client and the server.
44
-          # @option opts [Fixnum] :max_buff Largest SMB message that the server can handle.
45
-          # @option opts [Fixnum] :max_raw Max size for SMB_COM_WRITE_RAW requests and SMB_COM_READ_RAW responses.
46
-          # @option opts [Fixnum] :server_time_zone The server's time zone.
47
-          # @option opts [Fixnum] :capabilities The server capability indicators.
48
-          # @option opts [Fixnum] :key_length The challenge length.
39
+          # @param opts [Hash{Symbol => <String, Integer>}] Response custom values.
40
+          # @option opts [Integer] :dialect The index of the dialect selected by the server from the request.
41
+          # @option opts [Integer] :security_mode Security modes supported or required by the server.
42
+          # @option opts [Integer] :max_mpx The maximum number of outstanding SMB operations that the server supports.
43
+          # @option opts [Integer] :max_vcs The maximum number of virtual circuits between the client and the server.
44
+          # @option opts [Integer] :max_buff Largest SMB message that the server can handle.
45
+          # @option opts [Integer] :max_raw Max size for SMB_COM_WRITE_RAW requests and SMB_COM_READ_RAW responses.
46
+          # @option opts [Integer] :server_time_zone The server's time zone.
47
+          # @option opts [Integer] :capabilities The server capability indicators.
48
+          # @option opts [Integer] :key_length The challenge length.
49 49
           # @option opts [String] :key The challenge.
50
-          # @return [Fixnum] The number of bytes returned to the client as response.
50
+          # @return [Integer] The number of bytes returned to the client as response.
51 51
           def send_negotitate_res(c, opts = {})
52 52
             dialect = opts[:dialect] || 0
53 53
             security_mode = opts[:security_mode] || 0

+ 8
- 8
lib/msf/core/exploit/smb/server/share/command/nt_create_andx.rb View File

@@ -11,7 +11,7 @@ module Msf
11 11
           #
12 12
           # @param c [Socket] The client sending the request.
13 13
           # @param buff [String] The data including the client request.
14
-          # @return [Fixnum] The number of bytes returned to the client as response.
14
+          # @return [Integer] The number of bytes returned to the client as response.
15 15
           def smb_cmd_nt_create_andx(c, buff)
16 16
             smb = @state[c]
17 17
             pkt = CONST::SMB_CREATE_PKT.make_struct
@@ -69,13 +69,13 @@ module Msf
69 69
           # Builds and sends an SMB_COM_NT_CREATE_ANDX response.
70 70
           #
71 71
           # @param c [Socket] The client to answer.
72
-          # @param opts [Hash{Symbol => <Fixnum>}] Response custom values.
73
-          # @option opts [Fixnum] :file_id A FID representing the file or directory created or opened.
74
-          # @option opts [Fixnum] :attributes The attributes that the server assigned to the file or directory.
75
-          # @option opts [Fixnum] :end_of_file_low The end of file offset value (4 bytes)
76
-          # @option opts [Fixnum] :is_directory Indicates if the FID represents a directory.
77
-          # @option opts [Fixnum] :alloc_low The number of bytes allocated to the file by the server.
78
-          # @return [Fixnum] The number of bytes returned to the client as response.
72
+          # @param opts [Hash{Symbol => <Integer>}] Response custom values.
73
+          # @option opts [Integer] :file_id A FID representing the file or directory created or opened.
74
+          # @option opts [Integer] :attributes The attributes that the server assigned to the file or directory.
75
+          # @option opts [Integer] :end_of_file_low The end of file offset value (4 bytes)
76
+          # @option opts [Integer] :is_directory Indicates if the FID represents a directory.
77
+          # @option opts [Integer] :alloc_low The number of bytes allocated to the file by the server.
78
+          # @return [Integer] The number of bytes returned to the client as response.
79 79
           def send_nt_create_andx_res(c, opts = {})
80 80
             file_id = opts[:file_id] || 0
81 81
             attributes = opts[:attributes] || 0

+ 5
- 5
lib/msf/core/exploit/smb/server/share/command/read_andx.rb View File

@@ -11,7 +11,7 @@ module Msf
11 11
           #
12 12
           # @param c [Socket] The client sending the request.
13 13
           # @param buff [String] The data including the client request.
14
-          # @return [Fixnum] The number of bytes returned to the client as response.
14
+          # @return [Integer] The number of bytes returned to the client as response.
15 15
           def smb_cmd_read_andx(c, buff)
16 16
             pkt = CONST::SMB_READ_PKT.make_struct
17 17
             pkt.from_s(buff)
@@ -31,11 +31,11 @@ module Msf
31 31
           # Builds and sends an SMB_COM_NT_CREATE_ANDX response.
32 32
           #
33 33
           # @param c [Socket] The client to answer.
34
-          # @param opts [Hash{Symbol => <Fixnum, String>}] Response custom values.
35
-          # @option opts [Fixnum] :data_len_low The length of the file data sent back.
36
-          # @option opts [Fixnum] :byte_count The length of the file data sent back.
34
+          # @param opts [Hash{Symbol => <Integer, String>}] Response custom values.
35
+          # @option opts [Integer] :data_len_low The length of the file data sent back.
36
+          # @option opts [Integer] :byte_count The length of the file data sent back.
37 37
           # @option opts [String] :data The bytes read from the file.
38
-          # @return [Fixnum] The number of bytes returned to the client as response.
38
+          # @return [Integer] The number of bytes returned to the client as response.
39 39
           def send_read_andx_res(c, opts = {})
40 40
             data_len_low = opts[:data_len_low] || 0
41 41
             byte_count = opts[:byte_count] || 0

+ 7
- 7
lib/msf/core/exploit/smb/server/share/command/session_setup_andx.rb View File

@@ -11,7 +11,7 @@ module Msf
11 11
           #
12 12
           # @param c [Socket] The client sending the request.
13 13
           # @param buff [String] The data including the client request.
14
-          # @return [Fixnum] The number of bytes returned to the client as response.
14
+          # @return [Integer] The number of bytes returned to the client as response.
15 15
           def smb_cmd_session_setup_andx(c, buff)
16 16
             tree_connect_response = CONST::SMB_TREE_CONN_ANDX_RES_PKT.make_struct
17 17
             tree_connect_response.v['WordCount'] = CONST::SMB_TREE_CONN_ANDX_WORD_COUNT
@@ -39,15 +39,15 @@ module Msf
39 39
           # Builds and sends an SMB_COM_NT_CREATE_ANDX response.
40 40
           #
41 41
           # @param c [Socket] The client to answer.
42
-          # @param opts [Hash{Symbol => <Fixnum, String, Rex::Struct2::CStruct>}] Response custom values.
43
-          # @option opts [Fixnum] :action SMB Configuration result.
44
-          # @option opts [Fixnum] :andx_offset The offset in bytes from the start of the SMB Header to the start
42
+          # @param opts [Hash{Symbol => <Integer, String, Rex::Struct2::CStruct>}] Response custom values.
43
+          # @option opts [Integer] :action SMB Configuration result.
44
+          # @option opts [Integer] :andx_offset The offset in bytes from the start of the SMB Header to the start
45 45
           #   of the WordCount field in the next SMBCommand.
46
-          # @option opts [Fixnum] :reserved Reserved field.
47
-          # @option opts [Fixnum] :andx The command code for the next SMB Command in the packet.
46
+          # @option opts [Integer] :reserved Reserved field.
47
+          # @option opts [Integer] :andx The command code for the next SMB Command in the packet.
48 48
           # @option opts [String] :data The SMB_Data for the SMB_COM_SESSION_SETUP_ANDX response.
49 49
           # @option opts [Rex::Struct2::CStruct] :andx_command The next SMB Command in the packet.
50
-          # @return [Fixnum] The number of bytes returned to the client as response.
50
+          # @return [Integer] The number of bytes returned to the client as response.
51 51
           def send_session_setup_andx_res(c, opts = {})
52 52
             action = opts[:action] || 0
53 53
             andx_offset = opts[:andx_offset] || 0

+ 2
- 2
lib/msf/core/exploit/smb/server/share/command/trans2.rb View File

@@ -14,7 +14,7 @@ module Msf
14 14
           #
15 15
           # @param c [Socket] The client sending the request.
16 16
           # @param buff [String] The data including the client request.
17
-          # @return [Fixnum] The number of bytes returned to the client as response.
17
+          # @return [Integer] The number of bytes returned to the client as response.
18 18
           def smb_cmd_trans2(c, buff)
19 19
             smb = @state[c]
20 20
             pkt = CONST::SMB_TRANS2_PKT.make_struct
@@ -44,7 +44,7 @@ module Msf
44 44
           # @param c [Socket] The client to answer.
45 45
           # @param parameters [Rex::Struct2::CStruct] The SMB_Parameters to include in the response.
46 46
           # @param data [Rex::Struct2::CStruct] The SMB_Data to include in the response.
47
-          # @return [Fixnum] The number of bytes returned to the client as response.
47
+          # @return [Integer] The number of bytes returned to the client as response.
48 48
           def send_trans2_res(c, parameters, data)
49 49
             pkt = CONST::SMB_TRANS_RES_PKT.make_struct
50 50
             smb_set_defaults(c, pkt)

+ 1
- 1
lib/msf/core/exploit/smb/server/share/command/trans2/find_first2.rb View File

@@ -12,7 +12,7 @@ module Msf
12 12
             #
13 13
             # @param c [Socket] The client sending the request.
14 14
             # @param buff [String] The data including the client request.
15
-            # @return [Fixnum] The number of bytes returned to the client as response.
15
+            # @return [Integer] The number of bytes returned to the client as response.
16 16
             def smb_cmd_trans2_find_first2(c, buff)
17 17
               smb = @state[c]
18 18
 

+ 1
- 1
lib/msf/core/exploit/smb/server/share/command/trans2/query_file_information.rb View File

@@ -13,7 +13,7 @@ module Msf
13 13
             #
14 14
             # @param c [Socket] The client sending the request.
15 15
             # @param buff [String] The data including the client request.
16
-            # @return [Fixnum] The number of bytes returned to the client as response.
16
+            # @return [Integer] The number of bytes returned to the client as response.
17 17
             def smb_cmd_trans2_query_file_information(c, buff)
18 18
               smb = @state[c]
19 19
 

+ 1
- 1
lib/msf/core/exploit/smb/server/share/command/trans2/query_path_information.rb View File

@@ -12,7 +12,7 @@ module Msf
12 12
             #
13 13
             # @param c [Socket] The client sending the request.
14 14
             # @param buff [String] The data including the client request.
15
-            # @return [Fixnum] The number of bytes returned to the client as response.
15
+            # @return [Integer] The number of bytes returned to the client as response.
16 16
             def smb_cmd_trans2_query_path_information(c, buff)
17 17
               smb = @state[c]
18 18
 

+ 21
- 21
lib/msf/core/exploit/smb/server/share/information_level/find.rb View File

@@ -11,7 +11,7 @@ module Msf
11 11
           #
12 12
           # @param c [Socket] The client sending the request.
13 13
           # @param path [String] The path which the client is requesting info from.
14
-          # @return [Fixnum] The number of bytes returned to the client as response.
14
+          # @return [Integer] The number of bytes returned to the client as response.
15 15
           def smb_cmd_find_file_both_directory_info(c, path)
16 16
             contents = get_file_contents(client: c)
17 17
 
@@ -56,7 +56,7 @@ module Msf
56 56
           #
57 57
           # @param c [Socket] The client sending the request.
58 58
           # @param path [String] The path which the client is requesting info from.
59
-          # @return [Fixnum] The number of bytes returned to the client as response.
59
+          # @return [Integer] The number of bytes returned to the client as response.
60 60
           def smb_cmd_find_file_names_info(c, path)
61 61
             if path && path.ends_with?(file_name.downcase)
62 62
               data = Rex::Text.to_unicode(file_name)
@@ -76,7 +76,7 @@ module Msf
76 76
           #
77 77
           # @param c [Socket] The client sending the request.
78 78
           # @param path [String] The path which the client is requesting info from.
79
-          # @return [Fixnum] The number of bytes returned to the client as response.
79
+          # @return [Integer] The number of bytes returned to the client as response.
80 80
           def smb_cmd_find_file_full_directory_info(c, path)
81 81
             contents = get_file_contents(client: c)
82 82
 
@@ -120,15 +120,15 @@ module Msf
120 120
           # information level.
121 121
           #
122 122
           # @param c [Socket] The client to answer.
123
-          # @param opts [Hash{Symbol => <Fixnum, String>}] Response custom values.
124
-          # @option opts [Fixnum] :search_count The number of entries returned by the search.
125
-          # @option opts [Fixnum] :end_of_search 0 if search continues or nonzero otherwise.
126
-          # @option opts [Fixnum] :ea_error_offset should be 0 for SMB_FIND_FILE_BOTH_DIRECTORY_INFO.
127
-          # @option opts [Fixnum] :end_of_file The byte offset to the end of the file.
128
-          # @option opts [Fixnum] :allocation_size The file allocation size in bytes.
129
-          # @option opts [Fixnum] :file_attributes The extended file attributes of the file.
123
+          # @param opts [Hash{Symbol => <Integer, String>}] Response custom values.
124
+          # @option opts [Integer] :search_count The number of entries returned by the search.
125
+          # @option opts [Integer] :end_of_search 0 if search continues or nonzero otherwise.
126
+          # @option opts [Integer] :ea_error_offset should be 0 for SMB_FIND_FILE_BOTH_DIRECTORY_INFO.
127
+          # @option opts [Integer] :end_of_file The byte offset to the end of the file.
128
+          # @option opts [Integer] :allocation_size The file allocation size in bytes.
129
+          # @option opts [Integer] :file_attributes The extended file attributes of the file.
130 130
           # @option opts [String] :data The long name of the file.
131
-          # @return [Fixnum] The number of bytes returned to the client as response.
131
+          # @return [Integer] The number of bytes returned to the client as response.
132 132
           def send_find_file_both_directory_info_res(c, opts = {})
133 133
             data = opts[:data] || ''
134 134
             search_count = opts[:search_count] || 0
@@ -170,9 +170,9 @@ module Msf
170 170
           # Builds and sends an TRANS2_FIND_FIRST2 response with SMB_FIND_FILE_NAMES_INFO
171 171
           # information level.
172 172
           # @param c [Socket] The client to answer.
173
-          # @param opts [Hash{Symbol => <Fixnum, String>}] Response custom values.
173
+          # @param opts [Hash{Symbol => <Integer, String>}] Response custom values.
174 174
           # @option opts [String] :data The long name of the file.
175
-          # @return [Fixnum] The number of bytes returned to the client as response.
175
+          # @return [Integer] The number of bytes returned to the client as response.
176 176
           def send_find_file_names_info_res(c, opts = {})
177 177
             data = opts[:data] || ''
178 178
 
@@ -198,15 +198,15 @@ module Msf
198 198
           # information level.
199 199
           #
200 200
           # @param c [Socket] The client to answer.
201
-          # @param opts [Hash{Symbol => <Fixnum, String>}] Response custom values.
202
-          # @option opts [Fixnum] :search_count The number of entries returned by the search.
203
-          # @option opts [Fixnum] :end_of_search 0 if search continues or nonzero otherwise.
204
-          # @option opts [Fixnum] :ea_error_offset should be 0 for SMB_FIND_FILE_FULL_DIRECTORY_INFO.
205
-          # @option opts [Fixnum] :end_of_file The byte offset to the end of the file.
206
-          # @option opts [Fixnum] :allocation_size The file allocation size in bytes.
207
-          # @option opts [Fixnum] :file_attributes The extended file attributes of the file.
201
+          # @param opts [Hash{Symbol => <Integer, String>}] Response custom values.
202
+          # @option opts [Integer] :search_count The number of entries returned by the search.
203
+          # @option opts [Integer] :end_of_search 0 if search continues or nonzero otherwise.
204
+          # @option opts [Integer] :ea_error_offset should be 0 for SMB_FIND_FILE_FULL_DIRECTORY_INFO.
205
+          # @option opts [Integer] :end_of_file The byte offset to the end of the file.
206
+          # @option opts [Integer] :allocation_size The file allocation size in bytes.
207
+          # @option opts [Integer] :file_attributes The extended file attributes of the file.
208 208
           # @option opts [String] :data The long name of the file.
209
-          # @return [Fixnum] The number of bytes returned to the client as response.
209
+          # @return [Integer] The number of bytes returned to the client as response.
210 210
           def send_find_full_directory_info_res(c, opts = {})
211 211
             data = opts[:data] || ''
212 212
             search_count = opts[:search_count] || 0

+ 22
- 22
lib/msf/core/exploit/smb/server/share/information_level/query.rb View File

@@ -10,8 +10,8 @@ module Msf
10 10
           # Information Level.
11 11
           #
12 12
           # @param c [Socket] The client sending the request.
13
-          # @param fid [Fixnum] The file identifier which the client is requesting info from.
14
-          # @return [Fixnum] The number of bytes returned to the client as response.
13
+          # @param fid [Integer] The file identifier which the client is requesting info from.
14
+          # @return [Integer] The number of bytes returned to the client as response.
15 15
           def smb_cmd_trans_query_file_info_basic(c, fid)
16 16
             smb = @state[c]
17 17
 
@@ -30,8 +30,8 @@ module Msf
30 30
           # Information Level.
31 31
           #
32 32
           # @param c [Socket] The client sending the request.
33
-          # @param fid [Fixnum] The file identifier which the client is requesting info from.
34
-          # @return [Fixnum] The number of bytes returned to the client as response.
33
+          # @param fid [Integer] The file identifier which the client is requesting info from.
34
+          # @return [Integer] The number of bytes returned to the client as response.
35 35
           def smb_cmd_trans_query_file_info_standard(c, fid)
36 36
             contents = get_file_contents(client: c)
37 37
 
@@ -49,7 +49,7 @@ module Msf
49 49
           #
50 50
           # @param c [Socket] The client sending the request.
51 51
           # @param path [String] The path which the client is requesting info from.
52
-          # @return [Fixnum] The number of bytes returned to the client as response.
52
+          # @return [Integer] The number of bytes returned to the client as response.
53 53
           def smb_cmd_trans_query_path_info_basic(c, path)
54 54
             if path && path.ends_with?(file_name.downcase)
55 55
               attrib = CONST::SMB_EXT_FILE_ATTR_NORMAL
@@ -69,7 +69,7 @@ module Msf
69 69
           #
70 70
           # @param c [Socket] The client sending the request.
71 71
           # @param path [String] The path which the client is requesting info from.
72
-          # @return [Fixnum] The number of bytes returned to the client as response.
72
+          # @return [Integer] The number of bytes returned to the client as response.
73 73
           def smb_cmd_trans_query_path_info_standard(c, path)
74 74
             contents = get_file_contents(client: c)
75 75
 
@@ -97,7 +97,7 @@ module Msf
97 97
           #
98 98
           # @param c [Socket] The client sending the request.
99 99
           # @param path [String] The path which the client is requesting info from.
100
-          # @return [Fixnum] The number of bytes returned to the client as response.
100
+          # @return [Integer] The number of bytes returned to the client as response.
101 101
           def smb_cmd_trans_query_path_info_network(c, path)
102 102
             contents = get_file_contents(client: c)
103 103
 
@@ -122,9 +122,9 @@ module Msf
122 122
           # information level.
123 123
           #
124 124
           # @param c [Socket] The client to answer.
125
-          # @param opts [Hash{Symbol => <Fixnum, String>}] Response custom values.
126
-          # @option opts [Fixnum] :file_attributes The extended file attributes of the file.
127
-          # @return [Fixnum] The number of bytes returned to the client as response.
125
+          # @param opts [Hash{Symbol => <Integer, String>}] Response custom values.
126
+          # @option opts [Integer] :file_attributes The extended file attributes of the file.
127
+          # @return [Integer] The number of bytes returned to the client as response.
128 128
           def send_info_basic_res(c, opts = {})
129 129
             file_attributes = opts[:file_attributes] || 0
130 130
 
@@ -149,13 +149,13 @@ module Msf
149 149
           # information level.
150 150
           #
151 151
           # @param c [Socket] The client to answer.
152
-          # @param opts [Hash{Symbol => <Fixnum, String>}] Response custom values.
153
-          # @option opts [Fixnum] :allocation_size The number of bytes that are allocated to the file.
154
-          # @option opts [Fixnum] :number_links The number of hard links to the file.
155
-          # @option opts [Fixnum] :delete_pending Indicates whether there is a delete action pending for the file.
156
-          # @option opts [Fixnum] :directory Indicates whether the file is a directory.
157
-          # @option opts [Fixnum] :end_of_file The offset from the start to the end of the file.
158
-          # @return [Fixnum] The number of bytes returned to the client as response.
152
+          # @param opts [Hash{Symbol => <Integer, String>}] Response custom values.
153
+          # @option opts [Integer] :allocation_size The number of bytes that are allocated to the file.
154
+          # @option opts [Integer] :number_links The number of hard links to the file.
155
+          # @option opts [Integer] :delete_pending Indicates whether there is a delete action pending for the file.
156
+          # @option opts [Integer] :directory Indicates whether the file is a directory.
157
+          # @option opts [Integer] :end_of_file The offset from the start to the end of the file.
158
+          # @return [Integer] The number of bytes returned to the client as response.
159 159
           def send_info_standard_res(c, opts = {})
160 160
             allocation_size = opts[:allocation_size] || 0
161 161
             number_links = opts[:number_links] || 0
@@ -180,11 +180,11 @@ module Msf
180 180
           # information level.
181 181
           #
182 182
           # @param c [Socket] The client to answer.
183
-          # @param opts [Hash{Symbol => <Fixnum, String>}] Response custom values.
184
-          # @option opts [Fixnum] :allocation_size The number of bytes that are allocated to the file.
185
-          # @option opts [Fixnum] :end_of_file The offset from the start to the end of the file.
186
-          # @option opts [Fixnum] :file_attributes The file attributes.
187
-          # @return [Fixnum] The number of bytes returned to the client as response.
183
+          # @param opts [Hash{Symbol => <Integer, String>}] Response custom values.
184
+          # @option opts [Integer] :allocation_size The number of bytes that are allocated to the file.
185
+          # @option opts [Integer] :end_of_file The offset from the start to the end of the file.
186
+          # @option opts [Integer] :file_attributes The file attributes.
187
+          # @return [Integer] The number of bytes returned to the client as response.
188 188
           def send_info_network_res(c, opts= {})
189 189
             allocation_size = opts[:allocation_size] || 0
190 190
             end_of_file = opts[:end_of_file] || 0

+ 1
- 1
lib/msf/core/module/ui/message.rb View File

@@ -22,7 +22,7 @@ module Msf::Module::UI::Message
22 22
 
23 23
       xn ||= datastore['ExploitNumber']
24 24
       xn ||= framework.datastore['ExploitNumber']
25
-      if xn.is_a?(Fixnum)
25
+      if xn.is_a?(Integer)
26 26
         prefix << "[%04d] " % xn
27 27
       end
28 28
 

+ 1
- 1
lib/msf/core/payload/linux/bind_tcp.rb View File

@@ -80,7 +80,7 @@ module Payload::Linux::BindTcp
80 80
   #
81 81
   # Generate an assembly stub with the configured feature set and options.
82 82
   #
83
-  # @option opts [Fixnum] :port The port to connect to
83
+  # @option opts [Integer] :port The port to connect to
84 84
   # @option opts [Bool] :reliable Whether or not to enable error handling code
85 85
   #
86 86
   def asm_bind_tcp(opts={})

+ 1
- 1
lib/msf/core/payload/linux/reverse_tcp.rb View File

@@ -79,7 +79,7 @@ module Payload::Linux::ReverseTcp
79 79
   #
80 80
   # Generate an assembly stub with the configured feature set and options.
81 81
   #
82
-  # @option opts [Fixnum] :port The port to connect to
82
+  # @option opts [Integer] :port The port to connect to
83 83
   # @option opts [String] :host The host IP to connect to
84 84
   # @option opts [Bool] :reliable Whether or not to enable error handling code
85 85
   #

+ 4
- 4
lib/msf/core/payload/uuid.rb View File

@@ -94,8 +94,8 @@ class Msf::Payload::UUID
94 94
   # @option opts [String] :arch The hardware architecture for this payload
95 95
   # @option opts [String] :platform The operating system platform for this payload
96 96
   # @option opts [String] :timestamp The timestamp in UTC Unix epoch format
97
-  # @option opts [Fixnum] :xor1 An optional 8-bit XOR ID for obfuscation
98
-  # @option opts [Fixnum] :xor2 An optional 8-bit XOR ID for obfuscation
97
+  # @option opts [Integer] :xor1 An optional 8-bit XOR ID for obfuscation
98
+  # @option opts [Integer] :xor2 An optional 8-bit XOR ID for obfuscation
99 99
   # @return [String] The encoded payoad UUID as a binary string
100 100
   #
101 101
   def self.generate_raw(opts={})
@@ -195,7 +195,7 @@ class Msf::Payload::UUID
195 195
   # Look up the numeric platform ID given a string or PlatformList as input
196 196
   #
197 197
   # @param platform [String] The name of the platform to lookup
198
-  # @return [Fixnum] The integer value of this platform
198
+  # @return [Integer] The integer value of this platform
199 199
   #
200 200
   def self.find_platform_id(platform)
201 201
     # Handle a PlatformList input by grabbing the first entry
@@ -218,7 +218,7 @@ class Msf::Payload::UUID
218 218
   # Look up the numeric architecture ID given a string as input
219 219
   #
220 220
   # @param name [String] The name of the architecture to lookup
221
-  # @return [Fixnum] The integer value of this architecture
221
+  # @return [Integer] The integer value of this architecture
222 222
   #
223 223
   def self.find_architecture_id(name)
224 224
     name = name.first if name.kind_of? ::Array

+ 1
- 1
lib/msf/core/payload/uuid/options.rb View File

@@ -27,7 +27,7 @@ module Msf::Payload::UUID::Options
27 27
   # the desired length can accommodate it.
28 28
   #
29 29
   # @param mode [Symbol] The type of checksum to generate (:connect, :init_native, :init_python, :init_java)
30
-  # @param len [Fixnum] The length of the URI not including the leading slash, optionally nil for random
30
+  # @param len [Integer] The length of the URI not including the leading slash, optionally nil for random
31 31
   # @return [String] A URI with a leading slash that hashes to the checksum, with an optional UUID
32 32
   #
33 33
   def generate_uri_uuid_mode(mode, len = nil, uuid: nil)

+ 1
- 1
lib/msf/core/payload/windows/bind_tcp.rb View File

@@ -101,7 +101,7 @@ module Payload::Windows::BindTcp
101 101
   #
102 102
   # Generate an assembly stub with the configured feature set and options.
103 103
   #
104
-  # @option opts [Fixnum] :port The port to connect to
104
+  # @option opts [Integer] :port The port to connect to
105 105
   # @option opts [String] :exitfunk The exit method to use if there is an error, one of process, thread, or seh
106 106
   # @option opts [Bool] :reliable Whether or not to enable error handling code
107 107
   #

+ 3
- 3
lib/msf/core/payload/windows/reverse_http.rb View File

@@ -145,14 +145,14 @@ module Payload::Windows::ReverseHttp
145 145
   # @option opts [Bool] :ssl Whether or not to enable SSL
146 146
   # @option opts [String] :url The URI to request during staging
147 147
   # @option opts [String] :host The host to connect to
148
-  # @option opts [Fixnum] :port The port to connect to
148
+  # @option opts [Integer] :port The port to connect to
149 149
   # @option opts [String] :exitfunk The exit method to use if there is an error, one of process, thread, or seh
150 150
   # @option opts [String] :proxy_host The optional proxy server host to use
151
-  # @option opts [Fixnum] :proxy_port The optional proxy server port to use
151
+  # @option opts [Integer] :proxy_port The optional proxy server port to use
152 152
   # @option opts [String] :proxy_type The optional proxy server type, one of HTTP or SOCKS
153 153
   # @option opts [String] :proxy_user The optional proxy server username
154 154
   # @option opts [String] :proxy_pass The optional proxy server password
155
-  # @option opts [Fixnum] :retry_count The number of times to retry a failed request before giving up
155
+  # @option opts [Integer] :retry_count The number of times to retry a failed request before giving up
156 156
   #
157 157
   def asm_reverse_http(opts={})
158 158
 

+ 2
- 2
lib/msf/core/payload/windows/reverse_tcp.rb View File

@@ -93,9 +93,9 @@ module Payload::Windows::ReverseTcp
93 93
   #
94 94
   # Generate an assembly stub with the configured feature set and options.
95 95
   #
96
-  # @option opts [Fixnum] :port The port to connect to
96
+  # @option opts [Integer] :port The port to connect to
97 97
   # @option opts [String] :exitfunk The exit method to use if there is an error, one of process, thread, or seh
98
-  # @option opts [Fixnum] :retry_count Number of retry attempts
98
+  # @option opts [Integer] :retry_count Number of retry attempts
99 99
   #
100 100
   def asm_reverse_tcp(opts={})
101 101
 

+ 2
- 2
lib/msf/core/payload/windows/reverse_tcp_dns.rb View File

@@ -65,9 +65,9 @@ module Payload::Windows::ReverseTcpDns
65 65
   #
66 66
   # Generate an assembly stub with the configured feature set and options.
67 67
   #
68
-  # @option opts [Fixnum] :port The port to connect to
68
+  # @option opts [Integer] :port The port to connect to
69 69
   # @option opts [String] :exitfunk The exit method to use if there is an error, one of process, thread, or seh
70
-  # @option opts [Fixnum] :retry_count Number of retry attempts
70
+  # @option opts [Integer] :retry_count Number of retry attempts
71 71
   #
72 72
   def asm_reverse_tcp_dns(opts={})
73 73
 

+ 1
- 1
lib/msf/core/payload/windows/reverse_tcp_rc4.rb View File

@@ -61,7 +61,7 @@ module Payload::Windows::ReverseTcpRc4
61 61
   #
62 62
   # Generate an assembly stub with the configured feature set and options.
63 63
   #
64
-  # @option opts [Fixnum] :port The port to connect to
64
+  # @option opts [Integer] :port The port to connect to
65 65
   # @option opts [String] :exitfunk The exit method to use if there is an error, one of process, thread, or seh
66 66
   # @option opts [Bool] :reliable Whether or not to enable error handling code
67 67
   #

+ 2
- 2
lib/msf/core/payload/windows/reverse_winhttp.rb View File

@@ -115,10 +115,10 @@ module Payload::Windows::ReverseWinHttp
115 115
   # @option opts [Bool] :ssl Whether or not to enable SSL
116 116
   # @option opts [String] :uri The URI to request during staging
117 117
   # @option opts [String] :host The host to connect to
118
-  # @option opts [Fixnum] :port The port to connect to
118
+  # @option opts [Integer] :port The port to connect to
119 119
   # @option opts [String] :verify_cert_hash A 20-byte raw SHA-1 hash of the certificate to verify, or nil
120 120
   # @option opts [String] :exitfunk The exit method to use if there is an error, one of process, thread, or seh
121
-  # @option opts [Fixnum] :retry_count The number of times to retry a failed request before giving up
121
+  # @option opts [Integer] :retry_count The number of times to retry a failed request before giving up
122 122
   #
123 123
   def asm_reverse_winhttp(opts={})
124 124
 

+ 1
- 1
lib/msf/core/payload/windows/x64/bind_tcp.rb View File

@@ -100,7 +100,7 @@ module Payload::Windows::BindTcp_x64
100 100
   #
101 101
   # Generate an assembly stub with the configured feature set and options.
102 102
   #
103
-  # @option opts [Fixnum] :port The port to connect to
103
+  # @option opts [Integer] :port The port to connect to
104 104
   # @option opts [String] :exitfunk The exit method to use if there is an error, one of process, thread, or seh
105 105
   # @option opts [Bool] :reliable Whether or not to enable error handling code
106 106
   #

+ 3
- 3
lib/msf/core/payload/windows/x64/reverse_http.rb View File

@@ -144,14 +144,14 @@ module Payload::Windows::ReverseHttp_x64
144 144
   # @option opts [Bool] :ssl Whether or not to enable SSL
145 145
   # @option opts [String] :url The URI to request during staging
146 146
   # @option opts [String] :host The host to connect to
147
-  # @option opts [Fixnum] :port The port to connect to
147
+  # @option opts [Integer] :port The port to connect to
148 148
   # @option opts [String] :exitfunk The exit method to use if there is an error, one of process, thread, or seh
149 149
   # @option opts [String] :proxy_host The optional proxy server host to use
150
-  # @option opts [Fixnum] :proxy_port The optional proxy server port to use
150
+  # @option opts [Integer] :proxy_port The optional proxy server port to use
151 151
   # @option opts [String] :proxy_type The optional proxy server type, one of HTTP or SOCKS
152 152
   # @option opts [String] :proxy_user The optional proxy server username
153 153
   # @option opts [String] :proxy_pass The optional proxy server password
154
-  # @option opts [Fixnum] :retry_count The number of times to retry a failed request before giving up
154
+  # @option opts [Integer] :retry_count The number of times to retry a failed request before giving up
155 155
   #
156 156
   def asm_reverse_http(opts={})
157 157
 

+ 1
- 1
lib/msf/core/payload/windows/x64/reverse_tcp.rb View File

@@ -99,7 +99,7 @@ module Payload::Windows::ReverseTcp_x64
99 99
   #
100 100
   # Generate an assembly stub with the configured feature set and options.
101 101
   #
102
-  # @option opts [Fixnum] :port The port to connect to
102
+  # @option opts [Integer] :port The port to connect to
103 103
   # @option opts [String] :exitfunk The exit method to use if there is an error, one of process, thread, or seh
104 104
   # @option opts [Bool] :reliable Whether or not to enable error handling code
105 105
   #

+ 2
- 2
lib/msf/core/payload/windows/x64/reverse_winhttp.rb View File

@@ -117,10 +117,10 @@ module Payload::Windows::ReverseWinHttp_x64
117 117
   # @option opts [Bool] :ssl Whether or not to enable SSL
118 118
   # @option opts [String] :uri The URI to request during staging
119 119
   # @option opts [String] :host The host to connect to
120
-  # @option opts [Fixnum] :port The port to connect to
120
+  # @option opts [Integer] :port The port to connect to
121 121
   # @option opts [String] :verify_cert_hash A 20-byte raw SHA-1 hash of the certificate to verify, or nil
122 122
   # @option opts [String] :exitfunk The exit method to use if there is an error, one of process, thread, or seh
123
-  # @option opts [Fixnum] :retry_count The number of times to retry a failed request before giving up
123
+  # @option opts [Integer] :retry_count The number of times to retry a failed request before giving up
124 124
   #
125 125
   def asm_reverse_winhttp(opts={})
126 126
 

+ 8
- 8
lib/msf/core/payload_generator.rb View File

@@ -51,13 +51,13 @@ module Msf
51 51
     #   @return [Msf::Framework] The framework instance to use for generation
52 52
     attr_accessor :framework
53 53
     # @!attribute  iterations
54
-    #   @return [Fixnum] The number of iterations to run the encoder
54
+    #   @return [Integer] The number of iterations to run the encoder
55 55
     attr_accessor :iterations
56 56
     # @!attribute  keep
57 57
     #   @return [Boolean] Whether or not to preserve the original functionality of the template
58 58
     attr_accessor :keep
59 59
     # @!attribute  nops
60
-    #   @return [Fixnum] The size in bytes of NOP sled to prepend the payload with
60
+    #   @return [Integer] The size in bytes of NOP sled to prepend the payload with
61 61
     attr_accessor :nops
62 62
     # @!attribute  payload
63 63
     #   @return [String] The refname of the payload to generate
@@ -69,10 +69,10 @@ module Msf
69 69
     #   @return [Boolean] Whether or not to find the smallest possible output
70 70
     attr_accessor :smallest
71 71
     # @!attribute  space
72
-    #   @return [Fixnum] The maximum size in bytes of the payload
72
+    #   @return [Integer] The maximum size in bytes of the payload
73 73
     attr_accessor :space
74 74
     # @!attribute  encoder_space
75
-    #   @return [Fixnum] The maximum size in bytes of the encoded payload
75
+    #   @return [Integer] The maximum size in bytes of the encoded payload
76 76
     attr_accessor :encoder_space
77 77
     # @!attribute  stdin
78 78
     #   @return [String] The raw bytes of a payload taken from STDIN
@@ -89,14 +89,14 @@ module Msf
89 89
     # @option opts [String] :payload (see #payload)
90 90
     # @option opts [String] :format (see #format)
91 91
     # @option opts [String] :encoder (see #encoder)
92
-    # @option opts [Fixnum] :iterations (see #iterations)
92
+    # @option opts [Integer] :iterations (see #iterations)
93 93
     # @option opts [String] :arch (see #arch)
94 94
     # @option opts [String] :platform (see #platform)
95 95
     # @option opts [String] :badchars (see #badchars)
96 96
     # @option opts [String] :template (see #template)
97
-    # @option opts [Fixnum] :space (see #space)
98
-    # @option opts [Fixnum] :encoder_space (see #encoder_space)
99
-    # @option opts [Fixnum] :nops (see #nops)
97
+    # @option opts [Integer] :space (see #space)
98
+    # @option opts [Integer] :encoder_space (see #encoder_space)
99
+    # @option opts [Integer] :nops (see #nops)
100 100
     # @option opts [String] :add_code (see #add_code)
101 101
     # @option opts [Boolean] :keep (see #keep)
102 102
     # @option opts [Hash] :datastore (see #datastore)

+ 1
- 1
lib/msf/core/post.rb View File

@@ -57,7 +57,7 @@ class Msf::Post < Msf::Module
57 57
   # is currently running against.
58 58
   #
59 59
   # @return [NilClass] if there is no database record for the session
60
-  # @return [Fixnum] if there is a database record to get the id for
60
+  # @return [Integer] if there is a database record to get the id for
61 61
   def session_db_id
62 62
     if session.db_record
63 63
       session.db_record.id

+ 1
- 1
lib/msf/core/post/file.rb View File

@@ -533,7 +533,7 @@ protected
533 533
   #
534 534
   # Calculate the maximum line length for a unix shell.
535 535
   #
536
-  # @return [Fixnum]
536
+  # @return [Integer]
537 537
   def _unix_max_line_length
538 538
     # Based on autoconf's arg_max calculator, see
539 539
     # http://www.in-ulm.de/~mascheck/various/argmax/autoconf_check.html

+ 2
- 2
lib/msf/core/post/windows/accounts.rb View File

@@ -268,7 +268,7 @@ module Accounts
268 268
 
269 269
   # Gets an impersonation token from the primary token.
270 270
   #
271
-  # @return [Fixnum] the impersonate token handle identifier if success, nil if
271
+  # @return [Integer] the impersonate token handle identifier if success, nil if
272 272
   #	fails
273 273
   def get_imperstoken
274 274
     adv =  session.railgun.advapi32
@@ -291,7 +291,7 @@ module Accounts
291 291
   # to an access token.
292 292
   #
293 293
   # @param [String] dir the directory path
294
-  # @param [Fixnum] token the access token
294
+  # @param [Integer] token the access token
295 295
   # @return [String, nil] a String describing the permissions or nil
296 296
   def check_dir_perms(dir, token)
297 297
     adv =  session.railgun.advapi32

+ 5
- 5
lib/msf/core/post/windows/ldap.rb View File

@@ -108,7 +108,7 @@ module LDAP
108 108
   # Performs an ldap query
109 109
   #
110 110
   # @param filter [String] LDAP search filter
111
-  # @param max_results [Fixnum] Maximum results
111
+  # @param max_results [Integer] Maximum results
112 112
   # @param fields [Array<String>] Attributes to retrieve
113 113
   # @param domain [String] Optional domain or distinguished name
114 114
   # @return [Hash] Entries found
@@ -158,9 +158,9 @@ module LDAP
158 158
   # Performs a query on the LDAP session
159 159
   #
160 160
   # @param session_handle [Handle] LDAP Session Handle
161
-  # @param base [Fixnum] Pointer to string that contains distinguished
161
+  # @param base [Integer] Pointer to string that contains distinguished
162 162
   #   name of entry to start the search
163
-  # @param scope [Fixnum] Search Scope
163
+  # @param scope [Integer] Search Scope
164 164
   # @param filter [String] Search Filter
165 165
   # @param fields [Array<String>] Attributes to retrieve
166 166
   # @return [Hash] Entries found
@@ -245,7 +245,7 @@ module LDAP
245 245
 
246 246
   # Gets the LDAP Entry
247 247
   #
248
-  # @param pEntry [Fixnum] Pointer to the Entry
248
+  # @param pEntry [Integer] Pointer to the Entry
249 249
   # @return [Array] Entry data structure
250 250
   def get_entry(pEntry)
251 251
     return client.railgun.memread(pEntry,41).unpack('VVVVVVVVVvCCC')
@@ -328,7 +328,7 @@ module LDAP
328 328
   end
329 329
 
330 330
   # Binds to the default LDAP Server
331
-  # @param size_limit [Fixnum] Maximum number of results to return in a query
331
+  # @param size_limit [Integer] Maximum number of results to return in a query
332 332
   # @param domain [String] Optional domain or distinguished name
333 333
   # @return LDAP session handle
334 334
   def bind_default_ldap_server(size_limit, domain=nil)

+ 2
- 2
lib/msf/core/post/windows/process.rb View File

@@ -10,8 +10,8 @@ module Process
10 10
   # Injects shellcode to a process, and executes it.
11 11
   #
12 12
   # @param shellcode [String] The shellcode to execute
13
-  # @param base_addr [Fixnum] The base address to allocate memory
14
-  # @param pid       [Fixnum] The process ID to inject to
13
+  # @param base_addr [Integer] The base address to allocate memory
14
+  # @param pid       [Integer] The process ID to inject to
15 15
   #
16 16
   # @return [Boolean] True if successful, otherwise false
17 17
   #

+ 1
- 1
lib/msf/core/post/windows/reflective_dll_injection.rb View File

@@ -21,7 +21,7 @@ module Msf::Post::Windows::ReflectiveDLLInjection
21 21
   #   The process to inject the shellcode into.
22 22
   # @param shellcode [String] The shellcode to inject.
23 23
   #
24
-  # @return [Fixnum] Address of the shellcode in the target process's
24
+  # @return [Integer] Address of the shellcode in the target process's
25 25
   #   memory.
26 26
   def inject_into_process(process, shellcode)
27 27
     shellcode_size = shellcode.length

+ 5
- 5
lib/msf/core/post/windows/services.rb View File

@@ -55,11 +55,11 @@ module Services
55 55
   # @param opts [Hash]
56 56
   # @option opts [String] :host (nil) The host on which to open the
57 57
   #   service manager. May be a hostname or IP address.
58
-  # @option opts [Fixnum] :access (0xF003F) Bitwise-or of the
58
+  # @option opts [Integer] :access (0xF003F) Bitwise-or of the
59 59
   #   SC_MANAGER_* constants (see
60 60
   #   {http://msdn.microsoft.com/en-us/library/windows/desktop/ms685981(v=vs.85).aspx})
61 61
   #
62
-  # @return [Fixnum] Opaque Windows handle SC_HANDLE as returned by
62
+  # @return [Integer] Opaque Windows handle SC_HANDLE as returned by
63 63
   #   OpenSCManagerA()
64 64
   # @yield [manager] Gives the block a manager handle as returned by
65 65
   #   advapi32.dll!OpenSCManagerA. When the block returns, the handle
@@ -105,7 +105,7 @@ module Services
105 105
   # Open the service with advapi32.dll!OpenServiceA on the
106 106
   # target manager
107 107
   #
108
-  # @return [Fixnum] Opaque Windows handle SC_HANDLE as returned by
108
+  # @return [Integer] Opaque Windows handle SC_HANDLE as returned by
109 109
   #   OpenServiceA()
110 110
   # @yield [manager] Gives the block a service handle as returned by
111 111
   #   advapi32.dll!OpenServiceA. When the block returns, the handle
@@ -376,7 +376,7 @@ module Services
376 376
   # @param server [String,nil] A hostname or IP address. Default is the
377 377
   #   remote localhost
378 378
   #
379
-  # @return [Fixnum] 0 if service started successfully, 1 if it failed
379
+  # @return [Integer] 0 if service started successfully, 1 if it failed
380 380
   #   because the service is already running, 2 if it is disabled
381 381
   #
382 382
   # @raise [RuntimeError] if OpenServiceA failed
@@ -395,7 +395,7 @@ module Services
395 395
   # Stop a service.
396 396
   #
397 397
   # @param (see #service_start)
398
-  # @return [Fixnum] 0 if service stopped successfully, 1 if it failed
398
+  # @return [Integer] 0 if service stopped successfully, 1 if it failed
399 399
   #   because the service is already stopped or disabled, 2 if it
400 400
   #   cannot be stopped for some other reason.
401 401
   #

+ 3
- 3
lib/msf/core/post_mixin.rb View File

@@ -131,7 +131,7 @@ module Msf::PostMixin
131 131
   #
132 132
   # Checks the session's type against this module's
133 133
   # <tt>module_info["SessionTypes"]</tt> as well as examining platform
134
-  # compatibility.  +sess_or_sid+ can be a Session object, Fixnum, or
134
+  # compatibility.  +sess_or_sid+ can be a Session object, Integer, or
135 135
   # String.  In the latter cases it should be a key in
136 136
   # +framework.sessions+.
137 137
   #
@@ -139,14 +139,14 @@ module Msf::PostMixin
139 139
   #   value from this method does not guarantee the module will work
140 140
   #   with the session.
141 141
   #
142
-  # @param sess_or_sid [Msf::Session,Fixnum,String]
142
+  # @param sess_or_sid [Msf::Session,Integer,String]
143 143
   #   A session or session ID to compare against this module for
144 144
   #   compatibility.
145 145
   #
146 146
   def session_compatible?(sess_or_sid)
147 147
     # Normalize the argument to an actual Session
148 148
     case sess_or_sid
149
-    when ::Fixnum, ::String
149
+    when ::Integer, ::String
150 150
       s = framework.sessions[sess_or_sid.to_i]
151 151
     when ::Msf::Session
152 152
       s = sess_or_sid

+ 2
- 2
lib/msf/core/reflective_dll_loader.rb View File

@@ -29,9 +29,9 @@ module Msf::ReflectiveDLLLoader
29 29
   # Load a reflectively-injectable DLL from an string and find the offset
30 30
   # to the ReflectiveLoader function inside the DLL.
31 31
   #
32
-  # @param [Fixnum] dll_data the DLL to load.
32
+  # @param [Integer] dll_data the DLL to load.
33 33
   #
34
-  # @return [Fixnum] offset to the +ReflectiveLoader+ function within the DLL.
34
+  # @return [Integer] offset to the +ReflectiveLoader+ function within the DLL.
35 35
   def load_rdi_dll_from_data(dll_data)
36 36
     offset = parse_pe(dll_data)
37 37
 

+ 2
- 2
lib/msf/core/rpc/v10/constants.rb View File

@@ -10,7 +10,7 @@ class Exception < RuntimeError
10 10
 
11 11
   # Initializes Exception.
12 12
   #
13
-  # @param [Fixnum] code An error code.
13
+  # @param [Integer] code An error code.
14 14
   # @param [String] message An error message.
15 15
   # @return [void]
16 16
   def initialize(code, message)
@@ -25,7 +25,7 @@ class ServerException < RuntimeError
25 25
 
26 26
   # Initializes ServerException.
27 27
   #
28
-  # @param [Fixnum] code An error code.
28
+  # @param [Integer] code An error code.
29 29
   # @param [String] error_message An error message.
30 30
   # @param [Exception] error_class An error class.
31 31
   # @param [Array] error_backtrace A backtrace of the error.

+ 1
- 1
lib/msf/core/rpc/v10/rpc_base.rb View File

@@ -17,7 +17,7 @@ class RPC_Base
17 17
 
18 18
   # Raises an Msf::RPC Exception.
19 19
   #
20
-  # @param [Fixnum] code The error code to raise.
20
+  # @param [Integer] code The error code to raise.
21 21
   # @param [String] message The error message.
22 22
   # @raise [Msf::RPC::Exception]
23 23
   # @return [void]

+ 9
- 9
lib/msf/core/rpc/v10/rpc_console.rb View File

@@ -19,7 +19,7 @@ class RPC_Console < RPC_Base
19 19
   #
20 20
   # @param [Hash] opts See Msf::Ui::Web::Driver#create_console
21 21
   # @return [Hash] Information about the new console. It contains the following keys:
22
-  #  * 'id' [Fixnum] The console's ID.
22
+  #  * 'id' [Integer] The console's ID.
23 23
   #  * 'prompt' [String] The framework prompt (example: 'msf > ')
24 24
   #  * 'busy' [TrueClass] The console's busy state, or
25 25
   #  * 'busy' [FalseClass] The console's busy state.
@@ -39,7 +39,7 @@ class RPC_Console < RPC_Base
39 39
   #
40 40
   # @return [Hash] Console information.
41 41
   #  * 'consoles' [Array<Hash>] consoles, each element is a hash that includes:
42
-  #    * 'id' [Fixnum] The console's ID
42
+  #    * 'id' [Integer] The console's ID
43 43
   #    * 'prompt' [String] The framework prompt (example: 'msf > ')
44 44
   #    * 'busy' [TrueClass] The console's busy state, or
45 45
   #    * 'busy' [FalseClass] The console's busy state.
@@ -60,7 +60,7 @@ class RPC_Console < RPC_Base
60 60
 
61 61
   # Deletes a framework console instance.
62 62
   #
63
-  # @param [Fixnum] cid Framework console ID.
63
+  # @param [Integer] cid Framework console ID.
64 64
   # @return [Hash] A result indicating whether the action was successful or not.
65 65
   #                It contains the following key:
66 66
   #                * 'result' [String] Either 'success' or 'failure'.
@@ -76,7 +76,7 @@ class RPC_Console < RPC_Base
76 76
 
77 77
   # Returns the framework console output in raw form.
78 78
   #
79
-  # @param [Fixnum] cid Framework console ID.
79
+  # @param [Integer] cid Framework console ID.
80 80
   # @return [Hash] There are two different hashes you might get:
81 81
   #
82 82
   #  If the console ID is invalid, you will get a hash like the following:
@@ -101,14 +101,14 @@ class RPC_Console < RPC_Base
101 101
 
102 102
   # Sends an input (such as a command) to the framework console.
103 103
   #
104
-  # @param [Fixnum] cid Framework console ID.
104
+  # @param [Integer] cid Framework console ID.
105 105
   # @param [String] data User input.
106 106
   # @return [Hash] There are two different hashes you might get:
107 107
   #
108 108
   #  If the console ID is invalid, you will get a hash like the following:
109 109
   #  * 'result' [String] A value that says 'failure'.
110 110
   #  If the console ID is invalid, you will get a hash like the following:
111
-  #  * 'wrote' [Fixnum] Number of bytes sent.
111
+  #  * 'wrote' [Integer] Number of bytes sent.
112 112
   # @note Remember to add a newline (\\r\\n) at the end of input, otherwise
113 113
   #       the console will not do anything. And you will need to use the
114 114
   #       #rpc_read method to retrieve the output again.
@@ -124,7 +124,7 @@ class RPC_Console < RPC_Base
124 124
 
125 125
   # Returns the tab-completed version of your input (such as a module path).
126 126
   #
127
-  # @param [Fixnum] cid Framework console ID.
127
+  # @param [Integer] cid Framework console ID.
128 128
   # @param [String] line Command.
129 129
   # @return [Hash] There are two different hashes you might get:
130 130
   #
@@ -146,7 +146,7 @@ class RPC_Console < RPC_Base
146 146
   # Kills a framework session. This serves the same purpose as [CTRL]+[C] to abort an interactive session.
147 147
   # You might also want to considering using the session API calls instead of this.
148 148
   #
149
-  # @param [Fixnum] cid Framework console ID.
149
+  # @param [Integer] cid Framework console ID.
150 150
   # @return [Hash] A hash indicating whether the action was successful or not. It contains:
151 151
   #  * 'result' [String] A message that says 'success' if the console ID is valid (and successfully killed, otherwise 'failed')
152 152
   # @example Here's how you would use this from the client:
@@ -162,7 +162,7 @@ class RPC_Console < RPC_Base
162 162
   # Detaches a framework session. This serves the same purpose as [CTRL]+[Z] to
163 163
   # background an interactive session.
164 164
   #
165
-  # @param [Fixnum] cid Framework console ID.
165
+  # @param [Integer] cid Framework console ID.
166 166
   # @return [Hash] A hash indicating whether the action was successful or not. It contains:
167 167
   #  * 'result' [String] A message that says 'success' if the console ID is valid (and successfully detached, otherwise 'failed')
168 168
   # @example Here's how you would use this from the client:

+ 19
- 19
lib/msf/core/rpc/v10/rpc_core.rb View File

@@ -84,12 +84,12 @@ class RPC_Core < RPC_Base
84 84
   # Reloads framework modules. This will take some time to complete.
85 85
   #
86 86
   # @return [Hash] Module stats that contain the following keys:
87
-  #  * 'exploits' [Fixnum] The number of exploits reloaded.
88
-  #  * 'auxiliary' [Fixnum] The number of auxiliary modules reloaded.
89
-  #  * 'post' [Fixnum] The number of post modules reloaded.
90
-  #  * 'encoders' [Fixnum] The number of encoders reloaded.
91
-  #  * 'nops' [Fixnum] The number of NOP modules reloaded.
92
-  #  * 'payloads' [Fixnum] The number of payloads reloaded.
87
+  #  * 'exploits' [Integer] The number of exploits reloaded.
88
+  #  * 'auxiliary' [Integer] The number of auxiliary modules reloaded.
89
+  #  * 'post' [Integer] The number of post modules reloaded.
90
+  #  * 'encoders' [Integer] The number of encoders reloaded.
91
+  #  * 'nops' [Integer] The number of NOP modules reloaded.
92
+  #  * 'payloads' [Integer] The number of payloads reloaded.
93 93
   # @example Here's how you would use this from the client:
94 94
   #  rpc.call('core.reload_modules')
95 95
   def rpc_reload_modules
@@ -105,12 +105,12 @@ class RPC_Core < RPC_Base
105 105
   #
106 106
   # @param [String] path The new path to load.
107 107
   # @return [Hash] Module stats that contain the following keys:
108
-  #  * 'exploits' [Fixnum] The number of exploits loaded.
109
-  #  * 'auxiliary' [Fixnum] The number of auxiliary modules loaded.
110
-  #  * 'post' [Fixnum] The number of post modules loaded.
111
-  #  * 'encoders' [Fixnum] The number of encoders loaded.
112
-  #  * 'nops' [Fixnum] The number of NOP modules loaded.
113
-  #  * 'payloads' [Fixnum] The number of payloads loaded.
108
+  #  * 'exploits' [Integer] The number of exploits loaded.
109
+  #  * 'auxiliary' [Integer] The number of auxiliary modules loaded.
110
+  #  * 'post' [Integer] The number of post modules loaded.
111
+  #  * 'encoders' [Integer] The number of encoders loaded.
112
+  #  * 'nops' [Integer] The number of NOP modules loaded.
113
+  #  * 'payloads' [Integer] The number of payloads loaded.
114 114
   # @example Here's how you would use this from the client:
115 115
   #  rpc.call('core.add_module_path', '/tmp/modules/')
116 116
   def rpc_add_module_path(path)
@@ -122,12 +122,12 @@ class RPC_Core < RPC_Base
122 122
   # Returns the module stats.
123 123
   #
124 124
   # @return [Hash] Module stats that contain the following keys:
125
-  #  * 'exploits' [Fixnum] The number of exploits.
126
-  #  * 'auxiliary' [Fixnum] The number of auxiliary modules.
127
-  #  * 'post' [Fixnum] The number of post modules.
128
-  #  * 'encoders' [Fixnum] The number of encoders.
129
-  #  * 'nops' [Fixnum] The number of NOP modules.
130
-  #  * 'payloads' [Fixnum] The number of payloads.
125
+  #  * 'exploits' [Integer] The number of exploits.
126
+  #  * 'auxiliary' [Integer] The number of auxiliary modules.
127
+  #  * 'post' [Integer] The number of post modules.
128
+  #  * 'encoders' [Integer] The number of encoders.
129
+  #  * 'nops' [Integer] The number of NOP modules.
130
+  #  * 'payloads' [Integer] The number of payloads.
131 131
   # @example Here's how you would use this from the client:
132 132
   #  rpc.call('core.module_stats')
133 133
   def rpc_module_stats
@@ -170,7 +170,7 @@ class RPC_Core < RPC_Base
170 170
 
171 171
   # Kills a framework thread.
172 172
   #
173
-  # @param [Fixnum] tid The thread ID to kill.
173
+  # @param [Integer] tid The thread ID to kill.
174 174
   # @return [Hash] A hash indicating the action was successful. It contains the following key:
175 175
   #  * 'result' [String] A successful message: 'success'
176 176
   # @example Here's how you would use this from the client:

+ 54
- 54
lib/msf/core/rpc/v10/rpc_db.rb View File

@@ -246,10 +246,10 @@ public
246 246
   #  * 'creds' [Array<Hash>] An array of credentials. Each hash in the array will have the following:
247 247
   #    * 'user' [String] Username.
248 248
   #    * 'pass' [String] Password.
249
-  #    * 'updated_at' [Fixnum] Last updated at.
249
+  #    * 'updated_at' [Integer] Last updated at.
250 250
   #    * 'type' [String] Password type.
251 251
   #    * 'host' [String] Host.
252
-  #    * 'port' [Fixnum] Port.
252
+  #    * 'port' [Integer] Port.
253 253
   #    * 'proto' [String] Protocol.
254 254
   #    * 'sname' [String] Service name.
255 255
   # @example Here's how you would use this from the client:
@@ -301,7 +301,7 @@ public
301 301
   #  * 500 Invalid workspace.
302 302
   # @return [Hash] Host information that starts with the following hash key:
303 303
   #  * 'hosts' [Array<Hash>] An array of hosts. Each hash in the array will have the following:
304
-  #    * 'created_at' [Fixnum] Creation date.
304
+  #    * 'created_at' [Integer] Creation date.
305 305
   #    * 'address' [String] IP address.
306 306
   #    * 'mac' [String] MAC address.
307 307
   #    * 'name' [String] Computer name.
@@ -310,7 +310,7 @@ public
310 310
   #    * 'os_flavor' [String] OS flavor.
311 311
   #    * 'os_sp' [String] Service pack.
312 312
   #    * 'os_lang' [String] OS language.
313
-  #    * 'updated_at' [Fixnum] Last updated at.
313
+  #    * 'updated_at' [Integer] Last updated at.
314 314
   #    * 'purpose' [String] Host purpose (example: server)
315 315
   #    * 'info' [String] Additional information about the host.
316 316
   # @example Here's how you would use this from the client:
@@ -353,8 +353,8 @@ public
353 353
   #
354 354
   # @param [Hash] xopts Options:
355 355
   # @option xopts [String] :workspace Name of workspace.
356
-  # @option xopts [Fixnum] :limit Limit.
357
-  # @option xopts [Fixnum] :offset Offset.
356
+  # @option xopts [Integer] :limit Limit.
357
+  # @option xopts [Integer] :offset Offset.
358 358
   # @option xopts [String] :proto Protocol.
359 359
   # @option xopts [String] :address Address.
360 360
   # @option xopts [String] :ports Port range.
@@ -366,9 +366,9 @@ public
366 366
   # @return [Hash] A hash with the following keys:
367 367
   #  * 'services' [Array<Hash>] In each hash of the array, you will get these keys:
368 368
   #    * 'host' [String] Host.
369
-  #    * 'created_at' [Fixnum] Last created at.
370
-  #    * 'updated_at' [Fixnum] Last updated at.
371
-  #    * 'port' [Fixnum] Port.
369
+  #    * 'created_at' [Integer] Last created at.
370
+  #    * 'updated_at' [Integer] Last updated at.
371
+  #    * 'port' [Integer] Port.
372 372
   #    * 'proto' [String] Protocol.
373 373
   #    * 'state' [String] Service state.
374 374
   #    * 'name' [String] Service name.
@@ -413,8 +413,8 @@ public
413 413
   #
414 414
   # @param [Hash] xopts Options:
415 415
   # @option xopts [String] :workspace Name of workspace.
416
-  # @option xopts [Fixnum] :limit Limit.
417
-  # @option xopts [Fixnum] :offset Offset.
416
+  # @option xopts [Integer] :limit Limit.
417
+  # @option xopts [Integer] :offset Offset.
418 418
   # @option xopts [String] :proto Protocol.
419 419
   # @option xopts [String] :address Address.
420 420
   # @option xopts [String] :ports Port range.
@@ -424,9 +424,9 @@ public
424 424
   #  * 500 Invalid workspace.
425 425
   # @return [Hash] A hash with the following key:
426 426
   #  * 'vulns' [Array<Hash>] In each hash of the array, you will get these keys:
427
-  #    * 'port' [Fixnum] Port.
427
+  #    * 'port' [Integer] Port.
428 428
   #    * 'proto' [String] Protocol.
429
-  #    * 'time' [Fixnum] Time reported.
429
+  #    * 'time' [Integer] Time reported.
430 430
   #    * 'host' [String] Vulnerable host.
431 431
   #    * 'name' [String] Exploit that was used.
432 432
   #    * 'refs' [String] Vulnerability references.
@@ -472,10 +472,10 @@ public
472 472
   # @raise [Msf::RPC::Exception] Database not loaded.
473 473
   # @return [Hash] A hash with the following key:
474 474
   #  * 'workspaces' [Array<Hash>] In each hash of the array, you will get these keys:
475
-  #    * 'id' [Fixnum] Workspace ID.
475
+  #    * 'id' [Integer] Workspace ID.
476 476
   #    * 'name' [String] Workspace name.
477
-  #    * 'created_at' [Fixnum] Last created at.
478
-  #    * 'updated_at' [Fixnum] Last updated at.
477
+  #    * 'created_at' [Integer] Last created at.
478
+  #    * 'updated_at' [Integer] Last updated at.
479 479
   # @example Here's how you would use this from the client:
480 480
   #  rpc.call('db.workspaces')
481 481
   def rpc_workspaces
@@ -500,7 +500,7 @@ public
500 500
   # @raise [Msf::RPC::Exception] Database not loaded. Try: rpc.call('console.create')
501 501
   # @return [Hash] A hash with the following keys:
502 502
   #  * 'workspace' [String] Workspace name.
503
-  #  * 'workspace_id' [Fixnum] Workspace ID.
503
+  #  * 'workspace_id' [Integer] Workspace ID.
504 504
   # @example Here's how you would use this from the client:
505 505
   #  rpc.call('db.current_workspace')
506 506
   def rpc_current_workspace
@@ -518,9 +518,9 @@ public
518 518
   # @return [Hash] A hash with the following key:
519 519
   #  * 'workspace' [Array<Hash>] In each hash of the array, you will get these keys:
520 520
   #    * 'name' [String] Workspace name.
521
-  #    * 'id' [Fixnum] Workspace ID.
522
-  #    * 'created_at' [Fixnum] Last created at.
523
-  #    * 'updated_at' [Fixnum] Last updated at.
521
+  #    * 'id' [Integer] Workspace ID.
522
+  #    * 'created_at' [Integer] Last created at.
523
+  #    * 'updated_at' [Integer] Last updated at.
524 524
   # @example Here's how you would use this from the client:
525 525
   #  rpc.call('db.get_workspace')
526 526
   def rpc_get_workspace(wspace)
@@ -631,7 +631,7 @@ public
631 631
   #  * 500 Invalid workspace.
632 632
   # @return [Hash] A hash that contains the following:
633 633
   #  * 'host' [Array<Hash>] Each hash in the array contains the following:
634
-  #    * 'created_at' [Fixnum] Last created at.
634
+  #    * 'created_at' [Integer] Last created at.
635 635
   #    * 'address' [String] Address.
636 636
   #    * 'mac' [String] Mac address.
637 637
   #    * 'name' [String] Host name.
@@ -640,7 +640,7 @@ public
640 640
   #    * 'os_flavor' [String] OS flavor.
641 641
   #    * 'os_sp' [String] OS service pack.
642 642
   #    * 'os_lang' [String] OS language.
643
-  #    * 'updated_at' [Fixnum] Last updated at.
643
+  #    * 'updated_at' [Integer] Last updated at.
644 644
   #    * 'purpose' [String] Purpose. Example: 'server'.
645 645
   #    * 'info' [String] Additional information.
646 646
   # @example Here's how you would use this from the client:
@@ -739,7 +739,7 @@ public
739 739
   # @param [Hash] xopts Filters for the search, see below:
740 740
   # @option xopts [String] :workspace Workspace name.
741 741
   # @option xopts [String] :proto Protocol.
742
-  # @option xopts [Fixnum] :port Port.
742
+  # @option xopts [Integer] :port Port.
743 743
   # @option xopts [String] :names Service names.
744 744
   # @raise [Msf::RPC::ServerException] You might get one of these errors:
745 745
   #  * 500 ActiveRecord::ConnectionNotEstablished. Try: rpc.call('console.create').
@@ -748,8 +748,8 @@ public
748 748
   # @return [Hash] A hash that contains the following key:
749 749
   #  * 'service' [Array<Hash>] Each hash in the array contains the following:
750 750
   #    * 'host' [String] Host address.
751
-  #    * 'created_at' [Fixnum] Creation date.
752
-  #    * 'port' [Fixnum] Port.
751
+  #    * 'created_at' [Integer] Creation date.
752
+  #    * 'port' [Integer] Port.
753 753
   #    * 'proto' [String] Protocol.
754 754
   #    * 'state' [String] Service state.
755 755
   #    * 'name' [String] Service name.
@@ -809,7 +809,7 @@ public
809 809
   # @option xopts [String] :address Same as :addr.
810 810
   # @option xopts [String] :host Same as :address.
811 811
   # @option xopts [String] :proto Protocol.
812
-  # @option xopts [Fixnum] :port Port.
812
+  # @option xopts [Integer] :port Port.
813 813
   # @option xopts [String] :ntype Note type.
814 814
   # @raise [Msf::RPC::ServerException] You might get one of these errors:
815 815
   #  * 500 ActiveRecord::ConnectionNotEstablished. Try: rpc.call('console.create').
@@ -818,10 +818,10 @@ public
818 818
   # @return [Hash] A hash that contains the following:
819 819
   #  * 'note' [Array<Hash>] Each hash in the array contains the following:
820 820
   #    * 'host' [String] Host.
821
-  #    * 'port' [Fixnum] Port.
821
+  #    * 'port' [Integer] Port.
822 822
   #    * 'proto' [String] Protocol.
823
-  #    * 'created_at' [Fixnum] Last created at.
824
-  #    * 'updated_at' [Fixnum] Last updated at.
823
+  #    * 'created_at' [Integer] Last created at.
824
+  #    * 'updated_at' [Integer] Last updated at.
825 825
   #    * 'ntype' [String] Note type.
826 826
   #    * 'data' [String] Note data.
827 827
   #    * 'critical' [String] A boolean indicating criticality.
@@ -867,8 +867,8 @@ public
867 867
   # @return [Hash] A hash that contains the client connection:
868 868
   #  * 'client' [Array<Hash>] Each hash of the array contains the following:
869 869
   #    * 'host' [String] Host IP.
870
-  #    * 'created_at' [Fixnum] Created date.
871
-  #    * 'updated_at' [Fixnum] Last updated at.
870
+  #    * 'created_at' [Integer] Created date.
871
+  #    * 'updated_at' [Integer] Last updated at.
872 872
   #    * 'ua_string' [String] User-Agent string.
873 873
   #    * 'ua_name' [String] User-Agent name.
874 874
   #    * 'ua_ver' [String] User-Agent version.
@@ -931,7 +931,7 @@ public
931 931
   # @option xopts [String] :host An IP address or a Host object to associate with this note.
932 932
   # @option xopts [String] :service A Service object to associate with this note.
933 933
   # @option xopts [String] :data Whatever it is you're making a note of.
934
-  # @option xopts [Fixnum] :port Along with +:host+ and +:proto+, a service to associate with this note.
934
+  # @option xopts [Integer] :port Along with +:host+ and +:proto+, a service to associate with this note.
935 935
   # @option xopts [String] :proto Along with +:host+ and +:port+, a service to associate with this note.
936 936
   # @option xopts [Hash] A hash that contains the following information.
937 937
   #  * :unique [Boolean] Allow only a single Note per +:host+/+:type+ pair.
@@ -981,7 +981,7 @@ public
981 981
   #  * 500 Invalid workspace.
982 982
   # @return [Hash] A hash that contains the following:
983 983
   #  * 'notes' [Array<Hash>] Each hash in the array contains the following:
984
-  #    * 'time' [Fixnum] Creation date.
984
+  #    * 'time' [Integer] Creation date.
985 985
   #    * 'host' [String] Host address.
986 986
   #    * 'service' [String] Service name or port.
987 987
   #    * 'type' [String] Host type.
@@ -1045,7 +1045,7 @@ public
1045 1045
   # @option xopts [String] :host Host address.
1046 1046
   # @option xopts [String] :address Same as :host.
1047 1047
   # @option xopts [Array] :addresses Same as :address.
1048
-  # @option xopts [Fixnum] :port Port.
1048
+  # @option xopts [Integer] :port Port.
1049 1049
   # @option xopts [String] :proto Protocol.
1050 1050
   # @option xopts [String] :name Name of the vulnerability.
1051 1051
   # @raise [Msf::RPC::ServerException] You might get one of these errors:
@@ -1056,7 +1056,7 @@ public
1056 1056
   #  * 'result' [String] A message that says 'success'.
1057 1057
   #  * 'deleted' [Array<Hash>] Each hash in the array contains the following:
1058 1058
   #    * 'address' [String] Host address.
1059
-  #    * 'port' [Fixnum] Port.
1059
+  #    * 'port' [Integer] Port.
1060 1060
   #    * 'proto' [String] Protocol.
1061 1061
   #    * 'name' [String] Vulnerability name.
1062 1062
   # @example Here's how you would use this from the client:
@@ -1139,7 +1139,7 @@ public
1139 1139
   # @option xopts [String] :host Host address.
1140 1140
   # @option xopts [String] :address Same as :host.
1141 1141
   # @option xopts [Array] :addresses Same as :address.
1142
-  # @option xopts [Fixnum] :port Port.
1142
+  # @option xopts [Integer] :port Port.
1143 1143
   # @option xopts [String] :proto Protocol.
1144 1144
   # @option xopts [String] :ntype Note type.
1145 1145
   # @raise [Msf::RPC::ServerException] You might get one of these errors:
@@ -1150,7 +1150,7 @@ public
1150 1150
   #  * 'result' [String] A message that says 'success'.
1151 1151
   #  * 'deleted' [Array<Hash>] Each hash in the array contains the following:
1152 1152
   #    * 'address' [String] Host address.
1153
-  #    * 'port' [Fixnum] Port.
1153
+  #    * 'port' [Integer] Port.
1154 1154
   #    * 'proto' [String] Protocol.
1155 1155
   #    * 'ntype' [String] Note type.
1156 1156
   # @example Here's how you would use this from the client:
@@ -1180,7 +1180,7 @@ public
1180 1180
   # @option xopts [String] :host Host address.
1181 1181
   # @option xopts [String] :address Same as :host.
1182 1182
   # @option xopts [Array] :addresses Host addresses.
1183
-  # @option xopts [Fixnum] :port Port.
1183
+  # @option xopts [Integer] :port Port.
1184 1184
   # @option xopts [String] :proto Protocol.
1185 1185
   # @raise [Msf::RPC::ServerException] You might get one of these errors:
1186 1186
   #  * 500 ActiveRecord::ConnectionNotEstablished. Try: rpc.call('console.create').
@@ -1191,7 +1191,7 @@ public
1191 1191
   #  * 'deleted' [Array<Hash>] If result says success, then you will get this key.
1192 1192
   #    Each hash in the array contains:
1193 1193
   #    * 'address' [String] Host address.
1194
-  #    * 'port' [Fixnum] Port.
1194
+  #    * 'port' [Integer] Port.
1195 1195
   #    * 'proto' [String] Protocol.
1196 1196
   # @example Here's how you would use this from the client:
1197 1197
   #  rpc.call('db.del_service', {:host=>ip})
@@ -1331,8 +1331,8 @@ public
1331 1331
   #
1332 1332
   # @param [Hash] xopts Options:
1333 1333
   # @option xopts [String] :workspace Workspace name.
1334
-  # @option xopts [Fixnum] :limit Limit.
1335
-  # @option xopts [Fixnum] :offset Offset.
1334
+  # @option xopts [Integer] :limit Limit.
1335
+  # @option xopts [Integer] :offset Offset.
1336 1336
   # @raise [Msf::RPC::ServerException] You might get one of these errors:
1337 1337
   #  * 500 ActiveRecord::ConnectionNotEstablished. Try: rpc.call('console.create').
1338 1338
   #  * 500 Database not loaded. Try: rpc.call('console.create')
@@ -1340,8 +1340,8 @@ public
1340 1340
   # @return [Hash] A hash that contains the following:
1341 1341
   #  * 'events' [Array<Hash>] Each hash in the array contains the following:
1342 1342
   #    * 'host' [String] Host address.
1343
-  #    * 'created_at' [Fixnum] Creation date.
1344
-  #    * 'updated_at' [Fixnum] Last updated at.
1343
+  #    * 'created_at' [Integer] Creation date.
1344
+  #    * 'updated_at' [Integer] Last updated at.
1345 1345
   #    * 'name' [String] Event name.
1346 1346
   #    * 'critical' [Boolean] Criticality.
1347 1347
   #    * 'username' [String] Username.
@@ -1401,7 +1401,7 @@ public
1401 1401
   # @param [Hash] xopts Information about the looted item.
1402 1402
   # @option xopts [String] :workspace Workspace name.
1403 1403
   # @option xopts [String] :host Host address.
1404
-  # @option xopts [Fixnum] :port Port. Should match :service.
1404
+  # @option xopts [Integer] :port Port. Should match :service.
1405 1405
   # @option xopts [String] :proto Protocol. Should match :service.
1406 1406
   # @option xopts [String] :path Required. Path where the item was looted.
1407 1407
   # @option xopts [String] :type Loot type.
@@ -1435,8 +1435,8 @@ public
1435 1435
   #
1436 1436
   # @param [Hash] xopts Filters that narrow down the search:
1437 1437
   # @option xopts [Hash] :workspace Workspace name.
1438
-  # @option xopts [Fixnum] :limit Limit.
1439
-  # @option xopts [Fixnum] :offset Offset.
1438
+  # @option xopts [Integer] :limit Limit.
1439
+  # @option xopts [Integer] :offset Offset.
1440 1440
   # @raise [Msf::RPC::ServerException] You might get one of these errors:
1441 1441
   #  * 500 ActiveRecord::ConnectionNotEstablished. Try: rpc.call('console.create').
1442 1442
   #  * 500 Database not loaded. Try: rpc.call('console.create')
@@ -1448,8 +1448,8 @@ public
1448 1448
   #    * 'ltype' [String] Loot type.
1449 1449
   #    * 'ctype' [String] Content type.
1450 1450
   #    * 'data' [String] Looted data.
1451
-  #    * 'created_at' [Fixnum] Creation date.
1452
-  #    * 'updated_at' [Fixnum] Last updated at.
1451
+  #    * 'created_at' [Integer] Creation date.
1452
+  #    * 'updated_at' [Integer] Last updated at.
1453 1453
   #    * 'name' [String] Name.
1454 1454
   #    * 'info' [String] Additional information.
1455 1455
   # @example Here's how you would use this from the client:
@@ -1540,7 +1540,7 @@ public
1540 1540
   # @param [Hash] xopts Filters to narrow down which vulnerabilities to find.
1541 1541
   # @option xopts [String] :workspace Workspace name.
1542 1542
   # @option xopts [String] :proto Protocol.
1543
-  # @option xopts [Fixnum] :port Port.
1543
+  # @option xopts [Integer] :port Port.
1544 1544
   # @raise [Msf::RPC::ServerException] You might get one of these errors:
1545 1545
   #  * 500 ActiveRecord::ConnectionNotEstablished. Try: rpc.call('console.create').
1546 1546
   #  * 500 Database not loaded. Try: rpc.call('console.create')
@@ -1548,10 +1548,10 @@ public
1548 1548
   # @return [Hash] A hash that contains the following:
1549 1549
   #  * 'vuln' [Array<Hash>] Each hash in the array contains the following:
1550 1550
   #    * 'host' [String] Host address.
1551
-  #    * 'port' [Fixnum] Port.
1551
+  #    * 'port' [Integer] Port.
1552 1552
   #    * 'proto' [String] Protocol.
1553
-  #    * 'created_at' [Fixnum] Creation date.
1554
-  #    * 'updated_at' [Fixnum] Last updated at.
1553
+  #    * 'created_at' [Integer] Creation date.
1554
+  #    * 'updated_at' [Integer] Last updated at.
1555 1555
   #    * 'name' [String] Vulnerability name.
1556 1556
   #    * 'info' [String] Additional information.
1557 1557
   #    * 'refs' [Array<String>] Reference names.
@@ -1624,8 +1624,8 @@ public
1624 1624
   #   * 'ua_string' [String] User-agent string.
1625 1625
   #   * 'ua_name' [String] Browser name.
1626 1626
   #   * 'ua_ver' [String] Browser version.
1627
-  #   * 'created_at' [Fixnum] Creation date.
1628
-  #   * 'updated_at' [Fixnum] Last updated at.
1627
+  #   * 'created_at' [Integer] Creation date.
1628
+  #   * 'updated_at' [Integer] Last updated at.
1629 1629
   # @example Here's how you would use this from the client:
1630 1630
   #  rpc.call('db.clients', {})
1631 1631
   def rpc_clients(xopts)

+ 4
- 4
lib/msf/core/rpc/v10/rpc_job.rb View File

@@ -21,7 +21,7 @@ class RPC_Job < RPC_Base
21 21
 
22 22
   # Stops a job.
23 23
   #
24
-  # @param [Fixnum] jid Job ID.
24
+  # @param [Integer] jid Job ID.
25 25
   # @raise [Msf::RPC::Exception] A 500 response indicating an invalid job ID was given.
26 26
   # @return [Hash] A hash indicating the action was successful. It contains the following key:
27 27
   #  * 'result' [String] A successful message: 'success'
@@ -37,12 +37,12 @@ class RPC_Job < RPC_Base
37 37
 
38 38
   # Returns information about a job.
39