Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
pymilter-suspicious-from
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
misc
pymilter-suspicious-from
Commits
574dafe1
Commit
574dafe1
authored
5 years ago
by
Jan Philipp Timme
Browse files
Options
Downloads
Patches
Plain Diff
Fix uncaught exceptions while decoding
parent
894e8627
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
main.py
+14
-1
14 additions, 1 deletion
main.py
with
14 additions
and
1 deletion
main.py
+
14
−
1
View file @
574dafe1
...
@@ -32,7 +32,12 @@ def get_decoded_header(value):
...
@@ -32,7 +32,12 @@ def get_decoded_header(value):
decoded_header_items
=
decode_header
(
value
)
decoded_header_items
=
decode_header
(
value
)
decoded_header_value
=
''
decoded_header_value
=
''
for
item
in
decoded_header_items
:
for
item
in
decoded_header_items
:
try
:
decoded_item
=
item
[
0
].
decode
(
item
[
1
],
'
ignore
'
)
if
item
[
1
]
is
not
None
else
item
[
0
]
decoded_item
=
item
[
0
].
decode
(
item
[
1
],
'
ignore
'
)
if
item
[
1
]
is
not
None
else
item
[
0
]
except
:
logger
.
warning
(
f
"
Decoding went wrong for value
'
{
value
}
'
!
"
)
# Pretend decoded item is empty :-(
decoded_item
=
''
if
isinstance
(
decoded_item
,
bytes
):
if
isinstance
(
decoded_item
,
bytes
):
decoded_item
=
decoded_item
.
decode
(
'
ascii
'
,
'
ignore
'
)
decoded_item
=
decoded_item
.
decode
(
'
ascii
'
,
'
ignore
'
)
decoded_header_value
+=
decoded_item
decoded_header_value
+=
decoded_item
...
@@ -121,6 +126,14 @@ def main():
...
@@ -121,6 +126,14 @@ def main():
Milter
.
runmilter
(
"
SuspiciousFromMilter
"
,
config
.
milter_socket
,
config
.
milter_timeout
,
rmsock
=
False
)
Milter
.
runmilter
(
"
SuspiciousFromMilter
"
,
config
.
milter_socket
,
config
.
milter_timeout
,
rmsock
=
False
)
logger
.
info
(
f
"
Milter finished running.
"
)
logger
.
info
(
f
"
Milter finished running.
"
)
def
test
():
# simple method to deal with unexpected exceptions on the fly :(
test_from_value
=
'
=?UNKNOWN?Q?Nat=E1lia?= Reis via DBWorld <dbworld@cs.wisc.edu>
'
logger
.
info
(
f
"
Begin of test().
"
)
test_instance
=
SuspiciousFrom
()
test_instance
.
header
(
'
from
'
,
test_from_value
)
logger
.
info
(
f
"
End of test().
"
)
if
__name__
==
"
__main__
"
:
if
__name__
==
"
__main__
"
:
#test()
main
()
main
()
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment