91e3f4cca6
Merge 'kernelsmith/msfconsole-grep'
...
Resolved a conflict between grep and go_pro (go_pro was added after
grep). Adds @kernelsmith's grep command. Josh is determined to have
msfconsole be his default shell, it seems.
[Closes #1320 ]
Conflicts:
lib/msf/ui/console/command_dispatcher/core.rb
2013-03-18 14:39:45 -05:00
0a9b00e24c
Apparently missed part of mubix's original changes
...
Used by auxiliary/admin/smb/list_directory
2013-03-07 21:20:46 -06:00
c3fa62cd59
Whitespace at EOL
2013-03-07 18:16:57 -06:00
f05431791f
Merge branch 'dmaloney-r7-feature/ssl/add_cipher_support' into rapid7
2013-03-07 12:54:39 -06:00
27f43d3d1c
Param name goes before type
2013-03-07 12:50:43 -06:00
c41bfa9141
Whitespace
2013-03-07 12:45:01 -06:00
06443ea4d0
yarddoc cleanup
2013-03-07 11:52:58 -06:00
007b26d918
dry up enumerators
2013-03-07 11:35:34 -06:00
7332d31523
fix some style things for egypt
2013-03-07 11:11:48 -06:00
24c0da0adb
Merge branch 'rapid7' into doc/cleanup-peparsey
2013-03-05 21:00:26 -06:00
27727df415
Merge branch 'R3dy-psexec-mixin2' into rapid7
2013-03-05 14:36:55 -06:00
3acccd71f7
Whitespace and doc fix
2013-03-05 14:35:27 -06:00
a64edb33c4
Make code sections look right in docs
2013-03-05 14:34:11 -06:00
6eb334c925
a little more coverage
2013-03-05 00:01:09 -06:00
d909c00036
better spec coverage
2013-03-04 23:43:18 -06:00
3bb1b2b368
attempt to deal with specs
2013-03-04 19:25:20 -06:00
c121a4e9dc
Some more minor touchups
2013-03-04 18:42:08 -06:00
8b6b2fbce9
bad error handling fixed
2013-03-04 18:33:03 -06:00
dc7c02e9e8
still trying to get around this sslv2 thing
2013-03-04 18:18:01 -06:00
246977e0cf
Address openssl sslv2 issues
...
Debian/Ubuntu ship openssl without sslv2 compiled in.
we now check for this ahead of time
2013-03-04 17:39:28 -06:00
12201c519a
make sure we close sockets
2013-03-04 16:34:29 -06:00
13ad5cf150
Merge branch 'master' into feature/ssl/add_cipher_support
2013-03-04 15:07:32 -06:00
6dcca7df78
Remove duplicated header issues
...
Headers were getting duped back into client config, causing invalid
requests to be sent out
2013-03-04 11:24:26 -06:00
6d811ce4b9
empty passwords should be allowed
2013-03-04 09:09:11 -06:00
4212c36566
Fix up basic auth madness
2013-03-01 11:59:02 -06:00
902948e5d3
cleanup options
2013-03-01 11:01:00 -06:00
5a79fcd11e
Ensure we build only one Authorization header
...
Also fixes an issue where Host headers were generated with nil by
preferring the vhost from Client instead of the default nil from
ClientRequest.
2013-02-28 13:47:30 -06:00
425c245771
Axe set_cgi in favor of set_uri
...
They were identical except for a couple of extra bugs in set_cgi.
Also changes ```split("/")``` to ```split("/", -1)```, which behaves
correctly when the input has a seperator at the beginning or end.
2013-02-27 19:13:05 -06:00
b0745b090a
Msf HTTP uses this directly, can't axe it
2013-02-27 17:54:31 -06:00
4edd46216f
Refactor config -> opts
...
Puts all the evasion stuff in the same place as regular HTTP options to
make it easier to deal with.
2013-02-27 17:29:26 -06:00
d5ae54cbb6
More accurate docs
2013-02-27 16:27:37 -06:00
d3b3587660
Merge branch 'rapid7' into dmaloney-r7-feature/http/authv2
2013-02-27 14:01:57 -06:00
4085fa73c5
Merge branch 'stephenfewer-master'
2013-02-27 11:13:10 -06:00
7a7dd8975f
Hmm, turns out something actually used that
...
Despite comments to the contrary
2013-02-26 18:16:54 -06:00
29df20996e
Move most of the configuration into ClientRequest
...
Also fixes in-place modification of the query string which resulted in
duplication of the GET parameters when calling #to_s more than once.
2013-02-26 17:38:09 -06:00
f16cec552a
increase timeout with new checks
2013-02-26 14:27:04 -06:00
2ec2489f52
Test for general ssl before testing ciphers
2013-02-26 14:26:14 -06:00
579c11bc69
Set reasonable defaults for more things
...
All current tests are passing now
2013-02-26 14:25:46 -06:00
d7de3b75a4
Format Authorization header like others
...
Also sorts the set_*_header methods
2013-02-26 14:18:20 -06:00
c206ac4998
Set some reasonable defaults
...
Fixes a number of nil deref issues
2013-02-26 14:15:51 -06:00
1cb2717fe7
fix weak and strong cipher enumerators
2013-02-26 14:13:17 -06:00
d463460da7
Default cgi to true when not given
2013-02-26 13:33:54 -06:00
764bbbb8e5
Whitespace
2013-02-26 13:33:19 -06:00
5e0161d3f7
Reflect new ClientRequst in docs
2013-02-26 13:31:24 -06:00
1869cb5f8d
fix timeout
...
20 seconds is way too long for jsut opening a socket
2013-02-26 13:20:16 -06:00
5ac20e1b02
Merge branch 'feature/http/authv2' of git://github.com/dmaloney-r7/metasploit-framework into dmaloney-r7-feature/http/authv2
...
Conflicts:
lib/rex/proto/http/client.rb
2013-02-26 12:08:00 -06:00
c104fa6d97
Add spec and a few fixes for set_uri
2013-02-26 11:01:16 -06:00
d9627151c0
Add socket context option
...
Add the option for a socket context so pivoting will work
2013-02-25 15:01:42 -06:00
1ce86b7adb
Whitespace
2013-02-25 14:29:10 -06:00
e41922853e
Merge branch 'rapid7' into dmaloney-r7-feature/http/authv2
2013-02-25 14:15:22 -06:00
Tod Beardsley
James Lee
David Maloney
sinn3r