upstream/opnsense-plugins
1
0
Fork 0
mirror of https://github.com/opnsense/plugins.git synced 2026-05-28 04:34:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

net/haproxy: add support for custom TCP checks

Browse source
This commit is contained in:
Frank Wall 2016-12-29 15:58:54 +01:00 committed by Franco Fichtner
parent ce9e2f19d5
commit 856a054b0f
3 changed files with 79 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogHealthcheck.xml
View file

@ -89,7 +89,40 @@
</field>
<field>
<label>Non-HTTP check options</label>
<label>Custom TCP check</label>
<type>header</type>
</field>
<field>
<id>healthcheck.tcp_enabled</id>
<label>Enabled</label>
<type>checkbox</type>
</field>
<field>
<id>healthcheck.tcp_sendValue</id>
<label>Send data</label>
<type>text</type>
<help><![CDATA[Specify a value to match with the expression. <br/><div class="text-info"><b>NOTE:</b> It is important to note that the responses will be limited to a certain size defined by the global "tune.chksize" option, which defaults to 16384 bytes.</div>]]></help>
</field>
<field>
<id>healthcheck.tcp_matchType</id>
<label>Match response</label>
<type>dropdown</type>
<help><![CDATA[Select how to look for a specific pattern in the response.]]></help>
</field>
<field>
<id>healthcheck.tcp_negate</id>
<label>Negate condition</label>
<type>checkbox</type>
<help><![CDATA[Use this to invert the meaning of the expression.]]></help>
</field>
<field>
<id>healthcheck.tcp_matchValue</id>
<label>Match pattern</label>
<type>text</type>
<help><![CDATA[Specify the pattern to look for in the response buffer. If the match is set to binary, then the pattern must be passed as a serie of hexadecimal digits in an even number.]]></help>
</field>
<field>
<label>Other check options</label>
<type>header</type>
</field>
<field>

23
net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml
View file

@ -729,6 +729,29 @@
<http_value type="TextField">
<Required>N</Required>
</http_value>
<tcp_enabled type="BooleanField">
<default>0</default>
<Required>N</Required>
</tcp_enabled>
<tcp_sendValue type="TextField">
<Required>N</Required>
</tcp_sendValue>
<tcp_matchType type="OptionField">
<Required>N</Required>
<default>string</default>
<OptionValues>
<string>test the exact string match in the response buffer [default]</string>
<rstring>test a regular expression on the response buffer</rstring>
<binary>test the exact string in its hexadecimal form matches in the response buffer</binary>
</OptionValues>
</tcp_matchType>
<tcp_negate type="BooleanField">
<default>0</default>
<Required>N</Required>
</tcp_negate>
<tcp_matchValue type="TextField">
<Required>N</Required>
</tcp_matchValue>
<agentPort type="IntegerField">
<MinimumValue>1</MinimumValue>
<MaximumValue>65535</MaximumValue>

23
net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf
View file

@ -670,7 +670,28 @@ backend {{backend.name}}
{% if healthcheck_data.type|default("") == "" %}
{% set healthcheck_enabled = '0' %}
{% elif healthcheck_data.type == 'tcp' %}
{# # TCP check does not require additional options #}
{# # custom TCP health check option #}
{% if healthcheck_data.tcp_enabled|default("") == '1' %}
{# # validate options: both must not be disabled at the same time #}
{% if healthcheck_data.tcp_sendValue|default("") == "" and healthcheck_data.tcp_matchValue|default("") == "" %}
# ERROR: invalid custom TCP health check, missing "sendValue" or "matchValue"
{% else %}
{% set healthcheck_customtcp = [] %}
{% do healthcheck_customtcp.append('send ' ~ healthcheck_data.tcp_sendValue) if healthcheck_data.tcp_sendValue|default("") != "" %}
{% if healthcheck_data.tcp_matchValue|default("") != "" %}
{% do healthcheck_customtcp.append('expect ' ~ healthcheck_data.tcp_matchType) %}
{% if healthcheck_data.tcp_negate == '1' and healthcheck_data.tcp_matchType|default("") != 'binary' %}
{% do healthcheck_customtcp.append('!') %}
{% endif %}
{% do healthcheck_customtcp.append(healthcheck_data.tcp_matchValue) %}
{% endif %}
{# # XXX: some values (send/match) must be properly escaped (whitespace) #}
{# # TODO: add support for multiple send/expect steps #}
option tcp-check
tcp-check connect
tcp-check {{healthcheck_customtcp|join(' ')}}
{% endif %}
{% endif %}
{% elif healthcheck_data.type == 'http' %}
{% do healthcheck_options.append('httpchk') %}
{# # HTTP method must be uppercase #}