Fix Tails distro recognition inside Relay Program.

maqp · Mar 27, 2024 · cf7e1bd · cf7e1bd
1 parent e684c5e
commit cf7e1bd
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 20 deletions.
diff --git a/install.sh b/install.sh
@@ -263,11 +263,11 @@ function verify_files {
     compare_digest a66eaecb01207399564c965daca09e8e0db9eb5f2f10183491e5e8954a88993d023403835f027a7ea7434dde5adc42e49ad1eeb961ac60842ff6c884153b2293 src/common/ exceptions.py
     compare_digest b541d68a54ef1e2b59c935e18344d8f0f9d3f4353b15f5cc705ebeab9eb0f81f1e96ac01b1a20dd82149fba556c53a4f09e92dc153f39a23b71782cf0e6b9a4e src/common/ gateway.py
     compare_digest 7d78931c42aae3f02daa89bd51c8832b38e9eb0b2833a8970704083cfba9dda039d4ff60ac169490542edd187c485f86ee8609baa79feef710db68b14da5dd2b src/common/ input.py
-    compare_digest 6b5e9afc5fc598900102cd6b90096799228f7e3e41884fc829dca5c78da902392e1fadeb2d0b37d7081d39afeb4ee9d22059bbb6624485268b736950834bd630 src/common/ misc.py
+    compare_digest e1444a7eb65ef16fb7e490348b3e3d033e22539f099f804d8a93553395061bb65d59ae346f18ef567ae60c858f29ae8058f69a2813bbebd75c2d7bd624397ca0 src/common/ misc.py
     compare_digest 50985070c73cc5055504e3d228ecfa923a6b0ab0ea155f1ae308531f65a23d28d48141f19446e58c031c65b0c6122b42b3a907c297c8fb21e4ccfe3b0615ddbe src/common/ output.py
     compare_digest 6cc10e84c9b4fdfd0f8beee6c18e565231f98ad4ddfc7a6e3f96228aa1dbee15e32feab7fdbdb66402b60efc7579b32732fe23d1313caba201b181a28d06a120 src/common/ path.py
     compare_digest 0cf08cbd61b1be94142414c03f6931df7c06ff944f150855bb52b13abd8f1dd29506be041cd4b77eb83a2c4617702b4dbad3e9a5097256c36b1d444f20ccb4da src/common/ reed_solomon.py
-    compare_digest 9ef30831e51cfa772cda5f882eefac27bd2c3248a5b5e1677df287711d72300079ff1347fe65c6b88d8b4820edfb7df66f7bf5614da8a9679afb1c0547b6823b src/common/ statics.py
+    compare_digest f499b661369e5b41310f23e9c921db37e886ea5b151b727a87c15e27f0d614ca2cab8adb28836992caf009880e54e2d46b367503543d815be115b6703934f45b src/common/ statics.py
     compare_digest 66fe7fad5ad3e363fba36ed7c7177e97d17cb7fdecf0f303a9015cffafbd523c8d02393cfd297dc5e463bddf62e13daf21c19d9614a0814170f524616b81ff29 src/common/ word_list.py
 
     compare_digest dec1f3561e4345dcb7741b6ac26ec29e4bcd1b0ba421864c35c9c23ab989bc7b70cb3af46d820af65f405d390998ca0e762090d9165ded3cc1200365ccb8b902 src/receiver/ __init__.py

diff --git a/install.sh.asc b/install.sh.asc
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQIzBAABCgAdFiEEbab1Q2VetFRTHbYIAsu63k/6kOYFAmYEdFAACgkQAsu63k/6
-kOZkMw/9GMaWmLGcOtvY4SLC4NPvXBXCdqOIwGiQ69aDraEwSsxzu0xb0DbAn+NJ
-LapA49WYlvM7snIUmV6of85FzhQ/TjEmn2I3GmNKebPvtZLaBe3qMCilC7Zd07j8
-8T44PhFGVolETiz0txAop/6PfH4oqB6hHAkbh4hmHZg19cEjlf1kz3uDNHktO+JE
-ZpaYttRw4yvHUyRFQAAga3js4bTjg4oYafuJjx0bfejolRhRDY596sc/GhVx1PMq
-mbEypp/Sc+hmf6wow0e3yDD1YqyYAUkQZNOYh/L9izt9qwDJDUAxSRyNCG9skvBu
-KefAgKavH+GPZHTYr+Ncst25caP3hn9+TEzO9xcbhIBIyz58O1xImb1ovZcu60ak
-l9kVxQy6Ps9m0KUgwLReeNoHgosiW5vH9nNklzcwNXkedSHkE0IMEhiZC62F34MI
-u3DzvSL2Axm68De6sxXT6ECACApCLqo/qmLEVSMxmOlXJFchvk8FuX/cL8rrxl2P
-pSXrGbFf2FGU2a0BzxdXr3oFSo6wz8Gw6WofSj5WB4akFUj/MjCVAVTRxpjmAj4X
-9zpjSFkh19oSmvcdg36J1elwstOcXoAfc4VdZjPAe+9IuwuWgKHiza7se4kVvt5V
-z1lz08RAjfDBVDu/6t4d8RtgljNK3t6DIqXg4NQkr3UJSFlnOxI=
-=YgYu
+iQIzBAABCgAdFiEEbab1Q2VetFRTHbYIAsu63k/6kOYFAmYEeocACgkQAsu63k/6
+kObLNQ/+Ojqi1UTmGjDUX0rwuEMbbgLFEScj+irJh1PD1CPbbUw0sqTPffI+1uTB
+3dXCdeM9gcKfZDTdqfxbO84F+rWYEhLKjQWQFruyWImVbwhDPug6P/PUrx0lmL4F
+XHfMNoD9jEexwwvbnW08CEzEe5YgETkIpbmSebcaH3fxixEKM8yOcxzr2J0lsxlp
+QrkClD5eFLWtH8+u9diSQy4rq6Te/yLlhcyMZ1hj5OQaRroXr0WSOseHShzBj1ZD
+VzAVfoIAtk9uAQOswzvrZk48b5fskcOZP6+9Psghpnas7RoRbUPtt58DWFq4wveb
+cksW9/kD4pMF6k6LuzPbkocjijkVaNanRQ876Z0fbBACssS3U5unTdhqgqPhqi2p
+NkUNlgTyioS75VRNPNqVLXAY1ap05PtnnJhRbhFY2suO0OU8oQVZQx0rWrQHfJXE
+s7ayCG0fqA4EvA5lvCKH/mPE9gT62JnchxiqCxG4vsvmelt5buZdyYtlOmyReC87
+1NpBBNKIP1PvKtZ0P/pU4GSudwnRrfJpiEDFcE6G72xcmsM0t0qy3HAOAREOOVAa
+V4EqNWm76123BsL/22sLMB2bYT62aMfPDzYoyXjtDO3MB0JMZ5Ky0uerE9qd1kGt
+cB5m65ooE5I//RQYNaAim7FMsFAvm8CAaHReKCz51EfM9QgCaa8=
+=ozdM
 -----END PGP SIGNATURE-----
diff --git a/src/common/misc.py b/src/common/misc.py
@@ -266,9 +266,7 @@ def monitor_processes(process_list:       List[Process],
                     sys.exit(0)
 
                 if command == WIPE:
-                    with open('/etc/os-release') as f:
-                        data = f.read()
-                    if TAILS not in data:
+                    if not platform_is_tails():
                         shred_databases(software_operation)
                     power_off_system()
 
@@ -277,7 +275,7 @@ def platform_is_tails() -> bool:
     """Return True if Relay Program is running on Tails."""
     with open('/etc/os-release') as f:
         data = f.read()
-    return 'TAILS_PRODUCT_NAME="Tails"' in data
+    return TAILS in data
 
 
 def power_off_system() -> None:

diff --git a/src/common/statics.py b/src/common/statics.py
@@ -41,7 +41,7 @@
 TX            = 'tx'
 RX            = 'rx'
 NC            = 'nc'
-TAILS         = 'TAILS_PRODUCT_NAME="Tails"'
+TAILS         = 'NAME="Tails"'
 
 
 """Window identifiers"""