Commit Graph

49 Commits (f796071d6494e7b21e4c6fb7a7cbd10b1427be52)

Author SHA1 Message Date
chrisr3d f796071d64
Merge branch 'develop' of https://github.com/MISP/MISP into develop 2021-12-20 12:05:42 +01:00
Jakub Onderka f9eeeed4fe chg: [internal] Make JSONConverterTool method static 2021-12-14 22:35:50 +01:00
chrisr3d 9c76b9ecfa
fix: [stix export] Added parameters to the temporary files deleting function
- Can delete output files when we get an exception
  from the python scirpt
- Can delete a specific list of files that are not
  suffixed with a '.out' extension, like it is the
  case for attributes collections export as STIX 1
2021-12-14 01:54:18 +01:00
chrisr3d bcb6f8d5e3
fix: [stix export] Removed unused variables 2021-12-14 01:53:44 +01:00
chrisr3d 64a30723b7
fix: [stix export] Copy paste issue from merge conflict handling 2021-12-13 16:59:14 +01:00
chrisr3d fadfd10835
Merge branch '2.4' of https://github.com/MISP/MISP into misp-stix 2021-12-13 04:11:47 +01:00
chrisr3d 8af7a00073
chg: [stix export] Merging all the differents changes at different places to support every type of collection export as STIX 1 & 2 2021-12-09 16:52:50 +01:00
Jakub Onderka dba7d03cfb chg: [stix] Simplified STIX export code 2021-11-22 09:57:39 +01:00
Jakub Onderka 975bf43041 chg: [internal] Use ProcessTool in StixExport 2021-11-15 10:04:37 +01:00
chrisr3d 2b624662c3
fix: [stix export] Removing traceback parsing since it is handled in stderr 2021-11-09 17:27:43 +01:00
chrisr3d ab3c97718a
chg: [stix1 export] Making STIX1 attributes export parser available 2021-11-05 13:35:23 +01:00
chrisr3d a766fb1b3d
fix: [stix export] Displaying errors with their traceback 2021-11-05 11:34:14 +01:00
chrisr3d 3f5aedcf44
fix: [stix export] Typo on a class variable 2021-11-02 23:44:45 +01:00
chrisr3d 69379c6058
fix: [stix export] Better galaxies & clusters handling when dealing with attributes collections
- We skip some fields from galaxies and clusters,
  as well as adding the event timestamp that is
  going to be used when exporting event galaxies
2021-10-30 00:06:48 +02:00
chrisr3d 18296ec503
wip: [stix export] First implementation of an attributes restSearch export as STIX 1 & 2
- More testing, and changes on other parts of the
  process to come as well
2021-10-28 19:02:42 +02:00
Jakub Onderka a6c5089eba chg: [stix-export] Use JsonTool 2021-10-18 09:04:06 +02:00
Jakub Onderka 829ae07c3e fix: [stix-export] Delete tmp files 2021-10-15 14:40:37 +02:00
Jakub Onderka 0f2ac9c1c0 chg: [stix-export] Code cleanup 2021-10-13 10:37:06 +02:00
Jakub Onderka e96b05554c chg: [export] Check method existence rather than another variable 2021-10-13 09:57:26 +02:00
Jakub Onderka 785722931e chg: [stix-export] Throw exception on error 2021-10-13 09:57:26 +02:00
Jakub Onderka e03ac4f3ba chg: [stix-export] Store temp file in default folder 2021-10-13 09:57:26 +02:00
Jakub Onderka 1cf0f02228 chg: [stix-export] Try to directly return TmpFileTool 2021-10-13 09:57:26 +02:00
Jakub Onderka 3239c6dbd5 chg: [stix-export] Use more reliable file processing 2021-10-13 09:57:26 +02:00
Jakub Onderka fdfda4cec2 chg: [stix-export] Use TmpFileTool 2021-10-13 09:57:26 +02:00
Jakub Onderka 2b31ada0a5 chg: [stix-export] Simplified loading python bin 2021-10-13 09:57:25 +02:00
chrisr3d 71837d2f1b
chg: [stix2 export] Using a specific filter to specify the STIX version
- `version` being too generic and used from another
  end point, we use `stix-version` in order to
  avoid confusion between the 2 filters
2021-10-08 17:17:46 +02:00
chrisr3d e3e2ed25c6
chg: [stix2 export] Using specific filter `stix-version` instead of `version` that is too generic and used somewhere else 2021-10-08 17:15:16 +02:00
chrisr3d df33baff4d
chg: [stix export] Updated Stix export libraries
- Including parameters to define versions in the
  restSearch filters
- New parameters to call the python scripts
2021-08-30 20:09:15 +02:00
chrisr3d 615606e3b0
fix: [stix export] Quick single line php `if else` command clean-up 2021-07-24 05:27:44 +02:00
chrisr3d 3a07b3cfb8
wip: [stix export, framing] Reworked misp_framing
- Made it cleaner
- Made it support the STIX framing provided by
  misp-stix converter library
2021-07-24 05:26:03 +02:00
chrisr3d 34b85f096c
wip: [stix2 export] Testing MISP-STIX python library with the included changes on the Export Lib and on the misp2stix2.py script 2021-07-22 03:07:57 +02:00
Richard van den Berg 36dafcf8e4 fix: [StixExport] suppress unlink warnings 2020-07-11 20:06:18 +02:00
Richard van den Berg d0d233dfd0 fix: [stix export] log stack trace on error, support 'AMBER NATO ALLIANCE' TLP tags 2020-07-10 21:12:27 +02:00
chrisr3d 88ea4523b8
fix: [stix 1&2 export] Checking is an error message is returned 2020-01-20 11:43:46 +01:00
chrisr3d b140d6be09
add: [restSearch] Support of stix1 json export 2019-10-15 09:54:48 +02:00
chrisr3d f60e66fa00
fix: [stix 1/2 export] Catching potential exceptions and returning it as result in restSearch 2019-10-03 10:39:34 +02:00
chrisr3d 78dc7e7512
fix: [stix 1/2 restSearch] Deleting temporary files in case of an error in the python side 2019-09-25 18:28:37 +02:00
chrisr3d 50c18eebb1
fix: [stix restSearch] Fixed output json format in case of empty results 2019-04-12 14:46:57 +02:00
chrisr3d 2b8f655415
fix: [stix restSearch[ Quick file extension clarification
- Depending on the format (.stix or .stix2)
- Impacting temporary files, it is thus for
  debugging purpose in case of error
2019-04-12 14:41:54 +02:00
chrisr3d 4f4fe45633
fix: [stix2 export] Fixed attribute counting on restSearch 2019-02-02 12:09:52 +01:00
chrisr3d a42b3ab756
fix: [restSearch] Avoiding useless stix python script calls on empty files 2018-10-05 14:58:39 +02:00
chrisr3d d65482c297
fix: [restSearch] Ignoring square brackets around STIX2 objects returned by the python script
Because they are already provided by the framing script
2018-10-05 10:28:48 +02:00
chrisr3d 445bd0c84c
add: [restSearch] STIX 1 & 2 export for restSearch
Features to be merged:
- Export of multiple MISP events
- Fetching events and writing them into files, each
  file containing at most a number of attributes
  defined by a limit
- Each file is then parsed instead of parsing each
  event individualy, which reduces the number of
  times the python scripts are called, reducing
  the execution time of the overall process
- The result is then returned as on single file
  read and displayed
2018-10-04 22:11:30 +02:00
chrisr3d 54b90cf8f5
fix: [restSearch] Changed how data is handled eeeeeeeeeee
- Criteria was number of events and is now number
  of attributes
- Writing data in a file until the limit number of
  attributes is reached, then writing in the next
  file and looping again until all data is written
- Then for each file, calling the python script to
  parse MISP events and translate them into STIX
- Writing parsed STIX data into 1 file used to
  return the result
2018-10-04 11:40:45 +02:00
chrisr3d d6595e00c6
wip: [restSearch] Passing multiple events to the STIX parsing script
- atm calling the python script every 10 events
  fetched with fetchEvent
2018-09-30 20:32:38 +02:00
chrisr3d 72c0aa9987
fix: [restSearch] Prettifying stix packages with indents
- As it is in stix export function from Model/Event.php
2018-09-27 12:03:49 +02:00
chrisr3d 52115cdf85
fix: Added variable to have attribute with no ids flag from fetchEvent 2018-09-25 20:13:20 +02:00
chrisr3d 8a4911d18c
fix: [restSearch] Fixed variables & indent 2018-09-25 12:10:39 +02:00
chrisr3d 933af46dfb
wip: [restSearch] Stix1 export for restSearch 2018-09-24 14:52:33 +02:00