Project

General

Profile

« Previous | Next » 

Revision 1bd4b4dc

Added by Jim Pingle almost 15 years ago

Enforce length of OpenVPN server descr in wizard.

View differences:

usr/local/www/wizards/openvpn_wizard.inc
512 512
	$server['interface'] = $pconfig['step10']['interface'];
513 513
	if (isset($pconfig['step10']['localport']))
514 514
		$server['local_port'] = $pconfig['step10']['localport'];
515

  
516
	if (strlen($pconfig['step10']['descr']) > 30)
517
		$pconfig['step10']['descr'] = substr($pconfig['step10']['descr'], 0, 30);
515 518
	$server['description'] = $pconfig['step10']['descr'];
516 519
	$server['custom_options'] = $pconfig['step10']['advanced'];
517 520
	if (isset($pconfig['step10']['tlsauth'])) {
......
567 570

  
568 571
	if (isset($pconfig['step11']['ovpnrule'])) {
569 572
		$rule = array();
570
		$rule['descr'] = gettext("OpenVPN {$server['description']} wizard rules.");
573
		$rule['descr'] = gettext("OpenVPN {$server['description']} wizard");
574
		/* Ensure the rule descr is not too long for pf to handle */
575
		if (strlen($rule['descr']) > 52)
576
			$rule['descr'] = substr($rule['descr'], 0, 52);
571 577
		$rule['direction'] = "in";
572 578
		$rule['source']['any'] = TRUE;
573 579
		$rule['destination']['network'] = $server['interface'] . "ip";
......
580 586
	}
581 587
	if (isset($pconfig['step11']['ovpnallow'])) {
582 588
		$rule = array();
583
		$rule['descr'] = gettext("OpenVPN {$server['description']} wizard rules.");
589
		$rule['descr'] = gettext("OpenVPN {$server['description']} wizard");
590
		/* Ensure the rule descr is not too long for pf to handle */
591
		if (strlen($rule['descr']) > 52)
592
			$rule['descr'] = substr($rule['descr'], 0, 52);
584 593
		$rule['source']['any'] = TRUE;
585 594
		$rule['destination']['any'] = TRUE;
586 595
		$rule['interface'] = "openvpn";

Also available in: Unified diff