Skip to content

Commit 71fddf9

Browse files
committed
ignore bin directory, print more information about server.
1 parent 1b0c794 commit 71fddf9

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,8 @@
1515
# Dependency directories (remove the comment below to include it)
1616
# vendor/
1717

18+
# build
19+
bin
20+
1821
# GoLand
1922
.idea

log4shell.go

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ type Config struct {
5050
// check and exploit Apache Log4j2 vulnerability easily.
5151
type Server struct {
5252
logger *log.Logger
53+
hostname string
5354
enableTLS bool
5455

5556
secret string
@@ -162,6 +163,7 @@ func New(cfg *Config) (*Server, error) {
162163
// create log4shell server
163164
server := Server{
164165
logger: logger,
166+
hostname: cfg.Hostname,
165167
enableTLS: enableTLS,
166168
secret: secret,
167169
httpListener: httpListener,
@@ -213,6 +215,8 @@ func (srv *Server) Start() error {
213215
case <-time.After(250 * time.Millisecond):
214216
}
215217

218+
srv.logger.Println("[info]", "current hostname:", srv.hostname)
219+
srv.logger.Println("[info]", "secret about http handler:", srv.secret)
216220
if srv.enableTLS {
217221
srv.logger.Println("[info]", "start https server", srv.httpListener.Addr())
218222
srv.logger.Println("[info]", "start ldaps server", srv.ldapListener.Addr())
@@ -231,14 +235,22 @@ func (srv *Server) Stop() error {
231235

232236
// close ldap server
233237
srv.ldapServer.Stop()
234-
srv.logger.Println("[info]", "ldap server is stopped")
238+
if srv.enableTLS {
239+
srv.logger.Println("[info]", "ldaps server is stopped")
240+
} else {
241+
srv.logger.Println("[info]", "ldap server is stopped")
242+
}
235243

236244
// close http server
237245
err := srv.httpServer.Close()
238246
if err != nil {
239247
return errors.Wrap(err, "failed to close http server")
240248
}
241-
srv.logger.Println("[info]", "http server is stopped")
249+
if srv.enableTLS {
250+
srv.logger.Println("[info]", "https server is stopped")
251+
} else {
252+
srv.logger.Println("[info]", "http server is stopped")
253+
}
242254

243255
srv.wg.Wait()
244256
srv.logger.Println("[info]", "log4shell server is stopped")

0 commit comments

Comments
 (0)