Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve fingerprinting of SMB endpoints via native_lm + recog #8452

Closed
wants to merge 10 commits into from

Conversation

jhart-r7
Copy link
Contributor

@jhart-r7 jhart-r7 commented May 25, 2017

This is a WIP for #8451. I have not fully tested it and realize there may be important fingerprinting bits in other modules that may break because of this or the particulars of how this fingerprinting is supposed to work. Posting here to get feedback and get assistance from others.

The idea here is to update smb_fingerprint to account for fingerprints first from native_os and then from native_lm, and merge them together, taking what comes from native_os in the event of conflicts.

This utilizes the recog native_lm fingerprints (https://github.com/rapid7/recog/blob/master/xml/smb_native_lm.xml) to attempt to obtain more complete/accurate fingerprints when necessary in relevant smb modules:

https://github.com/rapid7/metasploit-framework/blob/master/modules/auxiliary/scanner/smb/smb_enumshares.rb#L157
https://github.com/rapid7/metasploit-framework/blob/master/modules/auxiliary/scanner/smb/smb_uninit_cred.rb#L155
https://github.com/rapid7/metasploit-framework/blob/master/modules/auxiliary/scanner/smb/smb_version.rb#L56
https://github.com/rapid7/metasploit-framework/blob/master/modules/exploits/windows/brightstor/ca_arcserve_342.rb#L60
https://github.com/rapid7/metasploit-framework/blob/master/modules/exploits/windows/smb/ms08_067_netapi.rb#L860
https://github.com/rapid7/metasploit-framework/blob/master/modules/exploits/linux/samba/is_known_pipename.rb#L426

This will require updates to MDM (rapid7/metasploit_data_models#170)

@jhart-r7 jhart-r7 changed the title Feature/smb native lm Improve fingerprinting of SMB endpoints via native_lm + recog May 25, 2017
@egypt egypt added blocked Blocked by one or more additional tasks enhancement library labels Jun 13, 2017
@egypt egypt self-assigned this Jun 13, 2017
@busterb
Copy link
Member

busterb commented Jun 23, 2017

Anything we should still be holding for here @jhart-r7 ?

@jhart-r7
Copy link
Contributor Author

jhart-r7 commented Jun 23, 2017

@busterb yes -- as mentioned in the current description, there are several modules that rely on the SMB fingerprinting that is being changed here. We need to be sure that these continue to function and that we aren't missing out on any possible improvements to these module as a side effect of the improved fingerprinting. I believe some of the affected modules are very important from a Pro perspective and am wary of breaking a key module.

There is also the necessary updates to metasploit_data_models in rapid7/metasploit_data_models#170

@sempervictus
Copy link
Contributor

I've had this in my fork for months, hasn't run over my dog or set my house on fire (yet).
@jhart-r7: There are a few PRs which improve communication facilities outstanding. The data changes around those do suck to integrate, but stalling out several merges of function due to uncertainty about data is kind of a catch 22 (obviously not intended, but seems to be a recurring theme in discussions). My $0.02 is we merge in as much as we can and do a conflict resolution push via the community (they'll report issues soon as we break all the things). For max effect, master would be awesome, but that might require cherry picking for releases for a bit.

@bwatters-r7
Copy link
Contributor

Is this still delayed? What needs to happen?

@bwatters-r7 bwatters-r7 self-assigned this Aug 22, 2018
@jhart-r7
Copy link
Contributor Author

@bwatters-r7 there is a dependent PR rapid7/metasploit_data_models#170 that needs to get reviewed and landed, and then someone needs to review and land this PR.

@acammack-r7 acammack-r7 added the attic Older submissions that we still want to work on again label Dec 5, 2018
@acammack-r7
Copy link
Contributor

acammack-r7 commented Dec 13, 2018

Sorry @jhart-r7 , looks like we haven't been able make progress on this. To help our PR queue reflect stuff that is in flight, I am closing this and adding the attic label. You can learn about our new PR label on our wiki. I hope that we can reopen and land this once @bwatters-r7 has a chance to test.

@bwatters-r7 bwatters-r7 removed their assignment Jan 10, 2019
@jhart-r7 jhart-r7 mentioned this pull request Jan 11, 2019
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
attic Older submissions that we still want to work on again blocked Blocked by one or more additional tasks enhancement library
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants