Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add handling for unhandled exceptions #63

Merged
merged 2 commits into from
May 14, 2018
Merged

Add handling for unhandled exceptions #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3573328
Catch IOError in addition to OSError in on_message
tofu-rocketry May 10, 2018
ae2ca4d
Add handling of msgs with no blankline before body
tofu-rocketry May 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ssm/crypto.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,10 @@ def verify(signed_text, capath, check_crl):

# SMIME header and message body are separated by a blank line
lines = message.strip().splitlines()
blankline = lines.index('')
try:
blankline = lines.index('')
except ValueError:
raise CryptoException('No blank line between message header and body')
headers = '\n'.join(lines[:blankline])
body = '\n'.join(lines[blankline + 1:])
# two possible encodings
Expand Down
2 changes: 1 addition & 1 deletion ssm/ssm2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ def on_message(self, headers, body):
'empaid': empaid})
log.info("Message saved to incoming queue as %s", name)

except OSError, e:
except (IOError, OSError) as e:
log.error('Failed to read or write file: %s', e)

def on_error(self, unused_headers, body):
Expand Down