# HG changeset patch # User Kim Alvefur # Date 1464619471 -7200 # Node ID a100f4a720cb8c220e8836c816e775ae19fb6434 # Parent 2cbd7876ba14d5067d818e60c279f203b6196545 mod_s2s_auth_monkeysphere: Query Monkeysphere asynchronously if util.async is available diff -r 2cbd7876ba14 -r a100f4a720cb mod_s2s_auth_monkeysphere/mod_s2s_auth_monkeysphere.lua --- a/mod_s2s_auth_monkeysphere/mod_s2s_auth_monkeysphere.lua Sat May 28 16:55:43 2016 +0200 +++ b/mod_s2s_auth_monkeysphere/mod_s2s_auth_monkeysphere.lua Mon May 30 16:44:31 2016 +0200 @@ -6,10 +6,25 @@ local json_encode, json_decode = json.encode, json.decode; local gettime = require"socket".gettime; local serialize = require"util.serialization".serialize; +local have_async, async = pcall(require, "util.async"); local msva_url = assert(os.getenv"MONKEYSPHERE_VALIDATION_AGENT_SOCKET", "MONKEYSPHERE_VALIDATION_AGENT_SOCKET is unset, please set it").."/reviewcert"; +if have_async then + local _http_request = require "net.http".request; + function http_request(url, ex) + local wait, done = async.waiter(); + local content, code, request, response; + _http_request(url, ex, function (_content, _code, _request, _response) + content, code, request, response = _content, _code, _request, _response; + done(); + end); + wait(); + return content, code, request, response; + end +end + local function check_with_monkeysphere(event) local session, host, cert = event.session, event.host, event.cert; local result = {};