Commit Graph

317 Commits (1774c99e0d13dc3d2502fcc424bf347b4d5004d9)

Author SHA1 Message Date
Steve Clement 5701432d1f
Merge remote-tracking branch 'upstream/main' into main 2021-09-30 12:35:12 +09:00
Steve Clement 89c3a2c117
fix: [travis] chardet dep 2021-09-30 09:50:32 +09:00
Steve Clement 70cb5ec0e7
fix: [doc] travis link 2021-09-30 09:32:04 +09:00
Steve Clement b5e6515e05
Merge pull request #57 from SteveClement/main 2021-09-30 09:29:49 +09:00
Steve Clement dd56497fb5
chg: [doc] travis link fix 2021-09-30 09:29:14 +09:00
Steve Clement bc16f91d27
Merge pull request #56 from SteveClement/main 2021-09-30 09:28:11 +09:00
Steve Clement 721a412d0b
chg: [py] updated requirements 2021-09-30 09:26:26 +09:00
Steve Clement b67189253f
chg: [doc] Updated readme 2021-09-30 09:06:35 +09:00
Steve Clement 3910a8fe55
Merge pull request #54 from SteveClement/main 2021-09-30 08:59:42 +09:00
Steve Clement 63e444862b
chg: [py] udpate poetry.lock 2021-09-30 08:58:57 +09:00
Steve Clement 3da1bff8bc
Merge branch 'MISP:main' into main 2021-09-30 08:43:20 +09:00
Raphaël Vinot 5728a8b1bd
Merge pull request #55 from MISP/dependabot/pip/urllib3-1.26.5
build(deps): bump urllib3 from 1.26.4 to 1.26.5
2021-06-01 16:53:04 -07:00
dependabot[bot] 1e8a2ba746
build(deps): bump urllib3 from 1.26.4 to 1.26.5
Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.26.4 to 1.26.5.
- [Release notes](https://github.com/urllib3/urllib3/releases)
- [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst)
- [Commits](https://github.com/urllib3/urllib3/compare/1.26.4...1.26.5)

---
updated-dependencies:
- dependency-name: urllib3
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-01 23:19:33 +00:00
Steve Clement d089f35a3b
chg: [py] faup 2021-04-02 17:44:06 +09:00
Steve Clement 1d29d26eed
chg: [py] pyfaup no optional 2021-04-02 17:41:15 +09:00
Steve Clement 4425766c25
chg: [py] poetry update 2021-04-02 17:37:45 +09:00
Steve Clement 242ebd89aa
chg: [py] Update lock file 2021-04-02 17:02:32 +09:00
Steve Clement aa1d284c90
chg: [py] Updated poetry 2021-04-02 16:58:56 +09:00
Steve Clement 4cf03fc793
fix: [ci] Travis fix 2021-04-02 16:51:28 +09:00
Steve Clement d01b597ecd
Merge pull request #53 from SteveClement/main 2021-04-02 11:00:17 +09:00
Steve Clement f77c6a3b03
chg: [doc] (c) bump 2021-04-02 10:35:55 +09:00
Steve Clement 2e68a84cb4
Merge pull request #52 from SteveClement/main
chg: [py] requirements.txt update
2021-04-02 10:33:18 +09:00
Steve Clement 9ee64f95f0
chg: [py] requirements.txt update 2021-04-02 10:32:05 +09:00
Steve Clement c8b9418b0a
Merge pull request #51 from SteveClement/main 2021-04-02 10:25:07 +09:00
Steve Clement 5d048f8f16
chg: [py] Updated poetry.lock, bumped pyLief 2021-04-02 10:23:33 +09:00
Steve Clement 94e8bd2a2a
chg: [py] updated requirements.txt 2021-04-02 10:04:26 +09:00
Alexandre Dulaunoy 6a2a932851
Merge pull request #50 from MISP/dependabot/pip/jinja2-2.11.3
build(deps): bump jinja2 from 2.11.2 to 2.11.3
2021-03-20 08:39:04 +01:00
dependabot[bot] af310665b9
build(deps): bump jinja2 from 2.11.2 to 2.11.3
Bumps [jinja2](https://github.com/pallets/jinja) from 2.11.2 to 2.11.3.
- [Release notes](https://github.com/pallets/jinja/releases)
- [Changelog](https://github.com/pallets/jinja/blob/master/CHANGES.rst)
- [Commits](https://github.com/pallets/jinja/compare/2.11.2...2.11.3)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-20 01:22:24 +00:00
Raphaël Vinot 5eabf6fb0d
Merge pull request #49 from eidurorng/fix-external-analysis-classification
Quick fix for everything getting classified as external analysis
2021-01-26 09:56:08 +01:00
eidurorng 5ccb365f93 Quick fix for everything getting classified as external analysis
With the OR statement everything gets classified as external analysis when not running with --urlsonly.
2021-01-25 18:03:18 +00:00
Raphaël Vinot 3818ac92ea new: Add freetext import of the whole body 2021-01-25 17:54:58 +01:00
Steve Clement ad36ff599d
Merge pull request #44 from SteveClement/main
chg: [py] Bumped requirements.txt
2020-07-14 19:12:23 +09:00
Steve Clement 3e931448a9
chg: [py] Bumped requirements.txt 2020-07-15 04:11:04 +09:00
Raphaël Vinot 851a98177e
Update README.md 2020-06-16 13:13:25 +02:00
Raphaël Vinot 8680e5fb64 chg: Cleanup, bump deps, bump readme 2020-06-16 12:03:59 +02:00
Raphaël Vinot 5b10290700 fix: libfuzzy-dev is required on travis 2020-06-07 21:34:39 +02:00
Raphaël Vinot 190a771ccb chg: Use poetry 2020-06-07 21:28:15 +02:00
Raphaël Vinot 4735383c2c chg: Bump dependencies 2020-06-07 20:55:34 +02:00
Raphaël Vinot 8e6a62e7df chg: bump tests 2020-06-07 20:44:51 +02:00
Raphaël Vinot 7ab2b432df
Merge pull request #42 from TheMysteriousX/master
multipart messages can be nested within each other
2020-06-07 20:44:00 +02:00
Raphaël Vinot 62a596146b
Merge branch 'master' into master 2020-06-07 20:41:47 +02:00
Raphaël Vinot 68b334df38
Merge pull request #39 from begunrom/carrier_mail_with_emailattachments
Carrier mail with emailattachments
2020-06-07 20:40:34 +02:00
Adam Bishop 8c2777585a multipart messages can be nested within each other
An example of something that does this is GPG, when operating in PGP/MIME
mode.

The Python documentation remarks that an attachment is anything that isn't
a body - meaning that if there are multipart messages nested within each
other, the containers will be flagged as an attachment.

When get_content() is called on the attachment, it fails with an unhandled
KeyError as there is no attachment handler for multipart.

This change wraps the get_content() call in a try...catch, and returns if
an attachment type unsupported by the runtime is present.

```
Traceback (most recent call last):
  File "/Users/adamb/mail_to_misp/tests/tests.py", line 89, in test_nested_mime
    self.mail2misp.process_email_body()
  File "./mail2misp/mail2misp.py", line 188, in process_email_body
    self._find_attached_forward()
  File "./mail2misp/mail2misp.py", line 88, in _find_attached_forward
    attachment_content = attachment.get_content()
  File "/usr/local/Cellar/python/3.7.7/Frameworks/Python.framework/Versions/3.7/lib/python3.7/email/message.py", line 1096, in get_content
    return content_manager.get_content(self, *args, **kw)
  File "/usr/local/Cellar/python/3.7.7/Frameworks/Python.framework/Versions/3.7/lib/python3.7/email/contentmanager.py", line 25, in get_content
    raise KeyError(content_type)
KeyError: 'multipart/mixed'
```
2020-06-07 00:31:56 +01:00
Steve Clement 721d806e8d
Merge pull request #41 from SteveClement/master
chg: [pip] Fix deps
2020-04-30 22:57:35 +09:00
Steve Clement 72d369fd2f
chg: [pip] Fix deps 2020-04-30 22:56:36 +09:00
Steve Clement b29f8fdf75
fix: [py] Update wrapt to 1.12.1 2020-04-27 19:21:01 +09:00
Steve Clement 3ed0d5280b
fix: [py] lief is now 0.10.1 stable 2020-04-27 19:16:55 +09:00
begunrom 92c99c0559 exclude attachements of size 0 bytes
Optionally exclude attachments that are 0 bytes long
2019-11-19 10:13:36 +01:00
begunrom b02cce7d14 added unit test for carrier 2019-11-17 09:45:30 +01:00
begunrom 6070d6428c fixed wrong exception handling
Except block handles 'BaseException'
2019-11-17 09:45:12 +01:00