From 143e9c7414aa74b1995b575e1a9368818a5c1d99 Mon Sep 17 00:00:00 2001 From: gorhill Date: Thu, 19 Oct 2017 08:07:00 -0400 Subject: [PATCH] more code review re. #3140 --- src/js/traffic.js | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/js/traffic.js b/src/js/traffic.js index e9eb32ebf..5dae0f1f9 100644 --- a/src/js/traffic.js +++ b/src/js/traffic.js @@ -435,17 +435,14 @@ var onBeforeMaybeSpuriousCSPReport = function(details) { if ( data instanceof Object ) { var report = data['csp-report']; if ( report instanceof Object ) { - var blockedURI = report['blocked-uri'] || - report['blockedURI'], - sourceFile = report['source-file'] || - report['sourceFile']; + var blocked = report['blocked-uri'] || report['blockedURI'], + validBlocked = typeof blocked === 'string', + source = report['source-file'] || report['sourceFile'], + validSource = typeof source === 'string'; if ( - (typeof blockedURI === 'string' || - typeof sourceFile === 'string') && - (typeof blockedURI !== 'string' || - blockedURI.startsWith('data') === false) && - (typeof sourceFile !== 'string' || - sourceFile.startsWith('data') === false) + (validBlocked || validSource) && + (!validBlocked || !blocked.startsWith('data')) && + (!validSource || !source.startsWith('data')) ) { return; }