ruby_smb 3.3.19 → 3.3.20

data/examples/get_computer_info.rb

@@ -2,20 +2,62 @@
 
 # This example script is used for testing DCERPC WKST requests.
 # It will attempt to retrieve configuration information of a remote computer/server.
-# Example usage: ruby enum_domain_users.rb 192.168.172.138 msfadmin msfadmin MyDomain
+# Example usage: ruby get_computer_info.rb --username msfadmin --password msfadmin 192.168.172.138
 
 require 'bundler/setup'
+require 'optparse'
 require 'ruby_smb'
 
-address      = ARGV[0]
-username     = ARGV[1]
-password     = ARGV[2]
-smb_versions = ARGV[3]&.split(',') || ['1','2','3']
+args = ARGV.dup
+options = {
+  domain: '.',
+  username: '',
+  password: '',
+  smbv1: true,
+  smbv2: true,
+  smbv3: true,
+  target: nil
+}
+options[:target] = args.pop
+optparser = OptionParser.new do |opts|
+  opts.banner = "Usage: #{File.basename(__FILE__)} [options] target"
+  opts.on("--[no-]smbv1", "Enable or disable SMBv1 (default: #{options[:smbv1] ? 'Enabled' : 'Disabled'})") do |smbv1|
+    options[:smbv1] = smbv1
+  end
+  opts.on("--[no-]smbv2", "Enable or disable SMBv2 (default: #{options[:smbv2] ? 'Enabled' : 'Disabled'})") do |smbv2|
+    options[:smbv2] = smbv2
+  end
+  opts.on("--[no-]smbv3", "Enable or disable SMBv3 (default: #{options[:smbv3] ? 'Enabled' : 'Disabled'})") do |smbv3|
+    options[:smbv3] = smbv3
+  end
+  opts.on("--username USERNAME", "The account's username (default: #{options[:username]})") do |username|
+    if username.include?('\\')
+      options[:domain], options[:username] = username.split('\\', 2)
+    else
+      options[:username] = username
+    end
+  end
+  opts.on("--password PASSWORD", "The account's password (default: #{options[:password]})") do |password|
+    options[:password] = password
+  end
+end
+optparser.parse!(args)
+
+if options[:target] == '-h' || options[:target] == '--help'
+  puts optparser.help
+  exit
+end
+
+if options[:target].nil?
+  abort(optparser.help)
+end
+
+address = options[:target]
 
 sock = TCPSocket.new address, 445
 dispatcher = RubySMB::Dispatcher::Socket.new(sock, read_timeout: 60)
 
-client = RubySMB::Client.new(dispatcher, smb1: smb_versions.include?('1'), smb2: smb_versions.include?('2'), smb3: smb_versions.include?('3'), username: username, password: password)
+client = RubySMB::Client.new(dispatcher, smb1: options[:smbv1], smb2: options[:smbv2], smb3: options[:smbv3], username: options[:username], password: options[:password], domain: options[:domain])
 protocol = client.negotiate
 status = client.authenticate
 
@@ -38,5 +80,3 @@ puts "LAN Group: #{info.wki100_langroup.encode('utf-8')}"
 puts "OS Version: #{info.wki100_ver_major}.#{info.wki100_ver_minor}"
 
 client.disconnect!
-
-

data/examples/list_directory.rb

@@ -2,27 +2,69 @@
 
 # This example script is used for testing directory listing functionality
 # It will attempt to connect to a specific share and then list all files in a
-#  specified directory..
-# Example usage: ruby list_directory.rb 192.168.172.138 msfadmin msfadmin TEST_SHARE subdir1
+#  specified directory.
+# Example usage: ruby list_directory.rb --username msfadmin --password msfadmin 192.168.172.138 TEST_SHARE subdir1
 # This will try to connect to \\192.168.172.138\TEST_SHARE with the msfadmin:msfadmin credentials,
 # and then list the contents of the directory 'subdir1'
 
 require 'bundler/setup'
+require 'optparse'
 require 'ruby_smb'
 
-address      = ARGV[0]
-username     = ARGV[1]
-password     = ARGV[2]
-share        = ARGV[3]
-dir          = ARGV[4]
-smb_versions = ARGV[5]&.split(',') || ['1','2','3']
+args = ARGV.dup
+options = {
+  domain: '.',
+  username: '',
+  password: '',
+  smbv1: true,
+  smbv2: true,
+  smbv3: true,
+  target: nil,
+  share: nil,
+  directory: nil
+}
+options[:directory] = args.pop
+options[:share] = args.pop
+options[:target] = args.pop
+optparser = OptionParser.new do |opts|
+  opts.banner = "Usage: #{File.basename(__FILE__)} [options] target share directory"
+  opts.on("--[no-]smbv1", "Enable or disable SMBv1 (default: #{options[:smbv1] ? 'Enabled' : 'Disabled'})") do |smbv1|
+    options[:smbv1] = smbv1
+  end
+  opts.on("--[no-]smbv2", "Enable or disable SMBv2 (default: #{options[:smbv2] ? 'Enabled' : 'Disabled'})") do |smbv2|
+    options[:smbv2] = smbv2
+  end
+  opts.on("--[no-]smbv3", "Enable or disable SMBv3 (default: #{options[:smbv3] ? 'Enabled' : 'Disabled'})") do |smbv3|
+    options[:smbv3] = smbv3
+  end
+  opts.on("--username USERNAME", "The account's username (default: #{options[:username]})") do |username|
+    if username.include?('\\')
+      options[:domain], options[:username] = username.split('\\', 2)
+    else
+      options[:username] = username
+    end
+  end
+  opts.on("--password PASSWORD", "The account's password (default: #{options[:password]})") do |password|
+    options[:password] = password
+  end
+end
+optparser.parse!(args)
+
+if [options[:target], options[:share], options[:directory]].any? { |a| a == '-h' || a == '--help' }
+  puts optparser.help
+  exit
+end
+
+if options[:target].nil? || options[:share].nil? || options[:directory].nil?
+  abort(optparser.help)
+end
 
-path     = "\\\\#{address}\\#{share}"
+path = "\\\\#{options[:target]}\\#{options[:share]}"
 
-sock = TCPSocket.new address, 445
+sock = TCPSocket.new options[:target], 445
 dispatcher = RubySMB::Dispatcher::Socket.new(sock)
 
-client = RubySMB::Client.new(dispatcher, smb1: smb_versions.include?('1'), smb2: smb_versions.include?('2'), smb3: smb_versions.include?('3'), username: username, password: password)
+client = RubySMB::Client.new(dispatcher, smb1: options[:smbv1], smb2: options[:smbv2], smb3: options[:smbv3], username: options[:username], password: options[:password], domain: options[:domain])
 protocol = client.negotiate
 status = client.authenticate
 
@@ -35,7 +77,7 @@ rescue StandardError => e
   puts "Failed to connect to #{path}: #{e.message}"
 end
 
-files = tree.list(directory: dir)
+files = tree.list(directory: options[:directory])
 
 files.each do |file|
   create_time = file.create_time.to_datetime.to_s

data/examples/negotiate.rb

@@ -5,63 +5,75 @@
 # without any other parts.
 
 require 'bundler/setup'
+require 'optparse'
 require 'ruby_smb'
 
-def run_negotiation(address, smb1, smb2, smb3, opts = {})
+def run_negotiation(address, smb1, smb2, smb3)
   # Create our socket and add it to the dispatcher
   sock = TCPSocket.new address, 445
   dispatcher = RubySMB::Dispatcher::Socket.new(sock)
 
-  client = RubySMB::Client.new(dispatcher, smb1: smb1, smb2: smb2, smb3: smb3, username: 'msfadmin', password: 'msfadmin')
+  client = RubySMB::Client.new(dispatcher, smb1: smb1, smb2: smb2, smb3: smb3, username: '', password: '')
   client.negotiate
 end
 
-begin
-  puts "Negotiate with only SMB1 enabled..."
-  puts "  Negotiated version: #{run_negotiation(ARGV[0], true, false, false)}"
-rescue RubySMB::Error::RubySMBError => e
-  puts "Error: #{e.message}"
+args = ARGV.dup
+options = {
+  smbv1: true,
+  smbv2: true,
+  smbv3: true,
+  target: nil
+}
+options[:target] = args.pop
+optparser = OptionParser.new do |opts|
+  opts.banner = "Usage: #{File.basename(__FILE__)} [options] target"
+  opts.on("--[no-]smbv1", "Enable or disable SMBv1 (default: #{options[:smbv1] ? 'Enabled' : 'Disabled'})") do |smbv1|
+    options[:smbv1] = smbv1
+  end
+  opts.on("--[no-]smbv2", "Enable or disable SMBv2 (default: #{options[:smbv2] ? 'Enabled' : 'Disabled'})") do |smbv2|
+    options[:smbv2] = smbv2
+  end
+  opts.on("--[no-]smbv3", "Enable or disable SMBv3 (default: #{options[:smbv3] ? 'Enabled' : 'Disabled'})") do |smbv3|
+    options[:smbv3] = smbv3
+  end
 end
+optparser.parse!(args)
 
-begin
-  puts "Negotiate with only SMB2 enabled..."
-  puts "  Negotiated version: #{run_negotiation(ARGV[0], false, true, false)}"
-rescue RubySMB::Error::RubySMBError => e
-  puts "Error: #{e.message}"
+if options[:target] == '-h' || options[:target] == '--help'
+  puts optparser.help
+  exit
 end
 
-begin
-  puts "Negotiate with only SMB3 enabled..."
-  puts "  Negotiated version: #{run_negotiation(ARGV[0], false, false, true)}"
-rescue RubySMB::Error::RubySMBError => e
-  puts "Error: #{e.message}"
+if options[:target].nil?
+  abort(optparser.help)
 end
 
-begin
-  puts "Negotiate with both SMB1 and SMB2 enabled on the client..."
-  puts "  Negotiated version: #{run_negotiation(ARGV[0], true, true, false)}"
-rescue RubySMB::Error::RubySMBError => e
-  puts "Error: #{e.message}"
-end
+# (smb1, smb2, smb3) combinations to exercise — filtered by the user's
+# --[no-]smbv{1,2,3} flags so any combo requiring a disabled version
+# is skipped.
+combinations = [
+  [true,  false, false], # only SMB1
+  [false, true,  false], # only SMB2
+  [false, false, true],  # only SMB3
+  [true,  true,  false], # SMB1 and SMB2
+  [false, true,  true],  # SMB2 and SMB3
+  [true,  false, true],  # SMB1 and SMB3
+  [true,  true,  true]   # SMB1, SMB2 and SMB3
+]
 
-begin
-  puts "Negotiate with both SMB2 and SMB3 enabled on the client..."
-  puts "  Negotiated version: #{run_negotiation(ARGV[0], false, true, true)}"
-rescue RubySMB::Error::RubySMBError => e
-  puts "Error: #{e.message}"
-end
+combinations.each do |smb1, smb2, smb3|
+  next if smb1 && !options[:smbv1]
+  next if smb2 && !options[:smbv2]
+  next if smb3 && !options[:smbv3]
 
-begin
-  puts "Negotiate with both SMB1 and SMB3 enabled on the client..."
-  puts "  Negotiated version: #{run_negotiation(ARGV[0], true, false, true)}"
-rescue RubySMB::Error::RubySMBError => e
-  puts "Error: #{e.message}"
+  enabled = []
+  enabled << 'SMB1' if smb1
+  enabled << 'SMB2' if smb2
+  enabled << 'SMB3' if smb3
+  puts "Negotiate with #{enabled.join(', ')} enabled..."
+  begin
+    puts "  Negotiated version: #{run_negotiation(options[:target], smb1, smb2, smb3)}"
+  rescue RubySMB::Error::RubySMBError => e
+    puts "Error: #{e.message}"
+  end
 end
-
-begin
-  puts "Negotiate with SMB1, SMB2 and SMB3 enabled on the client..."
-  puts "  Negotiated version: #{run_negotiation(ARGV[0], true, true, true)}"
-rescue RubySMB::Error::RubySMBError => e
-  puts "Error: #{e.message}"
-end
-

data/examples/negotiate_with_netbios_service.rb

@@ -1,19 +1,19 @@
 #!/usr/bin/ruby
 
 # This script is for testing the NetBIOS Session Service Request on port 139/tcp.
-# Example usage: ruby negotiate.rb 192.168.172.138 NBNAME
-# This will connect to 192.168.172.138 (139/TCP) and request a NetBIOS session with NBNAME as the called name. 
+# This will connect to 192.168.172.138 (139/TCP) and request a NetBIOS session with NBNAME as the called name.
 # If successful, a SMB negotiation is performed using this NetBIOS session.
 # The default *SMBSERVER name is used if the NetBIOS name is not provided.
 
 require 'bundler/setup'
+require 'optparse'
 require 'ruby_smb'
 
 def run_negotiation(address, smb1, smb2, smb3, netbios_name)
   sock = TCPSocket.new address, 139
   dispatcher = RubySMB::Dispatcher::Socket.new(sock)
 
-  client = RubySMB::Client.new(dispatcher, smb1: smb1, smb2: smb2, smb3: smb3, username: 'msfadmin', password: 'msfadmin')
+  client = RubySMB::Client.new(dispatcher, smb1: smb1, smb2: smb2, smb3: smb3, username: '', password: '')
   begin
     client.session_request(netbios_name)
   rescue RubySMB::Error::NetBiosSessionService => e
@@ -25,16 +25,55 @@ def run_negotiation(address, smb1, smb2, smb3, netbios_name)
   puts "#{smb_version} successfully negotiated."
 end
 
-address      = ARGV[0]
-netbios_name = ARGV[1] || '*SMBSERVER'
-
-# Negotiate with SMB1, SMB2 and SMB3 enabled on the client
-run_negotiation(ARGV[0], true, true, true, netbios_name)
-# Negotiate with both SMB1 and SMB2 enabled on the client
-run_negotiation(ARGV[0], true, true, false, netbios_name)
-# Negotiate with only SMB1 enabled
-run_negotiation(ARGV[0], true, false, false, netbios_name)
-# Negotiate with only SMB2 enabled
-run_negotiation(ARGV[0], false, true, false, netbios_name)
-# Negotiate with only SMB3 enabled
-run_negotiation(ARGV[0], false, false, true, netbios_name)
+args = ARGV.dup
+options = {
+  smbv1: true,
+  smbv2: true,
+  smbv3: true,
+  netbios_name: '*SMBSERVER',
+  target: nil
+}
+options[:target] = args.pop
+optparser = OptionParser.new do |opts|
+  opts.banner = "Usage: #{File.basename(__FILE__)} [options] target"
+  opts.on("--[no-]smbv1", "Enable or disable SMBv1 (default: #{options[:smbv1] ? 'Enabled' : 'Disabled'})") do |smbv1|
+    options[:smbv1] = smbv1
+  end
+  opts.on("--[no-]smbv2", "Enable or disable SMBv2 (default: #{options[:smbv2] ? 'Enabled' : 'Disabled'})") do |smbv2|
+    options[:smbv2] = smbv2
+  end
+  opts.on("--[no-]smbv3", "Enable or disable SMBv3 (default: #{options[:smbv3] ? 'Enabled' : 'Disabled'})") do |smbv3|
+    options[:smbv3] = smbv3
+  end
+  opts.on("--netbios-name NAME", "The NetBIOS called name (default: #{options[:netbios_name]})") do |name|
+    options[:netbios_name] = name
+  end
+end
+optparser.parse!(args)
+
+if options[:target] == '-h' || options[:target] == '--help'
+  puts optparser.help
+  exit
+end
+
+if options[:target].nil?
+  abort(optparser.help)
+end
+
+# (smb1, smb2, smb3) combinations to exercise — filtered by the user's
+# --[no-]smbv{1,2,3} flags so any combo requiring a disabled version
+# is skipped.
+combinations = [
+  [true,  true,  true],   # SMB1, SMB2 and SMB3 enabled
+  [true,  true,  false],  # SMB1 and SMB2 enabled
+  [true,  false, false],  # only SMB1 enabled
+  [false, true,  false],  # only SMB2 enabled
+  [false, false, true]    # only SMB3 enabled
+]
+
+combinations.each do |smb1, smb2, smb3|
+  next if smb1 && !options[:smbv1]
+  next if smb2 && !options[:smbv2]
+  next if smb3 && !options[:smbv3]
+  run_negotiation(options[:target], smb1, smb2, smb3, options[:netbios_name])
+end

data/examples/net_share_enum_all.rb

@@ -2,23 +2,63 @@
 
 # This example script is used for testing NetShareEnumAll functionality
 # It will attempt to connect to a host and enumerate shares.
-# Example usage: ruby net_share_enum_all.rb 192.168.172.138 msfadmin msfadmin
+# Example usage: ruby net_share_enum_all.rb --username msfadmin --password msfadmin 192.168.172.138
 # This will try to connect to \\192.168.172.138 with the msfadmin:msfadmin credentials
 
 require 'bundler/setup'
+require 'optparse'
 require 'ruby_smb'
 
-address      = ARGV[0]
-username     = ARGV[1]
-password     = ARGV[2]
-smb_versions = ARGV[3]&.split(',') || ['1','2','3']
+args = ARGV.dup
+options = {
+  domain: '.',
+  username: '',
+  password: '',
+  smbv1: true,
+  smbv2: true,
+  smbv3: true,
+  target: nil
+}
+options[:target] = args.pop
+optparser = OptionParser.new do |opts|
+  opts.banner = "Usage: #{File.basename(__FILE__)} [options] target"
+  opts.on("--[no-]smbv1", "Enable or disable SMBv1 (default: #{options[:smbv1] ? 'Enabled' : 'Disabled'})") do |smbv1|
+    options[:smbv1] = smbv1
+  end
+  opts.on("--[no-]smbv2", "Enable or disable SMBv2 (default: #{options[:smbv2] ? 'Enabled' : 'Disabled'})") do |smbv2|
+    options[:smbv2] = smbv2
+  end
+  opts.on("--[no-]smbv3", "Enable or disable SMBv3 (default: #{options[:smbv3] ? 'Enabled' : 'Disabled'})") do |smbv3|
+    options[:smbv3] = smbv3
+  end
+  opts.on("--username USERNAME", "The account's username (default: #{options[:username]})") do |username|
+    if username.include?('\\')
+      options[:domain], options[:username] = username.split('\\', 2)
+    else
+      options[:username] = username
+    end
+  end
+  opts.on("--password PASSWORD", "The account's password (default: #{options[:password]})") do |password|
+    options[:password] = password
+  end
+end
+optparser.parse!(args)
+
+if options[:target] == '-h' || options[:target] == '--help'
+  puts optparser.help
+  exit
+end
 
-path     = "\\\\#{address}\\IPC$"
+if options[:target].nil?
+  abort(optparser.help)
+end
+
+address = options[:target]
 
 sock = TCPSocket.new address, 445
 dispatcher = RubySMB::Dispatcher::Socket.new(sock, read_timeout: 60)
 
-client = RubySMB::Client.new(dispatcher, smb1: smb_versions.include?('1'), smb2: smb_versions.include?('2'), smb3: smb_versions.include?('3'), username: username, password: password)
+client = RubySMB::Client.new(dispatcher, smb1: options[:smbv1], smb2: options[:smbv2], smb3: options[:smbv3], username: options[:username], password: options[:password], domain: options[:domain])
 protocol = client.negotiate
 status = client.authenticate
 
@@ -32,4 +72,3 @@ rescue => e
 end
 
 client.disconnect!
-

data/examples/pipes.rb

@@ -4,22 +4,66 @@
 # Example script for connecting to a named pipe and performing a peek operation.
 # This is used to demonstrate pipe operations.
 #
-# Usage: ruby pipes.rb ADDRESS PIPENAME USER PASS 1|2
+# Usage: ruby pipes.rb --username USER --password PASS ADDRESS PIPENAME
 #
 
 require 'bundler/setup'
+require 'optparse'
 require 'ruby_smb'
 
-address      = ARGV[0]
-pipename     = ARGV[1]
-username     = ARGV[2]
-password     = ARGV[3]
-smb_versions = ARGV[4]&.split(',') || ['1','2','3']
+args = ARGV.dup
+options = {
+  domain: '.',
+  username: '',
+  password: '',
+  smbv1: true,
+  smbv2: true,
+  smbv3: true,
+  target: nil,
+  pipename: nil
+}
+options[:pipename] = args.pop
+options[:target] = args.pop
+optparser = OptionParser.new do |opts|
+  opts.banner = "Usage: #{File.basename(__FILE__)} [options] target pipename"
+  opts.on("--[no-]smbv1", "Enable or disable SMBv1 (default: #{options[:smbv1] ? 'Enabled' : 'Disabled'})") do |smbv1|
+    options[:smbv1] = smbv1
+  end
+  opts.on("--[no-]smbv2", "Enable or disable SMBv2 (default: #{options[:smbv2] ? 'Enabled' : 'Disabled'})") do |smbv2|
+    options[:smbv2] = smbv2
+  end
+  opts.on("--[no-]smbv3", "Enable or disable SMBv3 (default: #{options[:smbv3] ? 'Enabled' : 'Disabled'})") do |smbv3|
+    options[:smbv3] = smbv3
+  end
+  opts.on("--username USERNAME", "The account's username (default: #{options[:username]})") do |username|
+    if username.include?('\\')
+      options[:domain], options[:username] = username.split('\\', 2)
+    else
+      options[:username] = username
+    end
+  end
+  opts.on("--password PASSWORD", "The account's password (default: #{options[:password]})") do |password|
+    options[:password] = password
+  end
+end
+optparser.parse!(args)
+
+if [options[:target], options[:pipename]].any? { |a| a == '-h' || a == '--help' }
+  puts optparser.help
+  exit
+end
+
+if options[:target].nil? || options[:pipename].nil?
+  abort(optparser.help)
+end
+
+address = options[:target]
+pipename = options[:pipename]
 
 sock = TCPSocket.new(address, 445)
 dispatcher = RubySMB::Dispatcher::Socket.new(sock)
 
-client = RubySMB::Client.new(dispatcher, smb1: smb_versions.include?('1'), smb2: smb_versions.include?('2'), smb3: smb_versions.include?('3'), username: username, password: password)
+client = RubySMB::Client.new(dispatcher, smb1: options[:smbv1], smb2: options[:smbv2], smb3: options[:smbv3], username: options[:username], password: options[:password], domain: options[:domain])
 smbver = client.negotiate
 
 if smbver == 'SMB1'

data/examples/query_service_status.rb

@@ -2,22 +2,66 @@
 
 # This example script is used for testing remote service status and start type query.
 # It will attempt to connect to a host and query the status and start type of the provided service.
-# Example usage: ruby query_service_status.rb 192.168.172.138 msfadmin msfadmin "RemoteRegistry"
+# Example usage: ruby query_service_status.rb --username msfadmin --password msfadmin 192.168.172.138 "RemoteRegistry"
 # This will try to connect to \\192.168.172.138 with the msfadmin:msfadmin credentialas and get the status and start type of the "RemoteRegistry" service.
 
 require 'bundler/setup'
+require 'optparse'
 require 'ruby_smb'
 
-address      = ARGV[0]
-username     = ARGV[1]
-password     = ARGV[2]
-service      = ARGV[3]
-smb_versions = ARGV[4]&.split(',') || ['1','2','3']
+args = ARGV.dup
+options = {
+  domain: '.',
+  username: '',
+  password: '',
+  smbv1: true,
+  smbv2: true,
+  smbv3: true,
+  target: nil,
+  service: nil
+}
+options[:service] = args.pop
+options[:target] = args.pop
+optparser = OptionParser.new do |opts|
+  opts.banner = "Usage: #{File.basename(__FILE__)} [options] target service"
+  opts.on("--[no-]smbv1", "Enable or disable SMBv1 (default: #{options[:smbv1] ? 'Enabled' : 'Disabled'})") do |smbv1|
+    options[:smbv1] = smbv1
+  end
+  opts.on("--[no-]smbv2", "Enable or disable SMBv2 (default: #{options[:smbv2] ? 'Enabled' : 'Disabled'})") do |smbv2|
+    options[:smbv2] = smbv2
+  end
+  opts.on("--[no-]smbv3", "Enable or disable SMBv3 (default: #{options[:smbv3] ? 'Enabled' : 'Disabled'})") do |smbv3|
+    options[:smbv3] = smbv3
+  end
+  opts.on("--username USERNAME", "The account's username (default: #{options[:username]})") do |username|
+    if username.include?('\\')
+      options[:domain], options[:username] = username.split('\\', 2)
+    else
+      options[:username] = username
+    end
+  end
+  opts.on("--password PASSWORD", "The account's password (default: #{options[:password]})") do |password|
+    options[:password] = password
+  end
+end
+optparser.parse!(args)
+
+if [options[:target], options[:service]].any? { |a| a == '-h' || a == '--help' }
+  puts optparser.help
+  exit
+end
+
+if options[:target].nil? || options[:service].nil?
+  abort(optparser.help)
+end
+
+address = options[:target]
+service = options[:service]
 
 sock = TCPSocket.new address, 445
 dispatcher = RubySMB::Dispatcher::Socket.new(sock, read_timeout: 60)
 
-client = RubySMB::Client.new(dispatcher, smb1: smb_versions.include?('1'), smb2: smb_versions.include?('2'), smb3: smb_versions.include?('3'), username: username, password: password)
+client = RubySMB::Client.new(dispatcher, smb1: options[:smbv1], smb2: options[:smbv2], smb3: options[:smbv3], username: options[:username], password: options[:password], domain: options[:domain])
 protocol = client.negotiate
 status = client.authenticate
 
@@ -99,4 +143,3 @@ if svcctl
   svcctl.close
 end
 client.disconnect!
-