Skip to content

Commit ec0055f

Browse files
Merge branch 'master' into fix/multi-region-filtering
2 parents 6759a3d + ff46281 commit ec0055f

File tree

101 files changed

+3584
-1015
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+3584
-1015
lines changed

.env

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,9 @@ TASK_RETRY_ATTEMPTS=5
7878

7979
# Valkey settings
8080
# If running Valkey and celery on host, use localhost, else use 'valkey'
81+
VALKEY_SCHEME=redis
82+
VALKEY_USERNAME=
83+
VALKEY_PASSWORD=
8184
VALKEY_HOST=valkey
8285
VALKEY_PORT=6379
8386
VALKEY_DB=0

.github/actions/trivy-scan/action.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,10 @@ runs:
117117
INPUTS_IMAGE_TAG: ${{ inputs.image-tag }}
118118

119119
- name: Comment scan results on PR
120-
if: inputs.create-pr-comment == 'true' && github.event_name == 'pull_request'
120+
if: >-
121+
inputs.create-pr-comment == 'true'
122+
&& github.event_name == 'pull_request'
123+
&& github.event.pull_request.head.repo.full_name == github.repository
121124
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
122125
env:
123126
IMAGE_NAME: ${{ inputs.image-name }}

.github/workflows/api-code-quality.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,15 @@ jobs:
3232
working-directory: ./api
3333

3434
steps:
35-
- name: Harden the runner (Audit all outbound calls)
35+
- name: Harden Runner
3636
uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
3737
with:
38-
egress-policy: audit
38+
egress-policy: block
39+
allowed-endpoints: >
40+
github.com:443
41+
pypi.org:443
42+
files.pythonhosted.org:443
43+
api.github.com:443
3944
4045
- name: Checkout repository
4146
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

.github/workflows/api-codeql.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,17 @@ jobs:
4141
- 'python'
4242

4343
steps:
44-
- name: Harden the runner (Audit all outbound calls)
44+
- name: Harden Runner
4545
uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
4646
with:
47-
egress-policy: audit
47+
egress-policy: block
48+
allowed-endpoints: >
49+
api.github.com:443
50+
github.com:443
51+
release-assets.githubusercontent.com:443
52+
uploads.github.com:443
53+
release-assets.githubusercontent.com:443
54+
objects.githubusercontent.com:443
4855
4956
- name: Checkout repository
5057
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

.github/workflows/api-container-build-push.yml

Lines changed: 31 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ jobs:
4343
permissions:
4444
contents: read
4545
steps:
46-
- name: Harden the runner (Audit all outbound calls)
46+
- name: Harden Runner
4747
uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
4848
with:
49-
egress-policy: audit
49+
egress-policy: block
5050

5151
- name: Calculate short SHA
5252
id: set-short-sha
@@ -105,10 +105,25 @@ jobs:
105105
packages: write
106106

107107
steps:
108-
- name: Harden the runner (Audit all outbound calls)
108+
- name: Harden Runner
109109
uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
110110
with:
111-
egress-policy: audit
111+
egress-policy: block
112+
allowed-endpoints: >
113+
_http._tcp.deb.debian.org:443
114+
aka.ms:443
115+
auth.docker.io:443
116+
cdn.powershellgallery.com:443
117+
dc.services.visualstudio.com:443
118+
debian.map.fastlydns.net:80
119+
files.pythonhosted.org:443
120+
github.com:443
121+
powershellinfraartifacts-gkhedzdeaghdezhr.z01.azurefd.net:443
122+
production.cloudflare.docker.com:443
123+
pypi.org:443
124+
registry-1.docker.io:443
125+
release-assets.githubusercontent.com:443
126+
www.powershellgallery.com:443
112127
113128
- name: Checkout repository
114129
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -152,11 +167,16 @@ jobs:
152167
contents: read
153168

154169
steps:
155-
- name: Harden the runner (Audit all outbound calls)
170+
- name: Harden Runner
156171
uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
157172
with:
158-
egress-policy: audit
159-
173+
egress-policy: block
174+
allowed-endpoints: >
175+
github.com:443
176+
release-assets.githubusercontent.com:443
177+
registry-1.docker.io:443
178+
auth.docker.io:443
179+
production.cloudflare.docker.com:443
160180
- name: Login to DockerHub
161181
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
162182
with:
@@ -257,10 +277,12 @@ jobs:
257277
contents: read
258278

259279
steps:
260-
- name: Harden the runner (Audit all outbound calls)
280+
- name: Harden Runner
261281
uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
262282
with:
263-
egress-policy: audit
283+
egress-policy: block
284+
allowed-endpoints: >
285+
api.github.com:443
264286
265287
- name: Trigger API deployment
266288
uses: peter-evans/repository-dispatch@28959ce8df70de7be546dd1250a005dd32156697 # v4.0.1

.github/workflows/api-container-checks.yml

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,12 @@ jobs:
2727
contents: read
2828

2929
steps:
30-
- name: Harden the runner (Audit all outbound calls)
30+
- name: Harden Runner
3131
uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
3232
with:
33-
egress-policy: audit
33+
egress-policy: block
34+
allowed-endpoints: >
35+
github.com:443
3436
3537
- name: Checkout repository
3638
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -70,10 +72,29 @@ jobs:
7072
pull-requests: write
7173

7274
steps:
73-
- name: Harden the runner (Audit all outbound calls)
75+
- name: Harden Runner
7476
uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
7577
with:
76-
egress-policy: audit
78+
egress-policy: block
79+
allowed-endpoints: >
80+
api.github.com:443
81+
mirror.gcr.io:443
82+
check.trivy.dev:443
83+
github.com:443
84+
registry-1.docker.io:443
85+
auth.docker.io:443
86+
production.cloudflare.docker.com:443
87+
debian.map.fastlydns.net:80
88+
release-assets.githubusercontent.com:443
89+
objects.githubusercontent.com:443
90+
pypi.org:443
91+
files.pythonhosted.org:443
92+
www.powershellgallery.com:443
93+
aka.ms:443
94+
cdn.powershellgallery.com:443
95+
_http._tcp.deb.debian.org:443
96+
powershellinfraartifacts-gkhedzdeaghdezhr.z01.azurefd.net:443
97+
get.trivy.dev:443
7798
7899
- name: Checkout repository
79100
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

.github/workflows/api-security.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,18 @@ jobs:
3232
working-directory: ./api
3333

3434
steps:
35-
- name: Harden the runner (Audit all outbound calls)
35+
- name: Harden Runner
3636
uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
3737
with:
38-
egress-policy: audit
38+
egress-policy: block
39+
allowed-endpoints: >
40+
pypi.org:443
41+
files.pythonhosted.org:443
42+
github.com:443
43+
auth.safetycli.com:443
44+
pyup.io:443
45+
data.safetycli.com:443
46+
api.github.com:443
3947
4048
- name: Checkout repository
4149
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

.github/workflows/api-tests.yml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ env:
2222
POSTGRES_USER: prowler_user
2323
POSTGRES_PASSWORD: prowler
2424
POSTGRES_DB: postgres-db
25+
VALKEY_SCHEME: redis
26+
VALKEY_USERNAME: ""
27+
VALKEY_PASSWORD: ""
2528
VALKEY_HOST: localhost
2629
VALKEY_PORT: 6379
2730
VALKEY_DB: 0
@@ -72,10 +75,21 @@ jobs:
7275
--health-retries 5
7376
7477
steps:
75-
- name: Harden the runner (Audit all outbound calls)
78+
- name: Harden Runner
7679
uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
7780
with:
78-
egress-policy: audit
81+
egress-policy: block
82+
allowed-endpoints: >
83+
github.com:443
84+
pypi.org:443
85+
files.pythonhosted.org:443
86+
cli.codecov.io:443
87+
keybase.io:443
88+
ingest.codecov.io:443
89+
storage.googleapis.com:443
90+
o26192.ingest.us.sentry.io:443
91+
api.github.com:443
92+
7993
8094
- name: Checkout repository
8195
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

.github/workflows/backport.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,12 @@ jobs:
2727
pull-requests: write
2828

2929
steps:
30-
- name: Harden the runner (Audit all outbound calls)
30+
- name: Harden Runner
3131
uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
3232
with:
33-
egress-policy: audit
33+
egress-policy: block
34+
allowed-endpoints: >
35+
api.github.com:443
3436
3537
- name: Check labels
3638
id: label_check

.github/workflows/ci-zizmor.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,15 @@ jobs:
3333
actions: read
3434

3535
steps:
36-
- name: Harden the runner (Audit all outbound calls)
36+
- name: Harden Runner
3737
uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
3838
with:
39-
egress-policy: audit
39+
egress-policy: block
40+
allowed-endpoints: >
41+
github.com:443
42+
ghcr.io:443
43+
pkg-containers.githubusercontent.com:443
44+
api.github.com:443
4045
4146
- name: Checkout repository
4247
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

0 commit comments

Comments
 (0)