Skip to content
Permalink
Browse files

Land #11535, add deregister_http_client_options

  • Loading branch information...
busterb committed Mar 8, 2019
2 parents 6b6069e + 433af12 commit 7c97ca6a8e96d652dd6e3449eedb921ab4c80ede
@@ -82,6 +82,9 @@ def initialize(info = {})
register_autofilter_services(%W{ http https })
end

def deregister_http_client_options
deregister_options('RHOST', 'RPORT', 'VHOST', 'SSL', 'Proxies')
end

#
# For HTTP Client exploits, we often want to verify that the server info matches some regex before
@@ -23,6 +23,8 @@ def initialize(info = {})
]
))

deregister_http_client_options

register_options(
[
OptString.new('CW_ID', [ true, "The CorpWatch ID of the company", ""]),
@@ -34,8 +36,6 @@ def initialize(info = {})
OptInt.new('CHILD_LIMIT', [false, "Set limit to how many children we can get", 5]),
OptBool.new('GET_HISTORY', [false, "Get company history", false])
])

deregister_options('RHOST', 'RPORT', 'VHOST', 'Proxies')
end

def rhost_corpwatch
@@ -25,15 +25,15 @@ def initialize(info = {})
]
))

deregister_http_client_options

register_options(
[
OptString.new('COMPANY_NAME', [ true, "Search for companies with this name", ""]),
OptInt.new('YEAR', [ false, "Year to look up", Time.now.year-1]),
OptString.new('LIMIT', [ true, "Limit the number of results returned", "5"]),
OptString.new('CORPWATCH_APIKEY', [ false, "Use this API key when getting the data", ""]),
])

deregister_options('RHOST', 'RPORT', 'Proxies', 'VHOST')
end

def rhost_corpwatch
@@ -34,14 +34,16 @@ def initialize(info = {})
},
'License' => MSF_LICENSE,
'Author' => 'bcoles'))

deregister_http_client_options

register_options(
[
OptString.new('URL', [ false, 'The target URL', '' ]),
OptString.new('URL_LIST', [ false, 'File containing a list of target URLs', '' ]),
OptEnum.new('URL_TYPE', [ true, 'The type of URL(s) specified', 'html', [ 'pdf', 'html' ] ]),
OptBool.new('STORE_LOOT', [ false, 'Store authors in loot', true ])
])
deregister_options 'RHOST', 'RHOSTS', 'RPORT', 'VHOST', 'SSL'
end

def progress(current, total)
@@ -17,15 +17,15 @@ def initialize(info = {})
'Author' => [ 'Nixawk' ],
'License' => MSF_LICENSE))

deregister_http_client_options

register_options(
[
OptString.new('TARGET', [ true, "The target to locate subdomains for, ex: rapid7.com, 8.8.8.8"]),
OptBool.new('IP_SEARCH', [ false, "Enable ip of subdomains to locate subdomains", true]),
OptBool.new('ENUM_BING', [ true, "Enable Bing Search Subdomains", true]),
OptBool.new('ENUM_YAHOO', [ true, "Enable Yahoo Search Subdomains", true])
])

deregister_options('RHOST', 'RHOSTS', 'RPORT', 'VHOST', 'SSL', 'Proxies')
end

def rhost_yahoo

0 comments on commit 7c97ca6

Please sign in to comment.
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.