Commit Graph

171 Commits (93af832abef6293052efb768f6109bf8a5355f8a)

Author SHA1 Message Date
iglocska 3784209cf5 First bash at Taxonomies
What works:
- added submodules for taxonomies
- added import tool for taxonomies
- added models and convenience functions for taxonomies

- site admins can update taxonomy libraries
- list taxonomies / view indvidual ones (with all resolved tags)
- create tags manually if a taxonomy is enabled
- view related tags / events quickly from the Taxonomy view

What doesn't work:
- Users still cannot choose a tag from taxonomy lists (this will be the main functionality)
- Feature cannot be disabled
2015-11-24 03:27:14 +01:00
iglocska 394ae49596 Some bugs resolved 2015-11-20 03:42:35 +01:00
iglocska 5b9624e96e Added the publisher role to the default role set 2015-11-14 11:09:02 +01:00
Iglocska 7a686a2718 Merge branch 'master' into 2.4-beta
Also, reworked a lot of remaining distribution checks not handled by the main fetch methods

Conflicts:
	VERSION.json
	app/Controller/AttributesController.php
	app/Controller/ShadowAttributesController.php
	app/View/ShadowAttributes/add.ctp
	app/View/ShadowAttributes/edit.ctp
2015-10-30 13:39:12 +01:00
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 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
Alexandre Dulaunoy abd9fc18d6 Licensed updated to AGPL 3.0 - #686 2015-10-13 15:48:59 +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 af53475952 1st version of the upgrade documentation 2015-09-25 11:58:42 +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 3fb7764c00 First revision of the upgrade scripts
- .sql file to add all the new fields / tables
- admin tool to convert the old organisation fields to the new objects
- still missing a cleanup method (to remove the old organisation fields once the conversion is done)
2015-09-02 01:34:52 +02:00
Iglocska 6e5b9a5ac5 Cleanup and fixes to the memberslist 2015-08-31 03:08:49 +02:00
Iglocska 704880ce59 Merge branch 'master' into feature/sg
Conflicts:
	VERSION.json
	app/Controller/AttributesController.php
	app/Controller/EventsController.php
	app/Model/Attribute.php
	app/Model/Event.php
	app/Model/Server.php
2015-08-30 13:29:05 +02:00
nullprobe 305a1dbe70 Update MYSQL.sql
Unnecessary comma makes the import fail.
2015-08-26 14:57:06 +02:00
Raphaël Vinot ed475a8271 Merge pull request #577 from bemre/patch-1
Update INSTALL.ubuntu1404.txt
2015-08-26 11:29:14 +02:00
Iglocska 087d68e165 Merge branch 'master' of https://github.com/MISP/MISP 2015-08-25 10:36:12 +02:00
Iglocska 556688069a Resolved an issue that can lead to duplicate events showing up in MISP
- UUID uniqueness was previously not enforced
- changed the MYSQL.sql file to reflect the changes
- Added upgrade admin tool to remove duplicate events and make the database changes required
- Tweaked the tool for the attribute uuid fix so that it cannot created duplicate keys

- some minor fixes, such as automatically removing eventTag objects on event deletion
2015-08-25 10:32:26 +02:00
David André be81eb9583 Removed git pull (x2) since we are already doing checkout 2015-08-25 00:17:19 +02:00
Iglocska 254481a663 removed accidental inclusion 2015-08-03 14:14:15 +02:00
Iglocska ad21d5c35a Further work on the Sharing Groups 2015-08-03 14:12:20 +02:00
Iglocska da3e35952a Duplicate field removed in MYSQL.sql 2015-07-29 16:36:30 +02:00
Raphaël Vinot 43a01722c8 Update dependencies
* the real name of libxslt-dev is libxslt1-dev
* curl is required later in the installation and may not be present on the system
2015-07-28 17:29:39 +02:00
Bâkır Emre d3574adb4b Update INSTALL.ubuntu1404.txt
it must be core.php instead of Core.php
2015-07-28 10:49:02 +03:00
Iglocska 9e547cae70 Updated MYSQL.sql 2015-07-22 17:19:23 +02:00
Iglocska 0481e6eb02 Merge branch 'master' into feature/sg
Conflicts:
	VERSION.json
	app/Controller/ServersController.php
	app/Controller/ShadowAttributesController.php
	app/Controller/UsersController.php
	app/Model/Event.php
	app/webroot/js/ajaxification.js
2015-06-29 14:27:16 +02:00
Iglocska 3f215743f0 Complete rework of the ZeroMQ implementation
- python server running in the background doing the publishing
- MISP -> python script communication via redis
- configurable / controllable via the admin UI
2015-06-29 08:56:45 +02:00
Iglocska 3d2b8c3c10 Added pub/sub feature using ZeroMQ, fixes #540 and fixes #526
- by installing the requirements described in the update and the install instructions (ubuntu only for now, centos/red-hat versions to be tested and described), administrators can enable the pub/sub feature
- assign a port to the service via the interface
- each time an event is published, MISP will use ZMQ's PUB feature to push out a MISP JSON package using the "misp_json" prefix
2015-06-24 17:38:15 +02:00
Iglocska c73f71f243 Merge branch 'master' into feature/sg
The merging is complete

Conflicts:
	VERSION.json
	app/Console/Command/ServerShell.php
	app/Controller/AppController.php
	app/Controller/AttributesController.php
	app/Controller/EventsController.php
	app/Controller/PostsController.php
	app/Controller/UsersController.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/Users/admin_index.ctp
	app/webroot/js/ajaxification.js
2015-06-10 22:54:20 +02:00
Iglocska 345b4d03cb removed some junk 2015-06-10 13:05:04 +02:00
Iglocska 707140243a Updated the documentation to reflect the correct STIX / CyBox versions required
- Updated the admin tool to check the STIX / Cybox versions
2015-06-10 12:47:00 +02:00
Iglocska 31b99c5ce1 Added documentation changes to avoid a non-compatible cybox installation, fixes #529
- STIX exports were failing when using the master branch of the Cybox Python libraries
- installation guide now forces users to use the last compatible release
2015-06-06 20:10:44 +02:00
Iglocska 2b0a1e5c4e Fixed an issue with log entries being truncated (Requires administrator action!)
- added a new entry to the admin tools (Administartion -> Administrative tools)
- converts title and change columns in the logs table to text from varchar(255)
2015-06-05 15:24:26 +02:00
Iglocska a54c1a3943 Install instruction change under ubuntu: No more reference to removed INSTALL.SH file, fixes #520. Also, removed BUGS.txt, fixes #519 2015-06-04 13:01:09 +02:00
Richard van den Berg 204ba8bfb2 CakePHP 2.6.7 requires the php mbstring extension
- on CentOS this is a separate package php-mbstring
- on Ubuntu this is part of libapache2-mod-php5
2015-06-04 09:15:51 +02:00
Iglocska 9b46b1b7f8 Some fixes to the documentation
- workers potentially started as root in the documentation, fixed
2015-06-02 13:52:39 +02:00
Aaron Kaplan d9ae3c19b8 Merge branch 'master' of https://github.com/MISP/MISP 2015-05-27 21:10:33 +02:00
AaronK 5d2347bdc6 Update INSTALL.ubuntu1404.txt
Add a note on Debian Wheezy installation instructions
2015-05-27 09:54:50 +02:00
iglocska 99ec766ce3 Merge branch 'cakephppath' into hotfix-2.3.64 2015-05-13 17:10:10 +02:00
iglocska 3ac6c77b37 Merge branch 'saltlength' into hotfix-2.3.64 2015-05-13 17:09:27 +02:00
David André 7d3f53e5ac Removed the RSA key recommendation from INSTALL.ubuntu1404.txt 2015-05-12 15:11:43 +02:00
David André 40a3fe5f8b Removed the RSA key recommendation from INSTALL.centos7.txt 2015-05-12 15:10:59 +02:00
David André 91245f7705 Removed the RSA key recommendation from INSTALL.centos6.txt 2015-05-12 15:09:33 +02:00
Gábor Molnár 62f1e516ce Calrify salt length in INSTALL.md 2015-05-11 12:56:51 +02:00
Gábor Molnár 97c1dc95f6 Note salt key length requirement to INSTALL.md 2015-05-11 11:09:04 +02:00
remg427 76811250a1 Update UPDATE.txt
app missing in path for cakephp
2015-04-28 22:10:08 +02:00
Alexandre Dulaunoy e9e589ecad MISP diagrams in SVG licensed under CC-BY-SA added 2015-04-24 08:47:18 +02:00
Iglocska e0ef372392 Merge branch 'master' into feature/sg
Conflicts:
	app/Controller/EventsController.php
	app/Controller/UsersController.php
	app/Model/Event.php
2015-04-12 10:40:31 +02:00
Iglocska 99fae827a3 Merge branch 'cakeresque-update' into hotfix-2.3.59 2015-04-08 22:40:42 +02:00
Iglocska 99cabe39b9 Merge branch 'ids_example' into hotfix-2.3.59 2015-04-08 22:35:03 +02:00