evil-winrm 1.7 → 1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f22e20993055841458471a741888586cbd11292d6bb09134c06980374cf58b78
-  data.tar.gz: b6cea6df136cad02f441fa50e4d674cdb3deb0a8c8a8789173af362be12fefe3
+  metadata.gz: d0b098dfe30ffa9ff59a66cbb864ab9afb87b5210f67dc995ca7812ea376f401
+  data.tar.gz: 467111a369daeb2ee03af500e8688c3f48578c5fa5f43a3ef59e8c86ec802b8e
 SHA512:
-  metadata.gz: c48390b7d71e1e0a752f2a7067b45a0faf88edaa088e46aff9456a27fe45c01e0cb9aad21c0b0f2fb7aaa558b6d45568d23b4b9a6ea1ad9d51da4b6f83f088bb
-  data.tar.gz: e1a1363651f5446381cefef5429b23bb211efa01b5065a4470c4a390c1ba1ae93a815aebddbe93a5136f96dfcdd0126ff1ea7e057e0c59ca8072629a78f884de
+  metadata.gz: 02335e0cc9402ca597d28291a1d73d55dd37791c194d5a61bf51211613eb1f0758ba41e1e5626b169b7977526e8a0f21c1d271345ae38609e887aa6b474a3e8a
+  data.tar.gz: 21b63b0cc7be7c325c05a73f55f1f800039cef7569dead55ab7122a1809b544610c50075636a83ff23ae814d00f5b461a7c8b21dd36eb261c85132b0c5e95072

data/lib/evil-winrm.rb

@@ -17,7 +17,7 @@ require 'io/console'
 # Constants
 
 # Version
-VERSION = '1.7'
+VERSION = '1.8'
 
 # Msg types
 TYPE_INFO = 0
@@ -55,7 +55,7 @@ class EvilWinRM
     def arguments()
         options = { port:$port, url:$url }
         optparse = OptionParser.new do |opts|
-            opts.banner = "Usage: evil-winrm -i IP -u USER [-s SCRIPTS_PATH] [-e EXES_PATH] [-P PORT] [-p PASS] [-U URL] [-S] [-c PUBLIC_KEY_PATH ] [-k PRIVATE_KEY_PATH ]"
+            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 ]"
             opts.on("-S", "--ssl", "Enable ssl") do |val|
                 $ssl = true
                 options[:port] = "5986"
@@ -68,17 +68,29 @@ class EvilWinRM
             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("-p", "--password PASS", "Password") { |val| options[:password] = val }
+            opts.on("-H", "--hash HASH", "NTLM hash") do |val|
+                if options[:password] != nil and val != nil
+                    self.print_header()
+                    self.print_message("You must choose either password or hash auth. Both at the same time are not allowed", TYPE_ERROR)
+                    self.custom_exit(1, false)
+                end
+                if !val.match /^[a-fA-F0-9]{32}$/
+                    self.print_header()
+                    self.print_message("Invalid hash format", TYPE_ERROR)
+                    self.custom_exit(1, false)
+                end
+                options[:password] = "00000000000000000000000000000000:" + val
+            end
             opts.on("-P", "--port PORT", "Remote host port (default 5985)") { |val| options[:port] = val }
             opts.on("-V", "--version", "Show version") do |val|
                 puts("v" + VERSION)
-                custom_exit(0, false)
+                self.custom_exit(0, false)
             end
             opts.on('-h', '--help', 'Display this help message') do
-                puts()
-                self.print_message("Evil-WinRM shell v" + VERSION, TYPE_INFO, false)
+                self.print_header()
                 puts(opts)
                 puts()
-                custom_exit(0, false)
+                self.custom_exit(0, false)
             end
         end
 
@@ -90,8 +102,7 @@ class EvilWinRM
                 raise OptionParser::MissingArgument.new(missing.join(', '))
             end
         rescue OptionParser::InvalidOption, OptionParser::MissingArgument
-            puts()
-            self.print_message("Evil-WinRM shell v" + VERSION, TYPE_INFO, false)
+            self.print_header()
             self.print_message($!.to_s, TYPE_ERROR)
             puts(optparse)
             puts()
@@ -112,6 +123,12 @@ class EvilWinRM
         $priv_key = options[:priv_key]
     end
 
+    # Print script header
+    def print_header()
+         puts()
+         self.print_message("Evil-WinRM shell v" + VERSION, TYPE_INFO, false)
+     end
+
     # Generate connection object
     def connection_initialization()
         if $ssl then
@@ -277,8 +294,7 @@ class EvilWinRM
         self.arguments()
         self.connection_initialization()
         file_manager = WinRM::FS::FileManager.new($conn)
-        puts()
-        self.print_message("Starting Evil-WinRM shell v" + VERSION, TYPE_INFO)
+        self.print_header()
 
         if !$ssl and ($pub_key or $priv_key) then
             self.print_message("Useless cert/s provided, SSL is not enabled", TYPE_WARNING)
@@ -394,7 +410,7 @@ class EvilWinRM
                             end
                             print(output.output)
                         rescue
-                            self.print_message("Check file names", TYPE_ERROR)
+                            self.print_message("Check filenames", TYPE_ERROR)
                         end
 
                     elsif command.start_with?('Donut-Loader') then
@@ -412,7 +428,7 @@ class EvilWinRM
                             end
                             print(output.output)
                         rescue
-                            self.print_message("Check file names", TYPE_ERROR)
+                            self.print_message("Check filenames", TYPE_ERROR)
                         end
 
                     elsif command.start_with?('services') then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evil-winrm
 version: !ruby/object:Gem::Version
-  version: '1.7'
+  version: '1.8'
 platform: ruby
 authors:
 - CyberVaca
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-30 00:00:00.000000000 Z
+date: 2019-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: winrm