Merge pull request #195 from skrude61/openvpn_client_export_certificates

pfsense · Dec 2, 2016 · 576173a · 576173a
2 parents 6150abd + 6824df3
commit 576173a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/security/pfSense-pkg-openvpn-client-export/Makefile b/security/pfSense-pkg-openvpn-client-export/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	pfSense-pkg-openvpn-client-export
-PORTVERSION=	1.3.13
+PORTVERSION=	1.3.14
 CATEGORIES=	security
 MASTER_SITES=	# empty
 DISTFILES=	# empty

diff --git a/security/pfSense-pkg-openvpn-client-export/files/usr/local/www/vpn_openvpn_export.php b/security/pfSense-pkg-openvpn-client-export/files/usr/local/www/vpn_openvpn_export.php
@@ -78,6 +78,7 @@
 				$ras_userent['cindex'] = $cindex;
 				$ras_userent['name'] = $user['name'];
 				$ras_userent['certname'] = $cert['descr'];
+				$ras_userent['cert'] = $cert;
 				$ras_user[] = $ras_userent;
 			}
 		}
@@ -107,6 +108,7 @@
 	$ras_serverent['users'] = $ras_user;
 	$ras_serverent['certs'] = $ras_certs;
 	$ras_serverent['mode'] = $server['mode'];
+	$ras_serverent['crlref'] = $server['crlref'];
 	$ras_serverent['authmode'] = $server['authmode'] != "Local Database" ? 'other' : 'local';
 	$ras_server[$vpnid] = $ras_serverent;
 }
@@ -630,20 +632,25 @@
 servers[<?=$sindex?>][4] = '<?=$server['authmode']?>';
 <?php
 	foreach ($server['users'] as $uindex => $user): ?>
+<?php		if (!$server['crlref'] || !is_cert_revoked($user['cert'], $server['crlref'])): ?>
 servers[<?=$sindex?>][1][<?=$uindex?>] = new Array();
 servers[<?=$sindex?>][1][<?=$uindex?>][0] = '<?=$user['uindex']?>';
 servers[<?=$sindex?>][1][<?=$uindex?>][1] = '<?=$user['cindex']?>';
 servers[<?=$sindex?>][1][<?=$uindex?>][2] = '<?=$user['name']?>';
 servers[<?=$sindex?>][1][<?=$uindex?>][3] = '<?=str_replace("'", "\\'", $user['certname'])?>';
 <?php	
+		endif;
 	endforeach;
 	$c=0;
 	foreach ($server['certs'] as $cert): ?>
+<?php
+		if (!$server['crlref'] || !is_cert_revoked($config['cert'][$cert['cindex']], $server['crlref'])): ?>
 servers[<?=$sindex?>][3][<?=$c?>] = new Array();
 servers[<?=$sindex?>][3][<?=$c?>][0] = '<?=$cert['cindex']?>';
 servers[<?=$sindex?>][3][<?=$c?>][1] = '<?=str_replace("'", "\\'", $cert['certname'])?>';
 <?php
-		$c++;
+			$c++;
+		endif;
 	endforeach;
 endforeach; 
 ?>