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

Revert the revert of #3466 (Meterpreter binaries gem) #3481

Merged
merged 7 commits into from
Jul 14, 2014

Conversation

todb-r7
Copy link

@todb-r7 todb-r7 commented Jun 29, 2014

This reverts commit 9b35b0e.

This should not land on master until the Metasploit Pro folks (@trosen-r7 and friends) get their Meterpreter path specifications working the same way as Framework's does. IOW, one of those folks should land this.

See #3466 for details. (The commit message mistakenly mentions #3446)

OJ and others added 5 commits June 25, 2014 03:18
This would have made lots of people uhnappy.
This reverts commit 9b35b0e.

This should not land on master until the Metasploit Pro folks (@trosen-r7
and friends) get their Meterpreter path specifications working the
same way as Framework's does.
@OJ
Copy link
Contributor

OJ commented Jul 3, 2014

Hey @todb-r7 can we possibly include #3476 in this PR?

@todb
Copy link
Contributor

todb commented Jul 4, 2014

Capital idea. I'll merge to my branch when I'm near a proper terminal.

This incoporates @OJ's fixes as a result of gemification.
@OJ
Copy link
Contributor

OJ commented Jul 4, 2014

+1. Love your work @todb-r7

@todb-r7 todb-r7 added the hotness label Jul 4, 2014
@Meatballs1
Copy link
Contributor

Needs resolving against upstream again...

Whats the timescale on this? :)

@todb-r7
Copy link
Author

todb-r7 commented Jul 9, 2014

Man I suck at resolving merge conflicts.

Conflicts:
	Gemfile.lock
@todb-r7
Copy link
Author

todb-r7 commented Jul 9, 2014

@Meatballs1 My own Metasploit Pro development environment is old and dusty and I'm not up to speed quite yet, which is the holdup here. I can't propose a fix to Pro without getting my dev ducks in a row. That's all nearly sorted now so I should have something together shortly.

@todb-r7
Copy link
Author

todb-r7 commented Jul 10, 2014

Okay, I have a fix in that @kgray-r7 is testing now, on the Metepreter Pro source. Initial smoke testing seems to say this is a-ok.

@todb-r7
Copy link
Author

todb-r7 commented Jul 10, 2014

Adding @jlee-r7 as the assignee since he can handle both the Pro (and tell me what I did wrong) as well as the Framework sides.

@bturner-r7
Copy link
Contributor

Why do these binaries still live in framework instead of the gem? https://github.com/todb-r7/metasploit-framework/tree/reintroduce-meterpreter-gems/data/meterpreter

Sorry if this has been covered before. I'm a bit late to the party.

@todb
Copy link
Contributor

todb commented Jul 11, 2014

Trying to move the base Windows stuff first. Once that lands (and doesn't get reverted) we can start moving over bins over. Just trying to do it in stages.

@todb-r7
Copy link
Author

todb-r7 commented Jul 11, 2014

@jlee-r7 intimated he woudl land this Monday right after release cut so we could have a few days of it without impacting release schedules.

@jlee-r7 jlee-r7 merged commit 038d1e2 into rapid7:master Jul 14, 2014
jlee-r7 pushed a commit that referenced this pull request Jul 14, 2014
@todb-r7 todb-r7 deleted the reintroduce-meterpreter-gems branch November 25, 2014 17:44
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
blocked Blocked by one or more additional tasks hotness Something we're really excited about library meterpreter module tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants