From 4c81734310f84db5aafda606209d32205e2b3934 Mon Sep 17 00:00:00 2001
From: Esad Cetiner <104706115+EsadCetiner@users.noreply.github.com>
Date: Thu, 14 Mar 2024 23:02:14 +1100
Subject: [PATCH] fix: improve accuracy of tests (#16)

---
 .../9519101.yaml                              |  52 +---
 .../9519103.yaml                              |  12 +-
 .../9519104.yaml                              |  12 +-
 .../9519113.yaml                              |   4 +-
 .../9519114.yaml                              | 227 +++---------------
 .../9519130.yaml                              |  52 +---
 .../9519150.yaml                              |  16 +-
 .../9519152.yaml                              |  40 +--
 .../9519153.yaml                              |  65 ++++-
 .../9519156.yaml                              |  54 +----
 10 files changed, 145 insertions(+), 389 deletions(-)

diff --git a/tests/regression/roundcube-rule-exclusions-plugin/9519101.yaml b/tests/regression/roundcube-rule-exclusions-plugin/9519101.yaml
index 82757cb..ec9a645 100644
--- a/tests/regression/roundcube-rule-exclusions-plugin/9519101.yaml
+++ b/tests/regression/roundcube-rule-exclusions-plugin/9519101.yaml
@@ -6,7 +6,7 @@ meta:
   name: 9519101.yaml
 tests:
   - test_title: 9519101-1
-    desc: Disable CRS for password login
+    desc: Logging into roundcube
     stages:
       - stage:
           input:
@@ -15,53 +15,11 @@ tests:
               Host: localhost
               User-Agent: Roundcube rule exclusions plugin
               Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
+              Content-Type: application/x-www-form-urlencoded
             port: 80
             method: POST
-            uri: /post?_task=login&_pass=<script>
+            uri: /post?_task=login
+            data: |
+              _token=randomtoken&_task=login&_action=login&_timezone=Australia%2FSydney&_url=empty&_user=emptypostmaster%40example.com&_pass=empty%3Cscript%3E
           output:
             no_log_contains: id "941110"
-  - test_title: 9519101-2
-    desc: Disable 921180 for ARGS_NAMES:_task when logging in
-    stages:
-      - stage:
-          input:
-            dest_addr: 127.0.0.1
-            headers:
-              Host: localhost
-              User-Agent: Roundcube rule exclusions plugin
-              Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
-            port: 80
-            method: POST
-            uri: /post?_task=login&_task=login
-          output:
-            no_log_contains: id "921180"
-  - test_title: 9519101-3
-    desc: Disable 921180 for ARGS_NAMES:_framed when logging in
-    stages:
-      - stage:
-          input:
-            dest_addr: 127.0.0.1
-            headers:
-              Host: localhost
-              User-Agent: Roundcube rule exclusions plugin
-              Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
-            port: 80
-            method: POST
-            uri: /post?_task=login&_framed=1&_framed=1
-          output:
-            no_log_contains: id "921180"
-  - test_title: 9519101-4
-    desc: Disable 921180 for ARGS_NAMES:_action when logging in
-    stages:
-      - stage:
-          input:
-            dest_addr: 127.0.0.1
-            headers:
-              Host: localhost
-              User-Agent: Roundcube rule exclusions plugin
-              Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
-            port: 80
-            method: POST
-            uri: /post?_task=login&_action=1&_action=1
-          output:
-            no_log_contains: id "921180"
diff --git a/tests/regression/roundcube-rule-exclusions-plugin/9519103.yaml b/tests/regression/roundcube-rule-exclusions-plugin/9519103.yaml
index 4c8d005..34b6661 100644
--- a/tests/regression/roundcube-rule-exclusions-plugin/9519103.yaml
+++ b/tests/regression/roundcube-rule-exclusions-plugin/9519103.yaml
@@ -6,7 +6,7 @@ meta:
   name: 9519103.yaml
 tests:
   - test_title: 9519103-1
-    desc: Disable 932236 for _task when set to mail"
+    desc: Viewing mailbox"
     stages:
       - stage:
           input:
@@ -16,12 +16,12 @@ tests:
               User-Agent: Roundcube rule exclusions plugin
               Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
             port: 80
-            method: POST
-            uri: /post?_task=mail
+            method: get
+            uri: /get?_task=mail&_mbox=INBOX
           output:
             no_log_contains: id "932236"
   - test_title: 9519103-2
-    desc: Disable 932236 for _task when set to settings"
+    desc: Viewing settings"
     stages:
       - stage:
           input:
@@ -31,7 +31,7 @@ tests:
               User-Agent: Roundcube rule exclusions plugin
               Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
             port: 80
-            method: POST
-            uri: /post?_task=settings
+            method: get
+            uri: /get?_task=settings&_action=preferences
           output:
             no_log_contains: id "932236"
diff --git a/tests/regression/roundcube-rule-exclusions-plugin/9519104.yaml b/tests/regression/roundcube-rule-exclusions-plugin/9519104.yaml
index 2324347..9b9d4b8 100644
--- a/tests/regression/roundcube-rule-exclusions-plugin/9519104.yaml
+++ b/tests/regression/roundcube-rule-exclusions-plugin/9519104.yaml
@@ -6,7 +6,7 @@ meta:
   name: 9519104.yaml
 tests:
   - test_title: 9519104-1
-    desc: Disable 932236 for _token parameter, but only within a certain character range
+    desc: Disable 932236 for _token parameter
     stages:
       - stage:
           input:
@@ -17,11 +17,13 @@ tests:
               Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
             port: 80
             method: POST
-            uri: /post?_token=dfdf
+            uri: /post
+            data: |
+              _token=lsrandom&_task=login&_action=login&_timezone=Australia%2FSydney&_url=empty&_user=postmaster%40example.com&_pass=%3Cscript%3E
           output:
             no_log_contains: id "932236"
   - test_title: 9519104-2
-    desc: Disable 942450 for _token parameter, but only within a certain character range
+    desc: Disable 942450 for _token parameter
     stages:
       - stage:
           input:
@@ -32,6 +34,8 @@ tests:
               Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
             port: 80
             method: POST
-            uri: /post?_token=0x800
+            uri: /post
+            data: |
+              _token=0x0800random&_task=login&_action=login&_timezone=Australia%2FSydney&_url=empty&_user=postmaster%40example.com&_pass=%3Cscript%3E
           output:
             no_log_contains: id "942450"
diff --git a/tests/regression/roundcube-rule-exclusions-plugin/9519113.yaml b/tests/regression/roundcube-rule-exclusions-plugin/9519113.yaml
index d32e316..82ce3f6 100644
--- a/tests/regression/roundcube-rule-exclusions-plugin/9519113.yaml
+++ b/tests/regression/roundcube-rule-exclusions-plugin/9519113.yaml
@@ -16,7 +16,7 @@ tests:
               User-Agent: Roundcube rule exclusions plugin
               Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
             port: 80
-            method: POST
-            uri: /post?_task=mail&_framed=1&_framed=1
+            method: GET
+            uri: /get?_task=mail&_framed=1&_uid=42&_mbox=INBOX&_framed=1&_action=headers
           output:
             no_log_contains: id "921180"
diff --git a/tests/regression/roundcube-rule-exclusions-plugin/9519114.yaml b/tests/regression/roundcube-rule-exclusions-plugin/9519114.yaml
index a98522a..f638e44 100644
--- a/tests/regression/roundcube-rule-exclusions-plugin/9519114.yaml
+++ b/tests/regression/roundcube-rule-exclusions-plugin/9519114.yaml
@@ -6,7 +6,7 @@ meta:
   name: 9519114.yaml
 tests:
   - test_title: 9519114-1
-    desc: Disable 921180 for ARGS_NAMES:_id sending an email
+    desc: Sending an email
     stages:
       - stage:
           input:
@@ -15,203 +15,34 @@ tests:
               Host: localhost
               User-Agent: Roundcube rule exclusions plugin
               Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
+              Content-Type: application/x-www-form-urlencoded
             port: 80
             method: POST
-            uri: /post?_task=mail&_action=send&_id=1&_id=2
+            uri: /post?_task=mail&_unlock=loading1709858237830&_framed=1
+            data: |
+              _token=random
+              _task=mail
+              _action=send
+              _id=106014434365ea5da745fb3
+              _attachments=empty
+              _from=1
+              _to=postmaster@example.com,
+              _cc=empty
+              _bcc=empty
+              _replyto=empty
+              _followupto=empty
+              _subject=<script>
+              _draft_saveid=empty
+              _draft=empty
+              _is_html=0
+              _framed=1
+              _message=<script>
+              editorSelector=plain
+              _mdn=empty
+              _dsn=empty
+              _keepformatting=empty
+              _priority=0
+              _store_target=Sent
           output:
-            no_log_contains: id "921180"
-  - test_title: 9519114-2
-    desc: Disable 921180 for ARGS_NAMES:_id composing an email
-    stages:
-      - stage:
-          input:
-            dest_addr: 127.0.0.1
-            headers:
-              Host: localhost
-              User-Agent: Roundcube rule exclusions plugin
-              Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
-            port: 80
-            method: POST
-            uri: /post?_task=mail&_action=compose&_id=1&_id=2
-          output:
-            no_log_contains: id "921180"
-  - test_title: 9519114-3
-    desc: Disable 921180 for ARGS_NAMES:_framed sending an email
-    stages:
-      - stage:
-          input:
-            dest_addr: 127.0.0.1
-            headers:
-              Host: localhost
-              User-Agent: Roundcube rule exclusions plugin
-              Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
-            port: 80
-            method: POST
-            uri: /post?_task=mail&_action=send&_framed=1&_framed=2
-          output:
-            no_log_contains: id "921180"
-  - test_title: 9519114-4
-    desc: Disable 921180 for ARGS_NAMES:_framed composing an email
-    stages:
-      - stage:
-          input:
-            dest_addr: 127.0.0.1
-            headers:
-              Host: localhost
-              User-Agent: Roundcube rule exclusions plugin
-              Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
-            port: 80
-            method: POST
-            uri: /post?_task=mail&_action=compose&_framed=1&_framed=2
-          output:
-            no_log_contains: id "921180"
-  - test_title: 9519114-5
-    desc: Disable 921180 for ARGS_NAMES:_task sending an email
-    stages:
-      - stage:
-          input:
-            dest_addr: 127.0.0.1
-            headers:
-              Host: localhost
-              User-Agent: Roundcube rule exclusions plugin
-              Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
-            port: 80
-            method: POST
-            uri: /post?_task=mail&_action=send&_task=mail
-          output:
-            no_log_contains: id "921180"
-  - test_title: 9519114-6
-    desc: Disable 921180 for ARGS_NAMES:_task composing an email
-    stages:
-      - stage:
-          input:
-            dest_addr: 127.0.0.1
-            headers:
-              Host: localhost
-              User-Agent: Roundcube rule exclusions plugin
-              Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
-            port: 80
-            method: POST
-            uri: /post?_task=mail&_action=compose&_task=mail
-          output:
-            no_log_contains: id "921180"
-  - test_title: 9519114-7
-    desc: Disable 921180 for ARGS_NAMES:_action sending an email
-    stages:
-      - stage:
-          input:
-            dest_addr: 127.0.0.1
-            headers:
-              Host: localhost
-              User-Agent: Roundcube rule exclusions plugin
-              Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
-            port: 80
-            method: POST
-            uri: /post?_task=mail&_action=send&_action=send
-          output:
-            no_log_contains: id "921180"
-  - test_title: 9519114-8
-    desc: Disable 921180 for ARGS_NAMES:_action composing an email
-    stages:
-      - stage:
-          input:
-            dest_addr: 127.0.0.1
-            headers:
-              Host: localhost
-              User-Agent: Roundcube rule exclusions plugin
-              Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
-            port: 80
-            method: POST
-            uri: /post?_task=mail&_action=compose&_action=compose
-          output:
-            no_log_contains: id "921180"
-  - test_title: 9519114-9
-    desc: Disable 942131 for destination email address when composing email
-    stages:
-      - stage:
-          input:
-            dest_addr: 127.0.0.1
-            headers:
-              Host: localhost
-              User-Agent: Roundcube rule exclusions plugin
-              Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
-            port: 80
-            method: POST
-            uri: /post?_task=mail&_action=compose&_to=Postmaster%20<postmaster@example.com>,
-          output:
-            no_log_contains: id "942131"
-  - test_title: 9519114-10
-    desc: Disable 942131 for destination email address when sending email
-    stages:
-      - stage:
-          input:
-            dest_addr: 127.0.0.1
-            headers:
-              Host: localhost
-              User-Agent: Roundcube rule exclusions plugin
-              Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
-            port: 80
-            method: POST
-            uri: /post?_task=mail&_action=send&_to=Postmaster%20<postmaster@example.com>,
-          output:
-            no_log_contains: id "942131"
-  - test_title: 9519114-11
-    desc: Disable CRS for email subject sending an email
-    stages:
-      - stage:
-          input:
-            dest_addr: 127.0.0.1
-            headers:
-              Host: localhost
-              User-Agent: Roundcube rule exclusions plugin
-              Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
-            port: 80
-            method: POST
-            uri: /post?_task=mail&_action=send&_action=send&_subject=<script>
-          output:
-            no_log_contains: id "941101"
-  - test_title: 9519114-12
-    desc: Disable CRS for email subject composing an email
-    stages:
-      - stage:
-          input:
-            dest_addr: 127.0.0.1
-            headers:
-              Host: localhost
-              User-Agent: Roundcube rule exclusions plugin
-              Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
-            port: 80
-            method: POST
-            uri: /post?_task=mail&_action=compose&_action=compose&_subject=<script>
-          output:
-            no_log_contains: id "941101"
-  - test_title: 9519114-13
-    desc: Disable CRS for email message sending an email
-    stages:
-      - stage:
-          input:
-            dest_addr: 127.0.0.1
-            headers:
-              Host: localhost
-              User-Agent: Roundcube rule exclusions plugin
-              Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
-            port: 80
-            method: POST
-            uri: /post?_task=mail&_action=send&_action=send&_message=<script>
-          output:
-            no_log_contains: id "941101"
-  - test_title: 9519114-14
-    desc: Disable CRS for email message composing an email
-    stages:
-      - stage:
-          input:
-            dest_addr: 127.0.0.1
-            headers:
-              Host: localhost
-              User-Agent: Roundcube rule exclusions plugin
-              Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
-            port: 80
-            method: POST
-            uri: /post?_task=mail&_action=compose&_action=compose&_message=<script>
-          output:
-            no_log_contains: id "941101"
+            no_log_contains: |
+              id "(?:921180|941101|942131)"
diff --git a/tests/regression/roundcube-rule-exclusions-plugin/9519130.yaml b/tests/regression/roundcube-rule-exclusions-plugin/9519130.yaml
index 90bc85f..fd2126d 100644
--- a/tests/regression/roundcube-rule-exclusions-plugin/9519130.yaml
+++ b/tests/regression/roundcube-rule-exclusions-plugin/9519130.yaml
@@ -6,7 +6,7 @@ meta:
   name: 9519130.yaml
 tests:
   - test_title: 9519130-1
-    desc: Disable 931130 for ARGS:_website[] when creating/modifying a contact
+    desc: Creating/modifying a contact
     stages:
       - stage:
           input:
@@ -15,53 +15,11 @@ tests:
               Host: localhost
               User-Agent: Roundcube rule exclusions plugin
               Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
+              Content-Type: application/x-www-form-urlencoded
             port: 80
             method: POST
-            uri: /post?_task=addressbook&_website[]=https://example.com/
+            uri: /post?_task=addressbook&_framed=1&_orig_source=0
+            data: |
+              _token=random&_framed=1&_photo=-del-&_task=addressbook&_action=save&_framed=1&_source=0&_gid=0&_search=test&_cid=1test&_prefix=test&_firstname=Test&_middlename=test&_surname=Test&_suffix=test&_name=test&_nickname=test&_organization=test&_department=test&_jobtitle=test&_subtype_email[]=home&_email[]=test&_subtype_phone[]=home&_phone[]=test&_subtype_address[]=home&_street[]=test&_locality[]=test&_zipcode[]=test&_country[]=test&_region[]=test&_subtype_website[]=homepage&_website[]=https://example.com/&_subtype_im[]=aim&_im[]=https://example.com/&_gender=test&_birthday=test&_notes=test
           output:
             no_log_contains: id "931130"
-  - test_title: 9519130-2
-    desc: Disable 931130 for ARGS:_im[] when creating/modifying a contact
-    stages:
-      - stage:
-          input:
-            dest_addr: 127.0.0.1
-            headers:
-              Host: localhost
-              User-Agent: Roundcube rule exclusions plugin
-              Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
-            port: 80
-            method: POST
-            uri: /post?_task=addressbook&_im[]=https://example.com/
-          output:
-            no_log_contains: id "931130"
-  - test_title: 9519130-3
-    desc: Disable 921180 for ARGS_NAMES:_framed, but only when viewing addressbook
-    stages:
-      - stage:
-          input:
-            dest_addr: 127.0.0.1
-            headers:
-              Host: localhost
-              User-Agent: Roundcube rule exclusions plugin
-              Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
-            port: 80
-            method: POST
-            uri: /post?_task=addressbook&_framed=1&_framed=2
-          output:
-            no_log_contains: id "921180"
-  - test_title: 9519130-4
-    desc: Disable 921180 for ARGS_NAMES:_task, but only when viewing addressbook
-    stages:
-      - stage:
-          input:
-            dest_addr: 127.0.0.1
-            headers:
-              Host: localhost
-              User-Agent: Roundcube rule exclusions plugin
-              Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
-            port: 80
-            method: POST
-            uri: /post?_task=addressbook&_task=addressbook
-          output:
-            no_log_contains: id "921180"
diff --git a/tests/regression/roundcube-rule-exclusions-plugin/9519150.yaml b/tests/regression/roundcube-rule-exclusions-plugin/9519150.yaml
index ccc8be9..4df8249 100644
--- a/tests/regression/roundcube-rule-exclusions-plugin/9519150.yaml
+++ b/tests/regression/roundcube-rule-exclusions-plugin/9519150.yaml
@@ -15,8 +15,22 @@ tests:
               Host: localhost
               User-Agent: Roundcube rule exclusions plugin
               Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
+              Content-Type: application/x-www-form-urlencoded
             port: 80
             method: POST
-            uri: /post?_signature=<script>
+            uri: /post
+            data: |
+              _token=0DSmgBEDZh6R8fLjXZGc1zRAta36J5mx
+              _framed=1
+              _task=settings
+              _action=save-identity
+              _iid=1
+              _name=test
+              _email=postmaster@example.com
+              _organization=empty
+              _reply-to=empty
+              _bcc=empty
+              _standard=1
+              _signature=<script>
           output:
             no_log_contains: id "941101"
diff --git a/tests/regression/roundcube-rule-exclusions-plugin/9519152.yaml b/tests/regression/roundcube-rule-exclusions-plugin/9519152.yaml
index a6ad965..26eca07 100644
--- a/tests/regression/roundcube-rule-exclusions-plugin/9519152.yaml
+++ b/tests/regression/roundcube-rule-exclusions-plugin/9519152.yaml
@@ -6,7 +6,7 @@ meta:
   name: 9519152.yaml
 tests:
   - test_title: 9519152-1
-    desc: Disable CRS for current password prompt
+    desc: Changing Passwords
     stages:
       - stage:
           input:
@@ -15,38 +15,14 @@ tests:
               Host: localhost
               User-Agent: Roundcube rule exclusions plugin
               Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
+              Content-Type: application/x-www-form-urlencoded
             port: 80
             method: POST
-            uri: /post?_task=settings&_action=plugin.password-save&_curpasswd=<script>
-          output:
-            no_log_contains: id "941101"
-  - test_title: 9519152-2
-    desc: Disable CRS for new password prompt
-    stages:
-      - stage:
-          input:
-            dest_addr: 127.0.0.1
-            headers:
-              Host: localhost
-              User-Agent: Roundcube rule exclusions plugin
-              Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
-            port: 80
-            method: POST
-            uri: /post?_task=settings&_action=plugin.password-save&_newpasswd=<script>
-          output:
-            no_log_contains: id "941101"
-  - test_title: 9519152-3
-    desc: Disable CRS for confirm new password prompt
-    stages:
-      - stage:
-          input:
-            dest_addr: 127.0.0.1
-            headers:
-              Host: localhost
-              User-Agent: Roundcube rule exclusions plugin
-              Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
-            port: 80
-            method: POST
-            uri: /post?_task=settings&_action=plugin.password-save&_confpasswd=<script>
+            uri: /post?_task=settings&_action=plugin.password-save
+            data: |
+              _token=random
+              _curpasswd=<script>
+              _newpasswd=<script>
+              _confpasswd=<script>
           output:
             no_log_contains: id "941101"
diff --git a/tests/regression/roundcube-rule-exclusions-plugin/9519153.yaml b/tests/regression/roundcube-rule-exclusions-plugin/9519153.yaml
index 14a5871..f4b67a3 100644
--- a/tests/regression/roundcube-rule-exclusions-plugin/9519153.yaml
+++ b/tests/regression/roundcube-rule-exclusions-plugin/9519153.yaml
@@ -6,7 +6,7 @@ meta:
   name: 9519153.yaml
 tests:
   - test_title: 9519153-1
-    desc: Disable CRS for editing raw filter sets
+    desc: Editing raw filter sets
     stages:
       - stage:
           input:
@@ -15,13 +15,16 @@ tests:
               Host: localhost
               User-Agent: Roundcube rule exclusions plsugin
               Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
+              Content-Type: application/x-www-form-urlencoded; charset=UTF-8
             port: 80
             method: POST
-            uri: /post?rawsetcontent=<script>
+            uri: /post?_task=settings&_action=plugin.managesieve-action
+            data: |
+              _act=list&_set=managesieve&_remote=1&_unlock=loading1710411392771
           output:
             no_log_contains: id "941101"
   - test_title: 9519153-2
-    desc: Disable CRS for sieve filter sets
+    desc: Creating sieve filter sets
     stages:
       - stage:
           input:
@@ -30,8 +33,62 @@ tests:
               Host: localhost
               User-Agent: Roundcube rule exclusions plsugin
               Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
+              Content-Type: application/x-www-form-urlencoded
             port: 80
             method: POST
-            uri: /post?_rule_target[0][]=<script>
+            uri: /post
+            data: |
+              _token=randomtoken
+              _task=settings
+              _action=plugin.managesieve-save
+              _framed=1
+              _fid=test
+              _name=test
+              _enabled=1
+              _join=allof
+              _header%5B0%5D=subject
+              _custom_header%5B0%5D%5B%5D=test
+              _custom_var%5B0%5D%5B%5D=test
+              _rule_date_part%5B0%5D=date
+              _rule_message%5B0%5D=duplicate
+              _rule_op%5B0%5D=contains
+              _rule_target%5B0%5D%5B%5D=%3Cscript%3E
+              _rule_size_op%5B0%5D=over
+              _rule_size_target%5B0%5D=test
+              _rule_size_item%5B0%5D=test
+              _rule_spamtest_op%5B0%5D=test
+              _rule_spamtest_target%5B0%5D=1
+              _rule_mod%5B0%5D=test
+              _rule_mod_type%5B0%5D=all
+              _rule_comp%5B0%5D=test
+              _rule_mime_part%5B0%5D=test
+              _rule_mime_type%5B0%5D=test
+              _rule_mime_param%5B0%5D%5B%5D=test
+              _rule_trans%5B0%5D=text
+              _rule_trans_type%5B0%5D=test
+              _rule_date_header%5B0%5D=test
+              _rule_index%5B0%5D=test
+              _rule_duplicate_handle%5B0%5D=test
+              _rule_duplicate_header%5B0%5D=test
+              _rule_duplicate_uniqueid%5B0%5D=test
+              _rule_duplicate_seconds%5B0%5D=test
+              _action_type%5B0%5D=fileinto
+              _action_target%5B0%5D=test
+              _action_target_area%5B0%5D=test
+              _action_reason%5B0%5D=test
+              _action_subject%5B0%5D=test
+              _action_from%5B0%5D=test
+              _action_addresses%5B0%5D%5B%5D=test
+              _action_interval%5B0%5D=1
+              _action_flags%5B0%5D%5B%5D=test
+              _action_varname%5B0%5D=test
+              _action_varvalue%5B0%5D=test
+              _action_notifymethod%5B0%5D=mailto
+              _action_notifytarget%5B0%5D=test
+              _action_notifymessage%5B0%5D=test
+              _action_notifyfrom%5B0%5D=test
+              _action_notifyimportance%5B0%5D=2
+              _action_notifyoption%5B0%5D%5B%5D=test
+              _action_mailbox%5B0%5D=INBOX
           output:
             no_log_contains: id "941101"
diff --git a/tests/regression/roundcube-rule-exclusions-plugin/9519156.yaml b/tests/regression/roundcube-rule-exclusions-plugin/9519156.yaml
index 034d3a6..f8f654a 100644
--- a/tests/regression/roundcube-rule-exclusions-plugin/9519156.yaml
+++ b/tests/regression/roundcube-rule-exclusions-plugin/9519156.yaml
@@ -6,7 +6,7 @@ meta:
   name: 9519156.yaml
 tests:
   - test_title: 9519156-1
-    desc: Disable 921180 for ARGS_NAMES:_action when managing out of office
+    desc: Configuring out of office messages
     stages:
       - stage:
           input:
@@ -17,51 +17,9 @@ tests:
               Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
             port: 80
             method: POST
-            uri: /post?_task=settings&_action=plugin.managesieve-vacation&_action=plugin.managesieve-vacation
+            uri: /post?_task=settings&_action=plugin.managesieve-vacation
+            data: |
+              _token=randomtoken&_task=settings&_action=plugin.managesieve-vacation&vacation_subject=%3Cscript%3E&vacation_reason=%3Cscript%3E%0D%0AI+am+not+home&vacation_datefrom=14%2F03%2F2024&vacation_timefrom=&vacation_dateto=15%2F03%2F2024&vacation_timeto=&vacation_status=on&vacation_from=postmaster%40example.com&vacation_addresses%5B%5D=postmaster%40example.com&vacation_interval=1&vacation_action=keep&action_target=&_remote=1&_unlock=loading1710410586795
           output:
-            no_log_contains: id "921180"
-  - test_title: 9519156-2
-    desc: Disable 921180 for ARGS_NAMES:_task when managing out of office
-    stages:
-      - stage:
-          input:
-            dest_addr: 127.0.0.1
-            headers:
-              Host: localhost
-              User-Agent: Roundcube rule exclusions plsugin
-              Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
-            port: 80
-            method: POST
-            uri: /post?_task=settings&_action=plugin.managesieve-vacation&_task=settings
-          output:
-            no_log_contains: id "921180"
-  - test_title: 9519156-3
-    desc: Disable CRS for vaccation subject
-    stages:
-      - stage:
-          input:
-            dest_addr: 127.0.0.1
-            headers:
-              Host: localhost
-              User-Agent: Roundcube rule exclusions plsugin
-              Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
-            port: 80
-            method: POST
-            uri: /post?_task=settings&_action=plugin.managesieve-vacation&vacation_subject=<script>
-          output:
-            no_log_contains: id "941101"
-  - test_title: 9519156-4
-    desc: Disable CRS for vaccation reason
-    stages:
-      - stage:
-          input:
-            dest_addr: 127.0.0.1
-            headers:
-              Host: localhost
-              User-Agent: Roundcube rule exclusions plsugin
-              Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
-            port: 80
-            method: POST
-            uri: /post?_task=settings&_action=plugin.managesieve-vacation&vacation_reason=<script>
-          output:
-            no_log_contains: id "941101"
+            no_log_contains: |
+              id "(?:921180|941101)"