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

Already on GitHub? Sign in to your account

Adds a few metrics-based tools and a mailmap #1380

Merged
merged 6 commits into from Mar 21, 2013

Conversation

Projects
None yet
4 participants
Contributor

todb-r7 commented Jan 24, 2013

This merge adds four new tools:

  • .mailmap : allows for easier identification of committers
  • tools/module_count.rb : Spits out a current count of modules
  • tools/module_commits.rb: Spits out who commited to a module
  • tools/committer_counts.rb : Spits out commiters by commit counts

This was part of a long-running feature branch, which is why it's now
bundled up in one big squash merge.

Squashed commit of the following:

commit de201ff6a5b304d0fedec56d9f1930abf1a10d9e
Author: Tod Beardsley todb@metasploit.com
Date: Thu Jan 24 14:48:24 2013 -0600

Rename from scorecard to merely a count

commit 8028cf838b0b560831602e3163e92d0751a4c0a9
Author: Tod Beardsley todb@metasploit.com
Date: Thu Jan 24 14:36:42 2013 -0600

Some final comment docs

commit a69fd78
Merge: e288f13 3faf4b3
Author: Tod Beardsley todb@metasploit.com
Date: Thu Jan 24 13:21:14 2013 -0600

Merge branch 'master' into committer-scorecard

I think these conflicts came from a move or a rename or something.

Conflicts:
    external/source/exploits/cve-2012-5076_2/Makefile
    external/source/exploits/cve-2012-5088/Makefile
    modules/exploits/multi/browser/java_jre17_method_handle.rb
    modules/exploits/multi/http/jenkins_script_console.rb

commit e288f13
Author: Tod Beardsley todb@metasploit.com
Date: Wed Jan 16 14:06:23 2013 -0600

Add FireFart's mail alias

commit 1b1792e
Author: Tod Beardsley todb@metasploit.com
Date: Fri Jan 18 22:41:44 2013 -0600

Fix grammar on description for webcam

commit 276388f
Author: Robin Wood robin@digininja.org
Date: Tue Jan 22 15:42:23 2013 +0000

added extra checking for strict databases

commit a40ea3d
Author: jvazquez-r7 juan.vazquez@metasploit.com
Date: Tue Jan 22 12:07:16 2013 +0100

fix data added to table

commit 738d2fa
Author: HD Moore hd_moore@rapid7.com
Date: Tue Jan 22 00:27:03 2013 -0600

Fix a stack overflow in bidirectional pipe

commit aeec5a8
Author: jvazquez-r7 juan.vazquez@metasploit.com
Date: Mon Jan 21 12:26:35 2013 +0100

Cleanup for mysql_file_enum.rb

commit 13f68f0
Author: sinn3r msfsinn3r@gmail.com
Date: Mon Jan 21 00:30:43 2013 -0600

Updates the progress function

Because the previous one was wrong.

commit d971fe0
Author: Robin Wood robin@digininja.org
Date: Sun Jan 20 21:32:02 2013 +0000

Brute force directory and file names with MySQL

commit a96ca2e
Author: Robin Wood robin@digininja.org
Date: Sun Jan 20 00:13:42 2013 +0000

added a warning and using optpath

commit aa98d85
Author: Robin Wood robin@digininja.org
Date: Sun Jan 20 00:12:38 2013 +0000

added a warning and using optpath

commit 6dd5bb8
Author: Robin Wood robin@digininja.org
Date: Sun Jan 20 00:02:07 2013 +0000

stopped using fixed table name

commit 520aeb9
Author: Robin Wood robin@digininja.org
Date: Sat Jan 19 23:41:38 2013 +0000

Fixed msftidy stuff

commit cec6a06
Author: Robin Wood robin@digininja.org
Date: Sat Jan 19 22:48:00 2013 +0000

File/dir brute forcer using MySQL

commit 3cc0f3f
Author: jvazquez-r7 juan.vazquez@metasploit.com
Date: Sun Jan 20 19:54:24 2013 +0100

finally it doesn't use FileDropper atm

commit 2670d5c
Author: jvazquez-r7 juan.vazquez@metasploit.com
Date: Sun Jan 20 17:38:37 2013 +0100

references and date updated

commit 1230d52
Author: bcoles bcoles@gmail.com
Date: Mon Jan 21 02:12:42 2013 +1030

update php_charts_exec metadata

commit cf37c59
Author: bcoles bcoles@gmail.com
Date: Mon Jan 21 02:10:48 2013 +1030

move and update php_charts_exec metadata

commit 1e86429
Author: bcoles bcoles@gmail.com
Date: Sun Jan 20 23:51:17 2013 +1030

Add PHP-Charts v1.0 PHP Code Execution Exploit

commit fe60ee6
Author: jvazquez-r7 juan.vazquez@metasploit.com
Date: Sun Jan 20 13:42:02 2013 +0100

linux stager plus little cleanup

commit 5900248
Author: Spencer McIntyre zeroSteiner@gmail.com
Date: Sat Jan 19 19:10:56 2013 -0500

use target_uri and normalize_uri as well as fix a cookie problem

commit a7ce0a5
Author: Spencer McIntyre zeroSteiner@gmail.com
Date: Fri Jan 18 14:56:52 2013 -0500

add module to execute commands via Jenkins Script Console

commit 33b8aa4
Author: jvazquez-r7 juan.vazquez@metasploit.com
Date: Fri Jan 18 18:42:27 2013 +0100

title updated

commit 63fe457
Author: Charles Smith charles.smith@n2netsec.com
Date: Thu Jan 17 16:52:02 2013 -0500

Fixed loot formatting so data is under the proper column

The credentials table was defined with the columns "User", "Password", "Host", "Port", and "SSL".  Credentials were not added in that order, however. They were added in the order "host, port, user, password, ssl" in this line:

credentials << [cred['host'], cred['port'], cred['user'], cred['password'], cred['ssl']]

I changed the order the columns were defined to fix this.

The permissions table had a similar issue. The "FileWrite" column was missing, so I added it. I also moved the "Home" column to after the "AutoCreate" column. Now the line:

permissions << [perm['host'], perm['user'], perm['dir'], perm['fileread'], perm['filewrite'], perm['filedelete'], perm['fileappend'],perm['dircreate'], perm['dirdelete'], perm['dirlist'], perm['dirsubdirs'], perm['autocreate']]

works correctly.

commit b948559
Author: jvazquez-r7 juan.vazquez@metasploit.com
Date: Thu Jan 17 21:45:13 2013 +0100

cleanup

commit 199ab00
Author: jvazquez-r7 juan.vazquez@metasploit.com
Date: Thu Jan 17 21:39:41 2013 +0100

cleanup

commit 8d55044
Author: jvazquez-r7 juan.vazquez@metasploit.com
Date: Thu Jan 17 21:27:47 2013 +0100

Added new module for cve-2012-5076

commit 31ae18f
Author: jvazquez-r7 juan.vazquez@metasploit.com
Date: Thu Jan 17 21:14:49 2013 +0100

Added module for CVE-2012-5088

commit 6ac99f3
Author: Tod Beardsley todb@metasploit.com
Date: Sat Jan 19 09:08:31 2013 -0600

Add a quick comment doc

commit 0c18f1c
Author: Tod Beardsley todb@metasploit.com
Date: Sat Jan 19 09:06:34 2013 -0600

Adds a per-module commit counter.

commit 44fa228
Merge: fa288ff 9f42abd
Author: Tod Beardsley todb@metasploit.com
Date: Sat Jan 19 08:30:37 2013 -0600

Merge remote-tracking branch 'origin/master' into committer-scorecard

commit fa288ff
Author: Tod Beardsley todb@metasploit.com
Date: Fri Jan 18 14:05:47 2013 -0600

Make module_count execable

commit 6c1625e
Author: Tod Beardsley todb@metasploit.com
Date: Tue Jan 8 09:56:48 2013 -0600

Wrote a quick module counter, by type

commit af07ddc
Merge: 2ee5df8 2c3ccb5
Author: Tod Beardsley todb@metasploit.com
Date: Tue Jan 8 09:35:28 2013 -0600

Merge remote-tracking branch 'origin/master' into committer-scorecard

commit 2ee5df8
Merge: 501c678 b50e040
Author: Tod Beardsley todb@metasploit.com
Date: Fri Jan 4 10:24:27 2013 -0600

Merge remote-tracking branch 'origin/master' into committer-scorecard

commit 501c678
Merge: 8001401 c2586d0
Author: Tod Beardsley todb@metasploit.com
Date: Thu Dec 27 15:42:25 2012 -0600

Merge branch 'master' into committer-scorecard

commit 8001401
Author: Tod Beardsley todb@metasploit.com
Date: Thu Dec 27 11:13:04 2012 -0600

Adding shuckins and cjr to the mailmap

commit ab2db49
Merge: 8b6ecb3 daf5465
Author: Tod Beardsley todb@metasploit.com
Date: Thu Dec 27 10:29:19 2012 -0600

Merge remote branch 'origin/master' into committer-scorecard

commit 8b6ecb3
Author: Tod Beardsley todb@metasploit.com
Date: Mon Dec 17 21:58:37 2012 -0600

Comment docs on .mailmap

commit 8e245a0
Author: Tod Beardsley todb@metasploit.com
Date: Mon Dec 17 21:56:06 2012 -0600

Another alias for h0ng10

commit aff6169
Author: Tod Beardsley todb@metasploit.com
Date: Mon Dec 17 17:02:35 2012 -0600

A more useful committer score card

Now with aliases for anyone who hit the top 20 list of the last year,
six months, and twelve weeks.

Still needs some optparsey niceities, but it's good enough for an
intial push to GitHub.

commit bd4e00e
Author: Tod Beardsley todb@metasploit.com
Date: Mon Dec 17 15:22:33 2012 -0600

Initial commit of a git commit scorecard
@todb todb Adds a few metrics-based tools and a mailmap
This merge adds four new tools:

  * .mailmap : allows for easier identification of committers
  * tools/module_count.rb : Spits out a current count of modules
  * tools/module_commits.rb: Spits out who commited to a module
  * tools/committer_counts.rb : Spits out commiters by commit counts

This was part of a long-running feature branch, which is why it's now
bundled up in one big squash merge.

Squashed commit of the following:

commit de201ff6a5b304d0fedec56d9f1930abf1a10d9e
Author: Tod Beardsley <todb@metasploit.com>
Date:   Thu Jan 24 14:48:24 2013 -0600

    Rename from scorecard to merely a count

commit 8028cf838b0b560831602e3163e92d0751a4c0a9
Author: Tod Beardsley <todb@metasploit.com>
Date:   Thu Jan 24 14:36:42 2013 -0600

    Some final comment docs

commit a69fd78
Merge: e288f13 3faf4b3
Author: Tod Beardsley <todb@metasploit.com>
Date:   Thu Jan 24 13:21:14 2013 -0600

    Merge branch 'master' into committer-scorecard

    I think these conflicts came from a move or a rename or something.

    Conflicts:
    	external/source/exploits/cve-2012-5076_2/Makefile
    	external/source/exploits/cve-2012-5088/Makefile
    	modules/exploits/multi/browser/java_jre17_method_handle.rb
    	modules/exploits/multi/http/jenkins_script_console.rb

commit e288f13
Author: Tod Beardsley <todb@metasploit.com>
Date:   Wed Jan 16 14:06:23 2013 -0600

    Add FireFart's mail alias

commit 1b1792e
Author: Tod Beardsley <todb@metasploit.com>
Date:   Fri Jan 18 22:41:44 2013 -0600

    Fix grammar on description for webcam

commit 276388f
Author: Robin Wood <robin@digininja.org>
Date:   Tue Jan 22 15:42:23 2013 +0000

    added extra checking for strict databases

commit a40ea3d
Author: jvazquez-r7 <juan.vazquez@metasploit.com>
Date:   Tue Jan 22 12:07:16 2013 +0100

    fix data added to table

commit 738d2fa
Author: HD Moore <hd_moore@rapid7.com>
Date:   Tue Jan 22 00:27:03 2013 -0600

    Fix a stack overflow in bidirectional pipe

commit aeec5a8
Author: jvazquez-r7 <juan.vazquez@metasploit.com>
Date:   Mon Jan 21 12:26:35 2013 +0100

    Cleanup for mysql_file_enum.rb

commit 13f68f0
Author: sinn3r <msfsinn3r@gmail.com>
Date:   Mon Jan 21 00:30:43 2013 -0600

    Updates the progress function

    Because the previous one was wrong.

commit d971fe0
Author: Robin Wood <robin@digininja.org>
Date:   Sun Jan 20 21:32:02 2013 +0000

    Brute force directory and file names with MySQL

commit a96ca2e
Author: Robin Wood <robin@digininja.org>
Date:   Sun Jan 20 00:13:42 2013 +0000

    added a warning and using optpath

commit aa98d85
Author: Robin Wood <robin@digininja.org>
Date:   Sun Jan 20 00:12:38 2013 +0000

    added a warning and using optpath

commit 6dd5bb8
Author: Robin Wood <robin@digininja.org>
Date:   Sun Jan 20 00:02:07 2013 +0000

    stopped using fixed table name

commit 520aeb9
Author: Robin Wood <robin@digininja.org>
Date:   Sat Jan 19 23:41:38 2013 +0000

    Fixed msftidy stuff

commit cec6a06
Author: Robin Wood <robin@digininja.org>
Date:   Sat Jan 19 22:48:00 2013 +0000

    File/dir brute forcer using MySQL

commit 3cc0f3f
Author: jvazquez-r7 <juan.vazquez@metasploit.com>
Date:   Sun Jan 20 19:54:24 2013 +0100

    finally it doesn't use FileDropper atm

commit 2670d5c
Author: jvazquez-r7 <juan.vazquez@metasploit.com>
Date:   Sun Jan 20 17:38:37 2013 +0100

    references and date updated

commit 1230d52
Author: bcoles <bcoles@gmail.com>
Date:   Mon Jan 21 02:12:42 2013 +1030

    update php_charts_exec metadata

commit cf37c59
Author: bcoles <bcoles@gmail.com>
Date:   Mon Jan 21 02:10:48 2013 +1030

    move and update php_charts_exec metadata

commit 1e86429
Author: bcoles <bcoles@gmail.com>
Date:   Sun Jan 20 23:51:17 2013 +1030

    Add PHP-Charts v1.0 PHP Code Execution Exploit

commit fe60ee6
Author: jvazquez-r7 <juan.vazquez@metasploit.com>
Date:   Sun Jan 20 13:42:02 2013 +0100

    linux stager plus little cleanup

commit 5900248
Author: Spencer McIntyre <zeroSteiner@gmail.com>
Date:   Sat Jan 19 19:10:56 2013 -0500

    use target_uri and normalize_uri as well as fix a cookie problem

commit a7ce0a5
Author: Spencer McIntyre <zeroSteiner@gmail.com>
Date:   Fri Jan 18 14:56:52 2013 -0500

    add module to execute commands via Jenkins Script Console

commit 33b8aa4
Author: jvazquez-r7 <juan.vazquez@metasploit.com>
Date:   Fri Jan 18 18:42:27 2013 +0100

    title updated

commit 63fe457
Author: Charles Smith <charles.smith@n2netsec.com>
Date:   Thu Jan 17 16:52:02 2013 -0500

    Fixed loot formatting so data is under the proper column

    The credentials table was defined with the columns "User", "Password", "Host", "Port", and "SSL".  Credentials were not added in that order, however. They were added in the order "host, port, user, password, ssl" in this line:

    credentials << [cred['host'], cred['port'], cred['user'], cred['password'], cred['ssl']]

    I changed the order the columns were defined to fix this.

    The permissions table had a similar issue. The "FileWrite" column was missing, so I added it. I also moved the "Home" column to after the "AutoCreate" column. Now the line:

    permissions << [perm['host'], perm['user'], perm['dir'], perm['fileread'], perm['filewrite'], perm['filedelete'], perm['fileappend'],perm['dircreate'], perm['dirdelete'], perm['dirlist'], perm['dirsubdirs'], perm['autocreate']]

    works correctly.

commit b948559
Author: jvazquez-r7 <juan.vazquez@metasploit.com>
Date:   Thu Jan 17 21:45:13 2013 +0100

    cleanup

commit 199ab00
Author: jvazquez-r7 <juan.vazquez@metasploit.com>
Date:   Thu Jan 17 21:39:41 2013 +0100

    cleanup

commit 8d55044
Author: jvazquez-r7 <juan.vazquez@metasploit.com>
Date:   Thu Jan 17 21:27:47 2013 +0100

    Added new module for cve-2012-5076

commit 31ae18f
Author: jvazquez-r7 <juan.vazquez@metasploit.com>
Date:   Thu Jan 17 21:14:49 2013 +0100

    Added module for CVE-2012-5088

commit 6ac99f3
Author: Tod Beardsley <todb@metasploit.com>
Date:   Sat Jan 19 09:08:31 2013 -0600

    Add a quick comment doc

commit 0c18f1c
Author: Tod Beardsley <todb@metasploit.com>
Date:   Sat Jan 19 09:06:34 2013 -0600

    Adds a per-module commit counter.

commit 44fa228
Merge: fa288ff 9f42abd
Author: Tod Beardsley <todb@metasploit.com>
Date:   Sat Jan 19 08:30:37 2013 -0600

    Merge remote-tracking branch 'origin/master' into committer-scorecard

commit fa288ff
Author: Tod Beardsley <todb@metasploit.com>
Date:   Fri Jan 18 14:05:47 2013 -0600

    Make module_count execable

commit 6c1625e
Author: Tod Beardsley <todb@metasploit.com>
Date:   Tue Jan 8 09:56:48 2013 -0600

    Wrote a quick module counter, by type

commit af07ddc
Merge: 2ee5df8 2c3ccb5
Author: Tod Beardsley <todb@metasploit.com>
Date:   Tue Jan 8 09:35:28 2013 -0600

    Merge remote-tracking branch 'origin/master' into committer-scorecard

commit 2ee5df8
Merge: 501c678 b50e040
Author: Tod Beardsley <todb@metasploit.com>
Date:   Fri Jan 4 10:24:27 2013 -0600

    Merge remote-tracking branch 'origin/master' into committer-scorecard

commit 501c678
Merge: 8001401 c2586d0
Author: Tod Beardsley <todb@metasploit.com>
Date:   Thu Dec 27 15:42:25 2012 -0600

    Merge branch 'master' into committer-scorecard

commit 8001401
Author: Tod Beardsley <todb@metasploit.com>
Date:   Thu Dec 27 11:13:04 2012 -0600

    Adding shuckins and cjr to the mailmap

commit ab2db49
Merge: 8b6ecb3 daf5465
Author: Tod Beardsley <todb@metasploit.com>
Date:   Thu Dec 27 10:29:19 2012 -0600

    Merge remote branch 'origin/master' into committer-scorecard

commit 8b6ecb3
Author: Tod Beardsley <todb@metasploit.com>
Date:   Mon Dec 17 21:58:37 2012 -0600

    Comment docs on .mailmap

commit 8e245a0
Author: Tod Beardsley <todb@metasploit.com>
Date:   Mon Dec 17 21:56:06 2012 -0600

    Another alias for h0ng10

commit aff6169
Author: Tod Beardsley <todb@metasploit.com>
Date:   Mon Dec 17 17:02:35 2012 -0600

    A more useful committer score card

    Now with aliases for anyone who hit the top 20 list of the last year,
    six months, and twelve weeks.

    Still needs some optparsey niceities, but it's good enough for an
    intial push to GitHub.

commit bd4e00e
Author: Tod Beardsley <todb@metasploit.com>
Date:   Mon Dec 17 15:22:33 2012 -0600

    Initial commit of a git commit scorecard
40fd695
Contributor

todb-r7 commented Jan 24, 2013

To hell with you, Travis-CI. Merges just fine:

[1.9.3-p362] (master) todb@mazikeen:~/git/rapid7/metasploit-framework$ git merge feature/mailmap_and_commit_count 
Updating fbbac2b..40fd695
Fast-forward
 .mailmap                 |   63 +++++++++++++++++++++++++++++++++++++++++
 tools/committer_count.rb |   70 ++++++++++++++++++++++++++++++++++++++++++++++
 tools/module_commits.rb  |   64 ++++++++++++++++++++++++++++++++++++++++++
 tools/module_count.rb    |   49 ++++++++++++++++++++++++++++++++
 4 files changed, 246 insertions(+)
 create mode 100644 .mailmap
 create mode 100755 tools/committer_count.rb
 create mode 100755 tools/module_commits.rb
 create mode 100755 tools/module_count.rb

And rspecs fine, too:

Finished in 9.6 seconds
460 examples, 0 failures, 12 pending
Coverage report generated for RSpec to /home/todb/git/rapid7/metasploit-framework/coverage. 18659 / 56066 LOC (33.28%) covered.
Contributor

jlee-r7 commented Jan 25, 2013

Re-queued travis build.

Contributor

jlee-r7 commented Jan 25, 2013

Looks like there are a bunch of unrelated commits squashed in here. I'm not sure how that will affect the merge.

Contributor

todb-r7 commented Mar 8, 2013

@jlee-r7 the unrelated commits are just tracking along with master. It won't make any difference with a -no-ff merge. See:

$ git merge --no-ff committer-scorecard 
Merge made by the 'recursive' strategy.
 .mailmap                  |   62 +++++++++++++++++++++++++++++++++++++++
 tools/commit_scorecard.rb |   70 +++++++++++++++++++++++++++++++++++++++++++++
 tools/module_commits.rb   |   64 +++++++++++++++++++++++++++++++++++++++++
 tools/module_count.rb     |   49 +++++++++++++++++++++++++++++++
 4 files changed, 245 insertions(+)
 create mode 100644 .mailmap
 create mode 100755 tools/commit_scorecard.rb
 create mode 100755 tools/module_commits.rb
 create mode 100755 tools/module_count.rb

@trosen-r7 trosen-r7 added a commit that referenced this pull request Mar 21, 2013

@trosen-r7 trosen-r7 Merge pull request #1380 from todb-r7/feature/mailmap_and_commit_count
Godspeed, friends.
5af14c4

@trosen-r7 trosen-r7 merged commit 5af14c4 into rapid7:master Mar 21, 2013

1 check passed

default The Travis build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment