Updates

Author: brandonprry

ch12_automating_clamav/ch12_automating_clamav_filesystem.csproj

@@ -16,9 +16,9 @@
     <DefineConstants>DEBUG;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Externalconsole>true</Externalconsole>
     <PlatformTarget>x64</PlatformTarget>
-    <Commandlineparameters>/Users/bperry/eicar</Commandlineparameters>
+    <Commandlineparameters>/Users/bperry/eicar.com.txt</Commandlineparameters>
+    <ConsolePause>false</ConsolePause>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <Optimize>true</Optimize>
@@ -34,7 +34,6 @@
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="clam-sharp\ClamBindings.cs" />
-    <Compile Include="clam-sharp\ClamCountSigsOptions.cs" />
     <Compile Include="clam-sharp\ClamEngine.cs" />
     <Compile Include="clam-sharp\ClamEngineOptions.cs" />
     <Compile Include="clam-sharp\ClamResult.cs" />

ch12_automating_clamav/clam-sharp/ClamBindings.cs

@@ -5,7 +5,7 @@ namespace ch13_automating_clamav_filesystem
 {
 	public static class ClamBindings
 	{
-		const string _clamLibPath = "/Users/bperry/Downloads/clamav-0.98.7/libclamav/.libs/libclamav.6.dylib";
+		const string _clamLibPath = "/Users/bperry/tmp/clamav-0.99/libclamav/.libs/libclamav.7.dylib";
 
 		[DllImport(_clamLibPath)]
 		public extern static ClamReturnCode cl_init(uint options);

ch12_automating_clamav/clam-sharp/ClamCountSigsOptions.cs

@@ -30,12 +30,7 @@ public ClamEngine ()
 				throw new Exception("Expected CL_SUCCESS, got " + ret);
 		}
 
-		public ClamResult ScanFile(string filepath)
-		{
-			return this.ScanFile(filepath, (uint)ClamScanOptions.CL_SCAN_STDOPT);
-		}
-
-		public ClamResult ScanFile(string filepath, uint options)
+		public ClamResult ScanFile(string filepath, uint options = (uint)ClamScanOptions.CL_SCAN_STDOPT)
 		{
 			ulong scanned = 0;
 			IntPtr vname = (IntPtr)null;

ch12_automating_clamav/clam-sharp/ClamEngine.cs

@@ -7,13 +7,11 @@ class MainClass
 	{
 		public static void Main (string[] args)
 		{
-			ClamdSession session = new ClamdSession ("192.168.0.25", 3310);
+			ClamdSession session = new ClamdSession ("127.0.0.1", 3310);
+			ClamdManager manager = new ClamdManager (session);
 
-			using (ClamdManager manager = new ClamdManager(session))
-			{
-				Console.WriteLine(manager.GetVersion());
-				Console.WriteLine(manager.ScanWithArchiveSupport("/home/bperry/tmp"));
-			}
+			Console.WriteLine(manager.GetVersion());
+			Console.WriteLine(manager.Scan("/Users/bperry/eicar.com.txt"));
 		}
 	}
 }

ch12_automating_clamav_clamd/Program.cs

@@ -2,7 +2,7 @@
 
 namespace clamdsharp
 {
-	public class ClamdManager : IDisposable
+	public class ClamdManager
 	{
 		private ClamdSession _session = null;
 
@@ -16,49 +16,10 @@ public string GetVersion ()
 			return _session.Execute("VERSION");
 		}
 
-		public string GetStatistics ()
-		{
-			return _session.Execute("STATS");
-		}
-
-		public string Ping()
-		{
-			return _session.Execute("PING");
-		}
-
-		public string ScanWithArchiveSupport (string path)
+		public string Scan (string path)
 		{
 			return _session.Execute("SCAN " + path);
 		}
-
-		public string ScanWithoutArchiveSupport (string path)
-		{
-			return _session.Execute("RAWSCAN " + path);
-		}
-
-		public void Shutdown ()
-		{
-			_session.Execute("SHUTDOWN");
-		}
-
-		public string ReloadDatabase ()
-		{
-			return _session.Execute("RELOAD");
-		}
-
-		public string ContinuousScanWithArchiveSupport (string path)
-		{
-			return _session.Execute("CONTSCAN " + path);
-		}
-
-		public string MultithreadScan (string path)
-		{
-			return _session.Execute("MULTISCAN " + path);
-		}
-
-		public void Dispose() {
-			_session = null;
-		}
 	}
 }
 

ch12_automating_clamav_clamd/clamd-sharp/ClamdManager.cs

@@ -13,7 +13,7 @@ public static void Main (string[] args)
 			int listenPort = 4444;
 			string payload = "cmd/unix/reverse";
 
-			using (MetasploitSession session = new MetasploitSession ("username", "password", "http://"+listenAddr+":55553/api")) {
+			using (MetasploitSession session = new MetasploitSession ("admin", "admin", "http://"+listenAddr+":55553/api")) {
 				if (string.IsNullOrEmpty (session.Token))
 					throw new Exception ("Login failed. Check credentials");
 				using (MetasploitManager manager = new MetasploitManager (session)) {

ch13_automating_metasploit/Program.cs

@@ -9,27 +9,25 @@ class MainClass
 	{
 		public static void Main (string[] args)
 		{
-			using (ArachniHTTPSession session = new ArachniHTTPSession ("127.0.0.1", 7331)) {
-				using (ArachniHTTPManager manager = new ArachniHTTPManager (session)) {
+			ArachniHTTPSession session = new ArachniHTTPSession ("127.0.0.1", 7331); 
+			ArachniHTTPManager manager = new ArachniHTTPManager (session); 
 
-					JObject scanOptions = new JObject ();
-					scanOptions ["checks"] = new JArray() { "xss*", "sql*" } ;
-					scanOptions ["audit"] = new JObject ();
-					scanOptions ["audit"]["elements"] = new JArray() { "links", "forms" };
+			JObject scanOptions = new JObject ();
+			scanOptions ["checks"] = new JArray() { "xss*", "sql*" } ;
+			scanOptions ["audit"] = new JObject ();
+			scanOptions ["audit"]["elements"] = new JArray() { "links", "forms" };
 
-					JObject scanId = manager.StartScan ("http://demo.testfire.net/default.aspx", scanOptions);
-					Guid id = Guid.Parse(scanId ["id"].ToString ());
-					JObject scan = manager.GetScanStatus (id);
+			JObject scanId = manager.StartScan ("http://demo.testfire.net/default.aspx", scanOptions);
+			Guid id = Guid.Parse(scanId ["id"].ToString ());
+			JObject scan = manager.GetScanStatus (id);
 
-					while (scan ["status"].ToString() != "done") {
-						Console.WriteLine ("Sleeping");
-						System.Threading.Thread.Sleep (100);
-						scan = manager.GetScanStatus (id);
-					}
-
-					Console.WriteLine (scan.ToString ());
-				}
+			while (scan ["status"].ToString() != "done") {
+				Console.WriteLine ("Sleeping");
+				System.Threading.Thread.Sleep (100);
+				scan = manager.GetScanStatus (id);
 			}
+
+			Console.WriteLine (scan.ToString ());
 		}
 	}
 }

ch14_automating_arachni/Program.cs

@@ -19,9 +19,9 @@ static void Main(string[] args)
 			if (os.Platform == PlatformID.Win32Windows 
 				|| os.Platform == PlatformID.Win32NT) {
 
-				MessageBox (IntPtr.Zero, "Text", "Caption", 0);
+				MessageBox (IntPtr.Zero, "Hello world!", "Hello world!", 0);
 			} else {
-				printf ("linux");
+				printf ("Hello world!");
 			}
 		}
 	}