Selaa lähdekoodia

mod_auth_token: Remove broken path.join

j8
Sam Whited 9 vuotta sitten
vanhempi
commit
f2e369cfc0
1 muutettua tiedostoa jossa 4 lisäystä ja 3 poistoa
  1. 4
    3
      prosody-plugins/mod_auth_token.lua

+ 4
- 3
prosody-plugins/mod_auth_token.lua Näytä tiedosto

9
 local json = require 'cjson'
9
 local json = require 'cjson'
10
 json.encode_empty_table('array')
10
 json.encode_empty_table('array')
11
 local new_sasl = require "util.sasl".new;
11
 local new_sasl = require "util.sasl".new;
12
-local path = require "util.paths";
13
 local sasl = require "util.sasl";
12
 local sasl = require "util.sasl";
14
 local timer = require "util.timer";
13
 local timer = require "util.timer";
15
 local token_util = module:require "token/util";
14
 local token_util = module:require "token/util";
97
 			content, code = content_, code_;
96
 			content, code = content_, code_;
98
 			done();
97
 			done();
99
 		end
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
 			headers = http_headers or {},
101
 			headers = http_headers or {},
102
 			method = "GET"
102
 			method = "GET"
103
 		}, cb);
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
 		timer.add_task(http_timeout, function() http.destroy_request(request); done(); end);
106
 		timer.add_task(http_timeout, function() http.destroy_request(request); done(); end);
106
 		wait();
107
 		wait();
107
 
108
 

Loading…
Peruuta
Tallenna