[pve-devel] [PATCH v2 http-server manager 0/2] fix #2997: allow setting LISTEN_IP for pveproxy

[pve-devel] [PATCH v2 http-server manager 0/2] fix #2997: allow setting LISTEN_IP for pveproxy

[Oguz Bektas]

pve-http-server:
Oguz Bektas (1):
  utils: add LISTEN_IP option in /etc/default/pveproxy

 PVE/APIServer/Utils.pm | 3 +++
 1 file changed, 3 insertions(+)


pve-manager:
Oguz Bektas (1):
  proxy: allow setting LISTEN_IP for pveproxy

 PVE/Service/pveproxy.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

-- 
2.20.1

[pve-devel] [PATCH v2 http-server 1/2] utils: add LISTEN_IP option in /etc/default/pveproxy

[Oguz Bektas]

to allow setting arbitrary IP address to listen on

Signed-off-by: Oguz Bektas <o.bektas@proxmox.com>
---

v1->v2:
* changed parameter name from BIND_IP to LISTEN_IP

 PVE/APIServer/Utils.pm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/PVE/APIServer/Utils.pm b/PVE/APIServer/Utils.pm
index e843e5f..36e3ae6 100644
--- a/PVE/APIServer/Utils.pm
+++ b/PVE/APIServer/Utils.pm
@@ -14,6 +14,7 @@ sub read_proxy_config {
 
     # Note: evaluate with bash
     my $shcmd = ". $conffile;\n";
+    $shcmd .= 'echo \"LISTEN_IP:\$LISTEN_IP\";';
     $shcmd .= 'echo \"ALLOW_FROM:\$ALLOW_FROM\";';
     $shcmd .= 'echo \"DENY_FROM:\$DENY_FROM\";';
     $shcmd .= 'echo \"POLICY:\$POLICY\";';
@@ -36,6 +37,8 @@ sub read_proxy_config {
 		push @$ips, Net::IP->new($ip) || die Net::IP::Error() . "\n";
 	    }
 	    $res->{$key} = $ips;
+	} elsif ($key eq 'LISTEN_IP') {
+	    $res->{$key} = $value;
 	} elsif ($key eq 'POLICY') {
 	    die "unknown policy '$value'\n" if $value !~ m/^(allow|deny)$/;
 	    $res->{$key} = $value;
-- 
2.20.1

[pve-devel] [PATCH v2 manager 2/2] proxy: allow setting LISTEN_IP for pveproxy

[Oguz Bektas]

to preserve backwards behavior we leave this as 'undef' if it's not
configured in /etc/default/pveproxy

Signed-off-by: Oguz Bektas <o.bektas@proxmox.com>
---
v1->v2:
* use 'undef' as default instead of 0.0.0.0
* s/BIND_IP/LISTEN_IP/g

 PVE/Service/pveproxy.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/PVE/Service/pveproxy.pm b/PVE/Service/pveproxy.pm
index 571a6bf5..ca56bc60 100755
--- a/PVE/Service/pveproxy.pm
+++ b/PVE/Service/pveproxy.pm
@@ -70,7 +70,8 @@ sub init {
 	die "unable to open lock file '${accept_lock_fn}' - $!\n";
 
     my $family = PVE::Tools::get_host_address_family($self->{nodename});
-    my $socket = $self->create_reusable_socket(8006, undef, $family);
+    my $bind_ip = $proxyconf->{LISTEN_IP} // undef; # default
+    my $socket = $self->create_reusable_socket(8006, $bind_ip, $family);
 
     my $dirs = {};
 
-- 
2.20.1