MISP
/
PyMISP
mirror of https://github.com/MISP/PyMISP
2
0
Fork 0
Code Issues Releases Wiki Activity
816 Commits
13 Branches
164 Tags
92 MiB
Commit Graph

472 Commits (ff58b3bd593d2e4d6023b49021ea48180373c97e)

Author SHA1 Message Date
Deventual c8d962a594 Implemented much faster publish method to replace the old one 
new publish method that is less resourceful and also having the ability to send emails (same as the web interface).
The method depends on the publish misp api method instead of update.
 2017-08-03 14:19:48 +03:00
Raphaël Vinot 533b69d944 Update path to roles API 2017-07-31 17:28:47 +02:00
Raphaël Vinot 622a5701ee Fix typo in variable name. 2017-07-27 17:14:49 +02:00
Raphaël Vinot 0c86d489b6 Merge pull request #99 from edhoedt/patch-1 
Fixing undefined ressources_path
 2017-07-27 16:02:27 +02:00
Raphaël Vinot 0db710a586 Allow to load the event_id in MISPAttrbute 2017-07-27 15:42:56 +02:00
edhoedt b4dea5173f Fixing undefined ressources_path 2017-07-27 14:54:02 +02:00
Raphaël Vinot 41b5672360 Doesn't require describe_types in MISPAttribute's constructor. 2017-07-26 11:28:50 +02:00
Raphaël Vinot 1d6c63c54c Doesn't require describe_types in MISPAttribute's constructor. 2017-07-26 10:10:12 +02:00
Raphaël Vinot 2fd3b05202 Update accordingly to the current server implementation 2017-07-24 17:16:40 +02:00
Sebastian Wagner 5a85788c5d
Fix shebangs and executable permissions 
Files containing a shebang should be executable (examples/*.py)
Non-executable files should not contain a shebang (pymisp/...)

spotted with rpmlint
 2017-07-24 13:27:28 +02:00
Raphaël Vinot 0c66d80dd1 Re-enable python2 support... 2017-07-22 22:22:39 +02:00
Raphaël Vinot 78488db7aa Initial commit supporting MISP Objects 2017-07-21 20:34:56 +02:00
Raphaël Vinot 14fcc5f586 Fix typo in the method name 2017-07-21 15:16:00 +02:00
Raphaël Vinot f679e8aa7d Update describe types 2017-07-21 10:12:32 +02:00
Raphaël Vinot 5f94ad3104 Add test of the authkey, update warnings. 2017-07-20 15:33:15 +02:00
Raphaël Vinot fe829b8f4d Search paramaters validation. 
Fix #96
 2017-07-18 12:07:47 +02:00
Raphaël Vinot 59f9b37b5e Allow to pass a bytestream to upload_sample. 
Fix #101
 2017-07-18 11:26:09 +02:00
Raphaël Vinot af636812fd Fix get_attachment. 
Fix #105
 2017-07-18 10:55:49 +02:00
Raphaël Vinot e39d014ddc Update describeTypes.json 2017-07-17 16:49:40 +02:00
Raphaël Vinot ae40bf5d1b Allow to list roles and tags on a MISP instance 2017-07-15 20:35:58 +02:00
Raphaël Vinot c91849b468 Improve errors flattening 2017-07-15 20:35:00 +02:00
Raphaël Vinot cd7f928382 Version bump 2017-07-12 16:16:45 +02:00
Raphaël Vinot d0eb1252ae Avoid a comment set to NoneNone 
Fix https://github.com/MISP/misp-modules/issues/127
 2017-07-12 12:13:34 +02:00
Alex Bolshakov 8b0c379b7f Add handling a string response 
To avoid AttributeError when variable to_return is a string with a value "Pull queued for background execution."
 2017-07-12 12:51:26 +03:00
Raphaël Vinot 9fc631cc85 Simplfy MISPEvent.add_attribute 2017-07-12 11:25:41 +02:00
Raphaël Vinot 481c8e4790 Revert "Simplfy MISPEvent.add_attribute" 
This reverts commit f64f42ac71.
 2017-07-12 11:24:21 +02:00
Raphaël Vinot f64f42ac71 Simplfy MISPEvent.add_attribute 2017-07-12 11:08:58 +02:00
Raphaël Vinot bb9642445a Revert "Fix OpenIOC import" 
This reverts commit acd6d8b052.
 2017-07-12 11:07:54 +02:00
Raphaël Vinot acd6d8b052 Fix OpenIOC import 2017-07-12 10:49:45 +02:00
Raphaël Vinot a0273b8a43 Merge branch 'master' of github.com:CIRCL/PyMISP 2017-07-11 16:15:59 +02:00
obsidianpentesting c18d5cac6d Simple function to cache all feeds at once. This is almost identical to fetch_feed. In the future, I would like to specify the scope to include other values. 2017-07-06 16:06:59 -05:00
raw-data 6139caae2f exposing more feeds functions (for which _isRest() is available) to the API 2017-07-03 21:56:44 +01:00
Alexandre Dulaunoy 4a21727b2f Merge branch 'master' of github.com:CIRCL/PyMISP 2017-06-20 12:23:19 +02:00
Hannah Ward 64f1edd5b4
fix: If array passed to add_attrib, add each individually 2017-06-16 12:25:27 +01:00
Raphaël Vinot e8caa6a7b1 Merge pull request #102 from aparriel/debug-fix 
Fix missing %s in debug
 2017-06-13 16:04:46 +02:00
Raphaël Vinot 72a484ca32 Add support for freetext import in the API. 2017-06-13 15:37:39 +02:00
Alexandre Dulaunoy b73435949f Typo fixed 
Paris is not the center of the world as the idiot of the World village
would said.
 2017-06-02 09:12:00 +02:00
aparriel 72382f7618 Fix missing %s in debug 
Missing %s in logger.debug call lead to error.
 2017-05-31 18:07:31 +02:00
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