Permalink
Browse files

Fixed .h2 watin references

  • Loading branch information...
1 parent fb324e6 commit 662d6b4a3934372a932f9a156e2d96c931f634f7 @DinisCruz DinisCruz committed Jul 23, 2013
Showing with 63 additions and 86 deletions.
  1. +3 −3 3rdParty/Chrome/PoC - REPL with Chrome and IE.h2
  2. +1 −1 3rdParty/Microsoft/ASP.NET MVC/Tool - View Asp.NET MCV controllers.h2
  3. +1 −1 3rdParty/Microsoft/ASP.NET MVC/Tool - View Asp.NET MCV method streams and views.h2
  4. +1 −3 APIs/Amazon/Amazon S3 Browser.h2
  5. +0 −1 APIs/EventBrite/API_EventBrite.cs
  6. +1 −2 APIs/IE/IE_ExecutionGui/IE_Google - Execution.h2
  7. +0 −1 APIs/MediaWiki/MediaWikiEditor.cs
  8. +0 −1 APIs/Twitter/Twitter Client.h2
  9. +0 −2 APIs/WatiN/ascx_IE_ScriptExecution.cs
  10. +0 −1 APIs/WatiN/examples/PoC - Handing IE Error popups.h2
  11. +7 −10 APIs/WatiN/examples/PoC - Script to seach google images (with persistent ID).h2
  12. +0 −1 APIs/Windows/API_RDP.cs
  13. +1 −2 APIs/WordPress/Tool - WordPress Editor.h2
  14. +0 −1 APIs/WordPress/Util - Write Blog post on o2platform.wordpress.com.h2
  15. +7 −11 APIs/_Javascript_Libraries/JQuery/examples/PoC - JS conversation between IE and O2.h2
  16. +0 −1 Utils/Web/Util - View and search WebPage code.h2
  17. +0 −1 _Custom_O2s/Installers (Custom O2).h2
  18. +3 −2 _Custom_O2s/OWASP WebScarab (Custom O2 version).h2
  19. +1 −2 _Custom_O2s/v1.4/O2 GUI - Browser Automation and BlackBox Testing.h2
  20. +7 −1 _Custom_O2s/v4.1/Main O2 Gui.h2
  21. +1 −2 _Sample_Vulns/HacmeBank/HacmeBank - Custom O2 AST Security Scanner.h2
  22. +2 −1 _Sample_Vulns/NerdDinner/NerdDinner_Installer.cs
  23. +7 −9 _Sample_Vulns/SuperSecureBank/SSB IE Automation - site actions.h2
  24. +7 −9 _Sample_Vulns/_IE_Demos/Google/open Google.h2
  25. +6 −8 _Sample_Vulns/_IE_Demos/Google/search on Google.h2
  26. +7 −9 _Sample_Vulns/_IE_Demos/Local Html File/Select Fields - Simple Html Form.h2
@@ -14,10 +14,10 @@ ie.open(""http://o2platform.com"");
//return ie;
return chrome;
-
-//O2Ref:" + @"WatiN.Core.1x.dll
+//using " + @"FluentSharp.Watin;
+//O2Ref:" + @"WatiN.Core.dll
+//O2Ref:" + @"FluentSharp.WaitiN.dll
//O2Ref:" + @"WebDriver.dll
-//O2File:" + @"WatiN_IE_ExtensionMethods.cs
//O2File:" + @"API_Chrome_Hijack.cs
//O2File:" + @"API_ChromeDriver.cs
";
@@ -53,7 +53,7 @@ Action<string> loadFilesFromFolder =
foreach(var baseType in iClass.BaseTypes)
{
"iClass.baseType : {0}.{1}".debug(iClass.Name, baseType);
- if(baseType.FullyQualifiedName == "System.Web.Mvc.Controller" || baseType.FullyQualifiedName == "ContentController")
+ if(baseType.FullyQualifiedName == "System.Web.Mvc.Controller" || baseType.FullyQualifiedName == "Controller")
controllers.Add(iClass);
else
{
@@ -143,7 +143,7 @@ Action<string> loadFilesFromFolder =
if (iClass.BaseTypes.Count >0)
{
foreach(var baseType in iClass.BaseTypes)
- if(baseType.FullyQualifiedName == "System.Web.Mvc.Controller" || baseType.FullyQualifiedName == "ContentController")
+ if(baseType.FullyQualifiedName == "System.Web.Mvc.Controller" || baseType.FullyQualifiedName == "Controller")
controllers.Add(iClass);
}
}
@@ -1,4 +1,3 @@
-//O2Ref:WatiN.Core.1x.dll
var topPanel = O2Gui.open<Panel>("Amazon S3 Browser",700,400);
var autoPreviewSelectedFile = false;
var amazonS3 = new API_AmazonS3();
@@ -133,5 +132,4 @@ return null;
//O2Ref:AWSSDK.dll
//O2Ref:O2_External_IE.dll
//O2Ref:System.Xml.dll
-//O2Ref:System.Xml.Linq.dll
-
+//O2Ref:System.Xml.Linq.dll
@@ -13,7 +13,6 @@
//O2Ref:Watin.Core.dll
//O2Ref:Interop.SHDocVw.dll
-//O2Ref:WatiN.Core.1x.dll
//O2Ref:O2_External_IE.dll
//O2Ref:System.Xml.Linq.dll
//O2Ref:System.Xml.dll
@@ -2,5 +2,4 @@ var popupWindow = "IE Execution GUI - IE Google".popupWindow(700,500);
popupWindow.add_IE_ExecutionGui("IE_Google.cs");
//using O2.XRules.Database.APIs
-//O2File:API_IE_ExecutionGUI.cs
-//O2Ref:WatiN.Core.1x.dll
+//O2File:API_IE_ExecutionGUI.cs
@@ -32,7 +32,6 @@
//O2Ref:QuickGraph.dll
//O2Ref:GraphSharp.dll
//O2Ref:GraphSharp.Controls.dll
-//O2Ref:WatiN.Core.1x.dll
//O2Ref:O2_Misc_Microsoft_MPL_Libs.dll
namespace O2.XRules.Database.APIs
@@ -240,7 +240,6 @@ return "done";
//O2Ref:QuickGraph.dll
//O2Ref:GraphSharp.Controls.dll
//O2Ref:ICSharpCode.AvalonEdit.dll
-//O2Ref:WatiN.Core.1x.dll
//O2Ref:PresentationCore.dll
//O2Ref:PresentationFramework.dll
@@ -91,8 +91,6 @@ public string getDefaultScript()
return ie.links();
-//O2File:WatiN_IE_ExtensionMethods.cs
-//O2Ref:WatiN.Core.1x.dll
//O2Tag_DontAddExtraO2Files;
";*/
@@ -27,7 +27,6 @@ runPoC();
//O2Ref:Watin.Core.dll
//O2File:API_GuiAutomation.cs
-//O2Ref:WatiN.Core.1x.dll
//O2Ref:White.Core.dll
//_O2Tag_DontAddExtraO2Files;
@@ -1,6 +1,4 @@
-<?xml version="1.0"?>
-<H2>
- <SourceCode>var ie = panel.storeObjectInTag&lt;WatiN_IE&gt;(()=&gt; panel.clear().add_IE() );
+var ie = panel.storeObjectInTag<WatiN_IE>(()=> panel.clear().add_IE() );
//these can now be executed individually without needing a new IE object creation
if (ie.url().isNull() || ie.url().contains("search").isFalse())
@@ -12,10 +10,9 @@ if (ie.url().isNull() || ie.url().contains("search").isFalse())
}
return ie.links();
-//O2File:WatiN_IE_ExtensionMethods.cs
-//O2Ref:WatiN.Core.1x.dll
-
-
-//O2Tag:SkipGlobalCompilation</SourceCode>
- <ReferencedAssemblies />
-</H2>
+//using FluentSharp.Watin
+//O2Ref:FluentSharp.Watin.dll
+//O2Ref:Watin.Core.dll
+
+
+//O2Tag:SkipGlobalCompilation
View
@@ -6,7 +6,6 @@
//O2File:API_GuiAutomation.cs
//O2Ref:White.Core.dll
-//O2Ref:WatiN.Core.1x.dll
namespace O2.XRules.Database.APIs
{
@@ -70,9 +70,8 @@ return "ok";
//O2Ref:WordPress_XmlRpc_JoeBlogs.dll
//O2Ref:WindowsFormsIntegration.dll
//O2Ref:RibbonControlsLibrary.dll
-//O2Ref:WatiN.Core.1x.dll
//O2Ref:Interop.SHDocVw.dll
//O2Ref:PresentationCore.dll
//O2Ref:PresentationFramework.dll
//O2Ref:WindowsBase.dll
-//O2Ref:System.Xaml.dll
+//O2Ref:System.Xaml.dll
@@ -184,7 +184,6 @@ return "ok";
//O2Ref:WordPress_XmlRpc_JoeBlogs.dll
//O2Ref:Interop.SHDocVw.dll
-//O2Ref:WatiN.Core.1x.dll
//O2Ref:Microsoft.mshtml.dll
//O2Ref:O2_Misc_Microsoft_MPL_Libs.dll
//O2Ref:Jint/Jint.dll
@@ -1,8 +1,6 @@
-<?xml version="1.0"?>
-<H2>
- <SourceCode>//"ie_Object".o2Cache&lt;string&gt;("");
-var ie = "ie_Object".o2Cache&lt;WatiN_IE&gt;(
- ()=&gt; panel.clear().add_IE().silent(true));
+//"ie_Object".o2Cache<string>("");
+var ie = "ie_Object".o2Cache<WatiN_IE>(
+ ()=> panel.clear().add_IE().silent(true));
ie.open("about:blank");
ie.eval("document.write('this is some text')");
@@ -14,10 +12,8 @@ ie.eval("$o2.write('hello again')");
//ie.inject_FirebugLite();
-//O2File:WatiN_IE_ExtensionMethods.cs
-//O2Ref:WatiN.Core.1x.dll
-
+//using FluentSharp.Watin
+//O2Ref:FluentSharp.Watin.dll
+//O2Ref:Watin.Core.dll
+
//O2Tag:SkipGlobalCompilation
-</SourceCode>
- <ReferencedAssemblies />
-</H2>
@@ -28,7 +28,6 @@ browser.onDocumentCompleted += (htmlPage)=>
//O2File:WatiN_IE_ExtensionMethods.cs
//O2File:ascx_HtmlTagViewer.cs
-//O2Ref:WatiN.Core.1x.dll
//O2Ref:O2_External_IE.dll
//O2Ref:Microsoft.mshtml.dll
//using O2.External.IE.ExtensionMethods
@@ -48,7 +48,6 @@ ribbon.add_Tab("Development")
//O2Ref:RibbonControlsLibrary.dll
//O2Ref:White.Core.dll
//O2Ref:UIAutomationClient.dll
-//O2Ref:WatiN.Core.1x.dll
//O2Ref:PresentationCore.dll
//O2Ref:PresentationFramework.dll
@@ -61,8 +61,9 @@ webScarabTab.add_RibbonGroup("O2 Panel")
"ie.field(\"q\",\"O2 and WebScarab\");".line()+
"ie.button(\"Google Search\").click();".line()+
"ie.closeInNSeconds(4); ".line()+
- "//O2File:WatiN_IE_ExtensionMethods.cs".line()+
- "//O2Ref:WatiN.Core.1x.dll".line()+
+ "//using FluentSharp.Watin".line()+
+ "//O2Ref:WatiN.Core.dll".line()+
+ "//O2Ref:FluentSharp.WatiN.dll".line()+
"//O2Ref:O2_External_IE.dll".line();
script.onCompileExecuteOnce();
script.set_Command(initialScript);
@@ -73,5 +73,4 @@ return "ok";
//O2Ref:PresentationCore.dll
//O2Ref:PresentationFramework.dll
//O2Ref:WindowsBase.dll
-//O2Ref:System.Xaml.dll
-//O2Ref:WatiN.Core.1x.dll
+//O2Ref:System.Xaml.dll
@@ -140,6 +140,12 @@ logViewerPanel.add_LogViewer().white();
return "done";
//O2Embed:FluentSharp.Roslyn.dll
-//O2Embed:WatiN.Core.1x.dll
+//O2Embed:FluentSharp.WatiN.dll
+//O2Embed:WatiN.Core.dll
+//O2Embed:FluentSharp.O2Platform.exe
+//O2Embed:FluentSharp.NGit.dll
+//O2Embed:FluentSharp.NUnit.dll
+//O2Embed:nunit.framework.dll
+//O2Embed:FluentSharp.WPF.dll
//O2DontEmbed:Ionic.Zip.dll
//O2Package:ALL_SCRIPTS
@@ -138,9 +138,8 @@ step4_FindingsCreated.add_ContextMenu()
//O2Ref:GraphSharp.Controls.dll
//O2Ref:ICSharpCode.AvalonEdit.dll
//O2Ref:DiagramDesigner.exe
-//O2Ref:WatiN.Core.1x.dll
//O2Ref:PresentationCore.dll
//O2Ref:PresentationFramework.dll
//O2Ref:WindowsBase.dll
-//O2Ref:System.Xaml.dll
+//O2Ref:System.Xaml.dll
@@ -19,7 +19,8 @@ public NerdDinner_Installer()
{
config("NerdDinner",
"NerdDinner.zip",
- "http://download-codeplex.sec.s-msft.com/Download/Release?ProjectName=nerddinner&DownloadId=123725&FileTime=129192971514370000&Build=19692".uri(),
+ "http://download-codeplex.sec.s-msft.com/Download/Release?ProjectName=nerddinner&DownloadId=123725&FileTime=129192971514370000&Build=20626".uri(),
+// "http://download-codeplex.sec.s-msft.com/Download/Release?ProjectName=nerddinner&DownloadId=123725&FileTime=129192971514370000&Build=19692".uri(),
"NerdDinner_2.0\\NerdDinner.sln");
installFromZip_Web();
}
@@ -1,17 +1,15 @@
-<?xml version="1.0"?>
-<H2>
- <SourceCode>var topPanel = panel.clear().add_Panel();
+var topPanel = panel.clear().add_Panel();
var ie = topPanel.add_IE_with_NavigationBar().silent(true);
var ssb = new API_SuperSecureBank(ie, true);
ssb.homePage();
ssb.login("as","As");
-//O2File:API_SuperSecureBank.cs
-//O2File:WatiN_IE_ExtensionMethods.cs
-//O2Ref:WatiN.Core.1x.dll
+//O2File:API_SuperSecureBank.cs
-//O2Tag:SkipGlobalCompilation</SourceCode>
- <ReferencedAssemblies />
-</H2>
+//using FluentSharp.Watin
+//O2Ref:FluentSharp.Watin.dll
+//O2Ref:Watin.Core.dll
+
+//O2Tag:SkipGlobalCompilation
@@ -1,13 +1,11 @@
-<?xml version="1.0"?>
-<H2>
- <SourceCode>panel.clear();
+panel.clear();
var ie = panel.add_IE().silent(true);
ie.open("http://www.google.com");
-return ie.fields();
-//O2File:WatiN_IE_ExtensionMethods.cs
-//O2Ref:WatiN.Core.1x.dll
+return ie.fields();
-//O2Tag:SkipGlobalCompilation</SourceCode>
- <ReferencedAssemblies />
-</H2>
+//using FluentSharp.Watin
+//O2Ref:FluentSharp.Watin.dll
+//O2Ref:Watin.Core.dll
+
+//O2Tag:SkipGlobalCompilation
@@ -1,15 +1,13 @@
-<?xml version="1.0"?>
-<H2>
- <SourceCode>panel.clear();
+panel.clear();
var ie = panel.add_IE().silent(true);
ie.open("http://www.google.com");
ie.field("q").flash().value("OWASP O2 Platform").flash();
ie.button("Google Search").scrollIntoView().flash().click();
return ie.fields();
-//O2File:WatiN_IE_ExtensionMethods.cs
-//O2Ref:WatiN.Core.1x.dll
+
+//using FluentSharp.Watin
+//O2Ref:FluentSharp.Watin.dll
+//O2Ref:Watin.Core.dll
-//O2Tag:SkipGlobalCompilation</SourceCode>
- <ReferencedAssemblies />
-</H2>
+//O2Tag:SkipGlobalCompilation
@@ -1,16 +1,14 @@
-<?xml version="1.0"?>
-<H2>
- <SourceCode>panel.clear();
+panel.clear();
var ie = panel.add_IE().silent(true);
ie.open("Simple_Html_Form.html".local());
ie.field("field_1").flash().value("modified").flash();
ie.field("field_2").flash().value("values").flash();
ie.button("Submit").flash().click();
-return ie.url();
-//O2File:WatiN_IE_ExtensionMethods.cs
-//O2Ref:WatiN.Core.1x.dll
+return ie.url();
-//O2Tag:SkipGlobalCompilation</SourceCode>
- <ReferencedAssemblies />
-</H2>
+//using FluentSharp.Watin
+//O2Ref:FluentSharp.Watin.dll
+//O2Ref:Watin.Core.dll
+
+//O2Tag:SkipGlobalCompilation

0 comments on commit 662d6b4

Please sign in to comment.