Updating blocklist functionality

Scoop.js

@@ -147,7 +147,7 @@ export class Scoop {
    *   osName: ?string,
    *   osVersion: ?string,
    *   cpuArchitecture: ?string,
-   *   blockedRequests: Array.<{url: string, ip: string, rule: string}>,
+   *   blockedRequests: Array.<{match: string, rule: string}>,
    *   noArchiveUrls: string[],
    *   certificates: Array.<{host: string, pem: string}>,
    *   ytDlpHash: string,

assets/templates/provenance-summary.njk

@@ -134,16 +134,14 @@
         <table>
           <thead>
             <tr>
-              <th>URL</th>
-              <th>IP</th>
+              <th>Match</th>
               <th>Blocklist Rule</th>
             </tr>
           </thead>
           <tbody>
             {% for block in blockedRequests %}
             <tr>
-              <td>{{ block.url }}</td>
-              <td>{{ block.ip }}</td>
+              <td>{{ block.match }}</td>
               <td>{{ block.rule }}</td>
             </tr>
             {% endfor %}

intercepters/ScoopProxy.js

@@ -58,17 +58,19 @@ export class ScoopProxy extends ScoopIntercepter {
   }
 
   onRequest (request) {
-    if (this.recordExchanges && !this.urlFoundInBlocklist(request)) {
-      const exchange = new ScoopProxyExchange({ requestParsed: request })
-      this.exchanges.push(exchange)
+    const url = request.url.startsWith('/')
+      ? `https://${request.headers.host}${request.url}`
+      : request.url
+    if (this.recordExchanges && !this.foundInBlocklist(url, request)) {
+      this.exchanges.push(new ScoopProxyExchange({ requestParsed: request }))
       this.cacheBody(request)
     }
   }
 
   onResponse (response, request) {
     // there will not be an exchange with this request if we're, for instance, not recording
     const exchange = this.exchanges.find(ex => ex.requestParsed === request)
-    if (exchange && !this.ipFoundInBlocklist(request)) {
+    if (exchange && !this.foundInBlocklist(response.socket.remoteAddress, request)) {
       exchange.responseParsed = response
       response.on('end', () => this.checkExchangeForNoArchive(exchange))
       this.cacheBody(response)
@@ -97,57 +99,24 @@ export class ScoopProxy extends ScoopIntercepter {
    * @param {ScoopProxyExchange} exchange
    * @returns {boolean} - `true` if request was interrupted
    */
-  urlFoundInBlocklist (request) {
-    return false
-    const url = request.url.startsWith('/')
-      ? `https://${request.headers.host}${request.url}`
-      : request.url
-
+  foundInBlocklist (toMatch, request) {
     // Search for a blocklist match:
     // Use the index to pull the original un-parsed rule from options so that the printing matches user expectations
-    const ruleIndex = this.capture.blocklist.findIndex(searchBlocklistFor(url))
+    const ruleIndex = this.capture.blocklist.findIndex(searchBlocklistFor(toMatch))
 
     if (ruleIndex === -1) {
       return false
     }
 
     const rule = this.capture.options.blocklist[ruleIndex]
-    this.capture.log.warn(`Blocking ${url} matching rule ${rule}`)
-    this.capture.provenanceInfo.blockedRequests.push({ url, rule })
+    this.capture.log.warn(`Blocking ${toMatch} matching rule ${rule}`)
+    this.capture.provenanceInfo.blockedRequests.push({ match: toMatch, rule })
 
     request.socket.destroy()
 
     return true
   }
 
-  /**
-   * Checks an outgoing request against the blocklist. Interrupts the request it needed.
-   * Keeps trace of blocked requests in `Scoop.provenanceInfo`.
-   *
-   * @param {ScoopProxyExchange} exchange
-   * @returns {boolean} - `true` if request was interrupted
-   */
-  ipFoundInBlocklist (response) {
-    return false
-    const ip = response.socket.remoteAddress
-
-    // Search for a blocklist match:
-    // Use the index to pull the original un-parsed rule from options so that the printing matches user expectations
-    const ruleIndex = this.capture.blocklist.findIndex(searchBlocklistFor(ip))
-
-    if (ruleIndex === -1) {
-      return false
-    }
-
-    const rule = this.capture.options.blocklist[ruleIndex]
-    this.capture.log.warn(`Blocking IP ${ip} matching rule ${rule}`)
-    this.capture.provenanceInfo.blockedRequests.push({ ip, rule })
-
-    response.socket.destroy()
-
-    return true
-  }
-
   requestTransformer (request) {
     return new Transform({
       transform: (chunk, _encoding, callback) => {