Merge pull request #259 from vulncheck-oss/fixfileserve

Fixes stand-alone fileserve

Author: j-baines

c2/httpservefile/httpservefile.go

@@ -101,8 +101,21 @@ func (httpServer *Server) Init(channel channel.Channel) bool {
 
 		return false
 	}
-	httpServer.HTTPAddr = channel.HTTPAddr
-	httpServer.HTTPPort = channel.HTTPPort
+
+	switch {
+	case channel.HTTPPort == 0 && channel.Port != 0:
+		// must be stand-alone invocation of HTTPServeFile
+		httpServer.HTTPAddr = channel.IPAddr
+		httpServer.HTTPPort = channel.Port
+	case channel.HTTPPort != 0:
+		// must be used with another C2
+		httpServer.HTTPAddr = channel.HTTPAddr
+		httpServer.HTTPPort = channel.HTTPPort
+	default:
+		output.PrintFrameworkError("Called HTTPServeFile without specifying a bind port.")
+
+		return false
+	}
 
 	// split the provided files, read them in, and store them in the map
 	files := strings.Split(httpServer.FilesToServe, ",")