validate the number of log params match

the number of %'s in the format string
kaltura · Jan 29, 2017 · 5b3db6b · 5b3db6b
1 parent d4a804f
commit 5b3db6b
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 5 deletions.
diff --git a/ngx_http_vod_request_parse.c b/ngx_http_vod_request_parse.c
@@ -932,7 +932,7 @@ ngx_http_vod_parse_uri_path(
 	if (rc != NGX_OK)
 	{
 		ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-			"ngx_http_vod_parse_uri_path: ngx_http_vod_parse_multi_uri failed", rc);
+			"ngx_http_vod_parse_uri_path: ngx_http_vod_parse_multi_uri failed %i", rc);
 		return rc;
 	}
 
@@ -994,15 +994,15 @@ ngx_http_vod_parse_uri_path(
 		if (rc != NGX_OK)
 		{
 			ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-				"ngx_http_vod_parse_uri_path: ngx_http_vod_merge_string_parts failed", rc);
+				"ngx_http_vod_parse_uri_path: ngx_http_vod_merge_string_parts failed %i", rc);
 			return rc;
 		}
 
 		rc = ngx_http_vod_extract_uri_params(r, params_hash, &cur_uri, cur_sequence, &clip_id, cur_source, &cur_clip);
 		if (rc != NGX_OK)
 		{
 			ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-				"ngx_http_vod_parse_uri_path: ngx_http_vod_extract_uri_params failed", rc);
+				"ngx_http_vod_parse_uri_path: ngx_http_vod_extract_uri_params failed %i", rc);
 			return rc;
 		}
 

diff --git a/test/test_coverage.py b/test/test_coverage.py
@@ -2,6 +2,34 @@
 import re
 import os
 
+def countArgs(argsSpec):
+    result = 0
+    parentCount = 0
+    for curCh in argsSpec:
+        if curCh == '(':
+            parentCount += 1
+        elif curCh == ')':
+            parentCount -= 1
+        elif curCh == ',' and parentCount == 0:
+            result += 1
+    return result
+
+def validateLogParams(fileName, fileData):
+    logBlock = None
+    for curLine in fileData.split('\n'):
+        if re.match('^\s*(?:ngx|vod)_log_(?:debug|error)', curLine):
+            logBlock = ''
+        if logBlock == None:
+            continue
+        logBlock += curLine.strip()
+        if logBlock.count('(') > logBlock.count(')'):
+            continue
+        logMessage = logBlock[logBlock.find('"'):logBlock.rfind('"')]
+        args = logBlock[logBlock.rfind('"'):]
+        if countArgs(args) != logMessage.count('%') + logMessage.count('%*'):
+            print logBlock
+        logBlock = None
+
 if len(sys.argv) < 2:
     print 'Usage:\n\t%s <nginx-vod code root> [<error log file>]' % os.path.basename(__file__)
     sys.exit(1)
@@ -18,9 +46,9 @@
         if os.path.splitext(name)[1] != '.c':
             continue
         fileData = file(os.path.join(root, name), 'rb').read()
+        validateLogParams(name, fileData)
         for curLog in re.findall('(?:ngx|vod)_log_(?:debug|error)[^\(]*\([^\)]+\)', fileData):
             logMessage = curLog.split(',')[3].strip()
-
             if logMessage.endswith('")'):
                 logMessage = logMessage[:-1]
             if logMessage.endswith('"'):

diff --git a/vod/mp4/mp4_parser.c b/vod/mp4/mp4_parser.c
@@ -329,7 +329,7 @@ mp4_parser_parse_elst_atom(atom_info_t* atom_info, metadata_parse_context_t* con
 	if (entries > 2)
 	{
 		vod_log_error(VOD_LOG_ERR, context->request_context->log, 0,
-			"mp4_parser_parse_elst_atom: unsupported edit - atom has %uD entries");
+			"mp4_parser_parse_elst_atom: unsupported edit - atom has %uD entries", entries);
 	}
 
 	if (atom->version[0] == 1)