updates

Author: brandonprry

ch13_automating_metasploit/MetasploitSession.cs

@@ -2,13 +2,8 @@
 using System.Collections.Generic;
 using System.Net;
 using System.IO;
-using System.Net.Sockets;
 using MsgPack.Serialization;
 using MsgPack;
-using System.Collections.Specialized;
-using System.Text;
-using System.Collections;
-using System.ComponentModel;
 
 namespace ch13_automating_metasploit
 {

ch3_soap_fuzzer/Main.cs

@@ -24,7 +24,9 @@ public static void Main (string[] args)
 			HttpWebRequest req = (HttpWebRequest)WebRequest.Create (_endpoint + "?WSDL");
 			XmlDocument wsdlDoc = new XmlDocument ();
 
-			wsdlDoc.Load (req.GetResponse ().GetResponseStream ());
+			using (WebResponse resp = req.GetResponse())
+			using (Stream respStream = resp.GetResponseStream())
+				wsdlDoc.Load(respStream);
 
 			_wsdl = new WSDL (wsdlDoc);
 
@@ -90,7 +92,7 @@ static void FuzzSoapPort (SoapBinding binding)
 				}
 
 
-				XDocument soapDoc = new XDocument (new XDeclaration ("1.0", "utf-16", "true"),
+				XDocument soapDoc = new XDocument (new XDeclaration ("1.0", "ascii", "true"),
 					                    new XElement (soapNS + "Envelope",
 						                    new XAttribute (XNamespace.Xmlns + "soap", soapNS),
 						                    new XAttribute ("xmlns", xmlNS),
@@ -105,7 +107,9 @@ static void FuzzSoapPort (SoapBinding binding)
 					req.Method = "POST";
 					req.ContentType = "text/xml";
 					req.ContentLength = data.Length;
-					req.GetRequestStream ().Write (data, 0, data.Length);
+
+					using (Stream stream = req.GetRequestStream())
+						stream.Write (data, 0, data.Length);
 
 					string resp = string.Empty;
 					try {

ch3_soap_fuzzer/SoapMessagePart.cs

@@ -12,8 +12,10 @@ public SoapMessagePart (XmlNode part)
 
 			if (part.Attributes["element"] != null)
 				this.Element = part.Attributes["element"].Value;
-			else 
+			else if (part.Attributes["type"] != null)
 				this.Type = part.Attributes["type"].Value;
+			else
+				throw new ArgumentException("Neither element nor type attribute exist", nameof(part));
 		}
 
 		public string Name { get; set; }