Substantially rewrite AMF decoding.

This is tricky, but we should now handle a lot more corner-cases.

4 files changed, 22 insertions, 9 deletions

diff --git a/test/data/test.amf b/test/data/amf01
index c8fc261d..c8fc261d 100644
--- a/test/data/test.amf
+++ b/test/data/amf01
diff --git a/test/data/amf02 b/test/data/amf02
new file mode 100644
index 00000000..ba69f130
--- /dev/null
+++ b/test/data/amf02
diff --git a/test/data/amf03 b/test/data/amf03
new file mode 100644
index 00000000..d9fa736a
--- /dev/null
+++ b/test/data/amf03
diff --git a/test/test_console_contentview.py b/test/test_console_contentview.py
index 4ebef95b..8a5dabb8 100644
--- a/test/test_console_contentview.py
+++ b/test/test_console_contentview.py
@@ -3,6 +3,12 @@ import libmproxy.console.contentview as cv
 from libmproxy import utils, flow, encoding
 import tutils
 
+try:
+    import pyamf
+except ImportError:
+    pyamf = None
+
+
 class TestContentView:
     def test_trailer(self):
         txt = []
@@ -119,15 +125,6 @@ class TestContentView:
 
         assert not v([], "flibble", sys.maxint)
 
-    def test_view_amf(self):
-        try:
-            import pyamf
-            v = cv.ViewAMF()
-            p = tutils.test_data.path("data/test.amf")
-            assert v([], file(p).read(), sys.maxint)
-        except ImportError:
-            pass
-
     def test_view_multipart(self):
         view = cv.ViewMultipart()
         v = """
@@ -220,5 +217,21 @@ Larry
         assert "Raw" in r[0]
 
 
+if pyamf:
+    def test_view_amf_request():
+        v = cv.ViewAMF()
+
+        p = tutils.test_data.path("data/amf01")
+        assert v([], file(p).read(), sys.maxint)
+
+        p = tutils.test_data.path("data/amf02")
+        assert v([], file(p).read(), sys.maxint)
+
+    def test_view_amf_response():
+        v = cv.ViewAMF()
+        p = tutils.test_data.path("data/amf03")
+        assert v([], file(p).read(), sys.maxint)
+
+
 def test_get_by_shortcut():
     assert cv.get_by_shortcut("h")