Move boot.py out of the filesystem and into the firmware. Then use badge.safe_mode()

gavanfantom · gavanfantom · commit 53699ccbd496 · 2017-08-07T00:27:15.000+01:00
to force the use of the default splash, disable services and disable sleeping. This
should allow a user to uninstall any malicious applications without needing to plug
the badge into a computer with USB.
diff --git a/esp32/main.c b/esp32/main.c
@@ -102,7 +102,7 @@ void mp_task(void *pvParameter) {
     // run boot-up scripts
     pyexec_frozen_module("_boot.py");
     if (pyexec_mode_kind != PYEXEC_MODE_RAW_REPL) {
-        pyexec_file("boot.py");
+        pyexec_frozen_module("boot.py");
     }
     // if (pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL) {
     //     pyexec_file("main.py");
diff --git a/esp32/modules/_boot.py b/esp32/modules/_boot.py
@@ -1,13 +1,6 @@
 import badge, gc, uos
 
-try:
-    badge.mount_root()
-    uos.mount(uos.VfsNative(None), '/')
-    with open("/boot.py", "r") as f:
-        f.close()
-
-except OSError:
-    import inisetup
-    vfs = inisetup.setup()
+badge.mount_root()
+uos.mount(uos.VfsNative(None), '/')
 
 gc.collect()
diff --git a/esp32/modules/boot.py b/esp32/modules/boot.py
@@ -1,16 +1,13 @@
-import uos
-
-def boot():
-    print("Updating 'boot.py'...")
-    with open("/boot.py", "w") as f:
-            f.write("""\
 # This file is executed on every boot (including wake-boot from deepsleep)
 import badge, machine, esp, ugfx, sys
 badge.init()
 ugfx.init()
 esp.rtcmem_write(0,0)
 esp.rtcmem_write(1,0)
-splash = badge.nvs_get_str('boot','splash','splash')
+if badge.safe_mode():
+    splash = 'splash'
+else:
+    splash = badge.nvs_get_str('boot','splash','splash')
 if machine.reset_cause() != machine.DEEPSLEEP_RESET:
     print('[BOOT] Cold boot')
 else:
@@ -39,4 +36,3 @@ def boot():
     time.sleep(5)
     import appglue
     appglue.home()
-    """)
diff --git a/esp32/modules/inisetup.py b/esp32/modules/inisetup.py
diff --git a/esp32/modules/launcher.py b/esp32/modules/launcher.py
@@ -166,9 +166,16 @@ def start():
     ugfx.clear(ugfx.WHITE)
     ugfx.flush()
 
-    ugfx.string_box(148,0,148,26, "STILL", "Roboto_BlackItalic24", ugfx.BLACK, ugfx.justifyCenter)
+    if badge.safe_mode():
+	still = "SAFE"
+	anyway = "Mode"
+    else:
+	still = "STILL"
+	anyway = "Anyway"
+
+    ugfx.string_box(148,0,148,26, still, "Roboto_BlackItalic24", ugfx.BLACK, ugfx.justifyCenter)
     ugfx.string_box(148,23,148,23, "Hacking", "PermanentMarker22", ugfx.BLACK, ugfx.justifyCenter)
-    ugfx.string_box(148,48,148,26, "Anyway", "Roboto_BlackItalic24", ugfx.BLACK, ugfx.justifyCenter)
+    ugfx.string_box(148,48,148,26, anyway, "Roboto_BlackItalic24", ugfx.BLACK, ugfx.justifyCenter)
 
     #the line under the text
     str_len = ugfx.get_string_width("Hacking","PermanentMarker22")
diff --git a/esp32/modules/splash.py b/esp32/modules/splash.py
@@ -35,10 +35,18 @@ def draw(mode, goingToSleep=False):
                 info2 = 'Press select to start OTA update'
             else:
                 info2 = ''
-        l = ugfx.get_string_width(info1,"Roboto_Regular12")
-        ugfx.string(296-l, 0, info1, "Roboto_Regular12",ugfx.BLACK)
-        l = ugfx.get_string_width(info2,"Roboto_Regular12")
-        ugfx.string(296-l, 12, info2, "Roboto_Regular12",ugfx.BLACK)
+
+	def disp_string_right(y, s):
+	    l = ugfx.get_string_width(s,"Roboto_Regular12")
+	    ugfx.string(296-l, y, s, "Roboto_Regular12",ugfx.BLACK)
+
+	disp_string_right(0, info1)
+	disp_string_right(12, info2)
+
+	if badge.safe_mode():
+	    disp_string_right(92, "Safe Mode - services disabled")
+	    disp_string_right(104, "Sleep disabled - will drain battery quickly")
+	    disp_string_right(116, "Press Reset button to exit")
         
         easydraw.nickname()
         
@@ -156,7 +164,8 @@ def onSleep(idleTime):
 if not easywifi.failure():
     spoc.show(False)    # Check sponsors
 
-services.setup(draw) # Start services
+if not badge.safe_mode():
+    services.setup(draw) # Start services
 
 draw(False)
 services.force_draw()
diff --git a/esp32/modules/tasks/powermanagement.py b/esp32/modules/tasks/powermanagement.py
@@ -18,7 +18,7 @@ def pm_task():
     idleTime = virtualtimers.idle_time()
     print("[Power management] Next task wants to run in "+str(idleTime)+" ms.")
         
-    if idleTime>30000:
+    if idleTime>30000 and not badge.safe_mode():
         global onSleepCallback
         if not onSleepCallback==None:
             print("[Power management] Running onSleepCallback...")

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ void mp_task(void *pvParameter) {`
`102`	`102`	`// run boot-up scripts`
`103`	`103`	`pyexec_frozen_module("_boot.py");`
`104`	`104`	`if (pyexec_mode_kind != PYEXEC_MODE_RAW_REPL) {`
`105`		`- pyexec_file("boot.py");`
	`105`	`+ pyexec_frozen_module("boot.py");`
`106`	`106`	`}`
`107`	`107`	`// if (pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL) {`
`108`	`108`	`// pyexec_file("main.py");`