Skip to content

Commit

Permalink
Merge branch 'master' into improve-scanner-reliability
Browse files Browse the repository at this point in the history
  • Loading branch information
breadchris committed Dec 16, 2021
2 parents a499653 + fb5deb3 commit cfe2c1b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions tools/log4shell/constants/fs.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,6 @@ const (
JarFileExt = ".jar"
WarFileExt = ".war"
ZipFileExt = ".zip"
EarFileExt = ".ear"
ClassFileExt = ".class"
)
2 changes: 1 addition & 1 deletion tools/log4shell/scan/scan.go
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ func (s *Log4jDirectoryScanner) scanFile(
findings = []types.Finding{*finding}
}
return
case constants.JarFileExt, constants.WarFileExt:
case constants.JarFileExt, constants.WarFileExt, constants.ZipFileExt, constants.EarFileExt:
if s.onlyScanArchives {
finding := s.scanArchiveFile(path, file)
if finding != nil {
Expand Down

0 comments on commit cfe2c1b

Please sign in to comment.