Merge remote-tracking branch 'origin/master'

chaos_monkey/exploit/rdpgrinder.py

@@ -140,6 +140,11 @@ class KeyPressRDPClient(rdp.RDPClientObserver):
                 time.sleep(KEYS_SENDER_SLEEP)
 
     def onReady(self):
+        time.sleep(1)
+        reactor.callFromThread(self._controller.sendKeyEventUnicode, ord('Y'), True)
+        time.sleep(1)
+        reactor.callFromThread(self._controller.sendKeyEventUnicode, ord('Y'), False)
+        time.sleep(1)
         pass
 
     def onClose(self):
@@ -147,6 +152,7 @@ class KeyPressRDPClient(rdp.RDPClientObserver):
         self.closed = True
 
     def onSessionReady(self):
+        LOG.debug("Logged in, session is ready for work")
         self._last_update = time.time()
         self._keys_thread.start()
 

chaos_monkey/requirements.txt

@@ -12,5 +12,4 @@ psutil
 PyInstaller
 ecdsa
 netifaces
-requests
-grequests
+grequests