Address most of rubocop's nits

bug/bundler_fix
Jon Hart 2016-12-06 17:10:34 -08:00
parent 8f21a1f68c
commit a13382c80b
No known key found for this signature in database
GPG Key ID: 2FA9F0A3AFA8E9D3
2 changed files with 31 additions and 22 deletions

View File

@ -6,6 +6,7 @@ module Metasploit
module Client module Client
USER_AGENT = "aws-sdk-ruby2/2.6.27 ruby/2.3.2 x86_64-darwin15" USER_AGENT = "aws-sdk-ruby2/2.6.27 ruby/2.3.2 x86_64-darwin15"
include Msf::Exploit::Remote::HttpClient include Msf::Exploit::Remote::HttpClient
# because Post modules require these to be defined when including HttpClient # because Post modules require these to be defined when including HttpClient
def register_autofilter_ports(ports=[]); end def register_autofilter_ports(ports=[]); end
def register_autofilter_hosts(ports=[]); end def register_autofilter_hosts(ports=[]); end
@ -48,7 +49,7 @@ module Metasploit
if headers.nil? || !headers.instance_of?(Hash) || body_digest.nil? || !body_digest.instance_of?(String) if headers.nil? || !headers.instance_of?(Hash) || body_digest.nil? || !body_digest.instance_of?(String)
return nil, nil return nil, nil
end end
headers_block = headers.sort_by(&:first).map do |k,v| headers_block = headers.sort_by(&:first).map do |k, v|
v = "#{v},#{v}" if k == 'Host' v = "#{v},#{v}" if k == 'Host'
"#{k.downcase}:#{v}" "#{k.downcase}:#{v}"
end.join("\n") end.join("\n")
@ -76,8 +77,8 @@ module Metasploit
def body(vars_post) def body(vars_post)
pstr = "" pstr = ""
vars_post.each_pair do |var,val| vars_post.each_pair do |var, val|
pstr << '&' if pstr.length > 0 pstr << '&' unless pstr.empty?
pstr << var pstr << var
pstr << '=' pstr << '='
pstr << val pstr << val

View File

@ -1,3 +1,8 @@
##
# This module requires Metasploit: http://metasploit.com/download
# Current source: https://github.com/rapid7/metasploit-framework
##
require 'msf/core' require 'msf/core'
require 'metasploit/framework/aws/client' require 'metasploit/framework/aws/client'
@ -5,8 +10,10 @@ class MetasploitModule < Msf::Post
include Metasploit::Framework::Aws::Client include Metasploit::Framework::Aws::Client
def initialize(info={}) def initialize(info = {})
super(update_info(info, super(
update_info(
info,
'Name' => "Create an AWS IAM User", 'Name' => "Create an AWS IAM User",
'Description' => %q{ 'Description' => %q{
This module will attempt to create an AWS (Amazon Web Services) IAM This module will attempt to create an AWS (Amazon Web Services) IAM
@ -19,12 +26,14 @@ class MetasploitModule < Msf::Post
'References' => [ 'References' => [
[ 'URL', 'https://github.com/devsecops/bootcamp/raw/master/Week-6/slides/june-DSO-bootcamp-week-six-lesson-three.pdf' ] [ 'URL', 'https://github.com/devsecops/bootcamp/raw/master/Week-6/slides/june-DSO-bootcamp-week-six-lesson-three.pdf' ]
] ]
)) )
)
register_options( register_options(
[ [
OptString.new('IAM_USERNAME', [false, 'Name of the user to be created (leave empty or unset to use a random name)', '']) OptString.new('IAM_USERNAME', [false, 'Name of the user to be created (leave empty or unset to use a random name)', ''])
]) ]
)
register_advanced_options( register_advanced_options(
[ [
OptString.new('METADATA_IP', [true, 'The metadata service IP', '169.254.169.254']), OptString.new('METADATA_IP', [true, 'The metadata service IP', '169.254.169.254']),
@ -36,11 +45,11 @@ class MetasploitModule < Msf::Post
OptString.new('SSL', [true, 'AWS IAM Endpoint SSL', true]), OptString.new('SSL', [true, 'AWS IAM Endpoint SSL', true]),
OptString.new('IAM_GROUP_POL', [true, 'IAM group policy to use', '{"Version": "2012-10-17", "Statement": [{"Effect": "Allow", "Action": "*", "Resource": "*" }]}']), OptString.new('IAM_GROUP_POL', [true, 'IAM group policy to use', '{"Version": "2012-10-17", "Statement": [{"Effect": "Allow", "Action": "*", "Resource": "*" }]}']),
OptString.new('Region', [true, 'The default region', 'us-east-1' ]) OptString.new('Region', [true, 'The default region', 'us-east-1' ])
]) ]
)
deregister_options('VHOST') deregister_options('VHOST')
end end
def run def run
# setup creds for making IAM API calls # setup creds for making IAM API calls
creds = metadata_creds creds = metadata_creds
@ -119,4 +128,3 @@ class MetasploitModule < Msf::Post
{} {}
end end
end end