William Vu
38f6b8aada
Clean up module
2018-07-30 14:06:33 -05:00
James Barnett
d1f09ca81c
Add path selection for GET requests
...
Also remove instances where workspace is passed for
single object lookups since it is no longer required
2018-07-30 13:56:34 -05:00
William Vu
ce9f447a29
Land #10384 , upload_exec fixes
2018-07-30 13:55:40 -05:00
William Vu
3b2f614653
Land #10398 , unused option cleanup in enum_juniper
2018-07-30 13:52:52 -05:00
h00die
7c8190573c
remove unused juniper options
2018-07-30 14:20:01 -04:00
Metasploit
6752582bc0
automatic module_metadata_base.json update
2018-07-30 11:18:01 -07:00
Jacob Robles
4ed2cc8189
Land #10397 , Added line in psexec_psh to support SMB2
2018-07-30 13:06:00 -05:00
Metasploit
d62a960359
automatic module_metadata_base.json update
2018-07-30 10:42:41 -07:00
bwatters-r7
cdefb88770
Added line to support SMB2
2018-07-30 12:37:06 -05:00
Jacob Robles
952ab801e8
Land #10060 , vTiger CRM v6.3.0 Upload RCE
2018-07-30 12:32:24 -05:00
Jacob Robles
62f663207b
Change option type
2018-07-30 12:15:59 -05:00
Jacob Robles
fe9315dc89
Update module, Add documentation
2018-07-30 12:11:08 -05:00
James Barnett
4c92de0b55
Refactor logic for determining single object output.
...
Also add restrictions on passing id as a query string param
2018-07-30 11:42:45 -05:00
Metasploit
7596366df0
automatic module_metadata_base.json update
2018-07-30 07:16:54 -07:00
Shelby Pace
d58785f959
Land #10247 , add WordPress Arbitrary File Deletion
2018-07-30 09:05:23 -05:00
reka193
ece9a72d13
Removed tabs
2018-07-30 15:07:55 +02:00
reka193
5962fa752e
Fixes in aws_ec2_instance_metadata
...
@@ -36,7 +36,7 @@ def initialize(info = {})
- unless resp =~ /^instance-id.$/m
+ unless resp =~ /^instance-id$/m
The original regex requires one character after 'instance-id' which is not present in the instance.
@@ -50,15 +50,16 @@ def check_curl
- base_resp.split(/\r\n/).each do |l|
- new_uri = base_uri.merge("./#{l}")
+ base_resp.split(/\r?\n/).each do |l|
+ new_uri = "#{base_uri}#{l}"
- key_uri = new_uri.merge("./#{key_id}/")
- key_resp = simple_get(key_uri)
+ new_uri = new_uri.slice(0..(new_uri.index(%r{/public-keys/})+'/public-keys'.length))
+ key_uri = "#{new_uri}#{key_id}/"
+ key_resp = simple_get(key_uri)
1. merge function was causing 'rescue in merge' errors
2. the split function could not succeed, there were no '\r\n' between the lines but '\n' only
3. the special case was not handled correctly
was trying to curl http://169.254.169.254/latest/meta-data/public-keys/0=Key0/ instead of http://169.254.169.254/latest/meta-data/public-keys/0/
@@ -94,6 +95,6 @@ def setup
- cmd_exec("curl #{url}")
+ cmd_exec("curl -s #{url}")
Curl was causing issues when not in silent mode.
2018-07-30 14:02:15 +02:00
reka193
6790ac1998
Reset to original
2018-07-30 10:48:32 +02:00
Wang Yihang
c90b03808a
Merge remote-tracking branch 'upstream/master' into add-resource-meta-shell-command
2018-07-30 13:25:26 +08:00
Wang Yihang
b2eb5edf37
[+] Fix bug in pull 10220
2018-07-30 13:21:26 +08:00
h00die
c440eeaa31
rogue end
2018-07-29 10:35:33 -04:00
h00die
53cca07442
bcoles suggestions
2018-07-29 10:31:01 -04:00
James Barnett
9cd99cbc17
Fix error when id param is present in GET request
2018-07-28 22:55:03 -05:00
James Barnett
9e08bf6ec2
Fix logic issue when processing HTTP requests
2018-07-28 15:23:56 -05:00
James Barnett
37706e094d
Dont wrap object in array when using ID parameter
2018-07-27 16:41:11 -05:00
James Barnett
829b43f743
Address minor code review comments
2018-07-27 16:19:17 -05:00
Erin Bleiweiss
d4b5e27edc
remove whitespace
2018-07-27 16:03:16 -05:00
Erin Bleiweiss
57c9a3544a
delete unnecessary proxy files
2018-07-27 16:01:45 -05:00
Erin Bleiweiss
3e41db6994
refactor for more dry, more compartmentalized code
2018-07-27 16:00:19 -05:00
Erin Bleiweiss
4ac11d4e70
parameter validation
2018-07-27 15:15:49 -05:00
Metasploit
4744fb01d9
automatic module_metadata_base.json update
2018-07-27 13:01:14 -07:00
Wei Chen
32384cf850
Land #10387 , Update mov_ss and add mov_ss_dll
2018-07-27 14:52:21 -05:00
James Barnett
3411d0bce2
Refactor error JSON responses to use a helper method
2018-07-27 13:59:17 -05:00
Erin Bleiweiss
7cfc2b44ec
allow rank search with numeric value only
2018-07-27 13:30:29 -05:00
bwatters-r7
6d4c70d019
ughhhhh EOL
2018-07-27 11:35:31 -05:00
bwatters-r7
d343458dc5
Update documentation with build instructions
...
remove superfluous directory
2018-07-27 11:31:59 -05:00
bwatters-r7
1981c3c24b
Fix documentation
2018-07-27 11:21:06 -05:00
bwatters-r7
036e2b2247
shut up, Rubocop
2018-07-27 11:11:32 -05:00
James Barnett
15fe80de06
Merge branch 'master' into conform_to_api_standards
2018-07-27 11:08:18 -05:00
bwatters-r7
b4792e08a4
Combine the modules and update the binaries
2018-07-27 11:08:04 -05:00
Erin Bleiweiss
df159e957d
condense logic for matching rank names to numeric value
2018-07-27 11:02:25 -05:00
Erin Bleiweiss
c76f141a49
replace magic numbers with constants
2018-07-27 10:42:57 -05:00
Erin Bleiweiss
06c98a0772
ignore extraneous/invalid keywords
2018-07-27 10:33:47 -05:00
Erin Bleiweiss
44239b7005
remove debug line
2018-07-27 10:28:31 -05:00
bwatters-r7
aaf1a22c7c
Rubocop changes
2018-07-27 10:15:45 -05:00
bwatters-r7
eab62c18c6
Update mov_ss and add mov_ss_dll
2018-07-27 09:40:34 -05:00
michaelj0hn
7bbb44401d
added definition of IEC104
2018-07-27 15:21:00 +02:00
michaelj0hn
7b5e8463ba
msftidy-final
2018-07-27 14:52:10 +02:00
michaelj0hn
4e42834be3
msftidy 538
2018-07-27 14:48:04 +02:00
michaelj0hn
44c1fa9197
msftidy558
2018-07-27 14:29:32 +02:00