|
@@ -9,7 +9,6 @@ local http = require "net.http";
|
9
|
9
|
local json = require 'cjson'
|
10
|
10
|
json.encode_empty_table('array')
|
11
|
11
|
local new_sasl = require "util.sasl".new;
|
12
|
|
-local path = require "util.paths";
|
13
|
12
|
local sasl = require "util.sasl";
|
14
|
13
|
local timer = require "util.timer";
|
15
|
14
|
local token_util = module:require "token/util";
|
|
@@ -97,11 +96,13 @@ function get_public_key(keyId)
|
97
|
96
|
content, code = content_, code_;
|
98
|
97
|
done();
|
99
|
98
|
end
|
100
|
|
- local request = http.request(path.join(asapKeyServer, keyId), {
|
|
99
|
+ module:log("debug", "Fetching public key from: "..asapKeyServer..keyId);
|
|
100
|
+ local request = http.request(asapKeyServer..keyId, {
|
101
|
101
|
headers = http_headers or {},
|
102
|
102
|
method = "GET"
|
103
|
103
|
}, cb);
|
104
|
|
- -- TODO: Is the done() call racey?
|
|
104
|
+ -- TODO: Is the done() call racey? Can we cancel this if the request
|
|
105
|
+ -- succeedes?
|
105
|
106
|
timer.add_task(http_timeout, function() http.destroy_request(request); done(); end);
|
106
|
107
|
wait();
|
107
|
108
|
|