Commit Graph

19 Commits

Author SHA1 Message Date
Brent Cook bb0a0b5cd9 apply empty attribute fix in more places, simplify and unify 2017-04-13 22:07:10 -05:00
darkbushido e0ecf0972e dropping extra spaces 2017-04-10 15:19:36 -05:00
darkbushido 099cf87e54 Catching errors where we are passing invalid attributes
We need to pass :task down for some functionality in pro.
while the error is valid we really shouldnt be passing the task all the way down if its blank but we need
the check there or we will end up with the same problem with pro.
2017-04-10 15:05:53 -05:00
darkbushido 271fd589f2 Revert "Land #8135, Report hosts always add ip to hostname if hostname is blank"
This reverts commit 5a1c7ca8af, reversing
changes made to d10b3da6ec.
2017-03-23 10:05:58 -05:00
darkbushido 60bc279eb3 removing extra whitespace 2017-03-21 10:40:59 -05:00
darkbushido 1221a20d0d reversing the logic to check for .blank? 2017-03-21 10:35:19 -05:00
darkbushido 7ff7c707c9 setting host_name to address if host_name is blank. 2017-03-21 10:26:57 -05:00
David Maloney 05ac2ee6ed convert first stage to os_family
added the new os-family column to Host
so now we use that as our first stage filter
for targets

MS-2325
2017-01-03 14:38:49 -06:00
Matt Buck 912f41292a Drop some unused code 2015-04-30 11:25:57 -05:00
Matt Buck 5e2d6c27c3 Merge branch 'master' into staging/rails-4.0
Conflicts:
	Gemfile.lock
	db/schema.rb
	lib/msf/core/db_manager/session.rb
	metasploit-framework-db.gemspec
2015-04-06 11:27:00 -05:00
James Lee 1b0e3f13c6 Remove unnecessary extra assignment 2015-03-30 13:14:36 -05:00
Matt Buck f29a3f69e9 Merge branch 'master' into staging/rails-4.0
Conflicts:
	Gemfile.lock
	metasploit-framework-db.gemspec
2015-03-17 15:47:48 -05:00
joev ca3b2220b5 Check to ensure Mdm is loaded to fix store_loot. 2015-03-05 23:27:13 -06:00
Matt Buck d4d1dc09f3 Merge branch 'master' into staging/rails-4.0
Conflicts:
	Gemfile.lock
	db/schema.rb
	metasploit-framework-db.gemspec
	metasploit-framework.gemspec
2015-02-13 16:13:18 -06:00
Sonny Gonzalez dc1eab377c Rails 4 finder conversion: convert find_or_initialize_by_x_and_y
MSP-12153

* convert to where(conditions).first_or_initialize
2015-02-13 12:39:44 -06:00
Sonny Gonzalez 7c57b9fb57 Fix Master - Pro build
MSP-12138

* revert to previous Rails 3 syntax.
2015-02-11 12:02:34 -06:00
Christian Catalan 3deac54d3f Convert find_or_initialize_by_X to Rails 4 compatible.
MSP-12018
2015-02-03 16:09:49 -06:00
darkbushido 8d664bee9a normalize_host dropps scope if it exists
s
2014-10-28 15:34:54 -05:00
Luke Imhoff 0cfac32290 Extract Msf::DBManager::Host
MSP-11124

Extract methods related to `Mdm::Host`s.
2014-10-09 11:11:36 -05:00