argument changes, readme, etc

README.md

@@ -1,23 +1,24 @@
-# potknocker
-
-> scans for ssh/ftp honeypots and loads arbitrary payloads onto them, like zip bombs
-
 <p align="center">
     <img  src="https://i.imgur.com/A6Y5Y7P.png"  width="150"  title="latina">
 </p>
 <p align="center">
-"pinche sombreros blancos..."
+"pinche blancosombreros..."
 </p>
 
+# potknocker
+
+> scans for ssh/ftp honeypots and loads arbitrary payloads onto them, such as zip bombs
+
+
 ## usage
 
 ```
-! -r         target specific cidr range [0.0.0.0/0]
+  -r         target specific cidr range [0.0.0.0/0]
   -l         list of target cidr's (individual ip = /32)
-! -ssh       target ssh honeypots
-! -ftp       target ftp honeypots
-! -p         payload file to upload
+  -ssh       target ssh honeypots
+  -ftp       target ftp honeypots
+  -p         payload file to upload
   -c         shell command to run after uploading ssh payload
   -t         threads [25]
-  -s         silence connection attempt logs
+  -s         silence connection attempt verbosity
 ```

common/config.go

@@ -42,9 +42,11 @@ func LoadConf() {
 		fatal("are you targeting ssh (-ssh) or ftp (-ftp)?")
 	}
 
+	if *payload != "" {
 		if _, err := os.Stat(*payload); err != nil {
 			fatal("payload '" + *payload + "' not found")
 		}
+	}
 
 	targetcidr := ""
 	if *list == "" && *cidr == "" {

common/console.go

@@ -37,21 +37,22 @@ func usage() {
 	Banner()
 	fmt.Fprintf(os.Stderr, `
 potknocker - the block party on honeypot street
-%s!%s -r         %starget specific cidr range [0.0.0.0/0]%s
-  -l         %slist of target cidr's (individual ip = /32)%s
-%s!%s -ssh       %starget ssh honeypots%s
-%s!%s -ftp       %starget ftp honeypots
-%s!%s -p         %spayload file to upload%s
-  -c         %sshell command to run after uploading ssh payload%s
+%s!%s -r         %starget specific cidr range [0.0.0.0/0]
+%s!%s -l         %slist of target cidr's (individual ip = /32)%s
+  -p         %spayload file to upload to the pot%s
+  -c         %sshell commands to run on the pot
+%s!%s -ssh       %starget ssh honeypots
+%s!%s -ftp       %starget ftp honeypots%s
   -t         %sthreads [25]%s
   -s         %ssilence attempt logs%s
-`, colorRed, colorCyan, colorPurple, colorCyan, colorPurple, colorCyan, colorYellow, colorCyan, colorPurple,
-		colorCyan, colorYellow, colorCyan, colorPurple, colorRed, colorCyan, colorPurple, colorCyan, colorPurple,
-		colorCyan, colorPurple, colorCyan, colorPurple, colorReset)
+`, colorRed, colorCyan, colorPurple, colorRed, colorCyan, colorPurple, colorCyan, colorPurple, colorCyan,
+		colorPurple, colorRed, colorCyan, colorPurple, colorRed, colorCyan, colorPurple, colorCyan, colorPurple,
+		colorCyan, colorPurple, colorReset)
 }
 
 func Banner() {
 	fmt.Fprintf(os.Stderr, `
+      %s"i see a silly goose"%s
             ___________    ____
      ______/   \__//   \__/____\
    _/   \_/              //____\\
@@ -67,8 +68,6 @@ func Banner() {
                 /____             /
                /     \           /
                \______\_________/
-
-%spotknocker - doing burnouts down honeypot street%s
 sincerely,
    ~delorean
 `, colorRed, colorReset)

common/exec.go

@@ -13,14 +13,16 @@ func thread(addrs <-chan string, tab chan<- interface{}) {
 				}
 				if c, err := connssh(addr); err == nil {
 					success("connected to " + addr + " - " + string(c.ServerVersion()))
+					if Params.Payload != "" {
 						if err = loadpl(c); err == nil {
 							success("wrote payload to " + c.RemoteAddr().String())
+						}
+					}
 					if Params.Command != "" {
 						if err = runcmd(c, Params.Command); err == nil {
 							success("executed command on " + c.LocalAddr().String() + " as " + c.User())
 						}
 					}
-					}
 					c.Close()
 				}
 			}