Commit Graph

60 Commits (898ea1d97c5aae2841450b1afc2fa7cb88f65277)

Author SHA1 Message Date
Andreas Ziegler 898ea1d97c remove whitespace (space/tab) from empty lines 2016-06-04 01:08:16 +02:00
Andreas Ziegler 8a9ffc1f9b remove obsolete space from: File ( 2016-05-31 18:03:59 +02:00
Andreas Ziegler dc0974a55b misc cleanup 2016-05-21 05:10:49 +02:00
Andras Iklody 6d068e4928 Merge pull request #1151 from rotanid/filechecks
small change to file checks
2016-05-20 17:05:27 +02:00
Andreas Ziegler e21fa21de8 small change to file checks, use readable() instead of exists() 2016-05-20 16:57:34 +02:00
Andreas Ziegler 9db0777533 improve some text passages 2016-05-20 16:46:06 +02:00
Andreas Ziegler 7ae4c37f0b progressive removal of commented out if-statements 2016-05-20 00:48:54 +02:00
iglocska 73375042e6 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-05-13 20:47:10 +02:00
iglocska 9434a2364f fix: Fixes to issues with MYSQL >= 5.7 2016-05-13 20:44:16 +02:00
Iglocska b75cfb842b chg: Prevent attribute edit on deleted attributes, prevent proposal correlation on deleted attributes 2016-05-11 10:38:35 +02:00
devnull- bd6f5f8b20 Add 'certif_public' in the fields 2016-04-05 18:01:50 +02:00
Iglocska daeaee6483 Merge branch '2.4' into feature/enrichment
Conflicts:
	app/Model/Event.php
2016-03-19 16:55:42 +01:00
Iglocska d66a43aad1 Set proposal's deleted field to 0 if nothing is set before saving, fixes #988 2016-03-09 14:34:35 +01:00
Iglocska d111a9dc8d Fixed an issue where a proposal correlation would fail 2016-02-23 14:59:59 +01:00
Iglocska 70eebafa9f Fixed an issue where a proposal correlation would fail 2016-02-23 14:51:50 +01:00
Iglocska 2a2aaa9d1b Fix to setting the job progress before initialising the model when correlating proposals 2016-02-17 14:51:17 +01:00
Iglocska 926a5fabeb Fixed a copy paste fail 2016-02-17 14:49:38 +01:00
Iglocska 1ba8d1c1f0 Added correlations on a proposal level
- tied into automatic datamodel updates
- correlation is one way only (from proposal to attribute)
- proposals don't correlate with one another

- all distribution rules are adhered to
- further improvements on the upgrade mechanism pipeline
2016-02-17 14:43:33 +01:00
Iglocska d6c0b6d853 Fixes to several permission issues with the e-mailer
- contact e-mail recipients were incorrectly set resulting in the e-mails landing at the wrong recipient
- disabled users were not excluded from certain e-mails
2016-02-02 15:30:23 +01:00
Iglocska 2566d49278 Fix to the Proposal alerts not going out to users after one has failed 2016-01-29 14:28:42 +01:00
Iglocska a9c07371ca Fixes to the proposal system
- proposals were not synchronised during pulls due to a bug
  - affects both 2.3 and 2.4, the bug comes from the switch to json
  - missing JSON view for proposal interface
  - Also, 2.4->2.4 the organisation objects were incorrectly ommited from the sync
  - Fixes:
    - reverted back to XML for the old style proposal exchange
    - 2.3->2.4 is now fixed
    - 2.4->2.4 below 2.4.7 version will still not synchronise proposals on pull

- Proposal pull reworked
  - requires 2.4.7 on both ends or higher
  - proposals are now synced in one go
  - massive increase in speed and reduction of log entries

- Proposal e-mailing reworked
  - tied into the new 2.4 e-mailer, which was left out on 2.4's release by accident
  - triggers correctly now when a proposal is added (also on pull)
2016-01-14 02:46:10 +01:00
iglocska fea225c409 Rework of the contributor field, some MYSQL.sql tweaks
- added indeces to the MYSQL.sql file
- contributors now looks for shadow attributes instead of log entries (should make the event view much faster and resolve some timeout issues on sync when the log is massive)
2015-12-27 19:00:35 +01:00
Iglocska 5dbbe84069 Merge branch 'master' into 2.4-beta
Conflicts:
	VERSION.json
	app/Controller/EventsController.php
	app/Controller/ShadowAttributesController.php
	app/Model/Event.php
	app/View/Elements/side_menu.ctp
2015-11-30 09:37:22 +01:00
iglocska b30bfab0a5 Delete proposal attachment if the proposal was accepted / discarded
- there is no need to keep retransfering the actual attached file if all we want to convey is that the proposal is gone.
2015-11-27 09:16:17 +01:00
iglocska 91c4f67ebd Fix to an issue where a proposal with an attachment could not be correctly accepted 2015-11-27 08:49:13 +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 6fa27d659a Reverted change in proposal file storage path that wasn't needed 2015-10-22 09:51:31 +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 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 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 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 656a391223 Progress on the sync
- pull from 2.3 -> 2.4 should work correctly now
2015-09-21 14:55:40 +02:00
Iglocska 038ccd99bd Work on the new attribute types 2015-07-06 18:19:51 +02:00
Iglocska 28069a0a0f Further work and some cleanup
- decision to be revised: exports don't expose Sharing groups / org uuids to users unless they are admin (for the future: at least sync users have to be added for the new sync)
2015-04-13 16:20:21 +02:00
iglocska 6763159e87 Security fix
- filenames are now enclosed by quotes instead of double quotes while executing the zip command via exec
2015-03-10 10:58:15 +01:00
iglocska 504527d36b Fixes to the proposal ajax mechanism for newer cakephp versions 2014-10-15 15:39:28 +02:00
iglocska bd6b206ac5 Further work on the sync
- changed the pull implementation for proposals
2014-08-14 11:33:33 +02:00
iglocska 0363a251e2 Merge branch 'hotfix-2.2.35' into feature/proposalfix 2014-08-13 16:14:48 +02:00
iglocska cf3809ef74 Further work on the previous patch 2014-08-13 16:13:38 +02:00
iglocska 76fec60fdc Merge branch 'hotfix-2.2.35' into feature/proposalfix 2014-08-13 15:50:17 +02:00
iglocska 97eba22b46 Fix to the previous commit 2014-08-13 15:35:22 +02:00
iglocska 26a4f97adb Proposal validation now calls the Attribute validation method instead of using the (incorrect) duplication in ShadowAttribute 2014-08-13 15:24:22 +02:00
iglocska d0e121846c Missing validation for http-method in Shadow-Attributes 2014-08-13 15:21:16 +02:00
iglocska 9799c1d9dd More work on the sync fix 2014-08-12 17:25:09 +02:00
iglocska 99c04afa85 First round of fixes 2014-08-11 15:11:57 +02:00
iglocska c5644e5757 Some UI changes and other minor changes
- images updated in user manual

- fixed validation issues with named pipe (at the moment it's very loose)

- Fixed an issue with shadow attriubutes not showing for events that have no attributes

- some minor UI changes to make MISP a bit prettier
2014-03-06 17:21:57 +01:00
iglocska d19398999d SHA256 based shadowattribute validation added
- it was missing before
2014-03-04 10:23:52 +01:00
iglocska 2740da9094 Changes to the log system
- View Event history now shows the logo of the org whose action triggered the log entry
- View Event History now shows different fields than before
- Proposals now logged
- Accepting / Discarding a proposal now doesn't create junk edit / delete entries as before.
- Creators of an event can now see all of the log entries altering an event in the event history log. This includes deleted events.
2014-01-28 16:27:58 +01:00
iglocska 50096504f6 Small change to CVE notation fixes #186 2014-01-14 10:38:16 +01:00