Merge remote-tracking branch 'origin/master'

micromax · Sep 21, 2016 · 9ab5b17 · 9ab5b17
2 parents 3549bb3 + 224099a
commit 9ab5b17
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/chaos_monkey/exploit/rdpgrinder.py b/chaos_monkey/exploit/rdpgrinder.py
@@ -140,13 +140,19 @@ def _keysSender(self):
                 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):
         self.success = len(self._keys) == 0
         self.closed = True
 
     def onSessionReady(self):
+        LOG.debug("Logged in, session is ready for work")
         self._last_update = time.time()
         self._keys_thread.start()
 

diff --git a/chaos_monkey/requirements.txt b/chaos_monkey/requirements.txt
@@ -12,5 +12,4 @@ psutil
 PyInstaller
 ecdsa
 netifaces
-requests
-grequests
+grequests