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

2840 Commits (cd886b4a7977edc4d345d845f77c0eee0f7cb27b)

Author SHA1 Message Date
iglocska c07aadbd0c Merge branch 'hotfix-2.3.128' 2015-09-16 18:56:06 +02:00
iglocska 1079c4a1ea Added a diagnostic to check and purge overgrown session tables 2015-09-16 18:55:28 +02:00
Andras Iklody e1965a7f05 Merge pull request #663 from MISP/Rafiot-patch-1 
Fix #654
 2015-09-16 16:12:51 +02:00
Raphaël Vinot 7b1155599b Fix #654 
At least, I think so, please review :)
 2015-09-16 16:04:12 +02:00
iglocska 182fdebafb Merge branch 'hotfix-2.3.127' into develop 2015-09-16 15:35:52 +02:00
iglocska dfdcc722d6 Merge branch 'hotfix-2.3.127' 2015-09-16 15:34:32 +02:00
iglocska 14188f1367 Fix to a new bug introduced with the correlation engine 
- an attribute could correlate with another attribut of the same event
 2015-09-16 15:34:00 +02:00
iglocska b8fae35f34 Added ID in the response of the upload sample API 
- it now also returns the ID of the created/updated event
 2015-09-16 14:54:07 +02:00
iglocska e34908b3b2 Merge branch 'hotfix-2.3.126' into develop 2015-09-16 14:37:18 +02:00
iglocska 88c62c8129 Merge branch 'master' of https://github.com/MISP/MISP 2015-09-16 14:36:56 +02:00
iglocska d1c4a789dc Merge branch 'hotfix-2.3.126' 2015-09-16 14:36:13 +02:00
iglocska 0fe9794370 Removed redirect to the news page 2015-09-16 14:35:56 +02:00
iglocska 3f6cca5c98 Removed junk file 2015-09-16 14:31:23 +02:00
iglocska 6e61c50867 Collection of changes / fixes 
- Event blacklist functionality extended
    - Several context fields added
    - edit existing entries to change the context fields

- removed the deprecated news page

- hash attribute types get validated against empty values

- fixed an excepion on REST add of attributes when the validation stops an attribute from being entered

- fixed the parameters in some exports being ignored after a recent patch

- added an admin tool to prune orphaned attributes

- cleanup and move of the database update methods - they are now accessible from any model

- Footer now shows MISP version including sub version
 2015-09-16 14:24:44 +02:00
iglocska c06e687b5e Event blacklist context completed 2015-09-16 14:19:22 +02:00
iglocska 26e640e19c Further progress on several issues 2015-09-16 12:15:43 +02:00
Raphaël Vinot bfeac5ffa4 Merge pull request #658 from Rafiot/master 
Fix pull request
 2015-09-15 20:37:35 +02:00
David André a5e6fd2f2d Added gcc in dependencies (related to https://github.com/MISP/MISP/issues/302) 2015-09-15 20:33:33 +02:00
David André f34a108138 Added gcc in dependencies (related to #302) 2015-09-15 20:33:25 +02:00
Iglocska df59748719 progress on several issues 
- switching workstations, this is all WiP
 2015-09-15 15:11:08 +02:00
Raphaël Vinot d8530815f5 Merge pull request #653 from Rafiot/master 
[Travis] Fix DB
 2015-09-12 22:29:14 +02:00
Raphaël Vinot 7922b20585 [Travis] Fix DB 2015-09-12 22:23:07 +02:00
Raphaël Vinot 8ebc9bf0cf Merge pull request #652 from Rafiot/travis2 
[Travis] Big update, Almost ready to run tests.
 2015-09-11 19:29:59 +02:00
Raphaël Vinot 3e4364dd6c Big update, Almost ready to run tests. 2015-09-11 19:23:20 +02:00
Iglocska b6857b4743 fix to a display bug on the event index when short tags are used 2015-09-10 16:21:16 +02:00
Iglocska 3ad7d4b441 Added some fixes for XSS 2015-09-10 15:26:08 +02:00
Iglocska e1a95c62b0 Merge branch 'master' into feature/sg 
Conflicts:
	VERSION.json
	app/Controller/EventsController.php
	app/Controller/ServersController.php
	app/Model/Attribute.php
	app/View/Users/statistics.ctp
 2015-09-10 15:02:44 +02:00
Iglocska 2902c96f3c Merge branch 'hotfix-2.3.125' 2015-09-10 00:41:32 +02:00
Iglocska d7bab21919 Left off shell script 2015-09-10 00:30:34 +02:00
Iglocska 3feeee920e Initialise first user via the command line 
usage:

/var/www/MISP/app/Console/cake userInit -q

returns the created auth key or an error message if users already exist

The created account is an admin user, with the login being admin@admin.test / admin
 2015-09-09 20:52:01 +02:00
Iglocska bc06362d19 Fixed XSS in several views 
- reported by Roberto Suggi Liverani from NCIA
 2015-09-09 19:26:06 +02:00
David André a07346cfa2 Added comment in text export paragraph that 
non IDS flagged attributes are also exported by default.
 2015-09-09 17:07:03 +02:00
Raphaël Vinot 3f2824b053 Fix travis message in README. 2015-09-08 17:40:01 +02:00
Iglocska cf182167ee Merge branch 'hotfix-2.3.124' 2015-09-07 14:27:40 +02:00
Iglocska 2142bf87c3 Several issues resolved 
- fixed an issue where pushing a single event would fail

- both event and attribute edits via the API work without providing a timestamp. The current timestamp is instead attached

- both event and attribute edits fill the required fields from the data in the database if not supplied (as long as the uuid is found)
 2015-09-07 14:25:24 +02:00
Iglocska 291ebc8393 Typo, fixes #632 2015-09-07 10:31:25 +02:00
Iglocska e7b54c2c61 Fix to a serious bug with adding attributes via the API and performance fixes 
- due to a bug, setting an attribute ID in the /attributes/add API call can lead to overwriting an existing attribute

performance improvements:

- massive improvements to the correlation performance
- improvements to the attribute validation process
 2015-09-07 10:06:34 +02:00
Raphaël Vinot 9b82e4e2a7 Merge pull request #639 from Rafiot/travis 
Add partial travis support
 2015-09-07 09:56:36 +02:00
Raphaël Vinot fd3524aa7f Add partial travis support 2015-09-07 00:40:47 +02:00
Iglocska dfc6107032 Merge branch 'hotfix-2.3.123' into develop 2015-09-03 11:00:55 +02:00
Iglocska 5f6c840211 Merge branch 'hotfix-2.3.123' 2015-09-03 10:59:47 +02:00
Iglocska 43c2290097 Enhancements to the reportValidationIssuesAttributes action 
- now also shows issues not related to the value field
- takes an optional parameter to validate a single event's attributes
 2015-09-03 10:58:54 +02:00
Iglocska 10eb2d3ad3 Merge branch 'master' into feature/sg 
Conflicts:
	VERSION.json
 2015-09-02 16:39:54 +02:00
Iglocska 8310d91a37 Merge branch 'hotfix-2.3.122' into develop 2015-09-02 16:38:38 +02:00
Iglocska 9f8e5049a6 Merge branch 'hotfix-2.3.122' 2015-09-02 16:37:16 +02:00
Iglocska af0b2ffdce Version bump 2015-09-02 16:37:02 +02:00
Iglocska b83e615672 Fixed XSS in the footer 
- reported by Roberto Suggi Liverani from NCIA
 2015-09-02 16:34:43 +02:00
Iglocska 8685e93e22 Merge branch 'master' into feature/sg 
Conflicts:
	VERSION.json
	app/Model/Tag.php
	app/files/scripts/misp2stix.py
 2015-09-02 10:26:56 +02:00
Iglocska 81e2659704 Merge branch 'hotfix-2.3.121' into develop 2015-09-02 10:22:34 +02:00
Iglocska 809ac8f88b Merge branch 'master' of https://github.com/MISP/MISP 2015-09-02 10:21:46 +02:00