Some cat.net fixes

Added couple jni4net extension methods

Author: DinisCruz

3rdParty/Jni4Net/API_Jni4Net.cs

@@ -2,7 +2,7 @@ Bridge.CreateJVM(new BridgeSetup(){Verbose=true}); //only needs to be called onc
 
 var topPanel = "PoC - Jni4Net - Classes, Methods, Fields in target".popupWindow(1000,400);
 //var topPanel = panel.add_Panel(true);
- 
+  
 var actionPanel = topPanel.insert_ActionPanel();
 var decompileClasses = false;
 //var treeView = topPanel.insert_Left().add_TreeView_with_PropertyGrid().sort();
@@ -15,9 +15,9 @@ actionPanel.add_Link("REPL selectedNode", ()=> treeView.selected().Tag.script_Me
 
 treeView.java_SetTreeView_To_Show_Jni4Net_Reflection_Data();
 
-var jni4Net_Active = new API_Jni4Net_Active();
+var jni4Net = new API_Jni4Net();
 
-var classes = jni4Net_Active.java_From_ClassLoader_get_Loaded_Classes();
+var classes = jni4Net.java_From_ClassLoader_get_Loaded_Classes();
 
 Action<string> showClasses = 
 	(filter)=>{										
@@ -83,5 +83,5 @@ return "done";
 //using net.sf.jni4net.adaptors
 //O2Ref:Jni4Net/lib/jni4net.n-0.8.6.0.dll
 
-//O2File:API_Jni4Net_Active.cs
+//O2File:API_Jni4Net.cs
 //O2File:API_Jad.cs

3rdParty/Jni4Net/API_Jni4Net_Active.cs

@@ -1,6 +1,4 @@
-<?xml version="1.0"?>
-<H2>
-  <SourceCode>//Environment.setEnvironmentVariable("JAVA_HOME", @"C:\Program Files\Java\jre7");
+//Environment.setEnvironmentVariable("JAVA_HOME", @"C:\Program Files\Java\jre7");
 O2Setup.extractEmbededConfigZips();
 var topPanel = "PoC - Jni4Net - List JavaProperties: {0}".format(clr.details()).popupWindow().insert_LogViewer();
 var tableList = topPanel.clear().add_TableList("Java Properties").add_Columns("Key", "Value");
@@ -28,11 +26,8 @@ return "ok";
 //using java.lang;
 //using java.util;
 //using net.sf.jni4net;
-//using net.sf.jni4net.adaptors;
+//using net.sf.jni4net.adaptors;
 //O2Ref:Jni4Net/lib/jni4net.n-0.8.6.0.dll
 //_O2Ref:E:\_Code_Tests\Jni4Net\jni4net-read-only\target\jni4net-0.8.7.0-bin\lib\jni4net.n-0.8.7.0.dll
 //O2File:API_ConsoleOut.cs
-//O2EmbedTool:Jni4Net
-</SourceCode>
-  <ReferencedAssemblies />
-</H2>
+//O2EmbedTool:Jni4Net

3rdParty/Jni4Net/PoC - Jni4Net - Classes, Methods, Fields in target.h2

@@ -1,6 +1,4 @@
-<?xml version="1.0"?>
-<H2>
-  <SourceCode>//Package - Roslyn Cat.Net- Compile and Scan Solution.h2
+//Package - Roslyn Cat.Net- Compile and Scan Solution.h2
 
 //var topPanel = "{name}".popupWindow(700,400);
 var scriptFile = "Util - Roslyn Cat.Net- Compile and Scan Solution.h2"; 
@@ -9,8 +7,8 @@ var pathToAssemblies = "";
 var projectFile = "";
 var compiledScript = ""; 
 
-Action&lt;List&lt;string&gt;&gt; beforeAddingReferences =  
-	(referencesToAdd)=&gt; {   
+Action<List<string>> beforeAddingReferences =  
+	(referencesToAdd)=> {   
 							foreach(var file in referencesToAdd.toList())
 								if(file.fileName_Is("O2_External_SharpDevelop.dll","Ionic.Zip.dll", "Mono.Cecil.dll","QuickGraph.dll",
 													"Microsoft.ACESec.CATNet.Core.dll","WeifenLuo.WinFormsUI.Docking.dll"
@@ -24,8 +22,8 @@ Action&lt;List&lt;string&gt;&gt; beforeAddingReferences =
 							referencesToAdd.add("Roslyn.Services.CSharp.dll".assembly_Location());
 							"[in beforeAddingReferences] assembly references: {0}".debug(referencesToAdd.asString());
 					 	};
-Action&lt;List&lt;string&gt;&gt; beforeEmbedingFiles = 
-	(filesToEmbed)=&gt;{ 						
+Action<List<string>> beforeEmbedingFiles = 
+	(filesToEmbed)=>{ 						
 						"[in beforeEmbedingFiles] assembly references: {0}".debug(filesToEmbed.asString());								
 					};					
 
@@ -41,6 +39,4 @@ createdExe.file_Copy(testFolder);
 testFolder.startProcess(); 
 
 //O2File:API_MicrosoftBuild.cs
-//O2File:_Extra_methods_To_Add_to_Main_CodeBase.cs</SourceCode>
-  <ReferencedAssemblies />
-</H2>
+//O2File:_Extra_methods_To_Add_to_Main_CodeBase.cs

3rdParty/Jni4Net/PoC - Jni4Net - List JavaProperties.h2

@@ -1,6 +1,4 @@
-<?xml version="1.0"?>
-<H2>
-  <SourceCode> //var topPanel = panel.clear().add_Panel();
+ //var topPanel = panel.clear().add_Panel();
 var topPanel = "PoC - RealTime code scanning using Cat.NET and Roslyn".popupWindow(1000,500).insert_LogViewer();
 
 API_CatNet_Deployment.ensure_CatNet_Instalation();
@@ -11,7 +9,7 @@ var resultText = codeEditor.insert_Right("Errors and CatNet report file").add_Te
 var findingsViewer = resultText.parent().parent().insert_Above("CatNet Vulnerabilities").add_FindingsViewer(false);		 					    
 
 codeEditor.onTextChange(
-	(text)=&gt;{ 
+	(text)=>{ 
 				var compilation = text.tree()
 				   					  .compiler("test_Assembly_".add_RandomLetters())
 				   					  .add_Reference("mscorlib")
@@ -28,7 +26,7 @@ codeEditor.onTextChange(
 				{							 			
 					resultText.set_Text("");	 
 					O2Thread.mtaThread(
-						()=&gt;{								 								
+						()=>{								 								
 								var reportFile = "_catNet_reports__".tempDir(false)
 															      .pathCombine("report.xml");
 
@@ -89,5 +87,3 @@ codeEditor.set_Text(code, ".cs");
 //O2Ref:Roslyn.Compilers.CSharp.dll
 
 //O2Tag_DontAddExtraO2Files
-</SourceCode>
-</H2>

3rdParty/Microsoft/CatNet/AndRolsyn/Package - Roslyn Cat.Net- Compile and Scan Solution.h2

@@ -1,8 +1,6 @@
-<?xml version="1.0"?>
-<H2>
-  <SourceCode>try
-{
-
+try
+{
+
 O2Setup.extractEmbededConfigZips();
 var topPanel = "Tool - Simple Cat.NET Scan Gui v1.1".popupWindow(700,400)
 					.set_Form_Icon("cheshire_cat.ico".local()); 
@@ -12,11 +10,11 @@ var codeViewer = topPanel.insert_Below("Scan results").add_SourceCodeViewer();
 
 API_CatNet_Deployment.ensure_CatNet_Instalation();
 
-Action&lt;string&gt; scanFile = 
-	(target)=&gt;{
+Action<string> scanFile = 
+	(target)=>{
 				if (target.extension(".cs"))
 					target = target.compileScriptFile(true).location();					
-				if (target.valid() &amp;&amp; target.fileExists())
+				if (target.valid() && target.fileExists())
 				{
 					"Scanning with Cat.NET: {0}".debug(target);
 					var catNet = new API_CatNet().loadRules();
@@ -29,32 +27,30 @@ Action&lt;string&gt; scanFile =
 
 
 Action askUserForAssemblyToScan = 
-	()=&gt;{
+	()=>{
 			scanFile(topPanel.askUserForFileToOpen());						
 		};
 Action scanTestFile = 
-	()=&gt; scanFile("Web_SQL_Injection.cs".local());		
+	()=> scanFile("Web_SQL_Injection.cs".local());		
 logViewer.onDrop(scanFile);		
 
 topPanel.mainMenu().clear()
 		.add_Menu("File")
 			.add_MenuItem("Open Assembly to Scan", askUserForAssemblyToScan)
 		.add_Menu("Debug")
-			.add_MenuItem("Scan Test File "		, ()=&gt;scanTestFile())
-			.add_MenuItem("Scan HacmeBank .NET"	, ()=&gt;scanFile("DotNetGoat.dll".local()))
-			.add_MenuItem("Open REPL Script"	, ()=&gt;topPanel.parentForm().script_Me());
+			.add_MenuItem("Scan Test File "		, ()=>scanTestFile())
+			.add_MenuItem("Scan HacmeBank .NET"	, ()=>scanFile("DotNetGoat.dll".local()))
+			.add_MenuItem("Open REPL Script"	, ()=>topPanel.parentForm().script_Me());
 
 scanTestFile();
-}
-catch(Exception ex)
-{
-	ex.log("in script body");
+}
+catch(Exception ex)
+{
+	ex.log("in script body");
 }
 
 //O2File:API_CatNet.cs
 //O2Package:Web_SQL_Injection.cs
 //O2Package:DotNetGoat.dll
 //O2Package:cheshire_cat.ico
-//O2Embed:E:\TeamMentor\TM_UnitTests\StandAlone_Exes_Packages\CatNet_Files.zip</SourceCode>
-  <ReferencedAssemblies />
-</H2>
+//O2Embed:E:\TeamMentor\TM_UnitTests\StandAlone_Exes_Packages\CatNet_Files.zip