infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Handle content-type weirdness from Anemone 

Fixes #5515
 MSP-12834
bug/bundler_fix
Trevor Rosen 2015-06-23 14:08:23 -05:00
parent 275e5ff15d
commit a9ab5b7bb8
No known key found for this signature in database
GPG Key ID: 255ADB7A642D3928
3 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -24,8 +24,6 @@ group :development do
gem 'pry' gem 'pry'
end end
gem 'metasploit_data_models', git: 'git@github.com:rapid7/metasploit_data_models', branch:'bug/MSP-12834/crawler-choke-on-save'
group :development, :test do group :development, :test do
# automatically include factories from spec/factories # automatically include factories from spec/factories
gem 'factory_girl_rails', '~> 4.5.0' gem 'factory_girl_rails', '~> 4.5.0'

32
Gemfile.lock
View File

@ -1,19 +1,3 @@
GIT
remote: git@github.com:rapid7/metasploit_data_models
revision: c36c800866d42187c21c1308a9bac5f3278d8aa3
branch: bug/MSP-12834/crawler-choke-on-save
specs:
metasploit_data_models (1.2.4)
activerecord (>= 4.0.9, < 4.1.0)
activesupport (>= 4.0.9, < 4.1.0)
arel-helpers
metasploit-concern (~> 1.0)
metasploit-model (~> 1.0)
pg
postgres_ext
railties (>= 4.0.9, < 4.1.0)
recog (~> 2.0)
PATH PATH
remote: . remote: .
specs: specs:
@ -40,6 +24,7 @@ PATH
activerecord (>= 4.0.9, < 4.1.0) activerecord (>= 4.0.9, < 4.1.0)
metasploit-credential (~> 1.0) metasploit-credential (~> 1.0)
metasploit-framework (= 4.11.0.pre.dev) metasploit-framework (= 4.11.0.pre.dev)
metasploit_data_models (~> 1.2)
pg (>= 0.11) pg (>= 0.11)
metasploit-framework-pcap (4.11.0.pre.dev) metasploit-framework-pcap (4.11.0.pre.dev)
metasploit-framework (= 4.11.0.pre.dev) metasploit-framework (= 4.11.0.pre.dev)
@ -139,6 +124,16 @@ GEM
activesupport (>= 4.0.9, < 4.1.0) activesupport (>= 4.0.9, < 4.1.0)
railties (>= 4.0.9, < 4.1.0) railties (>= 4.0.9, < 4.1.0)
metasploit-payloads (1.0.2) metasploit-payloads (1.0.2)
metasploit_data_models (1.2.5)
activerecord (>= 4.0.9, < 4.1.0)
activesupport (>= 4.0.9, < 4.1.0)
arel-helpers
metasploit-concern (~> 1.0)
metasploit-model (~> 1.0)
pg
postgres_ext
railties (>= 4.0.9, < 4.1.0)
recog (~> 2.0)
method_source (0.8.2) method_source (0.8.2)
mime-types (2.4.3) mime-types (2.4.3)
mini_portile (0.6.2) mini_portile (0.6.2)
@ -161,7 +156,7 @@ GEM
coderay (~> 1.1.0) coderay (~> 1.1.0)
method_source (~> 0.8.1) method_source (~> 0.8.1)
slop (~> 3.4) slop (~> 3.4)
rack (1.5.3) rack (1.5.5)
rack-test (0.6.3) rack-test (0.6.3)
rack (>= 1.0) rack (>= 1.0)
rails (4.0.13) rails (4.0.13)
@ -179,7 +174,7 @@ GEM
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rake (10.4.2) rake (10.4.2)
rb-readline-r7 (0.5.2.0) rb-readline-r7 (0.5.2.0)
recog (2.0.5) recog (2.0.6)
nokogiri nokogiri
redcarpet (3.2.3) redcarpet (3.2.3)
rkelly-remix (0.0.6) rkelly-remix (0.0.6)
@ -243,7 +238,6 @@ DEPENDENCIES
metasploit-framework! metasploit-framework!
metasploit-framework-db! metasploit-framework-db!
metasploit-framework-pcap! metasploit-framework-pcap!
metasploit_data_models!
pry pry
rake (>= 10.0.0) rake (>= 10.0.0)
redcarpet redcarpet

2
metasploit-framework-db.gemspec
View File

@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
# Metasploit::Credential database models # Metasploit::Credential database models
spec.add_runtime_dependency 'metasploit-credential', '~> 1.0' spec.add_runtime_dependency 'metasploit-credential', '~> 1.0'
# Database models shared between framework and Pro. # Database models shared between framework and Pro.
#spec.add_runtime_dependency 'metasploit_data_models', '~> 1.2' spec.add_runtime_dependency 'metasploit_data_models', '~> 1.2'
# depend on metasploit-framewrok as the optional gems are useless with the actual code # depend on metasploit-framewrok as the optional gems are useless with the actual code
spec.add_runtime_dependency 'metasploit-framework', "= #{spec.version}" spec.add_runtime_dependency 'metasploit-framework', "= #{spec.version}"
# Needed for module caching in Mdm::ModuleDetails # Needed for module caching in Mdm::ModuleDetails