Skip to content

Commit df44ca5

Browse files
dependabot[bot]egibs
dependabot[bot]
and
egibs
authored
Bump github.com/gabriel-vasile/mimetype from 1.4.9 to 1.4.10 in the all group (#1102)
* Bump github.com/gabriel-vasile/mimetype in the all group Bumps the all group with 1 update: [github.com/gabriel-vasile/mimetype](https://github.com/gabriel-vasile/mimetype). Updates `github.com/gabriel-vasile/mimetype` from 1.4.9 to 1.4.10 - [Release notes](https://github.com/gabriel-vasile/mimetype/releases) - [Commits](gabriel-vasile/mimetype@v1.4.9...v1.4.10) --- updated-dependencies: - dependency-name: github.com/gabriel-vasile/mimetype dependency-version: 1.4.10 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all ... Signed-off-by: dependabot[bot] <support@github.com> * Fix JS shellscript edge case Signed-off-by: egibs <20933572+egibs@users.noreply.github.com> * Revert header size change Signed-off-by: egibs <20933572+egibs@users.noreply.github.com> * More correct comment Signed-off-by: egibs <20933572+egibs@users.noreply.github.com> * Fix test cases Signed-off-by: egibs <20933572+egibs@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: egibs <20933572+egibs@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: egibs <20933572+egibs@users.noreply.github.com>
1 parent 03bb7cf commit df44ca5

5 files changed

Lines changed: 17 additions & 10 deletions

File tree

‎go.mod‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ require (
1616
github.com/cosnicolaou/pbzip2 v1.0.5
1717
github.com/egibs/go-debian v0.18.0
1818
github.com/fatih/color v1.18.0
19-
github.com/gabriel-vasile/mimetype v1.4.9
19+
github.com/gabriel-vasile/mimetype v1.4.10
2020
github.com/google/go-cmp v0.7.0
2121
github.com/google/go-containerregistry v0.20.6
2222
github.com/klauspost/compress v1.18.0
@@ -77,7 +77,6 @@ require (
7777
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
7878
github.com/yusufpapurcu/wmi v1.2.4 // indirect
7979
golang.org/x/crypto v0.37.0 // indirect
80-
golang.org/x/net v0.39.0 // indirect
8180
golang.org/x/sys v0.35.0 // indirect
8281
golang.org/x/text v0.24.0 // indirect
8382
google.golang.org/protobuf v1.36.3 // indirect

‎go.sum‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6
5151
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM=
5252
github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
5353
github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
54-
github.com/gabriel-vasile/mimetype v1.4.9 h1:5k+WDwEsD9eTLL8Tz3L0VnmVh9QxGjRmjBvAG7U/oYY=
55-
github.com/gabriel-vasile/mimetype v1.4.9/go.mod h1:WnSQhFKJuBlRyLiKohA/2DtIlPFAbguNaG7QCHcyGok=
54+
github.com/gabriel-vasile/mimetype v1.4.10 h1:zyueNbySn/z8mJZHLt6IPw0KoZsiQNszIpU+bX4+ZK0=
55+
github.com/gabriel-vasile/mimetype v1.4.10/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s=
5656
github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
5757
github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
5858
github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
@@ -147,8 +147,6 @@ golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE=
147147
golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc=
148148
golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 h1:MDc5xs78ZrZr3HMQugiXOAkSZtfTpbJLDr/lwfgO53E=
149149
golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
150-
golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
151-
golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
152150
golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
153151
golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
154152
golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

‎pkg/programkind/programkind.go‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ var supportedKind = map[string]string{
9494
"scptd": "application/x-applescript",
9595
"script": "text/x-generic-script",
9696
"service": "text/x-systemd",
97-
"sh": "application/x-sh",
97+
"sh": "text/x-shellscript",
9898
"so": "application/x-sharedlib",
9999
"ts": "application/typescript",
100100
"upx": "application/x-upx",
@@ -224,6 +224,11 @@ func makeFileType(path string, ext string, mime string) *FileType {
224224
return Path(".elf")
225225
}
226226

227+
// fix mimetype bug that detects certain .js files as shellscript
228+
if mime == "text/x-shellscript" && strings.Contains(path, ".js") {
229+
return Path(".js")
230+
}
231+
227232
if strings.Contains(mime, "application") || strings.Contains(mime, "text/x-") || strings.Contains(mime, "executable") {
228233
return &FileType{
229234
Ext: ext,
@@ -324,6 +329,7 @@ func File(path string) (*FileType, error) {
324329
case bytes.HasPrefix(hdr, ZMagic):
325330
return Path(".Z"), nil
326331
}
332+
327333
return nil, nil
328334
}
329335

‎pkg/programkind/programkind_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ func TestFile(t *testing.T) {
1616
want *FileType
1717
}{
1818
{"expr", &FileType{MIME: "application/x-mach-binary", Ext: "macho"}},
19-
{"snmpd", &FileType{MIME: "application/x-sh", Ext: "sh"}},
19+
{"snmpd", &FileType{MIME: "text/x-shellscript", Ext: "sh"}},
2020
{"test.pl", &FileType{MIME: "text/x-perl", Ext: "pl"}},
2121
{"peclcmd", &FileType{MIME: "text/x-php", Ext: "php"}},
22-
{"test.sh", &FileType{MIME: "application/x-sh", Ext: "sh"}},
22+
{"test.sh", &FileType{MIME: "text/x-shellscript", Ext: "sh"}},
2323
{"libpam.so.0", &FileType{MIME: "application/x-sharedlib", Ext: "so"}},
2424
{"ls", &FileType{MIME: "application/x-elf", Ext: "elf"}},
2525
{"tiny", &FileType{MIME: "application/x-elf", Ext: "elf"}},
@@ -44,7 +44,7 @@ func TestPath(t *testing.T) {
4444
want *FileType
4545
}{
4646
{"applescript.scpt", &FileType{MIME: "application/x-applescript", Ext: "scpt"}},
47-
{"./shell.sh", &FileType{MIME: "application/x-sh", Ext: "sh"}},
47+
{"./shell.sh", &FileType{MIME: "text/x-shellscript", Ext: "sh"}},
4848
{"ls", nil},
4949
{"/etc/systemd/system/launcher.service", &FileType{MIME: "text/x-systemd", Ext: "service"}},
5050
{"yarn-package.json", &FileType{MIME: "application/json", Ext: "json"}},

‎tests/linux/mimipenguin/python/mimipenguin.simple‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,14 @@ credential/os/shadow: medium
66
credential/password: low
77
credential/password/finder: high
88
credential/ssh/d: medium
9+
data/base64/decode: medium
910
data/encoding/base64: low
1011
discover/process/name: medium
1112
discover/processes/list: medium
13+
discover/system/platform: medium
14+
exec/imports/python: low
1215
exfil/stealer/password: critical
16+
fs/directory/list: low
1317
fs/file/open: low
1418
fs/path/etc: low
1519
fs/path/usr_bin: low

0 commit comments

Comments
 (0)