[pve-devel] [PATCH manager 4/4] remove read_proxy_conf from PVE::API2Tools

Stoiko Ivanov s.ivanov at proxmox.com
Fri Feb 22 19:52:05 CET 2019


Signed-off-by: Stoiko Ivanov <s.ivanov at proxmox.com>
---
 PVE/API2Tools.pm | 46 ----------------------------------------------
 1 file changed, 46 deletions(-)

diff --git a/PVE/API2Tools.pm b/PVE/API2Tools.pm
index b2e3a6bd..2d1bdf25 100644
--- a/PVE/API2Tools.pm
+++ b/PVE/API2Tools.pm
@@ -211,52 +211,6 @@ sub run_spiceterm {
     return $remote_viewer_config;
 }
 
-sub read_proxy_config {
-
-    my $conffile = "/etc/default/pveproxy";
-
-    # Note: evaluate with bash 
-    my $shcmd = ". $conffile;\n";
-    $shcmd .= 'echo \"ALLOW_FROM:\$ALLOW_FROM\";';
-    $shcmd .= 'echo \"DENY_FROM:\$DENY_FROM\";';
-    $shcmd .= 'echo \"POLICY:\$POLICY\";';
-    $shcmd .= 'echo \"CIPHERS:\$CIPHERS\";';
-    $shcmd .= 'echo \"DHPARAMS:\$DHPARAMS\";';
-    $shcmd .= 'echo \"HONOR_CIPHER_ORDER:\$HONOR_CIPHER_ORDER\";';
-    $shcmd .= 'echo \"COMPRESSION:\$COMPRESSION\";';
-
-    my $data = -f $conffile ? `bash -c "$shcmd"` : '';
-
-    my $res = {};
-
-    while ($data =~ s/^(.*)\n//) {
-	my ($key, $value) = split(/:/, $1, 2);
-	next if !defined($value) || $value eq '';
-	if ($key eq 'ALLOW_FROM' || $key eq 'DENY_FROM') {
-	    my $ips = [];
-	    foreach my $ip (split(/,/, $value)) {
-		$ip = "0/0" if $ip eq 'all';
-		push @$ips, Net::IP->new($ip) || die Net::IP::Error() . "\n";
-	    }
-	    $res->{$key} = $ips;
-	} elsif ($key eq 'POLICY') {
-	    die "unknown policy '$value'\n" if $value !~ m/^(allow|deny)$/;
-	    $res->{$key} = $value;
-	} elsif ($key eq 'CIPHERS') {
-	    $res->{$key} = $value;
-	} elsif ($key eq 'DHPARAMS') {
-	    $res->{$key} = $value;
-	} elsif ($key eq 'HONOR_CIPHER_ORDER' || $key eq 'COMPRESSION') {
-	    die "unknown value '$value' - use 0 or 1\n" if $value !~ m/^(0|1)$/;
-	    $res->{$key} = $value;
-	} else {
-	    # silently skip everythin else?
-	}
-    }
-
-    return $res;
-}
-
 sub resolve_proxyto {
     my ($rpcenv, $proxyto_callback, $proxyto, $uri_param) = @_;
 
-- 
2.11.0




More information about the pve-devel mailing list