1
mirror of https://github.com/rapid7/metasploit-framework synced 2024-11-12 11:52:01 +01:00
Commit Graph

106 Commits

Author SHA1 Message Date
RageLtMan
7cc7fe71db Address net-dns additional records empty array
Conversion between packet formats can create empty additional
answers fields, which net-dns cannot handle.

Update net-dns' packet parser to be able to deal with empty arrays
such that it doesn't try to call :data on a nil, which is the only
element of an empty array.

Props to mubix for identifying this issues.
2017-06-24 20:27:19 -04:00
Carter Harwood
6e312fd009 Minor spelling correction: lenght => length 2017-05-05 10:42:33 -05:00
Brent Cook
f69b4a330e handle Ruby 2.4 Fixnum/Bignum -> Integer deprecations 2017-01-22 10:20:03 -06:00
David Maloney
06ff7303a6
make pubkey verifier work with old module
make the new pubkey verifier class and
the old identify_pubkeys aux module work
together

7321
2016-09-19 15:20:35 -05:00
David Maloney
2f17ae0946
add pubkey_verifier class to framework
this class provides a new way to do
public key only verification tests
for SSH

7321
2016-09-19 14:35:59 -05:00
David Maloney
3e94abe555
put net:ssh::commandstream back
this was apparently our own creation for doing
ssh sessions

MD-1688
2016-06-22 15:02:36 -05:00
David Maloney
140621ad9b
start to move to canonical net-ssh
removed vendored net::ssh
pulled in net:ssh gem
made Rex::Socket::SSHFactory clas to bridge rex sockets in
Renamed getpeername to getpeername-as_array to not override
core socket behaviour

MS-1688
2016-06-22 14:52:33 -05:00
Jon Hart
7c70a554ea
Merge branch 'pr/6187' into pr/fixup-6187 for pre-master merge testing 2016-04-08 16:56:38 -07:00
wchen-r7
f7dd326b16
Land #6455, Fix dns labels/names size limits for lib/net/dns/names/names 2016-04-01 21:57:09 -05:00
RubenRocha
72a69fcd16 Fixed timeout warning 2016-02-19 21:14:54 +00:00
Jon Hart
af33980b72
Load hinfo support, fix broken hinfo code 2016-02-18 23:22:17 -08:00
Jon Hart
a2a932e176
Dont store AXFR answers if there are no answers 2016-02-04 10:28:11 -08:00
Jon Hart
6882bf275e
Break out of the wait loop for this ns after a response is received 2016-02-04 10:07:53 -08:00
Adam Cammack
d544488409
Land #6461, backport net-ssh ECDH kex algorithms 2016-01-20 14:05:39 -06:00
Brent Cook
e1be57d658
Land #6458, Backport net-ssh AES CTR ciphers 2016-01-14 14:44:49 -06:00
Christopher Moore
8102fc2af2
add support for ECDH SHA2 NIST key exchanges 2016-01-10 18:01:49 +00:00
Christopher Moore
96b6eb6b06
remove extraneous comma 2016-01-10 17:13:15 +00:00
Christopher Moore
b7e3d97935
remove extra spacing 2016-01-10 17:12:41 +00:00
Christopher Moore
b3e42c3611
add missing coding preamble 2016-01-10 17:10:23 +00:00
Christopher Moore
8f72166f66
add missing coding preamble 2016-01-10 17:08:58 +00:00
Christopher Moore
9ff5ffd1ac
fix erroneous comment 2016-01-09 17:56:11 +00:00
Christopher Moore
888be6133c
KEx availability depends on OpenSSL support 2016-01-09 13:45:23 +00:00
nixawk
dceb0f5ea9 check dns labels size limits 2016-01-09 11:39:56 +08:00
nixawk
ed99f2bc01 Fix dns labels/names size limits 2016-01-08 22:22:00 +08:00
Christopher Moore
3a5805faaf
add CTR mode to support the new ciphers 2016-01-08 01:43:21 +00:00
Christopher Moore
5a710e4969
add aes128-ctr encryption algorithm 2016-01-08 01:15:17 +00:00
Christopher Moore
f82e32372e
add aes192-ctr encryption algorithm 2016-01-08 01:14:09 +00:00
Christopher Moore
3dc822588f
add aes256-ctr encryption algorithm 2016-01-08 01:12:27 +00:00
Christopher Moore
77cd28c136
add dh group exchange sha256 kex to net-ssh lib 2016-01-08 00:58:48 +00:00
HD Moore
9f9bbce034
Land #5840, add LLMNR & mDNS modules 2015-09-02 18:30:29 -05:00
jvazquez-r7
6962fcf2fd
Check the query result before accessing the header 2015-08-24 09:22:42 -05:00
Jon Hart
4b41e8e42c
Fix Net::DNS::RR merge conflicts. really 2015-08-13 08:55:09 -07:00
Jon Hart
3a7cea51b4
Merge master and fix Net::DNS::RR merge conflicts 2015-08-13 08:53:25 -07:00
HD Moore
c80017992a A dirty patch for a number of Net::DNS/dns_enum issues 2015-06-06 13:48:52 -05:00
Christian Mehlmauer
153344a1dd
fix Unkown typo 2015-04-16 23:59:28 +02:00
William Vu
21d0d6ceb3 Remove dead code from Net::SSH
Triggers uninitialized constant COMPAT_OLD_DHGEX, which was removed in
1664a4b5e8. Somehow, this file was missed
when syncing with upstream.
2015-04-06 15:59:09 -05:00
Jon Hart
e94f5fc635 Better handling of TYPE#/CLASS#, tests 2015-02-24 15:37:39 -08:00
Jon Hart
971ef30514 Allow Net::DNS::RR::Classes to handle all valid classes 2015-02-24 15:37:39 -08:00
Jon Hart
8398bae64f Allow Net::DNS::RR::Types to handle all valid types 2015-02-24 15:37:39 -08:00
Jon Hart
eaaa09b6a0 Update Net::DNS to handle non-standard types and classes. Bugs 2015-02-24 15:37:39 -08:00
Fernando Arias
f24d665516 Backported net-ssh ask_passphrase functionality
MSP-10038
2014-06-18 11:21:17 -05:00
Tab Assassin
7e5e0f7fc8 Retab lib 2013-08-30 16:28:33 -05:00
Tod Beardsley
05916c079e Inline unit tests are so last decade
Aside from codebase-wide changes, nearly all of these tests haven't been
touched since before 2010, and there is no effort to maintain this style
of testing. We've moved on to (correctly) seperating out our tests from
our codebase.
2013-05-23 12:41:14 -05:00
Tod Beardsley
2bfe5ee5a6 Add a ResolverError class 2012-09-04 19:20:31 -05:00
Tod Beardsley
e128fc87f2 Looks like it should be ResolverError 2012-09-04 19:19:53 -05:00
Daniel Miller
1aa83b830f Let Resolver#send_tcp take a block
This solves the looping problem. Since the TCP connection wouldn't
necessarily close, we couldn't count on a 0-length recv, and the
connection was timing out. Changed it so send_tcp can take a block, in
which we do parsing. AXFR responses are sandwiched between SOA answers,
so when the second one is reached, the transfer is done.

This is also cleaner for existing code that uses send_tcp, since if no
block is passed, it just returns the first response and tears down the
connection, just like it used to.
2012-08-20 20:51:18 -05:00
Daniel Miller
c015121dc0 Make Resolver#axfr use Resolver#send_tcp
This required some changes to send_tcp: it now loops, reading as many
length-prefixed DNS responses as are available before the connection
closes. This shouldn't affect other uses of the function, since most
questions only have one response in answer.
2012-08-19 17:21:37 -05:00
Daniel Miller
7005216d1f Fix axfr support for auxiliary/gather/enum_dns
AXFR support in net-dns is broken. This fixes it, and makes the
requisite modifications to enum_dns module. Basic problem is that AXFR
responses consist of a chain of DNS replies, not a single reply with
multiple answers. Previously, only the first of these replies, the SOA
record, was returned. Also added some exception handling to avoid
problems like #483.
2012-08-16 20:40:24 -05:00
RageLtMan
33c74c97e2 Add Opt::Proxies and opthash[:proxies] to ssh mods 2012-08-12 16:23:22 -04:00
RageLtMan
c9690033c7 This commit allows ssh_login to use socks proxies. Net::SSH::Transport::Session could take a :proxy option,
but it expects a factory object not a string, when setting :proxy => datastore['Proxies'] user got:
"Auxiliary failed: NoMethodError private method `open' called for \"socks4:localhost:1080\":String."
VALID_OPTIONS in ssh.rb now takes :proxies option which is passed to the Rex socket in
Net::SSH::Transport::Session.new.

Testing: block all outgoing to SSH server, try to connect with a proxy. Try with :proxy option,
then merge this pull request and try again.
2012-08-12 16:01:52 -04:00