Skip to content

Quickly sandbox your AI agent.

Python

fix(security): refresh trust stores and rebuild image artifacts

Tyler Paynea4697e82c7ba
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 25da974..70c169b 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -35,7 +35,7 @@ jobs:
- uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
with:
- node-version: 22
+ node-version: "22.23.4"
cache: npm
- run: npm ci
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1b931cd..7443e4c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -92,7 +92,7 @@ jobs:
with:
enable-cache: false
python-version: ${{ fromJSON(inputs.plan).python_version }}
- version: "0.12.13"
+ version: "0.13.4"
- id: build
name: Build packages
@@ -101,6 +101,7 @@ jobs:
UVR_PLAN: ${{ inputs.plan }}
UVR_RUNNER: ${{ toJSON(matrix.runner) }}
QUICKSAND_AUTO_INSTALL: "1"
+ QUICKSAND_REBUILD_IMAGES: "1"
UV_CACHE_DIR: ${{ runner.temp }}/quicksand-uv-${{ github.run_id }}-${{ github.run_attempt }}-${{ strategy.job-index }}
run: |
uv venv --seed --clear
diff --git a/package-lock.json b/package-lock.json
index f82b8e7..a477431 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,7 +5,7 @@
"packages": {
"": {
"devDependencies": {
- "mermaid": "^11.16.1",
+ "mermaid": "^11.17.2",
"vitepress": "^1.6.3",
"vitepress-plugin-mermaid": "^2.0.10"
}
@@ -283,9 +283,9 @@
}
},
"node_modules/@babel/helper-string-parser": {
- "version": "7.27.1",
- "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
- "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
+ "version": "7.29.7",
+ "resolved": "https://ms-feed-25.pkgs.visualstudio.com/1es-public/_packaging/npm-public/npm/registry/@babel/helper-string-parser/-/helper-string-parser-7.29.7.tgz",
+ "integrity": "sha1-fwhx2Zgk0jE31g+G/PYTD9WhtR8=",
"dev": true,
"license": "MIT",
"engines": {
@@ -293,9 +293,9 @@
}
},
"node_modules/@babel/helper-validator-identifier": {
- "version": "7.28.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
- "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
+ "version": "7.29.7",
+ "resolved": "https://ms-feed-25.pkgs.visualstudio.com/1es-public/_packaging/npm-public/npm/registry/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz",
+ "integrity": "sha1-vYcITO0MeW7Ea9pJLeboPSnon8I=",
"dev": true,
"license": "MIT",
"engines": {
@@ -303,13 +303,13 @@
}
},
"node_modules/@babel/parser": {
- "version": "7.29.2",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.2.tgz",
- "integrity": "sha512-4GgRzy/+fsBa72/RZVJmGKPmZu9Byn8o4MoLpmNe1m8ZfYnz5emHLQz3U4gLud6Zwl0RZIcgiLD7Uq7ySFuDLA==",
+ "version": "7.29.9",
+ "resolved": "https://ms-feed-25.pkgs.visualstudio.com/1es-public/_packaging/npm-public/npm/registry/@babel/parser/-/parser-7.29.9.tgz",
+ "integrity": "sha512-CjXrNHTnvqBVqHgdBysY3vk2T8tpJHb5/RMeHJBTyVa9xgugCB0CJTx/3oO8RV2QRQP391RWpB7D6hLjm8V9uA==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@babel/types": "^7.29.0"
+ "@babel/types": "^7.29.8"
},
"bin": {
"parser": "bin/babel-parser.js"
@@ -319,14 +319,14 @@
}
},
"node_modules/@babel/types": {
- "version": "7.29.0",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.0.tgz",
- "integrity": "sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==",
+ "version": "7.29.8",
+ "resolved": "https://ms-feed-25.pkgs.visualstudio.com/1es-public/_packaging/npm-public/npm/registry/@babel/types/-/types-7.29.8.tgz",
+ "integrity": "sha1-Einu8x2FFW1w+j9M2Fk3bQ6vaGM=",
"dev": true,
"license": "MIT",
"dependencies": {
- "@babel/helper-string-parser": "^7.27.1",
- "@babel/helper-validator-identifier": "^7.28.5"
+ "@babel/helper-string-parser": "^7.29.7",
+ "@babel/helper-validator-identifier": "^7.29.7"
},
"engines": {
"node": ">=6.9.0"
@@ -341,8 +341,8 @@
},
"node_modules/@chevrotain/types": {
"version": "11.1.2",
- "resolved": "https://registry.npmjs.org/@chevrotain/types/-/types-11.1.2.tgz",
- "integrity": "sha512-U+HFai5+zmJCkK86QsaJtoITlboZHBqrVketcO2ROv865xfCMSFpELQoz1GkX5GzME8pTa+3kbKrZHQtI0gdbw==",
+ "resolved": "https://ms-feed-25.pkgs.visualstudio.com/1es-public/_packaging/npm-public/npm/registry/@chevrotain/types/-/types-11.1.2.tgz",
+ "integrity": "sha1-6DoaJwTwxeSedZKyFAMaD0o01+U=",
"dev": true,
"license": "Apache-2.0"
},
@@ -869,9 +869,9 @@
}
},
"node_modules/@jridgewell/sourcemap-codec": {
- "version": "1.5.5",
- "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
- "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
+ "version": "1.6.0",
+ "resolved": "https://ms-feed-25.pkgs.visualstudio.com/1es-public/_packaging/npm-public/npm/registry/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.6.0.tgz",
+ "integrity": "sha1-9MZj6GLwbcmMpNRThixGkCeJoY0=",
"dev": true,
"license": "MIT"
},
@@ -901,9 +901,9 @@
"optional": true
},
"node_modules/@mermaid-js/parser": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/@mermaid-js/parser/-/parser-1.2.0.tgz",
- "integrity": "sha512-oYPyv8A4As1yH5Bx+04iQEQxXuIQDe0GKCNSRgao6z8AM9jixXIfP0vsppRLvGf+nKIOb9/LdpWA4YuJiVvESA==",
+ "version": "1.2.1",
+ "resolved": "https://ms-feed-25.pkgs.visualstudio.com/1es-public/_packaging/npm-public/npm/registry/@mermaid-js/parser/-/parser-1.2.1.tgz",
+ "integrity": "sha1-lMxAQWE3uxDSvBsKScYj1xbnYjM=",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -1745,57 +1745,57 @@
}
},
"node_modules/@vue/compiler-core": {
- "version": "3.5.33",
- "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.33.tgz",
- "integrity": "sha512-3PZLQwFw4Za3TC8t0FvTy3wI16Kt+pmwcgNZca4Pj9iWL2E72a/gZlpBtAJvEdDMdCxdG/qq0C7PN0bsJuv0Rw==",
+ "version": "3.5.44",
+ "resolved": "https://ms-feed-25.pkgs.visualstudio.com/1es-public/_packaging/npm-public/npm/registry/@vue/compiler-core/-/compiler-core-3.5.44.tgz",
+ "integrity": "sha512-k34nCytbK8PQ1gR2mGROYOw6Pnv/mumqIdrZ3x2tbyXZDWm7ViKGLTfdB+DRrWqEQsLgGJvn0WN9jBif5zCTLQ==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@babel/parser": "^7.29.2",
- "@vue/shared": "3.5.33",
+ "@babel/parser": "^7.29.9",
+ "@vue/shared": "3.5.44",
"entities": "^7.0.1",
"estree-walker": "^2.0.2",
- "source-map-js": "^1.2.1"
+ "source-map-js": "^1.2.2"
}
},
"node_modules/@vue/compiler-dom": {
- "version": "3.5.33",
- "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.33.tgz",
- "integrity": "sha512-PXq0yrfCLzzL07rbXO4awtXY1Z06LG2eu6Adg3RJFa/j3Cii217XxxLXG22N330gw7GmALCY0Z8RgXEviwgpjA==",
+ "version": "3.5.44",
+ "resolved": "https://ms-feed-25.pkgs.visualstudio.com/1es-public/_packaging/npm-public/npm/registry/@vue/compiler-dom/-/compiler-dom-3.5.44.tgz",
+ "integrity": "sha512-W5AoBFWdw1lQAKiHowkfgFKFab82oSRT6sGsPfw/q1GRjsy/ZJFLHGhJyBRIFN9APLTUduDH9U2JAiPOIyKuYg==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@vue/compiler-core": "3.5.33",
- "@vue/shared": "3.5.33"
+ "@vue/compiler-core": "3.5.44",
+ "@vue/shared": "3.5.44"
}
},
"node_modules/@vue/compiler-sfc": {
- "version": "3.5.33",
- "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.33.tgz",
- "integrity": "sha512-UTUvRO9cY+rROrx/pvN9P5Z7FgA6QGfokUCfhQE4EnmUj3rVnK+CHI0LsEO1pg+I7//iRYMUfcNcCPe7tg0CoA==",
+ "version": "3.5.44",
+ "resolved": "https://ms-feed-25.pkgs.visualstudio.com/1es-public/_packaging/npm-public/npm/registry/@vue/compiler-sfc/-/compiler-sfc-3.5.44.tgz",
+ "integrity": "sha512-dzHmQ4jXTpdr5FjIQUeykVakN/uzqFbUo9/C5ikBFg3a3PeM6uRxeczx1ZbXBML0/zJstEh3ygYipzR5Z7b2Pw==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@babel/parser": "^7.29.2",
- "@vue/compiler-core": "3.5.33",
- "@vue/compiler-dom": "3.5.33",
- "@vue/compiler-ssr": "3.5.33",
- "@vue/shared": "3.5.33",
+ "@babel/parser": "^7.29.9",
+ "@vue/compiler-core": "3.5.44",
+ "@vue/compiler-dom": "3.5.44",
+ "@vue/compiler-ssr": "3.5.44",
+ "@vue/shared": "3.5.44",
"estree-walker": "^2.0.2",
"magic-string": "^0.30.21",
- "postcss": "^8.5.10",
- "source-map-js": "^1.2.1"
+ "postcss": "^8.5.29",
+ "source-map-js": "^1.2.2"
}
},
"node_modules/@vue/compiler-ssr": {
- "version": "3.5.33",
- "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.33.tgz",
- "integrity": "sha512-IErjYdnj1qIupG5xxiVIYiiRvDhGWV4zuh/RCrwfYpuL+HWQzeU6lCk/nF9r7olWMnjKxCAkOctT2qFWFkzb1A==",
+ "version": "3.5.44",
+ "resolved": "https://ms-feed-25.pkgs.visualstudio.com/1es-public/_packaging/npm-public/npm/registry/@vue/compiler-ssr/-/compiler-ssr-3.5.44.tgz",
+ "integrity": "sha512-xr5gb1JVHlfXJwSlRz1FeP6uxoazdzHuMTVLE7up+4Vrqxk219CvxLPxD9NXBt47yvZW7+p4DXfyp4O1fkByIA==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@vue/compiler-dom": "3.5.33",
- "@vue/shared": "3.5.33"
+ "@vue/compiler-dom": "3.5.44",
+ "@vue/shared": "3.5.44"
}
},
"node_modules/@vue/devtools-api": {
@@ -1835,57 +1835,55 @@
}
},
"node_modules/@vue/reactivity": {
- "version": "3.5.33",
- "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.33.tgz",
- "integrity": "sha512-p8UfIqyIhb0rYGlSgSBV+lPhF2iUSBcRy7enhTmPqKWadHy9kcOFYF1AejYBP9P+avnd3OBbD49DU4pLWX/94A==",
+ "version": "3.5.44",
+ "resolved": "https://ms-feed-25.pkgs.visualstudio.com/1es-public/_packaging/npm-public/npm/registry/@vue/reactivity/-/reactivity-3.5.44.tgz",
+ "integrity": "sha512-u+QJdKeBBEADkPdevsL+6E12QlYVfBD8Zcw5qjDQKtamI6l14KyqazJMobhCKelhWN5zpyKUiEDoTyHE93cqWw==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@vue/shared": "3.5.33"
+ "@vue/shared": "3.5.44"
}
},
"node_modules/@vue/runtime-core": {
- "version": "3.5.33",
- "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.33.tgz",
- "integrity": "sha512-UpFF45RI9//a7rvq7RdOQblb4tup7hHG9QsmIrxkFQLzQ7R8/iNQ5LE15NhLZ1/WcHMU2b47u6P33CPUelHyIQ==",
+ "version": "3.5.44",
+ "resolved": "https://ms-feed-25.pkgs.visualstudio.com/1es-public/_packaging/npm-public/npm/registry/@vue/runtime-core/-/runtime-core-3.5.44.tgz",
+ "integrity": "sha512-uEa/ndwjhrrhnOfb2p+sZy6zeoamJOISqaLSJGk/8R6nABT1ZldpzcJoPzKj+zHVomVBPcmQYyC2r4LtvDV6CQ==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@vue/reactivity": "3.5.33",
- "@vue/shared": "3.5.33"
+ "@vue/reactivity": "3.5.44",
+ "@vue/shared": "3.5.44"
}
},
"node_modules/@vue/runtime-dom": {
- "version": "3.5.33",
- "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.33.tgz",
- "integrity": "sha512-IOxMsAOwquhfITgmOgaPYl7/j8gKUxUFoflRc+u4LxyD3+783xne8vNta1PONVCvCV9A0w7hkyEepINDqfO0tw==",
+ "version": "3.5.44",
+ "resolved": "https://ms-feed-25.pkgs.visualstudio.com/1es-public/_packaging/npm-public/npm/registry/@vue/runtime-dom/-/runtime-dom-3.5.44.tgz",
+ "integrity": "sha512-3fc4ARcXVhVBaJ3ujWiNZJARD6pkyRcwG+ZYhMzjKtKUp7MAY0HLwr7r3Smep3Li6ZaWT6ewdmx8XqdaD5oNZg==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@vue/reactivity": "3.5.33",
- "@vue/runtime-core": "3.5.33",
- "@vue/shared": "3.5.33",
+ "@vue/reactivity": "3.5.44",
+ "@vue/runtime-core": "3.5.44",
+ "@vue/shared": "3.5.44",
"csstype": "^3.2.3"
}
},
"node_modules/@vue/server-renderer": {
- "version": "3.5.33",
- "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.33.tgz",
- "integrity": "sha512-0xylq/8/h44lVG0pZFknv1XIdEgymq2E9n59uTWJBG+dIgiT0TMCSsxrN7nO16Z0MU0MPjFcguBbZV8Itk52Hw==",
+ "version": "3.5.44",
+ "resolved": "https://ms-feed-25.pkgs.visualstudio.com/1es-public/_packaging/npm-public/npm/registry/@vue/server-renderer/-/server-renderer-3.5.44.tgz",
+ "integrity": "sha512-R4S1UoH4h5Frrauv8Z5XE5TxV9oBiUSgWIC4TyVK1FK+RocRnOLwFA5Xcmo2011RlgJp+AbZCnw6afrhlgRuUQ==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@vue/compiler-ssr": "3.5.33",
- "@vue/shared": "3.5.33"
- },
- "peerDependencies": {
- "vue": "3.5.33"
+ "@vue/compiler-ssr": "3.5.44",
+ "@vue/runtime-dom": "3.5.44",
+ "@vue/shared": "3.5.44"
}
},
"node_modules/@vue/shared": {
- "version": "3.5.33",
- "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.33.tgz",
- "integrity": "sha512-5vR2QIlmaLG77Ygd4pMP6+SGQ5yox9VhtnbDWTy9DzMzdmeLxZ1QqxrywEZ9sa1AVubfIJyaCG3ytyWU81ufcQ==",
+ "version": "3.5.44",
+ "resolved": "https://ms-feed-25.pkgs.visualstudio.com/1es-public/_packaging/npm-public/npm/registry/@vue/shared/-/shared-3.5.44.tgz",
+ "integrity": "sha512-H82XLH0DjmSOdbEwO15x3QTo1f5PWEtv237eLpYKc0mqLu+B8hnq16lFWmuBmNurkeiG3wr+oM1FhOll/YVFRg==",
"dev": true,
"license": "MIT"
},
@@ -2133,8 +2131,8 @@
},
"node_modules/csstype": {
"version": "3.2.3",
- "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz",
- "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==",
+ "resolved": "https://ms-feed-25.pkgs.visualstudio.com/1es-public/_packaging/npm-public/npm/registry/csstype/-/csstype-3.2.3.tgz",
+ "integrity": "sha1-7EjA8+mT5QZIyG2lWeJhCZXPmJo=",
"dev": true,
"license": "MIT"
},
@@ -2680,9 +2678,9 @@
}
},
"node_modules/dayjs": {
- "version": "1.11.20",
- "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.20.tgz",
- "integrity": "sha512-YbwwqR/uYpeoP4pu043q+LTDLFBLApUP6VxRihdfNTqu4ubqMlGDLd6ErXhEgsyvY0K6nCs7nggYumAN+9uEuQ==",
+ "version": "1.11.23",
+ "resolved": "https://ms-feed-25.pkgs.visualstudio.com/1es-public/_packaging/npm-public/npm/registry/dayjs/-/dayjs-1.11.23.tgz",
+ "integrity": "sha1-sKNjUG3eXzbPUHXkLr6BFRZajHk=",
"dev": true,
"license": "MIT"
},
@@ -2721,9 +2719,9 @@
}
},
"node_modules/dompurify": {
- "version": "3.4.13",
- "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.4.13.tgz",
- "integrity": "sha512-2vmYIoqjze2d+kakP8S/nS5shfsl587kzwEjcGlTdiksUVgFHnFCsLYDVj/JNqJVOQZGSYBTmuycv0PodwmnMQ==",
+ "version": "3.4.17",
+ "resolved": "https://ms-feed-25.pkgs.visualstudio.com/1es-public/_packaging/npm-public/npm/registry/dompurify/-/dompurify-3.4.17.tgz",
+ "integrity": "sha512-B/pSlYVHQ58kqISD/yDjuJ1yfzI34m1gF4lAod2bwSRhiN4K5Cl3H8Af7hqB2PmTL911tdEudnnXn5FnhRoz0w==",
"dev": true,
"license": "(MPL-2.0 OR Apache-2.0)",
"optionalDependencies": {
@@ -2739,8 +2737,8 @@
},
"node_modules/entities": {
"version": "7.0.1",
- "resolved": "https://registry.npmjs.org/entities/-/entities-7.0.1.tgz",
- "integrity": "sha512-TWrgLOFUQTH994YUyl1yT4uyavY5nNB5muff+RtWaqNVCAK408b5ZnnbNAUEWLTCpum9w6arT70i1XdQ4UeOPA==",
+ "resolved": "https://ms-feed-25.pkgs.visualstudio.com/1es-public/_packaging/npm-public/npm/registry/entities/-/entities-7.0.1.tgz",
+ "integrity": "sha1-JuioiInbY0F9y5oeeaPxvJK1l2s=",
"dev": true,
"license": "BSD-2-Clause",
"engines": {
@@ -2805,11 +2803,39 @@
},
"node_modules/estree-walker": {
"version": "2.0.2",
- "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
- "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+ "resolved": "https://ms-feed-25.pkgs.visualstudio.com/1es-public/_packaging/npm-public/npm/registry/estree-walker/-/estree-walker-2.0.2.tgz",
+ "integrity": "sha1-UvAQF4wqTBF6d1fP6UKtt9LaTKw=",
"dev": true,
"license": "MIT"
},
+ "node_modules/fastdom": {
+ "version": "1.0.12",
+ "resolved": "https://ms-feed-25.pkgs.visualstudio.com/1es-public/_packaging/npm-public/npm/registry/fastdom/-/fastdom-1.0.12.tgz",
+ "integrity": "sha1-rkPVWvAXJSrkmbLhhlEauXQS3jk=",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "strictdom": "^1.0.1"
+ }
+ },
+ "node_modules/fdir": {
+ "version": "6.5.0",
+ "resolved": "https://ms-feed-25.pkgs.visualstudio.com/1es-public/_packaging/npm-public/npm/registry/fdir/-/fdir-6.5.0.tgz",
+ "integrity": "sha1-7Sq5Z6MxreYvGNB32uGSaE1Q01A=",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=12.0.0"
+ },
+ "peerDependencies": {
+ "picomatch": "^3 || ^4"
+ },
+ "peerDependenciesMeta": {
+ "picomatch": {
+ "optional": true
+ }
+ }
+ },
"node_modules/focus-trap": {
"version": "7.8.0",
"resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.8.0.tgz",
@@ -2935,9 +2961,9 @@
}
},
"node_modules/katex": {
- "version": "0.16.45",
- "resolved": "https://registry.npmjs.org/katex/-/katex-0.16.45.tgz",
- "integrity": "sha512-pQpZbdBu7wCTmQUh7ufPmLr0pFoObnGUoL/yhtwJDgmmQpbkg/0HSVti25Fu4rmd1oCR6NGWe9vqTWuWv3GcNA==",
+ "version": "0.18.10",
+ "resolved": "https://ms-feed-25.pkgs.visualstudio.com/1es-public/_packaging/npm-public/npm/registry/katex/-/katex-0.18.10.tgz",
+ "integrity": "sha512-/B6p9eY9DX7aHBfpkHdpirDTZ5QH9xTwL9y837PWuzuv41O5jFdqNQwVQEQsimY0/iVNkwBY4+4hMfhQ7d4Dbw==",
"dev": true,
"funding": [
"https://opencollective.com/katex",
@@ -2945,20 +2971,20 @@
],
"license": "MIT",
"dependencies": {
- "commander": "^8.3.0"
+ "commander": "^15.0.0"
},
"bin": {
"katex": "cli.js"
}
},
"node_modules/katex/node_modules/commander": {
- "version": "8.3.0",
- "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
- "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
+ "version": "15.0.0",
+ "resolved": "https://ms-feed-25.pkgs.visualstudio.com/1es-public/_packaging/npm-public/npm/registry/commander/-/commander-15.0.0.tgz",
+ "integrity": "sha1-lvOWHxKtrBeZ7z+9i8YdQFctGxE=",
"dev": true,
"license": "MIT",
"engines": {
- "node": ">= 12"
+ "node": ">=22.12.0"
}
},
"node_modules/khroma": {
@@ -2983,8 +3009,8 @@
},
"node_modules/magic-string": {
"version": "0.30.21",
- "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
- "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==",
+ "resolved": "https://ms-feed-25.pkgs.visualstudio.com/1es-public/_packaging/npm-public/npm/registry/magic-string/-/magic-string-0.30.21.tgz",
+ "integrity": "sha1-VnY+wJoPqAkd8nh5/ZTRkHjADZE=",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -3034,27 +3060,28 @@
}
},
"node_modules/mermaid": {
- "version": "11.16.1",
- "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-11.16.1.tgz",
- "integrity": "sha512-TQsq6u22fAn3rek5VOubrhKPo1g5hwC3FXUN9hiyupTckcYiGuuKGkNQrKYwGJkXUxZdojwRG46gsSCFZMDp4g==",
+ "version": "11.17.2",
+ "resolved": "https://ms-feed-25.pkgs.visualstudio.com/1es-public/_packaging/npm-public/npm/registry/mermaid/-/mermaid-11.17.2.tgz",
+ "integrity": "sha1-48rzcXWCwOROXQTP8EPgJcrsfLo=",
"dev": true,
"license": "MIT",
"dependencies": {
"@braintree/sanitize-url": "^7.1.2",
"@iconify/utils": "^3.0.2",
- "@mermaid-js/parser": "^1.2.0",
+ "@mermaid-js/parser": "^1.2.1",
"@types/d3": "^7.4.3",
"@upsetjs/venn.js": "^2.0.0",
- "cytoscape": "^3.33.3",
+ "cytoscape": "^3.34.0",
"cytoscape-cose-bilkent": "^4.1.0",
"cytoscape-fcose": "^2.2.0",
"d3": "^7.9.0",
"d3-sankey": "^0.12.3",
"dagre-d3-es": "7.0.14",
- "dayjs": "^1.11.20",
+ "dayjs": "^1.11.21",
"dompurify": "^3.3.3",
"es-toolkit": "^1.45.1",
- "katex": "^0.16.45",
+ "fastdom": "1.0.12",
+ "katex": "^0.16.47",
"khroma": "^2.1.0",
"marked": "^16.3.0",
"roughjs": "^4.6.6",
@@ -3185,9 +3212,9 @@
}
},
"node_modules/nanoid": {
- "version": "3.3.17",
- "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.17.tgz",
- "integrity": "sha512-xQLf0A3HOMlgHq0n247/LRuAOYmB7dXJ/DvAxGvsSBij45XtBSmQycu+F8ODbHwns/XyFZagyL1+J0Offw1E0g==",
+ "version": "3.3.20",
+ "resolved": "https://ms-feed-25.pkgs.visualstudio.com/1es-public/_packaging/npm-public/npm/registry/nanoid/-/nanoid-3.3.20.tgz",
+ "integrity": "sha512-uKdg2G3GNCKQn9byYOpxbGqrT2fGO5KRt5J/8b3pok8rT6qxGWF6hxMyJiEYtAf+FVyYuD9hRaDqX5uPFYJ4ZQ==",
"dev": true,
"funding": [
{
@@ -3258,6 +3285,19 @@
"dev": true,
"license": "ISC"
},
+ "node_modules/picomatch": {
+ "version": "4.0.7",
+ "resolved": "https://ms-feed-25.pkgs.visualstudio.com/1es-public/_packaging/npm-public/npm/registry/picomatch/-/picomatch-4.0.7.tgz",
+ "integrity": "sha1-YxM2ADTMs2s9xh7L3/eBIfkP4h8=",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/jonschlinkert"
+ }
+ },
"node_modules/pkg-types": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.3.1.tgz",
@@ -3289,9 +3329,9 @@
}
},
"node_modules/postcss": {
- "version": "8.5.26",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.26.tgz",
- "integrity": "sha512-u82N74LFzG8ca+dD8puPnplTXoGH4fTPpVGuIbt36G3qvNlkvfD0lEAZSxaly3KX8TS/L1A1gsCEmvKmBcVbkQ==",
+ "version": "8.5.30",
+ "resolved": "https://ms-feed-25.pkgs.visualstudio.com/1es-public/_packaging/npm-public/npm/registry/postcss/-/postcss-8.5.30.tgz",
+ "integrity": "sha512-zkd+e9S1AQHhmaBKye9zlFHWjOwVgqXl1q3ECYy8561K7qxR2cREf/STLskulBFd78k6AOFeA+ff1TtEzk9bAA==",
"dev": true,
"funding": [
{
@@ -3309,9 +3349,9 @@
],
"license": "MIT",
"dependencies": {
- "nanoid": "^3.3.17",
+ "nanoid": "^3.3.20",
"picocolors": "^1.1.1",
- "source-map-js": "^1.2.1"
+ "source-map-js": "^1.2.2"
},
"engines": {
"node": "^10 || ^12 || >=14"
@@ -3478,9 +3518,9 @@
}
},
"node_modules/source-map-js": {
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
- "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+ "version": "1.2.2",
+ "resolved": "https://ms-feed-25.pkgs.visualstudio.com/1es-public/_packaging/npm-public/npm/registry/source-map-js/-/source-map-js-1.2.2.tgz",
+ "integrity": "sha512-KGj/8Y43x35aZVDtt+J4mK1hoLGHULMYfSkODJNQjNDC3oW1PqPoxMwo0pLUsWM/UEGzON/NxeHywEfNXNP3Vw==",
"dev": true,
"license": "BSD-3-Clause",
"engines": {
@@ -3508,6 +3548,13 @@
"node": ">=0.10.0"
}
},
+ "node_modules/strictdom": {
+ "version": "1.0.1",
+ "resolved": "https://ms-feed-25.pkgs.visualstudio.com/1es-public/_packaging/npm-public/npm/registry/strictdom/-/strictdom-1.0.1.tgz",
+ "integrity": "sha1-GJ3pFkn3PUTVm4Qy76aO+dJllGA=",
+ "dev": true,
+ "license": "MIT"
+ },
"node_modules/stringify-entities": {
"version": "4.0.4",
"resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-4.0.4.tgz",
@@ -3560,6 +3607,23 @@
"node": ">=18"
}
},
+ "node_modules/tinyglobby": {
+ "version": "0.2.17",
+ "resolved": "https://ms-feed-25.pkgs.visualstudio.com/1es-public/_packaging/npm-public/npm/registry/tinyglobby/-/tinyglobby-0.2.17.tgz",
+ "integrity": "sha1-ViqabJ6ys7Ej05cZ+a9btE/NdjE=",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "fdir": "^6.5.0",
+ "picomatch": "^4.0.4"
+ },
+ "engines": {
+ "node": ">=12.0.0"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/SuperchupuDev"
+ }
+ },
"node_modules/trim-lines": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/trim-lines/-/trim-lines-3.0.1.tgz",
@@ -3706,21 +3770,24 @@
}
},
"node_modules/vite": {
- "version": "5.4.21",
- "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.21.tgz",
- "integrity": "sha512-o5a9xKjbtuhY6Bi5S3+HvbRERmouabWbyUcpXXUA1u+GNUKoROi9byOJ8M0nHbHYHkYICiMlqxkg1KkYmm25Sw==",
+ "version": "6.4.4",
+ "resolved": "https://ms-feed-25.pkgs.visualstudio.com/1es-public/_packaging/npm-public/npm/registry/vite/-/vite-6.4.4.tgz",
+ "integrity": "sha512-xGjU/SyjeNyb0E4KxXBvYz/1C+3JXuujvf2hXNOtnlcE+58o5ajd9N2/n2VhkiJvpCP2qQasnUpx5PXNeI+p1Q==",
"dev": true,
"license": "MIT",
"dependencies": {
- "esbuild": "^0.21.3",
- "postcss": "^8.4.43",
- "rollup": "^4.20.0"
+ "esbuild": "^0.25.0",
+ "fdir": "^6.4.4",
+ "picomatch": "^4.0.2",
+ "postcss": "^8.5.3",
+ "rollup": "^4.34.9",
+ "tinyglobby": "^0.2.13"
},
"bin": {
"vite": "bin/vite.js"
},
"engines": {
- "node": "^18.0.0 || >=20.0.0"
+ "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
},
"funding": {
"url": "https://github.com/vitejs/vite?sponsor=1"
@@ -3729,19 +3796,25 @@
"fsevents": "~2.3.3"
},
"peerDependencies": {
- "@types/node": "^18.0.0 || >=20.0.0",
+ "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0",
+ "jiti": ">=1.21.0",
"less": "*",
"lightningcss": "^1.21.0",
"sass": "*",
"sass-embedded": "*",
"stylus": "*",
"sugarss": "*",
- "terser": "^5.4.0"
+ "terser": "^5.16.0",
+ "tsx": "^4.8.1",
+ "yaml": "^2.4.2"
},
"peerDependenciesMeta": {
"@types/node": {
"optional": true
},
+ "jiti": {
+ "optional": true
+ },
"less": {
"optional": true
},
@@ -3762,6 +3835,12 @@
},
"terser": {
"optional": true
+ },
+ "tsx": {
+ "optional": true
+ },
+ "yaml": {
+ "optional": true
}
}
},
@@ -3822,17 +3901,17 @@
}
},
"node_modules/vue": {
- "version": "3.5.33",
- "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.33.tgz",
- "integrity": "sha512-1AgChhx5w3ALgT4oK3acm2Es/7jyZhWSVUfs3rOBlGQC0rjEDkS7G4lWlJJGGNQD+BV3reCwbQrOe1mPNwKHBQ==",
+ "version": "3.5.44",
+ "resolved": "https://ms-feed-25.pkgs.visualstudio.com/1es-public/_packaging/npm-public/npm/registry/vue/-/vue-3.5.44.tgz",
+ "integrity": "sha512-dvvmaOCG7lAMkJTPqPwWeGMsPS6DIsFsfZDUgBp9V6mHf9b3+/wyVwYR4Es+WV6uJC0FKRxp81Obcq0ZwUcGFQ==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@vue/compiler-dom": "3.5.33",
- "@vue/compiler-sfc": "3.5.33",
- "@vue/runtime-dom": "3.5.33",
- "@vue/server-renderer": "3.5.33",
- "@vue/shared": "3.5.33"
+ "@vue/compiler-dom": "3.5.44",
+ "@vue/compiler-sfc": "3.5.44",
+ "@vue/runtime-dom": "3.5.44",
+ "@vue/server-renderer": "3.5.44",
+ "@vue/shared": "3.5.44"
},
"peerDependencies": {
"typescript": "*"
diff --git a/package.json b/package.json
index 7e8b7f2..6dcbcc7 100644
--- a/package.json
+++ b/package.json
@@ -7,12 +7,14 @@
},
"overrides": {
"mermaid": {
- "uuid": "^14.0.0"
+ "uuid": "^14.0.0",
+ "katex": "^0.18.10"
},
- "esbuild": "~0.25.0"
+ "esbuild": "~0.25.0",
+ "vite": "^6.4.4"
},
"devDependencies": {
- "mermaid": "^11.16.1",
+ "mermaid": "^11.17.2",
"vitepress": "^1.6.3",
"vitepress-plugin-mermaid": "^2.0.10"
}
diff --git a/packages/contrib/quicksand-agent/hatch_build.py b/packages/contrib/quicksand-agent/hatch_build.py
index 78bec08..a65dbcc 100644
--- a/packages/contrib/quicksand-agent/hatch_build.py
+++ b/packages/contrib/quicksand-agent/hatch_build.py
@@ -8,6 +8,7 @@ from __future__ import annotations
import asyncio
import logging
+import os
import shutil
from collections.abc import Callable, Coroutine
from pathlib import Path
@@ -25,12 +26,27 @@ async def _setup(shell: Callable[..., Coroutine[Any, Any, Any]]) -> None:
"""Install steps for the agent sandbox."""
from quicksand_image_tools.build_utils import run_python_install
+ await shell("apt-get update", timeout=120)
+ await shell("apt-get install -y --no-install-recommends ca-certificates", timeout=120)
+ await shell(
+ "dpkg --compare-versions \"$(dpkg-query -W -f='${Version}' ca-certificates)\""
+ " ge 20260816ubuntu0.24.04.1"
+ )
+
# ── Install uv ──────────────────────────────────────────────
- await shell("curl -LsSf https://astral.sh/uv/install.sh | sh", timeout=60)
+ await shell(
+ "curl -LsSf https://astral.sh/uv/0.13.4/install.sh -o /tmp/uv-install.sh"
+ " && sh /tmp/uv-install.sh && rm /tmp/uv-install.sh",
+ timeout=60,
+ )
# ── Create Python 3.12 venv with pip at /opt/python ────────
await run_python_install(
- shell, "/root/.local/bin/uv venv /opt/python --python 3.12 --seed", timeout=120
+ shell,
+ "/root/.local/bin/uv venv /opt/python --python 3.12 --seed"
+ " && /root/.local/bin/uv pip install --python /opt/python/bin/python"
+ " 'pip>=26.2.2' 'certifi>=2026.10.19'",
+ timeout=120,
)
# ── Make venv discoverable on PATH ────────────────────────
@@ -64,13 +80,12 @@ PROF
await shell("/opt/python/bin/pip --version")
# ── Install build-essential ─────────────────────────────────
- await shell("apt-get update", timeout=120)
await shell("apt-get install -y build-essential", timeout=600)
# ── Install Python packages ─────────────────────────────────
await run_python_install(
shell,
- "/opt/python/bin/pip install requests 'pyyaml>=6.0'"
+ "/opt/python/bin/pip install 'certifi>=2026.10.19' requests 'pyyaml>=6.0'"
" 'ddgs>=9.11.2' 'markitdown[all]>=0.1.5'",
timeout=600,
)
@@ -101,8 +116,12 @@ class OverlayImageBuildHook(BuildHookInterface):
save_dir = pkg_dir / "images"
overlays_dir = save_dir / "overlays"
- if not (save_dir / "manifest.json").exists() or not any(overlays_dir.glob("*.qcow2")):
- self.app.display_info("Save not found, building overlay...")
+ if (
+ os.environ.get("QUICKSAND_REBUILD_IMAGES", "").strip() == "1"
+ or not (save_dir / "manifest.json").exists()
+ or not any(overlays_dir.glob("*.qcow2"))
+ ):
+ self.app.display_info("Building overlay...")
asyncio.run(self._build_and_save(save_dir))
self.app.display_info(f"Including save: {save_dir}")
diff --git a/packages/contrib/quicksand-agent/pyproject.toml b/packages/contrib/quicksand-agent/pyproject.toml
index af51c23..ce5704f 100644
--- a/packages/contrib/quicksand-agent/pyproject.toml
+++ b/packages/contrib/quicksand-agent/pyproject.toml
@@ -5,11 +5,11 @@ description = "Overlay image package for quicksand"
readme = "README.md"
requires-python = ">=3.11"
license = "MIT"
-dependencies = ["quicksand-core>=0.14.0,<0.15.0", "quicksand-ubuntu>=0.10.0,<0.11.0"]
+dependencies = ["quicksand-core>=0.14.1,<0.15.0", "quicksand-ubuntu>=0.10.2,<0.11.0"]
[build-system]
-requires = ["hatchling", "quicksand-image-tools>=0.6.0,<0.7.0", "quicksand-core>=0.14.0,<0.15.0", "quicksand-ubuntu>=0.10.0,<0.11.0", "quicksand-qemu>=0.5.10,<0.6.0", "quicksand-smb>=0.5.0,<0.6.0"]
+requires = ["hatchling", "quicksand-image-tools>=0.6.2,<0.7.0", "quicksand-core>=0.14.1,<0.15.0", "quicksand-ubuntu>=0.10.2,<0.11.0", "quicksand-qemu>=0.5.10,<0.6.0", "quicksand-smb>=0.5.0,<0.6.0"]
build-backend = "hatchling.build"
[tool.hatch.build.targets.wheel]
diff --git a/packages/contrib/quicksand-alpine-desktop/hatch_build.py b/packages/contrib/quicksand-alpine-desktop/hatch_build.py
index e03899c..5c5dce7 100644
--- a/packages/contrib/quicksand-alpine-desktop/hatch_build.py
+++ b/packages/contrib/quicksand-alpine-desktop/hatch_build.py
@@ -8,6 +8,7 @@ from __future__ import annotations
import asyncio
import logging
+import os
import shutil
from collections.abc import Callable, Coroutine
from pathlib import Path
@@ -23,6 +24,13 @@ logger = logging.getLogger("alpine-desktop")
async def _setup(shell: Callable[..., Coroutine[Any, Any, Any]]) -> None:
"""Install Xfce4 desktop environment on Alpine base."""
+ from quicksand_image_tools.browser_trust import install_chromium_ca_distrust
+
+ await shell(
+ "apk add --no-cache --upgrade 'ca-certificates>=20261020-r0'",
+ timeout=120,
+ )
+ await install_chromium_ca_distrust(shell, "/etc/chromium/policies/managed")
# ── Install X.org + Xfce4 + desktop packages ─────────────────
await shell(
@@ -227,8 +235,12 @@ class OverlayImageBuildHook(BuildHookInterface):
save_dir = pkg_dir / "images"
overlays_dir = save_dir / "overlays"
- if not (save_dir / "manifest.json").exists() or not any(overlays_dir.glob("*.qcow2")):
- self.app.display_info("Save not found, building overlay...")
+ if (
+ os.environ.get("QUICKSAND_REBUILD_IMAGES", "").strip() == "1"
+ or not (save_dir / "manifest.json").exists()
+ or not any(overlays_dir.glob("*.qcow2"))
+ ):
+ self.app.display_info("Building overlay...")
asyncio.run(self._build_and_save(save_dir))
self.app.display_info(f"Including save: {save_dir}")
diff --git a/packages/contrib/quicksand-alpine-desktop/pyproject.toml b/packages/contrib/quicksand-alpine-desktop/pyproject.toml
index 5f67cba..1dacef0 100644
--- a/packages/contrib/quicksand-alpine-desktop/pyproject.toml
+++ b/packages/contrib/quicksand-alpine-desktop/pyproject.toml
@@ -5,13 +5,13 @@ description = "Minimal Alpine Linux desktop VM (Xfce4) for quicksand"
readme = "README.md"
requires-python = ">=3.11"
license = "MIT"
-dependencies = ["quicksand-core>=0.14.0,<0.15.0", "quicksand-alpine>=0.10.0,<0.11.0"]
+dependencies = ["quicksand-core>=0.14.1,<0.15.0", "quicksand-alpine>=0.10.2,<0.11.0"]
[dependency-groups]
dev = []
[build-system]
-requires = ["hatchling", "quicksand-image-tools>=0.6.0,<0.7.0", "quicksand-core>=0.14.0,<0.15.0", "quicksand-alpine>=0.10.0,<0.11.0", "quicksand-qemu>=0.5.10,<0.6.0", "quicksand-smb>=0.5.0,<0.6.0"]
+requires = ["hatchling", "quicksand-image-tools>=0.6.2,<0.7.0", "quicksand-core>=0.14.1,<0.15.0", "quicksand-alpine>=0.10.2,<0.11.0", "quicksand-qemu>=0.5.10,<0.6.0", "quicksand-smb>=0.5.0,<0.6.0"]
build-backend = "hatchling.build"
[tool.hatch.build.targets.wheel]
diff --git a/packages/contrib/quicksand-alpine/pyproject.toml b/packages/contrib/quicksand-alpine/pyproject.toml
index 2f5bb79..c71b4f3 100644
--- a/packages/contrib/quicksand-alpine/pyproject.toml
+++ b/packages/contrib/quicksand-alpine/pyproject.toml
@@ -5,13 +5,13 @@ description = "Pre-built Alpine Linux VM image for quicksand"
readme = "README.md"
requires-python = ">=3.11"
license = "MIT"
-dependencies = ["quicksand-core>=0.14.0,<0.15.0"]
+dependencies = ["quicksand-core>=0.14.1,<0.15.0"]
[dependency-groups]
-dev = ["quicksand-image-tools>=0.4.4"]
+dev = ["quicksand-image-tools>=0.6.2"]
[build-system]
-requires = ["hatchling", "quicksand-image-tools>=0.6.0,<0.7.0", "quicksand-core>=0.14.0,<0.15.0", "quicksand-qemu>=0.5.10,<0.6.0", "quicksand-smb>=0.5.0,<0.6.0"]
+requires = ["hatchling", "quicksand-image-tools>=0.6.2,<0.7.0", "quicksand-core>=0.14.1,<0.15.0", "quicksand-qemu>=0.5.10,<0.6.0", "quicksand-smb>=0.5.0,<0.6.0"]
build-backend = "hatchling.build"
[tool.hatch.build.targets.wheel]
diff --git a/packages/contrib/quicksand-alpine/quicksand_alpine/docker/Dockerfile b/packages/contrib/quicksand-alpine/quicksand_alpine/docker/Dockerfile
index a8cd2e9..1974316 100644
--- a/packages/contrib/quicksand-alpine/quicksand_alpine/docker/Dockerfile
+++ b/packages/contrib/quicksand-alpine/quicksand_alpine/docker/Dockerfile
@@ -9,7 +9,7 @@
FROM rust:alpine AS agent-builder
# Install build dependencies
-RUN apk add --no-cache musl-dev
+RUN apk add --no-cache --upgrade musl-dev 'ca-certificates>=20261020-r0'
# Set up the build directory
WORKDIR /build
@@ -37,7 +37,7 @@ RUN apk add --no-cache \
# Networking
dhcpcd \
curl \
- ca-certificates \
+ 'ca-certificates>=20261020-r0' \
# Utilities
sudo \
# Disk resize tools (for disk_size config option)
diff --git a/packages/contrib/quicksand-cua/hatch_build.py b/packages/contrib/quicksand-cua/hatch_build.py
index a9fa9a5..f3d9b3d 100644
--- a/packages/contrib/quicksand-cua/hatch_build.py
+++ b/packages/contrib/quicksand-cua/hatch_build.py
@@ -7,6 +7,7 @@ from __future__ import annotations
import asyncio
import logging
+import os
import shutil
from collections.abc import Callable, Coroutine
from pathlib import Path
@@ -24,6 +25,36 @@ logger = logging.getLogger("quicksand-cua")
Shell = Callable[..., Coroutine[Any, Any, Any]]
+async def _install_playwright_node(shell: Shell) -> None:
+ """Install a patched external runtime for Playwright's Node-based driver."""
+ await shell(
+ """set -eu
+case "$(uname -m)" in
+ x86_64)
+ arch=x64
+ checksum=6c172a9ab6718f7b801fb5a7bd486af2ee5e32758086a04b84fcce2aa77095e6
+ ;;
+ aarch64)
+ arch=arm64
+ checksum=dbabf7a1cbf947e6059ffad2c27b80041db97dea1e553b62afdee7f13fca336e
+ ;;
+ *)
+ echo "Unsupported architecture for Playwright's Node runtime" >&2
+ exit 1
+ ;;
+esac
+archive="node-v24.22.1-linux-${arch}"
+curl -LsSf "https://nodejs.org/dist/v24.22.1/${archive}.tar.xz" -o /tmp/playwright-node.tar.xz
+printf '%s %s\\n' "$checksum" /tmp/playwright-node.tar.xz | sha256sum --check -
+mkdir -p /opt/playwright-node
+tar -xJf /tmp/playwright-node.tar.xz -C /opt/playwright-node --strip-components=1 --no-same-owner \
+ "${archive}/bin/node" "${archive}/LICENSE"
+rm /tmp/playwright-node.tar.xz
+""",
+ timeout=180,
+ )
+
+
# =============================================================================
# EDIT HERE — Install steps for your overlay image
#
@@ -37,25 +68,65 @@ Shell = Callable[..., Coroutine[Any, Any, Any]]
async def _setup(shell: Shell) -> None:
+ from quicksand_image_tools.browser_trust import install_chromium_ca_distrust
from quicksand_image_tools.build_utils import run_python_install
+ await shell(
+ """/opt/python/bin/python3 - <<'PY'
+from importlib.metadata import version
+from subprocess import check_output
+from pip._vendor.packaging.version import Version
+
+versions = {
+ "pip": version("pip"),
+ "certifi": version("certifi"),
+ "uv": check_output(["/root/.local/bin/uv", "--version"], text=True).split()[1],
+}
+for package, minimum in (("pip", "26.2.2"), ("certifi", "2026.10.19"), ("uv", "0.13.4")):
+ if Version(versions[package]) < Version(minimum):
+ raise SystemExit(
+ f"Rebuild quicksand-agent with {package}>={minimum} before building quicksand-cua"
+ )
+PY"""
+ )
+
# ── Install Xvfb, x11vnc, and Playwright system deps ────────
await shell("apt-get update", timeout=120)
await shell(
- "apt-get install -y xvfb x11vnc xauth fonts-liberation fonts-noto-color-emoji",
+ "apt-get install -y ca-certificates xz-utils"
+ " xvfb x11vnc xauth fonts-liberation fonts-noto-color-emoji",
timeout=300,
)
+ await shell(
+ "dpkg --compare-versions \"$(dpkg-query -W -f='${Version}' ca-certificates)\""
+ " ge 20260816ubuntu0.24.04.1"
+ )
await shell(
"apt-get install -y novnc websockify socat rsync findutils file",
timeout=300,
)
+ await _install_playwright_node(shell)
+ await install_chromium_ca_distrust(shell, "/etc/opt/chrome_for_testing/policies/managed")
+
# ── Install Playwright and Chromium via Playwright ───────────
await run_python_install(
- shell, '/opt/python/bin/pip install playwright "flake8==7.1.1"', timeout=300
+ shell,
+ "/opt/python/bin/pip install 'certifi>=2026.10.19' playwright 'flake8==7.1.1'",
+ timeout=300,
+ )
+ # Use Playwright's supported external runtime rather than its older bundled Node.
+ await shell(
+ """/opt/python/bin/python3 - <<'PY'
+from pathlib import Path
+import playwright
+
+(Path(playwright.__file__).parent / "driver" / "node").unlink()
+PY"""
)
await shell(
"PLAYWRIGHT_BROWSERS_PATH=/opt/playwright"
+ " PLAYWRIGHT_NODEJS_PATH=/opt/playwright-node/bin/node"
" /opt/python/bin/python3 -m playwright install --with-deps chromium",
timeout=300,
)
@@ -64,10 +135,19 @@ async def _setup(shell: Shell) -> None:
await shell(
"""cat > /etc/profile.d/playwright.sh << 'PROF'
export PLAYWRIGHT_BROWSERS_PATH=/opt/playwright
+export PLAYWRIGHT_NODEJS_PATH=/opt/playwright-node/bin/node
export DISPLAY=:0
PROF
""",
)
+ await shell(
+ """mkdir -p /etc/systemd/system/quicksand-guest-agent.service.d
+cat > /etc/systemd/system/quicksand-guest-agent.service.d/playwright.conf << 'EOF'
+[Service]
+Environment=PLAYWRIGHT_NODEJS_PATH=/opt/playwright-node/bin/node
+EOF
+"""
+ )
# ── Systemd service: Xvfb on display :0 ─────────────────────
await shell(
@@ -194,8 +274,12 @@ class OverlayImageBuildHook(BuildHookInterface):
save_dir = pkg_dir / "images"
overlays_dir = save_dir / "overlays"
- if not (save_dir / "manifest.json").exists() or not any(overlays_dir.glob("*.qcow2")):
- self.app.display_info("Save not found, building overlay...")
+ if (
+ os.environ.get("QUICKSAND_REBUILD_IMAGES", "").strip() == "1"
+ or not (save_dir / "manifest.json").exists()
+ or not any(overlays_dir.glob("*.qcow2"))
+ ):
+ self.app.display_info("Building overlay...")
asyncio.run(self._build_and_save(save_dir))
self.app.display_info(f"Including save: {save_dir}")
diff --git a/packages/contrib/quicksand-cua/pyproject.toml b/packages/contrib/quicksand-cua/pyproject.toml
index 8491cbf..2459392 100644
--- a/packages/contrib/quicksand-cua/pyproject.toml
+++ b/packages/contrib/quicksand-cua/pyproject.toml
@@ -5,7 +5,7 @@ description = "Overlay image package for quicksand"
readme = "README.md"
requires-python = ">=3.11"
license = "MIT"
-dependencies = ["quicksand-core>=0.14.0,<0.15.0", "quicksand-agent>=0.4.8,<0.5.0"]
+dependencies = ["quicksand-core>=0.14.1,<0.15.0", "quicksand-agent>=0.4.12,<0.5.0"]
[project.entry-points."quicksand.images"]
@@ -13,7 +13,7 @@ quicksand-cua = "quicksand_cua:image"
[build-system]
-requires = ["hatchling", "pip", "quicksand-image-tools>=0.6.0,<0.7.0", "quicksand-core>=0.14.0,<0.15.0", "quicksand-agent>=0.4.8,<0.5.0", "quicksand-ubuntu>=0.10.0,<0.11.0", "quicksand-qemu>=0.5.10,<0.6.0", "quicksand-smb>=0.5.0,<0.6.0"]
+requires = ["hatchling", "pip>=26.2.2", "quicksand-image-tools>=0.6.2,<0.7.0", "quicksand-core>=0.14.1,<0.15.0", "quicksand-agent>=0.4.12,<0.5.0", "quicksand-ubuntu>=0.10.2,<0.11.0", "quicksand-qemu>=0.5.10,<0.6.0", "quicksand-smb>=0.5.0,<0.6.0"]
build-backend = "hatchling.build"
[tool.hatch.build.targets.wheel]
diff --git a/packages/contrib/quicksand-ubuntu-desktop/README.md b/packages/contrib/quicksand-ubuntu-desktop/README.md
index 1d6d290..544a6ca 100644
--- a/packages/contrib/quicksand-ubuntu-desktop/README.md
+++ b/packages/contrib/quicksand-ubuntu-desktop/README.md
@@ -48,12 +48,14 @@ async with UbuntuDesktopSandbox(memory="4G", cpus=4) as sb:
## What's Included
- Ubuntu 24.04 with Xfce4 desktop + LightDM (auto-login, no password prompt)
-- Firefox ESR browser
+- Firefox ESR browser from Mozilla's signed APT repository
- Full apt/deb ecosystem
- Python 3, bash, curl, ca-certificates
- The quicksand guest agent (pre-installed)
- Software rendering via Mesa (`LIBGL_ALWAYS_SOFTWARE=1`)
+Firefox distrusts the compromised eMudhra intermediate certificates, including their cross-signed variants, at profile startup without waiting for online revocation updates.
+
## Default Config
| Setting | Default |
diff --git a/packages/contrib/quicksand-ubuntu-desktop/hatch_build.py b/packages/contrib/quicksand-ubuntu-desktop/hatch_build.py
index 6d6f485..76d13b4 100644
--- a/packages/contrib/quicksand-ubuntu-desktop/hatch_build.py
+++ b/packages/contrib/quicksand-ubuntu-desktop/hatch_build.py
@@ -8,6 +8,7 @@ from __future__ import annotations
import asyncio
import logging
+import os
import shutil
from collections.abc import Callable, Coroutine
from pathlib import Path
@@ -23,9 +24,18 @@ logger = logging.getLogger("ubuntu-desktop")
async def _setup(shell: Callable[..., Coroutine[Any, Any, Any]]) -> None:
"""Install Xfce4 desktop environment on Ubuntu base."""
+ from quicksand_image_tools.browser_trust import install_firefox_ca_distrust
# ── Install Xfce4 desktop packages ───────────────────────────
- await shell("DEBIAN_FRONTEND=noninteractive apt-get update", timeout=120)
+ await shell("DEBIAN_FRONTEND=noninteractive apt-get update --error-on=any", timeout=120)
+ await shell(
+ "DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends ca-certificates",
+ timeout=120,
+ )
+ await shell(
+ "dpkg --compare-versions \"$(dpkg-query -W -f='${Version}' ca-certificates)\""
+ " ge 20260816ubuntu0.24.04.1"
+ )
await shell(
"DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends "
"xserver-xorg-core xserver-xorg-video-modesetting xserver-xorg-input-libinput",
@@ -43,27 +53,34 @@ async def _setup(shell: Callable[..., Coroutine[Any, Any, Any]]) -> None:
timeout=300,
)
- # ── Install Firefox ESR from Mozilla PPA ─────────────────────
- await shell(
- "DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends "
- "software-properties-common",
- timeout=120,
- )
+ # ── Install Firefox ESR from Mozilla's signed APT repository ─
await shell(
- "add-apt-repository -y ppa:mozillateam/ppa && "
- "printf 'Package: firefox*\\nPin: release o=LP-PPA-mozillateam\\n"
- "Pin-Priority: 1001\\n' > /etc/apt/preferences.d/mozilla-firefox",
+ """set -eu
+install -d -m 0755 /etc/apt/keyrings
+curl -fsSL https://packages.mozilla.org/apt/repo-signing-key.gpg \
+ -o /etc/apt/keyrings/packages.mozilla.org.asc
+chmod 0644 /etc/apt/keyrings/packages.mozilla.org.asc
+cat > /etc/apt/sources.list.d/mozilla.sources << 'EOF'
+Types: deb
+URIs: https://packages.mozilla.org/apt
+Suites: mozilla
+Components: main
+Signed-By: /etc/apt/keyrings/packages.mozilla.org.asc 35BAA0B33E9EB396F59CA838C0BA5CE6DC6315A3
+EOF
+cat > /etc/apt/preferences.d/mozilla-firefox << 'EOF'
+Package: firefox*
+Pin: origin packages.mozilla.org
+Pin-Priority: 1000
+EOF
+""",
timeout=120,
)
- await shell("apt-get update", timeout=120)
+ await shell("apt-get update --error-on=any", timeout=120)
await shell(
"DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends firefox-esr",
timeout=300,
)
- await shell(
- "apt-get remove --purge -y software-properties-common && apt-get autoremove --purge -y",
- timeout=120,
- )
+ await install_firefox_ca_distrust(shell, "/usr/lib/firefox-esr")
# ── LightDM auto-login ───────────────────────────────────────
await shell(
@@ -134,8 +151,12 @@ class OverlayImageBuildHook(BuildHookInterface):
save_dir = pkg_dir / "images"
overlays_dir = save_dir / "overlays"
- if not (save_dir / "manifest.json").exists() or not any(overlays_dir.glob("*.qcow2")):
- self.app.display_info("Save not found, building overlay...")
+ if (
+ os.environ.get("QUICKSAND_REBUILD_IMAGES", "").strip() == "1"
+ or not (save_dir / "manifest.json").exists()
+ or not any(overlays_dir.glob("*.qcow2"))
+ ):
+ self.app.display_info("Building overlay...")
asyncio.run(self._build_and_save(save_dir))
self.app.display_info(f"Including save: {save_dir}")
diff --git a/packages/contrib/quicksand-ubuntu-desktop/pyproject.toml b/packages/contrib/quicksand-ubuntu-desktop/pyproject.toml
index 0899036..63511ff 100644
--- a/packages/contrib/quicksand-ubuntu-desktop/pyproject.toml
+++ b/packages/contrib/quicksand-ubuntu-desktop/pyproject.toml
@@ -5,13 +5,13 @@ description = "Ubuntu 24.04 Desktop VM (Xfce4) for quicksand"
readme = "README.md"
requires-python = ">=3.11"
license = "MIT"
-dependencies = ["quicksand-core>=0.14.0,<0.15.0", "quicksand-ubuntu>=0.10.0,<0.11.0"]
+dependencies = ["quicksand-core>=0.14.1,<0.15.0", "quicksand-ubuntu>=0.10.2,<0.11.0"]
[dependency-groups]
dev = []
[build-system]
-requires = ["hatchling", "quicksand-image-tools>=0.6.0,<0.7.0", "quicksand-core>=0.14.0,<0.15.0", "quicksand-ubuntu>=0.10.0,<0.11.0", "quicksand-qemu>=0.5.10,<0.6.0", "quicksand-smb>=0.5.0,<0.6.0"]
+requires = ["hatchling", "quicksand-image-tools>=0.6.2,<0.7.0", "quicksand-core>=0.14.1,<0.15.0", "quicksand-ubuntu>=0.10.2,<0.11.0", "quicksand-qemu>=0.5.10,<0.6.0", "quicksand-smb>=0.5.0,<0.6.0"]
build-backend = "hatchling.build"
[tool.hatch.build.targets.wheel]
diff --git a/packages/contrib/quicksand-ubuntu/pyproject.toml b/packages/contrib/quicksand-ubuntu/pyproject.toml
index dae524a..2bd94d4 100644
--- a/packages/contrib/quicksand-ubuntu/pyproject.toml
+++ b/packages/contrib/quicksand-ubuntu/pyproject.toml
@@ -5,13 +5,13 @@ description = "Pre-built Ubuntu 24.04 VM image for quicksand"
readme = "README.md"
requires-python = ">=3.11"
license = "MIT"
-dependencies = ["quicksand-core>=0.14.0,<0.15.0"]
+dependencies = ["quicksand-core>=0.14.1,<0.15.0"]
[dependency-groups]
-dev = ["quicksand-image-tools>=0.4.4"]
+dev = ["quicksand-image-tools>=0.6.2"]
[build-system]
-requires = ["hatchling", "quicksand-image-tools>=0.6.0,<0.7.0", "quicksand-core>=0.14.0,<0.15.0", "quicksand-qemu>=0.5.10,<0.6.0", "quicksand-smb>=0.5.0,<0.6.0"]
+requires = ["hatchling", "quicksand-image-tools>=0.6.2,<0.7.0", "quicksand-core>=0.14.1,<0.15.0", "quicksand-qemu>=0.5.10,<0.6.0", "quicksand-smb>=0.5.0,<0.6.0"]
build-backend = "hatchling.build"
[tool.hatch.build.targets.wheel]
diff --git a/packages/contrib/quicksand-ubuntu/quicksand_ubuntu/docker/Dockerfile b/packages/contrib/quicksand-ubuntu/quicksand_ubuntu/docker/Dockerfile
index c95e38e..a97bdbb 100644
--- a/packages/contrib/quicksand-ubuntu/quicksand_ubuntu/docker/Dockerfile
+++ b/packages/contrib/quicksand-ubuntu/quicksand_ubuntu/docker/Dockerfile
@@ -8,6 +8,10 @@
# =============================================================================
FROM rust:bookworm AS agent-builder
+RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates \
+ && dpkg --compare-versions "$(dpkg-query -W -f='${Version}' ca-certificates)" ge 20250419~deb12u2 \
+ && rm -rf /var/lib/apt/lists/*
+
WORKDIR /build
COPY agent/Cargo.toml agent/Cargo.lock* ./
COPY agent/src ./src
@@ -42,6 +46,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
iproute2 iputils-ping \
sudo curl ca-certificates \
cifs-utils cloud-guest-utils e2fsprogs \
+ && dpkg --compare-versions "$(dpkg-query -W -f='${Version}' ca-certificates)" ge 20260816ubuntu0.24.04.1 \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/* /tmp/* /var/tmp/*
diff --git a/packages/dev/quicksand-base-scaffold/hatch_build.py b/packages/dev/quicksand-base-scaffold/hatch_build.py
index 33cdebd..733d23a 100644
--- a/packages/dev/quicksand-base-scaffold/hatch_build.py
+++ b/packages/dev/quicksand-base-scaffold/hatch_build.py
@@ -3,6 +3,7 @@
from __future__ import annotations
import logging
+import os
import re
from pathlib import Path
@@ -48,8 +49,8 @@ class BaseImageBuildHook(BuildHookInterface):
image_path = images_dir / f"quicksand-base-scaffold-{distro_version}-{arch}.qcow2"
dockerfile_path = pkg_dir / "docker" / "Dockerfile"
- if not image_path.exists():
- self.app.display_info(f"Image not found: {image_path.name}, building...")
+ if os.environ.get("QUICKSAND_REBUILD_IMAGES", "").strip() == "1" or not image_path.exists():
+ self.app.display_info(f"Building image: {image_path.name}")
self._build_image(dockerfile_path, image_path)
self.app.display_info(f"Including image: {image_path}")
diff --git a/packages/dev/quicksand-base-scaffold/pyproject.toml b/packages/dev/quicksand-base-scaffold/pyproject.toml
index 8233853..fc36d05 100644
--- a/packages/dev/quicksand-base-scaffold/pyproject.toml
+++ b/packages/dev/quicksand-base-scaffold/pyproject.toml
@@ -4,7 +4,7 @@ version = "0.3.13.dev0"
description = "Template base image package for quicksand"
requires-python = ">=3.11"
license = "MIT"
-dependencies = ["quicksand-core>=0.14.0,<0.15.0", "tomlkit>=0.13"]
+dependencies = ["quicksand-core>=0.14.1,<0.15.0", "tomlkit>=0.13"]
[project.scripts]
quicksand-base-scaffold = "quicksand_base_scaffold.scaffold:main"
@@ -14,7 +14,7 @@ quicksand-base-scaffold = "quicksand_base_scaffold:image"
[build-system]
-requires = ["hatchling", "quicksand-image-tools>=0.6.0,<0.7.0", "quicksand-core>=0.14.0,<0.15.0", "quicksand-qemu>=0.5.10,<0.6.0", "quicksand-smb>=0.5.0,<0.6.0"]
+requires = ["hatchling", "quicksand-image-tools>=0.6.2,<0.7.0", "quicksand-core>=0.14.1,<0.15.0", "quicksand-qemu>=0.5.10,<0.6.0", "quicksand-smb>=0.5.0,<0.6.0"]
build-backend = "hatchling.build"
[tool.hatch.build.targets.wheel]
diff --git a/packages/dev/quicksand-gh-runners/cloud-init.yaml b/packages/dev/quicksand-gh-runners/cloud-init.yaml
index 6ccc916..b327483 100644
--- a/packages/dev/quicksand-gh-runners/cloud-init.yaml
+++ b/packages/dev/quicksand-gh-runners/cloud-init.yaml
@@ -3,11 +3,20 @@ package_update: true
packages:
- docker.io
- curl
+ - ca-certificates
- jq
- git
- build-essential
runcmd:
+ - set -eu
+ - |
+ dpkg --compare-versions "$(dpkg-query -W -f='${Version}' ca-certificates)" \
+ ge 20260816ubuntu0.24.04.1 || {
+ echo "ca-certificates>=20260816ubuntu0.24.04.1 is required for runner bootstrap" >&2
+ exit 1
+ }
+
# Docker Buildx
- mkdir -p /usr/local/lib/docker/cli-plugins
- |
@@ -18,8 +27,10 @@ runcmd:
chmod +x /usr/local/lib/docker/cli-plugins/docker-buildx
# uv
- - curl -LsSf https://astral.sh/uv/install.sh | UV_INSTALL_DIR=/usr/local/bin sh
-
+ - |
+ curl -LsSf https://astral.sh/uv/0.13.4/install.sh -o /tmp/uv-install.sh
+ UV_INSTALL_DIR=/usr/local/bin sh /tmp/uv-install.sh
+ rm /tmp/uv-install.sh
# KVM (x64 only, harmless no-op on arm64)
- modprobe kvm 2>/dev/null || true
diff --git a/packages/dev/quicksand-gh-runners/pyproject.toml b/packages/dev/quicksand-gh-runners/pyproject.toml
index 04ce768..2b9646b 100644
--- a/packages/dev/quicksand-gh-runners/pyproject.toml
+++ b/packages/dev/quicksand-gh-runners/pyproject.toml
@@ -7,6 +7,7 @@ license = "MIT"
dependencies = [
"azure-identity",
"azure-mgmt-compute",
+ "certifi>=2026.10.19",
"requests",
]
diff --git a/packages/dev/quicksand-image-tools/pyproject.toml b/packages/dev/quicksand-image-tools/pyproject.toml
index 069705f..591375a 100644
--- a/packages/dev/quicksand-image-tools/pyproject.toml
+++ b/packages/dev/quicksand-image-tools/pyproject.toml
@@ -5,7 +5,7 @@ description = "Development tools for quicksand - build custom VM images from Doc
readme = "README.md"
requires-python = ">=3.11"
license = "MIT"
-dependencies = ["quicksand-core>=0.14.0,<0.15.0"]
+dependencies = ["quicksand-core>=0.14.1,<0.15.0"]
[project.scripts]
quicksand-image-tools = "quicksand_image_tools.cli:main"
diff --git a/packages/dev/quicksand-image-tools/quicksand_image_tools/browser_trust.py b/packages/dev/quicksand-image-tools/quicksand_image_tools/browser_trust.py
new file mode 100644
index 0000000..751e90c
--- /dev/null
+++ b/packages/dev/quicksand-image-tools/quicksand_image_tools/browser_trust.py
@@ -0,0 +1,64 @@
+"""Build-time browser distrust for the compromised eMudhra intermediate CAs.
+
+Certificate source: https://emudhra.we-have-a-problem.com/impacted-intermediates.json
+Chromium blocks by SPKI; Firefox's NSS trust records require each certificate,
+including the cross-signed variants.
+"""
+
+from __future__ import annotations
+
+import json
+import shlex
+from collections.abc import Awaitable, Callable
+from pathlib import Path
+
+
+def _distrusted_certificates() -> list[str]:
+ data = Path(__file__).with_name("compromised_ca_certificates.json").read_text()
+ return json.loads(data)["certificates"]
+
+
+async def install_chromium_ca_distrust(
+ shell: Callable[..., Awaitable[None]], policy_directory: str
+) -> None:
+ """Block compromised keys even when browser revocation updates are disabled."""
+ directory = shlex.quote(policy_directory)
+ destination = shlex.quote(f"{policy_directory}/quicksand-ca-distrust.json")
+ policy = json.dumps({"CADistrustedCertificates": _distrusted_certificates()}).encode()
+ await shell(
+ f"mkdir -p {directory} && cat > {destination}"
+ f" && chown 0:0 {directory} {destination}"
+ f" && chmod 755 {directory} && chmod 644 {destination}",
+ stdin=policy,
+ )
+
+
+async def install_firefox_ca_distrust(
+ shell: Callable[..., Awaitable[None]], firefox_directory: str
+) -> None:
+ """Distrust compromised CAs in every ESR profile before online revocation updates."""
+ configuration = (
+ "// Quicksand: distrust compromised eMudhra intermediate certificates.\n"
+ 'var certdb = Components.classes["@mozilla.org/security/x509certdb;1"]\n'
+ " .getService(Components.interfaces.nsIX509CertDB);\n"
+ f"for (var certificate of {json.dumps(_distrusted_certificates())}) {{\n"
+ ' certdb.addCertFromBase64(certificate, "p,p,p");\n'
+ "}\n"
+ )
+ config_path = shlex.quote(f"{firefox_directory}/quicksand-ca-distrust.cfg")
+ await shell(
+ f"cat > {config_path} && chown 0:0 {config_path} && chmod 644 {config_path}",
+ stdin=configuration.encode(),
+ )
+ preferences = (
+ 'pref("general.config.filename", "quicksand-ca-distrust.cfg");\n'
+ 'pref("general.config.obscure_value", 0);\n'
+ )
+ directory = shlex.quote(f"{firefox_directory}/defaults/pref")
+ destination = shlex.quote(f"{firefox_directory}/defaults/pref/quicksand-ca-distrust.js")
+ await shell(
+ f"mkdir -p {directory} && cat > {destination}"
+ f" && chown 0:0 {directory} {destination}"
+ f" && chmod 755 {directory} && chmod 644 {destination}",
+ stdin=preferences.encode(),
+ )
diff --git a/packages/dev/quicksand-image-tools/quicksand_image_tools/build.py b/packages/dev/quicksand-image-tools/quicksand_image_tools/build.py
index dafe5ed..450574b 100644
--- a/packages/dev/quicksand-image-tools/quicksand_image_tools/build.py
+++ b/packages/dev/quicksand-image-tools/quicksand_image_tools/build.py
@@ -4,6 +4,7 @@ from __future__ import annotations
import hashlib
import logging
+import os
import shutil
import subprocess
import tempfile
@@ -75,6 +76,8 @@ def build_image(
output_path: Where to save the resulting qcow2 image.
If None, saves to cache directory with a hash-based name.
cache_dir: Directory for cached images. Defaults to ~/.cache/quicksand/images/
+ force: Rebuild the image, pull parent images, and bypass Docker's layer cache.
+ Also enabled by QUICKSAND_REBUILD_IMAGES=1.
Returns:
Path to the built qcow2 image.
@@ -83,6 +86,7 @@ def build_image(
RuntimeError: If Docker is not available or build fails.
"""
log = log or logger
+ force = force or os.environ.get("QUICKSAND_REBUILD_IMAGES", "").strip() == "1"
if not shutil.which("docker"):
raise RuntimeError(
@@ -155,7 +159,7 @@ def build_image(
# Build Docker image
tag = f"quicksand-build:{content_hash}"
- _run_docker_build(dockerfile_path, context_dir, tag, log=log)
+ _run_docker_build(dockerfile_path, context_dir, tag, log=log, force=force)
try:
log.info("[2/5] Exporting filesystem...")
@@ -187,17 +191,14 @@ def _run_docker_build(
context: Path,
tag: str,
log: logging.Logger = logger,
+ *,
+ force: bool = False,
) -> None:
"""Build a Docker image, streaming output to the caller's logger."""
- cmd = [
- "docker",
- "build",
- "-f",
- str(dockerfile),
- "-t",
- tag,
- str(context),
- ]
+ cmd = ["docker", "build"]
+ if force:
+ cmd.extend(["--pull", "--no-cache"])
+ cmd.extend(["-f", str(dockerfile), "-t", tag, str(context)])
process = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True)
assert process.stdout is not None
diff --git a/packages/dev/quicksand-image-tools/quicksand_image_tools/compromised_ca_certificates.json b/packages/dev/quicksand-image-tools/quicksand_image_tools/compromised_ca_certificates.json
new file mode 100644
index 0000000..f8f7b55
--- /dev/null
+++ b/packages/dev/quicksand-image-tools/quicksand_image_tools/compromised_ca_certificates.json
@@ -0,0 +1,20 @@
+{
+ "certificates": [
+ "MIIDaDCCAu6gAwIBAgIQAKSu5njyM2K0wORgt3LyFDAKBggqhkjOPQQDAzBWMQswCQYDVQQGEwJJTjElMCMGA1UECgwcZU11ZGhyYSBUZWNobm9sb2dpZXMgTGltaXRlZDEgMB4GA1UEAwwXZW1TaWduIFJvb3QgVExTIENBIC0gRzMwHhcNMjUwNDMwMTU1NDA4WhcNNDAwNDI4MTgzMDAwWjA/MQswCQYDVQQGEwJOTDETMBEGA1UECgwKZU11ZGhyYSBCVjEbMBkGA1UEAwwSRU0gRFYgVExTIENBIC0gRzNCMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAE557ZwEqXc8RzXlERHahawr1eZKs3S4DhLLwgOOweTw47gS/JhZ4eZ6+wTi+LyX90hbplqpEe6KTkW2LVzAPVa+Z4s8OMtNyTfKJGDiOEU8iSk10p1E+R4VYGtjzO2rRoo4IBljCCAZIwHwYDVR0jBBgwFoAU4TqrIXzx401UrtRyt/2LWUIgkFQwHQYDVR0OBBYEFOIeL+ccGTkOVUtiwSAkVzUkiiUUMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBdBgNVHSAEVjBUMDkGCysGAQQBg44hAQABMCowKAYIKwYBBQUHAgEWHGh0dHA6Ly9yZXBvc2l0b3J5LmVtc2lnbi5jb20wDQYLKwYBBAGDjiEBAmQwCAYGZ4EMAQIBMHUGCCsGAQUFBwEBBGkwZzAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AtYi5lbXNpZ24uY29tMD8GCCsGAQUFBzAChjNodHRwOi8vcmVwb3NpdG9yeS5lbXNpZ24uY29tL2NlcnRzL0VNRFZUTFNDQUczQi5wN2MwNwYDVR0fBDAwLjAsoCqgKIYmaHR0cDovL2NybC5lbXNpZ24uY29tLz9yb290dGxzY2FnMy5jcmwwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQAwCgYIKoZIzj0EAwMDaAAwZQIwLmsGXi6oFMJ2klkcEMXMug6gvxQWZWkewiDWVzQyl2L6z6DuQfPOIbh1grvdULDCAjEAxZvLlxUavG69J6wnSjC8XBbqNIQsJ6CE2QdNOe84Ptxb6VG8gt2TlfJbHii+KNvK",
+ "MIIDzjCCAragAwIBAgIRAKAk/fS6Zlx4XOSgIEg4WLcwDQYJKoZIhvcNAQELBQAwezELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNVBAMMGEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczAeFw0yNTA1MTQwMDAwMDBaFw0yODEyMzEyMzU5NTlaMD8xCzAJBgNVBAYTAk5MMRMwEQYDVQQKDAplTXVkaHJhIEJWMRswGQYDVQQDDBJFTSBEViBUTFMgQ0EgLSBHM0IwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAATnntnASpdzxHNeUREdqFrCvV5kqzdLgOEsvCA47B5PDjuBL8mFnh5nr7BOL4vJf3SFumWqkR7opORbYtXMA9Vr5nizw4y03JN8okYOI4RTyJKTXSnUT5HhVga2PM7atGijggE1MIIBMTAfBgNVHSMEGDAWgBSgEQojPpbxB+zirynvgqV/0DCktDAdBgNVHQ4EFgQU4h4v5xwZOQ5VS2LBICRXNSSKJRQwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDEGA1UdIAQqMCgwCAYGZ4EMAQIBMA0GCysGAQQBg44hAQABMA0GCysGAQQBg44hAQJkMEMGA1UdHwQ8MDowOKA2oDSGMmh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0FBQUNlcnRpZmljYXRlU2VydmljZXMuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuY29tb2RvY2EuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQBzQ1IoqpdotM6gFrR4Q3YrKifOLeaj5XXunldpVE/vZn2TxC2y0s8oYiLR5ICEwqVXSB7N6BM1Mp+Nif7Jbhb2IswAfSR4Iik8+B0iRmi7lYoNlycCgHjmsjOmZaxMQkPmjXAJbG5f4V41OsvJZmS7lI3r0IuvEDVX3GAZ13on6IImSs9ybNpHQ7NCqkMQ7wH4uAO1dtpFycgJSdHaCOhHjrox2BTYGLdpUrYwY3EOAjlZ8UGgsxs7mG+xquMlbN1LFURwfnkVMP3T/DBIZ/ys2+lNFyxK3FlArrV4/000uTnVB1lO8oGORYdXoT5VGUyRCEIDhF5TBUuKF4E3kf1h",
+ "MIIDZjCCAu2gAwIBAgIPbK2jZ/scEACIEg6iAtVoMAoGCCqGSM49BAMDMFYxCzAJBgNVBAYTAklOMSUwIwYDVQQKDBxlTXVkaHJhIFRlY2hub2xvZ2llcyBMaW1pdGVkMSAwHgYDVQQDDBdlbVNpZ24gUm9vdCBUTFMgQ0EgLSBHMzAeFw0yNTA0MzAxNjAwMTJaFw00MDA0MjgxODMwMDBaMD8xCzAJBgNVBAYTAk5MMRMwEQYDVQQKDAplTXVkaHJhIEJWMRswGQYDVQQDDBJFTSBPViBUTFMgQ0EgLSBHM0IwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARziXqg6zz9yosSQC/68KvE4SErr43ud4rJ7i1tuD+sKAxeBWOK56Ks1xwyKo42HN659pxDArndjXPRzGyqsswK7k4hbOl53VGKSvS2JuVoTN1lgDftDIVOTMEvTPhkbQ2jggGWMIIBkjAfBgNVHSMEGDAWgBThOqshfPHjTVSu1HK3/YtZQiCQVDAdBgNVHQ4EFgQUm9hlUa/n5yw3rQjuaRnZvzeErgowHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMF0GA1UdIARWMFQwOQYLKwYBBAGDjiEBAAEwKjAoBggrBgEFBQcCARYcaHR0cDovL3JlcG9zaXRvcnkuZW1zaWduLmNvbTANBgsrBgEEAYOOIQECbjAIBgZngQwBAgIwdQYIKwYBBQUHAQEEaTBnMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC1iLmVtc2lnbi5jb20wPwYIKwYBBQUHMAKGM2h0dHA6Ly9yZXBvc2l0b3J5LmVtc2lnbi5jb20vY2VydHMvRU1PVlRMU0NBRzNCLnA3YzA3BgNVHR8EMDAuMCygKqAohiZodHRwOi8vY3JsLmVtc2lnbi5jb20vP3Jvb3R0bHNjYWczLmNybDAOBgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAKBggqhkjOPQQDAwNnADBkAjBAk+5BizdJhrED3wb7F2Gm7bWI60dlNd075nghT2TrR4NWKZtJZcbc28xxIY/NONICMF6mPdsjosaqmvEMWqKcBh4vsIvXSKnQj5o8zrFB4oKS+accjYTe8Dz3bQjauvy9uw==",
+ "MIIDzjCCAragAwIBAgIRAOlCI73pL5FOWrmsq/2sNxAwDQYJKoZIhvcNAQELBQAwezELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNVBAMMGEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczAeFw0yNTA1MTQwMDAwMDBaFw0yODEyMzEyMzU5NTlaMD8xCzAJBgNVBAYTAk5MMRMwEQYDVQQKDAplTXVkaHJhIEJWMRswGQYDVQQDDBJFTSBPViBUTFMgQ0EgLSBHM0IwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARziXqg6zz9yosSQC/68KvE4SErr43ud4rJ7i1tuD+sKAxeBWOK56Ks1xwyKo42HN659pxDArndjXPRzGyqsswK7k4hbOl53VGKSvS2JuVoTN1lgDftDIVOTMEvTPhkbQ2jggE1MIIBMTAfBgNVHSMEGDAWgBSgEQojPpbxB+zirynvgqV/0DCktDAdBgNVHQ4EFgQUm9hlUa/n5yw3rQjuaRnZvzeErgowDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDEGA1UdIAQqMCgwCAYGZ4EMAQICMA0GCysGAQQBg44hAQABMA0GCysGAQQBg44hAQJuMEMGA1UdHwQ8MDowOKA2oDSGMmh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0FBQUNlcnRpZmljYXRlU2VydmljZXMuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuY29tb2RvY2EuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQALRoOSvkzRa+tN5Rje9W5GiXd/qsicd9N6Gnh0SWC7VyWH+HycIqAnFCMYZznjCeGusomFYHE42SHWr85JDIbgzy6y3dO4i9n9w0Bx7yrXWBbDzFS8VgA3+EY4Cg7ymtoC3RPOJVtaXXPZ+68X804g1Mj+3vCSHj2lNPVgco0OzSIOJ/KMg1R9MLBkiKzbbERAGZHejY0HBhYd76IINZN8z6bBNah2UdFYxsOisLynPQUkol6gRLum024/FzVlCCDfnUusrkr+mAfPAvD/Vb8bhpA7jYtepuU+2mIdShj5lLlvAwZphn+ypWycuo2x0k9mldz2dqI9nhCiY+TTIOOR",
+ "MIIDaDCCAu2gAwIBAgIQAMfEHv6S2CXwXq6EGkqCwTAKBggqhkjOPQQDAzBWMQswCQYDVQQGEwJJTjElMCMGA1UECgwcZU11ZGhyYSBUZWNobm9sb2dpZXMgTGltaXRlZDEgMB4GA1UEAwwXZW1TaWduIFJvb3QgVExTIENBIC0gRzMwHhcNMjUwNDMwMTYwMzMxWhcNNDAwNDI4MTgzMDAwWjA/MQswCQYDVQQGEwJOTDETMBEGA1UECgwKZU11ZGhyYSBCVjEbMBkGA1UEAwwSRU0gRVYgVExTIENBIC0gRzNCMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEJduoWmTTl9oLEFLp6lRuSHvv6pydnWigxerc/u91ppu11vwB9Cv7ym60C81kwHZ+Nv/QXZeoE8WqDGyVMOec9fCGZGjxOAZCCqXIUYQLHiUlQOeQ5LZUw4Uu1krx6GV9o4IBlTCCAZEwHwYDVR0jBBgwFoAU4TqrIXzx401UrtRyt/2LWUIgkFQwHQYDVR0OBBYEFD7cINmJRpiHe4c/2IFHslwV2EcGMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBcBgNVHSAEVTBTMDkGCysGAQQBg44hAQABMCowKAYIKwYBBQUHAgEWHGh0dHA6Ly9yZXBvc2l0b3J5LmVtc2lnbi5jb20wDQYLKwYBBAGDjiEBAngwBwYFZ4EMAQEwdQYIKwYBBQUHAQEEaTBnMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC1iLmVtc2lnbi5jb20wPwYIKwYBBQUHMAKGM2h0dHA6Ly9yZXBvc2l0b3J5LmVtc2lnbi5jb20vY2VydHMvRU1FVlRMU0NBRzNCLnA3YzA3BgNVHR8EMDAuMCygKqAohiZodHRwOi8vY3JsLmVtc2lnbi5jb20vP3Jvb3R0bHNjYWczLmNybDAOBgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAKBggqhkjOPQQDAwNpADBmAjEA9Jq999oaOUKhFwopw33iCmt0OHIn3gjT43GfuOHR/YckXdwoNdDAlIEhz0NgRO3/AjEAvY/a3OMvktIZLYjn+WLKmp0QhrIMV+e6EpS7j4GVeOKouNp6MN/P+ByGeiRMghzB",
+ "MIIDzTCCArWgAwIBAgIRANj4aF5PK9nYJAKoWhwetzEwDQYJKoZIhvcNAQELBQAwezELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNVBAMMGEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczAeFw0yNTA1MTQwMDAwMDBaFw0yODEyMzEyMzU5NTlaMD8xCzAJBgNVBAYTAk5MMRMwEQYDVQQKDAplTXVkaHJhIEJWMRswGQYDVQQDDBJFTSBFViBUTFMgQ0EgLSBHM0IwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQl26haZNOX2gsQUunqVG5Ie+/qnJ2daKDF6tz+73Wmm7XW/AH0K/vKbrQLzWTAdn42/9Bdl6gTxaoMbJUw55z18IZkaPE4BkIKpchRhAseJSVA55DktlTDhS7WSvHoZX2jggE0MIIBMDAfBgNVHSMEGDAWgBSgEQojPpbxB+zirynvgqV/0DCktDAdBgNVHQ4EFgQUPtwg2YlGmId7hz/YgUeyXBXYRwYwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDAGA1UdIAQpMCcwBwYFZ4EMAQEwDQYLKwYBBAGDjiEBAAEwDQYLKwYBBAGDjiEBAngwQwYDVR0fBDwwOjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20vQUFBQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmwwNAYIKwYBBQUHAQEEKDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5jb20wDQYJKoZIhvcNAQELBQADggEBAJNFuAFW9Gnw/8+kCO4KIlZdnM1Sh2u+8cK0EYAHhXpb5FlGvYkcARigo5oS7VoM7FOYlTueV6yICZKNAYawZPJPhNCGK+rp3cQBEz6d0n8OZEYZov9lb3ll8ORgSDufFVIW6Gagg/UnOamLBTOR8eD5V73SCme/B2cHUDw+m5E8cc+0Ujzz3Cn3ex5JrhXk2T3s8PoVzEmhTgGboFfcWO1EYhPPrYwdxPYRQIXAXUXhLEOVNL9ASbZJLFI8E1IMm7NwxVN2s38jWpaCUaaF0tg7hfiy7oe13rzJfHsdqldJVTTUTPWVx8TC4ju0VLetbAlwhwFT6AP8uIVMGUHNw24=",
+ "MIIDaDCCAu6gAwIBAgIPWIsuPCu4zaE+GhIJJUMhMAoGCCqGSM49BAMDMFYxCzAJBgNVBAYTAklOMSUwIwYDVQQKDBxlTXVkaHJhIFRlY2hub2xvZ2llcyBMaW1pdGVkMSAwHgYDVQQDDBdlbVNpZ24gUm9vdCBUTFMgQ0EgLSBHMzAeFw0yNTA0MzAxNTM1MDlaFw00MDA0MjgxODMwMDBaMEAxCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtlTXVkaHJhIEluYzEbMBkGA1UEAwwSRU0gRFYgVExTIENBIC0gRzNDMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEOnp4YsjETTJN3WkDOmeCwO/u/kBV5ooSP6A3G6O9kZRRTuFypDPjYw8CvRiAN9nlFJ+bd9uUooHfmHsv6oiLdL3+j9pMEJnubKGVZv4+8OX2sJpVbMyLpQVh3xsqRB0Bo4IBljCCAZIwHwYDVR0jBBgwFoAU4TqrIXzx401UrtRyt/2LWUIgkFQwHQYDVR0OBBYEFK5+EFw8KZbBqEcnBVnx4D3U5QrzMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBdBgNVHSAEVjBUMDkGCysGAQQBg44hAQABMCowKAYIKwYBBQUHAgEWHGh0dHA6Ly9yZXBvc2l0b3J5LmVtc2lnbi5jb20wDQYLKwYBBAGDjiEBAmQwCAYGZ4EMAQIBMHUGCCsGAQUFBwEBBGkwZzAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AtYy5lbXNpZ24uY29tMD8GCCsGAQUFBzAChjNodHRwOi8vcmVwb3NpdG9yeS5lbXNpZ24uY29tL2NlcnRzL0VNRFZUTFNDQUczQy5wN2MwNwYDVR0fBDAwLjAsoCqgKIYmaHR0cDovL2NybC5lbXNpZ24uY29tLz9yb290dGxzY2FnMy5jcmwwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQAwCgYIKoZIzj0EAwMDaAAwZQIxAMEN2HWMocbuWdy1d33pH6JpMvP/V/DIS5PtZbv1Q7TXEbxrcyxgyuddOJscYDJJlAIwB4sH1BpbScDzkdD4tJBSwrG/1Mx82vb8YaySehNuu1+1oXNdAEKwaJ0mVzScy2+6",
+ "MIIDzzCCAregAwIBAgIRAJHzR/Glt9OZYrleDuTimdEwDQYJKoZIhvcNAQELBQAwezELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNVBAMMGEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczAeFw0yNTA1MTQwMDAwMDBaFw0yODEyMzEyMzU5NTlaMEAxCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtlTXVkaHJhIEluYzEbMBkGA1UEAwwSRU0gRFYgVExTIENBIC0gRzNDMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEOnp4YsjETTJN3WkDOmeCwO/u/kBV5ooSP6A3G6O9kZRRTuFypDPjYw8CvRiAN9nlFJ+bd9uUooHfmHsv6oiLdL3+j9pMEJnubKGVZv4+8OX2sJpVbMyLpQVh3xsqRB0Bo4IBNTCCATEwHwYDVR0jBBgwFoAUoBEKIz6W8Qfs4q8p74Klf9AwpLQwHQYDVR0OBBYEFK5+EFw8KZbBqEcnBVnx4D3U5QrzMA4GA1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAxBgNVHSAEKjAoMAgGBmeBDAECATANBgsrBgEEAYOOIQEAATANBgsrBgEEAYOOIQECZDBDBgNVHR8EPDA6MDigNqA0hjJodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNybDA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9kb2NhLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAr7b6Mx11TIJgVzHt6EH5qGNWeiiqoMrp8E5/k8s+jvupx1n083pZ5XOzUzNDwEUe0W4C4FIGUHNQ4XDwqOw0yK42xqm2dvCKgsko2UvDlT0haZVtTCeWMQOe5J/JziaMfZwsZNfZ3aaI6XPtWDZtwY8AaNfyaeCpbtm5GcGnyNWk4jSNpbtpo6NjfXuPCFOm3rTjJ4zytP7Tso6iMm0L01cYFOlTmoPv4515R2r3SPnKDtijoB/D/vgxzojvDafgyG9afX8+laO9NbMMz4sqC1vZx3984i/sBNFiugm3Vvdq5OdJRjuGC1QILIs6dg/K3i8VQqRpbfaM9kIlMzZ3dQ==",
+ "MIIDaDCCAu6gAwIBAgIPKWkmwiejoVJjkrGUgqUEMAoGCCqGSM49BAMDMFYxCzAJBgNVBAYTAklOMSUwIwYDVQQKDBxlTXVkaHJhIFRlY2hub2xvZ2llcyBMaW1pdGVkMSAwHgYDVQQDDBdlbVNpZ24gUm9vdCBUTFMgQ0EgLSBHMzAeFw0yNTA0MzAxNTM3NDFaFw00MDA0MjgxODMwMDBaMEAxCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtlTXVkaHJhIEluYzEbMBkGA1UEAwwSRU0gT1YgVExTIENBIC0gRzNDMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEE4JRzVKskpjByKrZdzId65fnCb0LTKCspV3IrVHc/J0ViaFZfjpRIOHv1jHGPhg1ysrimGmmLhYx6KKBgatWYW3EXZGKvAnzqw5jz3kqpNztc4e+N7ulaVSfHAKycO1no4IBljCCAZIwHwYDVR0jBBgwFoAU4TqrIXzx401UrtRyt/2LWUIgkFQwHQYDVR0OBBYEFDTq6gzryQra+dDF4u2beMmHnhtsMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBdBgNVHSAEVjBUMDkGCysGAQQBg44hAQABMCowKAYIKwYBBQUHAgEWHGh0dHA6Ly9yZXBvc2l0b3J5LmVtc2lnbi5jb20wDQYLKwYBBAGDjiEBAm4wCAYGZ4EMAQICMHUGCCsGAQUFBwEBBGkwZzAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AtYy5lbXNpZ24uY29tMD8GCCsGAQUFBzAChjNodHRwOi8vcmVwb3NpdG9yeS5lbXNpZ24uY29tL2NlcnRzL0VNT1ZUTFNDQUczQy5wN2MwNwYDVR0fBDAwLjAsoCqgKIYmaHR0cDovL2NybC5lbXNpZ24uY29tLz9yb290dGxzY2FnMy5jcmwwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQAwCgYIKoZIzj0EAwMDaAAwZQIxAMSZt2xsPeumRdeSMSQ3CbzIZeQ/q7GDCWfeE1Pq+mhgA6gRM44cNVF3xJ+wsxJk+wIwFJbaDMokD8Ei6eNOiA8yUMYvfzQyngmrhZQMdPCK1SewrR794rSb9vGqxZzelQth",
+ "MIIDzzCCAregAwIBAgIRAI1aSBGTnvRH13ERzdmEmukwDQYJKoZIhvcNAQELBQAwezELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNVBAMMGEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczAeFw0yNTA1MTQwMDAwMDBaFw0yODEyMzEyMzU5NTlaMEAxCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtlTXVkaHJhIEluYzEbMBkGA1UEAwwSRU0gT1YgVExTIENBIC0gRzNDMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEE4JRzVKskpjByKrZdzId65fnCb0LTKCspV3IrVHc/J0ViaFZfjpRIOHv1jHGPhg1ysrimGmmLhYx6KKBgatWYW3EXZGKvAnzqw5jz3kqpNztc4e+N7ulaVSfHAKycO1no4IBNTCCATEwHwYDVR0jBBgwFoAUoBEKIz6W8Qfs4q8p74Klf9AwpLQwHQYDVR0OBBYEFDTq6gzryQra+dDF4u2beMmHnhtsMA4GA1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAxBgNVHSAEKjAoMAgGBmeBDAECAjANBgsrBgEEAYOOIQEAATANBgsrBgEEAYOOIQECbjBDBgNVHR8EPDA6MDigNqA0hjJodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNybDA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9kb2NhLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAHlbhZpjhkPEAQVhPHRtBDaHqiisVD20pQ1TUeSx3l62Qe7NQ0b7vWQy7DN0iKOu7BGpP5EnIjvXbz9FhpfPJ4FhKEt3tQ51rqXz2oD8vRaryvExWPobDUz3j7HN6OzBsVMIe3PD7AAkpky0x8zMSi/ep5R9OMzybmNptbtppyuB5ytgq+h7lQdRIP+CQTaJX3qTgfMqzntYre5GljmEB5hU2/rSn8zoSU2APkJidlZFpghtgbD4I2VRHZvCwFFr/SrFM9pwrgbJNZ1MtyTSVgI5NlNb0aMfLR+/r6jJt3ROeY2yh2QQ2dx+YqgdbuL5ChFWOQU+ErSDnUq7yr+pjBQ==",
+ "MIIDaDCCAu6gAwIBAgIQAIAJkopkEHYBrwX6LxnxCTAKBggqhkjOPQQDAzBWMQswCQYDVQQGEwJJTjElMCMGA1UECgwcZU11ZGhyYSBUZWNobm9sb2dpZXMgTGltaXRlZDEgMB4GA1UEAwwXZW1TaWduIFJvb3QgVExTIENBIC0gRzMwHhcNMjUwNDMwMTUzOTMxWhcNNDAwNDI4MTgzMDAwWjBAMQswCQYDVQQGEwJVUzEUMBIGA1UECgwLZU11ZGhyYSBJbmMxGzAZBgNVBAMMEkVNIEVWIFRMUyBDQSAtIEczQzB2MBAGByqGSM49AgEGBSuBBAAiA2IABC1W6Cmm+4LGSkaX2WCvlR6QZ66R+SbTQwbaSKiq63hptqZ+bSdCbgRCqgOzbhmI3/Y2UU7hzwf1uks/8qBmRa59MdWGatMao9JG6wsxd+6Zy3VmxRbOdICKZo+R8MR/yqOCAZUwggGRMB8GA1UdIwQYMBaAFOE6qyF88eNNVK7Ucrf9i1lCIJBUMB0GA1UdDgQWBBSmJV6AqU2385Z8G8eR35K87kvrXzAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwXAYDVR0gBFUwUzA5BgsrBgEEAYOOIQEAATAqMCgGCCsGAQUFBwIBFhxodHRwOi8vcmVwb3NpdG9yeS5lbXNpZ24uY29tMA0GCysGAQQBg44hAQJ4MAcGBWeBDAEBMHUGCCsGAQUFBwEBBGkwZzAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AtYy5lbXNpZ24uY29tMD8GCCsGAQUFBzAChjNodHRwOi8vcmVwb3NpdG9yeS5lbXNpZ24uY29tL2NlcnRzL0VNRVZUTFNDQUczQy5wN2MwNwYDVR0fBDAwLjAsoCqgKIYmaHR0cDovL2NybC5lbXNpZ24uY29tLz9yb290dGxzY2FnMy5jcmwwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQAwCgYIKoZIzj0EAwMDaAAwZQIwBy1wTnzH4lXDTy2PD91ysLjvnlVN3JbJmc1BIMEU8TOLkYVHibMc9HeyonikFSfmAjEA6uE3QRxlrZTz/1/lXPTEMUhoauAtycagtlNFp79kjhvNa2/fAal1GNxsOutLnr0Y",
+ "MIIDzTCCArWgAwIBAgIQBfB4dS3s56G7hZXTAxZxcTANBgkqhkiG9w0BAQsFADB7MQswCQYDVQQGEwJHQjEbMBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTI1MDUxNDAwMDAwMFoXDTI4MTIzMTIzNTk1OVowQDELMAkGA1UEBhMCVVMxFDASBgNVBAoMC2VNdWRocmEgSW5jMRswGQYDVQQDDBJFTSBFViBUTFMgQ0EgLSBHM0MwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQtVugppvuCxkpGl9lgr5UekGeukfkm00MG2kioqut4abamfm0nQm4EQqoDs24ZiN/2NlFO4c8H9bpLP/KgZkWufTHVhmrTGqPSRusLMXfumct1ZsUWznSAimaPkfDEf8qjggE0MIIBMDAfBgNVHSMEGDAWgBSgEQojPpbxB+zirynvgqV/0DCktDAdBgNVHQ4EFgQUpiVegKlNt/OWfBvHkd+SvO5L618wDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDAGA1UdIAQpMCcwBwYFZ4EMAQEwDQYLKwYBBAGDjiEBAAEwDQYLKwYBBAGDjiEBAngwQwYDVR0fBDwwOjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20vQUFBQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmwwNAYIKwYBBQUHAQEEKDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5jb20wDQYJKoZIhvcNAQELBQADggEBAIFfHiaMSjnrdZygRYV4ekRBmG7ybcFk4hGQWMMyMFi0cAEk2+dGfz5bl8IaIbLqz+uVJzhOgVEX7WqIfgbWfFsfPYHYjPHBmy7SlZ3BwA86IQ6qF/etpX2/qL9A5yRNN3nVowUpaqV6H3aCpkAh3wR2ZNkvAbLDvPz3J0l+sEWjWv+ZISOV4R+hXDTdPXV01lKxnbwqEsdo/sE2QkCDKwFrZh/0uKjWspydJj+jSaDLTrGNx50Dgmn7VEcD1ZI5FXjknVUiO25YlmS1dtVZSBbyUKSjlrP/yDwPcZunoAsmCAAtCKsFLviLaymzvsKIeSSDGxpSySp2VCxompGDk8g=",
+ "MIIDWzCCAuCgAwIBAgIPeBiTP4+FtGGaKzX7qD0KMAoGCCqGSM49BAMDMFUxCzAJBgNVBAYTAklOMSUwIwYDVQQKDBxlTXVkaHJhIFRlY2hub2xvZ2llcyBMaW1pdGVkMR8wHQYDVQQDDBZlbVNpZ24gUm9vdCBDUyBDQSAtIEczMB4XDTI1MDQzMDE2MDgyN1oXDTQwMDQyODE4MzAwMFowPjELMAkGA1UEBhMCTkwxEzARBgNVBAoMCmVNdWRocmEgQlYxGjAYBgNVBAMMEUVNIE9WIENTIENBIC0gRzNCMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEqrsPsGZqz88B+tUr/P1MK/LLPDSX3nOVDlgZth/mlQmHQcjEkUObNKBDHK/+W/m0wcjorgAB+fTcitgsWfNjnpbNbD1NsM7+wmw9YlF7N3YTcnQ/jordd7EAZPKr5eBQo4IBizCCAYcwHwYDVR0jBBgwFoAUaHQD+IXKjVRQVx0W4MjeRQ2rzS0wHQYDVR0OBBYEFHn66OzP2w11jaRY1p+27dx8Sd7mMBMGA1UdJQQMMAoGCCsGAQUFBwMDMF4GA1UdIARXMFUwOQYLKwYBBAGDjiEBAAEwKjAoBggrBgEFBQcCARYcaHR0cDovL3JlcG9zaXRvcnkuZW1zaWduLmNvbTAOBgwrBgEEAYOOIQECgUgwCAYGZ4EMAQQBMHQGCCsGAQUFBwEBBGgwZjAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AtYi5lbXNpZ24uY29tMD4GCCsGAQUFBzAChjJodHRwOi8vcmVwb3NpdG9yeS5lbXNpZ24uY29tL2NlcnRzL0VNT1ZDU0NBRzNCLnA3YzA2BgNVHR8ELzAtMCugKaAnhiVodHRwOi8vY3JsLmVtc2lnbi5jb20vP3Jvb3Rjc2NhZzMuY3JsMA4GA1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMAoGCCqGSM49BAMDA2kAMGYCMQC/zr03YEELsNKqzUtH2dVFi4BaKFdyrr/6G1dIWp8KAVgsw2/u4lyyboUDaC9jDvICMQC9HTxku84tNX9dmHOtH7aC2Nu/JM0jTf6KjZAvovCJzzv1IFWSZpVLZibynMLXOrM=",
+ "MIIDwzCCAqugAwIBAgIQQeMrc6wYXWzg10gLrPhOaTANBgkqhkiG9w0BAQsFADB7MQswCQYDVQQGEwJHQjEbMBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTI1MDUxNDAwMDAwMFoXDTI4MTIzMTIzNTk1OVowPjELMAkGA1UEBhMCTkwxEzARBgNVBAoMCmVNdWRocmEgQlYxGjAYBgNVBAMMEUVNIE9WIENTIENBIC0gRzNCMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEqrsPsGZqz88B+tUr/P1MK/LLPDSX3nOVDlgZth/mlQmHQcjEkUObNKBDHK/+W/m0wcjorgAB+fTcitgsWfNjnpbNbD1NsM7+wmw9YlF7N3YTcnQ/jordd7EAZPKr5eBQo4IBLDCCASgwHwYDVR0jBBgwFoAUoBEKIz6W8Qfs4q8p74Klf9AwpLQwHQYDVR0OBBYEFHn66OzP2w11jaRY1p+27dx8Sd7mMA4GA1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBMGA1UdJQQMMAoGCCsGAQUFBwMDMDIGA1UdIAQrMCkwCAYGZ4EMAQQBMA0GCysGAQQBg44hAQABMA4GDCsGAQQBg44hAQKBSDBDBgNVHR8EPDA6MDigNqA0hjJodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNybDA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9kb2NhLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAIh0OzWsdBYhY7+yxPGyosRL+uUSN6/Mrd30fBuougs5FVWQ3cRgLhImnUUgXADY9buugWhMmfT3cyU5T1MFXZXClCILm5mfg+oqm/ikUWJl3Ayf2GvYf2O++6vzqvkn418nI5Lpdt0O7Li524YS/3CZHDA+zZQ7rrHpZXgQ9Hmp8AUQ4FneaGjNanFoYxiZxwCyW5z4u7AoK0bmOVqKtcDFoVNz5++G9TYDJdhWOXmKKgzqRo1MK0PjazNT7MGHqknP93SqMVJ1gmX/qNWxYteAjlvFanQxBNX/+TRxDjuFsEHO/7BvqSpIIck0UEEfizhN8zNpWLbclEqVgl0g39A==",
+ "MIIDWzCCAuGgAwIBAgIPVEt/kiwxriIKSpIpFvbmMAoGCCqGSM49BAMDMFUxCzAJBgNVBAYTAklOMSUwIwYDVQQKDBxlTXVkaHJhIFRlY2hub2xvZ2llcyBMaW1pdGVkMR8wHQYDVQQDDBZlbVNpZ24gUm9vdCBDUyBDQSAtIEczMB4XDTI1MDQzMDE2Mzg0MFoXDTQwMDQyODE4MzAwMFowPzELMAkGA1UEBhMCVVMxFDASBgNVBAoMC2VNdWRocmEgSW5jMRowGAYDVQQDDBFFTSBPViBDUyBDQSAtIEczQzB2MBAGByqGSM49AgEGBSuBBAAiA2IABLnw4GNHAqacpqrdRDz9YsQbm6SyCSRpfXl052kaEm+5avs+NML9O8X0gwYfJl3CpYQ2NHMjUQQ2so8E84YjYwZ5gOJQPgJTLWVGI1pxZaJZoe9Jb3QbX97neHII5Lj676OCAYswggGHMB8GA1UdIwQYMBaAFGh0A/iFyo1UUFcdFuDI3kUNq80tMB0GA1UdDgQWBBTub3MpjW+/p7Mbw5U09hVWRHhmtzATBgNVHSUEDDAKBggrBgEFBQcDAzBeBgNVHSAEVzBVMDkGCysGAQQBg44hAQABMCowKAYIKwYBBQUHAgEWHGh0dHA6Ly9yZXBvc2l0b3J5LmVtc2lnbi5jb20wDgYMKwYBBAGDjiEBAoFIMAgGBmeBDAEEATB0BggrBgEFBQcBAQRoMGYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLWMuZW1zaWduLmNvbTA+BggrBgEFBQcwAoYyaHR0cDovL3JlcG9zaXRvcnkuZW1zaWduLmNvbS9jZXJ0cy9FTU9WQ1NDQUczQy5wN2MwNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2NybC5lbXNpZ24uY29tLz9yb290Y3NjYWczLmNybDAOBgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAKBggqhkjOPQQDAwNoADBlAjEA8yPg8sntOhLwV2QXJ5LEaKSpo/fnE3uOgTadK73fDhyjiqr0Io9GVuQTYqBPbQ2TAjBgeuApmBS486+iei03lRrp139dPw6k28jjGNvWsAU7A1N86J1zPJVDEyVH+nMAWC0=",
+ "MIIDxTCCAq2gAwIBAgIRANal72E7OQ8y75zfNJ93KEEwDQYJKoZIhvcNAQELBQAwezELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNVBAMMGEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczAeFw0yNTA1MTQwMDAwMDBaFw0yODEyMzEyMzU5NTlaMD8xCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtlTXVkaHJhIEluYzEaMBgGA1UEAwwRRU0gT1YgQ1MgQ0EgLSBHM0MwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAS58OBjRwKmnKaq3UQ8/WLEG5uksgkkaX15dOdpGhJvuWr7PjTC/TvF9IMGHyZdwqWENjRzI1EENrKPBPOGI2MGeYDiUD4CUy1lRiNacWWiWaHvSW90G1/e53hyCOS4+u+jggEsMIIBKDAfBgNVHSMEGDAWgBSgEQojPpbxB+zirynvgqV/0DCktDAdBgNVHQ4EFgQU7m9zKY1vv6ezG8OVNPYVVkR4ZrcwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQAwEwYDVR0lBAwwCgYIKwYBBQUHAwMwMgYDVR0gBCswKTAIBgZngQwBBAEwDQYLKwYBBAGDjiEBAAEwDgYMKwYBBAGDjiEBAoFIMEMGA1UdHwQ8MDowOKA2oDSGMmh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0FBQUNlcnRpZmljYXRlU2VydmljZXMuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuY29tb2RvY2EuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQBgGbZ+NDkn2Fr5dCVs/51+6cT5iEPP1stglX4TI2UaNh9LmPdltxXw3crV8gK5L8i+d+ScGibFy0obtBHNTldXDgLnAHIzY3n+pceyKj7O2ae9CYnyuu5RBifeI3XYKowWE+oXnVGFOy0CvCJ/JsdP6aYgoCa9hGnAYicYQQL6MOMQZ5PuhcSM8t4giIzrpgrEkUP93GYEemDG5Z8BYwKs80lLeQNBnwg/VHJ3iEF/o84RXYwrlrKqJ+33C094o6LNikMJCqOK/WYHZSR8Xyhf8GXFAj5pZuI6Bcpug2V/E7i42j8OBhc25aNYDqK+B0qmb90sjNUBg3tJeSIb/599"
+ ]
+}
diff --git a/packages/dev/quicksand-image-tools/quicksand_image_tools/templates/docker/Dockerfile.j2 b/packages/dev/quicksand-image-tools/quicksand_image_tools/templates/docker/Dockerfile.j2
index 86446c3..011e177 100644
--- a/packages/dev/quicksand-image-tools/quicksand_image_tools/templates/docker/Dockerfile.j2
+++ b/packages/dev/quicksand-image-tools/quicksand_image_tools/templates/docker/Dockerfile.j2
@@ -12,7 +12,7 @@
# Use rust:alpine for musl (Alpine) or rust:bookworm for glibc (Ubuntu/Debian)
FROM rust:alpine AS agent-builder
-RUN apk add --no-cache musl-dev
+RUN apk add --no-cache --upgrade musl-dev 'ca-certificates>=20261020-r0'
WORKDIR /build
COPY agent/Cargo.toml agent/Cargo.lock* ./
diff --git a/packages/dev/quicksand-overlay-scaffold/hatch_build.py b/packages/dev/quicksand-overlay-scaffold/hatch_build.py
index 2a707e7..288bf72 100644
--- a/packages/dev/quicksand-overlay-scaffold/hatch_build.py
+++ b/packages/dev/quicksand-overlay-scaffold/hatch_build.py
@@ -7,6 +7,7 @@ from __future__ import annotations
import asyncio
import logging
+import os
import shutil
from collections.abc import Callable, Coroutine
from pathlib import Path
@@ -61,8 +62,12 @@ class OverlayImageBuildHook(BuildHookInterface):
save_dir = pkg_dir / "images"
overlays_dir = save_dir / "overlays"
- if not (save_dir / "manifest.json").exists() or not any(overlays_dir.glob("*.qcow2")):
- self.app.display_info("Save not found, building overlay...")
+ if (
+ os.environ.get("QUICKSAND_REBUILD_IMAGES", "").strip() == "1"
+ or not (save_dir / "manifest.json").exists()
+ or not any(overlays_dir.glob("*.qcow2"))
+ ):
+ self.app.display_info("Building overlay...")
asyncio.run(self._build_and_save(save_dir))
self.app.display_info(f"Including save: {save_dir}")
diff --git a/packages/dev/quicksand-overlay-scaffold/pyproject.toml b/packages/dev/quicksand-overlay-scaffold/pyproject.toml
index 87f72fa..31b28f2 100644
--- a/packages/dev/quicksand-overlay-scaffold/pyproject.toml
+++ b/packages/dev/quicksand-overlay-scaffold/pyproject.toml
@@ -5,7 +5,7 @@ description = "Overlay image package for quicksand"
readme = "README.md"
requires-python = ">=3.11"
license = "MIT"
-dependencies = ["quicksand-core>=0.14.0,<0.15.0", "quicksand-ubuntu>=0.10.0,<0.11.0", "tomlkit>=0.13"]
+dependencies = ["quicksand-core>=0.14.1,<0.15.0", "quicksand-ubuntu>=0.10.2,<0.11.0", "tomlkit>=0.13"]
[project.scripts]
quicksand-overlay-scaffold = "quicksand_overlay_scaffold.scaffold:main"
@@ -15,7 +15,7 @@ quicksand-overlay-scaffold = "quicksand_overlay_scaffold:image"
[build-system]
-requires = ["hatchling", "quicksand-image-tools>=0.6.0,<0.7.0", "quicksand-core>=0.14.0,<0.15.0", "quicksand-ubuntu>=0.10.0,<0.11.0", "quicksand-qemu>=0.5.10,<0.6.0", "quicksand-smb>=0.5.0,<0.6.0"]
+requires = ["hatchling", "quicksand-image-tools>=0.6.2,<0.7.0", "quicksand-core>=0.14.1,<0.15.0", "quicksand-ubuntu>=0.10.2,<0.11.0", "quicksand-qemu>=0.5.10,<0.6.0", "quicksand-smb>=0.5.0,<0.6.0"]
build-backend = "hatchling.build"
[tool.hatch.build.targets.wheel]
diff --git a/packages/quicksand-core/pyproject.toml b/packages/quicksand-core/pyproject.toml
index 2bf9b80..04e49b7 100644
--- a/packages/quicksand-core/pyproject.toml
+++ b/packages/quicksand-core/pyproject.toml
@@ -5,7 +5,7 @@ description = "Core sandbox functionality for the quicksand VM harness."
readme = "README.md"
requires-python = ">=3.11"
license = "MIT"
-dependencies = ["httpx>=0.27,<1.0", "pydantic>=2.0", "quicksand-smb>=0.5.0,<0.6.0", "dnslib>=0.9.24; sys_platform == 'darwin'"]
+dependencies = ["certifi>=2026.10.19", "httpx>=0.27,<1.0", "pydantic>=2.0", "quicksand-smb>=0.5.0,<0.6.0", "dnslib>=0.9.24; sys_platform == 'darwin'"]
[build-system]
requires = ["hatchling"]
diff --git a/packages/quicksand/pyproject.toml b/packages/quicksand/pyproject.toml
index 2b40098..45c3c45 100644
--- a/packages/quicksand/pyproject.toml
+++ b/packages/quicksand/pyproject.toml
@@ -5,26 +5,26 @@ description = "A VM harness for AI agents that works on macOS, Linux, and Window
readme = "README.md"
requires-python = ">=3.11"
license = "MIT"
-dependencies = ["quicksand-core>=0.14.0,<0.15.0", "packaging>=23"]
+dependencies = ["quicksand-core>=0.14.1,<0.15.0", "packaging>=23"]
[project.optional-dependencies]
qemu = ["quicksand-qemu>=0.4.3"]
-ubuntu = ["quicksand-ubuntu>=0.7.2"]
-alpine = ["quicksand-alpine>=0.7.2"]
-alpine-desktop = ["quicksand-alpine-desktop>=0.7.5"]
-ubuntu-desktop = ["quicksand-ubuntu-desktop>=0.7.5"]
-agent = ["quicksand-agent>=0.3.7"]
-cua = ["quicksand-cua>=0.2.7"]
-dev = ["quicksand-image-tools>=0.3.2", "quicksand-overlay-scaffold>=0.1.4", "quicksand-base-scaffold>=0.1.3"]
+ubuntu = ["quicksand-ubuntu>=0.10.2"]
+alpine = ["quicksand-alpine>=0.10.2"]
+alpine-desktop = ["quicksand-alpine-desktop>=0.9.12"]
+ubuntu-desktop = ["quicksand-ubuntu-desktop>=0.9.12"]
+agent = ["quicksand-agent>=0.4.12"]
+cua = ["quicksand-cua>=0.3.14"]
+dev = ["quicksand-image-tools>=0.6.2", "quicksand-overlay-scaffold>=0.3.13", "quicksand-base-scaffold>=0.3.13"]
all = [
"quicksand-qemu>=0.4.3",
- "quicksand-ubuntu>=0.7.2",
- "quicksand-alpine>=0.7.2",
- "quicksand-alpine-desktop>=0.7.5",
- "quicksand-ubuntu-desktop>=0.7.5",
- "quicksand-image-tools>=0.3.2",
- "quicksand-agent>=0.3.7",
- "quicksand-cua>=0.2.7",
+ "quicksand-ubuntu>=0.10.2",
+ "quicksand-alpine>=0.10.2",
+ "quicksand-alpine-desktop>=0.9.12",
+ "quicksand-ubuntu-desktop>=0.9.12",
+ "quicksand-image-tools>=0.6.2",
+ "quicksand-agent>=0.4.12",
+ "quicksand-cua>=0.3.14",
]
[project.scripts]
diff --git a/pyproject.toml b/pyproject.toml
index 029665a..df88dc8 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -2,8 +2,9 @@
# Individual packages are in packages/
[tool.uv]
+required-version = ">=0.13.4"
override-dependencies = ["httpx>=0.27,<1"]
-constraint-dependencies = ["setuptools>=78.1.1"]
+constraint-dependencies = ["certifi>=2026.10.19", "setuptools>=78.1.1"]
[tool.uv.workspace]
members = ["packages/*", "packages/dev/*", "packages/contrib/*"]
@@ -66,6 +67,7 @@ dev = [
"pytest",
"pytest-asyncio",
"pytest-timeout",
+ "pip>=26.2.2",
"hatchling",
"uv-release>=0.40.0",
"pre-commit>=4.6.0",
diff --git a/tests/integration/security/test_tls_trust.py b/tests/integration/security/test_tls_trust.py
new file mode 100644
index 0000000..ad36fa4
--- /dev/null
+++ b/tests/integration/security/test_tls_trust.py
@@ -0,0 +1,303 @@
+"""Opt-in checks of built images against the public eMudhra trust-check endpoints.
+
+Set QUICKSAND_SECURITY_TEST_IMAGE to an image name, native qcow2 path, or saved overlay.
+These checks require network access and never update the image under test.
+"""
+
+from __future__ import annotations
+
+import os
+import shlex
+from collections.abc import AsyncIterator, Iterator
+from contextlib import contextmanager
+from dataclasses import replace
+from pathlib import Path
+from unittest.mock import patch
+
+import pytest
+import pytest_asyncio
+from quicksand_core import NetworkMode, Sandbox
+from quicksand_core._types import ResolvedImage
+from quicksand_core.qemu.image_resolver import ImageResolver
+
+pytestmark = [pytest.mark.integration, pytest.mark.asyncio(loop_scope="module")]
+
+_TRUSTED_URL = "https://www.python.org/"
+_COMPROMISED_URLS = (
+ "https://dv-g3b-emudhra.we-have-a-problem.com/",
+ "https://dv-g3b-aaa-emudhra.we-have-a-problem.com/",
+)
+
+
+@contextmanager
+def _local_image_files() -> Iterator[None]:
+ """Treat staged artifacts as named providers without replacing installed images."""
+ resolve_base = ImageResolver._resolve_base_by_name
+ original_resolve = ImageResolver.resolve
+
+ def resolve(name: str, *, arch: str | None = None) -> ResolvedImage | None:
+ path = Path(name)
+ if path.is_file() and path.suffix == ".qcow2":
+ kernel = path.with_suffix(".kernel")
+ if not kernel.is_file():
+ raise FileNotFoundError(kernel)
+ initrd = path.with_suffix(".initrd")
+ return ResolvedImage(
+ name=name,
+ chain=[path],
+ kernel=kernel,
+ initrd=initrd if initrd.is_file() else None,
+ )
+ if path.is_dir() and (path / "manifest.json").is_file():
+ return ImageResolver()._resolve_save(path)
+ return resolve_base(name, arch=arch)
+
+ def resolve_image(
+ resolver: ImageResolver, image: str, *, arch: str | None = None
+ ) -> ResolvedImage:
+ result = original_resolve(resolver, image, arch=arch)
+ if (Path(image) / "manifest.json").is_file():
+ # A saved child must reference the whole staged parent, not just its base.
+ return replace(result, name=image)
+ return result
+
+ with (
+ patch.object(ImageResolver, "_resolve_base_by_name", staticmethod(resolve)),
+ patch.object(ImageResolver, "resolve", resolve_image),
+ ):
+ yield
+
+
+@pytest_asyncio.fixture(scope="module", loop_scope="module")
+async def sandbox() -> AsyncIterator[Sandbox]:
+ image = os.environ.get("QUICKSAND_SECURITY_TEST_IMAGE")
+ if not image:
+ pytest.skip("Set QUICKSAND_SECURITY_TEST_IMAGE to explicitly select a built image")
+ with _local_image_files():
+ async with Sandbox(image=image, network_mode=NetworkMode.FULL, memory="2G") as sb:
+ yield sb
+
+
+@pytest_asyncio.fixture(scope="module", loop_scope="module")
+async def python_sandbox(sandbox: Sandbox) -> Sandbox:
+ available = await sandbox.execute("test -x /opt/python/bin/python3")
+ if available.exit_code != 0:
+ pytest.skip("This image does not include the agent Python environment")
+ return sandbox
+
+
+@pytest_asyncio.fixture(scope="module", loop_scope="module")
+async def playwright_sandbox(python_sandbox: Sandbox) -> Sandbox:
+ probe = (
+ 'import importlib.util; raise SystemExit(importlib.util.find_spec("playwright") is None)'
+ )
+ available = await python_sandbox.execute(f"/opt/python/bin/python3 -c {shlex.quote(probe)}")
+ if available.exit_code != 0:
+ pytest.skip("This image does not include Playwright")
+ return python_sandbox
+
+
+@pytest_asyncio.fixture(scope="module", loop_scope="module")
+async def firefox_sandbox(sandbox: Sandbox) -> Sandbox:
+ available = await sandbox.execute("test -x /usr/bin/firefox-esr")
+ if available.exit_code != 0:
+ pytest.skip("This image does not include Firefox ESR")
+ return sandbox
+
+
[email protected]("url", (_TRUSTED_URL, *_COMPROMISED_URLS))
+async def test_system_curl_trust(sandbox: Sandbox, url: str) -> None:
+ # Guest DHCP can finish after the agent is ready.
+ retry = "--retry 3 --retry-all-errors --retry-delay 1" if url == _TRUSTED_URL else ""
+ result = await sandbox.execute(
+ f"curl --silent --show-error --max-time 20 --retry-max-time 20 {retry}"
+ f" --output /dev/null {shlex.quote(url)}",
+ timeout=45,
+ )
+ expected = 0 if url == _TRUSTED_URL else 60
+ assert result.exit_code == expected, result.stderr
+
+
[email protected]("url", (_TRUSTED_URL, *_COMPROMISED_URLS))
+async def test_requests_trust(python_sandbox: Sandbox, url: str) -> None:
+ script = """
+import sys
+import requests
+try:
+ requests.get(sys.argv[1], timeout=20)
+except requests.exceptions.SSLError as exc:
+ print(exc, file=sys.stderr)
+ raise SystemExit(60)
+"""
+ result = await python_sandbox.execute(
+ f"/opt/python/bin/python3 -c {shlex.quote(script)} {shlex.quote(url)}",
+ timeout=30,
+ )
+ expected = 0 if url == _TRUSTED_URL else 60
+ assert result.exit_code == expected, result.stderr
+
+
[email protected]("url", _COMPROMISED_URLS)
+async def test_pip_trust(python_sandbox: Sandbox, url: str) -> None:
+ wheel_url = url + "tls_probe-0.0.0-py3-none-any.whl"
+ result = await python_sandbox.execute(
+ "/opt/python/bin/python3 -m pip --disable-pip-version-check download"
+ " --no-index --no-deps --no-cache-dir --only-binary=:all:"
+ " --retries 0 --timeout 20 --dest /tmp/quicksand-trust-check"
+ f" {shlex.quote(wheel_url)}",
+ timeout=30,
+ )
+ assert result.exit_code != 0
+ assert "CERTIFICATE_VERIFY_FAILED" in result.stderr, result.stderr
+
+
[email protected]("url", (_TRUSTED_URL, *_COMPROMISED_URLS))
+async def test_playwright_driver_trust(playwright_sandbox: Sandbox, url: str) -> None:
+ script = """
+import subprocess
+import sys
+from playwright._impl._driver import compute_driver_executable
+
+node, _ = compute_driver_executable()
+javascript = '''
+const request = require("node:https").get(process.argv[1], response => response.resume());
+request.setTimeout(20000, () => request.destroy(new Error("TLS connection timed out")));
+request.on("error", error => {
+ console.error(error.code, error.message);
+ process.exitCode = 1;
+});
+'''
+raise SystemExit(subprocess.run([node, "-e", javascript, sys.argv[1]], timeout=25).returncode)
+"""
+ result = await playwright_sandbox.execute(
+ f"/opt/python/bin/python3 -c {shlex.quote(script)} {shlex.quote(url)}",
+ timeout=35,
+ )
+ if url == _TRUSTED_URL:
+ assert result.exit_code == 0, result.stderr
+ else:
+ assert result.exit_code != 0
+ assert any(
+ code in result.stderr
+ for code in (
+ "CERT_REVOKED",
+ "CERT_REJECTED",
+ "UNABLE_TO_GET_ISSUER_CERT_LOCALLY",
+ "SELF_SIGNED_CERT_IN_CHAIN",
+ )
+ ), result.stderr
+
+
[email protected]("url", (_TRUSTED_URL, *_COMPROMISED_URLS))
+async def test_playwright_browser_trust(playwright_sandbox: Sandbox, url: str) -> None:
+ script = """
+import sys
+from playwright.sync_api import Error, sync_playwright
+
+with sync_playwright() as playwright:
+ browser = playwright.chromium.launch(executable_path="/usr/local/bin/chromium", headless=True)
+ try:
+ browser.new_page().goto(sys.argv[1], wait_until="commit", timeout=20000)
+ except Error as exc:
+ print(exc, file=sys.stderr)
+ raise SystemExit(1)
+ finally:
+ browser.close()
+"""
+ result = await playwright_sandbox.execute(
+ f"/opt/python/bin/python3 -c {shlex.quote(script)} {shlex.quote(url)}",
+ timeout=35,
+ )
+ if url == _TRUSTED_URL:
+ assert result.exit_code == 0, result.stderr
+ else:
+ assert result.exit_code != 0
+ assert any(
+ code in result.stderr
+ for code in (
+ "net::ERR_CERT_REVOKED",
+ "net::ERR_CERT_AUTHORITY_INVALID",
+ "net::ERR_CERT_KNOWN_INTERCEPTION_BLOCKED",
+ "net::ERR_CERTIFICATE_TRANSPARENCY_REQUIRED",
+ )
+ ), result.stderr
+
+
[email protected]("url", (_TRUSTED_URL, *_COMPROMISED_URLS))
+async def test_firefox_browser_trust(firefox_sandbox: Sandbox, url: str) -> None:
+ # Use Firefox's built-in Marionette protocol without installing a test driver.
+ script = """
+import json
+import socket
+import subprocess
+import sys
+import tempfile
+import time
+from pathlib import Path
+
+with tempfile.TemporaryDirectory() as profile, tempfile.TemporaryFile(mode="w+") as log:
+ # Automation's recommended preferences otherwise disable revocation updates.
+ Path(profile, "user.js").write_text('user_pref("remote.prefs.recommended", false);\\n')
+ browser = subprocess.Popen(
+ ["firefox-esr", "--headless", "--no-remote", "--profile", profile, "--marionette"],
+ stdout=log, stderr=log,
+ )
+ try:
+ deadline = time.monotonic() + 15
+ while True:
+ try:
+ connection = socket.create_connection(("127.0.0.1", 2828), timeout=25)
+ break
+ except ConnectionRefusedError:
+ if browser.poll() is not None or time.monotonic() >= deadline:
+ raise RuntimeError("Firefox's Marionette endpoint did not become ready")
+ time.sleep(0.1)
+
+ with connection, connection.makefile("rb") as stream:
+ def receive():
+ length = bytearray()
+ while True:
+ byte = stream.read(1)
+ if not byte:
+ raise EOFError("Firefox closed its Marionette connection")
+ if byte == b":":
+ return json.loads(stream.read(int(length)))
+ length.extend(byte)
+
+ def command(identifier, name, parameters):
+ payload = json.dumps([0, identifier, name, parameters]).encode()
+ connection.sendall(str(len(payload)).encode() + b":" + payload)
+ response = receive()
+ assert response[:2] == [1, identifier], response
+ return response[2], response[3]
+
+ assert receive()["marionetteProtocol"] == 3
+ error, session = command(1, "WebDriver:NewSession", {
+ "capabilities": {"alwaysMatch": {
+ "acceptInsecureCerts": False,
+ "pageLoadStrategy": "eager",
+ "timeouts": {"pageLoad": 20000},
+ }},
+ })
+ assert error is None, error
+ assert session["capabilities"]["acceptInsecureCerts"] is False, session
+ error, _ = command(2, "WebDriver:Navigate", {"url": sys.argv[1]})
+ if error is not None:
+ print(json.dumps(error), file=sys.stderr)
+ raise SystemExit(60 if error["error"] == "insecure certificate" else 1)
+ finally:
+ browser.terminate()
+ try:
+ browser.wait(timeout=10)
+ except subprocess.TimeoutExpired:
+ browser.kill()
+ browser.wait(timeout=5)
+ log.seek(0)
+ print(log.read(), file=sys.stderr)
+"""
+ result = await firefox_sandbox.execute(
+ f"/usr/bin/python3 -c {shlex.quote(script)} {shlex.quote(url)}",
+ timeout=75,
+ )
+ expected = 0 if url == _TRUSTED_URL else 60
+ assert result.exit_code == expected, result.stderr
diff --git a/tests/unit/test_dev_build.py b/tests/unit/test_dev_build.py
index 0dced95..02470e5 100644
--- a/tests/unit/test_dev_build.py
+++ b/tests/unit/test_dev_build.py
@@ -3,8 +3,11 @@
from __future__ import annotations
import importlib.util
+import os
+import runpy
+import subprocess
from pathlib import Path
-from unittest.mock import MagicMock, patch
+from unittest.mock import AsyncMock, MagicMock, patch
import pytest
from quicksand_image_tools.build import (
@@ -175,6 +178,119 @@ class TestBuildImage:
assert result == cached_image
[email protected]("use_environment", [False, True])
+def test_forced_build_refreshes_parent_images_and_docker_layers(
+ tmp_path, monkeypatch, use_environment
+):
+ import hashlib
+
+ monkeypatch.delenv("QUICKSAND_REBUILD_IMAGES", raising=False)
+ if use_environment:
+ monkeypatch.setenv("QUICKSAND_REBUILD_IMAGES", "1")
+ dockerfile = tmp_path / "Dockerfile"
+ dockerfile.write_text("FROM alpine:3.23\n")
+ agent_source = tmp_path / "agent-source"
+ agent_source.mkdir()
+ output = tmp_path / "image.qcow2"
+ output.write_bytes(b"cached")
+ content_hash = hashlib.sha256(dockerfile.read_bytes() + b"agent").hexdigest()[:16]
+ output.with_name("image.qcow2.buildhash").write_text(content_hash)
+
+ with (
+ patch("quicksand_image_tools.build.AGENT_SOURCE_DIR", agent_source),
+ patch("quicksand_image_tools.build._agent_source_hash", return_value="agent"),
+ patch("quicksand_image_tools.build.shutil.which", return_value="/usr/bin/docker"),
+ patch("quicksand_image_tools.build.subprocess.Popen") as popen,
+ patch("quicksand_image_tools.build._create_and_export_container"),
+ patch("quicksand_image_tools.build._remove_docker_image"),
+ patch(
+ "quicksand_image_tools.build._tar_to_qcow2",
+ side_effect=lambda tar, path, **kwargs: path.write_bytes(b"rebuilt"),
+ ),
+ ):
+ popen.return_value.stdout = ["building\n"]
+ popen.return_value.wait.return_value = 0
+ build_image(dockerfile, output_path=output, force=not use_environment)
+
+ assert output.read_bytes() == b"rebuilt"
+ command = popen.call_args.args[0]
+ assert "--pull" in command
+ assert "--no-cache" in command
+
+
+ "package",
+ ["quicksand-agent", "quicksand-cua", "quicksand-ubuntu-desktop", "quicksand-alpine-desktop"],
+)
[email protected]("force", [False, True])
+def test_overlay_build_respects_release_rebuild_request(tmp_path, monkeypatch, package, force):
+ monkeypatch.delenv("QUICKSAND_REBUILD_IMAGES", raising=False)
+ if force:
+ monkeypatch.setenv("QUICKSAND_REBUILD_IMAGES", "1")
+ hook_path = Path(__file__).parents[2] / "packages" / "contrib" / package / "hatch_build.py"
+ hook_class = runpy.run_path(str(hook_path))["OverlayImageBuildHook"]
+ save_dir = tmp_path / package.replace("-", "_") / "images"
+ overlays_dir = save_dir / "overlays"
+ overlays_dir.mkdir(parents=True)
+ (save_dir / "manifest.json").write_text("{}")
+ (overlays_dir / "cached.qcow2").touch()
+ hook = hook_class(
+ root=str(tmp_path),
+ config={},
+ build_config=MagicMock(),
+ metadata=MagicMock(),
+ directory=str(tmp_path),
+ target_name="wheel",
+ app=MagicMock(),
+ )
+
+ with (
+ patch("quicksand_image_tools.build_utils.set_platform_wheel_tag", return_value=True),
+ patch.object(hook, "_build_and_save", new_callable=AsyncMock) as build,
+ ):
+ hook.initialize("standard", {})
+
+ if force:
+ build.assert_awaited_once_with(save_dir)
+ else:
+ build.assert_not_awaited()
+
+
[email protected](os.name == "nt", reason="The installer executes inside a Unix guest")
+async def test_desktop_repository_setup_stops_on_key_download_failure(tmp_path, monkeypatch):
+ hook_path = (
+ Path(__file__).parents[2] / "packages/contrib/quicksand-ubuntu-desktop/hatch_build.py"
+ )
+ shell = AsyncMock()
+ await runpy.run_path(str(hook_path))["_setup"](shell)
+ command = next(
+ call.args[0]
+ for call in shell.await_args_list
+ if "https://packages.mozilla.org/apt/repo-signing-key.gpg" in call.args[0]
+ )
+ bin_dir = tmp_path / "bin"
+ bin_dir.mkdir()
+ curl = bin_dir / "curl"
+ curl.write_text("#!/bin/sh\nexit 22\n")
+ curl.chmod(0o755)
+ monkeypatch.setenv("PATH", f"{bin_dir}{os.pathsep}{os.environ['PATH']}")
+ apt_dir = tmp_path / "apt"
+ (apt_dir / "sources.list.d").mkdir(parents=True)
+ (apt_dir / "preferences.d").mkdir()
+
+ result = subprocess.run(
+ ["/bin/sh", "-c", command.replace("/etc/apt", str(apt_dir))],
+ capture_output=True,
+ text=True,
+ check=False,
+ )
+
+ assert result.returncode == 22, result.stderr
+ assert not (apt_dir / "sources.list.d/mozilla.sources").exists()
+ assert not (apt_dir / "preferences.d/mozilla-firefox").exists()
+
+
@pytest.mark.parametrize(
("distro", "hook_name"),
[("alpine", "AlpineImageBuildHook"), ("ubuntu", "UbuntuImageBuildHook")],
diff --git a/uv.lock b/uv.lock
index 228772b..4f7e8d8 100644
--- a/uv.lock
+++ b/uv.lock
@@ -20,13 +20,17 @@ members = [
"quicksand-ubuntu",
"quicksand-ubuntu-desktop",
]
-constraints = [{ name = "setuptools", specifier = ">=78.1.1" }]
+constraints = [
+ { name = "certifi", specifier = ">=2026.10.19" },
+ { name = "setuptools", specifier = ">=78.1.1" },
+]
overrides = [{ name = "httpx", specifier = ">=0.27,<1" }]
[manifest.dependency-groups]
dev = [
{ name = "dnslib", specifier = ">=0.9.24" },
{ name = "hatchling" },
+ { name = "pip", specifier = ">=26.2.2" },
{ name = "poethepoet" },
{ name = "pre-commit", specifier = ">=4.6.0" },
{ name = "pytest" },
@@ -117,11 +121,11 @@ wheels = [
[[package]]
name = "certifi"
-version = "2026.4.22"
+version = "2026.10.19"
source = { registry = "https://packagefeedproxy.microsoft.io/pypi/simple/" }
-sdist = { url = "https://ms-feed-25.pkgs.visualstudio.com/6f084628-a36d-42cb-934d-057357e379dc/_packaging/49d7402f-07bb-4b18-a9ce-086e6e98a554/pypi/download/certifi/2026.4.22/certifi-2026.4.22.tar.gz", hash = "sha256:8d455352a37b71bf76a79caa83a3d6c25afee4a385d632127b6afb3963f1c580", size = 137077, upload-time = "2026-08-04T05:16:45Z" }
+sdist = { url = "https://ms-feed-25.pkgs.visualstudio.com/6f084628-a36d-42cb-934d-057357e379dc/_packaging/49d7402f-07bb-4b18-a9ce-086e6e98a554/pypi/download/certifi/2026.10.19/certifi-2026.10.19.tar.gz", hash = "sha256:035c1e85572b141bf1c3a3eff0e33a8eb74917522f2559075ff8d2fea780a1ae", size = 137598, upload-time = "2026-10-21T00:00:12Z" }
wheels = [
- { url = "https://ms-feed-25.pkgs.visualstudio.com/6f084628-a36d-42cb-934d-057357e379dc/_packaging/49d7402f-07bb-4b18-a9ce-086e6e98a554/pypi/download/certifi/2026.4.22/certifi-2026.4.22-py3-none-any.whl", hash = "sha256:3cb2210c8f88ba2318d29b0388d1023c8492ff72ecdde4ebdaddbb13a31b1c4a", size = 135707, upload-time = "2026-07-24T15:58:06Z" },
+ { url = "https://ms-feed-25.pkgs.visualstudio.com/6f084628-a36d-42cb-934d-057357e379dc/_packaging/49d7402f-07bb-4b18-a9ce-086e6e98a554/pypi/download/certifi/2026.10.19/certifi-2026.10.19-py3-none-any.whl", hash = "sha256:42d35340cc5b9ba78e818ddbff0c5b1c2b779de448a340fd1b989f5fa8670e1b", size = 136464, upload-time = "2026-10-20T23:16:46Z" },
]
[[package]]
@@ -563,6 +567,15 @@ wheels = [
{ url = "https://ms-feed-25.pkgs.visualstudio.com/6f084628-a36d-42cb-934d-057357e379dc/_packaging/49d7402f-07bb-4b18-a9ce-086e6e98a554/pypi/download/pathspec/1.1.1/pathspec-1.1.1-py3-none-any.whl", hash = "sha256:a00ce642f577bf7f473932318056212bc4f8bfdf53128c78bbd5af0b9b20b189", size = 57328, upload-time = "2026-07-23T18:47:22Z" },
]
+[[package]]
+name = "pip"
+version = "26.2.2"
+source = { registry = "https://packagefeedproxy.microsoft.io/pypi/simple/" }
+sdist = { url = "https://ms-feed-25.pkgs.visualstudio.com/6f084628-a36d-42cb-934d-057357e379dc/_packaging/49d7402f-07bb-4b18-a9ce-086e6e98a554/pypi/download/pip/26.2.2/pip-26.2.2.tar.gz", hash = "sha256:3a8e5c800492787f33a4114ef54444546c340df428974ebba17e0fd47e11af2f", size = 1863336, upload-time = "2026-10-21T00:29:24Z" }
+wheels = [
+ { url = "https://ms-feed-25.pkgs.visualstudio.com/6f084628-a36d-42cb-934d-057357e379dc/_packaging/49d7402f-07bb-4b18-a9ce-086e6e98a554/pypi/download/pip/26.2.2/pip-26.2.2-py3-none-any.whl", hash = "sha256:fd7f4dfa8190e014013b9f08f3e973f4e4c26ffd179a204895533a7254813a70", size = 1819850, upload-time = "2026-10-20T22:42:39Z" },
+]
+
[[package]]
name = "platformdirs"
version = "4.9.6"
@@ -1082,6 +1095,7 @@ name = "quicksand-core"
version = "0.14.1.dev0"
source = { editable = "packages/quicksand-core" }
dependencies = [
+ { name = "certifi" },
{ name = "dnslib", marker = "sys_platform == 'darwin'" },
{ name = "httpx" },
{ name = "pydantic" },
@@ -1090,6 +1104,7 @@ dependencies = [
[package.metadata]
requires-dist = [
+ { name = "certifi", specifier = ">=2026.10.19" },
{ name = "dnslib", marker = "sys_platform == 'darwin'", specifier = ">=0.9.24" },
{ name = "httpx", specifier = ">=0.27,<1.0" },
{ name = "pydantic", specifier = ">=2.0" },
@@ -1118,6 +1133,7 @@ source = { editable = "packages/dev/quicksand-gh-runners" }
dependencies = [
{ name = "azure-identity" },
{ name = "azure-mgmt-compute" },
+ { name = "certifi" },
{ name = "requests" },
]
@@ -1125,6 +1141,7 @@ dependencies = [
requires-dist = [
{ name = "azure-identity" },
{ name = "azure-mgmt-compute" },
+ { name = "certifi", specifier = ">=2026.10.19" },
{ name = "requests" },
]