Merge pull request #286 from vulncheck-oss/fix_285

Fix #285 - FileFormat and -o interaction

Author: j-baines

cli/commandline.go

@@ -769,10 +769,11 @@ func FormatFileCmdLineParse(conf *config.Config) bool {
 	}
 
 	// must be validate (to set default for payload gen) and then check third party c2
-	if !conf.ThirdPartyC2Server && !validateC2Selection(c2Selection, conf) {
+	if !validateC2Selection(c2Selection, conf) {
 		return false
 	}
-	if !conf.ThirdPartyC2Server && (conf.Lport == 0 || len(conf.Lhost) == 0) {
+
+	if conf.Lport == 0 || len(conf.Lhost) == 0 {
 		output.PrintFrameworkError("Missing exploitation options (-Lhost or -Lport)")
 
 		return false

config/config.go

@@ -315,7 +315,7 @@ func (conf *Config) GetBoolFlag(name string) bool {
 // Some C2 (ShellTunnel) don't actually care how the payload is generated, but
 // the underlying C2 might be implied depending on how the individual exploit
 // has been developed. It is certainly not a requirement to call this function
-// but it can help simplify the handling of secure shell vs insecure
+// but it can help simplify the handling of secure shell vs insecure.
 func (conf *Config) ResolveC2Payload() c2.Impl {
 	if conf.C2Type != c2.ShellTunnel {
 		return conf.C2Type