Skip to content

OpenVPN: Allow Nonce Validation to be disabled when using OCSP #9241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ybayart wants to merge 5 commits into
base: master
Choose a base branch
from
+24 −4
Open

OpenVPN: Allow Nonce Validation to be disabled when using OCSP #9241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b7814a6
feat: add OCSP Nonce Validation checkbox
Sep 25, 2025
f9469ed
feat: Perform Nonce validation based on the configuration
Sep 25, 2025
2310b51
feat: add doc
Sep 25, 2025
c94442e
feat: revert logic nonce enable by default -> no_nonce disable by def…
Sep 26, 2025
c46e924
doc: value explanation
Sep 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions src/opnsense/mvc/app/controllers/OPNsense/OpenVPN/forms/dialogInstance.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,19 @@
<formatter>boolean</formatter>
</grid_view>
</field>
<field>
<id>instance.ocsp_no_nonce</id>
<label>Disable OCSP Nonce validation</label>
<style>role role_server</style>
<advanced>true</advanced>
<type>checkbox</type>
<help>When your OCSP Responder does not support Nonce Validation, a warning is returned and validation fails.</help>
<grid_view>
<visible>false</visible>
<type>boolean</type>
<formatter>boolean</formatter>
</grid_view>
</field>
<field>
<id>instance.cert_depth</id>
<label>Certificate Depth</label>
Expand Down
7 changes: 4 additions & 3 deletions src/opnsense/mvc/app/library/OPNsense/Trust/Store.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,9 +609,10 @@ public static function getCaChain($caref)
/**
* @param $ca_filename string filename
* @param $serial serial number to check
* @param $no_nonce nonce check disabled
* @return array
*/
public static function ocsp_validate($ca_filename, $serial)
public static function ocsp_validate($ca_filename, $serial, $no_nonce = false)
{
if (!is_file($ca_filename)) {
return [
Expand All @@ -633,8 +634,8 @@ public static function ocsp_validate($ca_filename, $serial)
$verdict_pass = false;
$result = exec(
exec_safe(
"%s ocsp -resp_no_certs -timeout 10 -nonce -CAfile %s -issuer %s -url %s -serial %s 2>&1",
['/usr/bin/openssl', $ca_filename, $ca_filename, $ocsp_uri, $serial]
"%s ocsp -resp_no_certs -timeout 10 %s -CAfile %s -issuer %s -url %s -serial %s 2>&1",
['/usr/bin/openssl', $no_nonce ? '-no_nonce' : '-nonce', $ca_filename, $ca_filename, $ocsp_uri, $serial]
),
$output,
$retval
Expand Down
2 changes: 2 additions & 0 deletions src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,6 +435,7 @@ public function getInstanceById($server_id, $role = null)
'digest' => (string)$node->auth,
'description' => (string)$node->description,
'use_ocsp' => !$node->use_ocsp->isEmpty(),
'ocsp_no_nonce' => !$node->ocsp_no_nonce->isEmpty(),
// legacy only (backwards compatibility)
'crypto' => (string)$node->{'data-ciphers-fallback'},
];
Expand Down Expand Up @@ -479,6 +480,7 @@ public function getInstanceById($server_id, $role = null)
'digest' => (string)$item->digest,
'interface' => (string)$item->interface,
'use_ocsp' => false,
'ocsp_no_nonce' => false,
];
}
}
Expand Down
4 changes: 4 additions & 0 deletions src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,10 @@
<Default>0</Default>
<Required>Y</Required>
</use_ocsp>
<ocsp_no_nonce type="BooleanField">
<Default>0</Default>
<Required>Y</Required>
</ocsp_no_nonce>
<auth type="OptionField">
<BlankDesc>OpenVPN default</BlankDesc>
<OptionValues>
Expand Down
2 changes: 1 addition & 1 deletion src/opnsense/scripts/openvpn/tls_verify.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ function do_verify($serverid)
return "Certificate depth {$certificate_depth} exceeded max allowed depth of {$allowed_depth}.";
} elseif ($a_server['use_ocsp'] && $certificate_depth == 0) {
$serial = getenv('tls_serial_' . $certificate_depth);
$ocsp_response = OPNsense\Trust\Store::ocsp_validate("/var/etc/openvpn/instance-" . $serverid . ".ca", $serial);
$ocsp_response = OPNsense\Trust\Store::ocsp_validate("/var/etc/openvpn/instance-" . $serverid . ".ca", $serial, $a_server['ocsp_no_nonce']);
if (!$ocsp_response['pass']) {
return sprintf(
"[serial : %s] @ %s - %s (%s)",
Expand Down