From e6e379762a7d4ca28b5770159cced358f28c4732 Mon Sep 17 00:00:00 2001 From: Jean Paul Galea Date: Wed, 9 Sep 2015 15:17:01 +0200 Subject: [PATCH] Fix bug. - fix fatal error when an empty sync request is sent to the server. - logging boilerplate must be initiated before we start validating the request. --- ykval-sync.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/ykval-sync.php b/ykval-sync.php index 75f2022..4a768a5 100644 --- a/ykval-sync.php +++ b/ykval-sync.php @@ -33,11 +33,6 @@ require_once 'ykval-synclib.php'; header('content-type: text/plain'); -if (empty($_SERVER['QUERY_STRING'])) -{ - sendResp(S_MISSING_PARAMETER, $myLog); -} - $ipaddr = $_SERVER['REMOTE_ADDR']; $allowed = $baseParams['__YKVAL_ALLOWED_SYNC_POOL__']; @@ -46,6 +41,10 @@ $myLog->addField('ip', $ipaddr); $myLog->log(LOG_INFO, 'Request: ' . $_SERVER['QUERY_STRING']); $myLog->log(LOG_DEBUG, "Received request from $ipaddr"); +if (empty($_SERVER['QUERY_STRING'])) +{ + sendResp(S_MISSING_PARAMETER, $myLog); +} // verify request sent by whitelisted address if (in_array($ipaddr, $allowed, TRUE) === FALSE)