James Lee
e7809b1b3b
Remove print_status line from db.rb
...
Not defined in that context, causes stack traces on db_import
2012-04-10 11:07:23 -06:00
Tod Beardsley
366cb2ff08
Merge branch 'egypt-packetwise'
...
Added in the upstream PacketFu changes and this all looks good for the
importer. Thanks!
2012-04-09 15:59:33 -05:00
Tod Beardsley
b8129f9463
Updating PacketFu to match upstream
2012-04-09 15:47:21 -05:00
sinn3r
71d2ef71f8
Don't want to print vuln.info if it's nil
2012-04-09 15:38:02 -05:00
sinn3r
ab5a4beb99
Merge branch 'andurin-5837' of https://github.com/wchen-r7/metasploit-framework into wchen-r7-andurin-5837
2012-04-09 15:18:55 -05:00
sinn3r
bef12478fc
Merge branch 'bap-refactor' of https://github.com/jlee-r7/metasploit-framework into jlee-r7-bap-refactor
2012-04-09 09:58:22 -05:00
James Lee
b58a87b7a8
Skip ::1 as well as 127.0.0.1 for session_host
...
Thanks rsmudge for pointing this out.
[Fixes #6599 ]
2012-04-08 14:58:39 -06:00
James Lee
9ae9509cfe
More fingerprints from browsershots
2012-04-08 11:12:32 -06:00
sinn3r
c6162bbe08
I've changed my mind. Default to "/" anyway even if it's nil.
2012-04-07 19:47:28 -05:00
sinn3r
cfb34739f9
Actually, let's default to "/" only if the TARGETURI option is empty. If it's nil, we prefer to throw the exception at the user.
2012-04-07 19:44:34 -05:00
sinn3r
9a229dfcff
Make target_uri default to "/" in case the TARGETURI option is nil or empty
2012-04-07 19:43:19 -05:00
James Lee
bac6bcd6f1
More fingerprints from browsershots
2012-04-06 18:41:14 -06:00
James Lee
31e3eb7d91
Merge branch 'rapid7' into bap-refactor
2012-04-06 18:12:49 -06:00
James Lee
bb4e37b7aa
Add a few fingerprints. Thanks browsershots.org!
2012-04-06 18:09:19 -06:00
andurin
274404716f
Show vuln.info on db_vuln command
...
IssueID #5837
2012-04-06 14:47:36 +02:00
HD Moore
0f7b08781f
Fix regular expression match number
2012-04-05 12:55:54 -05:00
James Lee
585245501a
Print an error when trying to open a dir as a file
...
Prevents unnecessary stack traces
2012-04-05 11:49:03 -06:00
James Lee
2c992c976d
Cut session info at 80 columns
...
Prevents a long "id" line from destroying the layout
2012-04-05 11:07:42 -06:00
sinn3r
8628991b1d
Merge pull request #305 from jlee-r7/bap-refactor
...
Bap refactor
2012-04-05 08:02:43 -07:00
James Lee
778fed9a19
Put things in the right namespace
2012-04-05 01:22:27 -06:00
James Lee
0ddfa79a34
Move javascriptosdetect out to its own file
...
Allows editors to easily highlight correctly which makes editing a
little nicer. Also makes it easier to debug because line numbers are
only off by the length of the custom_js argument.
2012-04-04 17:07:17 -06:00
sinn3r
57c22a50fa
Merge pull request #296 from allfro/patch-1
...
rpc_loots method uses the wrong iteration variable ('n' instead of 'l')
2012-04-04 13:58:18 -07:00
James Lee
32654b3578
Whitespace at EOL
2012-04-04 09:41:50 -06:00
James Lee
e901f9cc50
Add a couple of fingerprints and sort some
...
This is in terrible need of some more crowd-sourced fingerprint
gathering.
2012-04-03 18:18:32 -06:00
allfro
bed6e06e0a
Error in tag. Should be :updated_at instead of :modified_at.
2012-04-03 14:52:45 -03:00
James Lee
32b1e22d25
Revert "Update packetfu to 1.1.4"
...
This reverts commit 24e6131ad7
.
2012-04-03 10:28:22 -06:00
James Lee
04858220f2
Don't read in the whole pcap file when importing
...
Still not amazingly fast (about 500 packets per second in my tests), but
now it won't eat all your ram and start crashing things when given a
large file. Requires an upgrade to PacketFu containing pull request 5.
2012-04-03 10:22:36 -06:00
allfro
60fa58c9cf
rpc_loots method uses the wrong iteration variable ('n' instead of 'l') for service.port and service:
...
n.service.port should be l.service.port
n.service should be l.service
2012-04-03 13:10:10 -03:00
Brandon Perry
4a3d2a18de
hard tabs
2012-04-02 21:42:51 -05:00
Brandon Perry
a4d9e59934
silly registry typos
2012-04-02 21:33:01 -05:00
Jonathan Cran
9dbd5e87fd
move the lab code to a gem, and make sure the plugin warns users to install the gem
2012-04-02 16:00:43 -05:00
James Lee
24e6131ad7
Update packetfu to 1.1.4
2012-04-01 20:00:17 -06:00
HD Moore
afe3168a36
Enable additional migration-path parameters, use a temporary directory to bring the database online
...
Conflicts:
lib/msf/core/db_manager.rb
2012-03-31 12:05:54 -05:00
James Lee
62a54e0ad6
Account for stagers that use Assembly
...
Since staged payloads end up with an array of architectures, this was
failing to find a cpu and causing uncaught exceptions that crashed
msfconsole at startup. This only occurred when a stager contained an
Assembly directive. None of the default paylaods do this, so users
should generally not have been affected.
2012-03-30 17:57:56 -06:00
James Lee
11a1ae3a8d
Typo in a comment
2012-03-30 16:30:13 -06:00
Tod Beardsley
bd4819e8f2
Merge pull request #238 from mak/linux-x64-find-port
...
linux/x64/shell_find_port payload
2012-03-29 05:54:54 -07:00
Michael Schierl
016ba1613d
fix generating war files for Java payloads from within msfconsole
...
This fixes this use case:
use payload/java/meterpreter/reverse_tcp
generate -t war -f filename.war
2012-03-28 14:02:46 -06:00
James Lee
e522b40465
Make sure session.target_host gets resolved
...
Not sure why this isn't already resolved when we read it out of the
datastore. May have something to do with the recent options madness.
[Fixes #6567 ]
2012-03-28 13:44:23 -06:00
Tod Beardsley
b1683c94ef
Merge pull request #281 from jlee-r7/module-tests
...
Module tests
2012-03-27 10:23:20 -07:00
James Lee
812457fed0
Rename enum_user_dirs
2012-03-27 10:52:16 -06:00
Tod Beardsley
a0f0aadad3
Fixing checksum uri generator again.
...
This time, it's ensured that generate_uri_checksum(sum) will succeed,
provided the sum is an even number between 80 and 100 (tested)
It's still not great for arbitrary checksum targets, but that's because
there are lots of strings that cannot satisfy the requirement. I kind of
think this is the fault of Rex.
2012-03-27 08:34:52 -05:00
HD Moore
ad92eff66c
Correct an issue where launched exploits only used saved configurations
2012-03-26 22:43:33 -05:00
Tod Beardsley
eb9b92268e
Merge pull request #257 from ChrisJohnRiley/base32
...
Added a Rex library for encoding to/from Base32, based on Samuel Tesla's free Ruby implementation.
2012-03-26 17:34:19 -07:00
James Lee
98882621c0
Allow empty values for OptRegexp options
2012-03-26 17:06:43 -06:00
James Lee
84197a8903
Return a proper value instead of a silly print
2012-03-26 15:40:43 -06:00
Tod Beardsley
5cacf5f8f6
A still cleaner checksummed URI generator
...
Now with http and https support.
2012-03-26 12:34:30 -05:00
Tod Beardsley
899c6529c3
Revert "Precalculate some uri strings in case the 1000-round generation fails"
...
This reverts commit 7161a548f4
.
Prepping for a more sane solution that doesn't change the URI sizes and
succeeds without fallingback to a pre-generated list.
2012-03-26 12:34:30 -05:00
hdm
27d3f490f7
Precalculate some uri strings in case the 1000-round generation fails
2012-03-26 12:33:54 -05:00
Tod Beardsley
9fad028d8a
A nicer checksum fixer
...
Just use a checksum digit like a cc#, no need for precalculated lists,
will be correct every time.
2012-03-26 11:59:29 -05:00
Tod Beardsley
b2b2580dbf
Adding the correct url for exploit-db exploits.
2012-03-22 14:26:46 -05:00