12506 Commits (5bc0834bac35e9f19bfc017d19c0f87ab1059c4c)

All Branches

Search

Author	SHA1	Message	Date
Alexandre Dulaunoy	3d3bb1f3bf	Merge branch '2.4' of github.com:MISP/MISP into 2.4	2019-06-21 09:38:57 +02:00
Alexandre Dulaunoy	5148cfcd0c	chg: [misp-taxonomies] updated to the latest version	2019-06-21 09:38:22 +02:00
Alexandre Dulaunoy	f1771ab9d2	chg: [misp-galaxy] updated to the latest version	2019-06-21 09:37:56 +02:00
mokaddem	1c6b9d0c6b	Merge branch '2.4' of github.com:MISP/MISP into relatedEventUI	2019-06-21 09:20:57 +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
chrisr3d	b8c5825e80	fix: [enrichment] Applying regular expressions to values before displaying them ... - So when the DB is queried to find if object attributes with those values already exist, we do not miss some stored values	2019-06-20 14:41:03 +02:00
chrisr3d	08f1c4c4c8	fix: [enrichment] Strengthened query conditions to find existing object attributes	2019-06-20 14:39:26 +02:00
chrisr3d	9b9ef64b1f	add: [enrichment] Fetching data fields from the view	2019-06-20 14:37:33 +02:00
iglocska	61c5a576ef	Merge branch '2.4' of github.com:MISP/MISP into 2.4	2019-06-20 13:59:11 +02:00
iglocska	73963d846c	fix: [data-massaging] Removed massaging for float type attributes ... - it not only stripped anything but floats as expected, but additionally also rounded the value	2019-06-20 13:58:14 +02:00
Steve Clement	08e7ca34b8	chg: [installer] Update installer to Fix Auto-VMs	2019-06-20 14:00:42 +09:00
Steve Clement	43aaa8996d	fix: [installer] Currently misp-packer fails on waiting for user inpu… (#4788) ... fix: [installer] Currently misp-packer fails on waiting for user inpu…	2019-06-20 15:00:21 +10:00
Steve Clement	444b3f9c05	fix: [installer] Currently misp-packer fails on waiting for user input during upgrade	2019-06-20 13:59:31 +09:00
Steve Clement	4b5f36fcd3	chg: [installer] Updated installer	2019-06-20 12:31:27 +09:00
Steve Clement	24658f3bc7	chg: [doc] Added plyara to kali installer, amended RHEL misp-modules (#4787) ... chg: [doc] Added plyara to kali installer, amended RHEL misp-modules	2019-06-20 13:31:03 +10:00
Steve Clement	7eabb893c3	chg: [doc] Added plyara to kali installer, amended RHEL misp-modules	2019-06-20 11:57:38 +09:00
chrisr3d	c87de816a8	add: [enrichment view] Added data fields + cancel button to the form	2019-06-19 17:20:48 +02:00
iglocska	59b877d022	Merge branch '2.4' of github.com:MISP/MISP into 2.4	2019-06-19 14:09:25 +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
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	9975e9e437	Merge branch '2.4' of github.com:MISP/MISP into 2.4	2019-06-18 17:51:46 +02:00
iglocska	5b1697667f	new: [UI] Filter the object template index using the quick search	2019-06-18 17:51:25 +02:00
mokaddem	5c10a02bf0	fix: [object:proposeValidTemplate] Support only_full_group_by sql mode. ... Fix #4746	2019-06-18 15:50:48 +02: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
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	a507642a5a	Merge branch '2.4' of github.com:MISP/MISP into 2.4	2019-06-18 09:58:23 +02: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
Steve Clement	53bddddb8e	chg: [tools] ask_o () wants -e (for colorz) (#4764) ... chg: [tools] ask_o () wants -e (for colorz)	2019-06-18 02:25:00 +10:00
Steve Clement	6ef2d69c10	chg: [tools] ask_o () wants -e (for colorz)	2019-06-18 01:23:26 +09:00
chrisr3d	93bf92b86b	Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules	2019-06-17 17:20:50 +02:00
chrisr3d	5dfb024f26	fix: [enrichment view] Displaying Tags only if not empty (error otherwise)	2019-06-17 17:19:59 +02:00
chrisr3d	fc528d9315	fix: [stix import] Fixed address objects parsing	2019-06-17 09:49:53 +02:00
chrisr3d	139eab9fe9	Merge branch '2.4' of github.com:MISP/MISP into 2.4	2019-06-17 09:16:47 +02:00
chrisr3d	62a1bd8aa3	new: [stix import] Parsing observable compositions from external STIX files	2019-06-17 09:15:59 +02:00
iglocska	39a7077096	new: [server settings] Added option to disable the write collision safe rotating config.php handler	2019-06-17 00:43:00 +02:00
iglocska	98aca016e0	Merge branch '2.4' of github.com:MISP/MISP into 2.4	2019-06-16 19:15:48 +02:00
iglocska	c42c5fe927	fix: [security] Fixed an RCE vulnerability with user controled entries being fed to file_exists ... - phar protocol paths for php file instructions can lead to RCE via meta-data deserialization - mitigated by the functionalities enabling this being only accessible to site admins - Reported by Dawid Czarnecki	2019-06-16 19:11:35 +02:00
Steve Clement	959f4becf3	Merge branch '2.4' into tools	2019-06-15 12:03:24 +09:00
Steve Clement	683c1a8485	chg: [installer] This tweak allows us to reset ssh-keys/ssl-certs/other_things_that_want_to_be_uniqe on firstBoot. (#4751) ... chg: [installer] This tweak allows us to reset ssh-keys/ssl-certs/other_things_that_want_to_be_uniqe on firstBoot.	2019-06-15 13:03:07 +10:00
Steve Clement	bcde82a77d	chg: [installer] Regen Installer	2019-06-15 11:59:45 +09:00
Steve Clement	d383a3dff8	chg: [installer] This tweak allows us to reset ssh-keys/ssl-certs/other_things_that_want_to_be_uniqe on firstBoot.	2019-06-15 11:58:32 +09:00
Steve Clement	736f3824ba	fix: [shell] ask_o () needed some quotes, regenerated installer. (#4750) ... fix: [shell] ask_o () needed some quotes, regenerated installer.	2019-06-15 12:36:52 +10:00
Steve Clement	e64d16d124	fix: [shell] ask_o () needed some quotes, regenerated installer.	2019-06-15 11:35:27 +09:00
Steve Clement	3b460366f2	chg: [doc] Added more bits to GPG key. (#4749) ... chg: [doc] Added more bits to GPG key.	2019-06-15 12:27:43 +10:00