diff --git a/app/Controller/EventsController.php b/app/Controller/EventsController.php index 9d2c7c407..d268c64e3 100755 --- a/app/Controller/EventsController.php +++ b/app/Controller/EventsController.php @@ -117,6 +117,10 @@ class EventsController extends AppController { if (!$v) continue 2; $this->paginate['conditions'][] = array('Event.date' . ' <' => $v); break; + case 'org' : + if (!$v) continue 2; + $this->paginate['conditions'][] = array('Event.orgc' . ' =' => $v); + break; default: if (!$v) continue 2; $this->paginate['conditions'][] = array('Event.' . substr($k, 6) . ' LIKE' => '%' . $v . '%'); diff --git a/app/View/Events/index.ctp b/app/View/Events/index.ctp index faa3e2922..c2087d9d2 100755 --- a/app/View/Events/index.ctp +++ b/app/View/Events/index.ctp @@ -1,5 +1,6 @@ passedArgs['searchinfo'])) $this->passedArgs['searchinfo'] = '';?> passedArgs['searchorgc'])) $this->passedArgs['searchorgc'] = '';?> +passedArgs['searchorg'])) $this->passedArgs['searchorg'] = '';?> passedArgs['searchDatefrom'])) $this->passedArgs['searchDatefrom'] = '';?> passedArgs['searchDateuntil'])) $this->passedArgs['searchDateuntil'] = '';?>
@@ -93,6 +94,14 @@ } else { ?> Paginator->sort('org'); ?> +
+ Form->input('searchorg', array( + 'value' => $this->passedArgs['searchorg'], + 'label' => '', + 'class' => 'input-mini')); + ?> + Add user

Listing all users:

To list all current users of the system, just click on List Users under the administration menu to the left. A view will be loaded with a list of all users and the following columns of information:
List users

Editing a user:

To add a new user, click on the New User button in the administration menu to the left and fill out the following fields in the view that is loaded:

Contacting a user:

Site admins can use the "Contact users" feature to send all or an individual user an e-mail. Users that have a PGP key set will receive their e-mails encrypted. When clicking this button on the left, you'll be presented with a form that allows you to specify the type of the e-mail, who it should reach and what the content is using the following options:
Contact
Keep in mind that all e-mails sent through this system will, in addition to your own message, will be signed in the name of the instance's host organisation's support team, will include the e-mail address of the instance's support (if the contact field is set in the bootstrap file), and will include the instance's PGP signature for users that have a PGP key set (and thus are eligible for an encrypted e-mail).

Managing the roles

Privileges are assigned to users by assigning them to rule groups, which use one of four options determining what they can do with events and four additional privilege elevating settings. The four options for event manipulation are: Read Only, Manage My Own Events, Manage Organisation Events, Manage & Publish Organisation Events. The extra privileges are admin, sync, authentication key usage and audit permission
-Read Only: This allows the user to browse events that his organisation has access to, but doesn't allow any changes to be made to the database.
-Manage My Own Events: The second option, gives its users rights to create, modify or delete their own events, but they cannot publish them.
-Manage Organization Events: allows users to create events or modify and delete events created by a member of their organisation.
-Manage & Publish Organisation Events: This last setting, gives users the right to do all of the above and also to publish the events of their organisation.
-Perm sync: This setting allows the users of the role to be used as a synchronisation user. The authentication key of this user can be handed out to the administrator of a remote MISP instance to allow the synchronisation features to work.
-Perm admin: Gives the user administrator privileges, this setting is used for the organisation admins.
-Perm audit: Grants access to the logs. With the exception of site admins, only logs generated by the user's own org are visible.
-Perm auth: This setting enables the authentication key of the role's users to be used for rest requests.
+Read Only: This allows the user to browse events that his organisation has access to, but doesn't allow any changes to be made to the database.
+Manage My Own Events: The second option, gives its users rights to create, modify or delete their own events, but they cannot publish them.
+Manage Organization Events: allows users to create events or modify and delete events created by a member of their organisation.
+Manage & Publish Organisation Events: This last setting, gives users the right to do all of the above and also to publish the events of their organisation.
+Perm sync: This setting allows the users of the role to be used as a synchronisation user. The authentication key of this user can be handed out to the administrator of a remote MISP instance to allow the synchronisation features to work.
+Perm admin: Gives the user administrator privileges, this setting is used for the organisation admins.
+Perm audit: Grants access to the logs. With the exception of site admins, only logs generated by the user's own org are visible.
+Perm auth: This setting enables the authentication key of the role's users to be used for rest requests.

Creating roles:

When creating a new role, you will have to enter a name for the role to be created and set up the permissions (as described above) using the radio toggle and the four check-boxes.

Listing roles:

@@ -121,26 +121,26 @@ By clicking on the List Roles button, you can view a list of all the currently r Users with audit permissions are able to browse or search the logs that MISP automatically appends each time certain actions are taken (actions that modify data or if a user logs in and out).
Generally, the following actions are logged:

Browsing the logs:

Listing all the log entries will show the following columns generated by the users of your organisation (or all organisations in the case of site admins):
List logs
\ No newline at end of file diff --git a/app/View/Pages/documentation.ctp b/app/View/Pages/documentation.ctp index f18050d6a..fc7d85796 100644 --- a/app/View/Pages/documentation.ctp +++ b/app/View/Pages/documentation.ctp @@ -55,22 +55,22 @@
Sync Actions
Administration
Audit

The left bar

This bar changes based on each page-group. The blue selection shows you what page you are on.

diff --git a/app/View/ShadowAttributes/edit.ctp b/app/View/ShadowAttributes/edit.ctp new file mode 100644 index 000000000..beeca67fe --- /dev/null +++ b/app/View/ShadowAttributes/edit.ctp @@ -0,0 +1,173 @@ +
+Form->create('ShadowAttribute');?> +
+ + Form->input('id'); + echo $this->Form->input('category', array( + 'empty' => '(choose one)', + 'div' => 'input', + )); + if (!$attachment) { + echo $this->Form->input('type', array( + 'empty' => '(first choose category)' + )); + } + ?> +
+ Form->input('value', array( + 'type' => 'textarea', + 'error' => array('escape' => false), + 'class' => 'input-xxlarge clear' + )); + ?> +
+ Form->input('batch_import', array( + 'type' => 'checkbox', + )); + echo $this->Form->input('to_ids', array( + 'checked' => true, + 'label' => 'IDS Signature?', + )); + // link an onchange event to the form elements + $this->Js->get('#ShadowAttributeCategory')->event('change', 'formCategoryChanged("#ShadowAttributeCategory")'); + $this->Js->get('#ShadowAttributeType')->event('change', 'showFormInfo("#ShadowAttributeType")'); + ?> +
+Form->button('Propose', array('class' => 'btn btn-primary')); + echo $this->Form->end(); +?> +
+
+ +
+ + +Js->writeBuffer(); // Write cached scripts \ No newline at end of file diff --git a/app/webroot/img/doc/publish.png b/app/webroot/img/doc/publish.png index 11a1ffc72..7d07521f4 100644 Binary files a/app/webroot/img/doc/publish.png and b/app/webroot/img/doc/publish.png differ