From 70ced7841ea78b244f047591a800ef677037eb32 Mon Sep 17 00:00:00 2001
From: spawntty <42645225+spawntty@users.noreply.github.com>
Date: Wed, 7 May 2025 10:58:26 +0200
Subject: [PATCH] www/caddy: Add Request Matcher option to Access List (#4680)

* www/caddy: Add Request Matcher option to Access List

* www/caddy: Bump model version
---
 .../OPNsense/Caddy/forms/dialogAccessList.xml          |  7 +++++++
 .../opnsense/mvc/app/models/OPNsense/Caddy/Caddy.xml   | 10 +++++++++-
 .../service/templates/OPNsense/Caddy/Caddyfile         |  2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/www/caddy/src/opnsense/mvc/app/controllers/OPNsense/Caddy/forms/dialogAccessList.xml b/www/caddy/src/opnsense/mvc/app/controllers/OPNsense/Caddy/forms/dialogAccessList.xml
index 774ebd997..3f3339198 100644
--- a/www/caddy/src/opnsense/mvc/app/controllers/OPNsense/Caddy/forms/dialogAccessList.xml
+++ b/www/caddy/src/opnsense/mvc/app/controllers/OPNsense/Caddy/forms/dialogAccessList.xml
@@ -44,6 +44,13 @@
             <visible>false</visible>
         </grid_view>
     </field>
+    <field>
+        <id>accesslist.RequestMatcher</id>
+        <label>Request Matcher</label>
+        <type>dropdown</type>
+        <help><![CDATA[Set the request matcher that will be applied to this access list.]]></help>
+        <advanced>true</advanced>
+    </field>
     <field>
         <id>accesslist.description</id>
         <label>Description</label>
diff --git a/www/caddy/src/opnsense/mvc/app/models/OPNsense/Caddy/Caddy.xml b/www/caddy/src/opnsense/mvc/app/models/OPNsense/Caddy/Caddy.xml
index 493bbf765..3e1fdc217 100644
--- a/www/caddy/src/opnsense/mvc/app/models/OPNsense/Caddy/Caddy.xml
+++ b/www/caddy/src/opnsense/mvc/app/models/OPNsense/Caddy/Caddy.xml
@@ -1,7 +1,7 @@
 <model>
     <mount>//Pischem/caddy</mount>
     <description>Caddy Reverse Proxy</description>
-    <version>1.3.5</version>
+    <version>1.3.6</version>
     <items>
         <general>
             <enabled type="BooleanField">
@@ -530,6 +530,14 @@
                     <ValidationMessage>Please enter a valid HTTP response code between 100 and 599</ValidationMessage>
                 </HttpResponseCode>
                 <HttpResponseMessage type="DescriptionField"/>
+                <RequestMatcher type="OptionField">
+                    <Required>Y</Required>
+                    <Default>client_ip</Default>
+                    <OptionValues>
+                        <client_ip>client_ip</client_ip>
+                        <remote_ip>remote_ip</remote_ip>
+                    </OptionValues>
+                </RequestMatcher>
                 <description type="DescriptionField"/>
             </accesslist>
             <basicauth type="ArrayField">
diff --git a/www/caddy/src/opnsense/service/templates/OPNsense/Caddy/Caddyfile b/www/caddy/src/opnsense/service/templates/OPNsense/Caddy/Caddyfile
index fa96c74d4..8e027500b 100644
--- a/www/caddy/src/opnsense/service/templates/OPNsense/Caddy/Caddyfile
+++ b/www/caddy/src/opnsense/service/templates/OPNsense/Caddy/Caddyfile
@@ -524,7 +524,7 @@ http://{{ domain }} {
             {% set client_ips = accesslist_obj.clientIps.split(',') | join(' ') %}
             {{ unique_identifier }} {
                 {# Non-inverted access lists have "not" as default, inverted ones '' #}
-                {{ 'not' if accesslist_obj.accesslistInvert|default("0") == "0" else '' }} client_ip {{ client_ips }}
+                {{ 'not' if accesslist_obj.accesslistInvert|default("0") == "0" else '' }} {{ accesslist_obj.RequestMatcher }} {{ client_ips }}
             }
             {# When IP is matched, abort or send response code. This will end processing and drop the request #}
             handle {{ unique_identifier }} {