upstream/opnsense-plugins
1
0
Fork 0
mirror of https://github.com/opnsense/plugins.git synced 2026-06-03 22:08:11 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #214 from fraenki/acme_no_whitespace

Browse source 
security/acme-client: tighten validation masks, "Name" -> "Common Name"
This commit is contained in:
Frank Wall 2017-08-03 14:54:54 +02:00 committed by GitHub
commit cc6ca832b2
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/dialogCertificate.xml
View file

@ -7,9 +7,9 @@
</field>
<field>
<id>certificate.name</id>
<label>Name</label>
<label>Common Name</label>
<type>text</type>
<help>Name to identify this certificate.</help>
<help>Common Name (CN) for this certificate.</help>
</field>
<field>
<id>certificate.description</id>

8
security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml
View file

@ -152,8 +152,8 @@
</enabled>
<name type="TextField">
<Required>Y</Required>
<mask>/^.{1,255}$/u</mask>
<ValidationMessage>Should be a string between 1 and 255 characters.</ValidationMessage>
<mask>/^[^\s^\t^,^;^\\^\/^(^)^\[^\]]{1,255}$/u</mask>
<ValidationMessage>Please provide a valid FQDN, i.e. www.example.com or mail.example.com (max 255 characters).</ValidationMessage>
</name>
<description type="TextField">
<Required>N</Required>
@ -163,9 +163,9 @@
<altNames type="CSVListField">
<Required>N</Required>
<multiple>Y</multiple>
<mask>/^.{1,16384}$/u</mask>
<mask>/^[^\s^\t^;^\\^\/^(^)^\[^\]]{1,65536}$/u</mask>
<ChangeCase>lower</ChangeCase>
<ValidationMessage>Please provide a valid FQDN, i.e. www.example.com or mail.example.com. Field length is limited to 16384 characters.</ValidationMessage>
<ValidationMessage>Please provide one or more valid FQDNs, i.e. www.example.com or mail.example.com. Field length is limited to 65536 characters.</ValidationMessage>
</altNames>
<account type="ModelRelationField">
<Model>

2
security/acme-client/src/opnsense/mvc/app/views/OPNsense/AcmeClient/certificates.volt
View file

@ -382,7 +382,7 @@ POSSIBILITY OF SUCH DAMAGE.
<thead>
<tr>
<th data-column-id="enabled" data-width="6em" data-type="string" data-formatter="rowtoggle">{{ lang._('Enabled') }}</th>
<th data-column-id="name" data-type="string">{{ lang._('Certificate Name') }}</th>
<th data-column-id="name" data-type="string">{{ lang._('Common Name') }}</th>
<th data-column-id="altNames" data-type="string">{{ lang._('Multi-Domain (SAN)') }}</th>
<th data-column-id="description" data-type="string">{{ lang._('Description') }}</th>
<th data-column-id="lastUpdate" data-type="string" data-formatter="certdate">{{ lang._('Issue/Renewal Date') }}</th>