From 51e37674119f9522a225d81f5f10ab6584ebbaea Mon Sep 17 00:00:00 2001 From: Archimax <64978924+EnterTheVoid-x86@users.noreply.github.com> Date: Sat, 25 Jan 2025 22:26:54 -0500 Subject: [PATCH 1/6] Update README.md --- README.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/README.md b/README.md index 1cef0a9..845216a 100644 --- a/README.md +++ b/README.md @@ -27,11 +27,7 @@ Now, to modify the shim with the generated PKIMetadata: - `bash modify.sh ` -Now boot the shim, and in the terminal of the shim, run these commands: - -`mount /dev/disk/by-label/STATE /mnt/stateful_partition` - -`bash /mnt/stateful_partition/usr/bin/inshim.sh` +Now boot the shim, and ICARUS will attempt to modify your stateful partition. ### Server setup Requirements: npm, node From 5d167de02f030abea969a6e73066929049b6d574 Mon Sep 17 00:00:00 2001 From: Archimax <64978924+EnterTheVoid-x86@users.noreply.github.com> Date: Sat, 25 Jan 2025 22:30:45 -0500 Subject: [PATCH 2/6] fail statements + error handling --- inshim.sh | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/inshim.sh b/inshim.sh index 3a7c938..79c41d2 100644 --- a/inshim.sh +++ b/inshim.sh @@ -1,6 +1,11 @@ #!/bin/bash -[ "$EUID" -ne 0 ] && echo "Run this as root" +[ "$EUID" -ne 0 ] && fail "Not running as root, this shouldn't happen! Failing." + +fail() { + printf "%b\n" "$*" >&2 || : + sleep 1d +} get_largest_cros_blockdev() { local largest size dev_name tmp_size remo @@ -31,15 +36,15 @@ format_part_number() { mount /dev/disk/by-label/STATE /mnt/stateful_partition/ cros_dev="$(get_largest_cros_blockdev)" if [ -z "$cros_dev" ]; then - echo "No CrOS SSD found on device. Failing." - exit 1 + echo "No CrOS SSD found on device. Failing." + sleep 1d fi stateful=$(format_part_number "$cros_dev" 1) -mkfs.ext4 -F "$stateful" # This only wipes the stateful partition -mount "$stateful" /tmp +mkfs.ext4 -F "$stateful" || fail "Failed to wipe stateful." # This only wipes the stateful partition +mount "$stateful" /tmp || fail "Failed to mount stateful." mkdir -p /tmp/unencrypted cp /mnt/stateful_partition/usr/share/packeddata/. /tmp/unencrypted/ -rvf chown 1000 /tmp/unencrypted/PKIMetadata -R rm /tmp/.developer_mode umount /tmp -crossystem disable_dev_request=1 +crossystem disable_dev_request=1 || fail "Failed to set disable_dev_request." From 28ed1e1fa5d1a6403e69bf8b374ead394983cfab Mon Sep 17 00:00:00 2001 From: Archimax <64978924+EnterTheVoid-x86@users.noreply.github.com> Date: Sat, 25 Jan 2025 22:32:59 -0500 Subject: [PATCH 3/6] Revert "Update README.md" This reverts commit 51e37674119f9522a225d81f5f10ab6584ebbaea. --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 845216a..1cef0a9 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,11 @@ Now, to modify the shim with the generated PKIMetadata: - `bash modify.sh ` -Now boot the shim, and ICARUS will attempt to modify your stateful partition. +Now boot the shim, and in the terminal of the shim, run these commands: + +`mount /dev/disk/by-label/STATE /mnt/stateful_partition` + +`bash /mnt/stateful_partition/usr/bin/inshim.sh` ### Server setup Requirements: npm, node From 9f5f01fd9b1aeb1ff12df7db51465f29d861066a Mon Sep 17 00:00:00 2001 From: Archimax <64978924+EnterTheVoid-x86@users.noreply.github.com> Date: Sat, 25 Jan 2025 22:33:03 -0500 Subject: [PATCH 4/6] Revert "fail statements + error handling" This reverts commit 5d167de02f030abea969a6e73066929049b6d574. --- inshim.sh | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/inshim.sh b/inshim.sh index 79c41d2..3a7c938 100644 --- a/inshim.sh +++ b/inshim.sh @@ -1,11 +1,6 @@ #!/bin/bash -[ "$EUID" -ne 0 ] && fail "Not running as root, this shouldn't happen! Failing." - -fail() { - printf "%b\n" "$*" >&2 || : - sleep 1d -} +[ "$EUID" -ne 0 ] && echo "Run this as root" get_largest_cros_blockdev() { local largest size dev_name tmp_size remo @@ -36,15 +31,15 @@ format_part_number() { mount /dev/disk/by-label/STATE /mnt/stateful_partition/ cros_dev="$(get_largest_cros_blockdev)" if [ -z "$cros_dev" ]; then - echo "No CrOS SSD found on device. Failing." - sleep 1d + echo "No CrOS SSD found on device. Failing." + exit 1 fi stateful=$(format_part_number "$cros_dev" 1) -mkfs.ext4 -F "$stateful" || fail "Failed to wipe stateful." # This only wipes the stateful partition -mount "$stateful" /tmp || fail "Failed to mount stateful." +mkfs.ext4 -F "$stateful" # This only wipes the stateful partition +mount "$stateful" /tmp mkdir -p /tmp/unencrypted cp /mnt/stateful_partition/usr/share/packeddata/. /tmp/unencrypted/ -rvf chown 1000 /tmp/unencrypted/PKIMetadata -R rm /tmp/.developer_mode umount /tmp -crossystem disable_dev_request=1 || fail "Failed to set disable_dev_request." +crossystem disable_dev_request=1 From d24177d71b443a4d61c97d7b97987f1acebfd63b Mon Sep 17 00:00:00 2001 From: Archimax <64978924+EnterTheVoid-x86@users.noreply.github.com> Date: Sun, 26 Jan 2025 17:53:31 -0500 Subject: [PATCH 5/6] fix: readme typo about control center --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8df0455..9c85937 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ Requirements: npm, node Run `make start-server` to start your proxy, then continue with the instructions below. ## Setup and installation instructions, continued -Reboot the device. You'll boot into verified mode. Once you have your server running, open the network configuration by clicking the lower left button, connecting to wifi, and then change the proxy settings accordingly. +Reboot the device. You'll boot into verified mode. Once you have your server running, open the network configuration by clicking the lower right button (it will show the date), connecting to wifi, and then change the proxy settings accordingly. - Set proxy settings to manual - Set HTTPS IP to the IP you used to host the proxy server. From e3539f00fbf80ecf74f7aeed710104c577146f8e Mon Sep 17 00:00:00 2001 From: MunyDev Date: Sun, 26 Jan 2025 18:34:25 -0500 Subject: [PATCH 6/6] Updated submodules --- .gitmodules | 1 + httpmitm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index d0381e9..7098bf4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,4 @@ [submodule "httpmitm"] path = httpmitm url = https://github.com/MunyDev/httpmitm + branch = main diff --git a/httpmitm b/httpmitm index 17d80ea..a3e9aa3 160000 --- a/httpmitm +++ b/httpmitm @@ -1 +1 @@ -Subproject commit 17d80ead8561ac747bcf8c27e81e8a239ce7d665 +Subproject commit a3e9aa3e1e9d0fe9ff9496a153af0d548895f593