Commit Graph

172 Commits (a7905b40cededa7fb54e2c735b8196c9aae03f94)

Author SHA1 Message Date
iglocska 627f9abbd6 Fix to several issues with the sync and and an issue preventing the editing of events, fixes #788, fixes #784 2015-12-24 15:22:05 +01:00
Iglocska cc57aa397e Invalid fetchevent call fixed for proposal add attachment 2015-12-18 17:17:42 +01:00
Iglocska bc2c14c815 Disable e-mailing globally for an instance 2015-12-15 10:52:31 +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 714ed198e5 Various fixes throughout the application
- org field still used in some places other than the legitimate use-cases
2015-11-28 23:49:52 +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 57c5696d96 Backport of a fix to 2.4 adding comments to proposed attachments 2015-11-26 17:06:33 +01:00
iglocska c94d67275f Fix to an issue with the proposal uploader
- also a small fix to the baseurl auto detection
2015-11-26 16:38:39 +01:00
iglocska 8cc0996c3c Merge branch 'master' into 2.4-beta
Conflicts:
	VERSION.json
	app/View/Elements/side_menu.ctp
	app/View/Pages/administration.ctp
2015-11-14 17:16:38 +01:00
iglocska afdcc1af0c Fixed a security issue with the CSRF protection being avoidable using some site admin functionality
- as discovered and reported by Egidio Romano of Minded Security

- Lacking checks of HTTP methods in some functionality could lead to a site admin uploading and executing malicious scripts

- Tightened HTTP method verification across the board for actions that modify data
- Turned some administrative tasks to POST only actions
2015-11-13 23:57:03 +01:00
iglocska 42eeadb834 Fixed the proposal attachment upload
- was bugged before since the switch to the new format
- comments were not enabled

- fixed an issue where a proposed attribute could not be downloaded as it was pointing to a file in the attribute attachment directory
2015-11-09 16:44:40 +01:00
iglocska 324418dcf9 Merge branch 'master' into 2.4-beta
Merge and upgrade of several new features

Conflicts:
	VERSION.json
	app/Controller/ShadowAttributesController.php
	app/Controller/TagsController.php
	app/Model/AppModel.php
	app/Model/Event.php
	app/Plugin/SysLogLogable/Model/Behavior/SysLogLogableBehavior.php
2015-11-08 23:26:19 +01:00
iglocska 9c00d56ed4 View all proposals via the API
- Proposals that can be accepted / discarded via the API
- Can restrict the index to the proposals of a single event
2015-10-31 00:18:05 +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 059a8aa43a Added API for proposals
- APIs for the following actions:
  - Add new proposed attribute to an event
  - Add proposed change to an attribute
  - View a proposal
  - Accept a proposal
  - Discard a proposal

- new APIs described on the automation page
2015-10-28 23:32:30 +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 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
iglocska a93807439d Several bigger changes
- new functionality: Event blacklisting by UUID
  - site admins cna enable this feature in the server settings
  - enabling the feature will make the required db changes
  - any deleted event will automatically get blacklisted
  - this prevents deleted events from flowing back from a synced instance
  - site admins can manually add UUIDs to the list and remove entries

- fix to UUID duplication issues for attributes
  - simply run the admin script and it will regenerate the UUID of attributes that are duplicates, if any such exist
  - timestamps/event published status will not be affected

- config.core.php now includes a change that prevents from 404 exceptions being logged
  - the sync uses 404s to signal that an event with a given uuid does not exist when negotiating proposal synchronisation
  - this causes a dangerously high amount of noise in the logs
2015-08-17 16:10:10 +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 dc9fbf48d0 Proposal mass accept/discard, fixes #466 2015-06-25 11:51:36 +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 47d02845d2 Added the option to use an alternat executable for gpg, fixes #498
- users can specify an alternate gnupg executable
- Since GnuPG2 is not compatible with the last stable CryptGPG version, there are 3 options for CentOS / Red Hat users:
  1. Don't use a passphrase for the server's PGP key
  2. Install the beta version of CryptGPG (1.4.0b4)
  3. Install GnuPG classic and point MISP to the executable

- This patch enables option 3, administrators can point MISP to the alternate executable in the server settings
2015-06-09 13:04:33 +02:00
Iglocska 1e3db8a8ba Further work on the new version
- org checks fixed in a lot of places
- fixed the searches to work with the new organisations
2015-04-14 17:51:38 +02:00
Iglocska 094f932616 Merge branch 'disallow_unpublished_events' into hotfix-2.3.59 2015-04-08 22:22:22 +02:00
Iglocska b29e8fdada Site admins can now create proposals, fixes #417
- site admins can now create proposals to an event / attribute as long as the event does not belong to their organisation
- new icon for proposals to differentiate them from edits
2015-03-14 09:01:20 +01:00
Richard van den Berg 12dc5b6579 Make unpublished events private if MISP.unpublishedprivate == true 2015-02-05 17:16:40 +01:00
Richard van den Berg 253e579307 Disallow unpublished events 2015-01-27 10:10:22 +01:00
iglocska f14a26444b Fix to some event altering actions not updating the timestamp 2014-12-10 14:08:08 +01:00
iglocska 504527d36b Fixes to the proposal ajax mechanism for newer cakephp versions 2014-10-15 15:39:28 +02:00
iglocska b178358f2a Default config.php added 2014-09-10 11:48:48 +02:00
iglocska 03e43e9824 Failed e-mails don't break the proposal creation any longer 2014-08-18 13:30:18 +02:00
iglocska 22c1552bcc SQL scripts, some UI chnages
MYSQL.sql and upgrade_2.3.sql updated
Fixed incorrect proposal counts showing up due to attributes that are flagged for deletion also being counted
Added some extra fields to the view proposal view to make it more useful
2014-08-14 14:45:21 +02:00
iglocska bd6b206ac5 Further work on the sync
- changed the pull implementation for proposals
2014-08-14 11:33:33 +02:00
iglocska 99c04afa85 First round of fixes 2014-08-11 15:11:57 +02:00
iglocska 19b4a2ae37 Fixes to several ajax related issues
- malware samples / attachments couldn't be downloaded
- links weren't actually links

- deleting an attribute / shadowattribute now opens a custom confirmation dialogue. This is also where the CSRF tokens are generated for the post request to execute the delete, resulting in a faster event view load
2014-05-09 23:12:51 +02:00
iglocska ea5b4c4468 Fix to site admins not being allowed to edit attributes 2014-05-05 10:13:40 +02:00
iglocska 291892be05 Merge branch 'develop' into features/ajaxification
Conflicts:
	app/View/Elements/img.ctp
2014-05-05 09:56:42 +02:00
iglocska 8dc797dc39 Clearer disctinction between proposals that belong to an attribute and proposals to an event 2014-05-02 15:19:15 +02:00
iglocska 14976bd7bb Ajaxification of the event page done also, replaced histogram in memberslist
- AJAX requests now also respond with a small message at the bottom of the page, notifying the user of the result
- The following actions work now on the event page via ajax:

1. Add / remove tags
2. quick edit any attribute field if eligible
3. quickly create a proposal of any attribute field if not eligible to edit
4. popover attribute creation (also works with batch add)
5. popover proposal creation (also works with batch add)
6. delete attributes
7. accept/discard proposals
8. mass edit / delete attributes

Also, replaced the old memberslist, with a small lightweight css/js based one.
2014-05-02 14:29:15 +02:00
iglocska 50f1425526 Missing parantheses
- fixed.
2014-04-02 13:27:54 +02:00
iglocska 1054ff6e85 Very large PGP keys would prevent users from logging in - fixes #142
- removed the PGP key from the Auth user

- PGP key of currently logged in user is looked up on demand and not stored in the session
2014-04-01 16:20:47 +02:00
iglocska 22c8105f58 Mass replace replace of the old CyDefSig name to MISP - fixes #82 2014-02-05 15:01:26 +01:00
iglocska f51d61f8f9 Various changes
- contributors shown on the event view (list of the organisation logos of users that have contributed through proposals)
- these link to the event history containing only entries from their organisation

- changes to the activity heatmap
- heatmap now dynamically changes the range on the graph based on the obtained values
- performance improved
- buttons to move back or forward in time on the calendar

- Attributes:
- warning for the user if he/she has selected the attribute category "targeting-data" or "attribution" as these could contain classified information
- UI improvements across most attribute and shadowattribute input views

- Updated cal-heatmap to the newest version
2014-02-05 13:45:18 +01:00
iglocska 70c7f650f6 Changes to the logging and scheduling
- Scheduled tasks for pull / push now working as intended
- Rescheduling of all tasks fixed
- protection against the rescheduled task ending up in the past

- further event history fixes
- fixed lots of erroneous logging
- performance improvement with logging (no longer loading controllers for no reason)
- logging extra actions that weren't logged before (proposal accept / discard, server pull / push)
2014-01-29 15:52:09 +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 a1cd813070 Accepting / Discarding Proposals changed to POST only
- it is not possible to discard / accept a proposal with a GET request anymore
2014-01-16 10:11:44 +01:00
iglocska 2e82ee6a36 Some minor changes and fix to a vulnerability
- fix to the creator of a proposal being able to also accept it
- new attributes are now shown in the e-mail denoted by a * when an event is republished
- the date of an attribute's creation is shown
2014-01-13 16:38:49 +01:00
iglocska 772f60ff40 Proposal changes
- anyone can see proposals that can see an event
- fixed a vulnerability where a user could add a proposal to an event blindly that he couldn't see
2014-01-10 14:56:21 +01:00
iglocska c6fd29fb29 Several features
- Sync for background jobs (pull + push)
- more e-mailing delegated to background jobs
- A bunch of bug fixes and minor changes
2014-01-06 05:15:47 +01:00
iglocska a380ab444a Work on the background job and the proposals
- Proposals now get synced on pull
- several bug fixes
- new startup script for the background workers
2014-01-05 21:30:39 +01:00
iglocska f0944ab9b0 Proposal changes Fixes #192
- Contextual comments for proposals
- shows proposal count in the top bar
- new view showing all of the events of the user's organisation with an active proposal
2013-12-12 16:25:20 +01:00
iglocska 828d11c0c8 Accidental debug removed 2013-09-11 10:41:51 +02:00
iglocska 628bd5283a Change to the proposal list
- removed own proposals from the list
- allowing site admin to see all proposals of any org
2013-09-11 10:35:50 +02:00
iglocska a5c100309b Fixes to the Shadow attribute e-mailing
- E-mail locks are now correctly reset by discarding / accepting a proposal

- Also, new index page to see the list of proposals that a user can accept
2013-09-03 15:29:44 +02:00
iglocska ebcbcdc6bf Removed a left-over junk line from the shadow attribute controller 2013-08-28 14:56:40 +02:00
iglocska 4e32336878 Small fix to the previous commit 2013-08-20 17:20:37 +02:00
iglocska 33965eac0d Changes to the shadow attribute controller
- users that weren't publishers couldn't accept / discard proposals

- emails were blocked by an incorrect debug mode for the e-mailer
2013-08-20 17:04:42 +02:00
iglocska 8ec5a83768 Some smaller fixes
- PGP key of the user shown in the profile instead of always showing N/A

- Contact e-mails now include the instance's owning org in the subject

- Users can now enable/disable contact e-mail subscriptions
2013-08-20 14:19:08 +02:00
iglocska c989e4ce1d Fix to not being able to accept shadowAttributes
- recursive -1 used for loading attribute, then referencing the event
2013-08-20 10:17:37 +02:00
iglocska 23017fd9a8 Change to the GFI import and the attachment downloads
- GFI import issue fixed with attribute ID 1 not existing causing the
import to fail for several attributes

- GFI import change: registry keys with binary value are now artifacts
dropped instead of persistance mechanism

- GFI import change: files with size of 0 will be omitted

- file attachment download change: moved away from the deprecated media
view in favour of cakeresponse->file()
2013-07-10 17:31:18 +02:00
iglocska 8cdf97ff66 ACL checks changed
- until now checkAction was used to check permissions of a user

- but since all of the role permissions are checked beforefilter in
appcontroller and saved into a public array, doing a lookup of the
array saves an SQL call for each permission check.
2013-06-27 17:53:36 +02:00
iglocska 55f47d3166 ShadowAttribute notifications, and some minor fixes
- New field for events, locking an event from sending out a contact
e-mail when a proposal is made to it
- Default setting for the new field is 0, if a shadow attribute is
added an e-mail is sent to all subscribing members of the orgc and the
new field is set to 1
- Accepting a change resets the field to 0
2013-06-20 16:21:55 +02:00
iglocska 708156ee49 Some UI changes and partial update to the manual 2013-06-13 16:10:28 +02:00
iglocska fd077e7bd4 Shadow attribute change
- fixed incorrect link to edit shadow attributes and the distribution
checks
2013-06-11 13:51:11 +02:00
Andras Iklody 6332dbf05b Removal of more remnants of the old ACL and tightening of the filename
checks

- actAs acl removed from role and user models together with some extra
code related to the ACL

- Fix of the filename regex as pointed out by cvandeplas.
2013-04-29 10:52:07 +02:00
Andras Iklody 0eec208b45 Further changes to the authorisation 2013-04-26 15:46:39 +02:00
Andras Iklody 4396cec8ea Integrated ownership, ACL and minor fixes
- Orgs can propose new attributes or changes to existing attributes for
  events that they do not own

- publishing users of the owner organisation can see, accept or discard
  them

- Reworked the access control

- minor fixes
2013-04-25 14:04:08 +02:00