Skip to content

Commit 759e473

Browse files
DinisCruzDinisCruz
committed
minor changes
1 parent e2cc5fb commit 759e473

23 files changed

+157
-578
lines changed

‎3rdParty/Armorize/API_Armorize.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
using O2.Views.ASCX.ExtensionMethods;
1515
using O2.XRules.Database.Utils;
1616

17-
//O2Ref:O2_Misc_Microsoft_MPL_Libs.dll
17+
1818

1919
namespace O2.XRules.Database.APIs
2020
{

‎3rdParty/Clojure/Util - Clojure-clr REPL (Lisp).h2‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
<?xml version="1.0"?>
2-
<H2>
3-
<SourceCode>O2ConfigSettings.O2Version = "Closure_v2.0";
4-
O2Setup.extractEmbededConfigZips();
1+
O2ConfigSettings.O2Version = "Closure_v2.0";
2+
O2Setup.extractEmbededConfigZips();
53

64

75
//open.logViewer();
@@ -10,6 +8,4 @@ new API_Clojure().openO2ReplInClojureFolder();
108
//O2File:API_Clojure.cs
119

1210
//O2EmbedTool:Clojure
13-
//O2Package:Clojure-icon.png,Launch Clojure REPL.h2,API_Clojure.cs</SourceCode>
14-
<ReferencedAssemblies />
15-
</H2>
11+
//O2Package:Clojure-icon.png,Launch Clojure REPL.h2,API_Clojure.cs

‎3rdParty/Fortify/API_Fortify_1_6.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
using O2.XRules.Database.Utils;
1111
using xmlns.www.fortifysoftware.com.schema.fvdl;
1212
//O2File:Fortify.fvdl.1.6.xsd.cs
13-
//O2Ref:O2_Misc_Microsoft_MPL_Libs.dll
1413

1514
namespace O2.XRules.Database.APIs
1615
{

‎3rdParty/Fortify/Util - FVDL viewer.h2‎

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
<?xml version="1.0"?>
2-
<H2>
3-
<SourceCode>//var topPanel = panel.clear().add_Panel();
1+
//var topPanel = panel.clear().add_Panel();
42
var topPanel = "Util - FVDL viewer (drop *.fvdl on the left-hand-side PropertyGrid)".popupWindow(1000,500);
53
topPanel.insert_LogViewer();
64
//var actionsPanel = topPanel.insert_Above(40,"actions");
@@ -23,14 +21,14 @@ var propertyGrid = topPanel.insert_Left().add_PropertyGrid();
2321
Fortify_Scan fortifyScan = null;
2422
var apiFortify = new API_Fortify();
2523

26-
Action&lt;string&gt; showUserMessage =
27-
(message)=&gt; {
24+
Action<string> showUserMessage =
25+
(message)=> {
2826
// userMessages_Label.set_Text(message);
2927
message.info();
3028
};
3129

32-
Action&lt;Fortify_Scan&gt; showFvdl =
33-
(scan) =&gt;
30+
Action<Fortify_Scan> showFvdl =
31+
(scan) =>
3432
{
3533
vulnerabilities_Table.title("Showing {0} Vulnerabilties".format(scan.Vulnerabilities.size()))
3634
.show(scan.Vulnerabilities);
@@ -43,13 +41,13 @@ Action&lt;Fortify_Scan&gt; showFvdl =
4341
vulnerabilities_Table.show(scan.Vulnerabilities);
4442
snippets_Table.show(scan.Snippets);
4543
// traceNodes_Table.show((from vulnerability in scan.Vulnerabilities
46-
// select vulnerability.Traces).SelectMany(p=&gt;p).toList());
44+
// select vulnerability.Traces).SelectMany(p=>p).toList());
4745
};
4846

49-
Action&lt;string&gt; loadAndShowFile =
50-
(file)=&gt;{
47+
Action<string> loadAndShowFile =
48+
(file)=>{
5149
showUserMessage("... loading file: {0}".format(file.fileName()));
52-
O2Thread.mtaThread(()=&gt;{
50+
O2Thread.mtaThread(()=>{
5351
fortifyScan = apiFortify.convertToFortifyScan(file);
5452
showFvdl(fortifyScan);
5553
propertyGrid.show(fortifyScan);
@@ -68,12 +66,9 @@ propertyGrid.onDrop(loadAndShowFile);
6866
//var _fortifyScan = apiFortify.convertToFortifyScan(testFile);
6967
// return _fortifyScan._fvdl.ProgramData.CalledWithNoDef.str();
7068

71-
//actionsPanel.add_Link("show Fvdl details" ,0 ,0 , ()=&gt; fortifyScan._fvdl.details());
69+
//actionsPanel.add_Link("show Fvdl details" ,0 ,0 , ()=> fortifyScan._fvdl.details());
7270
//tabControl.selectedIndex(7);
7371

7472
return "done";
7573

76-
//O2File:API_Fortify_1_6.cs
77-
//O2Ref:O2_Misc_Microsoft_MPL_Libs.dll </SourceCode>
78-
<ReferencedAssemblies />
79-
</H2>
74+
//O2File:API_Fortify_1_6.cs

‎3rdParty/HawkEye/Util - Find WinForms Control and REPL it.h2‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
<?xml version="1.0"?>
2-
<H2>
3-
<SourceCode>new API_HawkEye().openControlFinder();
1+
new API_HawkEye().openControlFinder();
42

5-
//O2File:API_HawkEye.cs</SourceCode>
6-
<ReferencedAssemblies />
7-
</H2>
3+
//O2File:API_HawkEye.cs

‎3rdParty/Jni4Net/API_Jni4Net.cs‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,14 @@ public static class API_Jni4Net_Active_ExtensionMethods_JVM
3636

3737
public static API_Jni4Net setUpBride(this API_Jni4Net jni4Net)
3838
{
39-
jni4Net.bridgeSetup = new BridgeSetup(){ Verbose=true };
39+
return jni4Net.setUpBride(new BridgeSetup(){ Verbose=true });
40+
}
41+
public static API_Jni4Net setUpBride(this API_Jni4Net jni4Net, BridgeSetup _bridgeSetup)
42+
{
43+
jni4Net.bridgeSetup = _bridgeSetup;
4044
try
41-
{
45+
{
46+
4247
Bridge.CreateJVM(jni4Net.bridgeSetup);
4348
jni4Net.jniEnv = JNIEnv.ThreadEnv;
4449
return jni4Net;

‎3rdParty/NMap/NMap_CmdLine_Installer.cs‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
using System;
2+
using System.Diagnostics;
3+
using O2.Kernel;
4+
using O2.Kernel.ExtensionMethods;
5+
using O2.DotNetWrappers.ExtensionMethods;
6+
//O2File:Tool_API.cs
7+
using O2.XRules.Database.Utils;
8+
9+
namespace O2.XRules.Database.APIs
10+
{
11+
public class Install_Test
12+
{
13+
public void test()
14+
{
15+
new NMap_CmdLine().start();
16+
}
17+
}
18+
public class NMap_CmdLine : Tool_API
19+
{
20+
21+
public NMap_CmdLine()
22+
{
23+
config( "NMap_CmdLine",
24+
"http://nmap.org/dist/nmap-6.25-win32.zip".uri(),
25+
@"nmap-6.25\nmap.exe");
26+
27+
installFromZip_Web();
28+
}
29+
30+
31+
32+
public Process start()
33+
{
34+
if (isInstalled())
35+
Executable.parentFolder().startProcess();
36+
//return Executable.startProcess();
37+
return null;
38+
}
39+
}
40+
}

‎3rdParty/NMap/NMap_Installer.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ public NMap() : this(true)
2323

2424
public NMap(bool installNow)
2525
{
26-
config("MNap", "MMap v5.51", "nmap-5.51-setup.exe");
27-
Install_Uri = "http://nmap.org/dist/nmap-5.51-setup.exe".uri();
28-
Install_Dir = @"C:\Program Files\Nmap";
26+
config("MNap", "http://nmap.org/dist/nmap-6.25-setup.exe".uri(), "nmap-5.51-setup.exe");
27+
28+
//Install_Dir = @"C:\Program Files\Nmap";
2929
if (installNow)
3030
install();
3131
}

‎3rdParty/OWASP/OWASP_Summit_2011/Util - Attendees Funding Mappings.h2‎

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,34 @@
1-
<?xml version="1.0"?>
2-
<H2>
3-
<SourceCode>//panel.clear();
1+
//panel.clear();
42
//var topPanel = panel.clear().add_Panel();
5-
var topPanel = O2Gui.open&lt;Panel&gt;("Attendees Funding Mappings",1000,500);
3+
var topPanel = O2Gui.open<Panel>("Attendees Funding Mappings",1000,500);
64

75
var summitApi = new API_OWASP_Summit_2011();
86
var useCache = true;
97

10-
var actionPanel = topPanel.insert_Above&lt;GroupBox&gt;(50)
8+
var actionPanel = topPanel.insert_Above<GroupBox>(50)
119
.set_Text("Actions (Select type of Attendee to see)")
1210
.add_Panel() ;
1311
var tablePanel = topPanel.add_TableList();//.show(attendees);
1412

15-
Action&lt;string, List&lt;string&gt;&gt; showAttendees =
16-
(title, pages)=&gt;{
13+
Action<string, List<string>> showAttendees =
14+
(title, pages)=>{
1715
var attendees = summitApi.getAttendees(pages);
1816
tablePanel.clearTable();
1917
tablePanel.title(title);
2018
tablePanel.show(attendees);
2119
};
2220

2321
actionPanel.add_Link("Confirmed, Need Funding",5,0,
24-
()=&gt; showAttendees("Confirmed, Need Funding", summitApi.attendees_SeekingFunds(useCache)))
22+
()=> showAttendees("Confirmed, Need Funding", summitApi.attendees_SeekingFunds(useCache)))
2523
.append_Link("Confirmed",
26-
()=&gt; showAttendees("Confirmed", summitApi.attendees_Confirmed(useCache)))
24+
()=> showAttendees("Confirmed", summitApi.attendees_Confirmed(useCache)))
2725
.append_Link("UnConfirmed",
28-
()=&gt; showAttendees("UnConfirmed",summitApi.attendees_UnConfirmed(useCache)))
26+
()=> showAttendees("UnConfirmed",summitApi.attendees_UnConfirmed(useCache)))
2927
.append_Link("All Attendees",
30-
()=&gt; showAttendees("All Attendees", summitApi.attendees(useCache)));
28+
()=> showAttendees("All Attendees", summitApi.attendees(useCache)));
3129

3230

33-
actionPanel.controls&lt;LinkLabel&gt;().click();
31+
actionPanel.controls<LinkLabel>().click();
3432

3533
return "ok";
3634
//return summitApi.getAttendeesMappings();
@@ -78,7 +76,4 @@ foreach(var testPage in attendeesPages)
7876
}
7977
}*/
8078
//using Irony.Parsing;
81-
//O2File:API_OWASP_Summit_2011.cs
82-
//O2Ref:O2_Misc_Microsoft_MPL_Libs.dll</SourceCode>
83-
<ReferencedAssemblies />
84-
</H2>
79+
//O2File:API_OWASP_Summit_2011.cs

‎3rdParty/Veracode/Veracode (Custom O2).h2‎

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
<?xml version="1.0"?>
2-
<H2>
3-
<SourceCode>var title = "Veracode";
1+
var title = "Veracode";
42

53
var ribbon = CustomO2.create(title); // stand alone version
64
//var ribbon = CustomO2.create(panel.clear().add_Panel(),title); // use when inside 'Quick Development GUI'
@@ -9,16 +7,16 @@ var customO2 = ribbon.add_Tab("Veracode Detailed Xml Findings");
97
customO2.add_RibbonGroup("Main Gui")
108
.add_Script("Main Gui to view Veracode Findings", "API_Veracode_DetailedXmlFindings.cs.o2");
119
customO2.add_RibbonGroup("Raw Views")
12-
.add_Button("Raw View of Veracode Findigs - TreeView", ()=&gt;{
13-
var panel = O2Gui.open&lt;Panel&gt;("View Veracode Findigs in TreeView",700,400);
10+
.add_Button("Raw View of Veracode Findigs - TreeView", ()=>{
11+
var panel = O2Gui.open<Panel>("View Veracode Findigs in TreeView",700,400);
1412
new API_Veracode_DetailedXmlFindings().show_In_TreeView(panel);
1513
})
16-
.add_Button("Raw View of Veracode Findigs - Table List", ()=&gt;{
17-
var panel = O2Gui.open&lt;Panel&gt;("View Veracode Findigs in TreeView",700,400);
14+
.add_Button("Raw View of Veracode Findigs - Table List", ()=>{
15+
var panel = O2Gui.open<Panel>("View Veracode Findigs in TreeView",700,400);
1816
new API_Veracode_DetailedXmlFindings().show_In_TableList(panel);
1917
})
20-
.add_Button("Raw View of Veracode Findigs - Source Code Viewer", ()=&gt;{
21-
var panel = O2Gui.open&lt;Panel&gt;("View Veracode Findigs in TreeView",700,400);
18+
.add_Button("Raw View of Veracode Findigs - Source Code Viewer", ()=>{
19+
var panel = O2Gui.open<Panel>("View Veracode Findigs in TreeView",700,400);
2220
new API_Veracode_DetailedXmlFindings().show_Flaws_In_SourceCodeViewer(panel);
2321
})
2422
;
@@ -31,11 +29,9 @@ customO2.add_RibbonGroup("Raw Views")
3129
//O2Ref:WindowsFormsIntegration.dll
3230
//O2Ref:RibbonControlsLibrary.dll
3331
//O2Ref:O2_Misc_Microsoft_MPL_Libs.dll
34-
//O2File:API_Veracode_DetailedXmlFindings.cs.o2
35-
36-
//O2Ref:PresentationCore.dll
37-
//O2Ref:PresentationFramework.dll
38-
//O2Ref:WindowsBase.dll
39-
//O2Ref:System.Xaml.dll</SourceCode>
40-
<ReferencedAssemblies />
41-
</H2>
32+
//O2File:API_Veracode_DetailedXmlFindings.cs.o2
33+
34+
//O2Ref:PresentationCore.dll
35+
//O2Ref:PresentationFramework.dll
36+
//O2Ref:WindowsBase.dll
37+
//O2Ref:System.Xaml.dll

0 commit comments

Comments
 (0)