diff --git a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml index 17d19969a..fb4a4b8e0 100644 --- a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml +++ b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml @@ -1825,134 +1825,134 @@ Y - hdr_beg – specified HTTP Header starts with - hdr_end – specified HTTP Header ends with - hdr – specified HTTP Header matches - hdr_reg – specified HTTP Header regex - hdr_sub – specified HTTP Header contains - hdr_beg – HTTP Host Header starts with - hdr_end – HTTP Host Header ends with - hdr – HTTP Host Header matches - hdr_reg – HTTP Host Header regex - hdr_sub – HTTP Host Header contains - http_auth – HTTP Basic Auth: username/password from client matches selected User/Group - http_method – HTTP Method - nbsrv – Minimum number of usable servers in backend - path_beg – Path starts with - path_dir – Path contains subdir - path_end – Path ends with - path – Path matches - path_reg – Path regex - path_sub – Path contains string - quic_enabled – QUIC transport protocol is enabled - req.proto_http – Traffic is HTTP - req.ssl_ver – Traffic is SSL (TCP request content inspection) - sc_bytes_in_rate – Sticky counter: incoming bytes rate - sc_bytes_out_rate – Sticky counter: outgoing bytes rate - sc_clr_gpc – Sticky counter: clear General Purpose Counter - sc_clr_gpc0 – Sticky counter: clear General Purpose Counter - sc_clr_gpc1 – Sticky counter: clear General Purpose Counter - sc0_clr_gpc0 – Sticky counter: clear General Purpose Counter - sc0_clr_gpc1 – Sticky counter: clear General Purpose Counter - sc1_clr_gpc – Sticky counter: clear General Purpose Counter - sc1_clr_gpc0 – Sticky counter: clear General Purpose Counter - sc1_clr_gpc1 – Sticky counter: clear General Purpose Counter - sc2_clr_gpc – Sticky counter: clear General Purpose Counter - sc2_clr_gpc0 – Sticky counter: clear General Purpose Counter - sc2_clr_gpc1 – Sticky counter: clear General Purpose Counter - sc_conn_cnt – Sticky counter: cumulative number of connections - sc_conn_cur – Sticky counter: concurrent connections - sc_conn_rate – Sticky counter: connection rate - sc_get_gpc – Sticky counter: get General Purpose Counter value - sc_get_gpc0 – Sticky counter: get General Purpose Counter value - sc_get_gpc1 – Sticky counter: get General Purpose Counter value - sc0_get_gpc0 – Sticky counter: get General Purpose Counter value - sc0_get_gpc1 – Sticky counter: get General Purpose Counter value - sc1_get_gpc0 – Sticky counter: get General Purpose Counter value - sc1_get_gpc1 – Sticky counter: get General Purpose Counter value - sc2_get_gpc0 – Sticky counter: get General Purpose Counter value - sc2_get_gpc1 – Sticky counter: get General Purpose Counter value - sc_get_gpt – Sticky counter: get General Purpose Tag value - sc_get_gpt0 – Sticky counter: get General Purpose Tag value - sc0_get_gpt0 – Sticky counter: get General Purpose Tag value - sc1_get_gpt0 – Sticky counter: get General Purpose Tag value - sc2_get_gpt0 – Sticky counter: get General Purpose Tag value - sc_glitch_cnt – Sticky counter: cumulative number of glitches - sc_glitch_rate – Sticky counter: rate of glitches - sc_gpc_rate – Sticky counter: increment rate of General Purpose Counter - sc_gpc0_rate – Sticky counter: increment rate of General Purpose Counter - sc_gpc1_rate – Sticky counter: increment rate of General Purpose Counter - sc0_gpc0_rate – Sticky counter: increment rate of General Purpose Counter - sc0_gpc1_rate – Sticky counter: increment rate of General Purpose Counter - sc1_gpc0_rate – Sticky counter: increment rate of General Purpose Counter - sc1_gpc1_rate – Sticky counter: increment rate of General Purpose Counter - sc2_gpc0_rate – Sticky counter: increment rate of General Purpose Counter - sc2_gpc1_rate – Sticky counter: increment rate of General Purpose Counter - sc_http_err_cnt – Sticky counter: cumulative number of HTTP errors - sc_http_err_rate – Sticky counter: rate of HTTP errors - sc_http_fail_cnt – Sticky counter: cumulative number of HTTP failures - sc_http_fail_rate – Sticky counter: rate of HTTP failures - sc_http_req_cnt – Sticky counter: cumulative number of HTTP requests - sc_http_req_rate – Sticky counter: rate of HTTP requests - sc_inc_gpc – Sticky counter: increment General Purpose Counter - sc_inc_gpc0 – Sticky counter: increment General Purpose Counter - sc_inc_gpc1 – Sticky counter: increment General Purpose Counter - sc0_inc_gpc0 – Sticky counter: increment General Purpose Counter - sc0_inc_gpc1 – Sticky counter: increment General Purpose Counter - sc1_inc_gpc0 – Sticky counter: increment General Purpose Counter - sc1_inc_gpc1 – Sticky counter: increment General Purpose Counter - sc2_inc_gpc0 – Sticky counter: increment General Purpose Counter - sc2_inc_gpc1 – Sticky counter: increment General Purpose Counter - sc_sess_cnt – Sticky counter: cumulative number of sessions - sc_sess_rate – Sticky counter: session rate - src – Source IP matches specified IP - src_bytes_in_rate – Source IP: incoming bytes rate - src_bytes_out_rate – Source IP: outgoing bytes rate - src_clr_gpc – Source IP: clear General Purpose Counter - src_clr_gpc0 – Source IP: clear General Purpose Counter - src_clr_gpc1 – Source IP: clear General Purpose Counter - src_conn_cnt – Source IP: cumulative number of connections - src_conn_cur – Source IP: concurrent connections - src_conn_rate – Source IP: connection rate - src_get_gpc – Source IP: get General Purpose Counter value - src_get_gpc0 – Source IP: get General Purpose Counter value - src_get_gpc1 – Source IP: get General Purpose Counter value - src_get_gpt – Source IP: get General Purpose Tag value - src_glitch_cnt – Source IP: cumulative number of glitches - src_glitch_rate – Source IP: rate of glitches - src_gpc_rate – Source IP: increment rate of General Purpose Counter - src_gpc0_rate – Source IP: increment rate of General Purpose Counter - src_gpc1_rate – Source IP: increment rate of General Purpose Counter - src_http_err_cnt – Source IP: cumulative number of HTTP errors - src_http_err_rate – Source IP: rate of HTTP errors - src_http_fail_cnt – Source IP: cumulative number of HTTP failures - src_http_fail_rate – Source IP: rate of HTTP failures - src_http_req_cnt – Source IP: number of HTTP requests - src_http_req_rate – Source IP: rate of HTTP requests - src_inc_gpc – Source IP: increment General Purpose Counter - src_inc_gpc0 – Source IP: increment General Purpose Counter - src_inc_gpc1 – Source IP: increment General Purpose Counter - src_is_local – Source IP is local - src_kbytes_in – Source IP: amount of data received (in kilobytes) - src_kbytes_out – Source IP: amount of data sent (in kilobytes) - src_port – Source IP: TCP source port - src_sess_cnt – Source IP: cumulative number of sessions - src_sess_rate – Source IP: session rate - ssl_c_ca_commonname – SSL Client certificate issued by CA common-name - ssl_c_verify_code – SSL Client certificate verify error result - ssl_c_verify – SSL Client certificate is valid - ssl_fc_sni – SNI TLS extension matches (locally deciphered) - ssl_fc – Traffic is SSL (locally deciphered) - ssl_hello_type – SSL Hello Type - ssl_sni_beg – SNI TLS extension starts with (TCP request content inspection) - ssl_sni_end – SNI TLS extension ends with (TCP request content inspection) - ssl_sni_reg – SNI TLS extension regex (TCP request content inspection) - ssl_sni – SNI TLS extension matches (TCP request content inspection) - ssl_sni_sub – SNI TLS extension contains (TCP request content inspection) - stopping – HAProxy process is currently stopping - url_param – URL parameter contains - var – Compare the value of a variable - wait_end – Inspection period is over + hdr_beg - specified HTTP Header starts with + hdr_end - specified HTTP Header ends with + hdr - specified HTTP Header matches + hdr_reg - specified HTTP Header regex + hdr_sub - specified HTTP Header contains + hdr_beg - HTTP Host Header starts with + hdr_end - HTTP Host Header ends with + hdr - HTTP Host Header matches + hdr_reg - HTTP Host Header regex + hdr_sub - HTTP Host Header contains + http_auth - HTTP Basic Auth: username/password from client matches selected User/Group + http_method - HTTP Method + nbsrv - Minimum number of usable servers in backend + path_beg - Path starts with + path_dir - Path contains subdir + path_end - Path ends with + path - Path matches + path_reg - Path regex + path_sub - Path contains string + quic_enabled - QUIC transport protocol is enabled + req.proto_http - Traffic is HTTP + req.ssl_ver - Traffic is SSL (TCP request content inspection) + sc_bytes_in_rate - Sticky counter: incoming bytes rate + sc_bytes_out_rate - Sticky counter: outgoing bytes rate + sc_clr_gpc - Sticky counter: clear General Purpose Counter + sc_clr_gpc0 - Sticky counter: clear General Purpose Counter + sc_clr_gpc1 - Sticky counter: clear General Purpose Counter + sc0_clr_gpc0 - Sticky counter: clear General Purpose Counter + sc0_clr_gpc1 - Sticky counter: clear General Purpose Counter + sc1_clr_gpc - Sticky counter: clear General Purpose Counter + sc1_clr_gpc0 - Sticky counter: clear General Purpose Counter + sc1_clr_gpc1 - Sticky counter: clear General Purpose Counter + sc2_clr_gpc - Sticky counter: clear General Purpose Counter + sc2_clr_gpc0 - Sticky counter: clear General Purpose Counter + sc2_clr_gpc1 - Sticky counter: clear General Purpose Counter + sc_conn_cnt - Sticky counter: cumulative number of connections + sc_conn_cur - Sticky counter: concurrent connections + sc_conn_rate - Sticky counter: connection rate + sc_get_gpc - Sticky counter: get General Purpose Counter value + sc_get_gpc0 - Sticky counter: get General Purpose Counter value + sc_get_gpc1 - Sticky counter: get General Purpose Counter value + sc0_get_gpc0 - Sticky counter: get General Purpose Counter value + sc0_get_gpc1 - Sticky counter: get General Purpose Counter value + sc1_get_gpc0 - Sticky counter: get General Purpose Counter value + sc1_get_gpc1 - Sticky counter: get General Purpose Counter value + sc2_get_gpc0 - Sticky counter: get General Purpose Counter value + sc2_get_gpc1 - Sticky counter: get General Purpose Counter value + sc_get_gpt - Sticky counter: get General Purpose Tag value + sc_get_gpt0 - Sticky counter: get General Purpose Tag value + sc0_get_gpt0 - Sticky counter: get General Purpose Tag value + sc1_get_gpt0 - Sticky counter: get General Purpose Tag value + sc2_get_gpt0 - Sticky counter: get General Purpose Tag value + sc_glitch_cnt - Sticky counter: cumulative number of glitches + sc_glitch_rate - Sticky counter: rate of glitches + sc_gpc_rate - Sticky counter: increment rate of General Purpose Counter + sc_gpc0_rate - Sticky counter: increment rate of General Purpose Counter + sc_gpc1_rate - Sticky counter: increment rate of General Purpose Counter + sc0_gpc0_rate - Sticky counter: increment rate of General Purpose Counter + sc0_gpc1_rate - Sticky counter: increment rate of General Purpose Counter + sc1_gpc0_rate - Sticky counter: increment rate of General Purpose Counter + sc1_gpc1_rate - Sticky counter: increment rate of General Purpose Counter + sc2_gpc0_rate - Sticky counter: increment rate of General Purpose Counter + sc2_gpc1_rate - Sticky counter: increment rate of General Purpose Counter + sc_http_err_cnt - Sticky counter: cumulative number of HTTP errors + sc_http_err_rate - Sticky counter: rate of HTTP errors + sc_http_fail_cnt - Sticky counter: cumulative number of HTTP failures + sc_http_fail_rate - Sticky counter: rate of HTTP failures + sc_http_req_cnt - Sticky counter: cumulative number of HTTP requests + sc_http_req_rate - Sticky counter: rate of HTTP requests + sc_inc_gpc - Sticky counter: increment General Purpose Counter + sc_inc_gpc0 - Sticky counter: increment General Purpose Counter + sc_inc_gpc1 - Sticky counter: increment General Purpose Counter + sc0_inc_gpc0 - Sticky counter: increment General Purpose Counter + sc0_inc_gpc1 - Sticky counter: increment General Purpose Counter + sc1_inc_gpc0 - Sticky counter: increment General Purpose Counter + sc1_inc_gpc1 - Sticky counter: increment General Purpose Counter + sc2_inc_gpc0 - Sticky counter: increment General Purpose Counter + sc2_inc_gpc1 - Sticky counter: increment General Purpose Counter + sc_sess_cnt - Sticky counter: cumulative number of sessions + sc_sess_rate - Sticky counter: session rate + src - Source IP matches specified IP + src_bytes_in_rate - Source IP: incoming bytes rate + src_bytes_out_rate - Source IP: outgoing bytes rate + src_clr_gpc - Source IP: clear General Purpose Counter + src_clr_gpc0 - Source IP: clear General Purpose Counter + src_clr_gpc1 - Source IP: clear General Purpose Counter + src_conn_cnt - Source IP: cumulative number of connections + src_conn_cur - Source IP: concurrent connections + src_conn_rate - Source IP: connection rate + src_get_gpc - Source IP: get General Purpose Counter value + src_get_gpc0 - Source IP: get General Purpose Counter value + src_get_gpc1 - Source IP: get General Purpose Counter value + src_get_gpt - Source IP: get General Purpose Tag value + src_glitch_cnt - Source IP: cumulative number of glitches + src_glitch_rate - Source IP: rate of glitches + src_gpc_rate - Source IP: increment rate of General Purpose Counter + src_gpc0_rate - Source IP: increment rate of General Purpose Counter + src_gpc1_rate - Source IP: increment rate of General Purpose Counter + src_http_err_cnt - Source IP: cumulative number of HTTP errors + src_http_err_rate - Source IP: rate of HTTP errors + src_http_fail_cnt - Source IP: cumulative number of HTTP failures + src_http_fail_rate - Source IP: rate of HTTP failures + src_http_req_cnt - Source IP: number of HTTP requests + src_http_req_rate - Source IP: rate of HTTP requests + src_inc_gpc - Source IP: increment General Purpose Counter + src_inc_gpc0 - Source IP: increment General Purpose Counter + src_inc_gpc1 - Source IP: increment General Purpose Counter + src_is_local - Source IP is local + src_kbytes_in - Source IP: amount of data received (in kilobytes) + src_kbytes_out - Source IP: amount of data sent (in kilobytes) + src_port - Source IP: TCP source port + src_sess_cnt - Source IP: cumulative number of sessions + src_sess_rate - Source IP: session rate + ssl_c_ca_commonname - SSL Client certificate issued by CA common-name + ssl_c_verify_code - SSL Client certificate verify error result + ssl_c_verify - SSL Client certificate is valid + ssl_fc_sni - SNI TLS extension matches (locally deciphered) + ssl_fc - Traffic is SSL (locally deciphered) + ssl_hello_type - SSL Hello Type + ssl_sni_beg - SNI TLS extension starts with (TCP request content inspection) + ssl_sni_end - SNI TLS extension ends with (TCP request content inspection) + ssl_sni_reg - SNI TLS extension regex (TCP request content inspection) + ssl_sni - SNI TLS extension matches (TCP request content inspection) + ssl_sni_sub - SNI TLS extension contains (TCP request content inspection) + stopping - HAProxy process is currently stopping + url_param - URL parameter contains + var - Compare the value of a variable + wait_end - Inspection period is over Custom condition (option pass-through) @@ -3496,7 +3496,7 @@ - 1 + 1 Y @@ -4352,13 +4352,13 @@ Y dom - beg – key begins with requested value - dom – Domains - end – key ends with requested value - int – Integers - ip – IPs - reg – Regular Expressions - str – Strings + beg - key begins with requested value + dom - Domains + end - key ends with requested value + int - Integers + ip - IPs + reg - Regular Expressions + str - Strings diff --git a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/Migrations/M5_0_0.php b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/Migrations/M5_0_0.php index 04f55aae8..9546c29ee 100644 --- a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/Migrations/M5_0_0.php +++ b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/Migrations/M5_0_0.php @@ -223,7 +223,7 @@ class M5_0_0 extends BaseModelMigration $action->http_response_option = (string)$action->http_response_set_status_code . $status_reason; $action->http_response_set_status_code = null; $action->http_response_set_status_reason = null; - } + } break; case 'http-response_set-var': $action->type = 'http-response';