Page MenuHomePhorge
Files F117715389

D4217.1774887617.diff
No OneTemporary
Actions

Authored By
Unknown
Size
2 KB
Referenced Files
None
Subscribers
None

D4217.1774887617.diff
View Options

diff --git a/extras/kolab_policy_spf b/extras/kolab_policy_spf
--- a/extras/kolab_policy_spf
+++ b/extras/kolab_policy_spf
@@ -7,9 +7,14 @@
import json
import time
import sys
+import logging
+from logging.handlers import SysLogHandler
import requests
+logger = logging.getLogger(__name__)
+logger.setLevel(logging.INFO)
+logger.addHandler(SysLogHandler())
def read_request_input():
"""
@@ -23,6 +28,7 @@
while not end_of_request:
if (time.time() - start_time) >= 10:
+ logger.warning("policy/spf took too long reading the request.")
print("action=DEFER_IF_PERMIT Temporary error, try again later.\n")
sys.stdout.flush()
sys.exit(0)
@@ -57,6 +63,7 @@
)
# pylint: disable=broad-except
except Exception:
+ logger.warning("policy/spf request failed.")
print("action=DEFER_IF_PERMIT Temporary error, try again later.\n")
sys.stdout.flush()
sys.exit(0)
@@ -65,6 +72,7 @@
R = json.loads(RESPONSE.text)
# pylint: disable=broad-except
except Exception:
+ logger.warning("Failed to load json from policy/spf request.")
print("action=DEFER_IF_PERMIT Temporary error, try again later.\n")
sys.stdout.flush()
sys.exit(0)
@@ -73,10 +81,15 @@
for prepend in R['prepend']:
print("action=PREPEND {0}".format(prepend))
+ if 'log' in R:
+ for line in R['log']:
+ logger.warning(line)
+
if RESPONSE.ok:
print("action={0}\n".format(R['response']))
else:
print("action={0} {1}\n".format(R['response'], R['reason']))
+ logger.warning("spf failed with reason: %s" % R['reason'])
sys.stdout.flush()
sys.exit(0)
diff --git a/src/app/Http/Controllers/API/V4/PolicyController.php b/src/app/Http/Controllers/API/V4/PolicyController.php
--- a/src/app/Http/Controllers/API/V4/PolicyController.php
+++ b/src/app/Http/Controllers/API/V4/PolicyController.php
@@ -252,7 +252,8 @@
return response()->json(
[
'response' => 'DEFER_IF_PERMIT',
- 'reason' => 'Temporary error. Please try again later.'
+ 'reason' => 'Temporary error. Please try again later.',
+ 'log' => ["SPF: Request without client_address: " . json_encode($data)]
],
403
);
@@ -267,7 +268,8 @@
return response()->json(
[
'response' => 'DEFER_IF_PERMIT',
- 'reason' => 'Temporary error. Please try again later.'
+ 'reason' => 'Temporary error. Please try again later.',
+ 'log' => ["SPF: Request without recognizable network: " . json_encode($data)]
],
403
);

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 30, 4:20 PM (6 d, 13 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
18816480
Default Alt Text
D4217.1774887617.diff (2 KB)

Event Timeline