Skip to content

O
OpnSense
Commit 850cd7a5 authored by Franco Fichtner's avatar Franco Fichtner
Browse files
Options

miniupnpd: merge inc files, minor tweaks on the code 

Since we have pluggable anchors, this is ready to move to
plugins to shink down the base system a bit.
parent d01b7296
Hide whitespace changes
Inline Side-by-side
Showing with 177 additions and 186 deletions
plist
View file @ 850cd7a5
......@@ -26,7 +26,6 @@
/usr/local/etc/inc/ipsec.auth-user.php
/usr/local/etc/inc/ipsec.inc
/usr/local/etc/inc/legacy_bindings.inc
/usr/local/etc/inc/miniupnpd.inc
/usr/local/etc/inc/notices.basic_sasl_client.inc
/usr/local/etc/inc/notices.cram_md5_sasl_client.inc
/usr/local/etc/inc/notices.digest_sasl_client.inc
......
src/etc/inc/miniupnpd.inc deleted 100644 → 0
View file @ d01b7296
<?php
function upnp_running () {
if ((int)exec('/bin/pgrep -a miniupnpd | /usr/bin/wc -l') > 0) {
return true;
}
return false;
}
function upnp_start() {
if (file_exists('/var/etc/miniupnpd.conf')) {
@unlink('/var/run/miniupnpd.pid');
mwexec_bg('/usr/local/sbin/miniupnpd -f /var/etc/miniupnpd.conf -P /var/run/miniupnpd.pid');
}
}
function upnp_stop() {
killbypid('/var/run/miniupnpd.pid');
while ((int)exec("/bin/pgrep -a miniupnpd | wc -l") > 0) {
mwexec('killall miniupnpd 2>/dev/null', true);
}
mwexec('/sbin/pfctl -aminiupnpd -Fr 2>&1 >/dev/null');
mwexec('/sbin/pfctl -aminiupnpd -Fn 2>&1 >/dev/null');
}
function upnp_configure() {
global $config;
if (!empty($config['installedpackages']['miniupnpd']['config'][0]['enable'])) {
echo gettext("Starting UPnP service... ");
sync_package_miniupnpd();
echo "done.\n";
}
}
function upnp_uuid() {
/* md5 hash of wan mac */
$uuid = md5(get_interface_mac(get_real_interface("wan")));
/* put uuid in correct format 8-4-4-4-12 */
return substr($uuid,0,8).'-'.substr($uuid,9,4).'-'.substr($uuid,13,4).'-'.substr($uuid,17,4).'-'.substr($uuid,21,12);
}
function sync_package_miniupnpd() {
global $config;
global $input_errors;
$upnp_config = $config['installedpackages']['miniupnpd']['config'][0];
$config_file = '/var/etc/miniupnpd.conf';
$ext_ifname = get_real_interface($upnp_config['ext_iface']);
if ($ext_ifname == $upnp_config['ext_iface']) {
log_error("miniupnpd: Could not resolve real interface for {$upnp_config['ext_iface']}, exit");
return;
}
$config_text = "ext_ifname={$ext_ifname}\n";
$config_text .= "port=2189\n";
$ifaces_active = '';
/* since config is written before this file invoked we don't need to read post data */
if (!empty($upnp_config['enable']) && !empty($upnp_config['iface_array'])) {
foreach(explode(',', $upnp_config['iface_array']) as $iface) {
/* Setting the same internal and external interface is not allowed. */
if ($iface == $upnp_config['ext_iface']) {
continue;
}
$if = get_real_interface($iface);
/* above function returns iface if fail */
if ($if!=$iface) {
$addr = find_interface_ip($if);
$bits = find_interface_subnet($if);
/* check that the interface has an ip address before adding parameters */
if (is_ipaddr($addr)) {
$config_text .= "listening_ip={$if}\n";
if (!$ifaces_active) {
$webgui_ip = $addr;
$ifaces_active = $iface;
} else {
$ifaces_active .= ", {$iface}";
}
} else {
log_error("miniupnpd: Interface {$iface} has no ip address, ignoring");
}
} else {
log_error("miniupnpd: Could not resolve real interface for {$iface}");
}
}
if (!empty($ifaces_active)) {
/* override wan ip address, common for carp, etc */
if (!empty($upnp_config['overridewanip'])) {
$config_text .= "ext_ip={$upnp_config['overridewanip']}\n";
}
/* set upload and download bitrates */
if (!empty($upnp_config['download']) && !empty($upnp_config['upload'])) {
$download = $upnp_config['download']*1000;
$upload = $upnp_config['upload']*1000;
$config_text .= "bitrate_down={$download}\n";
$config_text .= "bitrate_up={$upload}\n";
}
$config_text .= "secure_mode=yes\n";
/* enable logging of packets handled by miniupnpd rules */
if (!empty($upnp_config['logpackets'])) {
$config_text .= "packet_log=yes\n";
}
/* enable system uptime instead of miniupnpd uptime */
if (!empty($upnp_config['sysuptime'])) {
$config_text .= "system_uptime=yes\n";
}
/* set webgui url */
if (!empty($config['system']['webgui']['protocol'])) {
$config_text .= "presentation_url={$config['system']['webgui']['protocol']}://{$webgui_ip}";
if (!empty($config['system']['webgui']['port'])) {
$config_text .= ":{$config['system']['webgui']['port']}";
}
$config_text .= "/\n";
}
/* set uuid and serial */
$config_text .= "uuid=".upnp_uuid()."\n";
$config_text .= "serial=".strtoupper(substr(upnp_uuid(),0,8))."\n";
/* set model number */
$config_text .= "model_number=".file_get_contents("/usr/local/opnsense/version/opnsense")."\n";
/* upnp access restrictions */
for ($i=1; $i<=4; $i++) {
if ($upnp_config["permuser{$i}"]) {
$config_text .= "{$upnp_config["permuser{$i}"]}\n";
}
}
if (!empty($upnp_config['permdefault'])) {
$config_text .= "deny 0-65535 0.0.0.0/0 0-65535\n";
}
/* Allow UPnP or NAT-PMP as requested */
$config_text .= "enable_upnp=" . ( $upnp_config['enable_upnp'] ? "yes\n" : "no\n" );
$config_text .= "enable_natpmp=" . ( $upnp_config['enable_natpmp'] ? "yes\n" : "no\n" );
/* write out the configuration */
file_put_contents($config_file, $config_text);
if (!upnp_running()) {
/* if miniupnpd not running start it */
log_error("miniupnpd: Starting service on interface: {$ifaces_active}");
upnp_start();
} else {
/* or restart miniupnpd if settings were changed */
log_error("miniupnpd: Restarting service on interface: {$ifaces_active}");
upnp_stop();
upnp_start();
}
}
} else {
/* user does not want miniupnpd running */
/* lets stop the service and remove the config file */
if (file_exists($config_file)) {
if (empty($upnp_config['enable'])) {
log_error("miniupnpd: Stopping service: miniupnpd disabled");
} else {
log_error("miniupnpd: Stopping service: no interfaces selected");
}
upnp_stop();
@unlink($config_file);
}
}
}
src/etc/inc/plugins.inc.d/miniupnpd.inc
View file @ 850cd7a5
<?php
/*
Copyright (C) 2016 Deciso B.V.
All rights reserved.
......@@ -46,12 +47,180 @@ function miniupnpd_services()
$pconfig['name'] = "miniupnpd";
$pconfig['description'] = gettext("UPnP Service");
$pconfig['description'] = gettext("UPnP Service");
$pconfig['php']['restart'] = array('upnp_stop', 'upnp_start');
$pconfig['php']['start'] = array('upnp_start');
$pconfig['php']['stop'] = array('upnp_stop');
$pconfig['php']['restart'] = array('miniupnpd_stop', 'miniupnpd_start');
$pconfig['php']['start'] = array('miniupnpd_start');
$pconfig['php']['stop'] = array('miniupnpd_stop');
$pconfig['pidfile'] = '/var/run/miniupnpd.pid';
$services[] = $pconfig;
}
return $services;
}
function miniupnpd_start()
{
if (file_exists('/var/etc/miniupnpd.conf')) {
@unlink('/var/run/miniupnpd.pid');
mwexec_bg('/usr/local/sbin/miniupnpd -f /var/etc/miniupnpd.conf -P /var/run/miniupnpd.pid');
}
}
function miniupnpd_stop()
{
killbypid('/var/run/miniupnpd.pid', 'TERM', true);
mwexec('/sbin/pfctl -aminiupnpd -Fr 2>&1 >/dev/null');
mwexec('/sbin/pfctl -aminiupnpd -Fn 2>&1 >/dev/null');
}
function miniupnpd_configure()
{
global $config;
if (!empty($config['installedpackages']['miniupnpd']['config'][0]['enable'])) {
echo gettext("Starting UPnP service... ");
miniupnpd_sync_package();
echo "done.\n";
}
}
function miniupnpd_uuid()
{
/* md5 hash of wan mac */
$uuid = md5(get_interface_mac(get_real_interface("wan")));
/* put uuid in correct format 8-4-4-4-12 */
return substr($uuid,0,8).'-'.substr($uuid,9,4).'-'.substr($uuid,13,4).'-'.substr($uuid,17,4).'-'.substr($uuid,21,12);
}
function miniupnpd_sync_package()
{
global $config;
global $input_errors;
$upnp_config = $config['installedpackages']['miniupnpd']['config'][0];
$config_file = '/var/etc/miniupnpd.conf';
$ext_ifname = get_real_interface($upnp_config['ext_iface']);
if ($ext_ifname == $upnp_config['ext_iface']) {
log_error("miniupnpd: Could not resolve real interface for {$upnp_config['ext_iface']}, exit");
return;
}
$config_text = "ext_ifname={$ext_ifname}\n";
$config_text .= "port=2189\n";
$ifaces_active = '';
/* since config is written before this file invoked we don't need to read post data */
if (!empty($upnp_config['enable']) && !empty($upnp_config['iface_array'])) {
foreach(explode(',', $upnp_config['iface_array']) as $iface) {
/* Setting the same internal and external interface is not allowed. */
if ($iface == $upnp_config['ext_iface']) {
continue;
}
$if = get_real_interface($iface);
/* above function returns iface if fail */
if ($if!=$iface) {
$addr = find_interface_ip($if);
$bits = find_interface_subnet($if);
/* check that the interface has an ip address before adding parameters */
if (is_ipaddr($addr)) {
$config_text .= "listening_ip={$if}\n";
if (!$ifaces_active) {
$webgui_ip = $addr;
$ifaces_active = $iface;
} else {
$ifaces_active .= ", {$iface}";
}
} else {
log_error("miniupnpd: Interface {$iface} has no ip address, ignoring");
}
} else {
log_error("miniupnpd: Could not resolve real interface for {$iface}");
}
}
if (!empty($ifaces_active)) {
/* override wan ip address, common for carp, etc */
if (!empty($upnp_config['overridewanip'])) {
$config_text .= "ext_ip={$upnp_config['overridewanip']}\n";
}
/* set upload and download bitrates */
if (!empty($upnp_config['download']) && !empty($upnp_config['upload'])) {
$download = $upnp_config['download']*1000;
$upload = $upnp_config['upload']*1000;
$config_text .= "bitrate_down={$download}\n";
$config_text .= "bitrate_up={$upload}\n";
}
$config_text .= "secure_mode=yes\n";
/* enable logging of packets handled by miniupnpd rules */
if (!empty($upnp_config['logpackets'])) {
$config_text .= "packet_log=yes\n";
}
/* enable system uptime instead of miniupnpd uptime */
if (!empty($upnp_config['sysuptime'])) {
$config_text .= "system_uptime=yes\n";
}
/* set webgui url */
if (!empty($config['system']['webgui']['protocol'])) {
$config_text .= "presentation_url={$config['system']['webgui']['protocol']}://{$webgui_ip}";
if (!empty($config['system']['webgui']['port'])) {
$config_text .= ":{$config['system']['webgui']['port']}";
}
$config_text .= "/\n";
}
/* set uuid and serial */
$config_text .= "uuid=".miniupnpd_uuid()."\n";
$config_text .= "serial=".strtoupper(substr(miniupnpd_uuid(),0,8))."\n";
/* set model number */
$config_text .= "model_number=".file_get_contents("/usr/local/opnsense/version/opnsense")."\n";
/* upnp access restrictions */
for ($i=1; $i<=4; $i++) {
if ($upnp_config["permuser{$i}"]) {
$config_text .= "{$upnp_config["permuser{$i}"]}\n";
}
}
if (!empty($upnp_config['permdefault'])) {
$config_text .= "deny 0-65535 0.0.0.0/0 0-65535\n";
}
/* Allow UPnP or NAT-PMP as requested */
$config_text .= "enable_upnp=" . ( $upnp_config['enable_upnp'] ? "yes\n" : "no\n" );
$config_text .= "enable_natpmp=" . ( $upnp_config['enable_natpmp'] ? "yes\n" : "no\n" );
/* write out the configuration */
file_put_contents($config_file, $config_text);
if (!isvalidpid('/var/run/miniupnpd.pid')) {
/* if miniupnpd not running start it */
log_error("miniupnpd: Starting service on interface: {$ifaces_active}");
miniupnpd_start();
} else {
/* or restart miniupnpd if settings were changed */
log_error("miniupnpd: Restarting service on interface: {$ifaces_active}");
miniupnpd_stop();
miniupnpd_start();
}
}
} else {
/* user does not want miniupnpd running */
/* lets stop the service and remove the config file */
if (file_exists($config_file)) {
if (empty($upnp_config['enable'])) {
log_error("miniupnpd: Stopping service: miniupnpd disabled");
} else {
log_error("miniupnpd: Stopping service: no interfaces selected");
}
miniupnpd_stop();
@unlink($config_file);
}
}
}
src/etc/inc/services.inc
View file @ 850cd7a5
......@@ -31,7 +31,6 @@
require_once('dyndns.class');
require_once('unbound.inc');
require_once('miniupnpd.inc');
function generate_ipv6_from_mac($mac)
{
......
src/etc/rc.bootup
View file @ 850cd7a5
......@@ -245,9 +245,6 @@ if ($kern_hz == '1000') {
/* start the igmpproxy daemon */
services_igmpproxy_configure();
/* start the upnp daemon if it is enabled */
upnp_configure();
/* If powerd is enabled, lets launch it */
activate_powerd();
......
src/www/services_upnp.php
View file @ 850cd7a5
......@@ -31,6 +31,7 @@ require_once("guiconfig.inc");
require_once("interfaces.inc");
require_once("services.inc");
require_once("system.inc");
require_once("plugins.inc.d/miniupnpd.inc");
function upnp_validate_ip($ip) {
/* validate cidr */
......@@ -60,7 +61,6 @@ function upnp_validate_port($port) {
return true;
}
if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$pconfig = array();
......@@ -149,7 +149,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$config['installedpackages']['miniupnpd']['config'] = $upnp;
write_config('Modified Universal Plug and Play settings');
sync_package_miniupnpd();
miniupnpd_sync_package();
header(url_safe('Location: /services_upnp.php'));
exit;
}
......
src/www/status_upnp.php
View file @ 850cd7a5
......@@ -30,11 +30,12 @@
require_once("guiconfig.inc");
require_once("services.inc");
require_once("interfaces.inc");
require_once("plugins.inc.d/miniupnpd.inc");
if ($_SERVER['REQUEST_METHOD'] === 'POST') {
if (!empty($_POST['clear'])) {
upnp_stop();
upnp_start();
miniupnpd_stop();
miniupnpd_start();
header(url_safe('Location: /status_upnp.php'));
exit;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023