MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
474 Commits
35 Branches
366 Tags
190 MiB
Commit Graph

224 Commits (b99d5684334cf063e41b53d61e544141eee143ac)

Author SHA1 Message Date
noud b99d568433 correlation 
resolved comment typo.
 2012-11-14 08:29:05 +01:00
noud 723ef6c3d1 correlation 
respect distribution Org in correlations.
(for this
add correlations.1_private conform MYSQL.correlaton.sql
and
AppController::generateCorrelation() must be run)
 2012-11-13 14:13:38 +01:00
noud 8eb56ebc43 RBAC 
AttributesController::edit() know's it's own attribute now for RBAC
check.
 2012-11-09 14:33:54 +01:00
noud 1183437606 correlation 
respect distribution Org only.
 2012-11-09 13:42:15 +01:00
noud dd979f7325 sync 
make pull work on an event with just one attribute.
 2012-11-09 13:01:00 +01:00
noud 4cc6b8055f RBAC 
now should be okay on the checkGroup.
(mind, we have a PHP 5.3.10 (dev) and 5.2.10 (f.a.) difference.
for CakePHP should be php > 5.2.8, pear > 1.9.0 and phpunit 3.5.0)
 2012-11-08 15:28:21 +01:00
noud c722205ddf RBAC 
check if $user exists, if no, not logged in.
 2012-11-08 15:12:20 +01:00
noud 91f96427db RBAC 
//$user =
ClassRegistry::init('User')->findById($this->Auth->user('id'));
$this->loadModel('User');
$user = $this->User->findById($this->Auth->user('id'));
 2012-11-08 14:36:27 +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 f7c5127da2 RBAC 
change the “Requested Level of User Access” items
conform "draft of Terms-ofUse and Joining Instruction".‏
 2012-11-08 10:31:50 +01:00
noud 2785512268 distribution 
removed No push leftovers as a distribution.
 2012-11-07 15:41:50 +01:00
noud d55f226275 distribution 
now attributes do work same for pull like push.
 2012-11-05 12:49:51 +01:00
noud 29c966810e distribution 
let pull behave same way as a push in regard to distribution.
 2012-11-05 10:24:50 +01:00
noud 6495787023 Audit log 
Following events are now being logged: 
1. Adding a new user.
2. Deleting a user.
 2012-10-31 15:34:43 +01:00
noud 1c3ca8909b Users 
invited by filled.
 2012-10-31 10:00:01 +01:00
noud 582dbb0f7b Audit log 
Search logs and paging now works as expected (conform search
attributes).
 2012-10-31 08:16:37 +01:00
noud 49cf9400aa NIDS 
Unpublished events with an attribute flagged for IDS signature will
create an IDS signature (should be published only).
 2012-10-30 16:03:58 +01:00
noud f3066ddbf8 minor 
cleanup of groups, logs and whitelists views.
 2012-10-30 15:01:59 +01:00
noud f82c3f5f0c dropdowns 
let the risk dropdown in event add and edit behave like the other
dropdowns.
 2012-10-30 12:54:04 +01:00
noud 8d986601b9 dropdowns 
no space in edit Attribute categories dropdown.
 2012-10-30 11:12:25 +01:00
noud 2b24b36639 (internationalization) 
setFlash using __(), so transletable lateron.
 2012-10-30 09:13:35 +01:00
noud 39abe9e589 Distribution 
distribution changes conform func.spec.
 2012-10-29 16:49:04 +01:00
noud f56cb25bed Merge branch 'master' into develop 2012-10-25 15:23:22 +02:00
noud 05085533de blackhole 
full out-commented.
 2012-10-25 15:16:19 +02:00
Andrzej Dereszowski a4eca35c0e Fixed lost JS helper in EventsController 2012-10-25 11:47:04 +02:00
noud 8bc1b767ef GFI Sandbox 
Replace Windows specific info in a $string with environment variables en
registry keys.
 2012-10-25 10:14:40 +02:00
noud fa86316747 blackhole 
revert the commit, this screws CSRF
(thanks to Christophe for noticing)
 2012-10-24 17:16:12 +02:00
noud 3c02cccf30 dropdowns 
undo better optgroup support in dropdown in Attribute::add()
and just remove the not usable empty category.
 2012-10-24 11:38:29 +02:00
noud 944cfb1348 dropdowns 
better optgroup support in dropdown in Attribute::add().
 2012-10-24 11:22:18 +02:00
noud 0232148631 dropdowns 
better optgroup support in dropdowns where 'ALL' or '' is used
in Search Attributes and Search Logs.
 2012-10-24 10:42:32 +02:00
noud 23cce1e2db Correlation. 
to overcome a possible error on empty correlations.
 2012-10-23 17:28:56 +02:00
noud 9790c4b60f Crypt_GPG 
small comment about debug and
small note in readme about file rights.
 2012-10-23 17:27:50 +02:00
noud cb677105b1 blackhole 
add component security to GroupsController.
 2012-10-23 15:00:48 +02:00
noud 1b570b9183 Pulldowns 
removed the select optgroup.
 2012-10-23 14:58:50 +02:00
noud fb38f0ca92 GFI Sandbox 
regexp replacement of usernames.
 2012-10-23 12:05:40 +02:00
noud 4b096fa584 distribution 
changes and cleanup.
 2012-10-23 11:28:39 +02:00
noud 1f428e4aa5 Wording change 
so this works.
 2012-10-22 16:39:33 +02:00
Andrzej Dereszowski 25e63dda68 Wording change 
Changed Private column to Distribution + some minor vocabulary changes.
 2012-10-22 16:29:08 +02:00
noud e300ab7ffa Merge branch 'master' of ssh://misp.ncirc.nato.int/home/git/cydefsig.git 2012-10-22 15:14:33 +02:00
noud 833f6d074f Correlation. 
to overcome a possible error on empty correlations.
 2012-10-19 15:04:31 +02:00
noud 0d65adc9d5 Merge branch 'master' into develop 2012-10-19 13:31:19 +02:00
noud 897732cd46 Crypt_GPG 
small comment about debug and
small note in readme about file rights.
 2012-10-19 13:17:56 +02:00
noud 7077d1e8d4 GFI sandbox. 
better representation of a downloadable attribute
in a link (just href the file name, not including the path).
 2012-10-19 10:04:20 +02:00
noud eae89d95cd Private. 
Add "Pull only" as a sharing state where,
everybody does see an event, is pullable,
but will never be pushed.

Has a generatePrivate for db conversion now.
 2012-10-18 11:40:12 +02:00
noud 67e50cb612 Private 
Private events are true private and
running a server in 2 modes (private and sync),
so real private (red) or private to server (amber)
or full distributable (green).

Mind this needs a change to tables events, attributes and correlation.
These are in MYSQL.private.sql.
 2012-10-17 14:45:26 +02:00
noud bf4e46da8f Merge branch 'master' into develop 2012-10-17 13:26:16 +02:00
noud 899ef6300b blackhole 
i have an idea this blackholeCallback seems to overcome a lot of
blackhole situations we got.
Notably during deleting multiple events from the index,
this improved not getting a blackhole a lot.
 2012-10-17 13:00:50 +02:00
noud 5bef441aba GFI Sandbox 2012-10-17 10:42:09 +02:00
noud 7bf0e2f882 Groups 
Do not delete group if there is still Users as children.
 2012-10-10 10:53:52 +02:00
noud 870372fb07 Merge branch 'master' into develop 
Conflicts:
	app/Config/bootstrap.php
 2012-10-10 08:37:12 +02:00