Merge pull request #43 from stephenegriffin/fixparser

IamWenboZhang · web-flow · commit 1cd6f84aa535 · 2019-07-24T11:25:53.000+08:00
MAPIInspector.Partial Throws when VirtualID not present
diff --git a/MAPIInspector/Source/MAPIInspector.cs b/MAPIInspector/Source/MAPIInspector.cs
@@ -403,8 +403,8 @@ public static uint ParseResponseMessageSimplely(Session currentSession, int outp
             if (IsMapihttpSession(currentSession, TrafficDirection.Out))
             {
                 byte[] bytesForHexView;
-                object mapiResponse;                
-                mapiResponse = ParseHTTPExecuteResponsePayload(currentSession.ResponseHeaders, currentSession, currentSession.responseBodyBytes, TrafficDirection.Out, out bytesForHexView);                              
+                object mapiResponse;
+                mapiResponse = ParseHTTPExecuteResponsePayload(currentSession.ResponseHeaders, currentSession, currentSession.responseBodyBytes, TrafficDirection.Out, out bytesForHexView);
                 int rgbOutputBufferCount = (mapiResponse as ExecuteResponseBody).RopBuffer.RgbOutputBuffers.Length;
 
                 for (int i = 0; i < rgbOutputBufferCount; i++)
@@ -464,13 +464,13 @@ public static object ParseHTTPExecuteResponsePayload(HTTPHeaders headers, Sessio
             {
                 if (direction == TrafficDirection.Out && MapiInspector.MAPIInspector.IsFromFiddlerCore(currentSession))
                 {
-                    if(currentSession["Transfer-Encoding"] != null && currentSession["Transfer-Encoding"] == "chunked")
+                    if (currentSession["Transfer-Encoding"] != null && currentSession["Transfer-Encoding"] == "chunked")
                     {
                         bytesFromHTTP = Utilities.GetPaylodFromChunkedBody(bytesFromHTTP);
                         bytes = bytesFromHTTP;
                     }
                 }
-                else if(direction == TrafficDirection.Out && headers.Exists("Transfer-Encoding") && headers["Transfer-Encoding"] == "chunked")
+                else if (direction == TrafficDirection.Out && headers.Exists("Transfer-Encoding") && headers["Transfer-Encoding"] == "chunked")
                 {
                     bytesFromHTTP = Utilities.GetPaylodFromChunkedBody(bytesFromHTTP);
                     bytes = bytesFromHTTP;
@@ -529,9 +529,9 @@ public static bool IsMapihttpSession(Session currentSession, TrafficDirection di
                         }
                     }
                 }
-                else if(direction == TrafficDirection.Out && currentSession["X-ResponseCode"] != null)
+                else if (direction == TrafficDirection.Out && currentSession["X-ResponseCode"] != null)
                 {
-                    string responseCode = currentSession["X-ResponseCode"];            
+                    string responseCode = currentSession["X-ResponseCode"];
                     if (responseCode == "0")
                     {
                         return currentSession["Content-Type"] != null && currentSession["Content-Type"] == "application/mapi-http";
@@ -540,7 +540,7 @@ public static bool IsMapihttpSession(Session currentSession, TrafficDirection di
                     {
                         return currentSession["Content-Type"] != null && currentSession["Content-Type"] == "text/html";
                     }
-                }             
+                }
             }
 
             return false;
@@ -1054,7 +1054,7 @@ public void HandleContextInformation(ushort sourceRopID, out object obj, out byt
                     }
                     else
                     {
-                        currentSession = AllSessions[Convert.ToInt32(thisSession["Number"]) - 1];          
+                        currentSession = AllSessions[Convert.ToInt32(thisSession["Number"]) - 1];
                         if (MapiInspector.MAPIInspector.IsFromFiddlerCore(currentSession))
                         {
                             currentSessionID = int.Parse(currentSession["VirtualID"]);
@@ -1353,7 +1353,7 @@ public object Partial(RopIdType ropID, uint parameters, out byte[] bytes)
             if (MapiInspector.MAPIInspector.IsFromFiddlerCore(thisSession))
             {
                 thisSessionID = int.Parse(thisSession["VirtualID"]);
-            }     
+            }
 
             if (ropID == RopIdType.RopFastTransferSourceGetBuffer)
             {
@@ -1467,7 +1467,8 @@ public object Partial(RopIdType ropID, uint parameters, out byte[] bytes)
                         }
 
                         currentSession = AllSessions[Convert.ToInt32(currentSession["Number"]) + 1];
-                        if (currentSessionID == currentSession.id || currentSessionID == int.Parse(currentSession["VirtualID"])) break;
+                        if (currentSessionID == currentSession.id ||
+                            (currentSession["VirtualID"] != null && currentSessionID == int.Parse(currentSession["VirtualID"]))) break;
                         if (MapiInspector.MAPIInspector.IsFromFiddlerCore(currentSession))
                         {
                             currentSessionID = int.Parse(currentSession["VirtualID"]);
@@ -1533,7 +1534,7 @@ public object Partial(RopIdType ropID, uint parameters, out byte[] bytes)
                     if (MapiInspector.MAPIInspector.IsFromFiddlerCore(currentSession))
                     {
                         currentSessionID = int.Parse(currentSession["VirtualID"]);
-                    }        
+                    }
                     if (ropID == RopIdType.RopFastTransferDestinationPutBuffer)
                     {
                         int sessionPutContextCount = HandleWithSessionPutContextInformation.Count;
@@ -1787,7 +1788,7 @@ public object ParseResponseMessage(Session currentSession, out byte[] hexViewByt
         {
             object mapiResponse = null;
             hexViewBytes = new byte[0];
-            if(!MapiInspector.MAPIInspector.IsFromFiddlerCore(currentSession))
+            if (!MapiInspector.MAPIInspector.IsFromFiddlerCore(currentSession))
             {
                 if (IsMapihttpSession(currentSession, TrafficDirection.Out) && currentSession.ResponseHeaders["X-ResponseCode"] == "0")
                 {
@@ -1869,7 +1870,7 @@ public object ParseResponseMessage(Session currentSession, out byte[] hexViewByt
                     }
                 }
             }
-            
+
 
             if (isLooper)
             {
@@ -1942,7 +1943,7 @@ public object ParseHTTPPayload(HTTPHeaders headers, Session currentSession, byte
                         bytes = bytesFromHTTP;
                     }
                 }
-                else if (direction == TrafficDirection.Out && headers.Exists("Transfer-Encoding") && headers["Transfer-Encoding"] == "chunked") 
+                else if (direction == TrafficDirection.Out && headers.Exists("Transfer-Encoding") && headers["Transfer-Encoding"] == "chunked")
                 {
                     bytesFromHTTP = Utilities.GetPaylodFromChunkedBody(bytesFromHTTP);
                     bytes = bytesFromHTTP;
@@ -2507,7 +2508,7 @@ private void UpdateView()
                 Session session0 = new Session(new byte[0], new byte[0]);
                 Session[] sessionsInFiddler = FiddlerApplication.UI.GetAllSessions();
                 allSessionsList.AddRange(sessionsInFiddler);
-                FiddlerApplication.OnLoadSAZ += this.AfterCallDoImport;              
+                FiddlerApplication.OnLoadSAZ += this.AfterCallDoImport;
                 allSessionsList.Sort(delegate (Session p1, Session p2)
                 {
                     return p1.id.CompareTo(p2.id);
@@ -2540,7 +2541,7 @@ private void UpdateView()
 
                     this.DisplayObject(parserResult, bytesForHexView);
                 }
-                catch(Exception e)
+                catch (Exception e)
                 {
                     parserResult = e.ToString();
                 }
@@ -2567,7 +2568,7 @@ private void UpdateView()
         public static bool IsFromFiddlerCore(Session session)
         {
             bool result = false;
-            if(session.id == 0)
+            if (session.id == 0)
             {
                 result = true;
             }

Original file line number	Diff line number	Diff line change
`@@ -403,8 +403,8 @@ public static uint ParseResponseMessageSimplely(Session currentSession, int outp`
`403`	`403`	`if (IsMapihttpSession(currentSession, TrafficDirection.Out))`
`404`	`404`	`{`
`405`	`405`	`byte[] bytesForHexView;`
`406`		`- object mapiResponse;`
`407`		`- mapiResponse = ParseHTTPExecuteResponsePayload(currentSession.ResponseHeaders, currentSession, currentSession.responseBodyBytes, TrafficDirection.Out, out bytesForHexView);`
	`406`	`+ object mapiResponse;`
	`407`	`+ mapiResponse = ParseHTTPExecuteResponsePayload(currentSession.ResponseHeaders, currentSession, currentSession.responseBodyBytes, TrafficDirection.Out, out bytesForHexView);`
`408`	`408`	`int rgbOutputBufferCount = (mapiResponse as ExecuteResponseBody).RopBuffer.RgbOutputBuffers.Length;`
`409`	`409`
`410`	`410`	`for (int i = 0; i < rgbOutputBufferCount; i++)`
`@@ -464,13 +464,13 @@ public static object ParseHTTPExecuteResponsePayload(HTTPHeaders headers, Sessio`
`464`	`464`	`{`
`465`	`465`	`if (direction == TrafficDirection.Out && MapiInspector.MAPIInspector.IsFromFiddlerCore(currentSession))`
`466`	`466`	`{`
`467`		`- if(currentSession["Transfer-Encoding"] != null && currentSession["Transfer-Encoding"] == "chunked")`
	`467`	`+ if (currentSession["Transfer-Encoding"] != null && currentSession["Transfer-Encoding"] == "chunked")`
`468`	`468`	`{`
`469`	`469`	`bytesFromHTTP = Utilities.GetPaylodFromChunkedBody(bytesFromHTTP);`
`470`	`470`	`bytes = bytesFromHTTP;`
`471`	`471`	`}`
`472`	`472`	`}`
`473`		`- else if(direction == TrafficDirection.Out && headers.Exists("Transfer-Encoding") && headers["Transfer-Encoding"] == "chunked")`
	`473`	`+ else if (direction == TrafficDirection.Out && headers.Exists("Transfer-Encoding") && headers["Transfer-Encoding"] == "chunked")`
`474`	`474`	`{`
`475`	`475`	`bytesFromHTTP = Utilities.GetPaylodFromChunkedBody(bytesFromHTTP);`
`476`	`476`	`bytes = bytesFromHTTP;`
`@@ -529,9 +529,9 @@ public static bool IsMapihttpSession(Session currentSession, TrafficDirection di`
`529`	`529`	`}`
`530`	`530`	`}`
`531`	`531`	`}`
`532`		`- else if(direction == TrafficDirection.Out && currentSession["X-ResponseCode"] != null)`
	`532`	`+ else if (direction == TrafficDirection.Out && currentSession["X-ResponseCode"] != null)`
`533`	`533`	`{`
`534`		`- string responseCode = currentSession["X-ResponseCode"];`
	`534`	`+ string responseCode = currentSession["X-ResponseCode"];`
`535`	`535`	`if (responseCode == "0")`
`536`	`536`	`{`
`537`	`537`	`return currentSession["Content-Type"] != null && currentSession["Content-Type"] == "application/mapi-http";`
`@@ -540,7 +540,7 @@ public static bool IsMapihttpSession(Session currentSession, TrafficDirection di`
`540`	`540`	`{`
`541`	`541`	`return currentSession["Content-Type"] != null && currentSession["Content-Type"] == "text/html";`
`542`	`542`	`}`
`543`		`- }`
	`543`	`+ }`
`544`	`544`	`}`
`545`	`545`
`546`	`546`	`return false;`
`@@ -1054,7 +1054,7 @@ public void HandleContextInformation(ushort sourceRopID, out object obj, out byt`
`1054`	`1054`	`}`
`1055`	`1055`	`else`
`1056`	`1056`	`{`
`1057`		`- currentSession = AllSessions[Convert.ToInt32(thisSession["Number"]) - 1];`
	`1057`	`+ currentSession = AllSessions[Convert.ToInt32(thisSession["Number"]) - 1];`
`1058`	`1058`	`if (MapiInspector.MAPIInspector.IsFromFiddlerCore(currentSession))`
`1059`	`1059`	`{`
`1060`	`1060`	`currentSessionID = int.Parse(currentSession["VirtualID"]);`
`@@ -1353,7 +1353,7 @@ public object Partial(RopIdType ropID, uint parameters, out byte[] bytes)`
`1353`	`1353`	`if (MapiInspector.MAPIInspector.IsFromFiddlerCore(thisSession))`
`1354`	`1354`	`{`
`1355`	`1355`	`thisSessionID = int.Parse(thisSession["VirtualID"]);`
`1356`		`- }`
	`1356`	`+ }`
`1357`	`1357`
`1358`	`1358`	`if (ropID == RopIdType.RopFastTransferSourceGetBuffer)`
`1359`	`1359`	`{`
`@@ -1467,7 +1467,8 @@ public object Partial(RopIdType ropID, uint parameters, out byte[] bytes)`
`1467`	`1467`	`}`
`1468`	`1468`
`1469`	`1469`	`currentSession = AllSessions[Convert.ToInt32(currentSession["Number"]) + 1];`
`1470`		`- if (currentSessionID == currentSession.id \|\| currentSessionID == int.Parse(currentSession["VirtualID"])) break;`
	`1470`	`+ if (currentSessionID == currentSession.id \|\|`
	`1471`	`+ (currentSession["VirtualID"] != null && currentSessionID == int.Parse(currentSession["VirtualID"]))) break;`
`1471`	`1472`	`if (MapiInspector.MAPIInspector.IsFromFiddlerCore(currentSession))`
`1472`	`1473`	`{`
`1473`	`1474`	`currentSessionID = int.Parse(currentSession["VirtualID"]);`
`@@ -1533,7 +1534,7 @@ public object Partial(RopIdType ropID, uint parameters, out byte[] bytes)`
`1533`	`1534`	`if (MapiInspector.MAPIInspector.IsFromFiddlerCore(currentSession))`
`1534`	`1535`	`{`
`1535`	`1536`	`currentSessionID = int.Parse(currentSession["VirtualID"]);`
`1536`		`- }`
	`1537`	`+ }`
`1537`	`1538`	`if (ropID == RopIdType.RopFastTransferDestinationPutBuffer)`
`1538`	`1539`	`{`
`1539`	`1540`	`int sessionPutContextCount = HandleWithSessionPutContextInformation.Count;`
`@@ -1787,7 +1788,7 @@ public object ParseResponseMessage(Session currentSession, out byte[] hexViewByt`
`1787`	`1788`	`{`
`1788`	`1789`	`object mapiResponse = null;`
`1789`	`1790`	`hexViewBytes = new byte[0];`
`1790`		`- if(!MapiInspector.MAPIInspector.IsFromFiddlerCore(currentSession))`
	`1791`	`+ if (!MapiInspector.MAPIInspector.IsFromFiddlerCore(currentSession))`
`1791`	`1792`	`{`
`1792`	`1793`	`if (IsMapihttpSession(currentSession, TrafficDirection.Out) && currentSession.ResponseHeaders["X-ResponseCode"] == "0")`
`1793`	`1794`	`{`
`@@ -1869,7 +1870,7 @@ public object ParseResponseMessage(Session currentSession, out byte[] hexViewByt`
`1869`	`1870`	`}`
`1870`	`1871`	`}`
`1871`	`1872`	`}`
`1872`		`-`
	`1873`	`+`
`1873`	`1874`
`1874`	`1875`	`if (isLooper)`
`1875`	`1876`	`{`
`@@ -1942,7 +1943,7 @@ public object ParseHTTPPayload(HTTPHeaders headers, Session currentSession, byte`
`1942`	`1943`	`bytes = bytesFromHTTP;`
`1943`	`1944`	`}`
`1944`	`1945`	`}`
`1945`		`- else if (direction == TrafficDirection.Out && headers.Exists("Transfer-Encoding") && headers["Transfer-Encoding"] == "chunked")`
	`1946`	`+ else if (direction == TrafficDirection.Out && headers.Exists("Transfer-Encoding") && headers["Transfer-Encoding"] == "chunked")`
`1946`	`1947`	`{`
`1947`	`1948`	`bytesFromHTTP = Utilities.GetPaylodFromChunkedBody(bytesFromHTTP);`
`1948`	`1949`	`bytes = bytesFromHTTP;`
`@@ -2507,7 +2508,7 @@ private void UpdateView()`
`2507`	`2508`	`Session session0 = new Session(new byte[0], new byte[0]);`
`2508`	`2509`	`Session[] sessionsInFiddler = FiddlerApplication.UI.GetAllSessions();`
`2509`	`2510`	`allSessionsList.AddRange(sessionsInFiddler);`
`2510`		`- FiddlerApplication.OnLoadSAZ += this.AfterCallDoImport;`
	`2511`	`+ FiddlerApplication.OnLoadSAZ += this.AfterCallDoImport;`
`2511`	`2512`	`allSessionsList.Sort(delegate (Session p1, Session p2)`
`2512`	`2513`	`{`
`2513`	`2514`	`return p1.id.CompareTo(p2.id);`
`@@ -2540,7 +2541,7 @@ private void UpdateView()`
`2540`	`2541`
`2541`	`2542`	`this.DisplayObject(parserResult, bytesForHexView);`
`2542`	`2543`	`}`
`2543`		`- catch(Exception e)`
	`2544`	`+ catch (Exception e)`
`2544`	`2545`	`{`
`2545`	`2546`	`parserResult = e.ToString();`
`2546`	`2547`	`}`
`@@ -2567,7 +2568,7 @@ private void UpdateView()`
`2567`	`2568`	`public static bool IsFromFiddlerCore(Session session)`
`2568`	`2569`	`{`
`2569`	`2570`	`bool result = false;`
`2570`		`- if(session.id == 0)`
	`2571`	`+ if (session.id == 0)`
`2571`	`2572`	`{`
`2572`	`2573`	`result = true;`
`2573`	`2574`	`}`