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

3780 Commits (745512e71e09580ae533a1e14dfc3026cd9f9cd2)

Author SHA1 Message Date
iglocska edf0657a1d
fix: [API] Fixes to the new attribute add 2019-08-06 16:01:09 +02:00
iglocska 786d53d30b
new: [API] Attribute add rework - WIP 
- handle attribute creation in a unified manner via captureAttributes
 2019-08-06 15:55:16 +02:00
iglocska e18e7c1807
fix: [API] fixed an incorrect fix to the object references add function from earlier today, fixes #4866 2019-08-05 16:49:25 +02:00
iglocska cad286d239
fix: [API] the returned data when adding object references doesn't include the object_uuid, fixes #4866 2019-08-05 16:06:51 +02:00
iglocska dcaebb8cc4
fix: [API] Consistency in returned attribute fields when modifying it 2019-08-05 15:31:43 +02:00
iglocska ae28d7b461
fix: [API] Object edit clusterfudge fixed 2019-08-05 13:41:23 +02:00
iglocska 166fbf0da4
fix: [objects] Fix various issues with objects/edit 
- value1 and value2 should not be included in the repsonse, fixes #4944
- fixed input being misunderstood in certain situations
 2019-08-05 10:50:39 +02:00
iglocska fc3a38d463
fix: [pymisp / querystring] versions bumped 2019-08-02 17:06:17 +02:00
iglocska e5cfd152cf
fix: [local tags] Host org non admin users should be able to tag data owned by others, partially fixes #4925 2019-08-02 16:53:30 +02:00
iglocska 630c6bc1f9
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-08-02 14:43:41 +02:00
iglocska d6692c44a0
new: [sync] Previewing a remote instance now passes pagination rules in the request instead of fetching the full data-set and paginating in memory 
- fixes issues with empty preview pages
- massive performance boost
- requires the remote side to be the same version or newer
 2019-08-02 14:42:23 +02:00
iglocska 1d47e37f5c
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-08-02 14:39:15 +02:00
iglocska 7b9b58356c
new: [sync] Event index cleaned up, total count of listd events added as X-Result-Count header 2019-08-02 14:38:28 +02:00
iglocska 7003faa00c
new: [API] new parameters added to attributes/restSearch to include additional context, fixes #4935, fixes #4940, affects MISP/PyMISP#415 
- includeSightings: include sightings for all attributes returned
- includeCorrelations: include the correlations to other attributes (includes a light-weight event object with each attribute)
 2019-08-02 13:41:20 +02:00
iglocska 4781d68a44
chg: [UI] Added the new user name helper 2019-08-02 10:45:55 +02:00
iglocska a39306dfe5
fix: [API] Exception on /sharingGroups/removeOrg fixed, fixes #4884 2019-08-01 11:16:44 +02:00
iglocska 5d90a8ffc7
fix: [API] /attriutes/index fixed for non admin users 2019-08-01 11:12:59 +02:00
iglocska 220842edff
fix: [API] Freetext import now correctly handles the response of non-background processed tasks 2019-07-31 15:57:25 +02:00
iglocska 1434759135
new: [API] Disable background processing on-demand via URL parameters 2019-07-31 15:56:33 +02:00
iglocska 5f9e04aa4f
fix: [rest client] Potential fix to the skip ssl validation flag not working on wrong CN name 2019-07-31 14:10:19 +02:00
iglocska dc0f4741be
Revert "fix: [rest client] Potential fix to the SSL validation skip not working" 
This reverts commit 293871cee8.
 2019-07-31 14:03:22 +02:00
iglocska 293871cee8
fix: [rest client] Potential fix to the SSL validation skip not working 2019-07-31 13:58:34 +02:00
iglocska b83ac37ff4
new: [API] Allow adding tags via /attributes/add directly 2019-07-30 12:03:49 +02:00
Andras Iklody de228e083f
Merge pull request #4927 from 4ekin/fix-postgresql-issues 
fix: some PostgreSQL issues
 2019-07-30 09:16:11 +02:00
iglocska d6a15438f7
fix: [proposals] POST on shadow_attributes/edit/{attribute_id} inconsistent, fixes #4857 2019-07-29 17:10:21 +02:00
iglocska b2e9bbd7ef
fix: [API] taxonomy/addTag now correctly responds if queried via the API instead of redirecting, fixes #4865 2019-07-29 17:01:28 +02:00
iglocska e60f0beff9
fix: [API] sightings/listSightings should also support JSON parameters, fixes #4875 2019-07-29 16:46:02 +02:00
iglocska 30e7b49632
fix: [API] Organisation edit now also accepts UUID instead of ID via the URL param, fixes #4896 2019-07-29 16:32:24 +02:00
iglocska ed1e55b76b
fix: [API] Fixed an edge case when the attribute historgram throws a notice error 
- no idea how to reproduce it, the organisation referenced in an event orgc_id not existing is a pre-condition

- fixes #4880
 2019-07-29 16:28:42 +02:00
iglocska ebf054e0d0
fix: [API] Adding attributes via the freetext importer using the API resulted in several issues 
- adhereToWarninglists was not correctly adhered to
- the response didn't reflect what was saved, only what was pushed to be saved (excluding removals by warnintlists, several attributes added by adding more than one valid type, etc)

fixes #4881
 2019-07-29 16:15:00 +02:00
iglocska d75c6c9e3b
fix: [sharing groups] Add sharing group returns a list instead of a sharing group object, fixes #4882 2019-07-29 15:20:51 +02:00
iglocska 191983d27b
fix: [API] Exception on POST sharingGroups/addOrg, fixes #4884 2019-07-29 13:12:09 +02:00
iglocska 954b7e6727
fix: [proposals] shadow_attributes/index default behavior modified to show all proposals by default, fixes #4936 2019-07-29 11:38:20 +02:00
iglocska 118fb6649b
fix: [API] Server deletion now responds correctly via the API 2019-07-29 10:23:00 +02:00
iglocska a89b32d0c4
chg: Server pull/push endpoints allow the passing of the parameters as a POSTed JSON in addition to URL parameters, partially fixes #4889 2019-07-29 10:14:49 +02:00
mokaddem 791ef0d21c
chg: [decaying:rest] Renamed `decayed` into `excludeDecayed` for better 
usability
 2019-07-25 16:21:12 +02:00
mokaddem 28f080e581
new: [decaying:rest] Filtering out of decayed attributes 2019-07-25 16:13:42 +02:00
mokaddem e4cc20b054
new: [decaying] Partial API support - WiP 2019-07-25 15:45:33 +02:00
mokaddem 8611c2069f
new: [restResponse] Added entries in Attribute/RestSearch for decaying 
model support
 2019-07-25 11:52:16 +02:00
mokaddem 5e2968df42
chg: [decaying] Full support of enable/disable model 2019-07-24 15:41:23 +02:00
mokaddem e1d9d53390
new: [decaying] Added models import and export feature 2019-07-24 10:51:58 +02:00
Bechkalo Evgeny 76d58e6e53 fix: some PostgreSQL issues 
Closes: #3066, #3067
Fixes issues:
- wrong boolean and smallint conversion;
- postgresql table and field naming (field 1_event_id is wrong name for
field for example);
- postgresql grouping (you cannot select columns without grouping them);
- wrong checkbox rendering without keyword.
 2019-07-23 11:17:56 +03: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 194e4b5e2d
fix: [event:view] Ensure sync users do not get local tags through ajax 2019-07-19 16:23:15 +02:00
mokaddem e50f624894
fix: [tag:local] Allow users (with correct authorization) to detach 
tags
 2019-07-19 15:28:13 +02:00
mokaddem 7394385de6
chg: [decaying:model] Added support of default base_score 2019-07-18 15:08:13 +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
Andras Iklody 046704b735
Merge pull request #4878 from RichieB2B/ncsc-nl/fix-destroy 
Fix session_destroy errors
 2019-07-16 18:11:53 +02:00
mokaddem 458bd23937
chg: bumped queryversion 2019-07-16 16:08:28 +02:00
mokaddem 42acd1843d
chg: [decaying:simulation] Improved UI 2019-07-16 15:30:31 +02:00
Richard van den Berg 50846595c8 Destroy the CakeSession, not the php one. Fixes #4808 2019-07-16 11:56:56 +02:00
mokaddem bbab646d01
chg: [decaying:simulation] Support of sightings in the decaying simulation 2019-07-16 09:31:49 +02:00
Alexandre Dulaunoy 5122299cd4
chg: [version] align PyMISP version with core 2019-07-13 09:16:37 +02:00
iglocska aafb44a4e2
fix: [bug] RestClient notice error fixed 2019-07-12 16:34:01 +02:00
iglocska 5acc5f9658
fix: [objects] delete now accepts delete HTTP method 2019-07-12 16:05:15 +02:00
iglocska e626936191
Merge branch 'hotfix/sync_rework' into 2.4 2019-07-12 16:03:57 +02:00
iglocska 5941037610
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-07-12 16:03:47 +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
chrisr3d 991337bd8d Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2019-07-12 10:46:08 +02:00
chrisr3d 5d39ec7144
fix: [hover enrichement] Fixed index in attribute 
- Depending on the format of attribute passed to
  the function
 2019-07-12 10:44:20 +02:00
iglocska 19b078d72d
fix: [proposal] sync fix stage 1 
- added new capture function
- reworked the proposal index
 2019-07-11 22:57:58 +02:00
mokaddem a6182341c1
chg: [decaying:simulation] Draft of simulation chart line - WiP 2019-07-11 16:49:38 +02:00
mokaddem 4e7c628350
chg: [decaying:simulation] Attribute searches 2019-07-10 15:52:22 +02:00
iglocska be6da3481f
fix: [sync] Proposal pull restricted to 14 days 
- no need to pull ancient proposals each time
 2019-07-10 15:10:23 +02:00
iglocska 64fafa1913
fix: [api fix] Deletes broken due to invalid boolean 
- /facepalm
 2019-07-10 13:55:33 +02:00
iglocska ed401d88be
fix: [API] delete http requests properly accepted by some /delete endpoints 2019-07-10 11:57:21 +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 5e54a9c311
chg: [decaying:tool] Full support of base_score configuration 2019-07-09 08:49:49 +02:00
iglocska 2fc7aafd8a
chg: [docs] Added excludeLocalTags to events/restSearch 2019-07-08 16:00:34 +02:00
iglocska ce7dc6ecb0
fix: [CLI] admin->setDatabaseVersion fixed 2019-07-08 15:46:29 +02:00
iglocska b45b55e854
fix: [tmpdir] fixed invalid file path 2019-07-08 12:51:37 +02:00
iglocska b9839b8ffe
fix: [internal] upload sample had a hard coded tmp path that would fail to the php fallback if MISP is not installed in /var/www/MISP 2019-07-08 11:53:30 +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 d0b4b009e0
chg: [decayingModel:controller] Updated edit endpoint to match the 
correct view
 2019-07-08 11:28:58 +02:00
Andras Iklody 7bf2bcf085
Merge pull request #4807 from RichieB2B/ncsc-nl/IOCImport 
Support empty attribute type in IOC import
 2019-07-04 06:57:50 +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
chrisr3d f651a030aa Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2019-07-02 22:08:11 +02:00
chrisr3d b40582679d
chg: [enrichment] Reusing the new function fetchInitialObject 
- New function that is exactly the copy paste of
  what is removed in this commit and replaced by
  the function call
 2019-07-02 22:05:38 +02:00
mokaddem 5b6b4777f2
fix: [events] Create massive dummy events 2019-07-02 11:44:05 +02:00
iglocska 9293a15e2f
Merge branch 'module_rework2' into 2.4 2019-07-01 09:51:07 +02:00
Richard van den Berg 52b7365f01 Support empty attribute type in IOC import 2019-06-27 07:39:29 +02:00
mokaddem eb21705fc5
chg: [decaying:tool] Filter taxonomies not having numerical score 2019-06-25 11:46:23 +02:00
mokaddem 4ab4318eb2
chg: [event:view] Make `Related *` scrollable 2019-06-24 14:00:51 +02:00
Andras Iklody 69febf087a
Merge pull request #4570 from mokaddem/relatedEventUI 
Related event ui
 2019-06-21 19:06:38 +01:00
chrisr3d faf7abc8e5 Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-06-21 12:15:01 +02:00
mokaddem 93e85e6d7a fix: [event:addTag] User can add multiple tag collection at once 2019-06-21 12:10:59 +02:00
mokaddem 96bc938ae1 fix: [relatedEvent:view] catch if number of correlation cannot be found 2019-06-21 11:42:21 +02:00
mokaddem 9274522177 chg: [relatedEvent:view] Display the number of unique correlation 2019-06-21 11:21:43 +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 7c0d7adb9e
chg: Bumped query version 2019-06-20 14:43:43 +02:00
iglocska c06aa1fd79
fix: [API] Simple worker management added 
- /servers/startWorker/[queue]
- /servers/stopWorker/[pid]
- /servers/getWorkers
 2019-06-19 14:08:06 +02:00
iglocska 5b1697667f
new: [UI] Filter the object template index using the quick search 2019-06-18 17:51:25 +02:00
iglocska 599641672e
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-06-18 10:55:07 +02:00
iglocska 007377129f
new: [API] On-demand inclusion of attribute relations via the event view endpoint 
- new URL param, includeGranularCorrelations:1 added

                                 |\    /|
                              ___| \,,/_/
                           ---__/ \/    \
                          __--/     (D)  \
                          _ -/    (_      \
                         // /       \_ / ==\
   __-------_____--___--/           / \_ O o)
  /                                 /   \==/
 /                                 /
||          )                   \_/\
||         /              _      /  |
| |      /--______      ___\    /\  :
| /   __-  - _/   ------    |  |   \ \
 |   -  -   /                | |     \ )
 |  |   -  |                 | )     | |
  | |    | |                 | |    | |
  | |    < |                 | |   |_/
  < |    /__\                <  \
  /__\                       /___\
 2019-06-18 10:51:16 +02:00
Andras Iklody 1470d21813
Merge pull request #4674 from juju4/devel-globalstrict 
strict typing - snuffleupagus tests
 2019-06-18 09:29:12 +01:00
Andras Iklody 9fca396bb4
Merge pull request #4741 from StefanKelm/2.4 
Update EventBlacklistsController.php
 2019-06-18 09:28:30 +01:00
iglocska c097f001dc
new: [security] Made certain settings modifiable via the CLI only 
- some settings are too risky to be exposed, even to site admins, so made them CLI accessible only
 2019-06-18 09:57:27 +02:00
StefanKelm 22345a747d
Update EventBlacklistsController.php 
(minor) aligns the text with app/Controller/Component/BlackListComponent.php
 2019-06-13 14:57:10 +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
iglocska 6965c83fc1
new: [eventblacklist] Added search filters 
- We really need a DISP - development information sharing platform
 2019-06-12 15:53:13 +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
iglocska 3bcd7c57a3
chg: [querystring] bump 2019-06-12 14:24:14 +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 210477eaaa chg: bumped queryversion 2019-06-12 14:13:25 +02:00
mokaddem f850abcdaa fix: [galaxyMatrix] Handle case if deprecated galaxy does not exists 2019-06-12 14:12:06 +02:00
mokaddem b3849655e0 fix: [attributes] Correctly pass the user object and renamed delete function 2019-06-12 11:56:42 +02:00
mokaddem d6093b9659 chg: [object:fromAttributes] Method only accesible via AJAX and regular 
users can use the feature
 2019-06-12 11:17:17 +02:00
mokaddem b050269949 chg: [object:fromAttributes] Added support of hard delete if event not 
published yet
 2019-06-12 11:00:17 +02:00
mokaddem 892348d7fd Merge branch '2.4' of github.com:MISP/MISP into mergeAttributeIntoObjects 2019-06-12 10:35:14 +02:00
mokaddem c9f8660518 chg: bumped queryversion 2019-06-12 10:11:18 +02:00
mokaddem 66ee8ef12c chg: [galaxyMatrix] Added check if event not found 2019-06-12 10:03:31 +02:00
mokaddem 43a038b0a5 chg: [galaxyMatrix] Improved `getTagScores` to allow with and without 
ACL tag score fetching
 2019-06-12 09:56:54 +02:00
mokaddem 49357e9c84 fix: [event:galaxyMatrix] Apply ACL on the galaxy matrix scores (event 
view)
 2019-06-12 09:11:08 +02:00
mokaddem 52ae153c0e Merge branch '2.4' of github.com:MISP/MISP into galaxyMatrixImprovements 2019-06-11 15:56:10 +02:00
mokaddem 11a4bdb959 chg: [restSearch:attack] Only expose attack return format to the `event` 
scope
 2019-06-11 15:50:51 +02:00
mokaddem acef3a0168 chg: [galaxyMatrix:stats] Only take into account occurences of galaxy 
once per event
 2019-06-11 15:09:02 +02:00
mokaddem fed5556976 fix: [galaxyMatrix:export] Removed multiple bugs providing inconsistent 
result
 2019-06-11 14:13:17 +02:00
chrisr3d 71209da87a Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-06-11 13:53:00 +02:00
chrisr3d ccee18b8c7
add: [enrichment view] Displaying events metadata & number of returned attributes 2019-06-11 13:51:53 +02:00
iglocska 36b43f1306
fix: [security] Org admins could reset credentials for site admins 
- org admins have the inherent ability to reset passwords for all of their org's users
- this however could be abused if for some reason the host org of an instance would create org admins
  - the org admin could set a password manually for the site admin or simply use the API key of the site admin to impersonate them
- the potential for abuse is very circumstancial as it requires the host org to create lower privilege org admins instead of the usual site admins
- only org admins of the same organisation as the site admin could abuse this

- as reported by Raymond Schippers
 2019-06-11 11:05:34 +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
iglocska 25d8d6cf94
new: [API] added new restSearch filter - date 
- deprecated to and from
- date works similarly to timestamp, accepted syntax options:
  - time ranges in the shorthand format (7d or 24h, etc)
  - timestamps
  - fallback parsing for other formats (2019-01-01, "fortnight ago", etc)
  - date ranges using lists [14d, 7d]
 2019-06-07 09:49:52 +02:00
iglocska 75dcaa14e0
fix: [session] Fix to automatic session destruction in previous attempt to fix the overflow of API sessions 2019-06-07 08:49:30 +02:00
iglocska d6fc4272ad
fix: [API] Destroy the session at the end of the execution 2019-06-06 20:31:56 +02:00
mokaddem 82e7859182 chg: [object:fromAttributes] Show object references that will be dropped 2019-06-06 16:43:54 +02:00
mokaddem fe4740abd9 fix: [object:fromAttributes] SYNC support for older instances 
(duplicate attributes and their contexts)
 2019-06-06 15:11:34 +02:00
mokaddem 8d2c55fa69 Merge branch '2.4' of github.com:MISP/MISP into mergeAttributeIntoObjects 2019-06-05 12:02:17 +02:00
iglocska 3bcaab013e
new: [cleanup] Added admin tool to remove all published empty events 
- part of the solution to the empty event sync issue introduced in 2.4.107
- skips the event blacklisting
 2019-06-04 19:45:28 +02:00
iglocska 2590b27334
fix: [sync] Temporary fix for empty events showing up in syncs when pulling from a new instance via an outdated one 2019-06-04 13:54:47 +02:00
chrisr3d 25f6c41444 Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-06-03 18:45:45 +10:00
iglocska c9860c2a44
fix: [UI] Event lock concatinating quoted empty strings 2019-06-03 08:03:41 +02:00
iglocska d9153f8bb8
fix: [sync] Further fixes to the deleted flag changes breakig things 2019-05-31 09:19:51 +02:00
iglocska 304358b162
fix: [sync] Fixed an issue that dropped the remote org 2019-05-30 15:06:51 +02:00
iglocska b23a2395e2
fix: [sync] whitelist fields that can be added via the JSON config 2019-05-30 14:50:51 +02:00
iglocska b706b5860b
fix: [UI] Invalid redirect fixed 2019-05-30 14:46:33 +02:00
iglocska aae9307106
new: [Sync] Add a tool to create MISP sync configuration JSONs and to ingest them, fixes #4696 
- sync user can log into remote instance, extract config JSON
- paste it into own instance as site admin to add MISP sync connection
 2019-05-30 14:42:29 +02:00
iglocska aeb906b494
fix: [API] Weird responses from JSON objects fixed when data returned is empty 2019-05-30 13:49:04 +02:00
iglocska e8f5d65499
fix: [API] Wrong JSON output when /events/index returns empty result, fixes #4690 2019-05-30 10:59:29 +02:00
chrisr3d 8aa6a4571a Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-05-28 12:25:43 +10:00
mokaddem af15c4af79 fix: [sync] Correctly capture the attributes from a groupment into an 
object during the sync
 2019-05-27 15:40:54 +02:00
juju4 492b076f12 strict typing - snuffleupagus tests 2019-05-26 09:06:16 -04:00
mokaddem b2766f2adf chg: [ACL] Updated routing 2019-05-24 16:14:38 +02:00
mokaddem 740d5695fb Merge branch '2.4' of github.com:MISP/MISP into mergeAttributeIntoObjects 2019-05-24 16:12:45 +02:00
mokaddem 93793be69b chg: [restResponse] Added documentation for adding tags on Objects 2019-05-24 14:39:13 +02:00
mokaddem 42b952d9d8 chg: [object:fromAttributes] Added object_relation description 2019-05-24 14:29:35 +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 543dc04d7a Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-05-23 14:45:07 +02:00
iglocska 93220608f1
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-05-23 11:26:11 +02:00
iglocska eba48be685
fix: [UI] Fixed checklocks polluting the top bar 2019-05-23 11:23:42 +02:00
iglocska 02a3a9a384
new: [API] Added object_relation as a filter for both the event/attribute restSearch functions 2019-05-23 07:56:23 +02:00
mokaddem c9a3b96b7b Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-05-22 16:15:55 +02:00
mokaddem b73ed846ab fix: [event:view] Correctly support the new `deleted` parameter behavior 2019-05-22 16:15:18 +02:00
mokaddem 94332afbf6 fix: [restSearche] Correctly interpret the `deleted` parameter on 
`event` and `attribute` scope.
-- Pair programming with @iglocksa
 2019-05-22 16:08:27 +02:00
iglocska 0fd8cee847
fix: [API] Allow more flexibility on the return content types 
- also set RPZ as txt
 2019-05-22 08:56:41 +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
iglocska e2b3be1a9b
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-05-21 15:06:02 +02:00
iglocska c84ae1cdc4
fix: [STIX] STIX upload fixed for API use 2019-05-21 15:05:35 +02:00
mokaddem db96ff4dae fix: [object:fromAttributes] Correctly skip non valid attributes 2019-05-21 10:56:58 +02:00
mokaddem 6d5fac0a6c chg: Bumped queryversion 2019-05-21 10:11:04 +02:00
mokaddem 75d92190cb chg: bumped queryversion 2019-05-21 09:52:09 +02:00
mokaddem 753a445177 chg: [object:fromAttributes] Created Object from Attribute now works 2019-05-20 17:36:00 +02:00
mokaddem 44d71a327a chg: [object:fromAttributes] Shows selected types and started 
implementaion of the actual object creation - WiP
 2019-05-20 14:30:20 +02:00
mokaddem f751c822b5 chg: [object:fromAttributes] Added support of form submission - WiP 2019-05-17 16:51:21 +02:00
mokaddem ca01897857 chg: [object:fromAttributes] Better Attribute filtering - WiP 2019-05-17 16:28:58 +02:00
mokaddem 5798a73462 chg: [object:fromAttributes] Greatly improved UI - WiP 2019-05-17 16:02:06 +02:00
iglocska 1aef957d5f
new: [paranoid logging] Added POST/PUT body logging on demand 2019-05-17 12:04:19 +02:00
iglocska f71bb17ea4
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-05-17 11:46:12 +02:00
iglocska e89b4525ad
new: [logging] Added paranoid logging mode 
- will log ANY query's (UI/API):
  - http method
  - requested URL

- optionally disable DB logging for paranoid log entries
 2019-05-17 11:45:20 +02:00
mokaddem 711f9d398e chg: Bumped queryVersion 2019-05-16 17:28:40 +02:00
mokaddem a90ac883aa chg: [object:fromAttribute] Continue of web and controller 
implementation - WiP
 2019-05-16 17:13:18 +02:00
mokaddem 4fafb1541c chg: [galaxyMatrix] Transformed query into cakephp model query 2019-05-15 11:55:22 +02:00
mokaddem c49e4a823f chg: bumped queryversion 2019-05-15 11:54:17 +02:00
mokaddem 0c69e739cc new: [statistics:galaxyMatrix] Added filtering capabilities 2019-05-15 11:12:09 +02:00
chrisr3d b3d023f315 Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-05-14 16:29:24 +02:00
iglocska 62f026ff8c
fix: [Logs] Event history missing proposal entries and deletions 
Signed-off-by: iglocska <andras.iklody@gmail.com>
 2019-05-13 15:57:00 +02:00
mokaddem 4fbe857f90 chg: [galaxyMatrix] Added sorting by score. Fix #4608 2019-05-13 15:07:38 +02:00
chrisr3d b4ce6dc5e5 Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-05-13 10:07:47 +02:00
mokaddem 2bce33b83e fix: [object:revise] Removed useless ACL conditions; was failing for users 
not being admin.
 2019-05-13 08:53:22 +02:00
chrisr3d 11da6855ce Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-05-10 16:22:51 +02:00
iglocska 5ee6013dff fix: [API] Some fixes for the restsearch -> attack export 2019-05-10 14:41:50 +02:00
iglocska e899eb8b9d new: [ATT&CK] Added new export system for restsearch for ATT&CK 
- Return the ATT&CK matrix data as HTML via the API
- Directly viewable via the REST client

- Greetings from the ATT&CK workshop @ Eurocontrol
 2019-05-10 14:25:38 +02:00
iglocska 5c9332072f new: [API] Added includeWarninglistHits to the attribute search API 2019-05-09 17:25:39 +02:00
iglocska 6150d9e4a6 new: [API] Added includeWarninglistHits as a possible filter for the event level restsearch 2019-05-09 17:14:25 +02:00
iglocska 845f2a7d40 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-05-09 17:13:41 +02:00
iglocska 583e07b484 fix: [galaxy clusters] Choosing them via the UI was dog slow 
- now it's just plain slow
 2019-05-09 12:22:30 +02:00
frpet 8cd4dceaf6 rpz: add missing rpz policy actions 
Fix: Add two new policy actions added to RPZexport previously
 2019-05-09 11:01:51 +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
frpet 38a64e0ba9 rpz: action policy rename (to Local-Data) 
Rename action policy "walled-garden" to "Local-Data" as per the IETF draft (and other documentation for RPZ)
 2019-05-08 15:54:34 +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
mokaddem b192a6ce28 chg: [event:view] Added button to quickly extend an event. Fix #4481. 2019-05-06 15:38:08 +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 30c55578e6 Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-05-03 14:30:57 +02:00
mokaddem 9b1b5a6896 fix: [object:revise] Force field to be `value1`, preventing bug in some 
cases
 2019-05-02 16:35:11 +02:00
mokaddem 0c14a14119 chg: [cluster:matrix] Slightly imporved memory performance 2019-05-02 15:00:06 +02:00
mokaddem 81db0f06d7 fix: [cluster:galaxyMatrix] Increased coverage of attack matrix. 
Now consider the following new links for the pivot tag:
Attributes -> Events
Events -> Attributes
 2019-05-02 14:57:05 +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
chrisr3d 42ea1bdbbe
chg: [enrichment] Import modules now support new modules format 
- Import module results are sent to the new view
  (same as for expansion modules) whenever they
  support objects import
- Function handling the results right after they
  are returned from the module has also been moved
  to Model/Event and is used for both expansion &
  import modules
 2019-05-02 11:49:17 +02:00
chrisr3d e2561f0022
fix: [enrichment] Setting importComment value before going to the view 
- Saving a variable & will avoid issues when reusing
  the view for import modules
 2019-05-02 11:45:43 +02:00
Steve Clement fc8f7982df
Zoidberg's son: Update system (#4534) 
Zoidberg's son: Update system
 2019-05-01 18:24:41 +09:00
Steve Clement 4b77fe35f8
Merge branch '2.4' into fix-i18n 2019-05-01 18:03:28 +09:00
chrisr3d a5a1fab835 Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-04-30 15:56:16 +02:00
iglocska 8b127f8fab new: [yara] Added diagnostics 2019-04-30 15:36:13 +02:00
mokaddem b323498de0 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-04-30 10:27:10 +02:00
mokaddem 02719517c7 chg: [object:similiar] Added back button, improved highlight and text 2019-04-30 10:05:39 +02:00
chrisr3d b9e050622b Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-04-30 10:03:05 +02:00
iglocska ac1acab690 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-04-30 09:56:51 +02:00
iglocska 18104c0a08 fix: [required taxonomies] not firing via regular publishing only via publish (no email), fixes #4546 2019-04-30 09:56:16 +02:00
Alexandre Dulaunoy a3e9f227d2
Merge pull request #4545 from MISP/mergeSimilarObject 
Several improvement on objects manipulation
 2019-04-30 08:40:47 +02:00
4ekin 9bb8933445 fix: Fixed i18n strings in Event controller, model and view 2019-04-29 16:14:14 +03:00
4ekin 14feb57e2f fix: Typos in controllers 2019-04-29 16:12:55 +03:00
mokaddem 47e13c8369 chg: [updates] Implented changes requested by the PR's review #4534. 2019-04-29 11:09:04 +02:00
mokaddem d6be8023e5 chg: [updateProgress] bit of cleanup 2019-04-26 14:10:26 +02:00
mokaddem ee735f00d4 new: [update] Injected update-related files/changes from zoidberg 2019-04-26 09:45:03 +02:00
chrisr3d b03abeff01 Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-04-25 16:37:55 +02:00
chrisr3d 68019b63c9
fix: [enrichment] Removed possibility to display freetext result in the new module results view 2019-04-25 16:28:42 +02:00
mokaddem 7848fb3ed8 chg: [object:revise] Increase threshold of 
similar_objects_display_threshold and fixed count
 2019-04-25 10:55:34 +02:00
iglocska 1db976edd1 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-04-25 10:28:45 +02:00
chrisr3d b38b703dc7 Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-04-25 09:13:12 +02:00
Raphaël Vinot aa58cf4ff2 chg: Bump PyMISP 2019-04-24 17:07:05 +02:00
mokaddem 324c7e783b chg: [object] Refacto renamed variables and added comments 2019-04-24 15:47:47 +02:00
Andras Iklody 58310f8b57
Merge pull request #4484 from obert01/fix-tag-search 
Fixed case sensitivity in the tag search API (/tags/search).
 2019-04-24 15:30:06 +02:00
iglocska 884564fb63 fix: [Sightings] ACL fixed 2019-04-24 15:11:00 +02:00
mokaddem ee6ba1e5ce Merge branch '2.4' of github.com:MISP/MISP into mergeSimilarObject 2019-04-24 14:56:35 +02:00
iglocska 9fd45e072d Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-04-24 11:39:23 +02:00
iglocska c225520f72 fix: [sightings] Users with sighting permissions should be able to add sightings even if they don't have event write access 2019-04-24 11:37:44 +02:00
mokaddem 90e1d7b9b4 Merge branch '2.4' of github.com:MISP/MISP into eventViewPerfImprov 2019-04-24 11:22:07 +02:00
mokaddem d75089e7a2 chg: [object:revise] Little perf improvement 2019-04-24 09:45:26 +02:00
chrisr3d e09b7da654 Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-04-23 17:02:18 +02:00
mokaddem 0f48cfe13e chg: [object:edit] Clean up 2019-04-23 16:48:05 +02:00
mokaddem af16fa51b0 chg: [object:edit] Avoid duplicating same multiple entries and usage of 
threshold instead of harcdoded value.
 2019-04-23 16:19:25 +02:00
mokaddem 8bb9201a3d chg: [object:edit] Added similarity amount between objects 2019-04-23 14:54:09 +02:00
mokaddem 675af7d357 chg: [object:edit] Improved UI and diff recognition - WiP 2019-04-23 13:47:33 +02:00
mokaddem d3013a9252 fix: [stats:galaxyMatrix] No longer trim the end of the cluster name 2019-04-23 08:49:04 +02:00
mokaddem c1d330e046 chg: [object:edit] Continuation integration with template update and 
object merge - WiP
 2019-04-19 17:10:36 +02:00
mokaddem e2c865e07c chg: [object:edit] Started integration to allow updating object 
templates - WiP
 2019-04-19 11:43:28 +02:00
mokaddem f44efc9299 chg: [object:add] Improved UI for similar objects - WiP 2019-04-19 10:47:33 +02:00
mokaddem 67b3f29dd0 new: [object:add] UI to propose to merge into similar objects - WiP 2019-04-18 16:58:49 +02:00
chrisr3d 7e55c28c92
wip: [enrichment] Passing initial object references as well 
- Also testing if the initial object found is not empty
 2019-04-17 11:56:35 +02:00