Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
c9ef52d
Merge pull request #166 from DefGuard/release_1.5_merger
wojcik91 Sep 15, 2025
945465c
Fixes pentest issue DG25-16 from 2025-09-02 (#159)
j-chmielewski Sep 16, 2025
3c0025e
Do not display sensitive data from protos (#167)
moubctez Sep 17, 2025
818389d
use the same phone regex as backend does (#168)
j-chmielewski Sep 19, 2025
89d4088
Web next wip (#170)
filipslezaklab Sep 24, 2025
13bcad8
fix dockerfile web build
filipslezaklab Sep 24, 2025
cef42e0
Merge branch 'main' into main-1.5.1-merger
j-chmielewski Sep 26, 2025
482debf
Merge pull request #172 from DefGuard/main-1.5.1-merger
j-chmielewski Sep 26, 2025
efb3d39
Create SBOM files (#173)
j-chmielewski Sep 26, 2025
c5b3360
CI: scan code with trivy (#174)
j-chmielewski Sep 26, 2025
b427e12
Handle not found error (#175)
moubctez Sep 29, 2025
0d40dee
Periodic sbom regeneration (#176)
j-chmielewski Sep 29, 2025
1ff841b
ui update (#177)
filipslezaklab Sep 29, 2025
89fdd7a
handle openid callback (#179)
filipslezaklab Sep 30, 2025
b47e803
update menu component (#180)
filipslezaklab Sep 30, 2025
3a6a3db
webnext update (#181)
filipslezaklab Oct 2, 2025
9e52d53
health checks return alive (#182)
jakub-tldr Oct 3, 2025
5a0e817
add favicon (#183)
filipslezaklab Oct 6, 2025
8546d1f
use update service api for client links (#184)
filipslezaklab Oct 6, 2025
6266eae
footer update (#185)
filipslezaklab Oct 6, 2025
a1b823e
Always add x-powered-by HTTP header (#186)
moubctez Oct 6, 2025
be5d0cd
handle update service fallback (#187)
filipslezaklab Oct 6, 2025
364ee35
e2e update (#188)
filipslezaklab Oct 7, 2025
b8155a4
Reorder pages (#189)
filipslezaklab Oct 8, 2025
e1c5954
add icon warning (#190)
filipslezaklab Oct 8, 2025
cd06899
fix info banner warning variant bg color (#191)
filipslezaklab Oct 8, 2025
9bf08f6
fix info banner (#192)
filipslezaklab Oct 9, 2025
056bb80
ui as module (#193)
filipslezaklab Oct 9, 2025
93d3367
Upgrade Debian packages to get latest security fixes (#194)
filipslezaklab Oct 9, 2025
45c0437
webnext to web (#195)
filipslezaklab Oct 10, 2025
3b97f46
Main to dev (#196)
filipslezaklab Oct 10, 2025
ebb3527
fix open graph logo tags
filipslezaklab Oct 10, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/build-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
cache-to: type=gha,mode=max

- name: Scan image with Trivy
uses: aquasecurity/trivy-action@0.32.0
uses: aquasecurity/trivy-action@0.33.1
with:
image-ref: "${{ env.GHCR_REPO }}:${{ github.sha }}-${{ matrix.tag }}"
format: "table"
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/lint-web.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ jobs:
run: |
npm i -g pnpm
pnpm i --frozen-lockfile
- name: Build translations
working-directory: ./web
run: pnpm dlx @inlang/paraglide-js compile --project ./project.inlang --outdir ./src/paraglide
- name: Lint
working-directory: ./web
run: pnpm lint
Expand Down
10 changes: 9 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,12 @@ jobs:
draft: true
generate_release_notes: true

create-sbom:
needs: [create-release, build-docker-release]
uses: ./.github/workflows/sbom.yml
with:
upload_url: ${{ needs.create-release.outputs.upload_url }}

build-binaries:
needs: [create-release]
runs-on:
Expand Down Expand Up @@ -111,10 +117,12 @@ jobs:
with:
version: 10

- name: Use Node.js 24
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: 24
cache: "pnpm"
cache-dependency-path: ./web/pnpm-lock.yaml

- name: Install frontend dependencies
run: pnpm install --ignore-scripts --frozen-lockfile
Expand Down
37 changes: 37 additions & 0 deletions .github/workflows/sbom-regenerate.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Periodic SBOM Regeneration

on:
schedule:
- cron: '30 2 * * *' # 2:30 AM UTC

jobs:
list-releases:
name: List releases
runs-on: ubuntu-latest
outputs:
releases: ${{ steps.get-releases.outputs.releases }}
steps:
- name: Get list of releases
id: get-releases
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
RELEASES_JSON=$(gh api repos/${{ github.repository }}/releases \
--jq '[.[]
| select(.draft == false and (.tag_name | test("^v[0-9]+\\.[0-9]+\\.[0-9]+$")))
| {tagName: .tag_name, uploadUrl: .upload_url}][:1]')
echo "releases=$RELEASES_JSON" >> $GITHUB_OUTPUT
regenerate-for-release:
name: Regenerate SBOM for release
needs: list-releases
# Don't run if no releases were found.
if: needs.list-releases.outputs.releases != '[]'
strategy:
fail-fast: false
matrix:
release: ${{ fromJson(needs.list-releases.outputs.releases) }}
uses: ./.github/workflows/sbom.yml
with:
upload_url: ${{ matrix.release.uploadUrl }}
tag: ${{ matrix.release.tagName }}
secrets: inherit
83 changes: 83 additions & 0 deletions .github/workflows/sbom.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
name: Create SBOM files

on:
workflow_call:
inputs:
upload_url:
description: "Release assets upload URL"
required: true
type: string
tag:
description: "The git tag to generate SBOM for - used in scheduled runs"
required: false
type: string

jobs:
create-sbom:
runs-on: [self-hosted, Linux, X64]

steps:
- name: Determine release tag and version
id: vars
# Uses inputs.tag for scheduled runs, otherwise github.ref_name.
run: |
TAG_NAME=${{ inputs.tag || github.ref_name }}
VERSION=${TAG_NAME#v}
echo "TAG_NAME=$TAG_NAME" >> $GITHUB_OUTPUT
echo "VERSION=$VERSION" >> $GITHUB_OUTPUT

- name: Checkout
uses: actions/checkout@v4
with:
ref: ${{ steps.vars.outputs.TAG_NAME }}
submodules: recursive

- name: Create SBOM with Trivy
uses: aquasecurity/trivy-action@0.33.1
with:
scan-type: 'fs'
format: 'spdx-json'
output: "defguard-proxy-${{ steps.vars.outputs.VERSION }}.sbom.json"
scan-ref: '.'
severity: "CRITICAL,HIGH,MEDIUM,LOW"
scanners: "vuln"

- name: Create docker image SBOM with Trivy
uses: aquasecurity/trivy-action@0.33.1
with:
image-ref: "ghcr.io/defguard/defguard-proxy:${{ steps.vars.outputs.VERSION }}"
scan-type: 'image'
format: 'spdx-json'
output: "defguard-proxy-${{ steps.vars.outputs.VERSION }}-docker.sbom.json"
severity: "CRITICAL,HIGH,MEDIUM,LOW"
scanners: "vuln"

- name: Create security advisory file with Trivy
uses: aquasecurity/trivy-action@0.33.1
with:
scan-type: 'fs'
format: 'json'
output: "defguard-proxy-${{ steps.vars.outputs.VERSION }}.advisories.json"
scan-ref: '.'
severity: "CRITICAL,HIGH,MEDIUM,LOW"
scanners: "vuln"

- name: Create docker image security advisory file with Trivy
uses: aquasecurity/trivy-action@0.33.1
with:
image-ref: "ghcr.io/defguard/defguard-proxy:${{ steps.vars.outputs.VERSION }}"
scan-type: 'image'
format: 'json'
output: "defguard-proxy-${{ steps.vars.outputs.VERSION }}-docker.advisories.json"
severity: "CRITICAL,HIGH,MEDIUM,LOW"
scanners: "vuln"

- name: Upload SBOMs and advisories
uses: shogo82148/actions-upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ inputs.upload_url }}
asset_path: "defguard-*.json"
asset_content_type: application/octet-stream
overwrite: true
9 changes: 9 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,15 @@ jobs:
uses: actions/checkout@v4
with:
submodules: recursive
- name: Scan code with Trivy
uses: aquasecurity/trivy-action@0.33.1
with:
scan-type: 'fs'
scan-ref: '.'
exit-code: "1"
ignore-unfixed: true
severity: "CRITICAL,HIGH,MEDIUM"
scanners: "vuln"
- name: Cache
uses: Swatinem/rust-cache@v2
- name: Install protoc
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@
.envrc
/node_modules
.env
.DS_Store
Loading