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

252 Commits (957b3e27b82c7e04634b97e87fdc31c34fcf6786)

Author SHA1 Message Date
noud 957b3e27b8 Merge branch 'master' into develop 
Conflicts:
	app/Controller/ServersController.php
 2012-11-20 11:01:18 +01:00
noud 8b3903cde6 sync 
push from v2 to v1.
 2012-11-20 09:54:54 +01:00
noud 7c878af986 terms 
slight better formulated AppController::beforeFilter()
 2012-11-20 08:42:32 +01:00
noud 7a0068936a terms 
slight better formulated AppController::beforeFilter()
 2012-11-19 15:40:26 +01:00
noud b2c268845f code standards 
respect code standards.
 2012-11-19 14:49:38 +01:00
noud 52c9114694 sync 
array correction done so no 2 kinda the same tests during pull.
 2012-11-19 13:42:41 +01:00
noud 8f70b7ce9e sync 
sync attributes on pull.
 2012-11-19 09:13:08 +01:00
noud d3cf89660b sync 
conform the new distribution.
pull on events works too.
 2012-11-19 09:02:43 +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 5d37e93eb6 code 
have the distribution description in one place, just the model.
 2012-11-16 11:43:47 +01:00
noud 2d3132ef53 code 
removed small double code.
 2012-11-16 10:11:52 +01:00
noud 247525ccbf sync (publish) 
Event publish button in events index and event view does
report push failure(s) if any remote server is down.
 2012-11-16 10:09:04 +01:00
noud fdd999ef35 correlation 
fixed correlations being double accounted.
 2012-11-15 15:53:07 +01:00
noud 4f234d1d46 terms 
take 2, for a user must accept terms.
 2012-11-15 13:50:20 +01:00
noud 8d2e665ceb terms 
reverted just done commit
(Can't use method return value in write context ).
 2012-11-15 13:24:34 +01:00
noud 8125c0c938 terms 
check for user logged in (if not a server looks total stalled).
 2012-11-15 13:23:08 +01:00
noud 7a96c66b49 whitelist 
cleanup whitelist.
 2012-11-15 09:31:34 +01:00
noud ea0ab59e4f code standards 
corrections toward code standards.
 2012-11-14 17:16:36 +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 c599c2c23e GFI Sandbox 
files having size 0 are not md5 summed in CakePHP.
 2012-11-14 15:12:19 +01:00
noud 3a84ffb59f terms 
user must accept terms.
 2012-11-14 10:52:53 +01:00
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
Andrzej Dereszowski 00d1958b86 Merge branch 'master' of /home/git/cydefsig 
Conflicts:
	app/Controller/AppController.php
 2012-11-09 14:58:01 +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
Christophe Vandeplas 68b038a29a fixes bug where no email alert is sent when event is added using API 
(and published)
 2012-11-08 11:11:02 +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
Christophe Vandeplas 8b6c212bf4 fixes bug when alerting and a single gpg key is giving problems 2012-10-30 12:41:19 +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