First commit for rspamd settings
This commit is contained in:
		
							parent
							
								
									8513fabc85
								
							
						
					
					
						commit
						7d6c5ff071
					
				@ -22,12 +22,12 @@ fi
 | 
			
		||||
sed -i "s#database_name.*#database_name = \"${DBNAME}\";#" data/web/inc/vars.inc.php
 | 
			
		||||
sed -i "s#database_user.*#database_user = \"${DBUSER}\";#" data/web/inc/vars.inc.php
 | 
			
		||||
sed -i "s#database_pass.*#database_pass = \"${DBPASS}\";#" data/web/inc/vars.inc.php
 | 
			
		||||
sed -i "s#database_user.*#database_user = \"${DBUSER}\";#" data/conf/nginx/vars.inc.php
 | 
			
		||||
 | 
			
		||||
docker run \
 | 
			
		||||
	-p 443:443 \
 | 
			
		||||
	--name ${NAME} \
 | 
			
		||||
	-v ${PWD}/data/web:/web:ro \
 | 
			
		||||
	-v ${PWD}/data/conf/rspamd/dynmaps:/dynmaps:ro \
 | 
			
		||||
	-v ${PWD}/data/assets/ssl/:/etc/ssl/mail/:ro \
 | 
			
		||||
	-v ${PWD}/data/conf/nginx/:/etc/nginx/conf.d/:ro \
 | 
			
		||||
	--network=${DOCKER_NETWORK} \
 | 
			
		||||
 | 
			
		||||
@ -20,6 +20,7 @@ fi
 | 
			
		||||
 | 
			
		||||
docker run \
 | 
			
		||||
	-v ${PWD}/data/web:/web:ro \
 | 
			
		||||
	-v ${PWD}/data/conf/rspamd/dynmaps:/dynmaps:ro \
 | 
			
		||||
    -v ${PWD}/data/dkim/:/shared/dkim/ \
 | 
			
		||||
	-d --network=${DOCKER_NETWORK} \
 | 
			
		||||
	--name ${NAME} --network-alias phpfpm -h phpfpm php:${PHPVERS}
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										18
									
								
								data/conf/nginx/dynmaps.conf
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										18
									
								
								data/conf/nginx/dynmaps.conf
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,18 @@
 | 
			
		||||
server {
 | 
			
		||||
		listen 8081;
 | 
			
		||||
	    index index.php index.html;
 | 
			
		||||
	    server_name _;
 | 
			
		||||
	    error_log  /var/log/nginx/error.log;
 | 
			
		||||
	    access_log /var/log/nginx/access.log;
 | 
			
		||||
	    root /dynmaps;
 | 
			
		||||
 | 
			
		||||
	    location ~ \.php$ {
 | 
			
		||||
	        try_files $uri =404;
 | 
			
		||||
	        fastcgi_split_path_info ^(.+\.php)(/.+)$;
 | 
			
		||||
	        fastcgi_pass phpfpm:9000;
 | 
			
		||||
	        fastcgi_index index.php;
 | 
			
		||||
	        include fastcgi_params;
 | 
			
		||||
	        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
 | 
			
		||||
			fastcgi_param PATH_INFO $fastcgi_path_info;
 | 
			
		||||
		}
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										206
									
								
								data/conf/rspamd/dynmaps/settings.php
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										206
									
								
								data/conf/rspamd/dynmaps/settings.php
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,206 @@
 | 
			
		||||
<?php
 | 
			
		||||
ini_set('error_reporting', 0);
 | 
			
		||||
/*
 | 
			
		||||
The match section performs AND operation on different matches: for example, if you have from and rcpt in the same rule,
 | 
			
		||||
then the rule matches only when from AND rcpt match. For similar matches, the OR rule applies: if you have multiple rcpt matches,
 | 
			
		||||
then any of these will trigger the rule. If a rule is triggered then no more rules are matched.
 | 
			
		||||
*/
 | 
			
		||||
header('Content-Type: text/plain');
 | 
			
		||||
require_once "vars.inc.php";
 | 
			
		||||
$dsn = $database_type . ':host=' . $database_host . ';dbname=' . $database_name;
 | 
			
		||||
$opt = [
 | 
			
		||||
    PDO::ATTR_ERRMODE            => PDO::ERRMODE_EXCEPTION,
 | 
			
		||||
    PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
 | 
			
		||||
    PDO::ATTR_EMULATE_PREPARES   => false,
 | 
			
		||||
];
 | 
			
		||||
$pdo = new PDO($dsn, $database_user, $database_pass, $opt);
 | 
			
		||||
?>
 | 
			
		||||
settings {
 | 
			
		||||
<?php
 | 
			
		||||
$stmt = $pdo->query("SELECT DISTINCT `object` FROM `filterconf` WHERE `option` = 'highspamlevel' OR `option` = 'lowspamlevel'");
 | 
			
		||||
$rows = $stmt->fetchAll(PDO::FETCH_ASSOC);
 | 
			
		||||
 | 
			
		||||
while ($row = array_shift($rows)) {
 | 
			
		||||
	$username_sane = preg_replace("/[^a-zA-Z0-9]+/", "", $row['object']);
 | 
			
		||||
?>
 | 
			
		||||
	score_<?=$username_sane;?> {
 | 
			
		||||
	priority = low;
 | 
			
		||||
<?php
 | 
			
		||||
	$stmt = $pdo->prepare("SELECT `option`, `value` FROM `filterconf` 
 | 
			
		||||
		WHERE (`option` = 'highspamlevel' OR `option` = 'lowspamlevel')
 | 
			
		||||
			AND `object`= :object");
 | 
			
		||||
	$stmt->execute(array(':object' => $row['object']));
 | 
			
		||||
	$spamscore = $stmt->fetchAll(PDO::FETCH_COLUMN|PDO::FETCH_GROUP);
 | 
			
		||||
 | 
			
		||||
	$stmt = $pdo->prepare("SELECT GROUP_CONCAT(REPLACE(`value`, '*', '.*') SEPARATOR '|') AS `value` FROM `filterconf`
 | 
			
		||||
		WHERE `object`= :object
 | 
			
		||||
			AND (`option` = 'blacklist_from' OR `option` = 'whitelist_from')");
 | 
			
		||||
	$stmt->execute(array(':object' => $row['object']));
 | 
			
		||||
	$grouped_lists = $stmt->fetchAll(PDO::FETCH_COLUMN);
 | 
			
		||||
	$value_sane = preg_replace("/\.\./", ".", (preg_replace("/\*/", ".*", $grouped_lists[0])));
 | 
			
		||||
?>
 | 
			
		||||
	from = "/^((?!<?=$value_sane;?>).)*$/";
 | 
			
		||||
	rcpt = "<?=$row['object'];?>";
 | 
			
		||||
<?php
 | 
			
		||||
	$stmt = $pdo->prepare("SELECT `address` FROM `alias` WHERE `goto` = :object_goto AND `address` NOT LIKE '@%' AND `address` != :object_address");
 | 
			
		||||
	$stmt->execute(array(':object_goto' => $row['object'], ':object_address' => $row['object']));
 | 
			
		||||
	$rows_aliases_1 = $stmt->fetchAll(PDO::FETCH_ASSOC);
 | 
			
		||||
	while ($row_aliases_1 = array_shift($rows_aliases_1)) {
 | 
			
		||||
?>
 | 
			
		||||
	rcpt = "<?=$row_aliases_1['address'];?>";
 | 
			
		||||
<?php
 | 
			
		||||
	}
 | 
			
		||||
	$stmt = $pdo->prepare("SELECT CONCAT(`local_part`, '@', `alias_domain`.`alias_domain`) AS `aliases` FROM `mailbox` 
 | 
			
		||||
		LEFT OUTER JOIN `alias_domain` on `mailbox`.`domain` = `alias_domain`.`target_domain`
 | 
			
		||||
		WHERE `mailbox`.`username` = :object");
 | 
			
		||||
	$stmt->execute(array(':object' => $row['object']));
 | 
			
		||||
	$rows_aliases_2 = $stmt->fetchAll(PDO::FETCH_ASSOC);
 | 
			
		||||
	while ($row_aliases_2 = array_shift($rows_aliases_2)) {
 | 
			
		||||
?>
 | 
			
		||||
	rcpt = "<?=$row_aliases_2['aliases'];?>";
 | 
			
		||||
<?php
 | 
			
		||||
	}
 | 
			
		||||
?>
 | 
			
		||||
	apply "default" {
 | 
			
		||||
		actions {
 | 
			
		||||
			reject = <?=$spamscore['highspamlevel'][0];?>;
 | 
			
		||||
			greylist = <?=$spamscore['lowspamlevel'][0] - 1;?>;
 | 
			
		||||
			"add header" = <?=$spamscore['lowspamlevel'][0];?>;
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
<?php
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/*
 | 
			
		||||
// Start whitelist
 | 
			
		||||
*/
 | 
			
		||||
 | 
			
		||||
$stmt = $pdo->query("SELECT DISTINCT `object` FROM `filterconf` WHERE `option` = 'whitelist_from'");
 | 
			
		||||
$rows = $stmt->fetchAll(PDO::FETCH_ASSOC);
 | 
			
		||||
while ($row = array_shift($rows)) {
 | 
			
		||||
	$username_sane = preg_replace("/[^a-zA-Z0-9]+/", "", $row['object']);
 | 
			
		||||
?>
 | 
			
		||||
	whitelist_<?=$username_sane;?> {
 | 
			
		||||
		priority = high;
 | 
			
		||||
<?php
 | 
			
		||||
	$stmt = $pdo->prepare("SELECT GROUP_CONCAT(REPLACE(`value`, '*', '.*') SEPARATOR '|') AS `value` FROM `filterconf`
 | 
			
		||||
		WHERE `object`= :object
 | 
			
		||||
			AND `option` = 'whitelist_from'");
 | 
			
		||||
	$stmt->execute(array(':object' => $row['object']));
 | 
			
		||||
	$grouped_lists = $stmt->fetchAll(PDO::FETCH_COLUMN);
 | 
			
		||||
	$value_sane = preg_replace("/\.\./", ".", (preg_replace("/\*/", ".*", $grouped_lists[0])));
 | 
			
		||||
?>
 | 
			
		||||
		from = "/(<?=$value_sane;?>)/";
 | 
			
		||||
<?php
 | 
			
		||||
	if (!filter_var(trim($row['object']), FILTER_VALIDATE_EMAIL)) {
 | 
			
		||||
?>
 | 
			
		||||
		rcpt = "/.*@<?=$username_userpref['username'];?>/";
 | 
			
		||||
<?php
 | 
			
		||||
		$stmt = $pdo->prepare("SELECT `alias_domain` FROM `alias_domain`
 | 
			
		||||
			WHERE `target_domain` = :object");
 | 
			
		||||
		$stmt->execute(array(':object' => $row['object']));
 | 
			
		||||
		$rows_domain_aliases = $stmt->fetchAll(PDO::FETCH_ASSOC);
 | 
			
		||||
		while ($row_domain_aliases = array_shift($rows_domain_aliases)) {
 | 
			
		||||
?>
 | 
			
		||||
		rcpt = "<?=$row_domain_aliases['alias_domain'];?>";
 | 
			
		||||
<?php
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	else {
 | 
			
		||||
?>
 | 
			
		||||
		rcpt = "<?=$row['object'];?>";
 | 
			
		||||
<?php
 | 
			
		||||
	}
 | 
			
		||||
	$stmt = $pdo->prepare("SELECT `address` FROM `alias` WHERE `goto` = :object_goto AND `address` NOT LIKE '@%' AND `address` != :object_address");
 | 
			
		||||
	$stmt->execute(array(':object_goto' => $row['object'], ':object_address' => $row['object']));
 | 
			
		||||
	$rows_aliases_wl_1 = $stmt->fetchAll(PDO::FETCH_ASSOC);
 | 
			
		||||
	while ($row_aliases_wl_1 = array_shift($rows_aliases_wl_1)) {
 | 
			
		||||
?>
 | 
			
		||||
		rcpt = "<?=$row_aliases_wl_1['address'];?>";
 | 
			
		||||
<?php
 | 
			
		||||
	}
 | 
			
		||||
	$stmt = $pdo->prepare("SELECT CONCAT(`local_part`, '@', `alias_domain`.`alias_domain`) AS `aliases` FROM `mailbox` 
 | 
			
		||||
		LEFT OUTER JOIN `alias_domain` on `mailbox`.`domain` = `alias_domain`.`target_domain`
 | 
			
		||||
		WHERE `mailbox`.`username` = :object");
 | 
			
		||||
	$stmt->execute(array(':object' => $row['object']));
 | 
			
		||||
	$rows_aliases_wl_2 = $stmt->fetchAll(PDO::FETCH_ASSOC);
 | 
			
		||||
	while ($row_aliases_wl_2 = array_shift($rows_aliases_wl_2)) {
 | 
			
		||||
?>
 | 
			
		||||
		rcpt = "<?=$row_aliases_wl_2['aliases'];?>";
 | 
			
		||||
<?php
 | 
			
		||||
	}
 | 
			
		||||
?>
 | 
			
		||||
		apply "default" {
 | 
			
		||||
			MAILCOW_MOO = -999.0;
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
<?php
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/*
 | 
			
		||||
// Start blacklist
 | 
			
		||||
*/
 | 
			
		||||
 | 
			
		||||
$stmt = $pdo->query("SELECT DISTINCT `object` FROM `filterconf` WHERE `option` = 'blacklist_from'");
 | 
			
		||||
$rows = $stmt->fetchAll(PDO::FETCH_ASSOC);
 | 
			
		||||
while ($row = array_shift($rows)) {
 | 
			
		||||
	$username_sane = preg_replace("/[^a-zA-Z0-9]+/", "", $row['object']);
 | 
			
		||||
?>
 | 
			
		||||
	blacklist_<?=$username_sane;?> {
 | 
			
		||||
		priority = medium;
 | 
			
		||||
<?php
 | 
			
		||||
	$stmt = $pdo->prepare("SELECT GROUP_CONCAT(REPLACE(`value`, '*', '.*') SEPARATOR '|') AS `value` FROM `filterconf`
 | 
			
		||||
		WHERE `object`= :object
 | 
			
		||||
			AND `option` = 'blacklist_from'");
 | 
			
		||||
	$stmt->execute(array(':object' => $row['object']));
 | 
			
		||||
	$grouped_lists = $stmt->fetchAll(PDO::FETCH_COLUMN);
 | 
			
		||||
	$value_sane = preg_replace("/\.\./", ".", (preg_replace("/\*/", ".*", $grouped_lists[0])));
 | 
			
		||||
?>
 | 
			
		||||
		from = "/(<?=$value_sane;?>)/";
 | 
			
		||||
<?php
 | 
			
		||||
	if (!filter_var(trim($row['object']), FILTER_VALIDATE_EMAIL)) {
 | 
			
		||||
?>
 | 
			
		||||
		rcpt = "/.*@<?=$username_userpref['username'];?>/";
 | 
			
		||||
<?php
 | 
			
		||||
		$stmt = $pdo->prepare("SELECT `alias_domain` FROM `alias_domain`
 | 
			
		||||
			WHERE `target_domain` = :object");
 | 
			
		||||
		$stmt->execute(array(':object' => $row['object']));
 | 
			
		||||
		$rows_domain_aliases = $stmt->fetchAll(PDO::FETCH_ASSOC);
 | 
			
		||||
		while ($row_domain_aliases = array_shift($rows_domain_aliases)) {
 | 
			
		||||
?>
 | 
			
		||||
		rcpt = "<?=$row_domain_aliases['alias_domain'];?>";
 | 
			
		||||
<?php
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	else {
 | 
			
		||||
?>
 | 
			
		||||
		rcpt = "<?=$row['object'];?>";
 | 
			
		||||
<?php
 | 
			
		||||
	}
 | 
			
		||||
	$stmt = $pdo->prepare("SELECT `address` FROM `alias` WHERE `goto` = :object_goto AND `address` NOT LIKE '@%' AND `address` != :object_address");
 | 
			
		||||
	$stmt->execute(array(':object_goto' => $row['object'], ':object_address' => $row['object']));
 | 
			
		||||
	$rows_aliases_wl_1 = $stmt->fetchAll(PDO::FETCH_ASSOC);
 | 
			
		||||
	while ($row_aliases_wl_1 = array_shift($rows_aliases_wl_1)) {
 | 
			
		||||
?>
 | 
			
		||||
		rcpt = "<?=$row_aliases_wl_1['address'];?>";
 | 
			
		||||
<?php
 | 
			
		||||
	}
 | 
			
		||||
	$stmt = $pdo->prepare("SELECT CONCAT(`local_part`, '@', `alias_domain`.`alias_domain`) AS `aliases` FROM `mailbox` 
 | 
			
		||||
		LEFT OUTER JOIN `alias_domain` on `mailbox`.`domain` = `alias_domain`.`target_domain`
 | 
			
		||||
		WHERE `mailbox`.`username` = :object");
 | 
			
		||||
	$stmt->execute(array(':object' => $row['object']));
 | 
			
		||||
	$rows_aliases_wl_2 = $stmt->fetchAll(PDO::FETCH_ASSOC);
 | 
			
		||||
	while ($row_aliases_wl_2 = array_shift($rows_aliases_wl_2)) {
 | 
			
		||||
?>
 | 
			
		||||
		rcpt = "<?=$row_aliases_wl_2['aliases'];?>";
 | 
			
		||||
<?php
 | 
			
		||||
	}
 | 
			
		||||
?>
 | 
			
		||||
		apply "default" {
 | 
			
		||||
			MAILCOW_MOO = 999.0;
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
<?php
 | 
			
		||||
}
 | 
			
		||||
?>
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										1
									
								
								data/conf/rspamd/dynmaps/vars.inc.php
									
									
									
									
									
										Symbolic link
									
								
							
							
						
						
									
										1
									
								
								data/conf/rspamd/dynmaps/vars.inc.php
									
									
									
									
									
										Symbolic link
									
								
							@ -0,0 +1 @@
 | 
			
		||||
../../../web/inc/vars.inc.php
 | 
			
		||||
@ -7,3 +7,8 @@ rspamd_config.MAILCOW_AUTH = {
 | 
			
		||||
	end
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
rspamd_config.MAILCOW_MOO = function (task)
 | 
			
		||||
	return true
 | 
			
		||||
end
 | 
			
		||||
 | 
			
		||||
rspamd_config:add_map('http://nginx:8081/settings.php', "settings map", process_map)
 | 
			
		||||
 | 
			
		||||
@ -206,7 +206,7 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
 | 
			
		||||
<div class="panel-body">
 | 
			
		||||
	<?php
 | 
			
		||||
	$dnstxt_folder	= scandir($GLOBALS["MC_DKIM_TXTS"]);
 | 
			
		||||
	$dnstxt_files	= array_diff($dnstxt_folder, array('.', '..'));
 | 
			
		||||
	$dnstxt_files	= array_diff($dnstxt_folder, array('.', '..', '.dkim_pub_keys'));
 | 
			
		||||
	foreach($dnstxt_files as $file) {
 | 
			
		||||
		$str = file_get_contents($GLOBALS["MC_DKIM_TXTS"]."/".$file);
 | 
			
		||||
		$str = preg_replace('/\r|\t|\n/', '', $str);
 | 
			
		||||
 | 
			
		||||
@ -278,7 +278,7 @@ if (isset($_SESSION['mailcow_cc_role']) && ($_SESSION['mailcow_cc_role'] == "adm
 | 
			
		||||
				</form>
 | 
			
		||||
				<?php
 | 
			
		||||
				$dnstxt_folder	= scandir($GLOBALS["MC_DKIM_TXTS"]);
 | 
			
		||||
				$dnstxt_files = array_diff($dnstxt_folder, array('.', '..'));
 | 
			
		||||
				$dnstxt_files	= array_diff($dnstxt_folder, array('.', '..', '.dkim_pub_keys'));
 | 
			
		||||
				foreach($dnstxt_files as $file) {
 | 
			
		||||
					if (explode("_", $file)[1] == $domain) {
 | 
			
		||||
						$str = file_get_contents($GLOBALS["MC_DKIM_TXTS"]."/".$file);
 | 
			
		||||
 | 
			
		||||
@ -112,6 +112,13 @@ table[data-sortable].sortable-theme-bootstrap.sortable-theme-bootstrap-striped t
 | 
			
		||||
.sort-table:hover {
 | 
			
		||||
  border-bottom-color: #00B7DC !important;
 | 
			
		||||
}
 | 
			
		||||
.striped:nth-child(odd) {
 | 
			
		||||
    background-color: #fff;
 | 
			
		||||
}
 | 
			
		||||
.striped:nth-child(even) {
 | 
			
		||||
    background-color: #fafafa;
 | 
			
		||||
	border:1px solid white;
 | 
			
		||||
}
 | 
			
		||||
</style>
 | 
			
		||||
<?php
 | 
			
		||||
if (preg_match("/mailbox.php/i", $_SERVER['REQUEST_URI'])):
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										2656
									
								
								data/web/inc/otepad.php
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										2656
									
								
								data/web/inc/otepad.php
									
									
									
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
		Loading…
	
		Reference in New Issue
	
	Block a user