evil-winrm 2.3 → 2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9756b40d33ba7ca3e6f2b2de7f73de80d42f7371ba1d563d76ead318c9c319d
-  data.tar.gz: fe143029ca1f6619ff27bacc1b8cb233657d6633b6097ec638feb54f4a7e1580
+  metadata.gz: 8ad89cb0e9f8954bb567652c0ac9efaf25adf2df59207ff517c1328c13176c76
+  data.tar.gz: c5bb1cbea2d39ebc04101dbe5b6b3467fc16356e5f5c8bf9be7a1a256d6612c7
 SHA512:
-  metadata.gz: 4ef15f9432b90621af898e153ad6d2a07d1442ff0873f29346704a7e9b04038a40039c69ca50f8a2cb70cb997b6ff050d912f88a9cc82facef3a35f4b001872b
-  data.tar.gz: 652a48c26bdfff0a22e055aced0ed674968e860b6d9c65697855075ca810f6513536c729fb29ccdf0eb40cf06bc078fe3e5050ad9397741a0cb2fe282cd2e8ef
+  metadata.gz: 83787fb7677f6c73423929449fd4728c81254fb6613391374540354ba6c369aaf968cba56d99dca82308f60855cfeb8a9c6ddf7a5fc166b1347e4fbb2c5a4399
+  data.tar.gz: 35ab318b763a7bff03b4c711bffec6b636ebfbd3ca5238a7e273a8528ad8049d6ff70fd562c7e3dc40bf3033c7e307d388d69b55daa5b02eaee0822a77ccc531

data/lib/evil-winrm.rb

@@ -17,7 +17,7 @@ require 'time'
 # Constants
 
 # Version
-VERSION = '2.3'
+VERSION = '2.4'
 
 # Msg types
 TYPE_INFO = 0
@@ -46,6 +46,7 @@ $port = "5985"
 $user = ""
 $password = ""
 $url = "wsman"
+$default_service = "HTTP"
 
 # Redefine download method from winrm-fs
 module WinRM
@@ -85,9 +86,9 @@ class EvilWinRM
 
     # Arguments
     def arguments()
-        options = { port:$port, url:$url }
+        options = { port:$port, url:$url, service:$service }
         optparse = OptionParser.new do |opts|
-            opts.banner = "Usage: evil-winrm -i IP -u USER [-s SCRIPTS_PATH] [-e EXES_PATH] [-P PORT] [-p PASS] [-H HASH] [-U URL] [-S] [-c PUBLIC_KEY_PATH ] [-k PRIVATE_KEY_PATH ] [-r REALM]"
+            opts.banner = "Usage: evil-winrm -i IP -u USER [-s SCRIPTS_PATH] [-e EXES_PATH] [-P PORT] [-p PASS] [-H HASH] [-U URL] [-S] [-c PUBLIC_KEY_PATH ] [-k PRIVATE_KEY_PATH ] [-r REALM] [--spn SPN_PREFIX]"
             opts.on("-S", "--ssl", "Enable ssl") do |val|
                 $ssl = true
                 options[:port] = "5986"
@@ -96,10 +97,11 @@ class EvilWinRM
             opts.on("-k", "--priv-key PRIVATE_KEY_PATH", "Local path to private key certificate") { |val| options[:priv_key] = val }
             opts.on("-r", "--realm DOMAIN", "Kerberos auth, it has to be set also in /etc/krb5.conf file using this format -> CONTOSO.COM = { kdc = fooserver.contoso.com }") { |val| options[:realm] = val.upcase }
             opts.on("-s", "--scripts PS_SCRIPTS_PATH", "Powershell scripts local path") { |val| options[:scripts] = val }
+            opts.on("--spn SPN_PREFIX", "SPN prefix for Kerberos auth (default HTTP)") { |val| options[:service] = val }
             opts.on("-e", "--executables EXES_PATH", "C# executables local path") { |val| options[:executables] = val }
             opts.on("-i", "--ip IP", "Remote host IP or hostname. FQDN for Kerberos auth (required)") { |val| options[:ip] = val }
             opts.on("-U", "--url URL", "Remote url endpoint (default /wsman)") { |val| options[:url] = val }
-            opts.on("-u", "--user USER", "Username (required)") { |val| options[:user] = val }
+            opts.on("-u", "--user USER", "Username (required if not using kerberos)") { |val| options[:user] = val }
             opts.on("-p", "--password PASS", "Password") { |val| options[:password] = val }
             opts.on("-H", "--hash HASH", "NTHash") do |val|
                 if !options[:password].nil? and !val.nil?
@@ -163,6 +165,12 @@ class EvilWinRM
         $pub_key = options[:pub_key]
         $priv_key = options[:priv_key]
         $realm = options[:realm]
+        $service = options[:service]
+        if !$realm.nil? then
+            if $service.nil? then
+                $service = $default_service
+            end
+        end
     end
 
     # Print script header
@@ -200,7 +208,8 @@ class EvilWinRM
                 user: "",
                 password: "",
                 transport: :kerberos,
-                realm: $realm
+                realm: $realm,
+                service: $service
             )
         else
             $conn = WinRM::Connection.new(
@@ -225,7 +234,7 @@ class EvilWinRM
     def colorize(text, color = "default")
         colors = {"default" => "38", "blue" => "34", "red" => "31", "yellow" => "1;33", "magenta" => "35"}
         color_code = colors[color]
-        return "\033[0;#{color_code}m#{text}\033[0m"
+        return "\001\033[0;#{color_code}m\002#{text}\001\033[0m\002"
     end
 
     # Messsage printing
@@ -393,6 +402,10 @@ class EvilWinRM
             self.print_message("Password is not needed for Kerberos auth. Ticket will be used", TYPE_WARNING)
         end
 
+        if $realm.nil? and !$service.nil? then
+            self.print_message("Useless spn provided, only used for Kerberos auth", TYPE_WARNING)
+        end
+
         if !$scripts_path.nil? then
             self.check_directories($scripts_path, "scripts")
             functions = self.read_scripts($scripts_path)
@@ -412,7 +425,7 @@ class EvilWinRM
               when Readline.line_buffer =~ /help.*/i
                 puts("#{$LIST.join("\t")}")
               when Readline.line_buffer =~ /\[.*/i
-                $LISTASSEM.grep( /^#{Regexp.escape(str)}/i ) unless str.nil?              
+                $LISTASSEM.grep( /^#{Regexp.escape(str)}/i ) unless str.nil?
               when Readline.line_buffer =~ /Invoke-Binary.*/i
                 executables.grep( /^#{Regexp.escape(str)}/i ) unless str.nil?
               when Readline.line_buffer =~ /donutfile.*/i
@@ -590,6 +603,10 @@ class EvilWinRM
                             STDERR.print(stderr)
                         end
                     end
+                rescue Errno::EACCES => ex
+                    puts()
+                    self.print_message("An error of type #{ex.class} happened, message is #{ex.message}", TYPE_ERROR)
+                    retry
                 rescue Interrupt
                     puts("\n\n")
                     self.print_message("Press \"y\" to exit, press any other key to continue", TYPE_WARNING)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evil-winrm
 version: !ruby/object:Gem::Version
-  version: '2.3'
+  version: '2.4'
 platform: ruby
 authors:
 - CyberVaca
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-07 00:00:00.000000000 Z
+date: 2021-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: winrm
@@ -75,15 +75,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.2.5
 signing_key: 
 specification_version: 4
 summary: Evil-WinRM