Commit Graph

129 Commits (4fea371c4b417e6eac5cdefe0baf77840f5752a1)

Author SHA1 Message Date
William Robinet 4fea371c4b Fix permissions 2016-02-11 17:03:51 +01:00
Iglocska 12e32d4673 Correlations on the event index, first implementation 2016-01-30 19:26:47 +01:00
Iglocska 98c1aadfa4 Fix to a bug allowing regular users of the owner organisation to edit/delete a synced event as discovered by @h122015
- requirements for the actions changed from an org_id match to an orgc_id match
2016-01-15 11:43:37 +01:00
Iglocska 52f429e3c7 Quickfilter added for users 2016-01-04 11:57:21 +01:00
iglocska 485c007b39 Merge branch 'master' into 2.4-beta
Conflicts:
	VERSION.json
	app/Lib/Tools/XMLConverterTool.php
	app/Model/Event.php
	app/Model/EventTag.php
	app/Model/TemplateElementAttribute.php
	app/Model/TemplateElementFile.php
	app/Model/TemplateElementText.php
	app/Model/ThreatLevel.php
	app/View/Attributes/index.ctp
	app/View/Elements/eventattribute.ctp
	app/View/Elements/eventattributerow.ctp
	app/View/Elements/global_menu.ctp
	app/View/Elements/side_menu.ctp
	app/View/Events/automation.ctp
	app/View/Events/index.ctp
	app/View/Pages/administration.ctp
	app/View/ShadowAttributes/index.ctp
	app/View/Tags/index.ctp
2015-11-17 01:14:51 +01:00
iglocska b3a2428345 Merge branch 'basedir' into hotfix-2.3.160
Conflicts:
	app/Controller/AppController.php
	app/View/Pages/administration.ctp
2015-11-17 00:33:34 +01:00
pugilist ec7d85332c modified many instances of html anchors and javascript document.location to use 2015-11-08 15:38:24 -05: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 b6857b4743 fix to a display bug on the event index when short tags are used 2015-09-10 16:21:16 +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 bc06362d19 Fixed XSS in several views
- reported by Roberto Suggi Liverani from NCIA
2015-09-09 19:26:06 +02:00
Iglocska c24704a6c2 Lots of progress
- further work on implementing the SG changes everywhere
- reworked the alert e-mails
- reworked a lot of the logging
- several convenience methods
2015-04-20 11:46:55 +02:00
iglocska 51ea9c090d Further progress 2015-04-18 07:53:18 +02:00
iglocska 0e7b2448d2 Further work on the sharing groups
- correlations should work fine now
- users can only see events they should be allowed to see on the event index / event view / event history view
2015-04-10 15:23:53 +02:00
iglocska 5abd8dfead Further work on the sharing groups:
- changes to the data model
- correlation engine updated
2015-04-09 17:27:34 +02:00
iglocska 6782159b53 API search incorrectly generating JSON with several events, fixes #407
- also fixed the edit button on the index
2015-02-18 11:45:15 +01:00
iglocska 92679f6b69 New way to download a single event
- The event export buttons have been unified into a single download as... button
- clicking it loads a popup with all of the export formats
- added snort, suricata, text dump to the export options
- added the option for an extra setting for some exports (such as including non IDS flagged attributes, encoding attachments)
- easily extendable system

- moved the hidden popup divs into the general layout, can be easily reused anywhere

- removed the auth refresh option that was re-enabled recently as it seems to sometimes cause issues

- text exports now allow "all" to be specified as type, which will dump all attribute values that the user can see
- text exports now allow restricting the results based on event id
2014-12-19 13:32:16 +01:00
iglocska 12692284fa Changed the annoying click to view feature on each row on certain index pages to double clicks 2014-12-05 15:27:54 +01:00
iglocska 9fae7a2193 Alternate event org display
- shows both orgc and org to normal users
- naming convention changed (orgc => source org, org => member org)
- this should allow users to see if an event was generated on their instance or not.
2014-11-25 13:21:25 +01:00
iglocska 7fcbca5a7d Quick filter tool, some further tweaks to the filters
- quick filter on the event index
- finds events with a sub-string match on event info, orgc, attribute value, attribute comment
2014-10-31 14:44:10 +01:00
iglocska 79127902b7 Cleanup, MISP health tool
- cleanup of a lot of deprecated settings
- tool to help assess and alter issues with the instance settings
- new mechanism to store settings
2014-09-10 09:43:22 +02:00
iglocska 1d9881b2db slightly better looks for the tags on the index 2014-08-28 17:35:29 +02:00
iglocska 6206cdc619 Some minor changes to the event index
- Tags are now fully shown on the event index
- can be enabled via bootstrap (the Configure::write setting is in the bootstrap.default.php file)
- shorthand distribution names
- narrowed some of the fields down
2014-08-28 16:29:30 +02:00
iglocska 559b39ceb5 Reworking of the event filtering 2014-08-08 15:28:37 +02:00
iglocska 303de0e3aa Further work on the ajaxification
- mass deletes / mass edits

- tagging now done via ajax

- also, several small unrelated issues fixed
2014-04-24 15:10:08 +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 bec1287968 Tagging system
- new special role for tagging
- can create tags with a name + colour combination (using a colour picker plugin)
- users can assign tags to events
- can filter events by tags on the index
2014-01-23 12:25:04 +01:00
iglocska 89bf5f06b6 Threat level changes
- upgrade script that populates threat level from the old risk field for every event that doesn't have a threat level set.
- threat levels in an event (from a sync for example) that are unknown to the local instance now show the numeric value of the threat level
2014-01-21 13:32:24 +01:00
iglocska 43e3b98326 Cosmetic changes
- Valid renamed to Published on the event index
- Attributes that are flagged as IDS signatures are now shown with a (IDS) notation at the end of the line in the alert e-mail
2014-01-14 10:15:41 +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 50f3fa40d0 Merge branch 'develop' into feature/CakeResque
Also, more work on the background jobs
- started work on publishing
- started making the background jobs an optional setting in bootstrap

Conflicts:
	app/Controller/AppController.php
	app/Controller/EventsController.php
2013-12-04 11:58:01 +01:00
Alexandru Ciobanu f36cc43955 replace Risk with ThreatLevel [skip ci]
- Event.risk has been replaced by Event.threat_level_id.
      all functionality remains the same and users should not see
      any difference.
      ENUM() used for Event.risk is vendor specific and requires
      too many hacks to play nicely with bake.
    - Added default schema file, SQL dumps should be avoided since
      they make updating/upgrading a pain.
    - Removed old unused schemas
2013-11-17 17:54:15 +01:00
iglocska 1c3425fc91 Merge branch 'develop' into feature/CakeResque
- develop and the first CakeResque implementation merged

Conflicts:
	app/View/Layouts/default.ctp
2013-11-06 11:02:23 +01:00
iglocska 0f80145c6d :q 2013-11-06 10:52:18 +01:00
iglocska d5d2e900c4 First revision of the unified menu and XML upload
- centalising the side menu for easier maintainability

- XML upload of event(s) from the interactive interface
2013-10-24 10:33:34 +02:00
iglocska 66a7791b33 Pivot threads and other changes
- Users can now see the path they took while jumping from related event to related event

- Removed the breadcrumbs

- Some UI changes (user menues were not showing the active page, etc)
2013-08-02 11:53:17 +02:00
iglocska 8d2595d592 Breadcrumbs for the views
- makes navigating the site easier
- some new css changes to support this
2013-07-31 15:08:10 +02:00
iglocska e74aabf924 Fixes XSS vulnerability in filters 2013-07-17 16:41:31 +02:00
iglocska 53675fe3a3 Some UI changes and reattached the regexp for the admin validation tool
- org only events have a redish background in the event index

- org only events and attributes have their distribution level marked in
red
2013-07-11 16:38:39 +02:00
iglocska 1b79963ce8 UI changes applied to the actions menu
- The side menu is now fixed / relatively positioned based on the debug
mode, like the header and the footer.
2013-07-04 13:35:04 +02:00
iglocska d9efaab416 Some more HTML fixes 2013-07-03 11:21:04 +02:00
iglocska 58aaf4fa5f Hard coded urls for the event index
- Should provide a tiny performance boost
2013-07-01 15:11:54 +02:00
iglocska c6c9809311 Width + height, should be fixed (event index images) 2013-06-25 17:16:49 +02:00
iglocska c5525eab49 Small part left off from the previous commit.. 2013-06-25 17:13:22 +02:00
iglocska efd5948287 Overriding the css that's blocking the size change
- on the event index
2013-06-25 17:08:27 +02:00
iglocska c1917846a4 Typo fixed 2013-06-25 17:00:43 +02:00
iglocska 753c034d4e Some UI changes
- removed the e-mail for non site admins from the event index (they can
still see it in the event view if the event was created by the same org)

- added a text MISP logo

- smaller icons for the event index
2013-06-25 14:39:50 +02:00
iglocska c9b3b15fa6 Email addresses of event creators visible to users if same org
- On the event index, users can view the e-mail address of the event
creator, if the event belongs to their own organisation
2013-06-24 10:34:56 +02:00
iglocska 640080d2e7 Some fixes to the filters event index
- siteadmins can now search the creator org instead of the owner org
(like normal users would)

- Changed the org search to be a partial match instead of an exact match
2013-06-24 10:02:35 +02:00
Iglocska 6146df10d0 Two small changes
- email of the user creating an event shown if current user's org ==
  event's orgc

- on export, the check for to_ids will happen outside of the if branch
  that sets extra restrictions of non site admins. Otherwise site-admins
  would accidentally include attributes that aren't iocs.
2013-06-21 15:20:49 +02:00