MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
2,780 Commits
42 Branches
370 Tags
181 MiB
Commit Graph

2780 Commits (ef1d3949e71cb6bc93e93bbf02ca7640dfaee702)

Author SHA1 Message Date
iglocska ef1d3949e7 Merge branch 'master' into feature/sg 
Conflicts:
	VERSION.json
	app/Controller/ShadowAttributesController.php
	app/Lib/Tools/JSONConverterTool.php
	app/Lib/Tools/XMLConverterTool.php
	app/Model/User.php
	app/View/Elements/eventattribute.ctp
 2015-10-22 09:59:00 +02:00
iglocska fa55f7fa9d Merge branch 'hotfix-2.3.144' 2015-10-21 23:51:50 +02:00
iglocska f4f4f0f069 Version bump 2015-10-21 23:51:36 +02:00
iglocska 26a4705bb3 Removed junk 2015-10-21 23:50:55 +02:00
iglocska 61e865956b Fixes to several issues, fixes #693 
- Fixed a critical bug in the XML export
  - As of recently XML exports include relations as they were missing before
  - the sanitisation of the event info field in related attributes was incorrectly sanitized of unicode characters
  - this can lead to the XML export breaking and also for affected events to be blocked from synchronisation

- Proposal fixes
  - fixed an invalid uuid generation that lead to an exception
  - fixed the attachments for proposals still using the old attachment system that disallows most filenames
  - added the automatic creation of hashes for attachment proposals
 2015-10-21 23:44:07 +02:00
iglocska 37faddff62 Further progress 
- rework of the push mechanism
- rework of the object capture on add
- rework of the sync filter UI
 2015-10-18 18:03:48 +02:00
iglocska fdcac8b72c Further work on the filter UI 2015-10-18 09:36:55 +02:00
Iglocska 94963852e2 Fixed an issue with ajax forms 2015-10-17 01:06:58 +02:00
Iglocska 044996bdb5 New feature: Proposal to delete attribute, fixes #315 
- Users can now propose a deletion to an attribute
  - also tied into the mass accept mechanism
  - new UI elements to go along with this

- Code refactoring for category list retrievals
  - Until now, several methods got the list of categories from the validation code
  - Was awkward with a fake empty element that had to be removed
  - altered the validation code to read the categoryDefinitions array instead
 2015-10-16 23:49:04 +02:00
Iglocska 6fc3dbbc1f Fixed a faulty replace that causes an infinite loop during the uuid generation 2015-10-16 17:03:07 +02:00
Iglocska 1aedfebf33 Merge branch 'hotfix-2.3.143' 2015-10-15 17:45:03 +02:00
Iglocska 4a358c9fee Removed junk 2015-10-15 17:44:33 +02:00
Iglocska 136daa1be1 Merge branch 'hotfix-2.3.143' 2015-10-15 17:40:53 +02:00
Iglocska 7fab2ce2be Added the attribute relations to the XML / JSON output, fixes #687 2015-10-15 17:39:17 +02:00
Iglocska 38d8bd0a77 Moved remaining UUID generation calls to the new uuid wrapper 2015-10-15 15:01:51 +02:00
Iglocska 1b291904d4 Fixed some more invalid org checks 2015-10-15 14:31:07 +02:00
Iglocska 025087bf5d Fixes to the first time initialisation script 2015-10-15 11:35:44 +02:00
Iglocska eeb1d8d117 Fixes to bugs with org usage from 2.3 2015-10-15 11:11:05 +02:00
Alexandre Dulaunoy d2e8cb8acb Copyright notices as a list. 2015-10-14 15:50:25 +02:00
Alexandre Dulaunoy eabd5c622a Update following recommendation #686 2015-10-14 15:45:17 +02:00
Alexandre Dulaunoy 1c3f98502f Merge branch 'master' of github.com:MISP/MISP 2015-10-14 15:39:09 +02:00
Alexandre Dulaunoy 56854c0a06 Updates following recommendation #686 2015-10-14 15:36:46 +02:00
Iglocska abd9fbbd00 Merge branch 'master' of https://github.com/MISP/MISP 2015-10-14 15:09:49 +02:00
Iglocska 3a7b2dd120 Merge branch 'hotfix-2.3.142' 2015-10-14 15:08:58 +02:00
Iglocska 3dc83778c2 Fixed the current user check while removing dead workers, fixes #685 
- as pointed out by RichieB2B
 2015-10-14 15:07:29 +02:00
Iglocska 5007388c1d removed debug 2015-10-14 03:47:20 +02:00
Iglocska 888042dbd6 Added the first version of the correlation graphing 
Conflicts:
	VERSION.json
 2015-10-14 03:45:34 +02:00
Alexandre Dulaunoy 737578a112 Merge branch 'master' of github.com:MISP/MISP 2015-10-13 15:49:39 +02:00
Alexandre Dulaunoy abd9fc18d6 Licensed updated to AGPL 3.0 - #686 2015-10-13 15:48:59 +02:00
Iglocska dbea871d5e Merge branch 'hotfix-2.3.141' 2015-10-13 10:52:11 +02:00
Iglocska c9bf8105e6 Replaced get_current_user for the process owner identification, fixes #685 
- As RichieB2B noted, get_current_user() gets the owner of the script in CentOS / RHEL not the user executing the script (as in Ubuntu)

- Current solution uses posix_getpwuid and posix_geteuid if the php-posix package is installed
- if not, it uses whoami
 2015-10-13 10:49:55 +02:00
Iglocska ab6ae4be67 Merge branch 'master' of https://github.com/MISP/MISP 2015-10-12 16:50:50 +02:00
Iglocska 15a12985f7 Merge branch 'hotfix-2.3.140' 2015-10-12 16:50:13 +02:00
Iglocska f9f9eed6fd Issue fixed with open_basedir preventing the worker diagnostics from working, fixes #685 
- for some users the workers appeared to be dead even though the worker processes were functional and started by the correct user
- this was due to access to /proc being blocked by open_basedir directive settings
- added a check and the corresponding view changes to this being the case
 2015-10-12 16:48:43 +02:00
Alexandre Dulaunoy b802af0e34 Documentation location updated (misp-book) 2015-10-12 16:26:41 +02:00
Iglocska 328c666e3a Merge branch 'master' into feature/sg 
Merging all the new changes from master

Conflicts:
	VERSION.json
	app/Console/Command/AdminShell.php
	app/Controller/AttributesController.php
	app/Controller/EventsController.php
	app/Model/Attribute.php
	app/Model/Event.php
	app/Model/Log.php
	app/Model/Server.php
	app/Model/User.php
	app/View/Elements/side_menu.ctp
	app/View/Pages/administration.ctp
	app/View/Users/admin_index.ctp
 2015-10-12 09:41:20 +02:00
Iglocska 08b14aeaaf Merge branch 'hotfix-2.3.139' 2015-10-09 20:51:33 +02:00
Iglocska 24eae46640 Fix to a previous invalid check on the cakephp version 2015-10-09 20:51:12 +02:00
Iglocska 832c6403aa Merge branch 'hotfix-2.3.138' 2015-10-09 17:11:39 +02:00
Iglocska f018c60c01 Fixed the worker diagnostics showing incorrect data under Red Hat / CentOS, fixes #685 
- Under these distros, php is blocked from seeing concurrently running php processes even under the same user
- instead of running ps, the diagnostic now checks the existance of the pid file in /proc/
 2015-10-09 17:09:33 +02:00
Iglocska 5d5305803d Merge branch 'hotfix-2.3.136' 2015-10-09 16:39:10 +02:00
Iglocska 9223240efd Further fixes that caused issues with old PHP versions 2015-10-09 16:38:48 +02:00
Iglocska 2f0f9f5812 Merge branch 'hotfix-2.3.136' 2015-10-09 16:25:28 +02:00
Iglocska a2f87faf1f Version bump 2015-10-09 16:25:09 +02:00
Iglocska 00b74b43de Fixed a possible issue with the previous commit on certain php versions 2015-10-09 16:24:36 +02:00
Iglocska 6a05c918f9 Merge branch 'hotfix-2.3.136' 2015-10-09 16:04:35 +02:00
Iglocska dc638adac2 Upgrade to CakePHP 2.7, fixes #684 
- cakephp submodule updated to 2.7
- make sure that you update your instance!

- not updating will not break compatibility
 2015-10-09 15:59:25 +02:00
Iglocska c198deee66 Merge branch 'hotfix-2.3.135' 2015-10-09 10:07:27 +02:00
Iglocska 3459661dc8 Left off view file 2015-10-09 10:07:12 +02:00
Iglocska d25f37a8b5 Merge branch 'hotfix-2.3.135' 2015-10-08 10:03:44 +02:00