msfrpc-client 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: eae20060bcf4dfb1bdbfa1fc3f530ed7a7421e8b
-  data.tar.gz: d07865830b68e642d3b4d90a3a91da825050eea7
+SHA256:
+  metadata.gz: a74d99283250678a38ed24fec054aa04eea762b29013ac9cbed948b6a3bcd057
+  data.tar.gz: cda8be470c197df8257a5c915909cc0982a7f3a176c6ce675fb73c5476f6ef02
 SHA512:
-  metadata.gz: af9827831127544c74d2ffdad8f2d7f5b3dda6e8f9ca42e0a2635d147b0ef886eb68ed188afde445ef3afa36d575256da07798c087470f7252f6efaa94e64a77
-  data.tar.gz: 9aa9459aab5fc8bdb85ef015641688f7f3b91c3c8383cc4ad50dc2000fb7420dc4a122b7da449594a804c62a6596e47d5e692c7d50d68d0288bf324462768090
+  metadata.gz: d980b0207db2824c10c44deb6ce9f7613b9dc3b344e66df0b9b04db64057849accac556f56bae38004e95676b457ec67b4d71be19685e59f706396a502772dcb
+  data.tar.gz: 21fd86631a416094c7260e03d370187b14ee1b64f29e4d0866f70693f053e618ae3f06245e8d8890f92ea344c8726bc1d008544ad88e59bcdf1d91f9a326ee55

data/.ruby-version

@@ -1 +1 @@
-2.4.1
+2.5.1

data/Gemfile.lock

@@ -1,48 +1,28 @@
 PATH
   remote: .
   specs:
-    msfrpc-client (1.1.1)
+    msfrpc-client (1.1.2)
       msgpack (~> 1)
-      rex (~> 2)
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.3)
-    filesize (0.1.1)
-    jsobfu (0.4.2)
-      rkelly-remix
-    json (2.1.0)
-    metasm (1.0.3)
-    mini_portile2 (2.2.0)
-    msgpack (1.1.0)
-    nokogiri (1.8.0)
-      mini_portile2 (~> 2.2.0)
-    rake (12.0.0)
-    rb-readline (0.5.4)
-    rex (2.0.11)
-      filesize
-      jsobfu (~> 0.4.1)
-      json
-      metasm (~> 1.0.2)
-      nokogiri
-      rb-readline
-      robots
-    rkelly-remix (0.0.7)
-    robots (0.10.1)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
+    msgpack (1.2.4)
+    rake (12.3.1)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
 
 PLATFORMS
   ruby
@@ -54,4 +34,4 @@ DEPENDENCIES
   rspec (~> 3)
 
 BUNDLED WITH
-   1.15.1
+   1.17.1

data/examples/msfrpc_irb.rb

@@ -3,8 +3,6 @@
 require 'rubygems'
 require 'optparse'
 require 'msfrpc-client'
-require 'rex/ui'
-
 
 # Use the RPC option parser to handle standard flags
 opts   = {}
@@ -23,4 +21,31 @@ if rpc.token
 end
 
 $stdout.puts "[*] Starting IRB shell..."
-Rex::Ui::Text::IrbShell.new(binding).run
+
+load('irb.rb')
+
+IRB.setup(nil)
+IRB.conf[:PROMPT_MODE]  = :SIMPLE
+
+# Create a new IRB instance
+irb = IRB::Irb.new(IRB::WorkSpace.new(binding))
+
+# Set the primary irb context so that exit and other intrinsic
+# commands will work.
+IRB.conf[:MAIN_CONTEXT] = irb.context
+
+# Trap interrupt
+old_sigint = trap("SIGINT") do
+  begin
+    irb.signal_handle
+  rescue RubyLex::TerminateLineInput
+    irb.eval_input
+  end
+end
+
+# Keep processing input until the cows come home...
+catch(:IRB_EXIT) do
+  irb.eval_input
+end
+
+trap("SIGINT", old_sigint)

data/lib/msfrpc-client/client.rb

@@ -1,5 +1,8 @@
 # -*- coding: binary -*-
 
+require 'net/http'
+require 'openssl'
+
 # MessagePack for data encoding (http://www.msgpack.org/)
 require 'msgpack'
 
@@ -9,10 +12,6 @@ require 'optparse'
 # Parse configuration file
 require 'yaml'
 
-# Rex library from the Metasploit Framework
-require 'rex'
-require 'rex/proto/http'
-
 # Constants used by this client
 require 'msfrpc-client/constants'
 
@@ -44,7 +43,6 @@ module Msf
           uri:   '/api/',
           ssl:   true,
           ssl_version: 'TLS1.2',
-          context: {}
         }.merge(info)
 
         self.token = self.info[:token]
@@ -126,8 +124,6 @@ module Msf
           else
             raise e
           end
-        ensure
-          @cli.close if @cli
         end
       end
 
@@ -135,9 +131,6 @@ module Msf
       #
       # @return [void]
       def close
-        if @cli && @cli.conn?
-          @cli.close
-        end
         @cli = nil
       end
 
@@ -253,28 +246,25 @@ module Msf
 
       def send_rpc_request(args)
         unless @cli
-          @cli = Rex::Proto::Http::Client.new(info[:host], info[:port], info[:context], info[:ssl], info[:ssl_version])
-          @cli.set_config(
-            vhost: info[:host],
-            agent: "Metasploit RPC Client/#{API_VERSION}",
-            read_max_data: 1024 * 1024 * 512
-          )
+          @cli = Net::HTTP.new(info[:host], info[:port])
+          @cli.use_ssl = info[:ssl]
+          @cli.verify_mode = OpenSSL::SSL::VERIFY_NONE
         end
 
-        req = @cli.request_cgi(
-          'method' => 'POST',
-          'uri'    => self.info[:uri],
-          'ctype'  => 'binary/message-pack',
-          'data'   => args.to_msgpack
+        req = Net::HTTP::Post.new(self.info[:uri], initheader = {
+          'User-Agent' => "Metasploit RPC Client/#{API_VERSION}",
+          'Content-Type' => 'binary/message-pack'
+          }
         )
+        req.body = args.to_msgpack
 
         begin
-          res = @cli.send_recv(req)
+          res = @cli.request(req)
         rescue => e
             raise Msf::RPC::ServerException.new(000, e.message, e.class)
         end
 
-        if res && [200, 401, 403, 500].include?(res.code)
+        if res && [200, 401, 403, 500].include?(res.code.to_i)
           resp = MessagePack.unpack(res.body)
 
           # Boolean true versus truthy check required here;

data/lib/msfrpc-client/version.rb

@@ -1,5 +1,5 @@
 module Msf
   module RPC
-    VERSION = "1.1.1"
+    VERSION = "1.1.2"
   end
 end

data/msfrpc-client.gemspec

@@ -26,7 +26,6 @@ Gem::Specification.new do |spec|
   spec.licenses      = ['BSD-2-Clause']
 
   spec.add_runtime_dependency 'msgpack', '~> 1'
-  spec.add_runtime_dependency 'rex', '~> 2'
 
   spec.add_development_dependency "bundler", '~> 1'
   spec.add_development_dependency "rake", '~> 12'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: msfrpc-client
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - HD Moore
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-03 00:00:00.000000000 Z
+date: 2018-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -25,20 +25,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
-- !ruby/object:Gem::Dependency
-  name: rex
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -129,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Ruby API for the Rapid7 Metasploit RPC service