Commit Graph

306 Commits (8ca550cbe10af9eba182158118689b87f0a0a946)

Author SHA1 Message Date
Noud de Brouwer 8ca550cbe1 event.analysis
set analysis* in view().
2012-12-18 03:59:45 +00:00
Noud de Brouwer b5205163fd paging
6 (used during test) -> 60 again.
2012-12-18 03:54:31 +00:00
Noud de Brouwer 8864ee78f7 generateAllFor<FieldName>
so we can use an URL like:
http://localhost/<TableName>/generateAllFor<FieldName>/newValue/oldValue
for example:
http://localhost/events/generateAllForAnalysis/0/null
http://localhost/users/generateAllForInvitedBy/1/0
http://localhost/users/generateAllForRoleId/1/0
2012-12-18 03:50:52 +00:00
Noud de Brouwer 68617350e8 Sanitize
Sanitize::clean() but redo the info and value fields.
2012-12-18 03:18:48 +00:00
Noud de Brouwer 9211e4d405 search
After added feedback on entered search terms for search attributes
and search logs, this now also works for LogsController::index()
and next and previous page.

Signed-off-by: Noud de Brouwer <noud4@home.nl>
2012-12-18 03:01:02 +00:00
Noud de Brouwer 8c7f8921a7 Sanitize
do not Sanitize::clean() $this->request->data.
2012-12-17 17:33:21 +00:00
Andras Iklody 099e5d92be Fix for the Attributes 2012-12-17 17:21:57 +01:00
Noud de Brouwer 46ab0d2e58 sanitize
small correction on a "\n" in info.
2012-12-17 15:51:14 +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 2903493205 Merge branch 'master' into develop
Conflicts:
	app/Controller/AttributesController.php
	app/Controller/EventsController.php
2012-12-13 16:03:35 +01:00
noud 276cb5df10 RESTfull sync
this is in responce to the email
From: <User1088@QET.BE>
To: <ndebrouwer@hotmail.com>, <andrzej.dereszowski@ncirc.nato.int>
Subject: Re: sync/REST
Date: Fri, 7 Dec 2012 13:30:10 +0000
in this there is a complaint about the RESTfull sync workings.
the email hints about 2 possible options:
i) RESTfull add event without attributes (conform the web interface)
ii) RESTfull add event with attributes (more conform the code)

both are implemented and can be choisen in bootstrap.php by
Configure::write('CyDefSIG.rest', 'ii') or 'i'.
2012-12-13 15:52:00 +01:00
noud 094719fa01 Merge branch 'master' into develop
Conflicts:
	app/Controller/AttributesController.php
	app/Controller/EventsController.php
	app/Controller/ServersController.php
	app/Model/Event.php
2012-12-12 18:01:39 +01:00
noud 26c8ad57ee Role
renamed everything group to role (i.s.o. renaming just the visable).
2012-12-12 16:15:01 +01:00
noud 52a7625a9d Source Code Review
sanitize everything displayed from the db.
(and some small coding standard whitespaces)
2012-12-12 14:01:00 +01:00
noud 8119d26d35 RBAC and Roles
did add Acl Admin and Audit.
2012-12-11 17:40:57 +01:00
noud 079ce88793 RESTfull sync
Let RESTfull only work conform the web pages (to Christophes wish),
so add/edit event apart from add/edit attribute.
(there is annotation in the code to revert back to full RESTfull and
add/edit the attribute(s) alongside add/edit the event.)
2012-12-11 16:11:45 +01:00
noud 6f4b72f214 RESTfull sync
redone delete attribute and add that to the sync.
2012-12-11 10:33:32 +01:00
noud 718691a627 RESTfull
make RESTfull event add and edit work again.
2012-12-10 13:49:56 +01:00
noud e4dafd3882 RESTfull sync
RESTfull attribute add, edit and view, to be usefull in sync.
2012-12-10 11:32:40 +01:00
noud 75dfba2ae1 sync
have sync option in role.
and only display the Sync Actions when sync option or admin.
(still has to be disabled if role is below manage org events.
2012-12-07 15:00:40 +01:00
noud e24ff690bb RESTfull/sync
redid the sync, so if add and exist, send HTTP 302 and different
Location, and do edit there.
Still, the final result has to compare the attributes and if needed
RESTfull delete.
2012-12-07 13:56:19 +01:00
noud d453ee1d99 Import Whitelist
if not regex and only replacement, consider that as a comment.
2012-12-05 10:14:14 +01:00
noud 4ab744ed76 Added bubble when hovering over related events
make baseurl variable conform bootstrap.
2012-12-05 09:00:35 +01:00
noud 63811bffb6 Added bubble when hovering over related events
make authkey variable conform the authenticated user.
2012-12-05 08:56:58 +01:00
noud 1bd14256e0 coding standards
correction conform conding standards.
2012-12-04 09:07:33 +01:00
noud 98a2df0280 Import Whitelist
if Import Whitelist item has regex and no replacement, then do not allow
an attribute having value the regex and do not allow events having info
conform that regex.
2012-12-04 08:51:27 +01:00
noud 9a7f160ec4 code
a "1" gremlin removed.
2012-12-03 13:07:07 +01:00
noud 053edeb304 regex and blacklist
blacklist, as in, do not input attributes, is working now,
for manual, batch and GFI Sandbox import.
2012-12-03 10:34:28 +01:00
noud 2af02aa100 input regex
use RegexBehavior on Event.info and Attribute.value.
2012-11-30 13:52:09 +01:00
Andras Iklody 1bf1e6f2a8 Slight change to the histogram
Data for types that had "|" or "-" in the name (such as ip-src)
were omitted - should be fixed now
2012-11-29 16:13:31 +01:00
noud c6bdf794c1 db
spit generatePrivate into attr and event part (given long runtime).
2012-11-29 15:10:18 +01:00
noud 2daba5a3c2 correlation
do not show the same event id multiple times for one attribute shown.
2012-11-29 14:42:06 +01:00
Christophe Vandeplas be939c2b9e fix bug when published event that is added using REST is not pushed to
remote servers
2012-11-29 09:15:53 +01:00
noud d2ab860ff2 distibution
generatePrivate conform new distribution.
2012-11-28 16:34:36 +01:00
noud 889492629e distibution
add generateHop to migratemisp11to2.
(generatePrivate should still be looked at.)
2012-11-28 14:30:29 +01:00
noud 324d58d532 distribution
generate hop count.
2012-11-28 13:19:20 +01:00
noud d301f201b9 distribution
do not do anything upon delete in regard to distribution.
2012-11-28 11:17:55 +01:00
noud 1e4597c009 distribution
if distribute upstream, do not alter org, user_id nor distribution
settings.
2012-11-28 11:09:08 +01:00
noud a3524bb0ee coding standards
correct conform coding standards.
2012-11-27 12:51:00 +01:00
Christophe Vandeplas 4a0e4ada0e removing update functionality for REST. 2012-11-27 10:08:39 +01:00
noud 4c31bb06cc sync
lastpushedid reminder.
2012-11-26 15:37:10 +01:00
Christophe Vandeplas 49eff9bed2 Merge branch 'master' of code.lab.modiss.be:cydefsig 2012-11-26 14:09:36 +01:00
Christophe Vandeplas 1466a5491a fix bug of sync 2012-11-26 14:06:13 +01:00
noud 80571386ad audit log & terms
do not handle a timed out user log.
and
better check on login and termsaccepted.
2012-11-26 10:50:23 +01:00
noud bba0088b88 correlation
repair correlation after introduction of 'This server-only'.
2012-11-23 14:48:59 +01:00
noud 59bab3e1a4 correlation
sort Related Events decending on date and second on id.
2012-11-23 10:02:46 +01:00
noud 6cce4792b4 correlation
some correction so no missing correlation.
2012-11-23 08:56:43 +01:00
noud ab8fd6b9f2 correlation
respect the latest added 'This server-only'.
2012-11-22 15:55:22 +01:00
noud 00fe39cc25 RBAC
respect setting for edit attribute.
2012-11-22 15:54:28 +01:00
noud c3c8c1e771 RBAC
respect setting for edit event.
2012-11-22 14:48:29 +01:00