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

1087 Commits (745512e71e09580ae533a1e14dfc3026cd9f9cd2)

Author SHA1 Message Date
mokaddem 6ba45b27f8
Merge remote-tracking branch 'origin/2.4' into decaying 2019-08-13 16:32:58 +02:00
mokaddem beef5012f9
fix: [decaying:tool] Correctly save formula changes 2019-08-13 14:27:47 +02:00
mokaddem b415f8ffc7
chg: [decaying] Added list of available formulas and model settings - 
WiP
 2019-08-13 14:21:58 +02:00
mokaddem bd1aacafea
new: [event:view] Added support of decay score 2019-08-12 16:34:26 +02:00
chrisr3d b532907cfb
fix: [enrichment] Handling correctly comments at objects level 
- Objects level comments were displayed but not
  handled at the end, they are now displayed,
  users can modify them as comments at attributes
  level, and they are handled then with the saved
  results
 2019-08-08 15:50:09 +02:00
chrisr3d 1645d45a3e
fix: [enrichment] Getting objects description from the view 2019-08-02 16:56:49 +02:00
chrisr3d be339c2dff
fix: [webroot] Catching encrypt fields from the enrichment view 2019-08-02 15:19:26 +02:00
mokaddem 26bedd8a68
fix: [security] Fix to stored XSS 
- as reported by David Heise
 2019-07-27 10:41:48 +02:00
mokaddem eba3f98ed3
Merge branch '2.4' of github.com:MISP/MISP into decaying 2019-07-25 11:32:52 +02:00
mokaddem c951228ebc
chg: [restClient] Do not override query body if url hasn't changed 2019-07-25 11:29:43 +02:00
mokaddem 61217eaf94
chg: [decaying] Added axis labels 2019-07-25 11:16:12 +02:00
mokaddem 5e2968df42
chg: [decaying] Full support of enable/disable model 2019-07-24 15:41:23 +02:00
mokaddem c2cd6a3459
chg: [decaying:index] Added support of enable/disable on the index 2019-07-24 14:36:13 +02:00
mokaddem 75c96d7b85
chg: [decaying:tool] Added support of enabled model in the UI 2019-07-24 12:14:07 +02:00
mokaddem 5857fdb7aa
chg: [decaying:tool] Small UI tweek 2019-07-24 09:34:03 +02:00
mokaddem 25403486e0
chg: [decaying:basescore] Moved JS in its own file 2019-07-24 09:27:23 +02:00
mokaddem 36ab88cd39
chg: [decaying] Usage of the assetLoader 2019-07-24 09:22:35 +02:00
mokaddem cc0c9a033d
chg: [decaying] UI/UX improvements 2019-07-24 08:59:35 +02:00
mokaddem f1cc83f888
chg: [decaying] Slight refactoroing for styling 2019-07-24 08:58:45 +02:00
mokaddem 8361e85e23
chg: [decaying] static file renaming and moved to its own style file 2019-07-23 15:18:52 +02:00
mokaddem 183851249a
chg: [decaying:simulation] Added responsiveness to SVG 2019-07-23 15:08:46 +02:00
mokaddem 1fa049b8b8
chg: [decaying:simulation] No more modal support for simulation tool 2019-07-23 11:36:44 +02:00
mokaddem a33ae9ee17
fix: [decaying:tool] Quick fix for mapping attribute type to models 2019-07-23 11:07:38 +02:00
mokaddem 52d143e030
chg: [decaying:tool] Dynamic redraw of the model table to support 
dynamic update
 2019-07-23 10:04:43 +02:00
mokaddem 821785273a
Merge remote-tracking branch 'origin/2.4' into decaying 2019-07-22 10:03:57 +02:00
mokaddem 472fa0f032
chg: [decaying:simulation] Hints for tag override and change to larger 
popover
 2019-07-19 10:50:42 +02:00
mokaddem d77163fce9
chg: [decaying:simulation] Added current time and score and improved UI 2019-07-18 16:30:32 +02:00
mokaddem 7394385de6
chg: [decaying:model] Added support of default base_score 2019-07-18 15:08:13 +02:00
mokaddem c73547f89f
chg: [decaying:simulation] Alert user if base_score has not been 
configured yet
 2019-07-18 09:58:11 +02:00
mokaddem dc68824ebf
chg: [decaying:simulation] Base score computation steps and improved UI 2019-07-18 08:50:15 +02:00
mokaddem 4817c38ac3
chg: [decaying:simulation] Added support of base_score computation, 
various UI improvements and different method to compute scores
 2019-07-17 16:14:24 +02:00
mokaddem 123c12a406
chg: [decaying:simulation] Improved tooltip generation 2019-07-17 10:05:16 +02:00
mokaddem a517bbb5d9
chg: [eventGraph:search] Usage of chosen instead of bootstrap with non-stripped label 2019-07-16 16:04:27 +02:00
mokaddem eb33866027
chg: [decaying:simulation] Removed commented out lines 2019-07-16 15:32:01 +02:00
mokaddem 42acd1843d
chg: [decaying:simulation] Improved UI 2019-07-16 15:30:31 +02:00
mokaddem e46e42058e
chg: [decaying:simulation] Support of both modal and fullscreen 
simulation
 2019-07-16 10:28:03 +02:00
mokaddem bbab646d01
chg: [decaying:simulation] Support of sightings in the decaying simulation 2019-07-16 09:31:49 +02:00
iglocska c8018d7daa
new: [API] Proposal sync rework done 2019-07-12 16:03:08 +02:00
mokaddem 9585c9118d
chg: [decaying:simulation] Draft 2 of simulation chart line - WiP 2019-07-12 15:20:49 +02:00
mokaddem 5c8e7f7e30
chg: [decaying:simulation] Support of row clicking 2019-07-10 16:39:32 +02:00
mokaddem 4e7c628350
chg: [decaying:simulation] Attribute searches 2019-07-10 15:52:22 +02:00
mokaddem 38fef5d1ae
fix: [galaxy:add] Prevent bug when submitting empty galaxy 2019-07-09 13:59:39 +02:00
mokaddem e2bb1a4f4d
chg: [decaying:simulation] Started simulation view - WiP 2019-07-09 13:43:41 +02:00
mokaddem d21e33c91c
chg: [decaying] Improved UI and limit number of digit in parameters 2019-07-09 09:49:45 +02:00
mokaddem 5e54a9c311
chg: [decaying:tool] Full support of base_score configuration 2019-07-09 08:49:49 +02:00
iglocska d82176b5ed
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-07-08 11:45:18 +02:00
iglocska 2a059f7b31
new: [tags] Local tags feature added 
- Create tags locally if you are a host org user that allows in-place tagging for sync / export filtering
- Events are NOT modified using these tags
- Local tags always get stripped before syncing
- Local tags allow host org users to violate the ownership model of MISP
- galaxies, attack matries also included

- some sync fixes
 2019-07-08 11:39:41 +02:00
mokaddem 2d7643ccd7
chg: [decaying:base_score] Custom tagging in base score examples 2019-07-03 16:04:36 +02:00
mokaddem 76cddeb264
Merge branch '2.4' of github.com:MISP/MISP into decaying 2019-07-03 13:45:49 +02:00
mokaddem 41615b7ce4
fix: [eventGraph] Correctly pick the first-matching requiredOneOff to 
generate the object's label
 2019-07-03 11:38:07 +02:00
iglocska 9293a15e2f
Merge branch 'module_rework2' into 2.4 2019-07-01 09:51:07 +02:00
mokaddem 727af1b799
chg: [decaying:tool] Added example table with automatic tags picking and 
pass config to the model - WiP
 2019-06-26 15:14:08 +02:00
mokaddem fa735c02db
chg: [decaying:tool] Started implementation of tag support and examples 
in the `adjust base_score`
 2019-06-25 16:57:44 +02:00
mokaddem 6cd281733a
chg: [event:view] UI tweaking on related-* 2019-06-24 15:43:48 +02:00
mokaddem 4ab4318eb2
chg: [event:view] Make `Related *` scrollable 2019-06-24 14:00:51 +02:00
chrisr3d faf7abc8e5 Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-06-21 12:15:01 +02:00
iglocska d69188f66a
new: [correlation graph] Toggle physics on/off 
.,/#&&@@@@@@@@&%(*.
                                                         #@@@@%*..,..,.,,.,,.,.,.,,,,..,*#@@@@(
                                                  .&@@%,,.,,.,,,*#%&&&%#(/**,,**/(%&&&%(/,.......(@@@,
                                              %@@(,,,,,,(&&%*..........  ...*,*..,.........../&,....,%@@,
                                          &@&,,,,,*&&(....  .*....*..//.../../(...*.*(...%..........#&(....*@@/
                                      ,@@,,,.,#......#..#*..(#..(*./,..,...*(...*.,.*..........#/#.....%&,..,/@@.
                                   /@%,,,,(&(.....#/,...#../.(#...,/.,,../,..*(...*...%,.........,*...#./....#&,.,,@@.
                                .@&,.,,%&....,,....(*,.../.(,..(...,..,..*#..,,..,..,...*,....../#...,..(//.....,&/..,&@.
                              %@,,,,#&...,,/./**....(,,..(,.//..,*..............................,.....././(.,..*...,&/,,,@&
                            @%,,.(&,../(*..(#../#....(*. /....................................../,..*.*..//,,..,/.....,&...%@
                         .@(..,&&,......%,,/..../(..(................................................/(..(.,.*.....**....%#,,*@,
                        @(,,*&%*.........*((....*#.......................................................(*.,,.......*,#...*&..,@*
                      @#,,/&%,.(*..........#,/.............................................................../...*..*(.......*&.,*@,
                    #@,.,&&*.#&/(.,...............................................................................,...(...,.,,.*%..*@
                   @*,,%@/......#*(................................................................................./. (./.#.....#%..%@
                 &@,,/..........#,../................................................................................,.#.........&*,,@*
                @/,,&@,............/(..................................................................................#............*&../@
               @*,/&&.................................................................................................................&,..@
             (@,,(&(...................................................................................................................%%..@(
            (&,,#&*.....................................................................................................................,%../%
           #@,,%&........................................................*/,...../(*......................................................&..*@
          /&,,%&....................................................,                  **..................................................&..,@
         *@,,%&..................................................,     . . ..       .  .  *,................................................&..*@
         @*,#%,................................................*   ..                       (................................................&.,*%
        @/,*#*...............................................*%/,,,***,...,,.  ..............,&..............................................,&..&(
       %&,,%@...............................................%**,..,,,,,,,......,. ........   ,,%#............................................./(,.@
       @*,(%................................................*,..*(*.*,,...*,/..*,.. ... .,.*... ...............................................&*..@
      &(,,#,...............................(/**,,,.,,(.*/,%&&%#*/#(....,* .,...... */. ..,/**/(##% *,,.,,.( .   .(..............................&..##
      @*,%#................................*.... .(/..... %,,.,,*.,**.,,,,,,*((*,..... .(. . . .. ,.,,,..,. .....,..............................#(..@
     ,,/,................................*.  ...........#,*.,/*.,,,,,,,,,,,...,*.......  .(. .  *              %...............................&..*#
     @/,##.................#*..,*,,,,..(/,,,*.,***/,,,,/*/*.,,,,,,,,,,,//***,,,**...... ..   ./.%.,*.(*,,,..,.,/,..,***/*#...*%(...............%(..@
    .@*.#*..........,,,,,*,%....,/,**/...,//(/...*/((,.,/&%((/***/*//**///////********,,,,......./%(..........      . .,,,,.....#*.. ...,.........%..%/
    #(*//..........%,.,,,,.%........... . ...............*/****,*,,,,**,,,,,,,,,,,,,..,,.........(,,,,,*,,,*,,,.........     ....( ...../.........&.,.@
    @/,(/........%%,.,,*,(%/*/*...,.,,*,..............,,.,/%%%###%%##%####(#%####%%(/((###(//(%((..................,   .  ....,%%((((//(&.......#/..@
    @/,((..........%......#*...........,..............,.../,//****/***/**,,*/,,/(*,*,,........**.(.,.................*...........&     .*.........,%..@
    @/,#/..........(,,.,,,(*.........../..............,.../,/*/((((//*//*,*#***,./,/,,,........*./...................*...........%....../..........%..%.
    @/,#*..........#......*/...........*..................*.**/,.,*(//**/,..,..,...*,,,..,*,...*.(...................*...........%   .../..........&..(,
   .@(*#,..........%......//...........,.,......,,*,**....*./**(,##,(//*/,/%&&&%%&//,,,..,//,.,*.(...../,,,,.........*.,.,.,.....& .. ../..........&../,
    @(*#,..........#...(,,&/.....,%##(,*.......,,/*,(.,..,*./*/(*/**(/*,/,///***,.*/,,,..,../.,*./.....*/..(........./,*,*#......&,../..*..........&..(,
    @(*#/..........#..*...%/...,.*,..#,,.......,,,..#,,.,,*./*/(*//*(//,(**//,,,,.*/,.,.,*../../,/...../(..(.........(.,..(.,....#. ..*.,,.........%..%
    @/*/*..........#..,...%*...,.*,..#.,.......,*,..(.,,..*,**(#*((/(//,/********,*/*,,,.*..*.,/,(.,...*(..(.........(.,..(......#... *.*,.........%..@
    &//*,..........%..*...&,...../...(,,......,,*...(.,,,,,.///(*/////(*(,/*/***,,*/*.,.,*..*.,*./.,...*(../.........#,,..(......#.   /./..........#..@
    *%/,#..........%..,...%,...........,.......,*...#.,,,./.**((*//*(//*(,/*/**,*,//*,,..,..*.,/,(...,.*#../,........#. .,......./.   /.*.........**..@
     @/,(,.........%..    %....,..,....,,......,*...(,,,,/.,/,./*/(,(((/%#*,(///*//((,...*..*.,*,,#.,,,//  ,.........#...........#.   . ,.........&..%/
     @(/,/....,.........,*..,.........,,.....,.,.,,*,,,*//***,,,,,,**,***,****//(((##%%#######(#(#(..,.***,,,........#............./...    ..,*...%..@
     ,@/,#,...,..,.,**,,,..,,,.,,.....,.,.,...,,/***/,,//(/////////**///(////**,,,,,,**,,,,......./.*,,**,,,,........#.............*,,,*,,,..**..#*.,%
      @/**/...............................,,,,,,,,,,,*&&%%%###%%%%%%%%%&&&&&&%%##((/////***,*,,,,*/#%(&%###%%%%%&&&&&&%########((//**,...........%..@
       @/,/...........,%...............................**,,,,,,,*******//((###%%%&&&&@@@@@@@@@@@@@@%...............................,,,,,,,*/*.**.*&
       /,#.....,*.,%&&%...........,.,..,*.....*,&/......*.*,/....&(#%......,.....*. ,.....,,,............../*........ .............../,..#*,..%..@
        @/*,/..,*@*...../(...........%*(,*%....,/#../#....*%( /.....(*.....,*,....(,......../.,......(,......#(.....#...#...........,.....//...&..%,
         @/,**.*(....(,%./%.........*%,#.,&.....,(..&.....*%.##.....((.....,/.....*/........(........(,......#(....../../........../.......((.**.*&
         (@/,(*..%#....,.,&........................................................................................................#*....../.,%..@
          #%/,(,..**/,..*%..*....................................................................................................,..#,.**(#..#..@
           @%/*#*.,....%*.#*%,,...................................................................................................%.........%.,@
            /,(/...,%.%./.*@*,................../&//...................................................,#*................../#*....&*./..%.,@
             &&/,(%..,./.(&....,/,..............,#(/,/. ,..............................................(*,,.,,...............,*..&..*../.,#.,@
              /&/,*%..,%,....*.(&*%............##.,...*&., ,....................................../.#...,,.../................%,..../&,.*,.,@
               ,@/**%*......,&(...&.#................*&..,(,./(,*.............................*..%./*.....#*,............*......,%.*,..&.,/%
                 @(/*#&..*/@.......%#(%............,/&...,(*#..(#./#.................,*.,.%,, .( ....,*.................,#...,.....(..#,.@*
                  #&/**&%......,,(&/..*.,................,%..../%(,..........///,#(.,*.....(.#,.,....#(...............%.*..%.....(..%,,,@
                    @(/*(&*...*&.((...../%/..................,/(.............*......./##,...(,..#*.....................,#.,..%.*..,/,,@*
                     #@//*#@..##%..../.%...%....................,............(/.../..(*..,../...................#/.....#..%...,..%..*@
                       @&(**%@,.,/.,.(*...//...................................%&(................................& &,..*..%,..%,,.@
                         @&(*/#&(..((..,.#/....../.*.*.......................................................%.,...%*..%/....%...@.
                           @&(//(&@...%#/.......#/%..*.( /,..........................................*,,...../*%*,...#..../(.,.@.
                             &@(///%&/...........,/#.....*/##(.....................................,*,........(.%%#,/...%,.,*@
                               /@#((/(%&*.....*/..((%...*/#...,*((#&.  ,,*///*..............(*.../*.,.*,......&......%#.,,@%
                                  &@((//#%&*...#(**#.../,/...*#*/../,,.*.*...(*,,..((....../,.....,,./........(...%/,,,#@
                                     @@(((((%%&,....../,/...,.**/..*,*..,,,(/..,,.,.,......(,.....(,..(, ...../%*.,,(@*
                                        #@%////#%%&*....#.,(.,#*,..*,...*,./*.....#(........(,....(.......(%/,,,,&@.
                                           .&@#////(#%%&(.....*&&*/*(...*,,..*./,...(...............,/%/,,,,,%@#
                                                #@@/*////(#%%&&/.........,*(#*..(,/*.........,*#%//,,*,,*@@(
                                                     /@@@(/(////((((###%&&&&%%%%%%%%&%%##(/*******/&@@(
                                                            ,%@@@@%#((//////******/////(/#%@@@@%,
                                                                          .,***/***,.
 2019-06-20 17:46:39 +02:00
chrisr3d 084b6e0786 Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-06-20 14:44:33 +02:00
chrisr3d 9b9ef64b1f
add: [enrichment] Fetching data fields from the view 2019-06-20 14:37:33 +02:00
Andras Iklody ba6fe46d6e
Merge pull request #4769 from cvandeplas/2.4 
fix: [js] fixes #4678 and javascript errors
 2019-06-19 07:37:54 +01:00
iglocska 80975bf7d3
fix: [UI] Enrichment hover should also work after sorting / changing the event attribute context, etc 2019-06-18 14:42:31 +02:00
Christophe Vandeplas 9f8e22e96c fix: [js] fixes #4678 and javascript errors 2019-06-18 13:46:32 +02:00
chrisr3d cf20d07cad
add: [enrichment] Displaying + returning tags at attributes level from the module results 
- If one of our UI master could review this and find
  a better way of displaying the tags at attribute
  level in the module results view, it would be
  very cool :D
 2019-06-14 18:16:09 +02:00
chrisr3d 8642bc5802
add: [enrichment] Attaching event level tags returned by the module results 2019-06-14 18:11:47 +02:00
chrisr3d b7b4002fc7 Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-06-13 14:16:39 +02:00
mokaddem b42f803110 chg: bumped queryversion 2019-06-12 15:31:06 +02:00
mokaddem c6fee5bc4f new: [eventBlacklist] Added support of bulk deletion of entries. Fix 2019-06-12 15:27:39 +02:00
Andras Iklody fbef06c0ca
Merge pull request #4635 from mokaddem/galaxyMatrixImprovements 
Galaxy matrix improvements
 2019-06-12 14:23:35 +02:00
mokaddem 4fcd8dc55d Merge branch '2.4' of github.com:MISP/MISP into mergeAttributeIntoObjects 2019-06-12 14:14:22 +02:00
mokaddem 99b6ff84bc Merge branch '2.4' of github.com:MISP/MISP into galaxyMatrixImprovements 2019-06-12 13:22:43 +02:00
mokaddem 7a6a22e84a fix: [galaxy:add] Fix #4733 (adding galaxies on attribute) 2019-06-12 13:10:47 +02:00
mokaddem 892348d7fd Merge branch '2.4' of github.com:MISP/MISP into mergeAttributeIntoObjects 2019-06-12 10:35:14 +02:00
mokaddem 52ae153c0e Merge branch '2.4' of github.com:MISP/MISP into galaxyMatrixImprovements 2019-06-11 15:56:10 +02:00
chrisr3d 831f7575bd Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-06-07 15:32:39 +02:00
iglocska 3733f3dd00
fix: [CSRF] END THIS NIGHTMARE 2019-06-07 15:25:32 +02:00
iglocska ab86fd658b
fix: [CSRF] Potential fix for the CSRF issues via tag/galaxy additions 2019-06-07 14:44:39 +02:00
mokaddem a85cbd5877 Merge branch '2.4' of github.com:MISP/MISP into mergeAttributeIntoObjects 2019-05-24 10:18:39 +02:00
chrisr3d 279a71c327 Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-05-24 08:32:23 +02:00
mokaddem 46be1e918e chg: [event:view] Correctly display title to large by truncating 
(+ellipsis)
 2019-05-23 15:07:43 +02:00
chrisr3d e974a651b2 Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-05-21 16:41:54 +02:00
mokaddem 6ac96b723f fix: [enrichment:popover] Correctly fadeout when clicking on the close 
button
 2019-05-21 10:10:14 +02:00
mokaddem b0b6f59920 fix: [eventGraph] Patch to support new font-awesome 5.8 2019-05-21 09:35:19 +02:00
mokaddem 1d9f49c9d9 chg: [font-awesome] Bumped version to 5.8.2 and updated glyphs. 2019-05-21 09:08:23 +02:00
mokaddem 9afaaf2108 chg: [css] Increase z-index of popover 2019-05-20 16:35:57 +02:00
mokaddem f86e99d73b fix: [galaxy:add] Consider both model names when doing a mass cluster 
addition
 2019-05-16 17:26:41 +02:00
chrisr3d a92ffa1b39 Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-05-16 14:09:20 +02:00
mokaddem eded05ea4b chg: [object:add] Disable the first select's option when adding a new row 2019-05-16 09:07:50 +02:00
mokaddem 6db5c77e0c chg: [object:add] Added empty option support in select inputs when 
creating an object
 2019-05-15 16:31:22 +02:00
mokaddem 2712b1c801 chg: [galaxyMatrix] Fix typos 2019-05-15 14:12:08 +02:00
mokaddem 21504ea5a8 fix: [galaxyMatrix] fixed layout for other views 2019-05-13 16:34:51 +02:00
mokaddem eb81e03a64 chg: [galaxyMatrix:popup] Layout improvement. Make it scrollable! 2019-05-13 16:23:13 +02:00
chrisr3d af8065abcf Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-05-13 14:53:46 +02:00
mokaddem de186f93ad fix: [genericPicker] allow tagging when the ATT&CK Matrix has been 
opened.
 2019-05-13 10:10:26 +02:00
mokaddem c325f1728c new: [object:fromAttribute] Started dev on merging selected attributes 
into an object - WiP
 2019-05-08 16:56:19 +02:00
chrisr3d e3788408f7 Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-05-07 10:09:29 +02:00
iglocska 62f15433e4 fix: [security] Fix persistent xss due to invalid sanitisation of image names in titles 
- triggered by expanding a screenshot

- as reported by João Lucas Melo Brasio from Elytron Security S.A. (https://elytronsecurity.com)
 2019-05-07 09:01:05 +02:00
mokaddem ffbbb9292d chg: [eventgraph] Force constant color for the eventgraph's nodes. Fix #4536 2019-05-06 15:19:22 +02:00
chrisr3d 34092b599f Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-05-02 11:57:29 +02:00
mokaddem 8e5c6e7192 chg: [diagnostic] Changed update button with more relevant icons 2019-05-02 11:21:58 +02:00
Steve Clement fc8f7982df
Zoidberg's son: Update system (#4534) 
Zoidberg's son: Update system
 2019-05-01 18:24:41 +09:00