ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-04-25 13:29:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

If a device is already provisioned but the key exchange fails, retry it until it succeeds

Browse Source 
Change-Type: patch
Signed-off-by: Pablo Carranza Velez <pablo@resin.io>
This commit is contained in:
Pablo Carranza Velez 2017-10-24 14:27:18 -07:00
parent b809e2aa02
commit c532344dce
1 changed files with 38 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/bootstrap.coffee
View File

@ -179,6 +179,42 @@ hasDeviceApiKeySupport = (osVersion) ->
console.error('Unable to determine if device has deviceApiKey support', err, err.stack) console.error('Unable to determine if device has deviceApiKey support', err, err.stack)
false false
exchangeKeyAndUpdateConfig = ->
# Only do a key exchange and delete the provisioning key if we're on a Resin OS version
# that supports using the deviceApiKey (2.0.2 and above)
# or if we're in a non-Resin OS (which is assumed to be updated enough).
# Otherwise VPN and other host services that use an API key will break.
#
# In other cases, we make the apiKey equal the deviceApiKey instead.
osRelease.getOSVersion(config.hostOSVersionPath)
.then (osVersion) ->
hasSupport = hasDeviceApiKeySupport(osVersion)
if hasSupport or userConfig.apiKey != userConfig.deviceApiKey
console.log('Attempting key exchange')
exchangeKey()
.then ->
console.log('Key exchange succeeded, starting to use deviceApiKey')
if hasSupport
delete userConfig.apiKey
else
userConfig.apiKey = userConfig.deviceApiKey
utils.setConfig('deviceApiKey', userConfig.deviceApiKey)
.then ->
utils.setConfig('apiKey', userConfig.deviceApiKey)
.then ->
writeAndSyncFile(configPath, JSON.stringify(userConfig))
exchangeKeyOrRetry = do ->
_failedExchanges = 0
return ->
exchangeKeyAndUpdateConfig()
.catch (err) ->
console.error('Error exchanging API key, will retry', err, err.stack)
delay = Math.min((2 ** _failedExchanges) * config.bootstrapRetryDelay, 24 * 60 * 60 * 1000)
_failedExchanges += 1
setTimeout(exchangeKeyOrRetry, delay)
return
bootstrapper.done = new Promise (resolve) -> bootstrapper.done = new Promise (resolve) ->
bootstrapper.doneBootstrapping = -> bootstrapper.doneBootstrapping = ->
bootstrapper.bootstrapped = true bootstrapper.bootstrapped = true
@ -186,31 +222,8 @@ bootstrapper.done = new Promise (resolve) ->
# If we're still using an old api key we can try to exchange it for a valid device key # If we're still using an old api key we can try to exchange it for a valid device key
# This will only be the case when the supervisor/OS has been updated. # This will only be the case when the supervisor/OS has been updated.
if userConfig.apiKey? if userConfig.apiKey?
# Only do a key exchange and delete the provisioning key if we're on a Resin OS version exchangeKeyOrRetry()
# that supports using the deviceApiKey (2.0.2 and above) return
# or if we're in a non-Resin OS (which is assumed to be updated enough).
# Otherwise VPN and other host services that use an API key will break.
#
# In other cases, we make the apiKey equal the deviceApiKey instead.
osRelease.getOSVersion(config.hostOSVersionPath)
.then (osVersion) ->
hasSupport = hasDeviceApiKeySupport(osVersion)
if hasSupport or userConfig.apiKey != userConfig.deviceApiKey
console.log('Attempting key exchange')
exchangeKey()
.then ->
console.log('Key exchange succeeded, starting to use deviceApiKey')
if hasSupport
delete userConfig.apiKey
else
userConfig.apiKey = userConfig.deviceApiKey
utils.setConfig('deviceApiKey', userConfig.deviceApiKey)
.then ->
utils.setConfig('apiKey', userConfig.deviceApiKey)
.then ->
writeAndSyncFile(configPath, JSON.stringify(userConfig))
# We return immediately, and eventually the API key will be exchanged and replaced.
return
bootstrapper.bootstrapped = false bootstrapper.bootstrapped = false
bootstrapper.startBootstrapping = -> bootstrapper.startBootstrapping = ->