Trust the reviewed Apps carousel while retaining older collections
This commit is contained in:
1 parent
d069d36ef8
commit
f493b059f8
3 files changed
+8
-2
No files matched your search
@@ -15,6 +15,8 @@ ROOT = Path(__file__).resolve().parent.parent
|
||||
parser = argparse.ArgumentParser(description=__doc__)
|
||||
parser.add_argument('--output', default='build/package-assets',
|
||||
help='Build directory for staged package assets')
|
||||
parser.add_argument('--apps-controller', type=Path, default=ROOT / 'build/apps-ui/apps.zib',
|
||||
help='Reviewed Apps controller to include in the root package')
|
||||
options = parser.parse_args()
|
||||
OUTPUT = (ROOT / options.output).resolve()
|
||||
if not OUTPUT.is_relative_to(ROOT / 'build') or OUTPUT == ROOT / 'build':
|
||||
@@ -103,7 +105,7 @@ for name in NODE_APPS:
|
||||
|
||||
# Root launcher cards share the reviewed Apps controller. A node-only build
|
||||
# can omit it; the root bundle build below requires this asset explicitly.
|
||||
apps_bundle = ROOT / 'build/apps-ui/apps.zib'
|
||||
apps_bundle = options.apps_controller.resolve()
|
||||
if apps_bundle.is_file():
|
||||
controller = apps_bundle.read_bytes()
|
||||
source = (ROOT / 'src/cells/apps_controller.zi').read_text()
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
// Trusted shared Apps UI reviewed for this host. Containers may carry these
|
||||
// bytes, but cannot select or replace the host's controller trust anchor.
|
||||
AppsControllerSha256 :: "ff62f2eb5b42b73d3ca6eac91ce96af917a564787a58a6d8c5b91104e1a07fad"
|
||||
AppsControllerSha256 :: "88eaaecc551afbe973e76d1b3298c58375b070c3c279b310d409a6ada48fee1d"
|
||||
|
||||
// Keep published icon/list collections from before cover carousels opening.
|
||||
AppsControllerBeforeCovers :: "ff62f2eb5b42b73d3ca6eac91ce96af917a564787a58a6d8c5b91104e1a07fad"
|
||||
// The controller before apps not on the device showed a download symbol.
|
||||
// Collections published with it, such as Arcade 0.5.1, keep opening.
|
||||
AppsControllerPrevious :: "cd28635a8824a70232cb94252cafdc5ffca8e73c2145fec551b4c30cde80efc7"
|
||||
|
||||
@@ -457,6 +457,7 @@ NodeTreeStart :: (runner: *NodeAppRunner, bytes: string, verified: string,
|
||||
payload := cast(*TextDescriptor)(*bytes)
|
||||
Sha256Hex(payload.data, bytes.count, *digest[0])
|
||||
}
|
||||
unused AppHostTrustHarness(host, AppsControllerBeforeCovers)
|
||||
unused AppHostTrustHarness(host, AppsControllerPrevious)
|
||||
unused AppHostTrustHarness(host, AppsControllerIconGrid)
|
||||
unused AppHostTrustHarness(host, AppsControllerList)
|
||||
|
||||
Reference in new issue
Block a user