From 43e1d025cf60e25577647827c9c26ed609999638 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Mon, 16 Jul 2018 14:24:20 +0200
Subject: [PATCH] Extended IDS whitelist. Fixed connection issue in mail
 account import tool.

---
 interface/web/tools/import_ispconfig.php | 14 +++++++++++++-
 security/ids.whitelist                   |  1 +
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/interface/web/tools/import_ispconfig.php b/interface/web/tools/import_ispconfig.php
index 0e7763dd98..4012802bc7 100644
--- a/interface/web/tools/import_ispconfig.php
+++ b/interface/web/tools/import_ispconfig.php
@@ -109,10 +109,22 @@ if(isset($_POST['connected'])) {
 
 
 		try {
+			//* Allow connections to self signed SSL certs
+			$context = stream_context_create(
+				array(
+					'ssl' => array (
+					'verify_peer' => false,
+					'verify_peer_name' => false,
+					'allow_self_signed' => true
+					)
+				)
+			);
+				
 			$client = new SoapClient(null, array('location' => $_POST['remote_server'],
 					'uri'      => $_POST['remote_server'].'/index.php',
 					'trace' => 1,
-					'exceptions' => 1));
+					'exceptions' => 1,
+					'stream_context' => $context));
 
 			if(!isset($remote_session_id)) $remote_session_id = $_POST['remote_session_id'];
 
diff --git a/security/ids.whitelist b/security/ids.whitelist
index 42c0559ecb..a9b045e15f 100644
--- a/security/ids.whitelist
+++ b/security/ids.whitelist
@@ -41,6 +41,7 @@ admin:/capp.php:SESSION.s.module.nav.1.items.0.title
 admin:/sites/web_vhost_subdomain_edit.php:POST.php_open_basedir
 admin:/sites/web_domain_edit.php:POST.php_open_basedir
 admin:/sites/web_domain_edit.php:POST.apache_directives
+admin:/sites/web_vhost_domain_edit.php:POST.nginx_directives
 user:/sites/shell_user_edit.php:POST.ssh_rsa
 user:/sites/cron_edit.php:POST.command
 admin:/admin/server_config_edit.php:POST.jailkit_chroot_app_programs
-- 
GitLab