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 "default certificate" parameter, fixes #51 (#55)

Browse source
This commit is contained in:
Frank Wall 2016-11-16 06:50:31 +01:00 committed by Franco Fichtner
parent bd2e61ebff
commit 42041e5fd5
3 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogFrontend.xml
View file

@ -64,6 +64,13 @@
<help><![CDATA[Select certificates to use for SSL offloading. HAProxy's SNI recognition will determine the correct certificate automatically. If no SNI is provided by the client then the first certificate will be presented.<br/>To import additional certificates, go to <a href="/system_certmanager.php">Certificate Manager</a>.]]></help>
<hint>Type certificate name or choose from list.</hint>
</field>
<field>
<id>frontend.ssl_default_certificate</id>
<label>Default certificate</label>
<type>dropdown</type>
<help><![CDATA[This certificate will be presented if no SNI is provided by the client or if the client provides an SNI hostname which does not match any certificate.<div class="text-info"><b>NOTE:</b> This parameter is optional to enforce a certain sort order for certificates. The certificate itself must still be listed under "Certificates".</div>]]></help>
<advanced>true</advanced>
</field>
<field>
<id>frontend.ssl_customOptions</id>
<label>Advanced SSL options</label>

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

@ -282,6 +282,11 @@
<Multiple>Y</Multiple>
<ValidationMessage>Please select a valid certificate from the list.</ValidationMessage>
</ssl_certificates>
<ssl_default_certificate type="CertificateField">
<Required>N</Required>
<Multiple>N</Multiple>
<ValidationMessage>Please select a valid certificate from the list.</ValidationMessage>
</ssl_default_certificate>
<ssl_customOptions type="TextField">
<Required>N</Required>
</ssl_customOptions>

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

@ -551,8 +551,17 @@ frontend {{frontend.name}}
{% if frontend.ssl_enabled == '1' %}
{# # collect ssl certs (if configured) #}
{% if frontend.ssl_certificates|default("") != "" %}
{# # check if a default certificate is configured #}
{% if frontend.ssl_default_certificate|default("") != "" %}
{% do ssl_certs.append('crt /var/etc/haproxy/ssl/' ~ frontend.ssl_default_certificate ~ '.pem') %}
{% endif %}
{% for cert in frontend.ssl_certificates.split(",") %}
{% do ssl_certs.append('crt /var/etc/haproxy/ssl/' ~ cert ~ '.pem') %}
{# # skip default certificate, it was already added to the list #}
{% if frontend.ssl_default_certificate|default("") != "" and cert == frontend.ssl_default_certificate %}
{# # do nothing #}
{% else %}
{% do ssl_certs.append('crt /var/etc/haproxy/ssl/' ~ cert ~ '.pem') %}
{% endif %}
{% endfor %}
{% endif %}
{# # advanced ssl options #}