nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

manman-sync: fix first sync

Browse Source
This commit is contained in:
Maciej Krüger 2022-04-13 18:41:28 +02:00 committed by Alexander List
parent e7c4ee890b
commit 50ceec1a4a
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
package/gluon-manman-sync/luasrc/usr/bin/manman-sync
View File

@ -126,6 +126,8 @@ local function shuffle(tbl)
end end
local function fetch_signed_json(remote, url) local function fetch_signed_json(remote, url)
print('GET ' .. url)
local code, res, result = fetch.request_raw(remote .. url) local code, res, result = fetch.request_raw(remote .. url)
if code < 1 then if code < 1 then
@ -148,7 +150,7 @@ local function fetch_signed_json(remote, url)
-- this is a hack to fish it out, it is irrelevant on unaffected reverse proxies -- this is a hack to fish it out, it is irrelevant on unaffected reverse proxies
local j_start = result:find('{') local j_start = result:find('{')
local j_end = (result:reverse()):find("}") local j_end = (result:reverse()):find("}")
result = string.sub(result, j_start, 1 - j_end) result = string.sub(result, j_start, (1 - j_end) > 0 and (1 - j_end) or nil)
local sig = res.headers['x-ecdsa'] local sig = res.headers['x-ecdsa']
local ts = res.headers['x-ecdsa-ts'] local ts = res.headers['x-ecdsa-ts']
@ -225,6 +227,9 @@ local function do_manman_sync()
printf('E: location %s is invalid (404)', location) printf('E: location %s is invalid (404)', location)
return 2 return 2
end end
uci:set('gluon-manman-sync', 'sync', 'location_id', resp.id)
location_id = resp.id
end end
local err, location = fetch_signed_json(working_remote, '/location/show/' .. location_id) local err, location = fetch_signed_json(working_remote, '/location/show/' .. location_id)
@ -402,7 +407,7 @@ local function show_info()
uci:get('gluon-manman-sync', 'sync', 'location') or '[none]', uci:get('gluon-manman-sync', 'sync', 'location') or '[none]',
uci:get('gluon-manman-sync', 'sync', 'location_id') or '[will autodetect]' uci:get('gluon-manman-sync', 'sync', 'location_id') or '[will autodetect]'
), ),
d = string.format('%s (id %s)', node = string.format('%s (id %s)',
uci:get('gluon-manman-sync', 'sync', 'node') or '[none - use only available or error]', uci:get('gluon-manman-sync', 'sync', 'node') or '[none - use only available or error]',
uci:get('gluon-manman-sync', 'sync', 'node_id') or '[will autodetect]' uci:get('gluon-manman-sync', 'sync', 'node_id') or '[will autodetect]'
), ),