Commit Graph

683 Commits (d7b4c28552d642c0614c108d91b86f1c73235460)

Author SHA1 Message Date
iglocska d7b4c28552 Contextual comments
- Attributes now have a comment field
2013-10-30 16:00:46 +01:00
iglocska bbbc17a95b Merge remote-tracking branch 'origin/feature/XML_and_UI' into feature/discussion
- Also some improvements to the shadow attributes

- some minor UI changes

Conflicts:
	app/Controller/EventsController.php
	app/View/Elements/global_menu.ctp
	app/View/Layouts/default.ctp
2013-10-30 10:06:12 +01:00
iglocska b2b76779b9 More changes to the discussion boards
- quote / event tags

- anonymised e-mail addresses
2013-10-29 13:45:53 +01:00
iglocska 0591db2a67 Small changes after merging the two feature branches
- Update to the representation of the new permission flags

- some small issues with the merge resolved
2013-10-25 11:31:35 +02:00
iglocska 2b11a78e22 Merge branch 'feature/roleChanges' into feature/XML_and_UI
Conflicts:
	app/Controller/UsersController.php
	app/View/Regexp/admin_add.ctp
	app/View/Regexp/admin_edit.ctp
	app/View/Regexp/admin_index.ctp
	app/View/Roles/admin_add.ctp
	app/View/Servers/add.ctp
	app/View/Servers/edit.ctp
	app/View/Servers/index.ctp
	app/View/Servers/pull.ctp
	app/View/Servers/push.ctp
2013-10-25 10:39:18 +02:00
iglocska 3c58e0071a Further work on the UI
- reworked almost all of the side menues to be centralised

- Some fixes for the IOC export not handling two new-ish types correctly

- Some changes to the menues (including a few options that didn't exist before)

- rework of the popovers in some forms
2013-10-24 16:41:42 +02:00
iglocska 0cb7653d41 Merge branch 'develop' into feature/XML_and_UI 2013-10-24 16:10:58 +02: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 195993dd3a Quick fix for the export changes
- pass by references on method calls removed
2013-10-17 17:41:46 +02:00
Christophe Vandeplas 04afc57bd5 Merge branch 'feature/IDSsuri' into develop 2013-10-17 15:16:03 +02:00
Christophe Vandeplas 9ed21a0b21 snort export, updated urls, new url is backwards compatible 2013-10-17 15:13:49 +02:00
Christophe Vandeplas 61f027e862 NIDS - fixes issue from last commit 2013-10-17 13:53:14 +02:00
Christophe Vandeplas a7009ada9d NIDS - substitute illegal chars, improved some rules 2013-10-17 13:49:22 +02:00
iglocska f445c0ddb8 Merge branch 'hotfix-2.1.26' into develop
Conflicts:
	app/Controller/AttributesController.php
2013-10-15 10:35:08 +02:00
Christophe Vandeplas ed266c7262 performance improvements in email and dns. rule for user agent 2013-10-15 07:49:38 +02:00
Christophe Vandeplas 23edf3dd06 improvements in the email NIDS rules 2013-10-11 15:21:45 +02:00
Christophe Vandeplas d06bc16577 improved smtp rules 2013-10-10 15:16:59 +02:00
Christophe Vandeplas 29a0f30041 start of different structure for multiple rule-formats 2013-10-10 15:02:47 +02:00
iglocska d27ddee207 First rework of the siteadmin role
- ADMIN org removed.

- Siteadmins are now identified by the perm_site_admin flag

- Siteadmins can now be of any organisation

- editing the regexp / whitelist rules can now be done by a special user with the perm_regexp_access in his/her role

- Executing a mass replace of attribute values based on the regexp rules cannot be initiated by a regexp/whitelist user, only by a site admin

- If the login page is reached without any users / roles defined they are automatically created (perviously it was only the user that was created)

- Org admins are restricted from assigning perm_site_admin, perm_sync and perm_regexp_access roles to users. This can only be done by a site admin.
2013-10-03 11:45:27 +02:00
iglocska e0e5e6a5c8 Some permission issues with restSearch of an event
- __fetchEvent used, which checked the currently logged in user

- instead now, __fetchEvent has a new optional parameter that automation methods can use to pass the org along that was read from the provided auth key
2013-09-27 11:34:11 +02:00
iglocska 1deddf0075 Fix to the conditions when doing a restsearch
- Was always searching for 'value' due to a bug. Fixed.
2013-09-27 10:06:36 +02:00
iglocska 10747e9366 Change to the attribute download method
- Permissions weren't checked correctly when downloading attachments
2013-09-20 14:26:06 +02:00
iglocska c48edd6732 First release of the new API features 2013-09-20 11:40:26 +02:00
iglocska 8e75f0826f Security fix and new download attachment feature
- users can now download attachments using the APIkey

- security issue fixed where a user could download attachments that he/she can't even see by navigating to attributes/download/<attribute_id>
2013-09-19 17:28:55 +02:00
iglocska 6d1dc6df95 First round of implementations for the new API searches
- users can search RESTfully for attributes based on various filtering mechanisms and get either an event that includes the located attribute(s) or just an array of attributes returned.

- users can also request all attributes of a (or several) types and get them returned as an XML
2013-09-19 12:05:08 +02:00
iglocska 861b5d3ddd First version of the api search
- requires the auth key of a user and the user has to have auth key permission

- user can specify what should be returned (event / attribute) - currently only event is implemented

- user can specify 4 filters (value, type, category, org)

- all these fields can have several values separated by &&

- Values can be negated by putting "!" infront of them
2013-09-16 17:22:44 +02:00
iglocska cf787a84ce Fix to the download of attribute search results as XML
- now uses the unified __fetchEvent method to retrieve the events

- __fetchEvent has a new optional parameter "idList" which restricts the results to an array of event IDs.
2013-09-16 11:23:47 +02:00
iglocska 44b714eb01 Fix to the exports not working since the new pivoting
- Helper echoed a blank line, breaking the xml export

- Helper will now only be called during view when it's not a rest request.
2013-09-12 16:53:59 +02: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 6895548877 Merge branch 'develop' into feature/discussion
- Pivots, attributes, discussions hideable

Conflicts:
	app/Controller/EventsController.php
	app/webroot/css/main.css
2013-09-10 16:51:56 +02:00
iglocska bec0d0e55f Thread creation if it doesn't exist for an event 2013-09-10 14:54:11 +02:00
iglocska de372d469d debug info removed 2013-09-10 10:49:46 +02:00
iglocska 494827e76d Previous commit fixed 2013-09-10 10:48:29 +02:00
iglocska 77e29f7068 Fixed a case that could cause overlapping pivot elements to appear
- The height calculation did not take into account gaps between child elements caused by them having several children. This caused a newly added sibling's children to overlap. Fixed by compensating for the vertical displacement between children when returning the height data.
2013-09-10 10:30:20 +02:00
iglocska 6d0c26b9d4 Delete button gone from pivot elements that should not be deleted
- When looking at an event, a user should not be able to delete the pivot path that he/she took to get to that particular event.

- Deleting the root pivot item is an exception, this will simply reset the pivoting.
2013-09-06 15:01:18 +02:00
iglocska 16abc9eddb Height adjustment was not cummulative
- inserting a branch to a previous sibling only pushed the next sibling down a line, not the following one. Fixed.
2013-09-06 10:20:43 +02:00
iglocska 5d25348780 Fix to removing the root element causing issues with pivoting 2013-09-06 10:04:15 +02:00
iglocska 22593b2378 Finished the first version of the new pivoting
- Users can go back to a previous event and branch the pivoting by choosing a new relation

- users can remove individual pivoted branches
2013-09-06 09:51:46 +02:00
iglocska 1b901bfacb Further work on the pivoting
- still has some issues with arranging the height for some branching
2013-09-05 17:00:15 +02:00
iglocska 9890d40b2b Heights / depths calculated for rearranging the pivot thread in view
- The idea is to draw a horizontal path instead of a vertical one
2013-09-05 11:00:06 +02:00
iglocska 4ef6b2b9fd First refactoring of the pivoting 2013-09-05 10:40:53 +02:00
iglocska 807cc4c090 Deleting attributes deletes associated shadow attributes
There was a bug causing "zombie" shadowattributes to stay in events if the attribute has been deleted
2013-09-04 08:52:30 +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
Christophe Vandeplas 23223155c7 fix bug in pull updated events, improved performance 2013-09-02 15:26:31 +02:00
iglocska 28901cc682 Left-over line removed 2013-09-02 11:46:22 +02:00
iglocska a6a6c6bd35 Small cleanup 2013-09-02 11:36:27 +02:00
iglocska e10d6a0afd Attachments correctly exported with events/view/1.xml now
- bug that broke transfer of attachments on pull fixed

- data only exported on view() not mass xml exports
2013-09-02 11:31:34 +02:00
iglocska a98d94469a Export fixes
- conversion of the array in the XML export to be compatible with the XML parser (some invalid characters could break it)

- New separate CSV export that includes all visible unpublished and non IDS signature attributes on request
2013-08-29 14:49:42 +02:00
iglocska b0f91729aa A fix to the csv export 2013-08-29 13:56:19 +02:00