Fix shasum path #1793
Fix shasum path #1793
Conversation
Signed-off-by: Dmitrii Kovalkov <kovalkov.dmitriy@gmail.com>
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #1793 +/- ##
======================================
Coverage 32% 32%
======================================
Files 45 45
Lines 2609 2609
Branches 337 337
======================================
Hits 859 859
Misses 1750 1750
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
src/electron/routing_service.ts
Outdated
| @@ -323,7 +323,7 @@ async function installLinuxRoutingServices(): Promise<void> { | |||
| command += | |||
| ' && ' + | |||
| installationFileDescriptors | |||
| .map(({filename, sha256}) => `/usr/bin/echo "${sha256} ${path.join(tmp, filename)}" | /usr/bin/shasum -a 256 -c`) | |||
| .map(({filename, sha256}) => `/usr/bin/echo "${sha256} ${path.join(tmp, filename)}" | $(which shasum) -a 256 -c`) | |||
There was a problem hiding this comment.
We can't use the path because it opens up a security vulnerability, that's why we use absolute paths to read-only files.
One alternative would be to check a few absolute paths instead.
Signed-off-by: Dmitrii Kovalkov <kovalkov.dmitriy@gmail.com>
|
Moved to absolute paths, check it, please |
| @@ -323,7 +323,7 @@ async function installLinuxRoutingServices(): Promise<void> { | |||
| command += | |||
| ' && ' + | |||
| installationFileDescriptors | |||
| .map(({filename, sha256}) => `/usr/bin/echo "${sha256} ${path.join(tmp, filename)}" | /usr/bin/shasum -a 256 -c`) | |||
| .map(({filename, sha256}) => `/usr/bin/echo "${sha256} ${path.join(tmp, filename)}" | (/usr/bin/shasum -a 256 -c || /usr/bin/core_perl/shasum -a 256 -c)`) | |||
There was a problem hiding this comment.
This is not really the logic we want. If the first command fails for whatever reason (e.g. fingerpring fails) we don't want to run the second command. And we don't want to try to run the first command if it doesn't exist. It's a lot cleaner and easier to reason about if you check the existence of the files before running them.
This also needs to be tested to make sure it works on Ubuntu/Debian, which is our only supported Linux.
/cc @jyyi1 to review
There was a problem hiding this comment.
Agreed, I'd rather test which shasum (either /usr/bin/shasum or /usr/bin/core_perl/shasum) exists before running the command, and only append the correct full shasum path to the command:
shasumCmd = findShasum() // this function returns `/usr/bin/shasum` or `/usr/bin/core_perl/shasum` depending on which one exists
command +=
' && ' +
installationFileDescriptors
.map(({filename, sha256}) => `/usr/bin/echo "${sha256} ${path.join(tmp, filename)}" | ${shasumCmd} -a 256 -c`)
On different systems
shasumhave different path, like this/usr/bin/shasumor/usr/bin/core_perl/shasumand etc