Merge branch 'master' into bootstrap

1 files changed, 334 insertions, 0 deletions

diff --git a/src/usr/local/www/firewall_nat_1to1.php b/src/usr/local/www/firewall_nat_1to1.php
new file mode 100644
index 0000000..753d030
--- /dev/null
+++ b/src/usr/local/www/firewall_nat_1to1.php
@@ -0,0 +1,334 @@
+<?php
+/* $Id$ */
+/*
+	firewall_nat_1to1.php
+*/
+/* ====================================================================
+ *  Copyright (c)  2004-2015  Electric Sheep Fencing, LLC. All rights reserved. 
+ *  Copyright (c)  2003-2004 Manuel Kasper <mk@neon1.net>
+ *	part of m0n0wall (http://m0n0.ch/wall)
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, 
+ *  are permitted provided that the following conditions are met: 
+ *
+ *  1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *
+ *  2. Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in
+ *      the documentation and/or other materials provided with the
+ *      distribution. 
+ *
+ *  3. All advertising materials mentioning features or use of this software 
+ *      must display the following acknowledgment:
+ *      "This product includes software developed by the pfSense Project
+ *       for use in the pfSense software distribution. (http://www.pfsense.org/). 
+ *
+ *  4. The names "pfSense" and "pfSense Project" must not be used to
+ *       endorse or promote products derived from this software without
+ *       prior written permission. For written permission, please contact
+ *       coreteam@pfsense.org.
+ *
+ *  5. Products derived from this software may not be called "pfSense"
+ *      nor may "pfSense" appear in their names without prior written
+ *      permission of the Electric Sheep Fencing, LLC.
+ *
+ *  6. Redistributions of any form whatsoever must retain the following
+ *      acknowledgment:
+ *
+ *  "This product includes software developed by the pfSense Project
+ *  for use in the pfSense software distribution (http://www.pfsense.org/).
+  *
+ *  THIS SOFTWARE IS PROVIDED BY THE pfSense PROJECT ``AS IS'' AND ANY
+ *  EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ *  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ *  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE pfSense PROJECT OR
+ *  ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *  NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ *  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ *  STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ *  OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  ====================================================================
+ *
+ */
+/*
+	pfSense_MODULE: nat
+*/
+
+##|+PRIV
+##|*IDENT=page-firewall-nat-1-1
+##|*NAME=Firewall: NAT: 1:1 page
+##|*DESCR=Allow access to the 'Firewall: NAT: 1:1' page.
+##|*MATCH=firewall_nat_1to1.php*
+##|-PRIV
+
+require("guiconfig.inc");
+require_once("functions.inc");
+require_once("filter.inc");
+require_once("shaper.inc");
+
+if (!is_array($config['nat']['onetoone'])) {
+	$config['nat']['onetoone'] = array();
+}
+
+$a_1to1 = &$config['nat']['onetoone'];
+
+/* update rule order, POST[rule] is an array of ordered IDs */
+if (is_array($_POST['rule']) && !empty($_POST['rule'])) {
+	$a_1to1_new = array();
+
+	// if a rule is not in POST[rule], it has been deleted by the user
+	foreach ($_POST['rule'] as $id)
+		$a_1to1_new[] = $a_1to1[$id];
+
+	$a_1to1 = $a_1to1_new;
+	
+	if (write_config())
+		mark_subsystem_dirty('filter');
+		
+	header("Location: firewall_nat_1to1.php");
+	exit;
+}
+
+if ($_POST) {
+	$pconfig = $_POST;
+
+	if ($_POST['apply']) {
+		$retval = 0;
+		$retval |= filter_configure();
+		$savemsg = get_std_save_message($retval);
+
+		if ($retval == 0) {
+			clear_subsystem_dirty('natconf');
+			clear_subsystem_dirty('filter');
+		}
+	}
+}
+
+if ($_GET['act'] == "del") {
+	if ($a_1to1[$_GET['id']]) {
+		unset($a_1to1[$_GET['id']]);
+		if (write_config()) {
+			mark_subsystem_dirty('natconf');
+		}
+		header("Location: firewall_nat_1to1.php");
+		exit;
+	}
+}
+
+if (isset($_POST['del_x'])) {
+	/* delete selected rules */
+	if (is_array($_POST['rule']) && count($_POST['rule'])) {
+		foreach ($_POST['rule'] as $rulei) {
+			unset($a_1to1[$rulei]);
+		}
+		if (write_config()) {
+			mark_subsystem_dirty('natconf');
+		}
+		header("Location: firewall_nat_1to1.php");
+		exit;
+	}
+
+} else if ($_GET['act'] == "toggle") {
+	if ($a_1to1[$_GET['id']]) {
+		if (isset($a_1to1[$_GET['id']]['disabled'])) {
+			unset($a_1to1[$_GET['id']]['disabled']);
+		} else {
+			$a_1to1[$_GET['id']]['disabled'] = true;
+		}
+		if (write_config("Firewall: NAT: Outbound, enable/disable NAT rule")) {
+			mark_subsystem_dirty('natconf');
+		}
+		header("Location: firewall_nat_1to1.php");
+		exit;
+	}
+} else {
+	/* yuck - IE won't send value attributes for image buttons, while Mozilla does - so we use .x/.y to find move button clicks instead... */
+	unset($movebtn);
+	foreach ($_POST as $pn => $pd) {
+		if (preg_match("/move_(\d+)_x/", $pn, $matches)) {
+			$movebtn = $matches[1];
+			break;
+		}
+	}
+	/* move selected rules before this rule */
+	if (isset($movebtn) && is_array($_POST['rule']) && count($_POST['rule'])) {
+		$a_1to1_new = array();
+
+		/* copy all rules < $movebtn and not selected */
+		for ($i = 0; $i < $movebtn; $i++) {
+			if (!in_array($i, $_POST['rule'])) {
+				$a_1to1_new[] = $a_1to1[$i];
+			}
+		}
+
+		/* copy all selected rules */
+		for ($i = 0; $i < count($a_1to1); $i++) {
+			if ($i == $movebtn) {
+				continue;
+			}
+			if (in_array($i, $_POST['rule'])) {
+				$a_1to1_new[] = $a_1to1[$i];
+			}
+		}
+
+		/* copy $movebtn rule */
+		if ($movebtn < count($a_1to1)) {
+			$a_1to1_new[] = $a_1to1[$movebtn];
+		}
+
+		/* copy all rules > $movebtn and not selected */
+		for ($i = $movebtn+1; $i < count($a_1to1); $i++) {
+			if (!in_array($i, $_POST['rule'])) {
+				$a_1to1_new[] = $a_1to1[$i];
+			}
+		}
+		if (count($a_1to1_new) > 0) {
+			$a_1to1 = $a_1to1_new;
+		}
+
+		if (write_config()) {
+			mark_subsystem_dirty('natconf');
+		}
+		header("Location: firewall_nat_1to1.php");
+		exit;
+	}
+}
+
+$pgtitle = array(gettext("Firewall"), gettext("NAT"), gettext("1:1"));
+include("head.inc");
+
+if ($savemsg)
+	print_info_box($savemsg, 'success');
+
+if (is_subsystem_dirty('natconf'))
+	print_info_box_np(gettext('The NAT configuration has been changed.') . '<br />' .
+					  gettext('You must apply the changes in order for them to take effect.') . '<br />');
+
+$tab_array = array();
+$tab_array[] = array(gettext("Port Forward"), false, "firewall_nat.php");
+$tab_array[] = array(gettext("1:1"), true, "firewall_nat_1to1.php");
+$tab_array[] = array(gettext("Outbound"), false, "firewall_nat_out.php");
+$tab_array[] = array(gettext("NPt"), false, "firewall_nat_npt.php");
+display_top_tabs($tab_array);
+?>
+<form action="firewall_nat_1to1.php" method="post">
+	<div class="panel panel-default">
+		<div class="panel-heading"><?=gettext("NAT 1 to 1 mappings")?></div>
+		<div id="mainarea" class="table-responsive panel-body">
+			<table class="table table-striped table-hover table-condensed">
+				<thead>
+					<tr>
+						<th><!-- icon --></th>
+						<th><?=gettext("Interface"); ?></th>
+						<th><?=gettext("External IP"); ?></th>
+						<th><?=gettext("Internal IP"); ?></th>
+						<th><?=gettext("Destination IP"); ?></th>
+						<th><?=gettext("Description"); ?></th>
+						<th><?=gettext('Actions')?></th>
+					</tr>
+				</thead>
+				<tbody class="user-entries">
+<?php
+		$textse = "</span>";
+		$i = 0;
+		foreach ($a_1to1 as $natent):
+			if (isset($natent['disabled'])) {
+				$textss = "<span class=\"gray\">";
+				$iconfn = "pass_d";
+			} else {
+				$textss = "<span>";
+				$iconfn = "pass";
+			}
+?>
+					<tr id="fr<?=$i?>">
+						<td>
+							<a href="?act=toggle&amp;id=<?=$i?>">
+								<i class="<?= ($iconfn == "pass") ? "icon-ok":"icon-remove"?>" title="<?=gettext("click to toggle enabled/disabled status")?>"></i>
+							</a>
+						</td>
+						<td>
+<?php
+					echo $textss;
+					if (!$natent['interface']) {
+						echo htmlspecialchars(convert_friendly_interface_to_friendly_descr("wan"));
+					} else {
+						echo htmlspecialchars(convert_friendly_interface_to_friendly_descr($natent['interface']));
+					}
+					echo $textse;
+?>
+						</td>
+						<td>
+						<input type="hidden" name="rule[]" value="<?=$i?>" />
+<?php
+					$source_net = pprint_address($natent['source']);
+					$source_cidr = strstr($source_net, '/');
+					echo $textss . $natent['external'] . $source_cidr . $textse;
+?>
+						</td>
+						<td>
+<?php
+					echo $textss . $source_net . $textse;
+?>
+						</td>
+						<td>
+<?php
+					echo $textss . pprint_address($natent['destination']) . $textse;
+?>
+						</td>
+						<td>
+<?php
+					echo $textss . htmlspecialchars($natent['descr']) . '&nbsp;' . $textse;
+?>
+						</td>
+
+						<td>
+							<a class="btn btn-xs btn-info"		  title="<?=gettext("Edit rule")?>" href="firewall_nat_1to1.php?id=<?=$i?>"><?=gettext("Edit")?></a>
+							<a class="btn btn-xs btn-danger"  title="<?=gettext("Delete rule")?>" href="firewall_nat_1to1.php?act=del&amp;id=<?=$i?>"><?=gettext("Del")?></a>
+							<a class="btn btn-xs btn-success"	  title="<?=gettext("Add a new rule based on this one")?>" href="firewall_nat_1to1_edit.php?dup=<?=$i?>"><?=gettext("Clone")?></a>
+						</td>
+
+					</tr>
+<?php
+			$i++;
+		endforeach;
+?>
+				</tbody>
+			</table>
+		</div>
+	</div>
+
+	<nav class="action-buttons">
+		<a href="firewall_nat_1to1_edit.php?after=-1" class="btn btn-sm btn-success" title="<?=gettext('Add new mapping')?>"><?=gettext('Add new mapping')?></a>
+		<input type="submit" id="order-store" class="btn btn-primary btn-sm" value="store changes" disabled="disabled" />
+	</nav>
+</form>
+
+<div>
+<?php
+
+print_info_box(gettext('Depending on the way your WAN connection is setup, you may also need a ') . '<a href="firewall_virtual_ip.php">' .
+			   gettext("Virtual IP.") . '</a>' . '<br />' .
+			   gettext('If you add a 1:1 NAT entry for any of the interface IPs on this system, ' .
+					   'it will make this system inaccessible on that IP address. i.e. if ' .
+					   'you use your WAN IP address, any services on this system (IPsec, OpenVPN server, etc.) ' .
+					   'using the WAN IP address will no longer function.'));
+?>
+</div>
+
+<script>
+events.push(function() {
+	// Make rules draggable/sortable
+	$('table tbody.user-entries').sortable({
+		cursor: 'grabbing',
+		update: function(event, ui) {
+			$('#order-store').removeAttr('disabled');
+		}
+	});
+});
+</script>
+<?php include("foot.inc"); ?>
\ No newline at end of file