Commit Graph

337 Commits (1193e904bfe7af1413eb165f28754211ebf9e6e5)

Author SHA1 Message Date
Raphaël Vinot ba6568eb46 Merge branch 'master' into logging 2017-05-03 15:42:01 +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
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
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
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
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
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 8dd0914a73 Allow to pass a MISPEvent to add_event and update_event 2017-03-15 14:10:51 +01: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
Déborah Servili 0636b9393e fix add_domain_ip 2017-03-10 14:48:11 +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 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 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
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 1556c901ef Add support for {attach,remove}TagToObject
Fix #47
2017-02-09 11:59:38 +01:00
Christophe Vandeplas b4d81e0d09 get_all_attributes_txt - support the additional flags 2017-02-03 12:22:54 +01:00
Raphaël Vinot 14ccf16d73 Fix regression.
Fix #46
2017-01-28 11:24:04 +01:00
Raphaël Vinot 2b9663cdf4 Bug fixes
* Improve version checking
* Fix attribute update
2017-01-27 11:58:00 +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 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
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 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
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
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 83c9ce9218 Allow to change the to_ids flag of an attribute 2016-12-09 11:42:07 +01:00
Raphaël Vinot 5bc4db789b Fix typo in add_mutex 2016-12-07 10:54:22 +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 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 c90c73c9af Improve debug mode 2016-11-24 10:41:47 +01:00
Raphaël Vinot 419897aba0 Bump recommended python3 version 2016-11-17 17:29:54 +01:00
Raphaël Vinot 5632959f02 Set user parameters in a function 2016-11-15 10:59:29 +01:00
Raphaël Vinot 6885779be5 Allow to set org_id and orgc_id when creating a new MISPEvent
Squashed commit of the following:

commit 8a5dfda8a728d8722dfba890729066948e744e44
Merge: 477f81d 332fc05
Author: Raphaël Vinot <raphael@vinot.info>
Date:   Tue Nov 15 09:52:26 2016 +0100

    Merge https://github.com/garanews/PyMISP into garanews-master

commit 332fc0508d3f5dc32cf962bd2cad1d800b6b4b02
Author: garanews <puntogtg@tiscali.it>
Date:   Mon Nov 14 15:29:04 2016 +0100

    Delete api_old.py

commit 7fb955fa2fba964ae7120f4cf56cf85e203efe96
Author: garanews <puntogtg@tiscali.it>
Date:   Mon Nov 14 14:05:22 2016 +0100

    Create api.py

commit 7f6f45d9ce8ec4e948c5b2513b9bc59296985e09
Author: garanews <puntogtg@tiscali.it>
Date:   Mon Nov 14 14:05:06 2016 +0100

    Rename api.py to api_old.py

commit 63c325816c2bda646f462a322eb3063788ab91a4
Author: garanews <puntogtg@tiscali.it>
Date:   Mon Nov 14 11:48:17 2016 +0100

    Add files via upload

commit edf0cd1d90e89c30a4d3ef756d6bc6501de3885f
Author: garanews <puntogtg@tiscali.it>
Date:   Wed Nov 2 15:31:42 2016 +0100

    Add files via upload
2016-11-15 10:21:49 +01:00
Déborah Servili 3cadc1a78d Improvements in the user api 2016-11-04 12:00:42 +01:00
Déborah Servili a11e26f80b Improvements in the user api 2016-11-04 11:58:21 +01:00
Raphaël Vinot 75ebedae5c Merge pull request #68 from MISP/tooling
[WIP] Tooling
2016-11-03 16:04:28 -04:00
Raphaël Vinot 9f0737c34a Add some mapping to openioc, add python version in the user agent 2016-11-03 16:02:09 -04:00
Déborah Servili dbba8ed0f9 add user management and examples 2016-11-03 11:41:37 +01:00
Déborah Servili 0b462404de add user management and examples 2016-11-03 11:23:48 +01:00
Raphaël Vinot 2c2bfe2354 Properly warn if the user is using python2 2016-10-25 11:36:49 -04:00
Raphaël Vinot f8f117f1a4 Cleanup 2016-10-21 13:42:22 +02:00
Raphaël Vinot aec6a2bbf2 Merge branch 'master' of github.com:CIRCL/PyMISP into next 2016-10-20 14:33:27 +02:00
Tom ec508191ca Including Network-Other option for API 2016-10-20 09:49:06 +01:00
Raphaël Vinot 49433cdc3a Print a warning in case python2 is used. 2016-10-19 18:52:49 +02:00
Déborah Servili 0d0ca1e9b5 Update comment 2016-10-13 13:43:57 +02:00
Déborah Servili 22956fbd81 add metadata flag to search 2016-10-13 11:48:17 +02:00
Déborah Servili 3df35826c5 fix flatten 2016-10-11 11:26:57 +02:00
Raphaël Vinot 268598fe23 Add forgotten variable 2016-10-11 11:22:31 +02:00
Raphaël Vinot 78919272ab Use sane_defaults from describeTypes.json if unable to fetch it from the instance. 2016-10-10 12:24:17 +02:00
Raphaël Vinot b6072f7145 Raise exception if the dest instance is < 2.4.52, set User-Agent. 2016-10-07 16:50:57 +02:00
Raphaël Vinot e91ad63ccf More logical output for _prepare_full_event 2016-10-05 11:43:33 +02:00
Raphaël Vinot 8a931a89f3 Fix upload function 2016-10-05 11:07:40 +02:00
Raphaël Vinot 6482a21834 More cleanup 2016-09-28 18:20:37 +02:00
Raphaël Vinot e035922949 Getting closed to a full support of a misp event as a Python Object 2016-09-27 19:47:22 +02:00
Raphaël Vinot cf257493f7 First batch of changes, will be squashed 2016-09-26 00:26:09 +02:00
Hannah Ward f6cf9d9150
Fixed search_index 2016-09-13 13:03:22 +01:00
Raphaël Vinot bf5793992b Fix examples after removal of MISP XML support 2016-09-12 12:53:58 +02:00
Raphaël Vinot cd25559c94 Fix flattening, fix python2.7 2016-08-27 18:13:15 +02:00
Raphaël Vinot aaaab590f5 Fix error flattening 2016-08-26 18:22:41 +02:00
Raphaël Vinot 77e3ad0016 Update rendering doc 2016-08-26 14:19:19 +02:00
Raphaël Vinot 32bc8782f0 Add doc 2016-08-26 12:00:13 +02:00
Raphaël Vinot 0b0905d0e7 Update documentation for client side certificate 2016-08-26 09:24:02 +02:00
Richard van den Berg a1a524c2c5 Add ssl client certificate support 2016-08-26 09:11:01 +02:00
Raphaël Vinot cdc77de598 Add some more tests 2016-08-18 13:18:58 +02:00
Raphaël Vinot cdcb1cca5e Update testing 2016-08-18 00:23:49 +02:00
Jurriaan Bremer 1ff08c7d73 provide sane defaults for upload-sample/samplelist
Most of the arguments are unused when a proper event ID has been
provided, hence default them to standard values.
2016-08-16 18:35:35 +02:00
Jurriaan Bremer 353d04eab3 magic value enumerations 2016-08-16 16:51:35 +02:00
Jurriaan Bremer f23a7c3357 allow multiple attributes to be sent off at once
Slightly worked out version of the suggestion by doomedraven in #42.
2016-08-16 11:44:08 +02:00
Thomas King 8ada05f310 Fixed double status code check on helpers and other functions 2016-08-11 19:30:31 +02:00
Raphaël Vinot f19520d5ac Proper support of functions returning plain text instead of json 2016-08-11 17:50:47 +02:00
Raphaël Vinot ab09c0a1dc Fix calls to __prepare_session
Fix #58
2016-08-11 17:45:32 +02:00
Raphaël Vinot 2a0d6566ee change: remove XML output, all functions return a Python dictionary. 2016-08-09 13:58:54 +02:00
Richard van den Berg af44760967 Set default distribution for attributes to inherit 2016-08-09 13:31:44 +02:00
Raphaël Vinot 86758cce19 Properly handle errors while fetching the types.
Fix #53
2016-08-05 11:13:26 +02:00
Raphaël Vinot cb25177a46 Add option to search function to only return attributes instead of events 2016-08-04 13:21:28 +02:00
Raphaël Vinot fd5c22d8d9 Merge branch 'master' of github.com:CIRCL/PyMISP 2016-07-28 09:50:57 +02:00
Raphaël Vinot b8205f11a8 Fix PEP8 2016-07-28 09:50:46 +02:00
Raphaël Vinot f45490b02e Add support for proxies in the library.
Fix #48
2016-07-28 09:49:40 +02:00
Kenneth Adam Miller 90b772d938 Caught exception on python3.4 where base64encode returns bytes and not str, and bytes are not json encodable. This caused a failure in upload_sample 2016-07-27 07:30:46 -04:00
Jessy Campos d31ec7a73c Add a method to add a textual detection name under the 'Antivirus detection' category 2016-07-26 13:13:29 -04:00
Nils ca5a4d0960 Fixes: expected bytes, got <class 'str'> in download_samples() 2016-07-21 13:43:04 +02:00
Hannah Ward 414ddaec01
Added STIX retrieval
- misp.get_stix(event_id=ID, with_attachment=True/False,
			from_date=YYYY-MM-DD, to_date=YYYY-MM-DD,
			tags=["tag1", "tag2"]
	                )
2016-07-14 12:55:37 +01:00
Raphaël Vinot 51a9725583 Add remove tag method 2016-07-11 17:57:16 +02:00
Déborah Servili 29476b6eba Add examples "create_dummy_event" and "create_massive_dummy_events" 2016-07-01 10:33:44 +02:00
Antonio S 101a274447 Added function to AV detection link 2016-06-28 13:12:37 +02:00
Antonio S b7c7afa4f6 Added add_domain_ip attribute function 2016-06-27 16:53:13 +02:00
Raphaël Vinot a42be22f78 Make pep8 happy 2016-06-15 11:44:08 +09:00
Raphaël Vinot fe8415dbc7 Fix check MISP latest version 2016-06-15 09:44:36 +09:00
Alexandre Dulaunoy 11c401bb6a Merge pull request #19 from Delta-Sierra/master
add function get_tags_statistics
2016-05-23 15:20:09 +02:00
Déborah Servili d781b4690f add function get_tags_statistics 2016-05-23 15:16:31 +02:00
Alexandre Dulaunoy 70808a46ca File indention fixed 2016-05-19 14:30:43 +02:00
Alexandre Dulaunoy 6fc403f7c8 Merge pull request #18 from Delta-Sierra/master
add function get_sharing_groups
2016-05-19 14:29:45 +02:00
Déborah Servili 5108d78f8d add function get_sharing_groups 2016-05-19 14:09:01 +02:00
KevTheHermit 12fa199202 Add Attribute by named category and type 2016-05-05 10:05:59 +01:00
Alexandre Dulaunoy f9ce3999e9 Merge pull request #17 from Delta-Sierra/master
Add function for sighting using attribute id, uuid or a json file
2016-04-30 14:52:09 +02:00