Merge branch 'main' into mergify/configuration-deprecated-update

Author: nullr0ute

.devcontainer/Dockerfile

@@ -2,12 +2,17 @@ FROM fedora:latest
 
 ENV PATH "$PATH:/home/vscode/.cargo/bin"
 
-RUN bash -c "$(curl -fsSL "https://raw.githubusercontent.com/microsoft/vscode-dev-containers/main/script-library/common-redhat.sh")" -- "true" "vscode" "1000" "1000" "true"
+# Create vscode user with sudo access
+RUN groupadd --gid 1000 vscode \
+    && useradd --uid 1000 --gid 1000 -m vscode \
+    && echo "vscode ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
 
+# Install development dependencies
 RUN dnf install -y \
     sudo git cargo rust rust-src git-core openssl openssl-devel clippy rustfmt golang tpm2-tss-devel clevis clevis-luks cryptsetup cryptsetup-devel clang-devel sqlite sqlite-devel libpq libpq-devel \
     && dnf clean all
 
 USER vscode
 
-RUN cargo install --force diesel_cli --no-default-features --features sqlite
+RUN cargo install --force diesel_cli --no-default-features --features sqlite
+

.devcontainer/devcontainer.json

@@ -5,39 +5,34 @@
 	},
 	"containerUser": "vscode",
 	"updateRemoteUserUID": true,
-	"containerEnv": {
-		"HOME": "/home/vscode"
-	},
 	"runArgs": [
-		"--userns=keep-id:uid=1000,gid=1000",
 		"--cap-add=SYS_PTRACE",
 		"--security-opt",
 		"seccomp=unconfined"
 	],
-	"settings": {
-		"files.watcherExclude": {
-			"**/target/**": true
-		},
-		"rust-analyzer.checkOnSave.command": "clippy"
+        "customizations": {
+		"vscode": {
+			"settings": {
+				"files.watcherExclude": {
+					"**/target/**": true
+				},
+				"rust-analyzer.checkOnSave.command": "clippy"
+			},
+			"extensions": [
+				"mutantdino.resourcemonitor",
+				"matklad.rust-analyzer",
+				"tamasfe.even-better-toml",
+				"serayuzgur.crates",
+				"rust-lang.rust-analyzer"
+			]
+		}
 	},
-	"extensions": [
-		"mutantdino.resourcemonitor",
-		"matklad.rust-analyzer",
-		"tamasfe.even-better-toml",
-		"serayuzgur.crates",
-		"rust-lang.rust-analyzer"
-	],
 	"remoteEnv": {
 		"PATH": "${containerEnv:PATH}:/home/vscode/.cargo/bin",
 		"SQLITE_MANUFACTURER_DATABASE_URL": "../ci-manufacturer-db.sqlite",
 		"SQLITE_OWNER_DATABASE_URL": "../ci-owner-db.sqlite",
 		"SQLITE_RENDEZVOUS_DATABASE_URL": "../ci-rendezvous-db.sqlite"
 	},
-	"containerEnv": {
-		"SQLITE_MANUFACTURER_DATABASE_URL": "../ci-manufacturer-db.sqlite",
-		"SQLITE_OWNER_DATABASE_URL": "../ci-owner-db.sqlite",
-		"SQLITE_RENDEZVOUS_DATABASE_URL": "../ci-rendezvous-db.sqlite"
-	},
 	"hostRequirements": {
 		"memory": "4gb"
 	},

.github/labeler.yml

@@ -1,3 +1,5 @@
-possible stability impact:
-- libfdo-data/fdo_data.h
-- libfdo-data/libfdo-data-go.doc
+"possible stability impact":
+  - changed-files:
+    - any-glob-to-any-file:
+      - "libfdo-data/fdo_data.h"
+      - "libfdo-data/libfdo-data-go.doc"

.github/spellcheck-ignore

@@ -6,3 +6,6 @@ childs
 ot
 marshalling
 te
+blacklist
+msdos
+ro

.github/workflows/analysis.yml

@@ -16,7 +16,7 @@ jobs:
       security-events: write
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 

.github/workflows/cd.yml

@@ -18,7 +18,7 @@ jobs:
       quay_org: fido-fdo
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Perform container builds
       id: build

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
     name: Test docs building
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/jekyll-build-pages@main
         with:
           source: ./docs
@@ -21,15 +21,15 @@ jobs:
     name: Build containers
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Build containers
       uses: ./.github/actions/build_containers
 
   check-spelling:
     name: Check spelling
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Check spelling
         uses: codespell-project/actions-codespell@master
         with:
@@ -43,7 +43,7 @@ jobs:
     name: Rustfmt
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: stable
@@ -53,15 +53,15 @@ jobs:
     name: Gofmt
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: if [ "$(gofmt -d -s -l . | tee /dev/stderr | wc -l)" -gt 0 ]; then exit 1; fi
 
   clippy:
     name: Clippy
     runs-on: ubuntu-latest
     container: fedora:latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Cache
         uses: actions/cache@v4
         with:
@@ -88,7 +88,7 @@ jobs:
       - name: Install deps
         run: |
           dnf install -y make gcc openssl openssl-devel findutils golang git tpm2-tss-devel swtpm swtpm-tools git clevis clevis-luks cryptsetup cryptsetup-devel clang-devel cracklib-dicts sqlite sqlite-devel libpq libpq-devel
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
       - name: Fix git trust
@@ -142,7 +142,7 @@ jobs:
   postgres_test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Run test
@@ -151,15 +151,15 @@ jobs:
   commitlint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: 'latest'
       - name: Install commitlint dependencies
         run: npm install commitlint
-      - uses: wagoid/commitlint-github-action@v5
+      - uses: wagoid/commitlint-github-action@v6
         env:
           NODE_PATH: ${{ github.workspace }}/node_modules
         with:
@@ -171,7 +171,7 @@ jobs:
     runs-on: ubuntu-latest
     container: fedora:latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: install deps
         run: |
           dnf install -y make python3-docutils
@@ -182,7 +182,7 @@ jobs:
     name: Test Devcontainer Creation
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install devcontainer CLI
         run: npm install -g @vscode/dev-container-cli
       - name: Build devcontainer

.github/workflows/integration.yaml

@@ -104,7 +104,7 @@ jobs:
         run: sudo dnf install -y make gcc openssl openssl-devel findutils golang git tpm2-tss-devel swtpm swtpm-tools git clevis clevis-luks cryptsetup cryptsetup-devel clang-devel cracklib-dicts rust-toolset rpmdevtools python3-docutils createrepo_c podman buildah skopeo
 
       - name: Clone repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ needs.pr-info.outputs.sha }}
           fetch-depth: 0
@@ -151,7 +151,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
           name: fido-container

.github/workflows/labeler.yml

@@ -10,7 +10,12 @@ jobs:
   triage:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/labeler@v4
+    - uses: actions/checkout@v4
+      with:
+        repository: "fdo-rs/fido-device-onboard-rs"
+        ref: ${{ github.event.pull_request.head.sha }}
+    - uses: actions/labeler@v5
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"
         sync-labels: true
+        configuration-path: '.github/labeler.yml'

.gitignore

@@ -20,3 +20,6 @@
 # Source and vendor tar files
 fido-device-onboard-rs-*.tar.gz
 fido-device-onboard-rs-*-vendor-patched.tar.xz
+
+# SQLite test files
+*.sqlite