SimpleLog extended for iframes (#1302)

core/constants.js

@@ -446,6 +446,7 @@ const LogString = {
     'MISSING_RESOURCE': 'Missing resource:',
     'EVIL_RESOURCE_BLOCKED': 'Evil resource blocked:',
     'NON_GET_REQUEST_BLOCKED': 'Non-GET-Request blocked',
+    'IFRAME': 'Possible iframe request:',
 };
 
 // Supported charsets for TextDecoder()

core/interceptor.js

@@ -31,7 +31,14 @@ var interceptor = {};
  */
 
 interceptor.handleRequest = function (requestDetails, tabIdentifier, tab) {
-    let validCandidate, targetDetails, targetDomain, isGoogleFont, isGoogleMaterialIcons, initiatorDomain, isListed;
+    let validCandidate, targetDetails, targetDomain, isGoogleFont, isGoogleMaterialIcons, initiatorDomain, isListed,
+        iframe;
+
+    iframe = '';
+    if (tab.url !== requestDetails.originUrl) {
+        console.log(`${LogString.PREFIX} ${LogString.IFRAME} ${tab.url} -> ${requestDetails.originUrl}`);
+        iframe = requestDetails.originUrl;
+    }
 
     if (requestDetails['type'] === WebRequestType.MAIN_FRAME &&
         helpers.checkAllowlisted(
@@ -57,7 +64,7 @@ interceptor.handleRequest = function (requestDetails, tabIdentifier, tab) {
     // Block POST, HEAD, PUT, DELETE, TRACE, OPTIONS
     if (BlockedRequestMethods[requestDetails.method]) {
         console.warn(`${LogString.PREFIX} ${LogString.NON_GET_REQUEST_BLOCKED}`);
-        log.append(tab.url, requestDetails.url, LogString.NON_GET_REQUEST_BLOCKED, true);
+        log.append(tab.url, requestDetails.url, LogString.NON_GET_REQUEST_BLOCKED, true, iframe);
         return {
             'cancel': true
         };
@@ -72,7 +79,7 @@ interceptor.handleRequest = function (requestDetails, tabIdentifier, tab) {
 
     if (interceptor._isBadResource(requestDetails.url)) {
         console.log(`${LogString.PREFIX} ${LogString.EVIL_RESOURCE_BLOCKED} ${requestDetails.url}`);
-        log.append(tab.url, requestDetails.url, '-', true);
+        log.append(tab.url, requestDetails.url, '-', true, iframe);
         return {
             'cancel': true
         };
@@ -105,7 +112,7 @@ interceptor.handleRequest = function (requestDetails, tabIdentifier, tab) {
     }
 
     console.log(`${LogString.PREFIX} ${LogString.REPLACED_RESOURCE} ${targetDetails.path}`);
-    log.append(tab.url, requestDetails.url, targetDetails.path, false);
+    log.append(tab.url, requestDetails.url, targetDetails.path, false, iframe);
 
     return {
         'redirectUrl': chrome.runtime.getURL(targetDetails.path + fileGuard.secret)

modules/internal/log.js

@@ -21,10 +21,10 @@
 
 var log = {};
 
-log.append = function (initiator, resource, target, highlight) {
+log.append = function (initiator, resource, target, highlight, iframe = '') {
     storageManager.type.get(Setting.LOGGING, function (items) {
         if (items.enableLogging) {
-            log.data.push({initiator, resource, target, highlight});
+            log.data.push({initiator, resource, target, highlight, iframe});
         }
     });
 };

pages/logging/logging.css

@@ -24,6 +24,7 @@ table td:first-child {
 
 td {
     padding: 2px 15px;
+    white-space: pre;
 }
 
 textarea {

pages/logging/logging.html

@@ -38,6 +38,12 @@
                 <tbody>
                 </tbody>
             </table>
+            <br>
+            <p>
+                Legend
+                <br>
+                <span>(i) = A website includes this iframe. It's possible that the request is from there.</span>
+            </p>
         </div>
     </body>
 </html>

pages/logging/logging.js

@@ -40,7 +40,7 @@ logging._generateTable = function () {
     }
 
     for (let i = data.length - 1; i >= 0; i--) {
-        let tbody, row, cell, content, redirect;
+        let tbody, row, cell, content, redirect, initiator;
 
         tbody = document.getElementById('logging-content').getElementsByTagName('tbody')[0];
         row = tbody.insertRow();
@@ -53,8 +53,14 @@ logging._generateTable = function () {
         content = document.createTextNode(i + 1);
         cell.appendChild(content);
 
+        if (Object.values(data[i])[4] === '') {
+            initiator = Object.values(data[i])[0];
+        } else {
+            initiator = `${Object.values(data[i])[0]}\n(i) ${Object.values(data[i])[4]}`;
+        }
+
         cell = row.insertCell();
-        content = document.createTextNode(Object.values(data[i])[0]);
+        content = document.createTextNode(initiator);
         cell.appendChild(content);
 
         cell = row.insertCell();

pages/updates/updates.html

@@ -53,6 +53,7 @@
                         <p>Improved</p>
                         <ul>
                             <li>Allow Fork-Awesome in Chromium (<a href="https://codeberg.org/nobody/LocalCDN/issues/1296">#1296</a>)</li>
+                            <li>SimpleLog extended for iframes (<a href="https://codeberg.org/nobody/LocalCDN/issues/1302">#1302</a>)</li>
                         </ul>
                     </div>
                     <div id="generator-section">