Small changes

Author: xistence

modules/exploits/unix/x11/x11_keyboard_exec.rb

@@ -169,7 +169,7 @@ def press_key(key)
     res = sock.get_once
 
     # Response should give 1 on first byte (Success)
-    unless res and res[0,1] == "\x01"
+    unless res && res[0,1] == "\x01"
       fail_with(Failure::Unknown, "#{rhost}:#{rport} - Error pressing key: #{key} #{res.inspect}")
     end
 
@@ -208,7 +208,7 @@ def release_key(key)
     res = sock.get_once
 
     # Response should give 1 on first byte (Success)
-    unless res and res[0,1] == "\x01"
+    unless res && res[0,1] == "\x01"
       fail_with(Failure::Unknown, "#{rhost}:#{rport} - Error releasing key: #{key} #{res.inspect}")
     end
 
@@ -276,7 +276,7 @@ def exploit
       res = send_msg(sock,req)
 
       # Response should give 0x01 in first byte (Success)
-      unless res and res[0,1] == "\x01"
+      unless res && res[0,1] == "\x01"
         fail_with(Failure::Unknown, "#{rhost}:#{rport} - X11 initial communication failed")
       end
 
@@ -294,7 +294,7 @@ def exploit
       res = send_msg(sock,req)
 
       # Response should give 0x01 in first byte (Success)
-      if res and res[0,1] == "\x01"
+      if res && res[0,1] == "\x01"
         @xkeyboard_opcode = res[9,1] # Retrieve the XKEYBOARD opcode
       else
         #puts res.inspect
@@ -312,7 +312,7 @@ def exploit
       # Retrieve the whole X11 details response
       res = send_msg(sock,req)
 
-      unless res and res[0,1] == "\x01"
+      unless res && res[0,1] == "\x01"
         fail_with(Failure::Unknown, "#{rhost}:#{rport} - X11 Request XKEYBOARD (opcode 136) failed -")
       end
 
@@ -329,7 +329,7 @@ def exploit
       res = send_msg(sock,req)
 
       # Response should give 0x01 in first byte (Success)
-      unless res and res[0,1] == "\x01"
+      unless res && res[0,1] == "\x01"
         fail_with(Failure::Unknown, "#{rhost}:#{rport} - X11 Request QueryExtension (opcode 98) XInputExtension failed")
       end
 
@@ -346,7 +346,7 @@ def exploit
       res = send_msg(sock,req)
 
       # Response should give 0x01 in first byte (Success)
-      if res and res[0,1] == "\x01"
+      if res && res[0,1] == "\x01"
         @xtest_opcode = res[9,1] # Retrieve the XTEST opcode
       else
         fail_with(Failure::Unknown, "#{rhost}:#{rport} - X11 Request QueryExtension (opcode 98) XTEST failed")
@@ -365,7 +365,7 @@ def exploit
       res = send_msg(sock,req)
 
       # Response should give 0x01 in first byte (Success)
-      if res and res[0,1] == "\x01"
+      if res && res[0,1] == "\x01"
         @genericevent_opcode = res[9,1] # Retrieve the Generic Event Extension opcode
       else
         fail_with(Failure::Unknown, "#{rhost}:#{rport} - X11 Request QueryExtension (opcode 98) Generic Event Extension failed")
@@ -383,7 +383,7 @@ def exploit
       res = send_msg(sock,req)
 
       # Response should give 0x01 in first byte (Success)
-      unless res and res[0,1] == "\x01"
+      unless res && res[0,1] == "\x01"
         fail_with(Failure::Unknown, "#{rhost}:#{rport} - X11 Request XKEYBOARD failed")
       end
 
@@ -399,7 +399,7 @@ def exploit
       res = send_msg(sock,req)
 
       # Response should give 0x01 in first byte (Success)
-      unless res and res[0,1] == "\x01"
+      unless res && res[0,1] == "\x01"
         fail_with(Failure::Unknown, "#{rhost}:#{rport} - X11 Request XTEST failed")
       end
 
@@ -415,7 +415,7 @@ def exploit
       res = send_msg(sock,req)
 
       # Response should give 0x01 in first byte (Success)
-      unless res and res[0,1] == "\x01"
+      unless res && res[0,1] == "\x01"
         fail_with(Failure::Unknown, "#{rhost}:#{rport} - X11 Request GetKeyboardMapping (opcode 101) failed")
       end
 
@@ -448,7 +448,7 @@ def exploit
       res = send_msg(sock,req)
 
       # Response should give 0x01 in first byte (Success)
-      unless res and res[0,1] == "\x01"
+      unless res && res[0,1] == "\x01"
         fail_with(Failure::Unknown, "#{rhost}:#{rport} - X11 Request XKEYBOARD failed")
       end
 
@@ -462,7 +462,7 @@ def exploit
 
       # Wait X seconds to open the dialog
       print_status("#{rhost}:#{rport} - Waiting #{datastore['TIME_WAIT']} seconds...")
-      select(nil, nil, nil, datastore['TIME_WAIT'])
+      Rex.sleep(datastore['TIME_WAIT'])
 
       if datastore['TARGET'] == 0
         # Start a xterm terminal
@@ -476,7 +476,7 @@ def exploit
 
       print_status("#{rhost}:#{rport} - Waiting #{datastore['TIME_WAIT']} seconds...")
       # Wait X seconds to open the terminal
-      select(nil, nil, nil, datastore['TIME_WAIT'])
+      Rex.sleep(datastore['TIME_WAIT'])
 
       # "Type" our payload and execute it
       print_status("#{rhost}:#{rport} - Typing and executing payload")