Skip to content

Commit e354176

Browse files
authored
Updates and collection management fixes (dani-garcia#5072)
* Fix collections not editable by managers Since a newer version of the web-vault we use manager were not able to create sub collections anymore. This was because of some missing details in the response of some json objects. This commit fixes this by using the `to_json_details` instead of the `to_json` Fixes dani-garcia#5066 Fixes dani-garcia#5044 * Update crates and GitHub Actions - Updated all the crates - Updated all the GHA dependencies - Configured the trivy workflow to only run on the main repo and not on forks Also selected a random new scheduled date so it will not run at the same time as all other forks. The two changes should help running this scan every day without failing, and also prevent the same for new or updated forks.
1 parent f0efec7 commit e354176

File tree

8 files changed

+175
-183
lines changed

8 files changed

+175
-183
lines changed

.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
steps:
4848
# Checkout the repo
4949
- name: "Checkout"
50-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
50+
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 #v4.2.1
5151
# End Checkout the repo
5252

5353

.github/workflows/hadolint.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ jobs:
1313
steps:
1414
# Checkout the repo
1515
- name: Checkout
16-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
16+
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 #v4.2.1
1717
# End Checkout the repo
1818

1919
# Start Docker Buildx
2020
- name: Setup Docker Buildx
21-
uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3.6.1
21+
uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
2222
# https://github.com/moby/buildkit/issues/3969
2323
# Also set max parallelism to 2, the default of 4 breaks GitHub Actions and causes OOMKills
2424
with:

.github/workflows/release.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
steps:
5959
# Checkout the repo
6060
- name: Checkout
61-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
61+
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 #v4.2.1
6262
with:
6363
fetch-depth: 0
6464

@@ -69,7 +69,7 @@ jobs:
6969

7070
# Start Docker Buildx
7171
- name: Setup Docker Buildx
72-
uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3.6.1
72+
uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
7373
# https://github.com/moby/buildkit/issues/3969
7474
# Also set max parallelism to 2, the default of 4 breaks GitHub Actions and causes OOMKills
7575
with:
@@ -165,7 +165,7 @@ jobs:
165165
echo "CONTAINER_REGISTRIES=${CONTAINER_REGISTRIES:+${CONTAINER_REGISTRIES},}localhost:5000/vaultwarden/server" | tee -a "${GITHUB_ENV}"
166166
167167
- name: Bake ${{ matrix.base_image }} containers
168-
uses: docker/bake-action@76cc8060bdff6d632a465001e4cf300684c5472c # v5.7.0
168+
uses: docker/bake-action@2e3d19baedb14545e5d41222653874f25d5b4dfb # v5.10.0
169169
env:
170170
BASE_TAGS: "${{ env.BASE_TAGS }}"
171171
SOURCE_COMMIT: "${{ env.SOURCE_COMMIT }}"
@@ -223,28 +223,28 @@ jobs:
223223
224224
# Upload artifacts to Github Actions
225225
- name: "Upload amd64 artifact"
226-
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
226+
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
227227
if: ${{ matrix.base_image == 'alpine' }}
228228
with:
229229
name: vaultwarden-${{ env.SOURCE_VERSION }}-linux-amd64
230230
path: vaultwarden-amd64
231231

232232
- name: "Upload arm64 artifact"
233-
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
233+
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
234234
if: ${{ matrix.base_image == 'alpine' }}
235235
with:
236236
name: vaultwarden-${{ env.SOURCE_VERSION }}-linux-arm64
237237
path: vaultwarden-arm64
238238

239239
- name: "Upload armv7 artifact"
240-
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
240+
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
241241
if: ${{ matrix.base_image == 'alpine' }}
242242
with:
243243
name: vaultwarden-${{ env.SOURCE_VERSION }}-linux-armv7
244244
path: vaultwarden-armv7
245245

246246
- name: "Upload armv6 artifact"
247-
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
247+
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
248248
if: ${{ matrix.base_image == 'alpine' }}
249249
with:
250250
name: vaultwarden-${{ env.SOURCE_VERSION }}-linux-armv6

.github/workflows/trivy.yml

+7-4
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,16 @@ on:
99
pull_request:
1010
branches: [ "main" ]
1111
schedule:
12-
- cron: '00 12 * * *'
12+
- cron: '08 11 * * *'
1313

1414
permissions:
1515
contents: read
1616

1717
jobs:
1818
trivy-scan:
19+
# Only run this in the master repo and not on forks
20+
# When all forks run this at the same time, it is causing `Too Many Requests` issues
21+
if: ${{ github.repository == 'dani-garcia/vaultwarden' }}
1922
name: Check
2023
runs-on: ubuntu-24.04
2124
timeout-minutes: 30
@@ -25,10 +28,10 @@ jobs:
2528
actions: read
2629
steps:
2730
- name: Checkout code
28-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
31+
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 #v4.2.1
2932

3033
- name: Run Trivy vulnerability scanner
31-
uses: aquasecurity/trivy-action@6e7b7d1fd3e4fef0c5fa8cce1229c54b2c9bd0d8 # v0.24.0
34+
uses: aquasecurity/trivy-action@5681af892cd0f4997658e2bacc62bd0a894cf564 # v0.27.0
3235
with:
3336
scan-type: repo
3437
ignore-unfixed: true
@@ -37,6 +40,6 @@ jobs:
3740
severity: CRITICAL,HIGH
3841

3942
- name: Upload Trivy scan results to GitHub Security tab
40-
uses: github/codeql-action/upload-sarif@2bbafcdd7fbf96243689e764c2f15d9735164f33 # v3.25.10
43+
uses: github/codeql-action/upload-sarif@2bbafcdd7fbf96243689e764c2f15d9735164f33 # v3.26.6
4144
with:
4245
sarif_file: 'trivy-results.sarif'

0 commit comments

Comments
 (0)