Commit Graph

434 Commits (75d96b2d7a89406997035a1715de7c3cbce2303b)

Author SHA1 Message Date
CheYenBzh 01770aa51e Add function to fetch all events from a feed
Function takes the feed id as argument (-f).
2017-05-29 13:57:02 +02:00
Raphaël Vinot b43722c73f Make pep8 happy 2017-05-24 07:38:17 +02:00
George 0bdef56001 Fix not_values type check in __prepare_rest_search 2017-05-19 18:19:21 +02:00
Hannah Ward a7892c03ff
fix: Don't even bother trying with futuressession if Async isn't ok
fixes #85
2017-05-16 10:27:54 +01:00
Tristan METAYER d72d3dceb7 correction for https://travis-ci.org/MISP/misp-modules/jobs/231065469
code refactoring

add new composite
2017-05-15 20:25:16 +02:00
Raphaël Vinot 619cb10403 Cleanup warning function 2017-05-03 16:52:57 +02:00
Raphaël Vinot 8b3d17c5d0 Fix typos 2017-05-03 16:49:51 +02:00
Raphaël Vinot db768ffef0 Merge pull request #82 from truckydev/master
add mapping and composite feature
2017-05-03 16:35:22 +02:00
Raphaël Vinot e76f19e793 Merge pull request #83 from bernhl/fix_api_version_check
Fix checks of recommended version
2017-05-03 15:57:42 +02:00
Raphaël Vinot ba6568eb46 Merge branch 'master' into logging 2017-05-03 15:42:01 +02:00
Tristan METAYER e232392335 remove unused variable 2017-05-03 15:36:08 +02:00
Tristan METAYER 2267e8a97b remove category
It will be automaticly detected
https://github.com/MISP/PyMISP/blob/master/pymisp/tools/openioc.py
2017-05-03 15:19:27 +02:00
Lukas Bernhard 3e4e76c21e Fix checks of recommended version 2017-05-03 14:49:16 +02:00
fluxas 0bee414592 Use logging instead of print; deprecate debug param 2017-05-03 14:14:13 +02:00
fluxas 6ec2513184 Add exception types to api.py 2017-05-03 13:22:15 +02:00
Hannah Ward e5f9c0b704
new: Enable async option for search() 2017-05-03 10:13:18 +01:00
Tristan METAYER 6548ed6e6f revert tab to escape 2017-05-03 10:56:41 +02:00
Hannah Ward d2b0c506a4
Merge branch 'master' of github.com:MISP/PyMISP 2017-05-03 09:47:44 +01:00
Hannah Ward 36661439cc
Merge branch 'async' 2017-05-03 09:43:45 +01:00
Paul A 9bfa24155c Normalize output between misp.search_index and misp.search
Fix issue: https://github.com/CIRCL/PyMISP/issues/78
2017-05-03 10:32:14 +02:00
Tristan METAYER abe54225b7 Ajout de mapping
Ajout de la prise en compte d'autre composite
2017-05-02 18:47:53 +02:00
Hannah Ward e86ffab5f4 Merge branch 'master' of github.com:MISP/PyMISP 2017-05-02 12:10:23 +01:00
Hannah Ward e7f9731179
fix: can't instantiate basestring
fixes #76
2017-05-02 12:09:59 +01:00
Hannah Ward a81e8f0b6d
fix: Added docstring for search 2017-05-02 10:12:25 +01:00
Hannah Ward 8f9e2a77e5
fix: Add docstring for asynch 2017-05-02 10:11:01 +01:00
Raphaël Vinot a4ac1b2c7f Quick and dirty fix for #97 2017-04-14 14:41:55 +02:00
Raphaël Vinot 4a2021f244 Fix testing 2017-04-13 16:56:28 +02:00
Raphaël Vinot 52a87ccfe0 Allow to pass some parameters as False or 0.
When creating or updating users and organisations

Fix #70
2017-04-13 15:05:13 +02:00
Raphaël Vinot 60b78fd885 Use POST instead of get in search_index
Fix #73
2017-04-13 14:51:50 +02:00
Raphaël Vinot c74cdd19c6 Fix typos and pep8 2017-04-11 15:59:12 +02:00
Raphaël Vinot bd7d782716 Update types 2017-04-11 15:55:49 +02:00
Raphaël Vinot 6d76141c35 Version Dump 2017-04-11 15:53:26 +02:00
Hannah Ward bcffa2f310
fix: Pass disable_correlation flag from add_attribute 2017-04-11 14:35:41 +01:00
Raphaël Vinot deb88969b5 Merge pull request #69 from SekoiaLab/fix/serverCreation
Fix/server creation
2017-04-11 10:51:01 +02:00
Raphaël Vinot 816bd0b6d5 Merge pull request #71 from SekoiaLab/fix/remoteOrgUUID
fix: raise exception if uuid not setted in remote org
2017-04-11 10:47:48 +02:00
Raphaël Vinot 540c54e2c1 Merge pull request #72 from SekoiaLab/feat/getAllOrganisations
feat: add filter to specify which organisation to list
2017-04-11 10:47:02 +02:00
Adrien RAFFIN 4ecfc1ada4 feat: add filter to specify which organisation to list 2017-04-10 17:23:44 +02:00
Adrien RAFFIN e46a74b41a fix: Add default values for mandatory variable 2017-04-10 14:14:55 +02:00
Raphaël Vinot bcb3b8cdfb Update validation
* Allow strict validation
* Add workaround to avoid all JSON dumps from MISP <=2.4.70 to fail
2017-04-09 00:02:02 +02:00
Raphaël Vinot 1dda8eb40a Merge branch 'master' of github.com:MISP/PyMISP 2017-04-07 17:31:27 +02:00
Raphaël Vinot 25795df308 Major rewrite of the schema 2017-04-07 17:30:43 +02:00
Adrien RAFFIN 46ef153d4b fix: raise exception if uuid not setted in remote org 2017-04-07 17:13:11 +02:00
Adrien RAFFIN 6ab8eee9e8 fix: org_type was not the correct variable 2017-04-07 17:10:47 +02:00
Hannah Ward 75fa1de2e4
fix: don't double-json-encode when sending proposals 2017-04-04 10:07:29 +01:00
Raphaël Vinot becaecaec8 Merge branch 'master' of github.com:CIRCL/PyMISP 2017-04-03 10:05:48 +02:00
Raphaël Vinot f6dc991751 Properly display deprecation warning 2017-04-03 10:04:59 +02:00
Raphaël Vinot 4f694ba389 Merge pull request #95 from RichieB2B/ncsc-nl/send-attributes
Return json when adding attributes
2017-03-31 12:12:02 +02:00
Raphaël Vinot 142566df4d Fix python 3 support
Fix #94
2017-03-31 11:44:48 +02:00
Richard van den Berg 6fef2c60e3 Return json when adding attributes 2017-03-31 11:29:02 +02:00
Raphaël Vinot 7d34153e0e Merge pull request #63 from TheDr1ver/patch-5
publish_timestamp Windows 7 Fix
2017-03-15 14:16:00 +01:00
Raphaël Vinot 8dd0914a73 Allow to pass a MISPEvent to add_event and update_event 2017-03-15 14:10:51 +01:00
Nick Driver d9bef7d65e extended the Windows fix to lines 168 and 471 2017-03-15 09:03:02 -04:00
Raphaël Vinot 38f2dbe94d Add an attributes to an event without sending the full existing event 2017-03-15 11:33:24 +01:00
Nick Driver 4aa0df9d1f publish_timestamp Windows 7 Fix
On Windows 7 datetime.datetime.fromtimestamp(int(0)) returns a date before 1970, which causes the script to crash. This fixes the bug.
2017-03-14 11:07:31 -04:00
Raphaël Vinot a7e66ca5db Allow to pass None to to_ids, default to sane default 2017-03-14 15:58:54 +01:00
Raphaël Vinot c875fde6ea Merge branch 'master' of github.com:MISP/PyMISP 2017-03-12 23:05:25 +01:00
Raphaël Vinot 638ad3d4b7 Update types, allow 0 as attribute value 2017-03-12 23:05:13 +01:00
Déborah Servili 0636b9393e fix add_domain_ip 2017-03-10 14:48:11 +01:00
Hannah Ward b3376183c0
fix: Entrypt isn't a word!
fixes #59
2017-03-09 16:36:30 +00:00
Raphaël Vinot e029b60455 Version bump 2017-03-09 16:43:40 +01:00
Raphaël Vinot fc80e711a9 Merge branch 'master' of github.com:MISP/PyMISP 2017-03-09 16:33:29 +01:00
Raphaël Vinot 1da447abf2 Reorganisation, make add attribute more flexible 2017-03-09 16:32:51 +01:00
rmarsollier 29a211ac64 Using the facilities introduced by MISP commit bdbd0920ba760a514cffdb30cc741b61b589d9da
(fix: attachTagToObject and removeTagFromObject now accept posted JSON objects)
2017-03-09 15:36:27 +01:00
rmarsollier 9c36afbcc6 throw exception for invalid uuid 2017-03-08 17:02:34 +01:00
Raphaël Vinot c348fcc7dc Properly split ip:port for ipv4 (openioc import) 2017-02-27 18:38:52 +01:00
Raphaël Vinot be0c8a1f8c Properly support CDATA fields in OpenIOC files. 2017-02-27 18:01:37 +01:00
Raphaël Vinot 17d6a3e27e Version bump 2017-02-27 13:34:28 +01:00
Raphaël Vinot a55603e5c8 Allow to pass a pseudo file to OpenIOC loader. 2017-02-27 11:33:07 +01:00
Raphaël Vinot 8175a0ecf0 Security fix: do not try to load any valid path as a MISP Event.
The MISP Event loader was trying to open any string passed as parameter
if is an existing filepath. Anything that isn't a valid MISP event would
raise an exception, but I can see it used for malicous purposes.

load_file is will do the same, but the user can decide if it is safe to
use.
2017-02-27 11:28:12 +01:00
Raphaël Vinot ee3f0fb9ca Allow filenames with regexes.
Fix #52
2017-02-23 16:59:37 +01:00
Raphaël Vinot ad02ebdef7 Merge pull request #53 from SekoiaLab/feature/serversRestApi
Adds new methods to add and edit servers in MISP
2017-02-23 16:11:47 +01:00
Raphaël Vinot 4be491b7a0 Merge pull request #51 from SekoiaLab/feature/AddAuthkeyAtCreation
feature: Add support for authkey in PyMISP operations
2017-02-23 14:46:42 +01:00
Sebastien Quioc cb8f4acf64 feature: Adds new methods to edit servers in MISP 2017-02-23 14:37:11 +01:00
Sebastien Quioc f0038d4be3 feature: Adds new methods to add new servers in MISP 2017-02-23 14:37:11 +01:00
iglocska 9576058bb4 Merge branch 'master' into errorhandling2 2017-02-22 09:27:19 +01:00
iglocska 13871dbd77 potential fix for the errors not being picked up by pymisp from the response "errors" field 2017-02-22 09:03:47 +01:00
Adrien RAFFIN 03a16fefef feature: Add support for authkey in PyMISP operations 2017-02-21 14:29:44 +01:00
Richard van den Berg ef69016e4a Allow 'Your organisation only' distribution for attributes 2017-02-21 11:07:57 +01:00
Raphaël Vinot 3493b26bd0 Add method to set sightings from a string 2017-02-17 10:32:25 +01:00
Hannah Ward 9e59a81b4c
new: Added async method for search_index 2017-02-16 15:39:36 +00:00
Hannah Ward bb00201aaf
new: Added base async imports 2017-02-16 15:23:42 +00:00
Raphaël Vinot ff21263405 Update bundled-in describeTypes.json 2017-02-10 16:57:52 +01:00
Raphaël Vinot 9a7961e0a3 Version dump 2017-02-09 16:41:01 +01:00
Raphaël Vinot 1556c901ef Add support for {attach,remove}TagToObject
Fix #47
2017-02-09 11:59:38 +01:00
Raphaël Vinot 6b5f347423 Merge branch 'master' of github.com:MISP/PyMISP 2017-02-07 14:03:22 +01:00
Raphaël Vinot b66e1258a7 Fix error message 2017-02-07 14:03:10 +01:00
Hannah Ward 98a008e67a
fix: Don't auto-publish events 2017-02-06 11:06:37 +00:00
Christophe Vandeplas b4d81e0d09 get_all_attributes_txt - support the additional flags 2017-02-03 12:22:54 +01:00
Raphaël Vinot d5e28abc70 Version bump 2017-01-31 10:24:29 +01:00
Raphaël Vinot 14ccf16d73 Fix regression.
Fix #46
2017-01-28 11:24:04 +01:00
Raphaël Vinot 6ecb713667 Version bump 2017-01-27 13:22:47 +01:00
Raphaël Vinot 2b9663cdf4 Bug fixes
* Improve version checking
* Fix attribute update
2017-01-27 11:58:00 +01:00
Raphaël Vinot 48e1211ed8 Allow to add a tag to a MISPEvent and MISPAttribute 2017-01-26 14:36:01 +01:00
Hannah Ward d260dc5ea5 Merge branch 'master' of github.com:MISP/PyMISP 2017-01-26 13:19:52 +00:00
Hannah Ward d355fc7e44
chg: Allow for old-style tag add 2017-01-26 13:19:32 +00:00
Raphaël Vinot 9ddbf0523d Fix python3 support. 2017-01-25 17:16:37 +01:00
Raphaël Vinot a81f6b5c15 Bump version 2017-01-25 17:02:29 +01:00
Raphaël Vinot 5cfbb679db Add orgs managment 2017-01-25 15:09:12 +01:00
Raphaël Vinot 6bee446fa0 Fix last commit 2017-01-24 09:46:31 +01:00
Raphaël Vinot 8e67303abc Merge branch 'master' of github.com:MISP/PyMISP 2017-01-24 09:42:52 +01:00
Raphaël Vinot 0f1553ef33 Refactoring search method 2017-01-24 09:41:30 +01:00
Koen Van Impe 38c0d2343d Wrong use of API for dateuntil
PyMISP uses “dateto” whereas the API expects “dateuntil”.
https://github.com/MISP/misp-book/tree/master/automation
2017-01-24 08:46:14 +01:00
Raphaël Vinot 296d0501db Revert "Add options to restsearch calls."
This reverts commit 3241e415b5.
2017-01-24 07:56:54 +01:00
Raphaël Vinot 3241e415b5 Add options to restsearch calls.
Related to:
8c63e6f3d5
2017-01-24 07:15:38 +01:00
Raphaël Vinot 9cc3c6e57d Merge branch 'master' of github.com:MISP/PyMISP 2017-01-19 19:07:36 -05:00
Raphaël Vinot b26c021b0e Fix typo 2017-01-19 19:07:24 -05:00
Christophe Vandeplas 351157b8f1 Minor documentation clarification 2017-01-18 09:33:35 +01:00
Raphaël Vinot f593ce69f8 Fix last commit 2017-01-17 19:03:38 -05:00
Raphaël Vinot 2bcc4163ad Add support for attribute level tagging 2017-01-17 18:20:24 -05:00
Raphaël Vinot 619538ced7 Fix travis 2017-01-16 15:41:17 -05:00
Raphaël Vinot 351ad53c97 Merge branch 'master' of git://github.com/cgi1/PyMISP into cgi1-master 2017-01-16 14:43:07 -05:00
Raphaël Vinot 748136f3f1 Allow to update an event by UUID, syntax fixes. 2017-01-16 14:41:32 -05:00
Hannah Ward 7c8cde0afd
chg: Updated api.py docstrings to comply with PEP257 2017-01-16 14:27:44 +00:00
Hannah Ward 78cef06963
new: Added ability to disable correlation on attributes 2017-01-16 09:52:35 +00:00
Hannah Ward cfb8572ab1
new: Added ability to add attachments to events 2017-01-13 13:15:53 +00:00
Raphaël Vinot 56a18275bb Fix get sharing groups
Fix #79
2017-01-11 14:29:20 -05:00
cgi 60c02cb5e9 + separate function change_sharing_group using update_event 2017-01-09 16:19:20 +01:00
Raphaël Vinot 3d2d41525f Merge branch 'master' of github.com:MISP/PyMISP 2017-01-06 16:25:36 -05:00
Raphaël Vinot b2752bd8d5 Load RelatedEvent as MISPEvent.
Fix #76
2017-01-06 16:24:39 -05:00
Hannah Ward 59aa5adfee
Merge branch 'master' of https://github.com/truckydev/PyMISP 2017-01-04 16:21:51 +00:00
Tristan METAYER 5478778a38 idem 2017-01-04 17:04:36 +01:00
Tristan METAYER 879f60f368 refere to FloatingGhost comment 2017-01-04 17:02:13 +01:00
Tristan METAYER bfb9fd5db3 Add uuid serch with pymisp 2017-01-04 11:23:18 +01:00
Raphaël Vinot 585ca9cd08 Allow to mark an attribute as deleted in a MISPEvent
Related to #33
2017-01-02 16:53:23 +01:00
Georges Bossert 0511bd4486 Fix typo in comments of 'search_index' method definition 2016-12-27 17:02:20 +01:00
Raphaël Vinot 4f230c9299 Add warning of PyMISP and MISP version don't match. 2016-12-14 15:42:43 +01:00
Raphaël Vinot d4489d9c34 Fix sharing group distribution level.
Fix https://github.com/MISP/MISP/issues/1761
2016-12-14 15:17:33 +01:00
Raphaël Vinot 0f2206a700 Add basic support for Galaxy 2016-12-09 17:35:50 +01:00
Raphaël Vinot a2ec3bf551 Bump to v2.4.56 2016-12-09 17:21:59 +01:00
Raphaël Vinot 83c9ce9218 Allow to change the to_ids flag of an attribute 2016-12-09 11:42:07 +01:00
Raphaël Vinot 81faa507f4 Add support for data field (malware-sample) 2016-12-07 19:27:12 +01:00
Raphaël Vinot 5bc4db789b Fix typo in add_mutex 2016-12-07 10:54:22 +01:00
Raphaël Vinot f96c1b5748 Reorganize json dumps 2016-12-03 18:37:13 +01:00
Raphaël Vinot d75d02b5eb Fix merge conflict, make pep8 happy. 2016-12-03 17:29:41 +01:00
morallo c40eaf935f Fixed synthax error 2016-12-02 17:51:43 +01:00
morallo a6a851f38d Solved warnings in tests when run under Python3 2016-12-02 16:53:45 +01:00
Nicolas Bareil 59b7d19970 map() is a generator in Python3 2016-12-01 14:26:59 +01:00
Nicolas Bareil 802fc0f20e python3 does not like lambda (x,y) syntax 2016-12-01 11:01:46 +01:00
Nicolas Bareil fff3a66d09 Unit-tests 2016-12-01 10:49:12 +01:00
Nicolas Bareil e44e33fe90 capitalizeformat() does not exist on Python2 and fix category variables 2016-12-01 10:48:33 +01:00
Raphaël Vinot f956fd526e Fix neo4j 2016-11-30 17:14:55 +01:00
Nicolas Bareil d3d7bccf0b Factorize all add_* in favor of add_named_attribute()
Not tested...
2016-11-30 13:17:15 +01:00
Raphaël Vinot 7b5b45146c Remove crazy replace 2016-11-24 10:50:46 +01:00
Raphaël Vinot e1b5000a16 Merge branch 'master' of github.com:CIRCL/PyMISP 2016-11-24 10:42:46 +01:00
Raphaël Vinot c90c73c9af Improve debug mode 2016-11-24 10:41:47 +01:00
Hannah Ward f7b228ac56
Use misp_stix_converter.converters.convert's load_stix method 2016-11-21 11:57:49 +00:00
Raphaël Vinot f62cf9f3d9 More granularity in the verification 2016-11-21 10:44:03 +01:00
Raphaël Vinot d2e4e73abb Allow to pass a passphrase as parameter for signing. 2016-11-18 18:01:57 +01:00
Raphaël Vinot b8a391d263 Avoid error if pyme3 isn't installed 2016-11-17 17:30:23 +01:00
Raphaël Vinot 419897aba0 Bump recommended python3 version 2016-11-17 17:29:54 +01:00