Skip to content

Commit

Permalink
Merge branch 'main' into init_py
Browse files Browse the repository at this point in the history
  • Loading branch information
tstromberg authored Oct 15, 2024
2 parents 3837ce8 + d0fb51e commit 8e9e797
Show file tree
Hide file tree
Showing 204 changed files with 5,515 additions and 5,121 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/go-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
egress-policy: audit

- name: Checkout code
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1

- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7
with:
egress-policy: audit
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
- uses: chainguard-dev/actions/setup-gitsign@e82b4e5ae10182af72972addcb3fedf7454621c8
- name: Set up Octo-STS
uses: octo-sts/action@6177b4481c00308b3839969c3eca88c96a91775f # v1.0.0
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/style.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
egress-policy: audit

- name: Check out code
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1

- name: Set up Go
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
Expand All @@ -44,7 +44,7 @@ jobs:
egress-policy: audit

- name: Check out code
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1

- name: Set up Go
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
Expand All @@ -64,7 +64,7 @@ jobs:
with:
egress-policy: audit

- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1

- name: Set up Go
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
egress-policy: audit

- name: Check out code
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1

- name: Set up Go
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/version.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7
with:
egress-policy: audit
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
- uses: chainguard-dev/actions/setup-gitsign@e82b4e5ae10182af72972addcb3fedf7454621c8
- name: Set up Octo-STS
uses: octo-sts/action@6177b4481c00308b3839969c3eca88c96a91775f # v1.0.0
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ fix: $(FIXERS)
# END: lint-install ../malcontent

SAMPLES_REPO ?= chainguard-dev/malcontent-samples
SAMPLES_COMMIT ?= 0ff28cbe99bc4610c58016faeb1a806a6e5cebbb
SAMPLES_COMMIT ?= c3d54ad8a6893037ea16e0b5be933cbd8cad868d
OUT_DIR=out/samples-$(SAMPLES_COMMIT).tmp
out/samples-$(SAMPLES_COMMIT):
mkdir -p out
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ require (
github.com/olekukonko/tablewriter v0.0.5
github.com/shirou/gopsutil/v4 v4.24.9
github.com/ulikunitz/xz v0.5.12
github.com/urfave/cli/v2 v2.27.4
github.com/urfave/cli/v2 v2.27.5
github.com/wk8/go-ordered-map/v2 v2.1.8
golang.org/x/sync v0.8.0
golang.org/x/term v0.25.0
Expand All @@ -24,7 +24,7 @@ require (
github.com/bahlo/generic-list-go v0.2.0 // indirect
github.com/buger/jsonparser v1.1.1 // indirect
github.com/containerd/stargz-snapshotter/estargz v0.15.1 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
github.com/docker/cli v27.1.2+incompatible // indirect
github.com/docker/distribution v2.8.3+incompatible // indirect
github.com/docker/docker-credential-helpers v0.8.2 // indirect
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ github.com/chainguard-dev/clog v1.5.0 h1:VFwdxf+4x7+EG8lRO4/tZFP7Hn/NG8OVkVNfgnn
github.com/chainguard-dev/clog v1.5.0/go.mod h1:4+WFhRMsGH79etYXY3plYdp+tCz/KCkU8fAr0HoaPvs=
github.com/containerd/stargz-snapshotter/estargz v0.15.1 h1:eXJjw9RbkLFgioVaTG+G/ZW/0kEe2oEKCdS/ZxIyoCU=
github.com/containerd/stargz-snapshotter/estargz v0.15.1/go.mod h1:gr2RNwukQ/S9Nv33Lt6UC7xEx58C+LHRdoqbEKjz1Kk=
github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4=
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/cpuguy83/go-md2man/v2 v2.0.5 h1:ZtcqGrnekaHpVLArFSe4HK5DoKx1T0rq2DwVB0alcyc=
github.com/cpuguy83/go-md2man/v2 v2.0.5/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
Expand Down Expand Up @@ -87,8 +87,8 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F
github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY=
github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc=
github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
github.com/urfave/cli/v2 v2.27.4 h1:o1owoI+02Eb+K107p27wEX9Bb8eqIoZCfLXloLUSWJ8=
github.com/urfave/cli/v2 v2.27.4/go.mod h1:m4QzxcD2qpra4z7WhzEGn74WZLViBnMpb1ToCAKdGRQ=
github.com/urfave/cli/v2 v2.27.5 h1:WoHEJLdsXr6dDWoJgMq/CboDmyY/8HMMH1fTECbih+w=
github.com/urfave/cli/v2 v2.27.5/go.mod h1:3Sevf16NykTbInEnD0yKkjDAeZDS0A6bzhBH5hrMvTQ=
github.com/vbatts/tar-split v0.11.5 h1:3bHCTIheBm1qFTcgh9oPu+nNBtX+XJIupG/vacinCts=
github.com/vbatts/tar-split v0.11.5/go.mod h1:yZbwRsSeGjusneWgA781EKej9HF8vme8okylkAeNKLk=
github.com/wk8/go-ordered-map/v2 v2.1.8 h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/fJgbpc=
Expand Down
242 changes: 121 additions & 121 deletions pkg/action/testdata/scan_archive
Original file line number Diff line number Diff line change
@@ -1,121 +1,121 @@
# testdata/apko_nested.tar.gz ∴ /apko_0.13.2_linux_arm64/apko
archives/zip
combo/dropper/shell
compression/bzip2
compression/gzip
compression/zstd
crypto/aes
crypto/ecdsa
crypto/ed25519
crypto/tls
data/embedded/pem/certificate
data/embedded/pem/test_key
data/embedded/ssh/signature
data/embedded/zstd
encoding/base64
encoding/json
encoding/json/decode
encoding/json/encode
env/HOME
env/USER
evasion/content/length/0
exec/program
fs/blkid
fs/directory/create
fs/directory/list
fs/directory/remove
fs/fifo/create
fs/file/delete
fs/file/delete/forcibly
fs/file/read
fs/file/stat
fs/file/write
fs/link/create
fs/link/read
fs/lock/update
fs/mount
fs/node/create
fs/permission/chown
fs/permission/modify
fs/swap/off
fs/swap/on
fs/symlink/resolve
fs/tempfile/create
fs/unmount
hash/blake2b
hash/md5
kernel/cpu/info
kernel/hostname/get
kernel/netlink
kernel/pivot_root
kernel/platform
net/dns
net/dns/reverse
net/dns/servers
net/dns/txt
net/download
net/fetch
net/hostname/resolve
net/http/accept/encoding
net/http/auth
net/http/cookies
net/http/form/upload
net/http/post
net/http/request
net/http2
net/http_proxy
net/interface/list
net/ip
net/ip/parse
net/mac/address
net/sendfile
net/socket/listen
net/socket/local/address
net/socket/peer/address
net/socket/receive
net/socket/send
net/socks5
net/ssh
net/stat
net/udp/receive
net/udp/send
net/upload
net/url
net/url/encode
net/url/request
persist/crontab
process/chdir
process/chroot
process/executable_path
process/find
process/groups/set
process/unshare
process/username/get
ref/daemon
ref/ip_port
ref/path/bin/su
ref/path/etc
ref/path/etc/hosts
ref/path/etc/resolv.conf
ref/path/hidden
ref/path/home
ref/path/home/config
ref/path/relative
ref/path/root
ref/path/usr/bin
ref/path/usr/local
ref/path/usr/sbin
ref/path/var
ref/site/url
ref/words/exclamation
ref/words/heartbeat
ref/words/password
ref/words/plugin
ref/words/server_address
secrets/keychain
secrets/private_key
secrets/ssh
security_controls/linux/selinux
shell/background/sleep
shell/exec
time/clock/set
# testdata/apko_nested.tar.gz ∴ /apko_0.13.2_linux_arm64/apko: medium
archives/zip: medium
combo/dropper/shell: medium
compression/bzip2: low
compression/gzip: low
compression/zstd: low
crypto/aes: low
crypto/ecdsa: low
crypto/ed25519: low
crypto/tls: low
data/embedded/pem/certificate: low
data/embedded/pem/test_key: low
data/embedded/ssh/signature: medium
data/embedded/zstd: medium
encoding/base64: low
encoding/json: low
encoding/json/decode: low
encoding/json/encode: low
env/HOME: low
env/USER: low
evasion/content/length/0: medium
exec/program: medium
fs/blkid: low
fs/directory/create: low
fs/directory/list: low
fs/directory/remove: low
fs/fifo/create: low
fs/file/delete: low
fs/file/delete/forcibly: low
fs/file/read: low
fs/file/stat: low
fs/file/write: low
fs/link/create: low
fs/link/read: low
fs/lock/update: low
fs/mount: low
fs/node/create: low
fs/permission/chown: medium
fs/permission/modify: medium
fs/swap/off: low
fs/swap/on: low
fs/symlink/resolve: low
fs/tempfile/create: low
fs/unmount: low
hash/blake2b: low
hash/md5: low
kernel/cpu/info: low
kernel/hostname/get: low
kernel/netlink: low
kernel/pivot_root: low
kernel/platform: low
net/dns: low
net/dns/reverse: medium
net/dns/servers: low
net/dns/txt: low
net/download: medium
net/fetch: medium
net/hostname/resolve: low
net/http/accept/encoding: low
net/http/auth: low
net/http/cookies: medium
net/http/form/upload: medium
net/http/post: medium
net/http/request: low
net/http2: low
net/http_proxy: low
net/interface/list: medium
net/ip: low
net/ip/parse: medium
net/mac/address: medium
net/sendfile: low
net/socket/listen: low
net/socket/local/address: low
net/socket/peer/address: low
net/socket/receive: low
net/socket/send: low
net/socks5: medium
net/ssh: medium
net/stat: medium
net/udp/receive: low
net/udp/send: low
net/upload: medium
net/url: low
net/url/encode: medium
net/url/request: medium
persist/crontab: medium
process/chdir: low
process/chroot: low
process/executable_path: low
process/find: medium
process/groups/set: low
process/unshare: low
process/username/get: medium
ref/daemon: medium
ref/ip_port: medium
ref/path/bin/su: low
ref/path/etc: low
ref/path/etc/hosts: medium
ref/path/etc/resolv.conf: low
ref/path/hidden: medium
ref/path/home: medium
ref/path/home/config: low
ref/path/relative: medium
ref/path/root: medium
ref/path/usr/bin: low
ref/path/usr/local: medium
ref/path/usr/sbin: low
ref/path/var: low
ref/site/url: low
ref/words/exclamation: medium
ref/words/heartbeat: medium
ref/words/password: low
ref/words/plugin: low
ref/words/server_address: medium
secrets/keychain: medium
secrets/private_key: low
secrets/ssh: medium
security_controls/linux/selinux: medium
shell/background/sleep: medium
shell/exec: medium
time/clock/set: low
34 changes: 17 additions & 17 deletions pkg/action/testdata/scan_oci
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# testdata/static.tar.xz ∴ /etc/profile
fs/file/permission/mask/set
persist/bash
persist/shell/init_files
ref/path/etc
ref/path/usr
ref/path/usr/local
# testdata/static.tar.xz ∴ /var/lib/db/sbom/ca-certificates-bundle-20240705-r0.spdx.json
net/download
ref/site/url
# testdata/static.tar.xz ∴ /var/lib/db/sbom/tzdata-2024b-r0.spdx.json
net/download
ref/site/url
time/tzinfo
# testdata/static.tar.xz ∴ /var/lib/db/sbom/wolfi-baselayout-20230201-r15.spdx.json
net/download
ref/site/url
# testdata/static.tar.xz ∴ /etc/profile: medium
fs/file/permission/mask/set: none
persist/bash: medium
persist/shell/init_files: low
ref/path/etc: low
ref/path/usr: none
ref/path/usr/local: medium
# testdata/static.tar.xz ∴ /var/lib/db/sbom/ca-certificates-bundle-20240705-r0.spdx.json: medium
net/download: medium
ref/site/url: low
# testdata/static.tar.xz ∴ /var/lib/db/sbom/tzdata-2024b-r0.spdx.json: medium
net/download: medium
ref/site/url: low
time/tzinfo: low
# testdata/static.tar.xz ∴ /var/lib/db/sbom/wolfi-baselayout-20230201-r15.spdx.json: medium
net/download: medium
ref/site/url: low
Loading

0 comments on commit 8e9e797

Please sign in to comment.