diff --git a/lib/msf/core/constants.rb b/lib/msf/core/constants.rb index e3a76cbecf..bb75269ef7 100644 --- a/lib/msf/core/constants.rb +++ b/lib/msf/core/constants.rb @@ -132,6 +132,8 @@ end MSF_LICENSE = "Metasploit Framework License (BSD)" GPL_LICENSE = "GNU Public License v2.0" BSD_LICENSE = "BSD License" +# Location: https://github.com/CoreSecurity/impacket/blob/1dba4c20e0d47ec614521e251d072116f75f3ef8/LICENSE +CORE_LICENSE = "CORE Security License (Apache 1.1)" ARTISTIC_LICENSE = "Perl Artistic License" UNKNOWN_LICENSE = "Unknown License" LICENSES = @@ -139,6 +141,7 @@ LICENSES = MSF_LICENSE, GPL_LICENSE, BSD_LICENSE, + CORE_LICENSE, ARTISTIC_LICENSE, UNKNOWN_LICENSE ] diff --git a/lib/msf/core/modules/external/shim.rb b/lib/msf/core/modules/external/shim.rb index b5ba42286b..20033de022 100644 --- a/lib/msf/core/modules/external/shim.rb +++ b/lib/msf/core/modules/external/shim.rb @@ -37,6 +37,7 @@ class Msf::Modules::External::Shim meta[:name] = mod.meta['name'].dump meta[:description] = mod.meta['description'].dump meta[:authors] = mod.meta['authors'].map(&:dump).join(",\n ") + meta[:license] = mod.meta['license'].nil? ? 'MSF_LICENSE' : mod.meta['license'] options = if drop_rhost mod.meta['options'].reject {|n, o| n == 'rhost'} diff --git a/lib/msf/core/modules/external/templates/common_metadata.erb b/lib/msf/core/modules/external/templates/common_metadata.erb index a1dcc9e11e..790c7abef1 100644 --- a/lib/msf/core/modules/external/templates/common_metadata.erb +++ b/lib/msf/core/modules/external/templates/common_metadata.erb @@ -4,4 +4,4 @@ [ <%= meta[:authors] %> ], - 'License' => MSF_LICENSE, + 'License' => <%= meta[:license] %>, diff --git a/modules/auxiliary/gather/get_user_spns.py b/modules/auxiliary/gather/get_user_spns.py index 2abb325f19..4a832ffd2a 100755 --- a/modules/auxiliary/gather/get_user_spns.py +++ b/modules/auxiliary/gather/get_user_spns.py @@ -39,6 +39,7 @@ metadata = { 'Alberto Solino' # impacket example ], 'date': '2014-09-27', + 'license': 'CORE_LICENSE', 'references': [ {'type': 'url', 'ref': 'https://github.com/CoreSecurity/impacket/blob/master/examples/GetUserSPNs.py'}, {'type': 'url', 'ref': 'https://files.sans.org/summit/hackfest2014/PDFs/Kicking%20the%20Guard%20Dog%20of%20Hades%20-%20Attacking%20Microsoft%20Kerberos%20%20-%20Tim%20Medin(1).pdf'},