Merge branch 'dev' of https://github.com/mailcow/mailcow-dockerized into dev
This commit is contained in:
		
						commit
						92e8233c92
					
				@ -28,17 +28,28 @@ function in_net($addr, $net) {
 | 
			
		||||
  return substr($addr_bin, 0, $mask) == substr($net_bin, 0, $mask);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
try {
 | 
			
		||||
  foreach ($redis->hGetAll('WHITELISTED_FWD_HOST') as $host => $source) {
 | 
			
		||||
    if (in_net($_GET['host'], $host)) {
 | 
			
		||||
      echo '200 PERMIT';
 | 
			
		||||
      exit;
 | 
			
		||||
if (isset($_GET['host'])) {
 | 
			
		||||
  try {
 | 
			
		||||
    foreach ($redis->hGetAll('WHITELISTED_FWD_HOST') as $host => $source) {
 | 
			
		||||
      if (in_net($_GET['host'], $host)) {
 | 
			
		||||
        echo '200 PERMIT';
 | 
			
		||||
        exit;
 | 
			
		||||
      }
 | 
			
		||||
    }
 | 
			
		||||
    echo '200 DUNNO';
 | 
			
		||||
  }
 | 
			
		||||
  catch (RedisException $e) {
 | 
			
		||||
    echo '200 DUNNO';
 | 
			
		||||
    exit;
 | 
			
		||||
  }
 | 
			
		||||
} else {
 | 
			
		||||
  try {
 | 
			
		||||
    foreach ($redis->hGetAll('WHITELISTED_FWD_HOST') as $host => $source) {
 | 
			
		||||
      echo $host . "\n";
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
  echo '200 DUNNO';
 | 
			
		||||
}
 | 
			
		||||
catch (RedisException $e) {
 | 
			
		||||
  echo '200 DUNNO';
 | 
			
		||||
  exit;
 | 
			
		||||
  catch (RedisException $e) {
 | 
			
		||||
    exit;
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
?>
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										1
									
								
								data/conf/rspamd/local.d/greylist.conf
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								data/conf/rspamd/local.d/greylist.conf
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1 @@
 | 
			
		||||
whitelisted_ip = "http://172.22.1.251:8081/forwardinghosts.php";
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user