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

11208 Commits (b71ec87021d626be3c8f525c112a2052348b09dc)

Author SHA1 Message Date
chrisr3d b71ec87021
fix: [enrichment] Added missing data field in attribute in case of attachement type attribute 2019-03-15 11:28:42 +01:00
mokaddem 7123c949c2 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-15 10:52:08 +01:00
iglocska 6699bb003c chg: [REST] Disable all SSL validation if requested by the user 2019-03-15 10:51:41 +01:00
mokaddem 3bd56a102f fix: [eventFiltering] quickfilter on value does not filter on wrong category 
anymore
 2019-03-15 10:50:16 +01:00
iglocska 5f34880010 chg: [REST] Disable all SSL validation if requested by the user 2019-03-14 18:14:01 +01:00
iglocska bdbba8d009 fix: [Training] Interesting link 
- Someone just told us about fmylife.com - if this day continues like this I might have to post there about the development
 2019-03-14 14:28:49 +01:00
iglocska b1f37257c6 fix: [training] Inverse conditional fixed 2019-03-14 14:26:20 +01:00
iglocska 8c4dc4275a fix: [Training] Duplicate user add handling 2019-03-14 14:20:49 +01:00
iglocska 975f09de6e fix: [Training] Handle sync connections failing to be saved better 2019-03-14 14:18:24 +01:00
iglocska 7bf2968785 fix: [training] Small fix 2019-03-14 14:13:42 +01:00
iglocska 3eafffad4e fix: [training] fixes to the org creation 2019-03-14 14:10:51 +01:00
iglocska b74728bdd0 chg: [Training script] Improvements 
- Create reverse sync accounts/link on demand
- Create admin users for the player teams on demand
- Some minor fixes
 2019-03-14 13:15:41 +01:00
iglocska 79b0be30f6 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-14 08:46:35 +01:00
iglocska fb26e3495f chg: [cakephp version] bump 2019-03-14 08:46:10 +01:00
Steve Clement 39b9ac6ca0
Merge pull request #4293 from 4ekin/russian_translation 
fix: Merge issue
 2019-03-14 11:46:36 +06:00
Alexandre Dulaunoy 2544170208
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-14 06:32:42 +01:00
Alexandre Dulaunoy 2cf64d545c
chg: [misp-galaxy] updated to the latest version 2019-03-14 06:32:15 +01:00
iglocska eaf71ef6eb fix: [Training] Cause I'm a lumberjack and I'm ok 2019-03-13 18:06:31 +01:00
iglocska 0e76537f7a fix: [Training] AAARGH 2019-03-13 17:31:07 +01:00
iglocska af8f730ebf fix: [training] Further work on the script 2019-03-13 17:27:20 +01:00
iglocska ca4c31dcc0 fix: [training] Allow for self signed certs 2019-03-13 17:20:37 +01:00
iglocska 3dc0244177 fix: [training] Siplified key management 2019-03-13 17:18:55 +01:00
iglocska 86b8fe3a30 fix: [Training] Further fixes 2019-03-13 17:11:04 +01:00
iglocska cbdd2e2cfc fix: [training script] Added some resilience to prior partial executions 2019-03-13 16:58:40 +01:00
iglocska e72e96d85f fix: [training] Fixes based on failed executions 2019-03-13 16:41:27 +01:00
iglocska 712509206c fix: [training script] Case sensitivty fixed 2019-03-13 16:05:25 +01:00
iglocska e49adab132 chg: [training] Some additional changes 2019-03-13 15:50:37 +01:00
iglocska 69fc0edc69 chg: [training script] Added server indication 2019-03-13 15:43:27 +01:00
iglocska e29985b6ab fix: [training script] verbose mode added 2019-03-13 15:40:56 +01:00
iglocska d5f62f62d8 fix: [training script] Minor fixes 2019-03-13 15:28:42 +01:00
iglocska 4c72f22516 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-13 15:09:35 +01:00
iglocska eb101c97c4 fix: [training] training setup script now correctly handles settings 2019-03-13 15:08:58 +01:00
Andras Iklody 3e25f98c4d
Merge pull request #4299 from nikofil/zmq_flag_fix 
Fix checking of incorrect flags when publishing to ZMQ
 2019-03-13 16:03:06 +02:00
iglocska 97b626a593 fix: [UI] Removed input field from form where it's not applicable 2019-03-13 13:26:22 +01:00
iglocska 7ceb64e0ba new: [exercises] Added a new setup script for configuring exercise infrastructures rapidly 
- assumes a hub MISP and a set of training MISPs for different participating teams
- This script is to be executed on the hub MISP and assuming a consecutively incrementing numeric component in the training MISPs' URL it will pre-configure them
- each instance has to have the same API key for the site admin (the idea is to clone training VMs)

- configuration creates users, organisations, sync users, sync connections across both the hub and the individual trainee instances
- Just copy /var/www/MISP/app/Console/Command/training.default.json to /var/www/MISP/app/Console/Command/training.json and configure it to get started
 2019-03-13 12:24:53 +01:00
iglocska f47b5643fd Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-13 12:06:01 +01:00
Nikos Filippakis b783b5e393 Fix checking of incorrect flags when publishing to ZMQ 
* Check Plugin.ZeroMQ_event_notifications_enable instead of Plugin.ZeroMQ_attribute_notifications_enable in Event.php
* Check Plugin.ZeroMQ_audit_notifications_enable instead of Plugin.ZeroMQ_user_notifications_enable in Log.php
* Check Plugin.ZeroMQ_object_notifications_enable instead of Plugin.ZeroMQ_attribute_notifications_enable in MispObject.php

Signed-off-by: Nikos Filippakis <nikolaos.filippakis@cern.ch>
 2019-03-13 11:51:40 +01:00
iglocska 7b34e8cacb fix: [API] resetting the authkey didn't respond with the new key before, making automation difficult. 2019-03-12 22:03:34 +01:00
4ekin e7a66859e8 fix: News View add, index and Controller (flash messages i18n bug 2019-03-12 17:26:44 +03:00
4ekin f79a18040b fix: Admin User index, view, edit i18n bug 
fix: User view i18n bug
 2019-03-12 16:55:38 +03:00
4ekin 840a2fb7e8 fix: Attributes index wrong ditribution field 
fix: Logs search bug i18n
fix: Organisations index bug i18n
 2019-03-12 16:45:48 +03:00
4ekin 3e4b7b76b3 fix: Merge issue 
chg: Russian translation
 2019-03-12 14:52:35 +03:00
Alexandre Dulaunoy 5648f3634d
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-12 10:38:48 +01:00
Alexandre Dulaunoy af9fda9a5c
chg: [warning-lists] updated to the latest version 2019-03-12 10:38:16 +01:00
chrisr3d bacb4ecab5
wip: [hover enrichment] Started changing hover enrichment as well 
- As for enrichment modules, it does not change
  the support of the current modules, and should
  not interfere with them either
 2019-03-11 23:47:03 +01:00
chrisr3d 0bb088bf00
wip: [enrichment] Started changing enrichment modules 
- Passing full attributes to the new modules
- No changes for the currently used modules
- Using a parameter to specify which format to use
- Current format used if no parameter is set
/!\ WIP, more to be updated soon /!\
 2019-03-11 23:33:26 +01:00
Alexandre Dulaunoy fb99d65076
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-03-11 19:27:56 +01:00
Alexandre Dulaunoy 1e859827be
chg: [misp-galaxy] updated to the latest version 2019-03-11 19:27:29 +01:00
iglocska 6f46c022de fix: [object references] Fixed an issue with the reference type not being loaded correctly 2019-03-11 16:44:34 +01:00
iglocska 11cd59b941 fix: ['rest client'] Python script generator fixed 2019-03-11 16:36:46 +01:00