MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
18,990 Commits
35 Branches
366 Tags
190 MiB
Commit Graph

784 Commits (74acfacde01918f46a088632a9b69bc0a81ab64f)

Author SHA1 Message Date
mokaddem 50185e45f0
fix: [eventReport:reportFromEvent] Correctly apply filter conditions 
Fix #6631
 2020-11-20 10:59:54 +01:00
mokaddem 89f307bd07 Merge branch '2.4' of github.com:MISP/MISP into galaxy-cluster2.0 2020-11-18 09:22:40 +01:00
Jakub Onderka 791dc9deab new: [internal] JSON stream convert 2020-11-17 19:28:59 +01:00
Jakub Onderka db1e7621b2 fix: [internal] MISP update without branch 2020-11-17 15:04:08 +01:00
mokaddem c8462c5791
Merge branch '2.4' of github.com:MISP/MISP into feature-report-from-event 2020-11-17 13:35:40 +01:00
mokaddem 8c87998981
chg: [export:textExport] Filter out deplicated values 
Fix #6603 for attribute scope
 2020-11-17 12:09:45 +01:00
mokaddem e1f82ba6ee
chg: [eventReport:reportFromEvent] Added support of attributes and objects 2020-11-13 15:59:53 +01:00
mokaddem e3d42ffe2a
new: [eventReport] Report from event 2020-11-13 13:56:28 +01:00
mokaddem 1879bc05b7
Merge branch '2.4' of github.com:MISP/MISP into galaxy-cluster2.0 2020-11-12 09:05:12 +01:00
Jakub Onderka fd82230478 fix: [internal] Do not fetch unnecessary correlations for distribution graph 2020-11-09 14:00:23 +01:00
mokaddem 150b4cb7d1
Merge remote-tracking branch 'origin/2.4' into galaxy-cluster2.0 2020-11-09 10:07:43 +01:00
Jakub Onderka df9687238d
Merge pull request #6529 from JakubOnderka/experimenteal-faster-rest-fetch 
chg: [rest] Faster attributes restSearch
 2020-11-08 14:16:45 +01:00
Jakub Onderka 4c586c504e
Merge pull request #6490 from JakubOnderka/json-converter-optim 
chg: [internal] Slightly optimise JSONConverterTool
 2020-11-02 14:30:59 +01:00
Jakub Onderka 9cf7be802d chg: [rest] Faster attributes restSearch 2020-10-30 18:49:48 +01:00
Loïc Jaquemet aeb73ecd37
Remove 'text' from required params from sendExternal 
Bug fix, there is no such fields named 'text' in params. It's probably a typo from reading line 309 too fast
 2020-10-29 13:36:34 -06:00
Loïc Fortemps 5896081f5f
new: [widgets] button for link (#6489) 2020-10-26 16:42:07 +01:00
Jakub Onderka 2bbff9fb70 chg: [internal] Slightly optimise JSONConverterTool 2020-10-23 15:47:54 +02:00
Jakub Onderka d06d409ca8 new: [av] Use misp-module for AV scanning 2020-10-22 16:38:26 +02:00
Jakub Onderka 49660255fe new: [av] Malware protection for uploaded files 2020-10-22 16:38:07 +02:00
Jakub Onderka 44c688d551 fix: [internal] Remove compressing by ZIP PHP extensions 2020-10-21 19:22:05 +02:00
Jakub Onderka 5e72663aef fix: [resource-widget] Use redisInfo method for getting info 2020-10-21 08:56:57 +02:00
Jakub Onderka ff4c98446a
Merge pull request #6450 from JakubOnderka/client-certificate-info 
new: [sync] Show client certificate info in connection test
 2020-10-20 10:15:20 +02:00
Jakub Onderka 8723fdcfcc fix: [internal] Check Crypt_GPG version 2020-10-19 14:58:23 +02:00
Jakub Onderka 46ba51a32e new: [sync] Show client certificate info in connection test 2020-10-19 09:57:06 +02:00
Jakub Onderka 6770ba8222 chg: [internal] Faster loading od Distribution graph 2020-10-14 10:20:14 +02:00
Jakub Onderka 10336acf0c chg: [internal] Provide better exception messages for signing and encrypting 2020-10-13 12:28:20 +02:00
Jakub Onderka 5d994f8799
Merge pull request #6425 from JakubOnderka/fix-smime-certificate-validation 
fix: [mail] S/MIME certificate validation
 2020-10-12 12:09:50 +02:00
Jakub Onderka 80a416a7b5 fix: [mail] S/MIME certificate validation, fixes #6424 2020-10-12 11:37:22 +02:00
Jakub Onderka 2f4d38b2f1 chg: [internal] Cleanup and simplify ShadowAttribute model code 2020-10-11 15:20:20 +02:00
Jakub Onderka 5c16ceb9d4
Merge pull request #6300 from JakubOnderka/validate-gpg-key 
Validate gpg key
 2020-10-09 23:14:33 +02:00
Jakub Onderka 380fba5405 new: [GPG] Validate fetched GPG key 2020-10-09 16:58:59 +02:00
mokaddem b628e15eb9
Merge remote-tracking branch 'origin/2.4' into feature-event-report 2020-10-09 14:54:47 +02:00
Jakub Onderka 66b0d34337 fix: [freetext] Convert CVE string to uppercase to follow attribute validation 2020-10-06 19:16:52 +02:00
Jakub Onderka 7f7b89edaf chg: [complextype] Support for uppercase hashes 2020-10-02 14:34:04 +02:00
Jakub Onderka fd822ef0c5 chg: [complextype] Speedup hash parsing from CSVs and freetexts 2020-10-02 13:41:43 +02:00
mokaddem eb84b3344f
Merge remote-tracking branch 'origin/2.4' into galaxy-cluster2.0 2020-09-22 12:08:12 +02:00
mokaddem 4408a17dff
Merge remote-tracking branch 'origin/2.4' into feature-event-report 2020-09-22 10:15:22 +02:00
Jakub Onderka 77833be960 chg: [mail] Another code cleanup for alert and contact mails template 2020-09-21 13:17:00 +02:00
mokaddem aba72c2a56
chg: [eventReport] Generic improvements and light integration with 
fetchEvent and sync support
 2020-09-17 15:06:55 +02:00
Loïc Fortemps ccfcb820f4
fix: [widgets] Adding images by default on the repository (#6298) 2020-09-08 15:46:14 +02:00
iglocska 754a0dafde
chg: [OpenIOC] email type added to the export tool 2020-09-03 12:06:14 +02:00
iglocska 802f813b27
chg: [complex parser] added email as an option for parsed email addresses 2020-09-03 12:05:37 +02:00
iglocska ecd8461d43
chg: [openioc] added email type 2020-09-03 12:05:23 +02:00
iglocska 34d186a2dc
chg: [nids] added email type 2020-09-03 12:05:00 +02:00
iglocska eaeff3ac59
chg: [bro] added email type 2020-09-03 12:04:41 +02:00
Golbark 3fb47d1cce chg: [internal] Using blocklist instead of blacklist 2020-09-01 16:27:36 +02:00
iglocska f82e10d1fb
new: [API] added count returnformat for the REST api, fixes #6233 
- simply counts the number of attributes/events found (on each respective scope)
 2020-08-31 12:32:28 +02:00
Jakub Onderka 8f806c4f1b
Merge pull request #6214 from JakubOnderka/otp-encryption 
fix: [otp] Allow to send encrypted OTP by mail
 2020-08-30 11:22:05 +02:00
Loïc Fortemps e0543e2fa2
Feature/achievements widget (#6129) 
* Additionnal protection against XSS, the response type defaults to html while it should be JSON.
* new: widget: Achievements widget
* Update AchievementsWidget.php
* Update AchievementsWidget.php
* Visual adjustments, new badges
* i18n
* indentation to MISP convention
* AchievementsWidget minor textual improvements
* Optimized query and fix issue with i18n

Co-authored-by: Steve Clement <steve@localhost.lu>
Co-authored-by: Christophe Vandeplas <christophe@vandeplas.com>
 2020-08-24 10:02:15 +02:00
Jakub Onderka 3005ef8f6e fix: [otp] Allow to send encrypted OTP by mail 2020-08-20 19:58:24 +02:00
Jakub Onderka 778d39e175 fix: [attachment] Do not fetch attachment when accepting deletion proposal 2020-08-14 13:40:05 +02:00
Jakub Onderka cac497158e chg: [internal] Reuse AttachmentTool instance 2020-08-14 12:30:12 +02:00
Jakub Onderka a411b36666 chg: [internal] Move attachment handling to one place 2020-08-13 15:34:32 +02:00
Jakub Onderka f84f304254 fix: [test] Set GnuPG.email variable 2020-08-12 19:33:46 +02:00
Jakub Onderka 6ee505a207 chg: [mail] Initialize GPG just once 2020-08-12 19:33:15 +02:00
Jakub Onderka 02c0624f3b chg: [mail] Simplified Message-ID generation 2020-08-12 19:33:15 +02:00
Jakub Onderka 46c5b824cb new: [internal] Support autocrypt when sending e-mails 2020-08-12 19:33:15 +02:00
Jakub Onderka ee4de160e8 chg: [internal] Move GPG initialization to GpgTool 2020-08-12 19:33:15 +02:00
Jakub Onderka 6fc8e4d119 fix: [internal] SendEmail exceptions message and logging 2020-08-12 19:33:15 +02:00
Jakub Onderka c347ffc6db new: [internal] 'GnuPG.obscure_subject' option to not send unencrypted subject 2020-08-12 19:33:15 +02:00
Jakub Onderka ea4d195e99 chg: [internal] Protect also Reply-To header 2020-08-12 19:33:15 +02:00
Jakub Onderka a87ad8acbd chg: [internal] Protect also Date header 2020-08-12 19:33:15 +02:00
Jakub Onderka 2db3c349f4 fix: [internal] Do not leak IP address in Message-ID 2020-08-12 19:33:15 +02:00
Jakub Onderka d044df2cb4 chg: [internal] Refactor S/MIME certificate validation 2020-08-12 19:33:15 +02:00
Jakub Onderka 6d1757188a new: [internal] Log if e-mail was send encrypted or not 2020-08-12 19:33:15 +02:00
Jakub Onderka 652df56ba6 chg: [internal] Rework email sending 2020-08-12 19:33:15 +02:00
mokaddem e41ffb5c9e
Merge branch '2.4' of github.com:MISP/MISP into fix-update-tags-on-attribute-edit 2020-07-27 08:19:11 +02:00
Jakub Onderka 7eeb15a450
Merge pull request #6115 from JakubOnderka/freetext-fixes-vol2 
chg: [feed] Use less memory when parsing CSV feeds
 2020-07-26 21:51:22 +02:00
Jakub Onderka c7d17cad9d chg: [feed] Use less memory when parsing CSV feeds 2020-07-26 21:26:08 +02:00
mokaddem 5b4cef3e6c
Merge branch 'feature/tags-deletion' into fix-update-tags-on-attribute-edit 2020-07-24 11:41:27 +02:00
Golbark 79b49e1d73 new: [widgets] Additional widgets for sharing statistics and layouts 2020-07-24 09:49:58 +02:00
mokaddem ad81c60986
Merge branch '2.4' of github.com:MISP/MISP into galaxy-cluster2.0 2020-07-21 08:09:25 +02:00
chrisr3d 824f03f0dc
chg: [opendata export] Support of the search functionality + fixed url parameter used in the delete feature 2020-07-16 23:35:44 +02:00
chrisr3d af502028c5 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2020-07-15 17:11:42 +02:00
mokaddem b3dbecb318
Merge branch '2.4' of github.com:MISP/MISP into galaxy-cluster2.0 2020-07-14 16:25:04 +02:00
Jakub Onderka dc03e8fd24
Merge pull request #6114 from JakubOnderka/remove-cidr 
fix: [internal] Remove unused CidrComponent and CIDRTool classes
 2020-07-14 12:06:13 +02:00
Jakub Onderka 39f3acba34 fix: [internal] Remove unused CidrComponent and CIDRTool classes 2020-07-14 10:29:32 +02:00
chrisr3d f9e4857422
fix: [opendata export] Adding auth param in the python command only if not empty 2020-07-13 22:26:02 +02:00
Jakub Onderka 3df94f868f chg: [freetext] Various code fixes and optimisations 2020-07-13 21:12:26 +02:00
chrisr3d 92910dd1f7
chg: [opendata export] Parsing portal url parameter + slight parameters parsing changes 
- As the possibility of specifying the url of the
  Open data portal to use instead of the default
  one, we support here this parameter and adapt
  the way we build the command that will launch
  the python script
- Slight changes to replace some isset tests by
  empty tests to make sure the concerned fields
  are not only set, but also contain a value
 2020-07-13 21:02:25 +02:00
Jakub Onderka 7f2f4d84c4
Merge pull request #6097 from JakubOnderka/freetext-fixes 
fix: [freetext] Handle IPv6 and punycode domains when import
 2020-07-13 17:26:41 +02:00
Jakub Onderka a34141c099 chg: [internal] More tests for ComplexTypeTool::checkFreeText 2020-07-13 15:29:17 +02:00
Jakub Onderka 06c7af4f83 chg: [internal] Simplified ComplexTypeTool::checkFreeText 2020-07-13 12:24:52 +02:00
Jakub Onderka e908a80656 fix: [internal] Reduce number of regexp in refang table 2020-07-13 10:13:26 +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 6195f81f3e
fix: [opendata export] Fixed resource deletion query creation to avoid silent syntax errors 2020-07-08 15:57:01 +02:00
mokaddem 5da4d11fe5
chg: Added more docs 2020-07-07 16:08:52 +02:00
mokaddem d348221792
chg: [ClusterRelationsGraphTool] Refacto and simplified code 2020-07-07 15:56:29 +02:00
mokaddem b1d9c8efaa
chg: Refacto bunch of galaxy clusters files 2020-07-07 09:47:13 +02:00
Jakub Onderka 9150c2be85 new: [freetext] Convert `[at]` to `@` and `hxtp` and `htxp` to `http` 
Fixes #4908 and #4805
 2020-07-06 18:22:40 +02:00
Jakub Onderka 73ccbd1f83 fix: [freetext] Handle IPv6 and punycode domains when import 2020-07-06 16:25:24 +02:00
mokaddem f3a9481c61
Merge remote-tracking branch 'origin/2.4' into galaxy-cluster2.0 2020-07-01 16:22:55 +02:00
Jakub Onderka f46ca1634a chg: [internal] Use tmp file fro Feed::getCache 2020-06-20 09:54:32 +02:00
Jakub Onderka 3d12cb3f3c chg: [internal] Attribute REST search optimisations and error handling 2020-06-19 23:45:22 +02:00
Jean-Louis Huynen 245fdf452c
chg: [widget] remove unused var, make test pass 2020-06-17 10:27:54 +02:00
Jean-Louis Huynen 3b651621e2
add [widget] Authentication failure widget 2020-06-16 17:19:34 +02:00
mokaddem 4f16019ea8
fix: [galaxyCluster] Typo in linked model 2020-06-12 15:09:54 +02:00
mokaddem 0732d20326
chg: [GalaxyCluster] Fetcher function arrange the data before returing 
its results
 2020-06-12 15:08:01 +02:00
Alexandre Dulaunoy ac6ed3235d
Merge pull request #5990 from cudeso/2.4 
Dashboard widgets
 2020-06-10 08:48:04 +02:00
Koen Van Impe bb9674b480 Avoid us of extra variable treshold 2020-06-09 23:17:21 +02:00
Jakub Onderka 91cb7cc299 chg: [internal] Bump CakePHP to 2.10.22 2020-06-08 12:55:27 +02:00
mokaddem c32eff5849
chg: [galaxyCluster:capture] Improved cluster catpure 
- Allow to capture relationships pointing to unknown clusters
- Improved display of relationships
 2020-06-08 11:10:59 +02:00
Koen Van Impe 306eda5328 Dashboard widgets 
- Widget to display system resources (df, cpu, mem)
- Widget to display the latest sightings
- Widget to display the false positive sightings above certain treshold
 2020-06-06 16:17:21 +02:00
mokaddem 5c04b9a8c1
Merge remote-tracking branch 'origin/2.4' into galaxy-cluster2.0 2020-05-28 14:06:30 +02:00
mokaddem 51391f8e57
chg: [galaxyCluster] Added drafty version of restSearch 2020-05-26 11:17:58 +02:00
mokaddem e0d73e099c
fix: [clusterRelations:relations_graph] Support of fallback `MISP` 
Organisation and improved tooltip layout
 2020-05-25 17:01:54 +02:00
mokaddem 9ba5bc186f
chg: [galaxyCluster] Usage of both ID and UUID for relation with drafty working 
version of import/export
 2020-05-25 10:04:07 +02:00
iglocska f46ec87cc0
chg: [cakephp] bump 
- updates cakephp to include the UUID generation fix by @RichieB2B to solve the deficiency discovered by @JakubOnderka. You guys rock.
 2020-05-23 18:24:43 +02:00
chrisr3d efadd73a58
fix: [opendata export] Using external_baseurl if set, before baseurl 
- If external_baseurl is not set, baseurl is used
 2020-05-15 14:22:14 +02:00
chrisr3d f44b22f8d5
fix: [opendata export] Internalization of the error messages 2020-05-15 14:12:59 +02:00
chrisr3d 932e51d4d7
fix: [opendata export] Less confusing variable name for the parameter to only skip exporting the data and keep only the header 2020-05-15 14:08:34 +02:00
chrisr3d 2bf534a882 Merge branch '2.4' of https://github.com/MISP/MISP into opendata 2020-05-15 11:40:20 +02:00
mokaddem 4c0e4984e1
chg: [clusterRelations] Moved relation_tree into its own `tool` and 
added modal support for galaxyQuickView
 2020-05-13 11:01:16 +02:00
mokaddem 77c4eb2795
fix: [ClusterRelationsGraphTool] Inject Orgs and SharingGroup info for 
referencing nodes
 2020-05-12 10:32:18 +02:00
mokaddem 3bc2b2c50a
chg: [clusterRelations:networkGenerator] Moved function in `Lib/Tools` 2020-05-12 10:29:52 +02:00
chrisr3d 18d6e38b4f
chg: [restSearch] Option to skip fetching attributes/events when only the metadata is wanted 
- As for the opendata export we do not need to get
  the attributes or event, and are only interested
  in using the metadata, a parameter to skip
  fetching the actual data collection has been
  added, and we avoid iterating through the entire
  data collection.
 2020-05-11 12:54:11 +02:00
Jakub Onderka 1e07dfc9ae chg: [pubsub] Refactored PubSub tool 2020-05-11 08:22:37 +02:00
chrisr3d b8f47718cc
fix: [opendata export] No longer using the returnFormat field as the dataset resource format 
- The resource format can be defined with a
  'format' field within the resource field in the
  setup filter
 2020-05-08 14:53:41 +02:00
chrisr3d 8265a95d4c
chg: [opendata export] Checking opendata setup and raising exception in case of error 2020-05-08 14:35:35 +02:00
chrisr3d fc8ef9aefa
add: [opendata export] Support of the deleting abilities 
- Deleting a dataset or its resource(s) is now
  available from the restSearch side as it already
  is with the python script
 2020-05-07 21:17:15 +02:00
chrisr3d b3a94a18f5 add: [restSearch] OpenData export module 2020-05-06 18:15:30 +02:00
iglocska 5ccf914278
fix: [json converter] fixed an issue if an expected key was not found 
- was only accessible due to another bug, but it's more graceful either way
 2020-05-06 09:30:26 +02:00
iglocska 37c5684e79
fix: [export] JSON export used the wrong handler for /objects/restSearch 2020-05-06 09:29:52 +02:00
mokaddem 8525dda7f8
Merge remote-tracking branch 'origin/2.4' into eventTimeline-sightings 2020-04-30 08:38:39 +02:00
iglocska 01b552d7e9
Revert "Merge branch '5835' into 2.4" 
This reverts commit 48132af179, reversing
changes made to 9a22aa1f3c.
 2020-04-30 07:09:56 +02:00
kscheetz 631800b80e Simplification for code complexity reqs. 2020-04-29 09:48:48 -04:00
mokaddem 720aa4a7db
Merge remote-tracking branch 'origin/2.4' into feature/tags-deletion 2020-04-29 09:00:31 +02:00
iglocska 1c3dc3fe51
Merge branch '2.4' into 5272 2020-04-28 15:31:17 +02:00
Cooper Dale 601a0ed4f2
bugfix in Suricata export template 
PR for reported bug https://github.com/MISP/MISP/issues/5766 based on suggestion @stacsirt, tested on my instance and it is working great
 2020-04-27 09:49:09 +02:00
mokaddem 93bd5eddba
chg: [event:timeline] Added Sightings visualisation 2020-04-23 10:08:34 +02:00
iglocska cf6d82aa3a
fix: [observer datasource] fixed for the QueryTool 2020-04-17 14:14:33 +02:00
mokaddem dd1be03597
Merge branch '2.4' of github.com:MISP/MISP into galaxy-cluster2.0 2020-04-09 14:26:48 +02:00
iglocska 9d63e427e6
new: [dashboard] COVID active cases backported from widget collections 2020-04-09 07:59:20 +02:00
iglocska 31662d6e15
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-04-06 22:29:38 +02:00
iglocska 75d6a4b829
chg: [cakephp] version bump to get TLS 1.3 support, fixes #5764 
- #yolo
 2020-04-06 22:29:12 +02:00
chrisr3d 8f90f79255
fix: [stix2 export] Avoiding the "end" function to return a notice 
- It looks like depending on the Php version, the
  end function does not like to have the reference
  of an array. By delaying its call, we pass the
  actual array and the notice no longer appears
 2020-04-06 15:14:23 +02:00
iglocska e898c121b1
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-04-06 09:23:30 +02:00
iglocska 78ad3cb368
chg: [dashboard] Added COVID widgets to the default installation from widget-collections 
- should be interesting enough for all at this point. We might remove it again once COVID-19 is finally gone from our lives
 2020-04-06 09:22:37 +02:00
mokaddem 0856bc5c04
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-04-06 09:21:56 +02:00
mokaddem 901af2b7b2
chg: [widgets:trendingTags] Added threshold parameter to let user 
decide the # to show
 2020-04-06 09:20:41 +02:00
mokaddem 5f74b9c4e8
fix: [widgets:trendingTags] Removes unused vars. fix #5761 2020-04-06 09:19:15 +02:00
Andras Iklody ca85806312
Merge pull request #5672 from patriziotufarolo/2.4 
Fixes STIX2 export failing with "ANTLR runtime and generated code versions disagree: 4.8!=4.7.1"
 2020-04-06 05:18:22 +02:00
iglocska c8a111447c
fix: [suricata] fixed an invalid validation of https hostnames that blocked the attributes from being included in the exports 2020-03-19 09:16:10 +01:00
mokaddem 04dcdebb1f
new: [galaxyCluster] Initial import of Galaxy2.0 codebase - WiP 2020-03-12 10:26:09 +01:00
iglocska 8d02332b31
new: [dashboard] persistence package 
- export dashboard state
- import dashboard state
- save dashboard state
  - make it available to others on the instance on demand
  - admins can set a default password for users that don't have anything configured yet
  - load another template based on what the community has shared
- added Whoami widget which was an outcome of the ESDC training
- various improvements, new fields for genericElements, etc
 2020-03-08 23:36:27 +01:00
iglocska cd4b6936c8
new: [widgets] Whoami widget added 2020-03-06 10:06:31 +01:00
iglocska 5e56e7dfc7
new: [dashboard] various fixes / improvements 
- simple list now accepts arrays for values
- fixed margin issues
- fixed empty sync test issues
 2020-03-05 10:08:15 +01:00
iglocska 218ea0333c
new: [dashboard] added a way to auto reload widgets 
- has to be defined in the code of the widget
 2020-03-04 14:46:01 +01:00
iglocska 03dc9a8206
fix: [synctool] tests improved 2020-03-02 23:09:47 +01:00