mirror of
https://github.com/balena-io/etcher.git
synced 2025-07-23 19:26:33 +00:00
Use sudo instead of sudo-prompt on macOS >= Catalina
Change-type: patch
This commit is contained in:
parent
64a28f891f
commit
9b82891abb
23
lib/shared/catalina-sudo/sudo-askpass.osascript.js
Executable file
23
lib/shared/catalina-sudo/sudo-askpass.osascript.js
Executable file
@ -0,0 +1,23 @@
|
||||
#!/usr/bin/env osascript -l JavaScript
|
||||
|
||||
/* eslint-disable */
|
||||
|
||||
ObjC.import('stdlib')
|
||||
|
||||
const app = Application.currentApplication()
|
||||
app.includeStandardAdditions = true
|
||||
|
||||
const result = app.displayDialog('balenaEtcher wants to make changes. Type your password to allow this.', {
|
||||
defaultAnswer: '',
|
||||
withIcon: 'stop',
|
||||
buttons: ['Cancel', 'Ok'],
|
||||
defaultButton: 'Ok',
|
||||
hiddenAnswer: true,
|
||||
})
|
||||
|
||||
if (result.buttonReturned === 'Ok') {
|
||||
result.textReturned
|
||||
} else {
|
||||
$.exit(255)
|
||||
}
|
||||
|
42
lib/shared/catalina-sudo/sudo.js
Normal file
42
lib/shared/catalina-sudo/sudo.js
Normal file
@ -0,0 +1,42 @@
|
||||
'use strict'
|
||||
|
||||
const { execFile } = require('child_process')
|
||||
const { env } = require('process')
|
||||
const { join } = require('path')
|
||||
const { promisify } = require('util')
|
||||
|
||||
const execFileAsync = promisify(execFile)
|
||||
|
||||
const SUCCESSFUL_AUTH_MARKER = 'AUTHENTICATION SUCCEEDED'
|
||||
const EXPECTED_SUCCESSFUL_AUTH_MARKER = `${SUCCESSFUL_AUTH_MARKER}\n`
|
||||
|
||||
exports.sudo = async (command) => {
|
||||
try {
|
||||
const { stdout, stderr } = await execFileAsync(
|
||||
'sudo',
|
||||
[ '--askpass', 'sh', '-c', `echo ${SUCCESSFUL_AUTH_MARKER} && ${command}` ],
|
||||
{
|
||||
encoding: 'utf8',
|
||||
env: {
|
||||
PATH: env.PATH,
|
||||
SUDO_ASKPASS: join(__dirname, 'sudo-askpass.osascript.js')
|
||||
}
|
||||
}
|
||||
)
|
||||
return {
|
||||
cancelled: false,
|
||||
stdout: stdout.slice(EXPECTED_SUCCESSFUL_AUTH_MARKER.length),
|
||||
stderr
|
||||
}
|
||||
} catch (error) {
|
||||
/* eslint-disable-next-line no-magic-numbers */
|
||||
if (error.code === 1) {
|
||||
/* eslint-disable-next-line lodash/prefer-lodash-method */
|
||||
if (!error.stdout.startsWith(EXPECTED_SUCCESSFUL_AUTH_MARKER)) {
|
||||
return { cancelled: true }
|
||||
}
|
||||
error.stdout = error.stdout.slice(EXPECTED_SUCCESSFUL_AUTH_MARKER.length)
|
||||
}
|
||||
throw error
|
||||
}
|
||||
}
|
@ -23,12 +23,14 @@ const childProcess = Bluebird.promisifyAll(require('child_process'))
|
||||
const fs = require('fs')
|
||||
const _ = require('lodash')
|
||||
const os = require('os')
|
||||
const semver = require('semver')
|
||||
const sudoPrompt = Bluebird.promisifyAll(require('sudo-prompt'))
|
||||
const { promisify } = require('util')
|
||||
|
||||
const errors = require('./errors')
|
||||
|
||||
const { tmpFileDisposer } = require('./utils')
|
||||
const { sudo: catalinaSudo } = require('./catalina-sudo/sudo')
|
||||
|
||||
const writeFileAsync = promisify(fs.writeFile)
|
||||
|
||||
@ -154,6 +156,16 @@ const elevateScriptUnix = async (path, name) => {
|
||||
return { cancelled: false }
|
||||
}
|
||||
|
||||
const elevateScriptCatalina = async (path) => {
|
||||
const cmd = [ 'sh', escapeSh(path) ].join(' ')
|
||||
try {
|
||||
const { cancelled } = await catalinaSudo(cmd)
|
||||
return { cancelled }
|
||||
} catch (error) {
|
||||
return errors.createError({ title: error.stderr })
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @summary Elevate a command
|
||||
* @function
|
||||
@ -190,6 +202,10 @@ exports.elevateCommand = async (command, options) => {
|
||||
if (isWindows) {
|
||||
return elevateScriptWindows(path)
|
||||
}
|
||||
if (os.platform() === 'darwin' && semver.compare(os.release(), '19.0.0') >= 0) {
|
||||
// >= macOS Catalina
|
||||
return elevateScriptCatalina(path)
|
||||
}
|
||||
try {
|
||||
return await elevateScriptUnix(path, options.applicationName)
|
||||
} catch (error) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user