Merge pull request #19 from BinyaminSharet/master

version 0.6.5

CHANGELOG

@@ -1,3 +1,13 @@
+Version 0.6.5 (2016-03-20)
+==========================
+* bugfix: [ClientFuzzer] Fixed off-by-one bug in the fuzzing index (start/end) of client fuzzer
+* bugfix: [ClientFuzzer] Protect from multiple calls to start (can now restart stack without restarting fuzzer)
+* bugfix: [ClientFuzzer] Fixed exception when there are no stage to log
+* new feature: [ClientFuzzer] Added requested stages (by the stack) to the report
+* new feature: [ClientFuzzer] Added API to check if client fuzzer is done fuzzing
+* new feature: [Remote] Added stop API for RPC server
+
+
 Version 0.6.4 (2016-03-13)
 ==========================
 * bugfix: [package] fixed package name in get_distribution calls

docs/source/conf.py

@@ -63,9 +63,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.4'
+version = '0.6.5'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.4'
+release = '0.6.5'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

kitty/fuzzers/client.py

@@ -49,6 +49,7 @@ def __init__(self, name='ClientFuzzer', logger=None, option_line=None):
         self._requested_stages = []
         self._report = None
         self._done_evt = Event()
+        self._started = False
 
     def _pre_test(self):
         self._requested_stages = []
@@ -93,6 +94,11 @@ def _do_trigger(self):
             self._done_evt.set()
             self._trigger_stop_evt.wait()
 
+    def start(self):
+        if not self._started:
+            self._started = True
+            super(ClientFuzzer, self).start()
+
     def _start(self):
         self._start_message()
         self.target.setup()
@@ -144,7 +150,11 @@ def _notify_mutated(self):
 
     def _get_report(self):
         base_report = super(ClientFuzzer, self)._get_report()
-        stages, payloads = zip(*self._requested_stages)
+        if len(self._requested_stages):
+            stages, payloads = zip(*self._requested_stages)
+        else:
+            stages = []
+            payloads = []
         self._report.add('stages', stages)
         self._report.add('payloads', [None if payload is None else hexlify(payload) for payload in payloads])
         base_report.add('fuzzer', self._report)

setup.py

@@ -7,7 +7,7 @@ def read(fname):
     return open(os.path.join(os.path.dirname(__file__), fname)).read()
 
 
-VERSION = '0.6.4'
+VERSION = '0.6.5'
 AUTHOR = 'Cisco SAS team'
 EMAIL = '[email protected]'
 URL = 'https://github.com/cisco-sas/kitty.git'
@@ -39,7 +39,7 @@ def read(fname):
         author_email=EMAIL,
         url=URL,
         packages=find_packages(),
-        install_requires=['docopt', 'bitstring', 'six', 'requests'],
+        install_requires=['docopt', 'bitstring!=3.1.4', 'six', 'requests'],
         keywords='fuzz framework sulley kitty',
         entry_points={
             'console_scripts': [