I don't think the use of the constant is a show stopper since it is
identical to the existing Nessus plugin scheme as well. It doesn't make
it right but it's not a reason to block. Both should be fixed some time.
Made a handful of minor edits regarding file handle management, and also
noted that the act of saving nexpose credentials will always cause the
SSL nag screen to not display.
Thanks for the implementation, mboman!
[Closes#57] [Fixes#6156]
Squashed commit of the following:
commit 8d421ab8e3004bcb67e156b45f1355a608e0320c
Author: Tod Beardsley <todb@metasploit.com>
Date: Fri Dec 23 15:55:35 2011 -0600
Adds a comment note about bypassing the SSL verify warning
commit fd956b380f14bbb394f36b0a3c565906f9aed869
Author: Tod Beardsley <todb@metasploit.com>
Date: Fri Dec 23 15:53:29 2011 -0600
Changing file write mode from w+ to wb.
commit d884c87482b033b7200d5045ba5f9b2d910f4aa8
Author: Tod Beardsley <todb@metasploit.com>
Date: Fri Dec 23 15:15:46 2011 -0600
::File instead of File throughout
commit 6d72f87e8f175f088ac7beeb80742d50ab01b38a
Author: Tod Beardsley <todb@metasploit.com>
Date: Fri Dec 23 15:14:54 2011 -0600
Space change
commit f6f3527595379ba11b3be4341a0c620b06340fbb
Merge: a978d19 2335614
Author: Tod Beardsley <todb@metasploit.com>
Date: Fri Dec 23 15:13:12 2011 -0600
Merge branch 'master' of github_r7:rapid7/metasploit-framework into mboman_nexpose
commit a978d1962f756f507fdabb988380a7ecf3ce76bb
Author: Tod Beardsley <todb@metasploit.com>
Date: Fri Dec 23 15:12:51 2011 -0600
Minor fixups mostly around ::File handling.
commit bddd0249b956c3e2c960b0bd6028b88e6e99eac5
Merge: 2ddc161 bb2ea62
Author: Michael Boman <michael@michaelboman.org>
Date: Fri Dec 16 08:39:10 2011 +0100
Merge branch 'master' of git://github.com/rapid7/metasploit-framework into nexpose
commit 2ddc1616714b37e89415195b2a9ef9c569e4065e
Author: Michael Boman <michael@michaelboman.org>
Date: Wed Dec 14 11:44:29 2011 +0100
msftidy cleanup (whitespace after EOL)
commit b202c7ff3a61ac450c181d4f60b01923bad9625f
Author: Michael Boman <michael@michaelboman.org>
Date: Wed Dec 14 11:28:13 2011 +0100
Removed a ncusage call
commit 45da9728d1867b04ce557521650abbc41753165e
Author: Michael Boman <michael@michaelboman.org>
Date: Wed Dec 14 09:19:58 2011 +0100
Fixed indenting, removed ncusage function until later...
commit e9f03aafba7db0d907c431eca3a3b55672437ea4
Merge: 41d3fae 8dc85f1
Author: Michael Boman <michael@michaelboman.org>
Date: Wed Dec 14 07:35:17 2011 +0100
Merge branch 'master' of git://github.com/rapid7/metasploit-framework into nexpose
commit 41d3fae61b9501179d5b474de018ea370ae90192
Merge: 63b6f38 d87d8d5
Author: Michael Boman <michael@michaelboman.org>
Date: Tue Dec 13 20:07:34 2011 +0100
Merge branch 'master' of git://github.com/rapid7/metasploit-framework into nexpose
commit 63b6f3873d466b7c6e4f3be5f0cea0a2a72e46f9
Merge: b3b7be4 cfa128a
Author: Michael Boman <michael@michaelboman.org>
Date: Tue Dec 13 17:01:06 2011 +0100
Merge branch 'master' of git://github.com/rapid7/metasploit-framework into nexpose
commit b3b7be4594eedbb82424e89ad44372dd71a0c507
Author: Michael Boman <michael@michaelboman.org>
Date: Tue Dec 13 16:54:54 2011 +0100
Nexpose plugin can now save/load credentials
Also removes duplicated code between external/source/exploits/pxesploit
and external/source/pxesploit.
[Closes#63]
Squashed commit of the following:
commit 325f52527233ded1bf6506c366ec8cb9efdc2610
Author: scriptjunkie <scriptjunkie@scriptjunkie.us>
Date: Fri Dec 16 12:14:18 2011 -0600
Jetzt auf Deutsch! y español! 中國人!
[update pxexploit to resolve administrators' group name rather than assume the English 'Administrators']
Also remove duplicate/old pxexploit source code from the tree.
- Use 'Actions' to configure which OWA version to try
- Fix a bug where the USER_AS_PASS option might overwrite PASSWORD (and not restoring it) even though a password is already set.
- Increase timeout to 25
- Update description
Can't actually require FILENAME or REMOTE_FILENAME because I don't know
if you're going to upload or download. However, there shouldn't be a
stacktrace when you just try to go with neither.
get() should get get_once() (intent is to get 4 bytes,
not timeout after 4 seconds), no need to escape equals
signs in regexes, no need to newline the unexpected
responses.
get() should get get_once() (intent is to get 4 bytes,
not timeout after 4 seconds), no need to escape equals
signs in regexes, no need to newline the unexpected
responses.
Also refers to port 264/TCP as the SecuRemote service instead of the
Topology service (I believe this is correct)
Reporting is initially conservative -- if we don't get something for
fw_hostname, then don't bother reporting at all; assume we're
mis-identifying the target.
Also refers to port 264/TCP as the SecuRemote service instead of the
Topology service (I believe this is correct)
Reporting is initially conservative -- if we don't get something for
fw_hostname, then don't bother reporting at all; assume we're
mis-identifying the target.
Squashed commit of the following:
commit 11a27a1e61
Author: Tod Beardsley <todb@metasploit.com>
Date: Tue Dec 20 10:06:44 2011 -0600
Renaming TFTP transfer util.
See #5291. Just renaming the file.
commit 24d53efa7c
Author: Tod Beardsley <todb@metasploit.com>
Date: Tue Dec 20 10:03:04 2011 -0600
Final touches on TFTP client
See #5291. Adds an option to mess with the block size in case someone
wants to write a fuzzer or exploit that leverages that. Adds a cleanup
method to the module (pretty much required, it turns out). Looking
nearly final, just need to rename the module and I think we're good to
push to master.
commit 677cb4b152
Author: Tod Beardsley <todb@metasploit.com>
Date: Mon Dec 19 21:56:03 2011 -0600
Handle empty data sends sanely for TFTP.
Don't just hang forever -- let the user know they just send empty data.
TFTP servers don't like this of course.
commit 2b3e3725ac
Author: Tod Beardsley <todb@metasploit.com>
Date: Mon Dec 19 18:15:19 2011 -0600
TFTP adding comment docs, ability to send w/out a file.
Commenting the tricksy parts a little better for general usage.
Adding the ability to set FILEDATA instead of FILENAME, in case
only short bits of data are desired and the user doesn't want
to go to the trouble of creating a source file to upload.
commit 431ef826c9
Author: Tod Beardsley <todb@metasploit.com>
Date: Mon Dec 19 16:33:25 2011 -0600
TFTP client now uses constants, preserves trailing spaces/nulls in data
See #5291, just rediscovered the bug on this.
commit 5eaf2e7535
Author: Tod Beardsley <todb@metasploit.com>
Date: Mon Dec 19 15:50:50 2011 -0600
Adding download and loot functionality.
Still need to deal with the use case of not passing a block; blocks
should not be required, it should be okay to invoke and just wait for
the complete attribute to be true. You'll miss out on error messages but
eh, maybe those should be return values.
commit aecde6fea4
Author: Tod Beardsley <todb@metasploit.com>
Date: Mon Dec 19 12:14:40 2011 -0600
Updating TFTP client. Now with grown-up thread handling.
No longer blocks on successful connections.
commit 902d7f5ea7
Author: Tod Beardsley <todb@metasploit.com>
Date: Sun Dec 18 21:05:27 2011 -0600
Adding more to TFTP. Still need a read tho
Adds error checking and some helpful messaging in the event of an error.
In the event of a failed transfer the module exits immediately, but in
success, I'm still hanging around for several seconds after. Not a deal
breaker but can be annoying.
Also, need to implement a read as well as a write and store it as loot,
to be actually useful for most TFTP checking.
commit 23aadd04f7
Author: Tod Beardsley <todb@metasploit.com>
Date: Sun Dec 18 13:28:52 2011 -0600
Fixing merge conflict cruft
Dangit teach me to merge quickly. TFTP module now loads again.
commit 1201d7fbf2
Merge: 0b89140a6867ef
Author: Tod Beardsley <todb@metasploit.com>
Date: Fri Dec 16 22:41:22 2011 -0600
Merge branch 'tftp_client' of github_r7:rapid7/metasploit-framework into tftp_client
Conflicts:
modules/auxiliary/admin/tftp/tftp_upload_file.rb
commit 0b8914021c
Author: Tod Beardsley <todb@metasploit.com>
Date: Fri Dec 16 21:06:10 2011 -0600
Switch to vprint_status, also add skeletal cleanup def.
commit 50fa10679b
Author: Tod Beardsley <todb@metasploit.com>
Date: Fri Dec 16 18:39:09 2011 -0600
First draft of a TFTP client.
Could use some actual error checking and also needs to expose
more options.
commit a6867ef128
Author: Tod Beardsley <todb@metasploit.com>
Date: Fri Dec 16 18:39:09 2011 -0600
First draft of a TFTP client.
Could use some actual error checking and also needs to expose
more options.