Compare commits
8
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b7f57b57e8 | ||
|
|
4e8a8666b7 | ||
|
|
feae577108 | ||
|
|
ba23f719ab | ||
|
|
1447febbaf | ||
|
|
6b21be0088 | ||
|
|
0279df6b11 | ||
|
|
3a87891486 |
@@ -5,10 +5,6 @@ on:
|
||||
- cron: "0 6 * * 1"
|
||||
workflow_dispatch:
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
issues: write
|
||||
|
||||
jobs:
|
||||
scan:
|
||||
runs-on: nix
|
||||
@@ -25,7 +21,7 @@ jobs:
|
||||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
API: ${{ github.api_url }}
|
||||
REPO: ${{ github.repository }}
|
||||
run: nix run -L .#ci -- upsert-issue vulnix "vulnix: known vulnerabilities in system closure" "$RUNNER_TEMP/issue.md"
|
||||
run: 'nix run -L .#ci -- upsert-issue vulnix "vulnix: known vulnerabilities in system closure" "$RUNNER_TEMP/issue.md"'
|
||||
|
||||
- name: close resolved issue
|
||||
if: steps.scan.outputs.count == '0'
|
||||
|
||||
@@ -1,10 +1,17 @@
|
||||
{ lib, pkgs }:
|
||||
let
|
||||
# vulnix's bundled nix-2.34 broke its own --experimental-features detection
|
||||
nixConf = pkgs.writeText "ci-nix.conf" "experimental-features = nix-command flakes";
|
||||
in
|
||||
# tools must track ci.py's subprocess calls; nix stays ambient (uses the
|
||||
# runner's own nix, not a pinned one).
|
||||
pkgs.writers.writePython3Bin "ci" {
|
||||
flakeIgnore = [ "E501" ];
|
||||
libraries = [ pkgs.python3Packages.subprocess-tee ];
|
||||
makeWrapperArgs = [
|
||||
"--set-default"
|
||||
"NIX_USER_CONF_FILES"
|
||||
(toString nixConf)
|
||||
"--prefix"
|
||||
"PATH"
|
||||
":"
|
||||
|
||||
@@ -18,7 +18,8 @@ def run(*args, **kw):
|
||||
|
||||
|
||||
def nix(*args):
|
||||
return subprocess_tee.run(("nix", "--extra-experimental-features", "nix-command flakes", "-L", *args), check=True, text=True).stdout
|
||||
# tee to stderr - stdout leaks into GITHUB_OUTPUT $() captures
|
||||
return subprocess_tee.run(("nix", "--extra-experimental-features", "nix-command flakes", "-L", *args), check=True, text=True, stdout=sys.stderr).stdout
|
||||
|
||||
|
||||
def git(*args, check=True):
|
||||
@@ -32,13 +33,16 @@ def gitea(method, path, body=None):
|
||||
req.add_header("Authorization", f'token {os.environ["GH_TOKEN"]}')
|
||||
if data is not None:
|
||||
req.add_header("Content-Type", "application/json")
|
||||
with urllib.request.urlopen(req) as resp:
|
||||
raw = resp.read()
|
||||
try:
|
||||
with urllib.request.urlopen(req) as resp:
|
||||
raw = resp.read()
|
||||
except urllib.error.HTTPError as e:
|
||||
sys.exit(f"gitea {method} {path}: {e.code} {e.reason}\n{e.read().decode()}")
|
||||
return json.loads(raw) if raw else None
|
||||
|
||||
|
||||
def find_open_issue(label):
|
||||
issues = gitea("GET", f"/issues?state=open&labels={label}")
|
||||
issues = gitea("GET", f"/issues?state=open&type=issues&labels={label}")
|
||||
return issues[0] if issues else None
|
||||
|
||||
|
||||
@@ -235,7 +239,7 @@ def format_vulnix(vulns):
|
||||
for v in vulns:
|
||||
for cve in v["affected_by"]:
|
||||
score = v.get("cvssv3_basescore", {}).get(cve)
|
||||
desc = v.get("description", {}).get(cve, "")
|
||||
desc = v.get("description", {}).get(cve, "").replace("\n", " ").replace("|", "∣")
|
||||
if len(desc) > 120:
|
||||
desc = desc[:117] + "..."
|
||||
rows.append((v["pname"], v["version"], cve, score, desc))
|
||||
|
||||
@@ -163,10 +163,9 @@ in
|
||||
trusted-public-keys = [ "microvm.cachix.org-1:oXnBc6hRE3eX5rSYdRyMYXnfzcCxC7yKPTbZXALsqys=" ];
|
||||
};
|
||||
|
||||
nix.gc = {
|
||||
automatic = true;
|
||||
dates = "daily";
|
||||
options = "--delete-older-than 14d";
|
||||
nix.settings = {
|
||||
min-free = 5 * 1024 * 1024 * 1024;
|
||||
max-free = 10 * 1024 * 1024 * 1024;
|
||||
};
|
||||
# nix.optimise.automatic = true; - doesn't work with microvm.writableStoreOverlay
|
||||
|
||||
|
||||
@@ -67,7 +67,10 @@ let
|
||||
inherit name;
|
||||
inherit net resources;
|
||||
svc.autoStart = true;
|
||||
isolation = { nixDaemon = nixDaemon; } // isolation;
|
||||
isolation = {
|
||||
inherit nixDaemon;
|
||||
}
|
||||
// isolation;
|
||||
traits = [ sshTrait ] ++ traits;
|
||||
packages = with pkgs; [ tmux ] ++ packages;
|
||||
miscProperties = self._sshpiperRegister routingInfo;
|
||||
@@ -77,8 +80,7 @@ let
|
||||
containerConfig =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
users.users.runner.extraGroups = [ "wheel" ];
|
||||
security.sudo.wheelNeedsPassword = false;
|
||||
users.users.runner.extraGroups = [ "kvm" ];
|
||||
environment.systemPackages = [ pkgs.qemu_kvm ];
|
||||
};
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user