Merge pull request #351 from lobsterjerusalem/fix-duplicate-output

De-duplicate product/vendor name output in cases where they are the same.

Author: j-baines

config/config.go

@@ -168,13 +168,13 @@ func NewRemoteExploit(implemented ImplementedFeatures, extype ExploitType, suppo
 	product []string, cpe []string, cve string, protocol string, defaultPort int,
 ) *Config {
 	newConf := new(Config)
+	newConf.Product = deDupeProductName(product, vendor)
 	newConf.InitFlagsStructs()
 	newConf.Impl = implemented
 	newConf.ExType = extype
 	newConf.SupportedC2 = supportedC2
 	newConf.Vendor = vendor
 	newConf.Products = product
-	newConf.Product = fmt.Sprintf("%s %s", vendor, strings.Join(product, "/"))
 	newConf.C2AutoStart = true
 	newConf.CPE = cpe
 	newConf.CVE = cve
@@ -184,18 +184,27 @@ func NewRemoteExploit(implemented ImplementedFeatures, extype ExploitType, suppo
 	return newConf
 }
 
+func deDupeProductName(product []string, vendor string) string {
+	joinedProducts := strings.Join(product, "/")
+	if joinedProducts == vendor {
+		return vendor
+	}
+
+	return fmt.Sprintf("%s %s", vendor, joinedProducts)
+}
+
 // Defines a new remote exploit and associates with CVE/Product/Protocol metadata. Usage example:.
 func NewLocalExploit(implemented ImplementedFeatures, extype ExploitType, supportedC2 []c2.Impl, vendor string,
 	product []string, cpe []string, cve string,
 ) *Config {
 	newConf := new(Config)
+	newConf.Product = deDupeProductName(product, vendor)
 	newConf.InitFlagsStructs()
 	newConf.Impl = implemented
 	newConf.ExType = extype
 	newConf.SupportedC2 = supportedC2
 	newConf.Vendor = vendor
 	newConf.Products = product
-	newConf.Product = fmt.Sprintf("%s %s", vendor, strings.Join(product, "/"))
 	newConf.C2AutoStart = true
 	newConf.CPE = cpe
 	newConf.CVE = cve