NobGit
public nobgit read

NobMail

Based on mailcow: dockerized

Languages

Repository composition by tracked source files.

PHP
PHP 49% JavaScript 35% HTML 9% CSS 4% Shell 2% Python 1% Lua 0% Perl 0% Ruby 0% SCSS 0%
Create file Wiki Documentation
Clone
https://nobgit.com/orgs/nobgit/nobmail.git
ssh://[email protected]:2222/orgs/nobgit/nobmail.git

Trace

data/conf/rspamd/dynmaps/aliasexp.php

Trace helps you understand code history line by line. See who changed each line, when it changed, and which commit introduced it.

aliasexp.php on main
Author Date Commit Line Code
andryyy almost 6 years ago 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
1
<?php
Open commit View diff
1 <?php
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
2
// File size is limited by Nginx site to 10M
Open commit View diff
2 // File size is limited by Nginx site to 10M
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
3
// To speed things up, we do not include prerequisites
Open commit View diff
3 // To speed things up, we do not include prerequisites
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
4
header('Content-Type: text/plain');
Open commit View diff
4 header('Content-Type: text/plain');
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
5
require_once "vars.inc.php";
Open commit View diff
5 require_once "vars.inc.php";
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
6
// Do not show errors, we log to using error_log
Open commit View diff
6 // Do not show errors, we log to using error_log
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
7
ini_set('error_reporting', 0);
Open commit View diff
7 ini_set('error_reporting', 0);
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
8
// Init database
Open commit View diff
8 // Init database
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
9
//$dsn = $database_type . ':host=' . $database_host . ';dbname=' . $database_name;
Open commit View diff
9 //$dsn = $database_type . ':host=' . $database_host . ';dbname=' . $database_name;
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
10
$dsn = $database_type . ":unix_socket=" . $database_sock . ";dbname=" . $database_name;
Open commit View diff
10 $dsn = $database_type . ":unix_socket=" . $database_sock . ";dbname=" . $database_name;
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
11
$opt = [
Open commit View diff
11 $opt = [
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
12
    PDO::ATTR_ERRMODE            => PDO::ERRMODE_EXCEPTION,
Open commit View diff
12 PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
13
    PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
Open commit View diff
13 PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
14
    PDO::ATTR_EMULATE_PREPARES   => false,
Open commit View diff
14 PDO::ATTR_EMULATE_PREPARES => false,
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
15
];
Open commit View diff
15 ];
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
16
try {
Open commit View diff
16 try {
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
17
  $pdo = new PDO($dsn, $database_user, $database_pass, $opt);
Open commit View diff
17 $pdo = new PDO($dsn, $database_user, $database_pass, $opt);
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
18
}
Open commit View diff
18 }
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
19
catch (PDOException $e) {
Open commit View diff
19 catch (PDOException $e) {
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
20
  error_log("ALIASEXP: " . $e . PHP_EOL);
Open commit View diff
20 error_log("ALIASEXP: " . $e . PHP_EOL);
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
21
  http_response_code(501);
Open commit View diff
21 http_response_code(501);
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
22
  exit;
Open commit View diff
22 exit;
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
23
}
Open commit View diff
23 }
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
24
Open commit View diff
24
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
25
// Init Redis
Open commit View diff
25 // Init Redis
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
26
$redis = new Redis();
Open commit View diff
26 $redis = new Redis();
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
27
$redis->connect('redis-mailcow', 6379);
Open commit View diff
27 $redis->connect('redis-mailcow', 6379);
FreddleSpl0it over 1 year ago 89fb132

Enable password protection for Redis

Full commit hash
89fb1322c6f486a9883e6435a73537b13fbf3582
Author
FreddleSpl0it <[email protected]>
Date
over 1 year ago
Selected line
28
$redis->auth(getenv("REDISPASS"));
Open commit View diff
28 $redis->auth(getenv("REDISPASS"));
andryyy almost 6 years ago 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
29
Open commit View diff
29
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
30
function parse_email($email) {
Open commit View diff
30 function parse_email($email) {
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
31
  if(!filter_var($email, FILTER_VALIDATE_EMAIL)) return false;
Open commit View diff
31 if(!filter_var($email, FILTER_VALIDATE_EMAIL)) return false;
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
32
  $a = strrpos($email, '@');
Open commit View diff
32 $a = strrpos($email, '@');
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
33
  return array('local' => substr($email, 0, $a), 'domain' => substr(substr($email, $a), 1));
Open commit View diff
33 return array('local' => substr($email, 0, $a), 'domain' => substr(substr($email, $a), 1));
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
34
}
Open commit View diff
34 }
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
35
if (!function_exists('getallheaders'))  {
Open commit View diff
35 if (!function_exists('getallheaders')) {
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
36
  function getallheaders() {
Open commit View diff
36 function getallheaders() {
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
37
    if (!is_array($_SERVER)) {
Open commit View diff
37 if (!is_array($_SERVER)) {
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
38
      return array();
Open commit View diff
38 return array();
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
39
    }
Open commit View diff
39 }
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
40
    $headers = array();
Open commit View diff
40 $headers = array();
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
41
    foreach ($_SERVER as $name => $value) {
Open commit View diff
41 foreach ($_SERVER as $name => $value) {
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
42
      if (substr($name, 0, 5) == 'HTTP_') {
Open commit View diff
42 if (substr($name, 0, 5) == 'HTTP_') {
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
43
        $headers[str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5)))))] = $value;
Open commit View diff
43 $headers[str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5)))))] = $value;
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
44
      }
Open commit View diff
44 }
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
45
    }
Open commit View diff
45 }
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
46
    return $headers;
Open commit View diff
46 return $headers;
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
47
  }
Open commit View diff
47 }
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
48
}
Open commit View diff
48 }
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
49
Open commit View diff
49
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
50
// Read headers
Open commit View diff
50 // Read headers
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
51
$headers = getallheaders();
Open commit View diff
51 $headers = getallheaders();
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
52
// Get rcpt
Open commit View diff
52 // Get rcpt
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
53
$rcpt = $headers['Rcpt'];
Open commit View diff
53 $rcpt = $headers['Rcpt'];
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
54
// Remove tag
Open commit View diff
54 // Remove tag
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
55
$rcpt = preg_replace('/^(.*?)\+.*(@.*)$/', '$1$2', $rcpt);
Open commit View diff
55 $rcpt = preg_replace('/^(.*?)\+.*(@.*)$/', '$1$2', $rcpt);
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
56
// Parse email address
Open commit View diff
56 // Parse email address
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
57
$parsed_rcpt = parse_email($rcpt);
Open commit View diff
57 $parsed_rcpt = parse_email($rcpt);
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
58
// Create array of final mailboxes
Open commit View diff
58 // Create array of final mailboxes
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
59
$rcpt_final_mailboxes = array();
Open commit View diff
59 $rcpt_final_mailboxes = array();
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
60
Open commit View diff
60
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
61
// Skip if not a mailcow handled domain
Open commit View diff
61 // Skip if not a mailcow handled domain
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
62
try {
Open commit View diff
62 try {
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
63
  if (!$redis->hGet('DOMAIN_MAP', $parsed_rcpt['domain'])) {
Open commit View diff
63 if (!$redis->hGet('DOMAIN_MAP', $parsed_rcpt['domain'])) {
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
64
    exit;
Open commit View diff
64 exit;
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
65
  }
Open commit View diff
65 }
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
66
}
Open commit View diff
66 }
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
67
catch (RedisException $e) {
Open commit View diff
67 catch (RedisException $e) {
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
68
  error_log("ALIASEXP: " . $e . PHP_EOL);
Open commit View diff
68 error_log("ALIASEXP: " . $e . PHP_EOL);
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
69
  http_response_code(504);
Open commit View diff
69 http_response_code(504);
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
70
  exit;
Open commit View diff
70 exit;
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
71
}
Open commit View diff
71 }
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
72
Open commit View diff
72
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
73
// Always assume rcpt is not a final mailbox but an alias for a mailbox or further aliases
Open commit View diff
73 // Always assume rcpt is not a final mailbox but an alias for a mailbox or further aliases
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
74
//
Open commit View diff
74 //
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
75
//             rcpt
Open commit View diff
75 // rcpt
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
76
//              |
Open commit View diff
76 // |
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
77
// mailbox <-- goto ---> alias1, alias2, mailbox2
Open commit View diff
77 // mailbox <-- goto ---> alias1, alias2, mailbox2
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
78
//                          |       |
Open commit View diff
78 // | |
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
79
//                      mailbox3    |
Open commit View diff
79 // mailbox3 |
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
80
//                                  |
Open commit View diff
80 // |
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
81
//                               alias3 ---> mailbox4
Open commit View diff
81 // alias3 ---> mailbox4
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
82
//
Open commit View diff
82 //
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
83
try {
Open commit View diff
83 try {
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
84
  $stmt = $pdo->prepare("SELECT `goto` FROM `alias` WHERE `address` = :rcpt AND `active` = '1'");
Open commit View diff
84 $stmt = $pdo->prepare("SELECT `goto` FROM `alias` WHERE `address` = :rcpt AND `active` = '1'");
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
85
  $stmt->execute(array(
Open commit View diff
85 $stmt->execute(array(
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
86
    ':rcpt' => $rcpt
Open commit View diff
86 ':rcpt' => $rcpt
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
87
  ));
Open commit View diff
87 ));
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
88
  $gotos = $stmt->fetch(PDO::FETCH_ASSOC)['goto'];
Open commit View diff
88 $gotos = $stmt->fetch(PDO::FETCH_ASSOC)['goto'];
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
89
  if (empty($gotos)) {
Open commit View diff
89 if (empty($gotos)) {
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
90
    $stmt = $pdo->prepare("SELECT `goto` FROM `alias` WHERE `address` = :rcpt AND `active` = '1'");
Open commit View diff
90 $stmt = $pdo->prepare("SELECT `goto` FROM `alias` WHERE `address` = :rcpt AND `active` = '1'");
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
91
    $stmt->execute(array(
Open commit View diff
91 $stmt->execute(array(
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
92
      ':rcpt' => '@' . $parsed_rcpt['domain']
Open commit View diff
92 ':rcpt' => '@' . $parsed_rcpt['domain']
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
93
    ));
Open commit View diff
93 ));
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
94
    $gotos = $stmt->fetch(PDO::FETCH_ASSOC)['goto'];
Open commit View diff
94 $gotos = $stmt->fetch(PDO::FETCH_ASSOC)['goto'];
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
95
  }
Open commit View diff
95 }
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
96
  if (empty($gotos)) {
Open commit View diff
96 if (empty($gotos)) {
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
97
    $stmt = $pdo->prepare("SELECT `target_domain` FROM `alias_domain` WHERE `alias_domain` = :rcpt AND `active` = '1'");
Open commit View diff
97 $stmt = $pdo->prepare("SELECT `target_domain` FROM `alias_domain` WHERE `alias_domain` = :rcpt AND `active` = '1'");
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
98
    $stmt->execute(array(':rcpt' => $parsed_rcpt['domain']));
Open commit View diff
98 $stmt->execute(array(':rcpt' => $parsed_rcpt['domain']));
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
99
    $goto_branch = $stmt->fetch(PDO::FETCH_ASSOC)['target_domain'];
Open commit View diff
99 $goto_branch = $stmt->fetch(PDO::FETCH_ASSOC)['target_domain'];
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
100
    if ($goto_branch) {
Open commit View diff
100 if ($goto_branch) {
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
101
      $gotos = $parsed_rcpt['local'] . '@' . $goto_branch;
Open commit View diff
101 $gotos = $parsed_rcpt['local'] . '@' . $goto_branch;
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
102
    }
Open commit View diff
102 }
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
103
  }
Open commit View diff
103 }
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
104
  $gotos_array = explode(',', $gotos);
Open commit View diff
104 $gotos_array = explode(',', $gotos);
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
105
Open commit View diff
105
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
106
  $loop_c = 0;
Open commit View diff
106 $loop_c = 0;
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
107
Open commit View diff
107
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
108
  while (count($gotos_array) != 0 && $loop_c <= 20) {
Open commit View diff
108 while (count($gotos_array) != 0 && $loop_c <= 20) {
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
109
Open commit View diff
109
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
110
    // Loop through all found gotos
Open commit View diff
110 // Loop through all found gotos
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
111
    foreach ($gotos_array as $index => &$goto) {
Open commit View diff
111 foreach ($gotos_array as $index => &$goto) {
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
112
      error_log("ALIAS EXPANDER: http pipe: query " . $goto . " as username from mailbox" . PHP_EOL);
Open commit View diff
112 error_log("ALIAS EXPANDER: http pipe: query " . $goto . " as username from mailbox" . PHP_EOL);
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
113
      $stmt = $pdo->prepare("SELECT `username` FROM `mailbox` WHERE `username` = :goto AND (`active`= '1' OR `active`= '2');");
Open commit View diff
113 $stmt = $pdo->prepare("SELECT `username` FROM `mailbox` WHERE `username` = :goto AND (`active`= '1' OR `active`= '2');");
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
114
      $stmt->execute(array(':goto' => $goto));
Open commit View diff
114 $stmt->execute(array(':goto' => $goto));
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
115
      $username = $stmt->fetch(PDO::FETCH_ASSOC)['username'];
Open commit View diff
115 $username = $stmt->fetch(PDO::FETCH_ASSOC)['username'];
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
116
      if (!empty($username)) {
Open commit View diff
116 if (!empty($username)) {
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
117
        error_log("ALIAS EXPANDER: http pipe: mailbox found: " . $username . PHP_EOL);
Open commit View diff
117 error_log("ALIAS EXPANDER: http pipe: mailbox found: " . $username . PHP_EOL);
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
118
        // Current goto is a mailbox, save to rcpt_final_mailboxes if not a duplicate
Open commit View diff
118 // Current goto is a mailbox, save to rcpt_final_mailboxes if not a duplicate
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
119
        if (!in_array($username, $rcpt_final_mailboxes)) {
Open commit View diff
119 if (!in_array($username, $rcpt_final_mailboxes)) {
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
120
          $rcpt_final_mailboxes[] = $username;
Open commit View diff
120 $rcpt_final_mailboxes[] = $username;
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
121
        }
Open commit View diff
121 }
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
122
      }
Open commit View diff
122 }
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
123
      else {
Open commit View diff
123 else {
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
124
        $parsed_goto = parse_email($goto);
Open commit View diff
124 $parsed_goto = parse_email($goto);
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
125
        if (!$redis->hGet('DOMAIN_MAP', $parsed_goto['domain'])) {
Open commit View diff
125 if (!$redis->hGet('DOMAIN_MAP', $parsed_goto['domain'])) {
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
126
          error_log("ALIAS EXPANDER:" . $goto . " is not a mailcow handled mailbox or alias address" . PHP_EOL);
Open commit View diff
126 error_log("ALIAS EXPANDER:" . $goto . " is not a mailcow handled mailbox or alias address" . PHP_EOL);
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
127
        }
Open commit View diff
127 }
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
128
        else {
Open commit View diff
128 else {
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
129
          $stmt = $pdo->prepare("SELECT `goto` FROM `alias` WHERE `address` = :goto AND `active` = '1'");
Open commit View diff
129 $stmt = $pdo->prepare("SELECT `goto` FROM `alias` WHERE `address` = :goto AND `active` = '1'");
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
130
          $stmt->execute(array(':goto' => $goto));
Open commit View diff
130 $stmt->execute(array(':goto' => $goto));
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
131
          $goto_branch = $stmt->fetch(PDO::FETCH_ASSOC)['goto'];
Open commit View diff
131 $goto_branch = $stmt->fetch(PDO::FETCH_ASSOC)['goto'];
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
132
          if ($goto_branch) {
Open commit View diff
132 if ($goto_branch) {
andryyy almost 6 years ago 5cd6bed

[Rspamd] Fix typo in alias resolvers

Full commit hash
5cd6bed70155c63de3833eed65b80a6fe02b4e13
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
133
            error_log("ALIAS EXPANDER: http pipe: goto address " . $goto . " is an alias branch for " . $goto_branch . PHP_EOL);
Open commit View diff
133 error_log("ALIAS EXPANDER: http pipe: goto address " . $goto . " is an alias branch for " . $goto_branch . PHP_EOL);
andryyy almost 6 years ago 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
134
            $goto_branch_array = explode(',', $goto_branch);
Open commit View diff
134 $goto_branch_array = explode(',', $goto_branch);
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
135
          } else {
Open commit View diff
135 } else {
Patrik Kernstock 10 months ago d06d23b

Fix several SQL statements

Full commit hash
d06d23bbaf528f5edfb26d32d3d693b8005fc81e
Author
Patrik Kernstock <[email protected]>
Date
10 months ago
Selected line
136
            $stmt = $pdo->prepare("SELECT `target_domain` FROM `alias_domain` WHERE `alias_domain` = :domain AND `active` = '1'");
Open commit View diff
136 $stmt = $pdo->prepare("SELECT `target_domain` FROM `alias_domain` WHERE `alias_domain` = :domain AND `active` = '1'");
andryyy almost 6 years ago 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
137
            $stmt->execute(array(':domain' => $parsed_goto['domain']));
Open commit View diff
137 $stmt->execute(array(':domain' => $parsed_goto['domain']));
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
138
            $goto_branch = $stmt->fetch(PDO::FETCH_ASSOC)['target_domain'];
Open commit View diff
138 $goto_branch = $stmt->fetch(PDO::FETCH_ASSOC)['target_domain'];
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
139
            if ($goto_branch) {
Open commit View diff
139 if ($goto_branch) {
andryyy almost 6 years ago 5cd6bed

[Rspamd] Fix typo in alias resolvers

Full commit hash
5cd6bed70155c63de3833eed65b80a6fe02b4e13
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
140
              error_log("ALIAS EXPANDER: http pipe: goto domain " . $parsed_goto['domain'] . " is a domain alias branch for " . $goto_branch . PHP_EOL);
Open commit View diff
140 error_log("ALIAS EXPANDER: http pipe: goto domain " . $parsed_goto['domain'] . " is a domain alias branch for " . $goto_branch . PHP_EOL);
same change 5cd6bed

[Rspamd] Fix typo in alias resolvers

Full commit hash
5cd6bed70155c63de3833eed65b80a6fe02b4e13
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
141
              $goto_branch_array = array($parsed_goto['local'] . '@' . $goto_branch);
Open commit View diff
141 $goto_branch_array = array($parsed_goto['local'] . '@' . $goto_branch);
andryyy almost 6 years ago 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
142
            }
Open commit View diff
142 }
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
143
          }
Open commit View diff
143 }
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
144
        }
Open commit View diff
144 }
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
145
      }
Open commit View diff
145 }
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
146
      // goto item was processed, unset
Open commit View diff
146 // goto item was processed, unset
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
147
      unset($gotos_array[$index]);
Open commit View diff
147 unset($gotos_array[$index]);
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
148
    }
Open commit View diff
148 }
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
149
Open commit View diff
149
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
150
    // Merge goto branch array derived from previous loop (if any), filter duplicates and unset goto branch array
Open commit View diff
150 // Merge goto branch array derived from previous loop (if any), filter duplicates and unset goto branch array
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
151
    if (!empty($goto_branch_array)) {
Open commit View diff
151 if (!empty($goto_branch_array)) {
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
152
      $gotos_array = array_unique(array_merge($gotos_array, $goto_branch_array));
Open commit View diff
152 $gotos_array = array_unique(array_merge($gotos_array, $goto_branch_array));
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
153
      unset($goto_branch_array);
Open commit View diff
153 unset($goto_branch_array);
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
154
    }
Open commit View diff
154 }
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
155
Open commit View diff
155
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
156
    // Reindex array
Open commit View diff
156 // Reindex array
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
157
    $gotos_array = array_values($gotos_array);
Open commit View diff
157 $gotos_array = array_values($gotos_array);
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
158
Open commit View diff
158
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
159
    // Force exit if loop cannot be solved
Open commit View diff
159 // Force exit if loop cannot be solved
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
160
    // Postfix does not allow for alias loops, so this should never happen.
Open commit View diff
160 // Postfix does not allow for alias loops, so this should never happen.
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
161
    $loop_c++;
Open commit View diff
161 $loop_c++;
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
162
    error_log("ALIAS EXPANDER: http pipe: goto array count on loop #". $loop_c . " is " . count($gotos_array) . PHP_EOL);
Open commit View diff
162 error_log("ALIAS EXPANDER: http pipe: goto array count on loop #". $loop_c . " is " . count($gotos_array) . PHP_EOL);
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
163
  }
Open commit View diff
163 }
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
164
}
Open commit View diff
164 }
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
165
catch (PDOException $e) {
Open commit View diff
165 catch (PDOException $e) {
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
166
  error_log("ALIAS EXPANDER: " . $e->getMessage() . PHP_EOL);
Open commit View diff
166 error_log("ALIAS EXPANDER: " . $e->getMessage() . PHP_EOL);
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
167
  http_response_code(502);
Open commit View diff
167 http_response_code(502);
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
168
  exit;
Open commit View diff
168 exit;
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
169
}
Open commit View diff
169 }
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
170
Open commit View diff
170
andryyy over 5 years ago 9034e0f

[Rspamd] Fix tag handling for mailboxes

Full commit hash
9034e0f3a8117b10cbff04d1ed650fa25556aefe
Author
andryyy <[email protected]>
Date
over 5 years ago
Selected line
171
// Does also return the mailbox name if question == answer (query == mailbox)
Open commit View diff
171 // Does also return the mailbox name if question == answer (query == mailbox)
same change 9034e0f

[Rspamd] Fix tag handling for mailboxes

Full commit hash
9034e0f3a8117b10cbff04d1ed650fa25556aefe
Author
andryyy <[email protected]>
Date
over 5 years ago
Selected line
172
if (count($rcpt_final_mailboxes) == 1) {
Open commit View diff
172 if (count($rcpt_final_mailboxes) == 1) {
andryyy almost 6 years ago 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
173
  error_log("ALIASEXP: direct alias " . $rcpt . " expanded to " . $rcpt_final_mailboxes[0] . PHP_EOL);
Open commit View diff
173 error_log("ALIASEXP: direct alias " . $rcpt . " expanded to " . $rcpt_final_mailboxes[0] . PHP_EOL);
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
174
  echo trim($rcpt_final_mailboxes[0]);
Open commit View diff
174 echo trim($rcpt_final_mailboxes[0]);
same change 0c30d32

[Rspamd] Resolve direct aliases (also fixes tagging options)

Full commit hash
0c30d32fdb94e858318fe2bfbf81c2540741b221
Author
andryyy <[email protected]>
Date
almost 6 years ago
Selected line
175
}
Open commit View diff
175 }