[abp2blocklist] Map $websocket and $webrtc to raw

[mjethani]

Background

Content blocker rules in Safari also apply to WebSocket requests. In the future if and when Safari supports RTCPeerConnection, they will very likely apply to those requests as well. Right now abp2blocklist ignores these types of filters, but it should just map them to the raw type instead, just the way it's doing with XMLHttpRequest.

What to change

Edit filterClasses.js to add WEBSOCKET (128) and WEBRTC (256) to RegExpFilter.typeMap.

In lib/abp2blocklist.js, add WEBSOCKET and WEBRTC to whitelistableRequestTypes. In the getRequestTypes function, map WEBSOCKET and WEBRTC to raw.

In the convertFilterAddRules function, generate rules based on the following criteria:

1. If the filter contains $websocket, generate a rule with the raw type and the wss?:// URL scheme
2. If the filter contains $webrtc, generate two rules with the raw type and the stuns?: and turns?: URL schemes
3. If the filter contains $xmlhttprequest, generate a rule with the raw type and the https?:// URL scheme
4. However, if the filter contains all three of $websocket, $webrtc, and at least one other option that would map to the raw type (e.g. $xmlhttprequest), ignore 1-3 and instead generate a single rule with the raw type and the [^:]+:(//)? URL scheme
5. If the filter contains any other types, add the types to the rule if it covers the https?:// URL scheme already, otherwise generate an additional rule with those types

Handle special cases like filters beginning with http://.

Add unit tests.

[abpbot]

A commit referencing this issue has landed:
​Issue 5283 - Add support for $websocket and $webrtc

[mjethani]

I'm reopening this because we forgot to deal with other raw types like $ping

[abpbot]

A commit referencing this issue has landed:
​Issue 5283 - Combine other raw types with WebSocket and WebRTC when possible