mawei/StarPilot
1
0
Fork 0
mirror of https://github.com/firestar5683/StarPilot.git synced 2026-11-06 20:43:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Arabesque time harden

Browse Source
This commit is contained in:
firestarsdog
2026-11-03 16:20:25 -05:00
parent e6f1ad93ee
commit 5e02c2387a
3 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openpilot/selfdrive/ui/layouts/arabesque/desktop.py
+7 -4
View File
@@ -53,12 +53,15 @@ class ArabesqueLayout(Widget):
def _sync_time(self, cancelled: Event, net_time: datetime | None = None):
try:
if net_time is None:
# shortcut: HTTP recovery time is unauthenticated, replace when an authenticated bootstrap source is available.
headers = subprocess.run(
['curl', '-fsI', '-m', '10', '-H', 'Cache-Control: no-cache', 'http://www.google.com'],
# shortcut: TLS needs a roughly correct clock. Use manual recovery if certificate validation fails.
response = subprocess.run(
['curl', '-q', '-fsI', '-m', '10', '-H', 'Cache-Control: no-cache', '-o', '/dev/null',
'-w', '%{response_code}|%header{age}|%header{date}', 'https://www.google.com/generate_204'],
stdin=subprocess.DEVNULL, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL, text=True, check=True, timeout=11,
).stdout
date = next((line.partition(':')[2].strip() for line in headers.splitlines() if line.lower().startswith('date:')), '')
status, age, date = response.split('|', 2)
if status != '204' or age not in ('', '0'):
return
net_time = parsedate_to_datetime(date)
if net_time.tzinfo is None or not MIN_DATE < net_time.astimezone(UTC).replace(tzinfo=None) < MAX_DATE or cancelled.is_set():
return
openpilot/selfdrive/ui/layouts/arabesque/tools/browser_session.py
+2
View File
@@ -1012,6 +1012,8 @@ def worker_main():
preferences = {'browser.shell.checkDefaultBrowser': False, 'browser.startup.homepage_override.mstone': 'ignore',
'browser.warnOnQuitShortcut': False,
'browser.startup.page': 3,
'browser.link.open_newwindow': 3, 'browser.link.open_newwindow.restriction': 0,
'browser.tabs.loadDivertedInBackground': False,
'browser.cache.disk.capacity': 65536, 'browser.cache.disk.smart_size.enabled': False,
'browser.download.dir': str(STATE / 'downloads'), 'browser.download.folderList': 2,
'gfx.webrender.software': True, 'layers.acceleration.disabled': True,
openpilot/selfdrive/ui/tests/test_arabesque.py
+10 -8
View File
@@ -510,7 +510,7 @@ def test_star_large_routes_shell_and_uses_confirmed_offroad(main, probe):
def test_time_sync_startup_cancellation_and_reentry(shell, monkeypatch):
thread, run = Mock(), Mock(return_value=NS(stdout='dAtE: Mon, 02 Nov 2026 18:00:00 GMT\r\n'))
thread, run = Mock(), Mock(return_value=NS(stdout='204||Mon, 02 Nov 2026 18:00:00 GMT'))
monkeypatch.setattr(desktop, 'Thread', thread)
monkeypatch.setattr(desktop.subprocess, 'run', run)
shell.show_event()
@@ -544,7 +544,8 @@ def test_time_sync_startup_cancellation_and_reentry(shell, monkeypatch):
thread.call_args.kwargs['target'](*thread.call_args.kwargs['args'])
assert run.call_count == 3
fetch, apply = run.call_args_list[-2:]
assert fetch.args[0] == ['curl', '-fsI', '-m', '10', '-H', 'Cache-Control: no-cache', 'http://www.google.com']
assert fetch.args[0] == ['curl', '-q', '-fsI', '-m', '10', '-H', 'Cache-Control: no-cache', '-o', '/dev/null',
'-w', '%{response_code}|%header{age}|%header{date}', 'https://www.google.com/generate_204']
assert fetch.kwargs['timeout'] == 11
assert apply.args[0] == ['sudo', '-n', 'date', '-u', '-s', '2026-11-02T18:00:00+00:00']
assert apply.kwargs['timeout'] == 2
@@ -554,11 +555,12 @@ def test_time_sync_startup_cancellation_and_reentry(shell, monkeypatch):
@pytest.mark.parametrize('response', [
'', 'HTTP/1.1 200 OK\r\n', 'Date: invalid\r\n',
'Date: Sat, 01 Jan 2000 00:00:00 GMT\r\n', 'Date: Tue, 01 Jan 2036 00:00:00 GMT\r\n',
'Date: Mon, 02 Nov 2026 18:00:00\r\n',
subprocess.CalledProcessError(22, ['curl'], output='Date: Mon, 02 Nov 2026 18:00:00 GMT\r\n'),
subprocess.CalledProcessError(28, ['curl'], output='Date: Mon, 02 Nov 2026 18:00:00 GMT\r\n'),
'', '204||', '204||invalid', '204||Sat, 01 Jan 2000 00:00:00 GMT', '204||Tue, 01 Jan 2036 00:00:00 GMT',
'204||Mon, 02 Nov 2026 18:00:00', '200||Fri, 02 Oct 2026 18:00:00 GMT', '302||Fri, 02 Oct 2026 18:00:00 GMT',
'204|2678400|Fri, 02 Oct 2026 18:00:00 GMT',
subprocess.CalledProcessError(22, ['curl'], output='204||Mon, 02 Nov 2026 18:00:00 GMT'),
subprocess.CalledProcessError(28, ['curl'], output='204||Mon, 02 Nov 2026 18:00:00 GMT'),
subprocess.CalledProcessError(60, ['curl']),
subprocess.TimeoutExpired(['curl'], 11), FileNotFoundError('curl'),
])
def test_failed_or_invalid_time_sync_never_sets_clock(shell, monkeypatch, response):
@@ -570,7 +572,7 @@ def test_failed_or_invalid_time_sync_never_sets_clock(shell, monkeypatch, respon
@pytest.mark.parametrize('error', [subprocess.CalledProcessError(1, ['sudo']), subprocess.TimeoutExpired(['sudo'], 2), FileNotFoundError('sudo')])
def test_time_sync_permission_or_command_failures_stay_quiet(shell, monkeypatch, error):
run = Mock(side_effect=[NS(stdout='Date: Mon, 02 Nov 2026 18:00:00 GMT\r\n'), error])
run = Mock(side_effect=[NS(stdout='204|0|Mon, 02 Nov 2026 18:00:00 GMT'), error])
monkeypatch.setattr(desktop.subprocess, 'run', run)
shell._sync_time(Event())
assert run.call_count == 2