Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop

pandora_agents/unix/tentacle_server

@@ -171,6 +171,9 @@ my $t_proxy_socket;
 # Proxy selected handler
 my $t_proxy_select;
 
+# Use SSL for proxy, 1 true, 0 false
+my $t_proxy_ssl = 0;
+
 # Use libwrap, 1 true, 0 false
 my $t_use_libwrap = 0;
 
@@ -206,11 +209,12 @@ sub print_help {
 	print ("\t-t time\t\tTime-out for network operations in seconds (default ${t_timeout}s).\n");
 	print ("\t-v\t\tBe verbose.\n");
 	print ("\t-w\t\tPrompt for OpenSSL private key password.\n");
-	print ("\t-x pwd\t\tServer password.\n\n");
-	print ("\t-b proxy_ip_address\t\tProxied server address.\n\n");	
-	print ("\t-g proxy_port\t\tPort of proxied server.\n\n");
+	print ("\t-x pwd\t\tServer password.\n");
+	print ("\t-b proxy_ip_address\tProxied server address.\n");	
+	print ("\t-g proxy_port\t\tPort of proxied server.\n");
+	print ("\t-C\t\tEnable SSL for proxy connection without a client certificate.\n");
 	print ("\t-T\t\tEnable tcpwrappers support.\n");
-	print ("\t\t(To use this option, 'Authen::Libwrap' should be installed.)\n\n");
+	print ("\t\t\t(To use this option, 'Authen::Libwrap' should be installed.)\n\n");
 }
 
 ################################################################################
@@ -256,7 +260,7 @@ sub parse_options {
 	my @t_addresses_tmp;
 
 	# Get options
-	if (getopts ('a:b:c:de:f:g:hi:k:m:op:qr:s:S:t:Tvwx:', \%opts) == 0 || defined ($opts{'h'})) {
+	if (getopts ('a:b:c:Cde:f:g:hi:k:m:op:qr:s:S:t:Tvwx:', \%opts) == 0 || defined ($opts{'h'})) {
 		print_help ();
 		exit 1;
 	}
@@ -444,6 +448,15 @@ sub parse_options {
 		}
 	}	
 
+	# Enable SSL without a client certificate
+	if (defined ($opts{'C'})) {
+
+		require IO::Socket::SSL;
+
+		$t_proxy_ssl = 1;
+	} 
+
+
 	# TCP wrappers support
 	if (defined ($opts{'T'})) {
 		if ($t_libwrap_installed) {
@@ -658,6 +671,30 @@ sub start_ssl {
 	print_log ("SSL started for " . $t_client_socket->sockhost ());
 }
 
+################################################################################
+## SUB start_proxy_ssl
+## Convert the proxy socket to an IO::Socket::SSL socket.
+################################################################################
+sub start_proxy_ssl {
+	my $err;
+
+	if ($t_proxy_ssl != 1) {
+		return;
+	}
+
+	IO::Socket::SSL->start_SSL (
+		$t_proxy_socket,
+		SSL_verify_mode => 0x00,
+	);
+
+	$err = IO::Socket::SSL::errstr ();
+	if ($err ne '') {
+		error ($err);
+	}
+
+	print_log ("proxy SSL started for " . $t_proxy_socket->sockhost ());
+}
+
 ################################################################################
 ## SUB accept_connections
 ## Manage incoming connections.
@@ -749,6 +786,11 @@ sub serve_proxy_connection {
 	
 	# Start a connection with the other Tentacle Server
 	open_proxy();		
+
+	# Start SSL for proxy
+	if ($t_proxy_ssl == 1) {
+		start_proxy_ssl();
+	}
 	
 	my $command;
 
@@ -1582,6 +1624,14 @@ __END__
 
 =item	I<-x> pwd		B<Server password>.
 
+=item	I<-b proxy_ip_address>	B<Proxied server> address.
+
+=item	I<-g proxy_port>	B<Port> of proxied server.
+
+=item	I<-C>			Enable SSL for proxy without a client certificate.
+
+=item	I<-T>			Enable tcpwrappers support ('Authen::Libwrap' required).
+
 =back
 
 =head1 EXIT STATUS

pandora_agents/win32/pandora_windows_service.cc

@@ -322,7 +322,7 @@ Pandora_Windows_Service::killTentacleProxy() {
 
 int 
 Pandora_Windows_Service::launchTentacleProxy() {
-	string server_ip, server_port, proxy_max_connections, proxy_timeout;
+	string server_ip, server_port, proxy_max_connections, proxy_timeout, server_ssl;
 	string proxy_cmd;
 	PROCESS_INFORMATION pi;
 	STARTUPINFO         si;	
@@ -331,6 +331,7 @@ Pandora_Windows_Service::launchTentacleProxy() {
 	server_ip = conf->getValue("server_ip");
 	
 	if (server_ip != "localhost") {
+
 		proxy_max_connections = conf->getValue("proxy_max_connection");
 
 		if (proxy_max_connections == "") {
@@ -348,9 +349,18 @@ Pandora_Windows_Service::launchTentacleProxy() {
 		if (server_port == "") {
 			server_port = "41121";
 		}
-			
-		proxy_cmd = "tentacle_server.exe -b " + server_ip + " -g " + server_port + " -c " + proxy_max_connections + " -t " + proxy_timeout;		
-		
+
+		server_ssl = conf->getValue("server_ssl");
+
+		if (server_ssl == "1") {
+			proxy_cmd = "tentacle_server.exe -C";
+		}
+		else {
+			proxy_cmd = "tentacle_server.exe";
+		}
+
+		proxy_cmd += " -b " + server_ip + " -g " + server_port + " -c " + proxy_max_connections + " -t " + proxy_timeout;
+
 		ZeroMemory (&si, sizeof (si));
 		ZeroMemory (&pi, sizeof (pi));
 		if (CreateProcess (NULL , (CHAR *)proxy_cmd.c_str (), NULL, NULL, FALSE,