diff --git a/scripts/check-server-api-explorer-patch.sh b/scripts/check-server-api-explorer-patch.sh index 86517bf39d..d6c6d4b494 100755 --- a/scripts/check-server-api-explorer-patch.sh +++ b/scripts/check-server-api-explorer-patch.sh @@ -573,7 +573,7 @@ python3 scripts/test-web-console-sbom.py python3 server/security/test_web_console_sbom_scan.py require_marker "$release_dockerfile" \ - 'ARG SERVER_RELEASE_TAG=v1.6.601' \ + 'ARG SERVER_RELEASE_TAG=v1.6.602' \ SERVER_INCREMENTAL_RELEASE_DEFAULT_MISSING require_marker "$release_dockerfile" \ 'org.opencontainers.image.version="${SERVER_RELEASE_TAG}"' \ @@ -1141,10 +1141,10 @@ require_marker "$build_script" \ '--file server/Dockerfile.web-compose-release' \ SERVER_INCREMENTAL_RELEASE_BUILD_PATH_MISSING require_marker "$build_script" \ - 'image=${IMAGE:-pasturestack-validation/server:v1.6.601}' \ + 'image=${IMAGE:-pasturestack-validation/server:v1.6.602}' \ SERVER_INCREMENTAL_RELEASE_BUILD_VERSION_MISSING require_marker "$build_script" \ - 'server_release_tag=${SERVER_RELEASE_TAG:-v1.6.601}' \ + 'server_release_tag=${SERVER_RELEASE_TAG:-v1.6.602}' \ SERVER_INCREMENTAL_RELEASE_BUILD_DEFAULT_MISSING require_marker "$build_script" \ 'CATTLE_RANCHER_SERVER_VERSION="${server_release_tag}"' \ @@ -1701,10 +1701,10 @@ fi if grep -Fxq '## Current source candidate' README.md; then for candidate_readme_marker in \ '' \ - 'Server `v1.6.601` is a prepared source candidate, not a published image.' \ + 'Server `v1.6.602` is a prepared source candidate, not a published image.' \ 'run them only after its official release' \ 'This candidate is not yet available' \ - 'ghcr.io/pasturestack/server:v1.6.601'; do + 'ghcr.io/pasturestack/server:v1.6.602'; do require_marker README.md "$candidate_readme_marker" \ SERVER_CURRENT_CANDIDATE_README_MISSING done @@ -2318,7 +2318,7 @@ done jq -e ' ["CVE-2026-107928","CVE-2026-107929","CVE-2026-86409","CVE-2026-86410","CVE-2026-86412","CVE-2026-86414","CVE-2026-87862","CVE-2026-87863","CVE-2026-87864","CVE-2026-87865","CVE-2026-92386","CVE-2026-92387","CVE-2026-92388","CVE-2026-92389","CVE-2026-92390","CVE-2026-92391","CVE-2026-92392","CVE-2026-94266"] as $curl_fixed_cves | .["@context"] == "https://openvex.dev/ns/v0.2.0" - and .["@id"] == "https://github.com/PastureStack/server/security/openvex/v1.6.601" + and .["@id"] == "https://github.com/PastureStack/server/security/openvex/v1.6.602" and (.statements | length) == 58 and ([.statements[] | select(.vulnerability.name == "CVE-2026-82560")] | length) == 1 and any(.statements[]; @@ -2378,7 +2378,7 @@ jq -r ' | @tsv ' "$runtime_vendor_pending" | LC_ALL=C sort -u >"$vendor_pending_fixture" bash "$vendor_pending_validator" "$runtime_vendor_pending" \ - "$vendor_pending_fixture" v1.6.601 >/dev/null + "$vendor_pending_fixture" v1.6.602 >/dev/null bash scripts/test-vendor-pending-findings.sh >/dev/null rm -f "$vendor_pending_fixture" trap - EXIT @@ -2482,4 +2482,4 @@ require_marker server/artifacts/fetch-server-component.sh 'Component response mu # Execute the shared archive verifier controls before starting an image build. python3 -B "$repo_root/scripts/test-engine-archive-contract.py" -printf 'SERVER_API_EXPLORER_PATCH_OK release=v1.6.601 base=v1.6.460 engine=0.183.395 web_console=1.6.239 catalog_service=0.20.18 webhook_automation_service=0.10.6 authentication_service=0.4.47 curl=8.18.0-1ubuntu2.8 freemarker=2.3.35 artifact_scan=required vendor_pending=exact-set role_matrix=qa-required locale_layout=qa-required\n' +printf 'SERVER_API_EXPLORER_PATCH_OK release=v1.6.602 base=v1.6.460 engine=0.183.395 web_console=1.6.239 catalog_service=0.20.18 webhook_automation_service=0.10.6 authentication_service=0.4.47 curl=8.18.0-1ubuntu2.8 freemarker=2.3.35 artifact_scan=required vendor_pending=exact-set role_matrix=qa-required locale_layout=qa-required\n' diff --git a/scripts/test-current-server-packaging-contract.py b/scripts/test-current-server-packaging-contract.py index 08d7be4b44..12889d44a3 100644 --- a/scripts/test-current-server-packaging-contract.py +++ b/scripts/test-current-server-packaging-contract.py @@ -46,7 +46,7 @@ ENGINE_SHA = '0c446a67b9a11fb9018045be0b114b328365e4c3da314d1db6e4e4421d07fcfa' ENGINE_SOURCE = '9611a0abde9b8e13a21182b544b98cdac92b7c6a' OLD_COORDINATES = { - 'v1.6.601': 'v1.6.521', + 'v1.6.602': 'v1.6.521', '1.6.239': '1.6.181', WEB_SHA: '9199681f2c4311f3fbe8727fcf0f6fa136c9bafe9fbe9d13878c55df442a7a03', WEB_SOURCE: '7f2bdad0c90a3241693c2ddd4475202ababba550', @@ -70,7 +70,7 @@ } EXPECTED = { COMPATIBILITY_CODE: (COMPATIBILITY, PUBLISHED_508), - 'SERVER_INCREMENTAL_RELEASE_DEFAULT_MISSING': (DOCKER, 'ARG SERVER_RELEASE_TAG=v1.6.601'), + 'SERVER_INCREMENTAL_RELEASE_DEFAULT_MISSING': (DOCKER, 'ARG SERVER_RELEASE_TAG=v1.6.602'), 'SERVER_INCREMENTAL_RELEASE_VERSION_MISSING': (DOCKER, 'org.opencontainers.image.version="${SERVER_RELEASE_TAG}"'), 'SERVER_INCREMENTAL_RELEASE_RUNTIME_VERSION_MISSING': (DOCKER, 'ENV CATTLE_RANCHER_SERVER_VERSION=${SERVER_RELEASE_TAG}'), 'SERVER_INCREMENTAL_WEB_CONSOLE_VERSION_MISSING': (DOCKER, 'ARG WEB_CONSOLE_RELEASE_TAG=1.6.239'), @@ -85,8 +85,8 @@ 'SERVER_INCREMENTAL_WEB_CONSOLE_BUILD_HASH_MISSING': (BUILD, 'web_console_artifact_sha256=${WEB_CONSOLE_ARTIFACT_SHA256:-' + WEB_SHA + '}'), 'SERVER_INCREMENTAL_WEB_CONSOLE_BUILD_LOCK_HASH_MISSING': (BUILD, 'web_console_lock_sha256=${WEB_CONSOLE_LOCK_SHA256:-' + WEB_LOCK_SHA + '}'), 'SERVER_INCREMENTAL_WEB_CONSOLE_BUILD_SBOM_HASH_MISSING': (BUILD, 'web_console_runtime_sbom_sha256=${WEB_CONSOLE_RUNTIME_SBOM_SHA256:-' + WEB_SBOM_SHA + '}'), - 'SERVER_INCREMENTAL_RELEASE_BUILD_VERSION_MISSING': (BUILD, 'image=${IMAGE:-pasturestack-validation/server:v1.6.601}'), - 'SERVER_INCREMENTAL_RELEASE_BUILD_DEFAULT_MISSING': (BUILD, 'server_release_tag=${SERVER_RELEASE_TAG:-v1.6.601}'), + 'SERVER_INCREMENTAL_RELEASE_BUILD_VERSION_MISSING': (BUILD, 'image=${IMAGE:-pasturestack-validation/server:v1.6.602}'), + 'SERVER_INCREMENTAL_RELEASE_BUILD_DEFAULT_MISSING': (BUILD, 'server_release_tag=${SERVER_RELEASE_TAG:-v1.6.602}'), 'SERVER_INCREMENTAL_RELEASE_BUILD_RUNTIME_VERSION_MISSING': (BUILD, 'CATTLE_RANCHER_SERVER_VERSION="${server_release_tag}"'), 'SERVER_WEB_CONSOLE_RUNTIME_VERSION_GATE_MISSING': (BUILD, 'test "$(cat "${web_root}/VERSION.txt")" = "${WEB_CONSOLE_RELEASE_TAG}"'), 'SERVER_VOLUME_NATIVE_READ_ONLY_BUILD_GATE_MISSING': (DOCKER, 'grep -F \'"volume.isNative" : "r"\' >/dev/null'), @@ -489,6 +489,7 @@ def verify_runtime_layout(files, gate=GATE): 'FROM ${ARTIFACT_HELPER_IMAGE} AS console_broker_build', 'FROM scratch AS component_input', 'FROM ${ARTIFACT_HELPER_IMAGE} AS release_artifacts', + 'FROM ${UBUNTU_SECURITY_IMAGE} AS rsync_security_package', 'FROM ${UBUNTU_SECURITY_IMAGE} AS runtime_security_packages', 'FROM ${BASE_IMAGE}', ] @@ -612,15 +613,15 @@ def verify(files, gate=GATE): pipeline = r'(?:^|[;\n])\s*' + re.escape(marker) + r'(?=\s*(?:;|\n|$))' if len(re.findall(pipeline, source)) != 1: raise AssertionError('CURRENT_CATALOG_HASH_BYPASS') - if 'and .["@id"] == "https://github.com/PastureStack/server/security/openvex/v1.6.601"' not in gate: + if 'and .["@id"] == "https://github.com/PastureStack/server/security/openvex/v1.6.602"' not in gate: raise AssertionError('CURRENT_VEX_GATE_PIN_MISMATCH') - if '"$vendor_pending_fixture" v1.6.601 >/dev/null' not in gate: + if '"$vendor_pending_fixture" v1.6.602 >/dev/null' not in gate: raise AssertionError('CURRENT_VENDOR_GATE_PIN_MISMATCH') - if json.loads(files[VEX]).get('@id') != 'https://github.com/PastureStack/server/security/openvex/v1.6.601': + if json.loads(files[VEX]).get('@id') != 'https://github.com/PastureStack/server/security/openvex/v1.6.602': raise AssertionError('CURRENT_VEX_RELEASE_MISMATCH') - if json.loads(files[VENDOR]).get('release') != 'v1.6.601': + if json.loads(files[VENDOR]).get('release') != 'v1.6.602': raise AssertionError('CURRENT_VENDOR_RELEASE_MISMATCH') - if 'SERVER_API_EXPLORER_PATCH_OK release=v1.6.601 base=v1.6.460 engine=0.183.395 web_console=1.6.239 catalog_service=0.20.18 ' not in gate: + if 'SERVER_API_EXPLORER_PATCH_OK release=v1.6.602 base=v1.6.460 engine=0.183.395 web_console=1.6.239 catalog_service=0.20.18 ' not in gate: raise AssertionError('CURRENT_SUMMARY_MISMATCH') verify_incremental_contract(files, gate) verify_load_balancer_contract(files, gate) @@ -635,11 +636,11 @@ def previous_gate(gate=GATE): if stale(marker) != marker: replacements["'" + marker + "' "] = "'" + stale(marker) + "' " replacements.update({ - 'and .["@id"] == "https://github.com/PastureStack/server/security/openvex/v1.6.601"': + 'and .["@id"] == "https://github.com/PastureStack/server/security/openvex/v1.6.602"': 'and .["@id"] == "https://github.com/PastureStack/server/security/openvex/v1.6.521"', - '"$vendor_pending_fixture" v1.6.601 >/dev/null': + '"$vendor_pending_fixture" v1.6.602 >/dev/null': '"$vendor_pending_fixture" v1.6.521 >/dev/null', - 'SERVER_API_EXPLORER_PATCH_OK release=v1.6.601 base=v1.6.460 engine=0.183.395 web_console=1.6.239 catalog_service=0.20.18 ': + 'SERVER_API_EXPLORER_PATCH_OK release=v1.6.602 base=v1.6.460 engine=0.183.395 web_console=1.6.239 catalog_service=0.20.18 ': 'SERVER_API_EXPLORER_PATCH_OK release=v1.6.521 base=v1.6.460 engine=0.183.340 web_console=1.6.181 catalog_service=0.20.12 ', }) for marker, stale_marker in replacements.items(): @@ -1098,7 +1099,7 @@ def test_nineteen_component_inputs_keep_exact_sha_fetch_and_separate_jdk_stage(s block = FILES[BUILD].split(' component_assets=(\n', 1)[1].split(' )', 1)[0] self.assertEqual([line.strip() for line in block.splitlines()], EXACT_COMPONENT_INPUTS) self.assertEqual(len(EXACT_COMPONENT_INPUTS), 19) - self.assertEqual(len(re.findall(r'^FROM ', FILES[DOCKER], re.M)), 7) + self.assertEqual(len(re.findall(r'^FROM ', FILES[DOCKER], re.M)), 8) self.assertIn('FROM scratch AS component_input', FILES[DOCKER]) final = FILES[DOCKER].rsplit('FROM ${BASE_IMAGE}', 1)[1] # The already-flattened base contributes one real layer too. @@ -1170,7 +1171,7 @@ def test_freetype_official_deb_and_library_checks_fail_closed(self): def check(files): self.assertEqual(files[DOCKER].splitlines().count('ARG FREETYPE_PACKAGE_VERSION=' + version), 2) self.assertEqual(len(re.findall(archive, files[DOCKER], re.M)), 1) - self.assertEqual(len(re.findall(r'^FROM ', files[DOCKER], re.M)), 7) + self.assertEqual(len(re.findall(r'^FROM ', files[DOCKER], re.M)), 8) self.assertIn('FROM scratch AS component_input', files[DOCKER]) for name, variable in paths: for marker in engine_gate_markers(GATE, variable): @@ -1283,7 +1284,7 @@ def test_catalog_both_stages_build_defaults_and_pending_reject(self): self.assertLess(FILES[BUILD].index(actual_guard), FILES[BUILD].index('docker buildx build')) self.assertIsNotNone(re.fullmatch(pattern, value)) self.assertIsNone(re.fullmatch(pattern, 'PENDING_OFFICIAL_SOURCE')) - self.assertEqual(len(re.findall(r'^FROM ', FILES[DOCKER], re.M)), 7) + self.assertEqual(len(re.findall(r'^FROM ', FILES[DOCKER], re.M)), 8) self.assertIn('FROM scratch AS component_input', FILES[DOCKER]) self.assertIn('SERVER_COMPONENT_RELEASE_COORDINATES_PENDING', GATE) self.assertIn('PENDING_OFFICIAL_(SOURCE|ARCHIVE|BINARY|SQLITE_BINARY)', GATE) @@ -1340,7 +1341,7 @@ def test_previous_gate_and_each_old_component_pin_rejected(self): def test_previous_server566_engine367_web206_component_pins_cannot_mix(self): previous = { - 'v1.6.601': 'v1.6.566', '1.6.239': '1.6.206', '0.183.395': '0.183.367', + 'v1.6.602': 'v1.6.566', '1.6.239': '1.6.206', '0.183.395': '0.183.367', ENGINE_SHA: '4435aec3508fafeb1b1d88f455b7cef815c026957820b9127a391728130aa86c', ENGINE_SOURCE: '7cdacb4aad8cfbee3db239bb602a6a047da31fcf', WEB_SHA: 'c385bd89cb9458650259a9fc46baa5a46e60dd6a67fd116a3ed13bcf372a2075', @@ -1431,7 +1432,7 @@ def test_historical_engine340_cannot_be_packaged(self): def test_engine352_actual_war_producer_and_previous351_350_boundary(self): candidate = (REPO / 'server/build-component-candidate.sh').read_text(encoding='utf-8') - self.assertIn('export SERVER_RELEASE_TAG=${SERVER_RELEASE_TAG:-v1.6.601}', candidate) + self.assertIn('export SERVER_RELEASE_TAG=${SERVER_RELEASE_TAG:-v1.6.602}', candidate) self.assertIn('export ORCHESTRATION_ENGINE_RELEASE_TAG=${ORCHESTRATION_ENGINE_RELEASE_TAG:-v0.183.395}', candidate) for old in ( {'0.183.395': '0.183.351', @@ -1739,7 +1740,7 @@ def test_machine_actual_binary_package_and_retired_boundary_are_verified(self): def test_current_readme_status_specific_prose_does_not_block_publication_transition(self): common = GATE.split('for current_readme_marker in ', 1)[1].split('; do', 1)[0] self.assertNotIn('candidate', common) - self.assertNotIn('v1.6.601', common) + self.assertNotIn('v1.6.602', common) self.assertIn("grep -Fqi 'keep all three named volumes' README.md", GATE) status = GATE.split("if grep -Fxq '## Current source candidate' README.md; then", 1)[1] candidate, published = status.split("elif grep -Fxq '## Current release' README.md; then", 1) @@ -1748,7 +1749,7 @@ def test_current_readme_status_specific_prose_does_not_block_publication_transit self.assertIn('This candidate is not yet available', candidate) self.assertIn('SERVER_CURRENT_PUBLISHED_README_MISSING', published) self.assertNotIn('candidate', published) - self.assertNotIn('v1.6.601', published) + self.assertNotIn('v1.6.602', published) if __name__ == '__main__': diff --git a/server/Dockerfile.web-compose-release b/server/Dockerfile.web-compose-release index 31442b55fa..6b754998da 100644 --- a/server/Dockerfile.web-compose-release +++ b/server/Dockerfile.web-compose-release @@ -619,7 +619,7 @@ mkdir /rsync-out install -m 0644 "$package" /rsync-out/rsync.deb install -m 0644 /backport/cve-2026-70457.patch /rsync-out/cve-2026-70457.patch cd /rsync-out -sha256sum rsync.deb cve-2026-70457.patch > SHA256SUMS +sha256sum rsync.deb cve-2026-70457.patch > rsync-SHA256SUMS sha256sum /usr/bin/rsync > runtime.sha256 SH @@ -945,6 +945,8 @@ COPY scripts/install-ubuntu-security-updates.sh security/ubuntu-security-package # upstream 1.3.2 library, which is affected by USN-8954-1 / CVE-2026-85091. # Retain the base image's removed, unused Git DAV/Expat surface after updating. RUN --mount=from=ubuntu_security_backports,source=/out,target=/opt/pasturestack/ubuntu-security-backports,ro \ + --mount=from=rsync_security_package,source=/rsync-out,target=/tmp/rsync-security,ro \ + --mount=type=bind,source=security/ubuntu-backports/rsync/verify-rsync-runtime.sh,target=/tmp/verify-rsync-runtime.sh,ro \ set -eux; \ printf '%s\n' "${WEB_CONSOLE_COMMIT}" | grep -Eq '^[0-9a-f]{40}$'; \ cd /tmp/pasturestack-runtime-security; \ @@ -1075,13 +1077,8 @@ RUN --mount=from=ubuntu_security_backports,source=/out,target=/opt/pasturestack/ sha256sum -c /usr/share/pasturestack/security/openssl-runtime.sha256; \ openssl version | grep -E '^OpenSSL 3\.5\.5 .*\(Library: OpenSSL 3\.5\.5 '; \ rm -rf /tmp/pasturestack-runtime-security /usr/share/licenses/pasturestack/openssl-3.5.8; \ - rm -f /usr/bin/tar - -RUN --mount=from=rsync_security_package,source=/rsync-out,target=/tmp/rsync-security,ro \ - --mount=type=bind,source=security/ubuntu-backports/rsync/verify-rsync-runtime.sh,target=/tmp/verify-rsync-runtime.sh,ro \ - set -eu; \ cd /tmp/rsync-security; \ - sha256sum -c SHA256SUMS; \ + sha256sum -c rsync-SHA256SUMS; \ test "$(dpkg-query -W -f='${Version}' rsync)" = 3.4.1+ds1-7ubuntu0.3; \ dpkg -i rsync.deb; \ sha256sum -c runtime.sha256; \ @@ -1089,8 +1086,8 @@ RUN --mount=from=rsync_security_package,source=/rsync-out,target=/tmp/rsync-secu install -d "$evidence"; \ install -m 0644 runtime.sha256 cve-2026-70457.patch "$evidence/"; \ install -D -m 0755 /tmp/verify-rsync-runtime.sh /usr/local/libexec/pasturestack/verify-rsync-runtime.sh; \ - sh /usr/local/libexec/pasturestack/verify-rsync-runtime.sh > "$evidence/runtime.txt" - + sh /usr/local/libexec/pasturestack/verify-rsync-runtime.sh > "$evidence/runtime.txt"; \ + rm -f /usr/bin/tar COPY --from=release_artifacts /out/web-console/ /tmp/pasturestack-web-console/ RUN rm -rf /tmp/pasturestack-api-ui diff --git a/server/build-component-candidate.sh b/server/build-component-candidate.sh index 00507ced0e..53dc699156 100755 --- a/server/build-component-candidate.sh +++ b/server/build-component-candidate.sh @@ -18,7 +18,7 @@ for name in "${required[@]}"; do case "$name" in *_COMMIT) [[ ${!name} =~ ^[0-9a-f]{40}$ ]] ;; *) [[ ${!name} =~ ^[0-9a-f]{64}$ ]] ;; esac export "$name" done -export SERVER_RELEASE_TAG=${SERVER_RELEASE_TAG:-v1.6.601} +export SERVER_RELEASE_TAG=${SERVER_RELEASE_TAG:-v1.6.602} export ORCHESTRATION_ENGINE_RELEASE_TAG=${ORCHESTRATION_ENGINE_RELEASE_TAG:-v0.183.395} export ORCHESTRATION_ENGINE_ARTIFACT=cattle.jar export WEB_CONSOLE_RELEASE_TAG=${WEB_CONSOLE_RELEASE_TAG:-1.6.239} diff --git a/server/security/openvex.json b/server/security/openvex.json index dbf4cf7214..9b7830711f 100644 --- a/server/security/openvex.json +++ b/server/security/openvex.json @@ -1,6 +1,6 @@ { "@context": "https://openvex.dev/ns/v0.2.0", - "@id": "https://github.com/PastureStack/server/security/openvex/v1.6.601", + "@id": "https://github.com/PastureStack/server/security/openvex/v1.6.602", "author": "PastureStack Security", "timestamp": "2026-11-12T08:08:21Z", "version": 90,