/ - Diff - pfSense - pfSense bugtracker

     $section->addInput(new Form_Input(
     	'ident',
     	'Identifier',
     	'*Identifier',
     	'text',
     	$pconfig['ident']
     ))->setHelp('This can be either an IP address, fully qualified domain name or an e-mail address.');
     $section->addInput(new Form_Select(
     	'type',
     	'Secret type',
     	'*Secret type',
     	$pconfig['type'],
     	$ipsec_preshared_key_type
     ))->setWidth(2);
     $section->addInput(new Form_Input(
     	'psk',
     	'Pre-Shared Key',
     	'*Pre-Shared Key',
     	'text',
     	$pconfig['psk']
     ));

     $section->addInput(new Form_Select(
     	'user_source',
     	'User Authentication',
     	'*User Authentication',
     	explode(",", $pconfig['user_source']),
     	$authServers,
     	true
-...
     $section->addInput(new Form_Select(
     	'group_source',
     	'Group Authentication',
     	'*Group Authentication',
     	$pconfig['group_source'],
     	array(
     		'none' => gettext('none'),

     $section->addInput(new Form_Select(
     	'iketype',
     	'Key Exchange version',
     	'*Key Exchange version',
     	$pconfig['iketype'],
     	array("ikev1" => "IKEv1", "ikev2" => "IKEv2", "auto" => gettext("Auto"))
     ))->setHelp('Select the Internet Key Exchange protocol version to be used. Auto uses IKEv2 when initiator, and accepts either IKEv1 or IKEv2 as responder.');
     $section->addInput(new Form_Select(
     	'protocol',
     	'Internet Protocol',
     	'*Internet Protocol',
     	$pconfig['protocol'],
     	array("inet" => "IPv4", "inet6" => "IPv6")
     ))->setHelp('Select the Internet Protocol family.');
     $section->addInput(new Form_Select(
     	'interface',
     	'Interface',
     	'*Interface',
     	$pconfig['interface'],
     	build_interface_list()
     ))->setHelp('Select the interface for the local endpoint of this phase1 entry.');
-...
     if (!$pconfig['mobile']) {
     	$section->addInput(new Form_Input(
     		'remotegw',
     		'Remote Gateway',
     		'*Remote Gateway',
     		'text',
     		$pconfig['remotegw']
     	))->setHelp('Enter the public IP address or host name of the remote gateway.');
-...
     $section->addInput(new Form_Select(
     	'authentication_method',
     	'Authentication Method',
     	'*Authentication Method',
     	$pconfig['authentication_method'],
     	build_auth_method_list()
     ))->setHelp('Must match the setting chosen on the remote side.');
     $section->addInput(new Form_Select(
     	'mode',
     	'Negotiation mode',
     	'*Negotiation mode',
     	$pconfig['mode'],
     	array("main" => gettext("Main"), "aggressive" => gettext("Aggressive"))
     ))->setHelp('Aggressive is more flexible, but less secure.');
     $group = new Form_Group('My identifier');
     $group = new Form_Group('*My identifier');
     $group->add(new Form_Select(
     	'myid_type',
-...
     $section->add($group);
     $group = new Form_Group('Peer identifier');
     $group = new Form_Group('*Peer identifier');
     $group->addClass('peeridgroup');
     $group->add(new Form_Select(
-...
     $section->addInput(new Form_Input(
     	'pskey',
     	'Pre-Shared Key',
     	'*Pre-Shared Key',
     	'text',
     	$pconfig['pskey']
     ))->setHelp('Enter the Pre-Shared Key string.');
     $section->addInput(new Form_Select(
     	'certref',
     	'My Certificate',
     	'*My Certificate',
     	$pconfig['certref'],
     	build_cert_list()
     ))->setHelp('Select a certificate previously configured in the Certificate Manager.');
     $section->addInput(new Form_Select(
     	'caref',
     	'Peer Certificate Authority',
     	'*Peer Certificate Authority',
     	$pconfig['caref'],
     	build_ca_list()
     ))->setHelp('Select a certificate authority previously configured in the Certificate Manager.');
-...
     $section = new Form_Section('Phase 1 Proposal (Algorithms)');
     $group = new Form_Group('Encryption Algorithm');
     $group = new Form_Group('*Encryption Algorithm');
     $group->add(new Form_Select(
     	'ealgo',
-...
     $section->addInput(new Form_Select(
     	'halgo',
     	'Hash Algorithm',
     	'*Hash Algorithm',
     	$pconfig['halgo'],
     	$p1_halgos
     ))->setHelp('Must match the setting chosen on the remote side.');
     $section->addInput(new Form_Select(
     	'dhgroup',
     	'DH Group',
     	'*DH Group',
     	$pconfig['dhgroup'],
     	$p1_dhgroups
     ))->setHelp('Must match the setting chosen on the remote side.');
     $section->addInput(new Form_Input(
     	'lifetime',
     	'Lifetime (Seconds)',
     	'*Lifetime (Seconds)',
     	'number',
     	$pconfig['lifetime']
     ));

     $section->addInput(new Form_Select(
     	'mode',
     	'Mode',
     	'*Mode',
     	$pconfig['mode'],
     	$p2_modes
     ));
     $group = new Form_Group('Local Network');
     $group = new Form_Group('*Local Network');
     $group->addClass('opt_localid');
     $subnetarray = get_configured_interface_with_descr();
-...
     $section->add($group);
     if (!isset($pconfig['mobile'])) {
     	$group = new Form_Group('Remote Network');
     	$group = new Form_Group('*Remote Network');
     	$group->addClass('opt_remoteid');
     	$group->add(new Form_Select(
-...
     $section->addInput(new Form_Select(
     	'proto',
     	'Protocol',
     	'*Protocol',
     	$pconfig['proto'],
     	$p2_protos
     ))->setHelp('ESP is encryption, AH is authentication only.');
-...
     $rows = count($p2_ealgos) - 1;
     foreach ($p2_ealgos as $algo => $algodata) {
     	$group = new Form_Group($i == 0 ? 'Encryption Algorithms':'');
     	$group = new Form_Group($i == 0 ? '*Encryption Algorithms':'');
     	$group->addClass('encalg');
     	// Note: ID attribute of each element created is to be unique.  Not being used, suppressing it.
-...
     	$section->add($group);
+    }
     $group = new Form_Group('Hash Algorithms');
     $group = new Form_Group('*Hash Algorithms');
     foreach ($p2_halgos as $algo => $algoname) {
     	// Note: ID attribute of each element created is to be unique.  Not being used, suppressing it.

     $section->addInput(new Form_Select(
     	'interface',
     	'Interface',
     	'*Interface',
     	$pconfig['interface'],
     	$iflist
     ));
     $section->addInput(new Form_Input(
     	'localip',
     	'Server address',
     	'*Server address',
     	'text',
     	$pconfig['localip']
     ))->setHelp('Enter the IP address the L2TP server should give to clients for use as their "gateway". ' . '<br />' .
-...
     $section->addInput(new Form_IpAddress(
     	'remoteip',
     	'Remote address range',
     	'*Remote address range',
     	$pconfig['remoteip']
     ))->addMask(l2tp_subnet, $pconfig['l2tp_subnet'])
       ->setHelp('Specify the starting address for the client IP address subnet.');
     $section->addInput(new Form_Select(
     	'n_l2tp_units',
     	'Number of L2TP users',
     	'*Number of L2TP users',
     	$pconfig['n_l2tp_units'],
     	array_combine(range(1, 255, 1), range(1, 255, 1))
     ));
-...
     $section->addInput(new Form_Select(
     	'paporchap',
     	'Authentication type',
     	'*Authentication type',
     	$pconfig['paporchap'],
     	array(
     		'chap' => 'CHAP',
-...
     $section->addInput(new Form_IpAddress(
     	'radiusserver',
     	'Server',
     	'*Server',
     	$pconfig['radiusserver']
     ))->setHelp('Enter the IP address of the RADIUS server.');
     $section->addPassword(new Form_Input(
     	'radiussecret',
     	'Secret',
     	'*Secret',
     	'password',
     	$pconfig['radiussecret']
     ))->setHelp('Enter the shared secret that will be used to authenticate to the RADIUS server.');

     if (isset($id) && $a_secret[$id]) {
     	$pconfig['usernamefld'] = $a_secret[$id]['name'];
     	$pconfig['ip'] = $a_secret[$id]['ip'];
     	$pwd_required = "";
     } else {
     	$pwd_required = "*";
+    }
     if ($_POST) {
-...
     $section->addInput(new Form_Input(
     	'usernamefld',
     	'Username',
     	'*Username',
     	'text',
     	$pconfig['usernamefld']
     ));
     $pwd = new Form_Input(
     	'passwordfld',
     	'Password',
     	$pwd_required . 'Password',
     	'text',
     	$pconfig['passwordfld']
     );

     	$section->addInput(new Form_Select(
     		'mode',
     		'Server mode',
     		'*Server mode',
     		$pconfig['mode'],
     		$openvpn_client_modes
     		));
     	$section->addInput(new Form_Select(
     		'protocol',
     		'Protocol',
     		'*Protocol',
     		$pconfig['protocol'],
     		$openvpn_prots
     		));
     	$section->addInput(new Form_Select(
     		'dev_mode',
     		'Device mode',
     		'*Device mode',
     		empty($pconfig['dev_mode']) ? 'tun':$pconfig['dev_mode'],
     		$openvpn_dev_mode
     		))->setHelp("\"tun\" mode carries IPv4 and IPv6 (OSI layer 3) and is the most common and compatible mode across all platforms." .
-...
     	$section->addInput(new Form_Select(
     		'interface',
     		'Interface',
     		'*Interface',
     		$pconfig['interface'],
     		openvpn_build_if_list()
     		))->setHelp("The interface used by the firewall to originate this OpenVPN client connection");
-...
     	$section->addInput(new Form_Input(
     		'server_addr',
     		'Server host or address',
     		'*Server host or address',
     		'text',
     		$pconfig['server_addr']
     	))->setHelp("The IP address or hostname of the OpenVPN server.");
-...
     	$section->addInput(new Form_Input(
     		'server_port',
     		'Server port',
     		'*Server port',
     		'number',
     		$pconfig['server_port']
     	))->setHelp("The port used by the server to receive client connections.");
-...
     	$section->addInput(new Form_Textarea(
     		'tls',
     		'TLS Key',
     		'*TLS Key',
     		$pconfig['tls']
     	))->setHelp("Paste the TLS key here." .
     	    "<br/>" .
-...
     	$section->addInput(new Form_Select(
     		'tls_type',
     		'TLS Key Usage Mode',
     		'*TLS Key Usage Mode',
     		empty($pconfig['tls_type']) ? 'auth':$pconfig['tls_type'],
     		$openvpn_tls_modes
     		))->setHelp("In Authentication mode the TLS key is used only as HMAC authentication for the control channel, protecting the peers from unauthorized connections. " .
-...
     		$section->addInput(new Form_Select(
     			'caref',
     			'Peer Certificate Authority',
     			'*Peer Certificate Authority',
     			$pconfig['caref'],
     			$list
     		));
     	} else {
     		$section->addInput(new Form_StaticText(
     			'Peer Certificate Authority',
     			'*Peer Certificate Authority',
     			sprintf('No Certificate Authorities defined. One may be created here: %s', '<a href="system_camanager.php">System &gt; Cert. Manager</a>')
     		));
+    	}
-...
     	$section->addInput(new Form_Textarea(
     		'shared_key',
     		'Shared Key',
     		'*Shared Key',
     		$pconfig['shared_key']
     	))->setHelp('Paste the shared key here');
-...
     	$section->addInput(new Form_Select(
     		'crypto',
     		'Encryption Algorithm',
     		'*Encryption Algorithm',
     		$pconfig['crypto'],
     		openvpn_get_cipherlist()
     		))->setHelp('The Encryption Algorithm used for data channel packets when Negotiable Cryptographic Parameter (NCP) support is not available.');
-...
     	  ->setAttribute('size', '10')
     	  ->setHelp('Allowed NCP Encryption Algorithms. Click an algorithm name to remove it from the list');
     	$group->setHelp(		'The order of the selected NCP Encryption Algorithms is respected by OpenVPN.' .
     	$group->setHelp('The order of the selected NCP Encryption Algorithms is respected by OpenVPN.' .
     					'<div class="infoblock">' . sprint_info_box(
     					'For backward compatibility, when an older peer connects that does not support NCP, OpenVPN will use the Encryption Algorithm ' .
     					'requested by the peer so long as it is selected in this list or chosen as the Encryption Algorithm.', 'info', false) .
-...
     	$section->addInput(new Form_Select(
     		'digest',
     		'Auth digest algorithm',
     		'*Auth digest algorithm',
     		$pconfig['digest'],
     		openvpn_get_digestlist()
     		))->setHelp('The algorithm used to authenticate data channel packets, and control channel packets if a TLS Key is present.' .

     	$section->addInput(new Form_Input(
     		'common_name',
     		'Common Name',
     		'*Common Name',
     		'text',
     		$pconfig['common_name']
     	))->setHelp('Enter the X.509 common name for the client certificate, or the username for VPNs utilizing password authentication. This match is case sensitive.');

     	$section->addInput(new Form_Select(
     		'mode',
     		'Server mode',
     		'*Server mode',
     		$pconfig['mode'],
     		openvpn_build_mode_list()
     		));
-...
     	$section->addInput(new Form_Select(
     		'authmode',
     		'Backend for authentication',
     		'*Backend for authentication',
     		$authmodes,
     		$options,
     		true
-...
     	$section->addInput(new Form_Select(
     		'protocol',
     		'Protocol',
     		'*Protocol',
     		$pconfig['protocol'],
     		$openvpn_prots
     		));
     	$section->addInput(new Form_Select(
     		'dev_mode',
     		'Device mode',
     		'*Device mode',
     		empty($pconfig['dev_mode']) ? 'tun':$pconfig['dev_mode'],
     		$openvpn_dev_mode
     		))->setHelp("\"tun\" mode carries IPv4 and IPv6 (OSI layer 3) and is the most common and compatible mode across all platforms." .
-...
     	$section->addInput(new Form_Select(
     		'interface',
     		'Interface',
     		'*Interface',
     		$pconfig['interface'],
     		openvpn_build_if_list()
     		))->setHelp("The interface or Virtual IP address where OpenVPN will receive client connections.");
     	$section->addInput(new Form_Input(
     		'local_port',
     		'Local port',
     		'*Local port',
     		'number',
     		$pconfig['local_port'],
     		['min' => '0']
-...
     	$section->addInput(new Form_Textarea(
     		'tls',
     		'TLS Key',
     		'*TLS Key',
     		$pconfig['tls']
     	))->setHelp("Paste the TLS key here." .
     	    "<br/>" .
-...
     	$section->addInput(new Form_Select(
     		'tls_type',
     		'TLS Key Usage Mode',
     		'*TLS Key Usage Mode',
     		empty($pconfig['tls_type']) ? 'auth':$pconfig['tls_type'],
     		$openvpn_tls_modes
     		))->setHelp("In Authentication mode the TLS key is used only as HMAC authentication for the control channel, protecting the peers from unauthorized connections. " .
-...
     		$section->addInput(new Form_Select(
     			'caref',
     			'Peer Certificate Authority',
     			'*Peer Certificate Authority',
     			$pconfig['caref'],
     			$list
     		));
     	} else {
     		$section->addInput(new Form_StaticText(
     			'Peer Certificate Authority',
     			'*Peer Certificate Authority',
     			sprintf('No Certificate Authorities defined. One may be created here: %s', '<a href="system_camanager.php">System &gt; Cert. Manager</a>')
     		));
+    	}
-...
     	$section->addInput(new Form_Select(
     		'certref',
     		'Server certificate',
     		'*Server certificate',
     		$pconfig['certref'],
     		$cl['server'] + $cl['non-server']
     		))->setHelp($certhelp);
     	$section->addInput(new Form_Select(
     		'dh_length',
     		'DH Parameter Length',
     		'*DH Parameter Length',
     		$pconfig['dh_length'],
     		$openvpn_dh_lengths
     		))->setHelp('Diffie-Hellman (DH) parameter set used for key exchange.' .
-...
     	$section->addInput(new Form_Textarea(
     		'shared_key',
     		'Shared Key',
     		'*Shared Key',
     		$pconfig['shared_key']
     	))->setHelp('Paste the shared key here');
     	$section->addInput(new Form_Select(
     		'crypto',
     		'Encryption Algorithm',
     		'*Encryption Algorithm',
     		$pconfig['crypto'],
     		openvpn_get_cipherlist()
     		))->setHelp('The Encryption Algorithm used for data channel packets when Negotiable Cryptographic Parameter (NCP) support is not available.');
-...
     	  ->setAttribute('size', '10')
     	  ->setHelp('Allowed NCP Encryption Algorithms. Click an algorithm name to remove it from the list');
     	$group->setHelp(		'The order of the selected NCP Encryption Algorithms is respected by OpenVPN.' .
     	$group->setHelp('The order of the selected NCP Encryption Algorithms is respected by OpenVPN.' .
     					'<div class="infoblock">' . sprint_info_box(
     					'For backward compatibility, when an older peer connects that does not support NCP, OpenVPN will use the Encryption Algorithm ' .
     					'requested by the peer so long as it is selected in this list or chosen as the Encryption Algorithm.', 'info', false) .
-...
     	$section->addInput(new Form_Select(
     		'digest',
     		'Auth digest algorithm',
     		'*Auth digest algorithm',
     		$pconfig['digest'],
     		openvpn_get_digestlist()
     		))->setHelp('The algorithm used to authenticate data channel packets, and control channel packets if a TLS Key is present.' .
-...
     	$section->addInput(new Form_Select(
     		'cert_depth',
     		'Certificate Depth',
     		'*Certificate Depth',
     		$pconfig['cert_depth'],
     		["" => gettext("Do Not Check")] + $openvpn_cert_depths
     		))->setHelp('When a certificate-based client logs in, do not accept certificates below this depth. ' .
-...
     				hideInput('serverbridge_interface', true);
     				hideInput('serverbridge_dhcp_start', true);
     				hideInput('serverbridge_dhcp_end', true);
     				setRequired('tunnel_network', true);
     				if (sharedkey) {
     					hideInput('local_network', true);
     					hideInput('local_networkv6', true);
-...
     			case "tap":
     				hideInput('tunnel_network', false);
     				setRequired('tunnel_network', false);
     				if (!p2p) {
     					hideCheckbox('serverbridge_dhcp', false);

Project

General

Profile

pfSense

Revision 1bbdab13

Added by Phil Davis over 8 years ago