Pull request #11: feature: AG-4603 convert 1p,3p options

Merge in ADGUARD-IOS/safari-converter from feature/AG-4603 to master

* commit '4910d61ac8fe5f91e20bd0c39241588dcac2ff5a':
  feature: AG-4603 convert 1p,3p options

Author: Mizzick

Sources/ContentBlockerConverter/Rules/RuleConverter.swift

@@ -287,12 +287,16 @@ class RuleConverter {
     private static let ALL_OPTION = "all";
     private static let POPUP_OPTION = "popup";
     private static let DOCUMENT_OPTION = "document";
+    private static let UBO_1P_OPTION = "1p";
+    private static let UBO_3P_OPTION = "3p";
 
     private static let conversionMap : [String:String] = [
         EMPTY_OPTION : "redirect=nooptext",
         MP4_OPTION : "redirect=noopmp4-1s",
         INLINE_SCRIPT_OPTION : CSP_OPTION + "=script-src 'self' 'unsafe-eval' http: https: data: blob: mediastream: filesystem:",
-        INLINE_FONT_OPTION : CSP_OPTION + "=font-src 'self' 'unsafe-eval' http: https: data: blob: mediastream: filesystem:"
+        INLINE_FONT_OPTION : CSP_OPTION + "=font-src 'self' 'unsafe-eval' http: https: data: blob: mediastream: filesystem:",
+        UBO_1P_OPTION: "first-party",
+        UBO_3P_OPTION: "third-party"
     ]
 
     private func convertOptions(rule: NSString) -> [NSString]? {

Tests/ContentBlockerConverterTests/Rules/RuleConverterTests.swift

@@ -130,6 +130,28 @@ final class RuleConverterTests: XCTestCase {
         XCTAssertEqual(res, [exp]);
     }
 
+    func testUboThirdPartyModifiers() {
+        var exp = "||video.example.org^$third-party,match-case"  as NSString;
+        var res = ruleConverter.convertRule(rule: "||video.example.org^$3p,match-case" as NSString);
+        XCTAssertEqual(res, [exp]);
+        
+        exp = "||video.example.org^$match-case,third-party";
+        res = ruleConverter.convertRule(rule: "||video.example.org^$match-case,3p" as NSString);
+        XCTAssertEqual(res, [exp]);
+        
+        exp = "||video.example.org^$first-party";
+        res = ruleConverter.convertRule(rule: "||video.example.org^$1p" as NSString);
+        XCTAssertEqual(res, [exp]);
+        
+        exp = "||video.example.org^$first-party";
+        res = ruleConverter.convertRule(rule: "||video.example.org^$first-party" as NSString);
+        XCTAssertEqual(res, [exp]);
+        
+        exp = "||video.example.org^$match-case,third-party,redirect=noopmp4-1s,media";
+        res = ruleConverter.convertRule(rule: "||video.example.org^$match-case,3p,mp4" as NSString);
+        XCTAssertEqual(res, [exp]);
+    }
+    
     func testConvertUboScriptTags() {
         var exp = "example.com##^script:some-another-rule(test)" as NSString;
         var res = ruleConverter.convertRule(rule: "example.com##^script:some-another-rule(test)" as NSString);
@@ -237,6 +259,7 @@ final class RuleConverterTests: XCTestCase {
         ("testConvertCssAGRules", testConvertCssAGRules),
         ("testEmptyAndMp4Modifiers", testEmptyAndMp4Modifiers),
         ("testMp4AndMediaModifiers", testMp4AndMediaModifiers),
+        ("testUboThirdPartyModifiers", testUboThirdPartyModifiers),
         ("testConvertUboScriptTags", testConvertUboScriptTags),
         ("testInlineScriptModifier", testInlineScriptModifier),
         ("testInlineFontModifier", testInlineFontModifier),