From d0de490ef1ced7597471c1867d30213b162a7e89 Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Sun, 2 Nov 2014 18:04:57 +1300
Subject: [PATCH] Release prep: binaries build script, release checklist,
 fuzzing

---
 release/osx-binaries                  |  3 ++-
 release/release-checklist             |  4 ++++
 test/fuzzing/.env                     |  2 +-
 test/fuzzing/straight_stream          |  6 +++---
 test/fuzzing/straight_stream_patterns | 12 +++++++++++-
 test/fuzzing/straight_stream_ssl      |  6 ++++++
 6 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 test/fuzzing/straight_stream_ssl

diff --git a/release/osx-binaries b/release/osx-binaries
index 4be85800e..9945e471b 100755
--- a/release/osx-binaries
+++ b/release/osx-binaries
@@ -10,7 +10,8 @@
 # answer is to touch the __init__.py file in the zope directory. On my system:
 #   touch /Library/Python/2.7/site-packages/zope/__init__.py
 
-# To run, change into the pyinstaller directory, and then run this script.
+# To run, first install netlib and mitmproxy, then change into the pyinstaller
+# directory, and then run this script.
 
 DST=/tmp/osx-mitmproxy
 MITMPROXY=~/mitmproxy/mitmproxy
diff --git a/release/release-checklist b/release/release-checklist
index d0bf8aad4..683e9b895 100644
--- a/release/release-checklist
+++ b/release/release-checklist
@@ -26,3 +26,7 @@
     - tar -xzvf pkgfile.tgz
     - virtualenv venv
 
+- Build the OSX binaries
+    - Follow instructions in osxbinaries
+
+
diff --git a/test/fuzzing/.env b/test/fuzzing/.env
index e2cf7829e..82ae6a8d2 100644
--- a/test/fuzzing/.env
+++ b/test/fuzzing/.env
@@ -2,5 +2,5 @@
 MITMDUMP=../../mitmdump
 PATHOD=../../../pathod/pathod
 PATHOC=../../../pathod/pathoc
-FUZZ_SETTINGS=-remTt 1 -n 0 -I 200,400,405,502 
+FUZZ_SETTINGS=-remTt 1 -n 0 
 
diff --git a/test/fuzzing/straight_stream b/test/fuzzing/straight_stream
index 99af212ff..41e2a6e16 100644
--- a/test/fuzzing/straight_stream
+++ b/test/fuzzing/straight_stream
@@ -1,6 +1,6 @@
 
-mitmdump: $MITMDUMP -q --stream 1 
-pathod: $PATHOD -q
+mitmdump: $MITMDUMP 
+pathod: $PATHOD
 pathoc: sleep 2 && $PATHOC $FUZZ_SETTINGS  localhost:8080  ./straight_stream_patterns
-#pathoc: sleep 2 && $PATHOC $FUZZ_SETTINGS  localhost:8080  /tmp/err
+#pathoc: sleep 2 && $PATHOC localhost:8080  /tmp/err
 
diff --git a/test/fuzzing/straight_stream_patterns b/test/fuzzing/straight_stream_patterns
index 591bf20de..93a066e6e 100644
--- a/test/fuzzing/straight_stream_patterns
+++ b/test/fuzzing/straight_stream_patterns
@@ -4,4 +4,14 @@ get:'http://localhost:9999/p/':s'200:b"foo"':ir,'9'
 get:'http://localhost:9999/p/':s'200:b"foo"':ir,':'
 get:'http://localhost:9999/p/':s'200:b"foo"':ir,'"'
 get:'http://localhost:9999/p/':s'200:b"foo"':ir,'-'
-get:'http://localhost:9999/p/':s'200:b"foo"':dr
+
+get:'http://localhost:9999/p/':s'200:b"foo":ir,"\n"'
+get:'http://localhost:9999/p/':s'200:b"foo":ir,"a"'
+get:'http://localhost:9999/p/':s'200:b"foo":ir,"9"'
+get:'http://localhost:9999/p/':s'200:b"foo":ir,":"'
+get:'http://localhost:9999/p/':s"200:b'foo':ir,'\"'"
+get:'http://localhost:9999/p/':s'200:b"foo":ir,"-"'
+get:'http://localhost:9999/p/':s'200:b"foo":dr'
+
+get:'http://localhost:9999/p/':s'200:b"foo"':ir,@2
+get:'http://localhost:9999/p/':s'200:b"foo":ir,@2'
diff --git a/test/fuzzing/straight_stream_ssl b/test/fuzzing/straight_stream_ssl
new file mode 100644
index 000000000..708ff0b3d
--- /dev/null
+++ b/test/fuzzing/straight_stream_ssl
@@ -0,0 +1,6 @@
+
+mitmdump: $MITMDUMP -q --stream 1 
+pathod: $PATHOD
+pathoc: sleep 2 && $PATHOC $FUZZ_SETTINGS  localhost:8080  ./straight_stream_patterns
+#pathoc: sleep 2 && $PATHOC localhost:8080  /tmp/err
+