Permalink
Browse files

More FluentSharp fixes

  • Loading branch information...
1 parent 3e94450 commit 90e81105c19ac755bcee4d755dd23f2ab09b10e5 @DinisCruz DinisCruz committed Jul 22, 2013
Showing with 261 additions and 1,361 deletions.
  1. +4 −0 .gitignore
  2. +2 −1 3rdParty/Chrome/API_Chrome_Hijack.cs
  3. +1 −2 3rdParty/Chrome/CefSharp_Installer.cs
  4. +4 −2 3rdParty/HawkEye/API_HawkEye.cs
  5. +3 −3 3rdParty/HawkEye/Ctrl_ProcessFinder.cs
  6. +6 −9 3rdParty/HawkEye/WindowFinder.cs
  7. +4 −10 APIs/Windows/API_RDP.cs
  8. +2 −12 APIs/Windows/API_WindowsMediaPlayer.cs
  9. +1 −5 APIs/Windows/CLR/API_CLR.cs
  10. +3 −5 APIs/Windows/CLR/API_Mscoree.cs
  11. +3 −12 APIs/Windows/CmdExe/CmdExeAPI.cs
  12. +3 −11 APIs/Windows/InputSimulator/API_InputSimulator.cs
  13. +4 −11 APIs/Windows/MessageHooks/API_InjectMenu_AnotherProcess.cs
  14. +2 −4 APIs/Windows/MessageHooks/WilsonGlobalSystemHooks/Form1.cs
  15. +1 −1 APIs/Windows/MessageHooks/WilsonGlobalSystemHooks/GlobalHooks.cs
  16. +13 −24 APIs/Windows/WMI/API_WMI.cs
  17. +3 −11 APIs/Windows/Win32/API_ProcessHandles.cs
  18. +1 −2 APIs/Windows/Win32/API_Win32Processes_Handles.cs
  19. +3 −3 APIs/Windows/Win32_DLL_Imports/API_WinAPI_ExtensionMethods.cs
  20. +2 −1 APIs/Windows/Win32_DLL_Imports/Win32_Helper_Methods.cs
  21. +4 −9 APIs/Windows/Windows_Messages/API_Win32_Handle_Hijack.cs
  22. +3 −13 Languages/AspNet/AspNet_Page.cs
  23. +2 −6 Languages/AspNet/ControlEncodings/AspNetControlEncodings.cs
  24. +3 −7 Languages/AspNet/Util - WSDL Invoke and Scripting v1.0.h2
  25. +3 −8 Languages/AspNet/WSDL/API_ASMX_Proxy.cs
  26. +6 −19 Languages/AspNet/ascx_Edit_AspNet_Pages.cs
  27. +0 −416 Languages/AspNet/ascx_WSDL_Creation_and_Execution.cs.o2
  28. +5 −15 Languages/AspNet/aspCompile.cs
  29. +3 −13 Languages/DotNet/Ast_Scanner/Ast_Engine/Ast_Engine_Cache.cs
  30. +4 −13 Languages/DotNet/Ast_Scanner/Ast_Engine/Ast_Engine_ExtensionMethods.cs
  31. +8 −23 Languages/DotNet/Ast_Scanner/Ast_Engine/MethodMappings_Engine.cs
  32. +10 −18 Languages/DotNet/Ast_Scanner/Ast_Engine/MethodMappings_ExtensionMethods.cs
  33. +3 −4 Languages/DotNet/Ast_Scanner/Ast_Engine/O2CodeStreamTaintRules_ExtensionMethods.cs
  34. +4 −8 Languages/DotNet/Ast_Scanner/Ast_Engine/O2CodeStream_ExtensionMethods.cs
  35. +8 −12 Languages/DotNet/Ast_Scanner/Ast_Engine/O2MappedAstData_ExtensionMethods.cs
  36. +4 −6 Languages/DotNet/Ast_Scanner/Ast_Engine/O2MethodStream_ExtensionMethods.cs
  37. +7 −18 Languages/DotNet/Ast_Scanner/Ast_Engine/Saved_MethodStream.cs
  38. +10 −15 Languages/DotNet/Ast_Scanner/Ast_Engine/SharpDevelop_O2MappedAstData_ExtensionMethods.cs
  39. +4 −10 Languages/DotNet/Ast_Scanner/Ast_Engine/TextEditor_O2CodeStream_ExtensionMethods.cs
  40. +10 −14 Languages/DotNet/Ast_Scanner/Controls/ascx_CodeStreams.cs
  41. +5 −14 Languages/DotNet/Ast_Scanner/Controls/ascx_GraphAst_MethodCalls.cs
  42. +5 −16 Languages/DotNet/Ast_Scanner/Controls/ascx_Interactive_MethodCalls.cs
  43. +7 −23 Languages/DotNet/Ast_Scanner/Controls/ascx_ManualMethodStreams.cs
  44. +7 −23 Languages/DotNet/Ast_Scanner/Controls/ascx_SearchAST.cs
  45. +9 −24 Languages/DotNet/Ast_Scanner/Controls/ascx_ViewAST.cs
  46. +14 −20 Languages/DotNet/Ast_Scanner/Controls/ascx_View_SourceCode_AST.cs
  47. +8 −19 Languages/DotNet/Ast_Scanner/Controls/ascx_WriteRule.cs
  48. +3 −24 Languages/DotNet/Ast_Scanner/O2_DotNet_Ast_Engine.cs
  49. +1 −1 Languages/DotNet/Ast_Scanner/SecurityRules_AST_DotNet/IAST_Rules.cs
  50. +2 −7 Languages/DotNet/Ast_Scanner/SecurityRules_AST_DotNet/Rule_DotNet_FindSinks.cs
  51. +3 −7 Languages/DotNet/Ast_Scanner/SecurityRules_AST_DotNet/Rule_DotNet_FindSources.cs
  52. +1 −5 Languages/DotNet/Ast_Scanner/SecurityRules_AST_DotNet/Rule_DotNet_ScanFiles.cs
  53. +6 −13 Languages/DotNet/DotNet_AspNet_Compiler.cs
  54. +1 −9 Languages/DotNet/DotNet_SDK_GacUtil.cs
  55. +3 −9 Languages/DotNet/DotNet_SDK_WCF.cs
  56. +4 −10 Languages/DotNet/DotNet_SDK_WSDL.cs
  57. +6 −13 Languages/DotNet/DotNet_ViewState.cs
  58. +2 −10 Languages/DotNet/MS_VS_WebServer.cs
  59. +0 −90 Languages/DotNet/Mono_and_Reflection/ascx_AssemblyAttributes.cs.o2
  60. +0 −227 Languages/DotNet/Mono_and_Reflection/ascx_MonoDecompiler.cs.o2
  61. +3 −12 Languages/DotNet/SoS/SunOfStrikeApi.cs
  62. +1 −1 _Custom_O2s/v4.1/Main O2 Gui.h2
  63. +4 −8 _Sample_Vulns/SuperSecureBank/SSB Tool - Invoke WebServices via WSDL.h2
View
@@ -5,3 +5,7 @@ bin
*.csproj
*.user
_VisualStudio_Projects
+
+*.suo
+
+*.ncrunchsolution
@@ -1,5 +1,6 @@
// This file is part of the OWASP O2 Platform (http://www.owasp.org/index.php/OWASP_O2_Platform) and is released under the Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0)
using System;
+using System.Management;
using System.Windows.Forms;
using System.Reflection;
using System.Diagnostics;
@@ -104,7 +105,7 @@ public static API_Chrome_Hijack hijack_Chrome(this API_Chrome_Hijack chromeHijac
var targetWindow = mainWindowHandle.child_Windows().second();
return targetWindow;
- return mainWindowHandle; // for now hijack the whole thing
+ //return mainWindowHandle; // for now hijack the whole thing
});
}
@@ -30,8 +30,7 @@ public CefSharp_Installer(bool installNow)
public bool install()
{
"Installing {0}".info(ToolName);
- return installFromZip_Web();
- return false;
+ return installFromZip_Web();
}
public Process start()
@@ -1,7 +1,9 @@
using System;
using System.Windows.Forms;
-using O2.Kernel;
-using O2.DotNetWrappers.ExtensionMethods;
+using FluentSharp.CoreLib;
+using FluentSharp.REPL;
+using FluentSharp.WinForms;
+
//O2File:WindowFinder.cs
namespace O2.XRules.Database.APIs
@@ -1,10 +1,10 @@
// This file is part of the OWASP O2 Platform (http://www.owasp.org/index.php/OWASP_O2_Platform) and is released under the Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0)
using System;
-using System.Linq;
using System.Diagnostics;
using System.Windows.Forms;
-using System.Collections.Generic;
-using O2.DotNetWrappers.ExtensionMethods;
+using FluentSharp.CoreLib;
+using FluentSharp.WinForms;
+
//O2File:WindowFinder.cs
namespace O2.XRules.Database.APIs
@@ -1,15 +1,12 @@
//based on the code from HawkEye
using System;
-using System.IO;
-using System.Text;
using System.Drawing;
using System.Diagnostics;
using System.Windows.Forms;
-using System.ComponentModel;
-using System.Runtime.InteropServices;
-using System.Runtime.CompilerServices;
-using O2.XRules.Database.Utils;
-using O2.DotNetWrappers.ExtensionMethods;
+using System.ComponentModel;
+using FluentSharp.CoreLib;
+using FluentSharp.WinForms;
+using FluentSharp.WinForms.Utils;
//O2File:API_WinAPI.cs
@@ -90,7 +87,7 @@ public WindowFinder()
this.pink();*/
base.Name = "WindowFinder";
base.Size = new Size(32, 32);
- this.BackgroundImage = O2.Platform.BCL.O2_Views_ASCX.FormImages.target.ToBitmap();
+ this.BackgroundImage = FormImages.target.ToBitmap();
this.BackgroundImageLayout = ImageLayout.Stretch;
}
@@ -108,7 +105,7 @@ public void StartSearch()
// Cursor.Current = new Cursor("Eye.cur".local());
//else
// Cursor.Current = Cursors.Cross;
- Cursor.Current = new Cursor(new System.IO.MemoryStream(O2.Platform.BCL.O2_Views_ASCX.FormImages.Eye));
+ Cursor.Current = new Cursor(new System.IO.MemoryStream(FormImages.Eye));
base.Capture = true;
base.MouseMove += new MouseEventHandler(this.WindowFinder_MouseMove);
base.MouseUp += new MouseEventHandler(this.WindowFinder_MouseUp);
View
@@ -1,14 +1,8 @@
// This file is part of the OWASP O2 Platform (http://www.owasp.org/index.php/OWASP_O2_Platform) and is released under the Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0)
-using System;
-using System.Windows.Forms;
-using System.Text;
-using O2.Interfaces.O2Core;
-using O2.Kernel;
-using O2.Kernel.ExtensionMethods;
-using O2.DotNetWrappers.ExtensionMethods;
-using O2.DotNetWrappers.Windows;
-using O2.Views.ASCX;
-using O2.XRules.Database.Utils;
+
+using FluentSharp.CoreLib;
+using FluentSharp.CoreLib.API;
+using FluentSharp.GuiAutomation;
//O2File:API_GuiAutomation.cs
//O2Ref:White.Core.dll
@@ -1,17 +1,7 @@
// This file is part of the OWASP O2 Platform (http://www.owasp.org/index.php/OWASP_O2_Platform) and is released under the Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0)
-using System;
using System.Windows.Forms;
-using System.Drawing;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using O2.Interfaces.O2Core;
-using O2.Kernel;
-using O2.Kernel.ExtensionMethods;
-using O2.DotNetWrappers.ExtensionMethods;
-using O2.Views.ASCX;
-using O2.XRules.Database.Utils;
+using FluentSharp.CoreLib;
+using FluentSharp.WinForms;
using AxWMPLib;
//O2Ref:Interop.WMPLib.dll
//O2Ref:AxInterop.WMPLib.dll
@@ -1,15 +1,11 @@
// This file is part of the OWASP O2 Platform (http://www.owasp.org/index.php/OWASP_O2_Platform) and is released under the Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0)
using System;
using System.Diagnostics;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
using System.Text;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Security;
-using O2.DotNetWrappers.ExtensionMethods;
-using O2.Kernel;
+using FluentSharp.CoreLib;
namespace O2.XRules.Database.APIs
{
@@ -1,11 +1,9 @@
// This file is part of the OWASP O2 Platform (http://www.owasp.org/index.php/OWASP_O2_Platform) and is released under the Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0)
using System;
-using System.Diagnostics;
-using System.Collections;
using System.Collections.Generic;
-using O2.DotNetWrappers.ExtensionMethods;
-using System.Runtime.InteropServices;
-using mscoree;
+using FluentSharp.CoreLib;
+using System.Runtime.InteropServices;
+using mscoree;
//O2Ref:mscoree_v4.0.dll
@@ -2,18 +2,9 @@
using System;
using System.Windows.Forms;
using System.Diagnostics;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using O2.Interfaces.O2Core;
-using O2.Kernel;
-using O2.Kernel.ExtensionMethods;
-using O2.DotNetWrappers.ExtensionMethods;
-using O2.DotNetWrappers.DotNet;
-using O2.DotNetWrappers.Windows;
-using O2.Views.ASCX;
-using O2.Views.ASCX.classes.MainGUI;
+using FluentSharp.CoreLib;
+using FluentSharp.CoreLib.API;
+using FluentSharp.WinForms;
using WindowsInput;
using WindowsInput.Native;
//O2Ref:O2_Misc_Microsoft_MPL_Libs.dll
@@ -1,19 +1,11 @@
// This file is part of the OWASP O2 Platform (http://www.owasp.org/index.php/OWASP_O2_Platform) and is released under the Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0)
using System;
-using System.Linq;
-using System.Text;
using System.Drawing;
-using System.Reflection;
-using System.Threading;
using System.Diagnostics;
using System.Windows.Forms;
-using System.Collections.Generic;
using System.Runtime.InteropServices;
-using O2.Interfaces.O2Core;
-using O2.Kernel;
-using O2.Kernel.ExtensionMethods;
-using O2.DotNetWrappers.ExtensionMethods;
-using O2.Views.ASCX;
+using FluentSharp.CoreLib;
+using FluentSharp.WinForms;
using WindowsInput.Native;
using WindowsInput;
@@ -272,7 +264,7 @@ public static API_InputSimulator mouse_MoveTo<T>(this API_InputSimulator inputSi
public static API_InputSimulator mouse_MoveTo_Wpf<T>(this API_InputSimulator inputSimulator, T uiElement)
where T : System.Windows.UIElement
{
- return (API_InputSimulator)O2.DotNetWrappers.ExtensionMethods.WPF_Threading_ExtensionMethods.wpfInvoke(
+ return (API_InputSimulator)WPF_Threading_ExtensionMethods.wpfInvoke(
uiElement,
()=>{
try
@@ -1,19 +1,12 @@
// This file is part of the OWASP O2 Platform (http://www.owasp.org/index.php/OWASP_O2_Platform) and is released under the Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0)
using System;
-using System.Linq;
using System.Collections.Generic;
using System.Windows.Forms;
-using System.Text;
using System.Diagnostics;
-using O2.Kernel;
-using O2.Kernel.ExtensionMethods;
-using O2.DotNetWrappers.DotNet;
-using O2.DotNetWrappers.Windows;
-using O2.DotNetWrappers.ExtensionMethods;
-using O2.Views.ASCX.Ascx.MainGUI;
-using O2.Views.ASCX.classes.MainGUI;
-using O2.Views.ASCX.ExtensionMethods;
-
+using FluentSharp.CoreLib;
+using FluentSharp.CoreLib.API;
+using FluentSharp.WinForms;
+using FluentSharp.WinForms.Controls;
using TransparencyMenu;
using win32 = TransparencyMenu.Win32;
//O2File:GenericWindow.cs
@@ -1,12 +1,10 @@
//File based on the VS project from http://www.codeproject.com/KB/system/WilsonSystemGlobalHooks.aspx
using System;
-using System.Drawing;
using System.Collections;
-using System.ComponentModel;
using System.Windows.Forms;
-using System.Data;
-using O2.DotNetWrappers.ExtensionMethods;
+using FluentSharp.CoreLib;
+
//O2Ref:System.Windows.Forms.dll
//O2File:GlobalHooks.cs
//O2File:Window.cs
@@ -2,7 +2,7 @@
using System;
using System.Runtime.InteropServices;
using System.Windows.Forms;
-using O2.DotNetWrappers.ExtensionMethods;
+using FluentSharp.CoreLib;
namespace TransparencyMenu
{
@@ -1,24 +1,13 @@
// This file is part of the OWASP O2 Platform (http://www.owasp.org/index.php/OWASP_O2_Platform) and is released under the Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0)
using System;
-using System.Windows.Forms;
-using System.Diagnostics;
-using System.Collections;
-using System.Collections.Generic;
using System.Linq;
-using System.Reflection;
-using System.Text;
-using O2.Interfaces.O2Core;
-using O2.Kernel;
-using O2.Kernel.ExtensionMethods;
-using O2.DotNetWrappers.ExtensionMethods;
-using O2.DotNetWrappers.DotNet;
-using O2.DotNetWrappers.Windows;
-using O2.Views.ASCX;
-using O2.Views.ASCX.DataViewers;
-using O2.Views.ASCX.classes.MainGUI;
-using O2.Views.ASCX.ExtensionMethods;
using System.Management;
-using O2.XRules.Database.Utils;
+using System.Windows.Forms;
+using System.Collections.Generic;
+using FluentSharp.CoreLib;
+using FluentSharp.CoreLib.API;
+using FluentSharp.WinForms;
+using FluentSharp.WinForms.Controls;
//O2Ref:System.Management.dll
//using O2.XRules.Database.Utils
@@ -93,27 +82,27 @@ public static List<object> createObjectWithSearchResults(this List<ManagementBas
return wmiQueryItems;
}
- public static ascx_TableList show(this List<ManagementBaseObject> searchResults)
+ public static ctrl_TableList show(this List<ManagementBaseObject> searchResults)
{
var panel = O2Gui.open<Panel>("WMI Query Results Viewer",700,400);
return searchResults.show_in_TableList(panel);
}
- public static ascx_TableList show<T>(this List<ManagementBaseObject> searchResults, T control)
+ public static ctrl_TableList show<T>(this List<ManagementBaseObject> searchResults, T control)
where T : Control
{
return searchResults.show_in_TableList(control);
}
- public static ascx_TableList show_in_TableList<T>(this List<ManagementBaseObject> searchResults, T control)
+ public static ctrl_TableList show_in_TableList<T>(this List<ManagementBaseObject> searchResults, T control)
where T : Control
{
var tableList = control.clear().add_TableList();
searchResults.show_in_TableList(tableList);
return tableList;
}
- public static ascx_TableList show_in_TableList(this List<ManagementBaseObject> searchResults, ascx_TableList tableList)
+ public static ctrl_TableList show_in_TableList(this List<ManagementBaseObject> searchResults, ctrl_TableList tableList)
{
if (searchResults.isNull() || tableList.isNull())
return tableList;
@@ -169,15 +158,15 @@ public static DataGridView show_in_DataGridView(this List<ManagementBaseObject>
return dataGridView;
}
- public static ascx_ShowInfo show_in_PropertyGrid<T>(this List<ManagementBaseObject> searchResults, T control)
+ public static ctrl_ShowInfo show_in_PropertyGrid<T>(this List<ManagementBaseObject> searchResults, T control)
where T : Control
{
- var showInfo = control.clear().add_Control<ascx_ShowInfo>();
+ var showInfo = control.clear().add_Control<ctrl_ShowInfo>();
searchResults.show_in_PropertyGrid(showInfo);
return showInfo;
}
- public static ascx_ShowInfo show_in_PropertyGrid(this List<ManagementBaseObject> searchResults, ascx_ShowInfo showInfo)
+ public static ctrl_ShowInfo show_in_PropertyGrid(this List<ManagementBaseObject> searchResults, ctrl_ShowInfo showInfo)
{
showInfo.show(searchResults.createObjectWithSearchResults());
return showInfo;
@@ -1,18 +1,10 @@
// This file is part of the OWASP O2 Platform (http://www.owasp.org/index.php/OWASP_O2_Platform) and is released under the Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0)
using System;
-using System.IO;
-using System.Collections;
using System.Collections.Generic;
using System.Runtime.InteropServices;
-using System.Windows.Forms;
-using System.Text;
-using O2.Interfaces.O2Core;
-using O2.Kernel;
-using O2.Kernel.ExtensionMethods;
-using O2.DotNetWrappers.ExtensionMethods;
-using O2.DotNetWrappers.Windows;
-using O2.Views.ASCX;
-using O2.XRules.Database.Utils;
+using FluentSharp.CoreLib;
+using FluentSharp.CoreLib.API;
+using FluentSharp.WinForms;
namespace O2.XRules.Database.APIs
{
@@ -6,8 +6,7 @@
using System.Runtime.InteropServices;
using System.Diagnostics;
using System.Text;
-using System.Threading;
-using O2.DotNetWrappers.ExtensionMethods;
+using FluentSharp.CoreLib;
namespace O2.XRules.Database.APIs
{
Oops, something went wrong.

0 comments on commit 90e8110

Please sign in to comment.