Commit Graph

179 Commits (40ce38efec260b95705ddae52b60418298d8635d)

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
Iglocska b491898c11 Fix to the filters on IE
- old versions of IE didn't handle an incorrect form creation as gracefully as the other browsers

- forms should not be created within a table unless it's within a <td> (it was
  on <tr> level before). The normal solution would be to encapsulate the
  entire table in a form, but since we have formlinks for the deletes /
  publishes this would get flagged as form tampering by the security
  components.

- As a fix, filter forms are created separately for the 4 search fields within their <td> now with hidden fields that keep the persistence of the previously
  entered filter terms
2013-06-21 14:38:00 +02:00
iglocska 277aecf463 UI consistency 2013-06-17 17:15:04 +02:00
iglocska 77e028dd9c Several smaller changes
- Fix to the proposed attribute edit that got broken in a previous
commit

- Fix to the org filters for non admin users

- Some changes to the documentation
2013-06-17 15:23:21 +02:00
Christophe Vandeplas 68c2fd09fe Merge branch 'develop' of https://github.com/MISP/MISP into feature/sync/timestamp
Conflicts:
	app/View/Attributes/index.ctp
	app/View/Events/add.ctp
	app/View/Events/edit.ctp
2013-06-10 23:00:37 +02:00
Iglocska 06ca5ba0cd Further changes to the distribution
- changed to use the new int field
2013-06-10 20:49:31 +02:00
Iglocska 638a99e0e7 Few changes 2013-06-10 20:34:05 +02:00
Christophe Vandeplas e0c0e7ccf5 unified links 2013-06-10 17:57:20 +02:00
Christophe Vandeplas 3ed50e2aef improve UI of event index filtering 2013-06-10 17:24:41 +02:00
iglocska cb3ac8be15 Changes to the event filtering
- there was a bug that pushed the data entered into the "published"
filter field to the date fields -> fixed

- Also a bug in the serverscontroller, pulling threw an undefined
warning from the log controller because a single saveField was used and
the logController couldn't save the url data for the action
2013-06-06 10:24:27 +02:00
iglocska bc42dbd78c Filters updated and some changes for the sync
- visual changes
- date from/until fields
- published field
- a reset form button

- the org of an event added by a sync user will be that of the host
instance's own organisation identifier
2013-06-05 17:45:01 +02:00
iglocska 0410c1465e First version of the new filters on event index 2013-06-04 17:41:27 +02:00
Christophe Vandeplas bdc973f9ed alignment of action buttons 2013-06-03 14:44:31 +02:00
iglocska 9a8f090b79 Update to the event index view 2013-06-03 08:58:57 +02:00
Christophe Vandeplas bd50135fe6 UI events partial improvements 2013-06-01 08:46:21 +02:00
Christophe Vandeplas d099ca8e1c hilight row 2013-05-30 16:40:47 +02:00
Christophe Vandeplas 0fa30912a3 mirated first parts of nice GUI proposed by Alexandru of CERT-EU 2013-05-30 11:14:00 +02:00
Christophe Vandeplas 3be869a9d5 fix sanitization in Events #96 2013-04-24 15:49:35 +02:00
Andras Iklody 9a6733acfd Removal of deprecated code
- The flag private is deprecated, removed together with the code that was
  affected by it
2013-04-17 11:13:09 +02:00
Christophe Vandeplas 8d5782125d removed unused CyDefSIG.showowner field. Closes issue #93 2013-04-16 15:29:34 +02:00
iglocska 99e0a91aa8 Small bug with sorting events by validation
- didn't work properly, fixed.
2013-03-26 14:32:32 +01:00
iglocska d5800206e6 Bug fixes
- issues of admin orgs not being able to edit/delete org events

- owner org removed for org admins

- email only visible from own org to org admins
2013-03-13 15:11:49 +01:00
Andras Iklody 64f304da48 Tighter checks so users can't edit events of other orgs 2013-03-05 16:17:34 +01:00
Andras Iklody 0f947085cb Reworked the sync / release control
- Fixed issues with the sync
	- Secondary publishes on remote servers failed
	- Introduced new fields in events to stop backward traverse of
	  edit information that lead to low performance and eroneous
	  distribution information updates when more than 2 servers were
	  linked
	- Deletion of an attribute now deletes on remote servers

- Changes to the event ownership
	- Original creator org now noted in the event itself
	- Only original creator org can change distribution
	- Events will show up with the original creator org for users
	  (admins can see both that and the owner of the event on the
	  local instance)
	- Server.organization now used in junction with the connecting
	  user's org and the instance's org (from the bootstrap) to
	  determine distribution flow control and access rights

- Lots of minor changes
2013-02-19 15:37:35 +01:00
Andras Iklody 29295e1380 changes to the admin org access and sanitization
1. Some errors fixed in the way redirects worked for org admins

2. fixed some double sanitization resulting in incorrect characters
displayed in certain fields
2013-01-30 11:49:55 +01:00
Noud de Brouwer 120f907427 git
redo 'git-trigger' change.
2013-01-04 13:13:06 +00:00
Noud de Brouwer 4f9a2a5dd9 git
pardon i seem to have had a:
Error: messages not turned on: /dev/ttyp3: Operation not permitted
2013-01-02 15:32:47 +00:00
Noud de Brouwer e14d8d758d unused & coding standard
Removed some total unused code and corrected some toward the CakePHP coding standard.
2013-01-02 14:49:49 +00:00
Andras Iklody 0f751eb742 Validation field
A field in the event index showing it clearly whether the event has been
published or not - shows a small image (placeholder atm)
2012-12-20 16:56:56 +01:00
Noud de Brouwer a17eaa69ad log & code duplication
$this->Html->image($nonExistingImage)
showed up in tmp/logs/error.log and
the origin this is in 2 Views, so a View Element was created.
2012-12-20 10:33:54 +00:00
Noud de Brouwer 132a10182c log
do not logs/error.log if an img does not exist.
2012-12-19 16:18:08 +00:00
Noud de Brouwer f6c140e1dc coding standards
Coding Standards.
2012-12-19 13:34:40 +00:00
Andras Iklody 29cc79255f Added validation field to the event index
A small image at the front of each line showing whether the event has been
validated (published) or not. The images are placeholders for now.
2012-12-19 13:13:39 +01:00
Noud de Brouwer ea9aa8eb3a coding standards
Coding Standards.
2012-12-18 19:25:12 +00:00
Andras Iklody 1ceadab700 Added features from branch analysis_levels
-Analaysis levels setable for events as per milestone item 94
-Password change forced as per milestone item 109
-Added feedback on entered search terms for search attributes
-fixed the authentication issue
-some minor fixes
2012-12-17 15:51:30 +01:00
noud c2fa68a198 attributes
display "#Attr.".
2012-12-07 14:03:28 +01:00
noud 45cbe60aa7 distribution
show "All" if distribution is All communities in Events/index.ctp and
Events/view.ctp.
2012-12-07 14:01:41 +01:00
noud 1cddb6abe0 distribution
conform latest, having:
- Your organization only
- This server-only
- This Community-only
- Connected communities
- All communities

Push is tested, pull not yet.
2012-11-16 15:25:57 +01:00
noud b84bc50c56 index
some line disapeared.
Andras Iklody suggested a html non breaking space, that worked.
2012-11-14 16:43:24 +01:00
noud 6b06ba7ff6 count & GFI Sandbox
count # attributes in events index.
plus various fixes for distribution in correlation of a GFI Sandbox
upload.
2012-11-14 16:14:04 +01:00
noud 55f9b594d7 RBAC
just edit your own did still give edit org as well.
can be tested if now correct.
2012-11-09 10:14:40 +01:00
noud a2bc237bcd RBAC
should now respect Manage, so also edit, own and org events.‏
2012-11-08 14:09:52 +01:00
noud 12ebfafe16 RBAC
role only add could still publish her own events,
this should be not possible anymore.
2012-11-07 16:02:36 +01:00
noud f66b199f26 distribution
removed No push as a distribution.
2012-11-05 13:05:31 +01:00
noud 2b478605a5 Flags
correct from 50*50 to 48*48, so it's an icon size.
2012-10-31 15:54:15 +01:00
noud 099dd8398f distribution
border="1"-testleftover removed.
2012-10-30 13:19:34 +01:00
noud ed56d7c29c distribution
if distribution is All, so not displayed in an index nor in attributes
per event, there is missing a line-part in IE.
Did add 1 space for All, this will maybe display the line-part again.
2012-10-30 13:16:46 +01:00
noud f296a9381e RBAC
real inactive buttons.
2012-10-25 15:00:43 +02:00
noud e01dd6de77 distribution
do not display distribution 'All' in Events index or Event view.
2012-10-24 08:57:41 +02:00
noud 4b096fa584 distribution
changes and cleanup.
2012-10-23 11:28:39 +02:00
noud 8f3d624c1a Merge branch 'master' into develop
Conflicts:
	app/Controller/AppController.php
	app/Controller/AttributesController.php
	app/Controller/EventsController.php
	app/Controller/ServersController.php
	app/Controller/UsersController.php
	app/Model/Attribute.php
	app/Model/Event.php
	app/Model/Server.php
	app/Model/User.php
	app/View/Attributes/edit.ctp
	app/View/Attributes/index.ctp
	app/View/Elements/actions_menu.ctp
	app/View/Events/add.ctp
	app/View/Events/index.ctp
	app/View/Events/view.ctp
	app/View/Events/xml/view.ctp
	app/View/Servers/index.ctp
	app/View/Users/admin_index.ctp
2012-09-24 16:02:01 +02:00