Change JSON key "last_updated" in sdw-update-flag to "last_status_update"#433
Change JSON key "last_updated" in sdw-update-flag to "last_status_update"#433
sdw-update-flag to "last_status_update"#433Conversation
…pdate" The use of `last_updated` here is ambiguous with with the usage in the separate file `sdw-last-udpated`, which contains the time of the last successful update of the SecureDrop Workstation. The `last_updated` key in `sdw-last-updated` contains the timestamp of the last time the status itself was written to disk, regardless of success or failure.
e222458 to
8efc122
Compare
|
Personally I think |
("flag" doesn't clearly speak to the purpose of the file and
is not used in the JSON keys)
|
Per brief chat at standup, renamed the file as well; leaving in draft for now until I give it one quick run-through in Qubes. |
|
Tested in Qubes, works as expected. |
emkll
left a comment
There was a problem hiding this comment.
Diff and functional testing looks good to me.
The only issue that should be addressed before merge, IMO, should be a clean up of all the dom0 flags (see inline).
While testing this pr, I discovered an related but not related bug. If you think it makes sense to take a stab at fixing this, that would be great otherwise I will open a follow up.
The reboot_required case should be handled at this point and show the reboot button
.str:
- apply updates that require a reboot
- close app
- open app (no updates required), error is shown (because
REBOOT_REQUIREDcase is not handled, and is part of the catch-all)
dom0/sd-clean-all.sls
Outdated
| - /etc/qubes-rpc/policy/securedrop.Log | ||
| - /etc/qubes-rpc/policy/securedrop.Proxy | ||
| - /home/{{ gui_user }}/Desktop/securedrop-launcher.desktop | ||
| - /home/{{ gui_user }}/.securedrop_launcher/sdw-update-flag |
There was a problem hiding this comment.
We should at least remove the other flags as well (the current, working flags) and consider deleting the entire folder (which include the logs)
There was a problem hiding this comment.
I was wondering about that; I thought you maybe intentionally omitted the folder. But I agree, it should clean up everything.
There was a problem hiding this comment.
Done and tested. If you prefer to preserve the logs we can list individual files instead, but it would feel a bit wrong to me to leave this directory hanging around after a make clean.
I'll file a separate issue for that, thanks for the clear STR |
Change JSON key "last_updated" in `sdw-update-flag` to "last_status_update"
The use of
last_updatedhere is ambiguous with with the usage in the separate filesdw-last-udpated, which contains the time of the last successful update of the SecureDrop Workstation.The
last_updatedkey insdw-last-updatedcontains the timestamp of the last time the status itself was written to disk, regardless of success or failure.I have also renamed the file itself to
sdw-update-statusfor clarity, since that is the purpose of the file.Status
Ready for review
Testing
sdw-update-statuswhen running the updatermake cleanremoves file under old name