From 0abc658221eb396212a219c29a764a4134e86bc3 Mon Sep 17 00:00:00 2001 From: iglocska Date: Wed, 29 May 2013 16:53:01 +0200 Subject: [PATCH 01/13] Named pipes and mutex - added the 2 types under the artifacts dropped category --- app/Model/Attribute.php | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/app/Model/Attribute.php b/app/Model/Attribute.php index d8a192f6b..0b36fc48b 100755 --- a/app/Model/Attribute.php +++ b/app/Model/Attribute.php @@ -134,7 +134,9 @@ class Attribute extends AppModel { 'link' => array('desc' => 'Link to an external information'), 'comment' => array('desc' => 'Comment or description in a human language', 'formdesc' => 'Comment or description in a human language.
This will not be correlated with other attributes (NOT IMPLEMENTED YET)'), 'text' => array('desc' => 'Name, ID or a reference'), - 'other' => array('desc' => 'Other attribute') + 'other' => array('desc' => 'Other attribute'), + 'named pipe' => array('desc' => 'Named pipe, use the format \\.\pipe\'), + 'mutex' => array('desc' => 'Mutex, use the format \BaseNamedObjects\'), ); // definitions of categories @@ -155,7 +157,7 @@ class Attribute extends AppModel { ), 'Artifacts dropped' => array( 'desc' => 'Any artifact (files, registry keys etc.) dropped by the malware or other modifications to the system', - 'types' => array('md5', 'sha1', 'filename', 'filename|md5', 'filename|sha1', 'regkey', 'regkey|value', 'pattern-in-file', 'pattern-in-memory', 'yara', 'attachment', 'malware-sample', 'comment', 'text', 'other') + 'types' => array('md5', 'sha1', 'filename', 'filename|md5', 'filename|sha1', 'regkey', 'regkey|value', 'pattern-in-file', 'pattern-in-memory', 'yara', 'attachment', 'malware-sample', 'comment', 'text', 'other', 'named pipe', 'mutex') ), 'Payload installation' => array( 'desc' => 'Info on where the malware gets installed in the system', @@ -691,6 +693,16 @@ class Attribute extends AppModel { $returnValue = 'Invalid format. Expected: CVE-xxxx-xxxx.'; } break; + case 'named pipe': + if (preg_match('#^(\\\\\\\\.\\\\pipe\\\\)#', $value) && !preg_match("#\n#", $value)) { + $returnValue = true; + } + break; + case 'mutex': + if (preg_match('#^(\\\\BaseNamedObjects\\\\)#', $value) && !preg_match("#\n#", $value)) { + $returnValue = true; + } + break; case 'AS': case 'snort': case 'pattern-in-file': From bd444d3ed8bf63cf15c2e430fed011d59c5703f2 Mon Sep 17 00:00:00 2001 From: iglocska Date: Thu, 30 May 2013 14:01:55 +0200 Subject: [PATCH 02/13] Logos shown in memberslist --- app/View/Users/memberslist.ctp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/View/Users/memberslist.ctp b/app/View/Users/memberslist.ctp index 5990adb7d..058ed742f 100755 --- a/app/View/Users/memberslist.ctp +++ b/app/View/Users/memberslist.ctp @@ -4,13 +4,18 @@ Organisation # of members + Logo     - + + Html->image('orgs/' . h($org['User']['org']) . '.png', array('alt' => h($org['User']['org']),'width' => '48','hight' => '48'));?>  From 0d66ef931a95735ceaa5d56f9d683de37c32f264 Mon Sep 17 00:00:00 2001 From: Christophe Vandeplas Date: Thu, 6 Jun 2013 16:36:28 +0200 Subject: [PATCH 03/13] UI tooltip love --- app/View/Attributes/add.ctp | 61 +++++++++++++----------- app/View/Attributes/edit.ctp | 78 ++++++++++++++++--------------- app/View/Attributes/index.ctp | 13 +++++- app/View/Attributes/search.ctp | 55 ++++++++++------------ app/View/Elements/global_menu.ctp | 2 +- app/View/Events/add.ctp | 42 ++++++++--------- app/View/Events/edit.ctp | 49 ++++++++----------- app/View/Events/view.ctp | 41 +++++++++++----- 8 files changed, 177 insertions(+), 164 deletions(-) diff --git a/app/View/Attributes/add.ctp b/app/View/Attributes/add.ctp index 286f7babd..ddea58463 100755 --- a/app/View/Attributes/add.ctp +++ b/app/View/Attributes/add.ctp @@ -5,18 +5,15 @@ Form->hidden('event_id'); echo $this->Form->input('category', array( - 'after' => $this->Html->div('forminfo', '', array('id' => 'AttributeCategoryDiv')), 'empty' => '(choose one)' )); echo $this->Form->input('type', array( - 'after' => $this->Html->div('forminfo', '', array('id' => 'AttributeTypeDiv')), 'empty' => '(first choose category)' )); if ('true' == Configure::read('CyDefSIG.sync')) { echo $this->Form->input('distribution', array( 'label' => 'Distribution', 'selected' => $maxDist, - 'after' => $this->Html->div('forminfo', '', array('id' => 'AttributeDistributionDiv')) )); } echo $this->Form->input('value', array( @@ -30,18 +27,16 @@ Form->input('to_ids', array( 'checked' => true, - 'after' => $this->Html->div('forminfo', isset($attrDescriptions['signature']['formdesc']) ? $attrDescriptions['signature']['formdesc'] : $attrDescriptions['signature']['desc']), + 'data-content' => isset($attrDescriptions['signature']['formdesc']) ? $attrDescriptions['signature']['formdesc'] : $attrDescriptions['signature']['desc'], 'label' => 'IDS Signature?', )); echo $this->Form->input('batch_import', array( 'type' => 'checkbox', - 'after' => $this->Html->div('forminfo', 'Create multiple attributes one per line'), + 'data-content' => 'Create multiple attributes one per line', )); // link an onchange event to the form elements $this->Js->get('#AttributeCategory')->event('change', 'formCategoryChanged("#AttributeCategory")'); - $this->Js->get('#AttributeType')->event('change', 'showFormInfo("#AttributeType")'); - $this->Js->get('#AttributeDistribution')->event('change', 'showFormInfo("#AttributeDistribution")'); ?> Form->end();
  • Html->link('View Event', array('controller' => 'events', 'action' => 'view', $this->request->data['Attribute']['event_id'])); ?>
    • -
  • Html->link('Edit Event', array('controller' => 'events', 'action' => 'edit', $this->request->data['Attribute']['event_id'])); ?>
  • Form->postLink('Delete Event', array('controller' => 'events', 'action' => 'delete', $this->request->data['Attribute']['event_id']), null, __('Are you sure you want to delete # %s?', $this->request->data['Attribute']['event_id'])); ?>
  • Html->link('Add Attribute', array('controller' => 'attributes', 'action' => 'add', $this->request->data['Attribute']['event_id']));?>
  • Html->link('Add Attachment', array('controller' => 'attributes', 'action' => 'add_attachment', $this->request->data['Attribute']['event_id']));?>
  • Html->link('Populate event from IOC', array('controller' => 'events', 'action' => 'addIOC', $this->request->data['Attribute']['event_id']));?>
    • - -
  • Html->link('Propose Attribute', array('controller' => 'shadow_attributes', 'action' => 'add', $this->request->data['Attribute']['event_id']));?>
    • -
  • Html->link('Propose Attachment', array('controller' => 'shadow_attributes', 'action' => 'add_attachment', $this->request->data['Attribute']['event_id']));?>
    • -
  • Html->link(__('Contact reporter', true), array('controller' => 'events', 'action' => 'contact', $this->request->data['Attribute']['event_id'])); ?>
  • Html->link(__('Download as XML', true), array('controller' => 'events', 'action' => 'xml', 'download', $this->request->data['Attribute']['event_id'])); ?>
    • @@ -94,7 +84,6 @@ foreach ($categoryDefinitions as $category => $def) { ?> function formCategoryChanged(id) { - showFormInfo(id); // display the tooltip // fill in the types var options = $('#AttributeType').prop('options'); $('option', $('#AttributeType')).remove(); @@ -125,23 +114,39 @@ foreach ($distributionDescriptions as $type => $def) { } ?> -function showFormInfo(id) { - idDiv = id+'Div'; - // LATER use nice animations - //$(idDiv).hide('fast'); - // change the content - var value = $(id).val(); // get the selected value - $(idDiv).html(formInfoValues[value]); // search in a lookup table +$(document).ready(function() { - // show it again - $(idDiv).fadeIn('slow'); -} + $("#AttributeType, #AttributeCategory, #Attribute, #AttributeDistribution").on('mouseleave', function(e) { + $('#'+e.currentTarget.id).popover('destroy'); + }); + + $("#AttributeType, #AttributeCategory, #Attribute, #AttributeDistribution").on('mouseover', function(e) { + var $e = $(e.target); + if ($e.is('option')) { + $('#'+e.currentTarget.id).popover('destroy'); + $('#'+e.currentTarget.id).popover({ + trigger: 'manual', + placement: 'right', + content: formInfoValues[$e.val()], + }).popover('show'); + } + }); + + $("input, label").on('mouseleave', function(e) { + $('#'+e.currentTarget.id).popover('destroy'); + }); + + $("input, label").on('mouseover', function(e) { + var $e = $(e.target); + $('#'+e.currentTarget.id).popover('destroy'); + $('#'+e.currentTarget.id).popover({ + trigger: 'manual', + placement: 'right', + }).popover('show'); + }); + +}); -// hide the formInfo things -$('#AttributeTypeDiv').hide(); -$('#AttributeCategoryDiv').hide(); -$('#AttributeType').prop('disabled', true); -$('#AttributeDistributionDiv').hide(); diff --git a/app/View/Attributes/edit.ctp b/app/View/Attributes/edit.ctp index 8d6b7ce7f..2af50a5e7 100755 --- a/app/View/Attributes/edit.ctp +++ b/app/View/Attributes/edit.ctp @@ -1,6 +1,3 @@ -
    Form->create('Attribute');?>
    @@ -8,18 +5,15 @@ $mayModify = (($isAclModify && $attribute['Event']['user_id'] == $me['id']) || ( Form->hidden('event_id'); echo $this->Form->input('category', array( - 'after' => $this->Html->div('forminfo', '', array('id' => 'AttributeCategoryDiv')), 'empty' => '(choose one)' )); echo $this->Form->input('type', array( - 'after' => $this->Html->div('forminfo', '', array('id' => 'AttributeTypeDiv')), 'empty' => '(first choose category)' )); - if ('true' == Configure::read('CyDefSIG.sync')) { + if ('true' == Configure::read('CyDefSIG.sync') && $canEditDist) { echo $this->Form->input('distribution', array( 'label' => 'Distribution', 'selected' => $maxDist, - 'after' => $this->Html->div('forminfo', '', array('id' => 'AttributeDistributionDiv')) )); } echo $this->Form->input('value', array( @@ -33,18 +27,16 @@ $mayModify = (($isAclModify && $attribute['Event']['user_id'] == $me['id']) || ( Form->input('to_ids', array( 'checked' => true, - 'after' => $this->Html->div('forminfo', isset($attrDescriptions['signature']['formdesc']) ? $attrDescriptions['signature']['formdesc'] : $attrDescriptions['signature']['desc']), + 'data-content' => isset($attrDescriptions['signature']['formdesc']) ? $attrDescriptions['signature']['formdesc'] : $attrDescriptions['signature']['desc'], 'label' => 'IDS Signature?', )); echo $this->Form->input('batch_import', array( 'type' => 'checkbox', - 'after' => $this->Html->div('forminfo', 'Create multiple attributes one per line'), + 'data-content' => 'Create multiple attributes one per line', )); // link an onchange event to the form elements $this->Js->get('#AttributeCategory')->event('change', 'formCategoryChanged("#AttributeCategory")'); - $this->Js->get('#AttributeType')->event('change', 'showFormInfo("#AttributeType")'); - $this->Js->get('#AttributeDistribution')->event('change', 'showFormInfo("#AttributeDistribution")'); ?>
    Form->end();
    • Html->link('View Event', array('controller' => 'events', 'action' => 'view', $this->request->data['Attribute']['event_id'])); ?>
      • -
    • Html->link('Edit Event', array('controller' => 'events', 'action' => 'edit', $this->request->data['Attribute']['event_id'])); ?>
    • Form->postLink('Delete Event', array('controller' => 'events', 'action' => 'delete', $this->request->data['Attribute']['event_id']), null, __('Are you sure you want to delete # %s?', $this->request->data['Attribute']['event_id'])); ?>
    • Html->link('Add Attribute', array('controller' => 'attributes', 'action' => 'add', $this->request->data['Attribute']['event_id']));?>
    • Html->link('Add Attachment', array('controller' => 'attributes', 'action' => 'add_attachment', $this->request->data['Attribute']['event_id']));?>
    • Html->link('Populate event from IOC', array('controller' => 'events', 'action' => 'addIOC', $this->request->data['Attribute']['event_id']));?>
      • - -
    • Html->link('Propose Attribute', array('controller' => 'shadow_attributes', 'action' => 'add', $this->request->data['Attribute']['event_id']));?>
      • -
    • Html->link('Propose Attachment', array('controller' => 'shadow_attributes', 'action' => 'add_attachment', $this->request->data['Attribute']['event_id']));?>
      • -
    • Html->link(__('Contact reporter', true), array('controller' => 'events', 'action' => 'contact', $this->request->data['Attribute']['event_id'])); ?>
    • Html->link(__('Download as XML', true), array('controller' => 'events', 'action' => 'xml', 'download', $this->request->data['Attribute']['event_id'])); ?>
      • @@ -96,7 +83,6 @@ foreach ($categoryDefinitions as $category => $def) { ?> function formCategoryChanged(id) { - showFormInfo(id); // display the tooltip // fill in the types var options = $('#AttributeType').prop('options'); $('option', $('#AttributeType')).remove(); @@ -121,32 +107,48 @@ foreach ($categoryDefinitions as $category => $def) { $info = isset($def['formdesc']) ? $def['formdesc'] : $def['desc']; echo "formInfoValues['" . addslashes($category) . "'] = \"" . addslashes($info) . "\";\n"; // as we output JS code we need to add slashes } -foreach ($distributionDescriptions as $type => $def) { - $info = isset($def['formdesc']) ? $def['formdesc'] : $def['desc']; - echo "formInfoValues['" . addslashes($type) . "'] = \"" . addslashes($info) . "\";\n"; // as we output JS code we need to add slashes +if ($canEditDist) { + foreach ($distributionDescriptions as $type => $def) { + $info = isset($def['formdesc']) ? $def['formdesc'] : $def['desc']; + echo "formInfoValues['" . addslashes($type) . "'] = \"" . addslashes($info) . "\";\n"; // as we output JS code we need to add slashes + } } ?> -function showFormInfo(id) { - idDiv = id+'Div'; - // LATER use nice animations - //$(idDiv).hide('fast'); - // change the content - var value = $(id).val(); // get the selected value - $(idDiv).html(formInfoValues[value]); // search in a lookup table +$(document).ready(function() { + + $("#AttributeType, #AttributeCategory, #Attribute, #AttributeDistribution").on('mouseleave', function(e) { + $('#'+e.currentTarget.id).popover('destroy'); + }); + + $("#AttributeType, #AttributeCategory, #Attribute, #AttributeDistribution").on('mouseover', function(e) { + var $e = $(e.target); + if ($e.is('option')) { + $('#'+e.currentTarget.id).popover('destroy'); + $('#'+e.currentTarget.id).popover({ + trigger: 'manual', + placement: 'right', + content: formInfoValues[$e.val()], + }).popover('show'); + } + }); + + $("input, label").on('mouseleave', function(e) { + $('#'+e.currentTarget.id).popover('destroy'); + }); + + $("input, label").on('mouseover', function(e) { + var $e = $(e.target); + $('#'+e.currentTarget.id).popover('destroy'); + $('#'+e.currentTarget.id).popover({ + trigger: 'manual', + placement: 'right', + }).popover('show'); + }); + +}); - // show it again - $(idDiv).fadeIn('slow'); -} -//hide the formInfo things -$('#AttributeTypeDiv').hide(); -$('#AttributeCategoryDiv').hide(); -$('#AttributeDistributionDiv').hide(); -// fix the select box based on what was selected -var type_value = $('#AttributeType').val(); -formCategoryChanged("#AttributeCategory"); -$('#AttributeType').val(type_value); Js->writeBuffer(); // Write cached scripts diff --git a/app/View/Attributes/index.ctp b/app/View/Attributes/index.ctp index 976d0b884..859762b58 100755 --- a/app/View/Attributes/index.ctp +++ b/app/View/Attributes/index.ctp @@ -145,4 +145,15 @@ endforeach;
    • Html->link('Automation', array('controller' => 'events', 'action' => 'automation')); ?>
    -
    \ No newline at end of file +
    + \ No newline at end of file diff --git a/app/View/Attributes/search.ctp b/app/View/Attributes/search.ctp index 6a21570e7..7d6f52557 100755 --- a/app/View/Attributes/search.ctp +++ b/app/View/Attributes/search.ctp @@ -16,9 +16,9 @@ Form->input('type', array( 'div' => 'input clear', - 'after' => $this->Html->div('forminfo', '', array('id' => 'AttributeTypeDiv')) )); - echo $this->Form->input('category', array('after' => $this->Html->div('forminfo', '', array('id' => 'AttributeCategoryDiv')))); + echo $this->Form->input('category', array( + )); ?> $def) { function formCategoryChanged(id) { var alreadySelected = $('#AttributeType').val(); - showFormInfo(id); // display the tooltip // empty the types document.getElementById("AttributeType").options.length = 1; // add new items to options @@ -112,15 +111,10 @@ function formCategoryChanged(id) { }); // enable the form element $('#AttributeType').prop('disabled', false); - if ("ALL" == $('#AttributeCategory').val()) { - //alert($('#AttributeCategory').val()); - $('#AttributeCategoryDiv').hide(); - } } function formTypeChanged(id) { var alreadySelected = $('#AttributeCategory').val(); - showFormInfo(id); // display the tooltip // empty the categories document.getElementById("AttributeCategory").options.length = 2; // add new items to options @@ -133,10 +127,6 @@ function formTypeChanged(id) { }); // enable the form element $('#AttributeCategory').prop('disabled', false); - if ("ALL" == $('#AttributeType').val()) { - //alert($('#AttributeType').val()); - $('#AttributeTypeDiv').hide(); - } } var formInfoValues = new Array(); @@ -151,33 +141,36 @@ foreach ($categoryDefinitions as $category => $def) { echo "formInfoValues['$category'] = \"$info\";\n"; } $this->Js->get('#AttributeCategory')->event('change', 'formCategoryChanged("#AttributeCategory")'); -$this->Js->get('#AttributeCategory')->event('change', 'showFormInfo("#AttributeCategory")'); $this->Js->get('#AttributeType')->event('change', 'formTypeChanged("#AttributeType")'); -$this->Js->get('#AttributeType')->event('change', 'showFormInfo("#AttributeType")'); ?> formInfoValues['ALL'] = ''; formInfoValues[''] = ''; -function showFormInfo(id) { - idDiv = id+'Div'; - if (("ALL" != $(id).val()) && ("" != $(id).val())) { - // LATER use nice animations - //$(idDiv).hide('fast'); - // change the content - var value = $(id).val(); // get the selected value - $(idDiv).html(formInfoValues[value]); // search in a lookup table - // show it again - $(idDiv).fadeIn('slow'); - } else { - $(idDiv).hide(); - } -} +$(document).ready(function() { + + $("#AttributeType, #AttributeCategory").on('mouseleave', function(e) { + $('#'+e.currentTarget.id).popover('destroy'); + }); + + $("#AttributeType, #AttributeCategory").on('mouseover', function(e) { + var $e = $(e.target); + if ($e.is('option')) { + $('#'+e.currentTarget.id).popover('destroy'); + $('#'+e.currentTarget.id).popover({ + trigger: 'manual', + placement: 'right', + content: formInfoValues[$e.val()], + }).popover('show'); + } + }); + + +}); + + -// hide the formInfo things -$('#AttributeTypeDiv').hide(); -$('#AttributeCategoryDiv').hide(); Js->writeBuffer(); // Write cached scripts ?> diff --git a/app/View/Elements/global_menu.ctp b/app/View/Elements/global_menu.ctp index 484c99d26..1e76de380 100755 --- a/app/View/Elements/global_menu.ctp +++ b/app/View/Elements/global_menu.ctp @@ -113,7 +113,7 @@
-
+
  • Html->link(__('Log out', true), array('controller' => 'users', 'action' => 'logout', 'plugin' => false)); ?>
diff --git a/app/View/Events/add.ctp b/app/View/Events/add.ctp index 3531fb20b..b8281a2e8 100755 --- a/app/View/Events/add.ctp +++ b/app/View/Events/add.ctp @@ -10,17 +10,14 @@ if ('true' == Configure::read('CyDefSIG.sync')) { echo $this->Form->input('distribution', array( 'label' => 'Distribution', - 'selected' => 'All communities', - 'after' => $this->Html->div('forminfo', '', array('id' => 'EventDistributionDiv')), + 'selected' => 'All communities' )); } echo $this->Form->input('risk', array( - 'after' => $this->Html->div('forminfo', '', array('id' => 'EventRiskDiv')), 'div' => 'input clear' )); echo $this->Form->input('analysis', array( 'options' => array($analysisLevels), - 'after' => $this->Html->div('forminfo', '', array('id' => 'EventAnalysisDiv')) )); echo $this->Form->input('info', array( 'div' => 'clear', @@ -29,13 +26,8 @@ echo $this->Form->input('Event.submittedgfi', array( 'label' => 'GFI sandbox', 'type' => 'file', - // 'between' => $this->Html->div('forminfo', isset($eventDescriptions['submittedgfi']['formdesc']) ? $eventDescriptions['submittedgfi']['formdesc'] : $eventDescriptions['submittedgfi']['desc']), 'div' => 'clear' )); - // link an onchange event to the form elements - $this->Js->get('#EventDistribution')->event('change', 'showFormInfo("#EventDistribution")'); - $this->Js->get('#EventRisk')->event('change', 'showFormInfo("#EventRisk")'); - $this->Js->get('#EventAnalysis')->event('change', 'showFormInfo("#EventAnalysis")'); ?> $def) { } ?> -function showFormInfo(id) { - idDiv = id+'Div'; - // LATER use nice animations - //$(idDiv).hide('fast'); - // change the content - var value = $(id).val(); // get the selected value - $(idDiv).html(formInfoValues[value]); // search in a lookup table - // show it again - $(idDiv).fadeIn('slow'); -} +$(document).ready(function() { + + $("#EventAnalysis, #EventRisk, #EventDistribution").on('mouseleave', function(e) { + $('#'+e.currentTarget.id).popover('destroy'); + }); + + $("#EventAnalysis, #EventRisk, #EventDistribution").on('mouseover', function(e) { + var $e = $(e.target); + if ($e.is('option')) { + $('#'+e.currentTarget.id).popover('destroy'); + $('#'+e.currentTarget.id).popover({ + trigger: 'manual', + placement: 'right', + content: formInfoValues[$e.val()], + }).popover('show'); + } + }); +}); -// hide the formInfo things -$('#EventDistributionDiv').hide(); -$('#EventRiskDiv').hide(); -$('#EventAnalysisDiv').hide(); Js->writeBuffer(); diff --git a/app/View/Events/edit.ctp b/app/View/Events/edit.ctp index 54f5f5e70..ed892c9a6 100755 --- a/app/View/Events/edit.ctp +++ b/app/View/Events/edit.ctp @@ -13,29 +13,20 @@ if ('true' == Configure::read('CyDefSIG.sync')) { echo $this->Form->input('distribution', array( 'label' => 'Distribution', 'selected' => 'All communities', - 'after' => $this->Html->div('forminfo', '', array('id' => 'EventDistributionDiv')), )); } } echo $this->Form->input('risk', array( - 'after' => $this->Html->div('forminfo', '', array('id' => 'EventRiskDiv')), 'div' => 'input clear' )); echo $this->Form->input('analysis', array( 'options' => array($analysisLevels), - 'after' => $this->Html->div('forminfo', '', array('id' => 'EventAnalysisDiv')) )); echo $this->Form->input('info', array( 'div' => 'clear', 'class' => 'input-xxlarge' )); -// link an onchange event to the form elements -if ('true' == $canEditDist) { - $this->Js->get('#EventDistribution')->event('change', 'showFormInfo("#EventDistribution")'); -} -$this->Js->get('#EventRisk')->event('change', 'showFormInfo("#EventRisk")'); -$this->Js->get('#EventAnalysis')->event('change', 'showFormInfo("#EventAnalysis")'); ?> Form->end();
  • Html->link('View Event', array('action' => 'view', $this->request->data['Event']['id'])); ?>
    • - +
  • Html->link('Edit Event', array('action' => 'edit', $this->request->data['Event']['id'])); ?>
  • Form->postLink('Delete Event', array('action' => 'delete', $this->request->data['Event']['id']), null, __('Are you sure you want to delete # %s?', $this->request->data['Event']['id'])); ?>
  • Html->link('Add Attribute', array('controller' => 'attributes', 'action' => 'add', $this->request->data['Event']['id']));?>
  • Html->link('Add Attachment', array('controller' => 'attributes', 'action' => 'add_attachment', $this->request->data['Event']['id']));?>
  • Html->link('Populate event from IOC', array('controller' => 'events', 'action' => 'addIOC', $this->request->data['Event']['id']));?>
    • - -
  • Html->link('Propose Attribute', array('controller' => 'shadow_attributes', 'action' => 'add', $this->request->data['Event']['id']));?>
    • -
  • Html->link('Propose Attachment', array('controller' => 'shadow_attributes', 'action' => 'add_attachment', $this->request->data['Event']['id']));?>
    • -
  • request->data['Event']['published'] && ($isAdmin || $mayPublish)): ?>
  • Form->postLink('Publish Event', array('action' => 'alert', $this->request->data['Event']['id']), null, 'Are you sure this event is complete and everyone should be informed?'); ?>
    • @@ -101,22 +88,24 @@ foreach ($analysisDescriptions as $type => $def) { } ?> -function showFormInfo(id) { - idDiv = id+'Div'; - // LATER use nice animations - //$(idDiv).hide('fast'); - // change the content - var value = $(id).val(); // get the selected value - $(idDiv).html(formInfoValues[value]); // search in a lookup table - // show it again - $(idDiv).fadeIn('slow'); -} +$(document).ready(function() { + + $("#EventAnalysis, #EventRisk, #EventDistribution").on('mouseleave', function(e) { + $('#'+e.currentTarget.id).popover('destroy'); + }); + + $("#EventAnalysis, #EventRisk, #EventDistribution").on('mouseover', function(e) { + var $e = $(e.target); + if ($e.is('option')) { + $('#'+e.currentTarget.id).popover('destroy'); + $('#'+e.currentTarget.id).popover({ + trigger: 'manual', + placement: 'right', + content: formInfoValues[$e.val()], + }).popover('show'); + } + }); +}); -// hide the formInfo things -if ('true' == $canEditDist) { - $('#EventDistributionDiv').hide(); -} -$('#EventRiskDiv').hide(); -$('#EventAnalysisDiv').hide(); Js->writeBuffer(); \ No newline at end of file diff --git a/app/View/Events/view.ctp b/app/View/Events/view.ctp index 5aca97a30..4c0ec7de3 100755 --- a/app/View/Events/view.ctp +++ b/app/View/Events/view.ctp @@ -84,12 +84,12 @@ $mayPublish = ($isAclPublish && $event['Event']['orgc'] == $me['org']);   - >Risk +
    Risk
     
    - >Analysis +
    Analysis
      @@ -105,7 +105,7 @@ $mayPublish = ($isAclPublish && $event['Event']['orgc'] == $me['org']);  
    Published
    -
    +
     
    @@ -155,16 +155,23 @@ if (!empty($event['Attribute'])):?> if (count($attribute['ShadowAttribute'])) $extra .= 'highlight1'; ?> - + + - + else echo h($attribute['category']); + ?> + + + +   + + + + + + + endif; ?>
+ From d4d24a3aea0f6e88df431c3b98a3b4d7dac7b8d1 Mon Sep 17 00:00:00 2001 From: Christophe Vandeplas Date: Sat, 8 Jun 2013 11:31:22 +0200 Subject: [PATCH 04/13] peformance --- app/Controller/AppController.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/app/Controller/AppController.php b/app/Controller/AppController.php index 5ec0f2f1d..46ea7e576 100755 --- a/app/Controller/AppController.php +++ b/app/Controller/AppController.php @@ -183,13 +183,9 @@ class AppController extends Controller { * @return void */ protected function _refreshAuth() { - if (isset($this->User)) { - $user = $this->User->read(false, $this->Auth->user('id')); - } else { - $this->loadModel('User'); - $this->User->recursive = -1; - $user = $this->User->findById($this->Auth->user('id')); - } + $this->loadModel('User'); + $this->User->recursive = -1; + $user = $this->User->findById($this->Auth->user('id')); $this->Auth->login($user['User']); } From bd88c10bf175c2224d0b7a774d256d864f7b471f Mon Sep 17 00:00:00 2001 From: Christophe Vandeplas Date: Sat, 8 Jun 2013 16:55:04 +0200 Subject: [PATCH 05/13] removed not necessary sort results in huge performance improvement --- app/Model/Attribute.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Model/Attribute.php b/app/Model/Attribute.php index be47267eb..75ef8b1df 100755 --- a/app/Model/Attribute.php +++ b/app/Model/Attribute.php @@ -177,7 +177,7 @@ class Attribute extends AppModel { ) ); - public $order = array("Attribute.event_id" => "DESC", "Attribute.type" => "ASC"); + public $order = array("Attribute.event_id" => "DESC"); /** * Validation rules From 482fd8b8b08fe0c96135a4b2a524eccbb72a28f6 Mon Sep 17 00:00:00 2001 From: Christophe Vandeplas Date: Mon, 10 Jun 2013 10:41:29 +0200 Subject: [PATCH 06/13] fix no tooltip bug on Chrome and probably IE. --- app/View/Attributes/add.ctp | 15 +++++++++++++++ app/View/Attributes/edit.ctp | 15 +++++++++++++++ app/View/Events/add.ctp | 13 +++++++++++++ app/View/Events/edit.ctp | 13 +++++++++++++ 4 files changed, 56 insertions(+) diff --git a/app/View/Attributes/add.ctp b/app/View/Attributes/add.ctp index ddea58463..5107bbb71 100755 --- a/app/View/Attributes/add.ctp +++ b/app/View/Attributes/add.ctp @@ -145,6 +145,21 @@ $(document).ready(function() { }).popover('show'); }); + // workaround for browsers like IE and Chrome that do now have an onmouseover on the 'options' of a select. + // disadvangate is that user needs to click on the item to see the tooltip. + // no solutions exist, except to generate the select completely using html. + $("#AttributeType, #AttributeCategory, #Attribute, #AttributeDistribution").on('change', function(e) { + var $e = $(e.target); + if ($e.is('option')) { + $('#'+e.currentTarget.id).popover('destroy'); + $('#'+e.currentTarget.id).popover({ + trigger: 'manual', + placement: 'right', + content: formInfoValues[$e.val()], + }).popover('show'); + } + }); + }); diff --git a/app/View/Attributes/edit.ctp b/app/View/Attributes/edit.ctp index 2af50a5e7..4ddbb86b9 100755 --- a/app/View/Attributes/edit.ctp +++ b/app/View/Attributes/edit.ctp @@ -146,6 +146,21 @@ $(document).ready(function() { }).popover('show'); }); + // workaround for browsers like IE and Chrome that do now have an onmouseover on the 'options' of a select. + // disadvangate is that user needs to click on the item to see the tooltip. + // no solutions exist, except to generate the select completely using html. + $("#AttributeType, #AttributeCategory, #Attribute, #AttributeDistribution").on('change', function(e) { + var $e = $(e.target); + if ($e.is('option')) { + $('#'+e.currentTarget.id).popover('destroy'); + $('#'+e.currentTarget.id).popover({ + trigger: 'manual', + placement: 'right', + content: formInfoValues[$e.val()], + }).popover('show'); + } + }); + }); diff --git a/app/View/Events/add.ctp b/app/View/Events/add.ctp index b8281a2e8..244dda8c0 100755 --- a/app/View/Events/add.ctp +++ b/app/View/Events/add.ctp @@ -90,6 +90,19 @@ $(document).ready(function() { }).popover('show'); } }); + + // workaround for browsers like IE and Chrome that do now have an onmouseover on the 'options' of a select. + // disadvangate is that user needs to click on the item to see the tooltip. + // no solutions exist, except to generate the select completely using html. + $("#EventAnalysis, #EventRisk, #EventDistribution").on('change', function(e) { + var $e = $(e.target); + $('#'+e.currentTarget.id).popover('destroy'); + $('#'+e.currentTarget.id).popover({ + trigger: 'manual', + placement: 'right', + content: formInfoValues[$e.val()], + }).popover('show'); + }); }); diff --git a/app/View/Events/edit.ctp b/app/View/Events/edit.ctp index ed892c9a6..35a8dfc8f 100755 --- a/app/View/Events/edit.ctp +++ b/app/View/Events/edit.ctp @@ -105,6 +105,19 @@ $(document).ready(function() { }).popover('show'); } }); + + // workaround for browsers like IE and Chrome that do now have an onmouseover on the 'options' of a select. + // disadvangate is that user needs to click on the item to see the tooltip. + // no solutions exist, except to generate the select completely using html. + $("#EventAnalysis, #EventRisk, #EventDistribution").on('change', function(e) { + var $e = $(e.target); + $('#'+e.currentTarget.id).popover('destroy'); + $('#'+e.currentTarget.id).popover({ + trigger: 'manual', + placement: 'right', + content: formInfoValues[$e.val()], + }).popover('show'); + }); }); From c348c62a0e1c76653086e3377039485a5f4bdd57 Mon Sep 17 00:00:00 2001 From: Christophe Vandeplas Date: Mon, 10 Jun 2013 10:46:03 +0200 Subject: [PATCH 07/13] fix bug no tooltip with Chrome/IE on attributes --- app/View/Attributes/add.ctp | 14 ++++++-------- app/View/Attributes/edit.ctp | 14 ++++++-------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/app/View/Attributes/add.ctp b/app/View/Attributes/add.ctp index 5107bbb71..4154f1c5d 100755 --- a/app/View/Attributes/add.ctp +++ b/app/View/Attributes/add.ctp @@ -150,14 +150,12 @@ $(document).ready(function() { // no solutions exist, except to generate the select completely using html. $("#AttributeType, #AttributeCategory, #Attribute, #AttributeDistribution").on('change', function(e) { var $e = $(e.target); - if ($e.is('option')) { - $('#'+e.currentTarget.id).popover('destroy'); - $('#'+e.currentTarget.id).popover({ - trigger: 'manual', - placement: 'right', - content: formInfoValues[$e.val()], - }).popover('show'); - } + $('#'+e.currentTarget.id).popover('destroy'); + $('#'+e.currentTarget.id).popover({ + trigger: 'manual', + placement: 'right', + content: formInfoValues[$e.val()], + }).popover('show'); }); }); diff --git a/app/View/Attributes/edit.ctp b/app/View/Attributes/edit.ctp index 4ddbb86b9..2c95bbe9e 100755 --- a/app/View/Attributes/edit.ctp +++ b/app/View/Attributes/edit.ctp @@ -151,14 +151,12 @@ $(document).ready(function() { // no solutions exist, except to generate the select completely using html. $("#AttributeType, #AttributeCategory, #Attribute, #AttributeDistribution").on('change', function(e) { var $e = $(e.target); - if ($e.is('option')) { - $('#'+e.currentTarget.id).popover('destroy'); - $('#'+e.currentTarget.id).popover({ - trigger: 'manual', - placement: 'right', - content: formInfoValues[$e.val()], - }).popover('show'); - } + $('#'+e.currentTarget.id).popover('destroy'); + $('#'+e.currentTarget.id).popover({ + trigger: 'manual', + placement: 'right', + content: formInfoValues[$e.val()], + }).popover('show'); }); }); From d81ffe56b7c38aaaf620e8829203d1afdc50ebca Mon Sep 17 00:00:00 2001 From: Christophe Vandeplas Date: Mon, 10 Jun 2013 11:31:46 +0200 Subject: [PATCH 08/13] Performance improvement with static urls --- app/View/Attributes/add.ctp | 20 ++++----- app/View/Attributes/add_attachment.ctp | 25 +++++------- app/View/Attributes/edit.ctp | 20 ++++----- app/View/Attributes/index.ctp | 56 +++++++++++++------------- app/View/Attributes/search.ctp | 24 ++++++++--- app/View/Elements/global_menu.ctp | 56 +++++++++++++------------- 6 files changed, 105 insertions(+), 96 deletions(-) diff --git a/app/View/Attributes/add.ctp b/app/View/Attributes/add.ctp index 4154f1c5d..66c370ac2 100755 --- a/app/View/Attributes/add.ctp +++ b/app/View/Attributes/add.ctp @@ -46,21 +46,21 @@ echo $this->Form->end();
    -
  • Html->link('View Event', array('controller' => 'events', 'action' => 'view', $this->request->data['Attribute']['event_id'])); ?>
    • -
  • Html->link('Edit Event', array('controller' => 'events', 'action' => 'edit', $this->request->data['Attribute']['event_id'])); ?>
    • +
  • View Event
    • +
  • Edit Event
  • Form->postLink('Delete Event', array('controller' => 'events', 'action' => 'delete', $this->request->data['Attribute']['event_id']), null, __('Are you sure you want to delete # %s?', $this->request->data['Attribute']['event_id'])); ?>
  • -
  • Html->link('Add Attribute', array('controller' => 'attributes', 'action' => 'add', $this->request->data['Attribute']['event_id']));?>
    • -
  • Html->link('Add Attachment', array('controller' => 'attributes', 'action' => 'add_attachment', $this->request->data['Attribute']['event_id']));?>
    • -
  • Html->link('Populate event from IOC', array('controller' => 'events', 'action' => 'addIOC', $this->request->data['Attribute']['event_id']));?>
    • +
  • Add Attribute
    • +
  • Add Attachment
    • +
  • Populate from IOC
  • -
  • Html->link(__('Contact reporter', true), array('controller' => 'events', 'action' => 'contact', $this->request->data['Attribute']['event_id'])); ?>
    • -
  • Html->link(__('Download as XML', true), array('controller' => 'events', 'action' => 'xml', 'download', $this->request->data['Attribute']['event_id'])); ?>
    • -
  • Html->link(__('Download as IOC', true), array('controller' => 'events', 'action' => 'downloadOpenIOCEvent', $this->request->data['Attribute']['event_id'])); ?>
    • +
  • Contact Reporter
    • +
  • Download as XML
    • +
  • Download as IOC
  • -
  • Html->link('List Events', array('controller' => 'events', 'action' => 'index')); ?>
    • +
  • List Events
    • -
  • Html->link('Add Event', array('controller' => 'events', 'action' => 'add')); ?>
    • +
  • Add Event
diff --git a/app/View/Attributes/add_attachment.ctp b/app/View/Attributes/add_attachment.ctp index 77ab0d569..38a38787e 100755 --- a/app/View/Attributes/add_attachment.ctp +++ b/app/View/Attributes/add_attachment.ctp @@ -42,26 +42,21 @@ echo $this->Form->end();
    -
  • Html->link('View Event', array('controller' => 'events', 'action' => 'view', $this->request->data['Attribute']['event_id'])); ?>
    • - -
  • Html->link('Edit Event', array('controller' => 'events', 'action' => 'edit', $this->request->data['Attribute']['event_id'])); ?>
    • +
  • View Event
    • +
  • Edit Event
  • Form->postLink('Delete Event', array('controller' => 'events', 'action' => 'delete', $this->request->data['Attribute']['event_id']), null, __('Are you sure you want to delete # %s?', $this->request->data['Attribute']['event_id'])); ?>
  • -
  • Html->link('Add Attribute', array('controller' => 'attributes', 'action' => 'add', $this->request->data['Attribute']['event_id']));?>
    • -
  • Html->link('Add Attachment', array('controller' => 'attributes', 'action' => 'add_attachment', $this->request->data['Attribute']['event_id']));?>
    • -
  • Html->link('Populate event from IOC', array('controller' => 'events', 'action' => 'addIOC', $this->request->data['Attribute']['event_id']));?>
    • - -
  • Html->link('Propose Attribute', array('controller' => 'shadow_attributes', 'action' => 'add', $this->request->data['Attribute']['event_id']));?>
    • -
  • Html->link('Propose Attachment', array('controller' => 'shadow_attributes', 'action' => 'add_attachment', $this->request->data['Attribute']['event_id']));?>
    • - +
  • Add Attribute
    • +
  • Add Attachment
    • +
  • Populate from IOC
  • -
  • Html->link(__('Contact reporter', true), array('controller' => 'events', 'action' => 'contact', $this->request->data['Attribute']['event_id'])); ?>
    • -
  • Html->link(__('Download as XML', true), array('controller' => 'events', 'action' => 'xml', 'download', $this->request->data['Attribute']['event_id'])); ?>
    • -
  • Html->link(__('Download as IOC', true), array('controller' => 'events', 'action' => 'downloadOpenIOCEvent', $this->request->data['Attribute']['event_id'])); ?>
    • +
  • Contact Reporter
    • +
  • Download as XML
    • +
  • Download as IOC
  • -
  • Html->link('List Events', array('controller' => 'events', 'action' => 'index')); ?>
    • +
  • List Events
    • -
  • Html->link('Add Event', array('controller' => 'events', 'action' => 'add')); ?>
    • +
  • Add Event
diff --git a/app/View/Attributes/edit.ctp b/app/View/Attributes/edit.ctp index 2c95bbe9e..1ce2bae02 100755 --- a/app/View/Attributes/edit.ctp +++ b/app/View/Attributes/edit.ctp @@ -46,21 +46,21 @@ echo $this->Form->end();
    -
  • Html->link('View Event', array('controller' => 'events', 'action' => 'view', $this->request->data['Attribute']['event_id'])); ?>
    • -
  • Html->link('Edit Event', array('controller' => 'events', 'action' => 'edit', $this->request->data['Attribute']['event_id'])); ?>
    • +
  • View Event
    • +
  • Edit Event
  • Form->postLink('Delete Event', array('controller' => 'events', 'action' => 'delete', $this->request->data['Attribute']['event_id']), null, __('Are you sure you want to delete # %s?', $this->request->data['Attribute']['event_id'])); ?>
  • -
  • Html->link('Add Attribute', array('controller' => 'attributes', 'action' => 'add', $this->request->data['Attribute']['event_id']));?>
    • -
  • Html->link('Add Attachment', array('controller' => 'attributes', 'action' => 'add_attachment', $this->request->data['Attribute']['event_id']));?>
    • -
  • Html->link('Populate event from IOC', array('controller' => 'events', 'action' => 'addIOC', $this->request->data['Attribute']['event_id']));?>
    • +
  • Add Attribute
    • +
  • Add Attachment
    • +
  • Populate from IOC
  • -
  • Html->link(__('Contact reporter', true), array('controller' => 'events', 'action' => 'contact', $this->request->data['Attribute']['event_id'])); ?>
    • -
  • Html->link(__('Download as XML', true), array('controller' => 'events', 'action' => 'xml', 'download', $this->request->data['Attribute']['event_id'])); ?>
    • -
  • Html->link(__('Download as IOC', true), array('controller' => 'events', 'action' => 'downloadOpenIOCEvent', $this->request->data['Attribute']['event_id'])); ?>
    • +
  • Contact Reporter
    • +
  • Download as XML
    • +
  • Download as IOC
  • -
  • Html->link('List Events', array('controller' => 'events', 'action' => 'index')); ?>
    • +
  • List Events
    • -
  • Html->link('Add Event', array('controller' => 'events', 'action' => 'add')); ?>
    • +
  • Add Event
diff --git a/app/View/Attributes/index.ctp b/app/View/Attributes/index.ctp index 859762b58..7438ad8a5 100755 --- a/app/View/Attributes/index.ctp +++ b/app/View/Attributes/index.ctp @@ -21,7 +21,7 @@ if ($isSearch == 1) { )); echo $this->Paginator->prev('« ' . __('previous'), array('tag' => 'li', 'escape' => false), null, array('tag' => 'li', 'class' => 'prev disabled', 'escape' => false, 'disabledTag' => 'span')); - echo $this->Paginator->numbers(array('modulus' => 20, 'separator' => '', 'tag' => 'li', 'currentClass' => 'active', 'currentTag' => 'span')); + //echo $this->Paginator->numbers(array('modulus' => 20, 'separator' => '', 'tag' => 'li', 'currentClass' => 'active', 'currentTag' => 'span')); echo $this->Paginator->next(__('next') . ' »', array('tag' => 'li', 'escape' => false), null, array('tag' => 'li', 'class' => 'next disabled', 'escape' => false, 'disabledTag' => 'span')); ?> @@ -53,45 +53,47 @@ foreach ($attributes as $attribute):
+ onclick="document.location='/events/view/';"> Html->link($attribute['Event']['id'], array('controller' => 'events', 'action' => 'view', $attribute['Event']['id']), array('class' => 'SameOrgLink')); + $class='class="SameOrgLink"'; } else { - echo $this->Html->link($attribute['Event']['id'], array('controller' => 'events', 'action' => 'view', $attribute['Event']['id'])); + $class=''; } $currentCount++; ?> + >
- -   - -   - + +   + +   + Highlight->highlighter($sigDisplay, $replacePairs)); + $sigDisplay = $this->Highlight->highlighter($sigDisplay, $replacePairs); } if ('attachment' == $attribute['Attribute']['type'] || 'malware-sample' == $attribute['Attribute']['type']) { - echo $this->Html->link($sigDisplay, array('controller' => 'attributes', 'action' => 'download', $attribute['Attribute']['id']), array('escape' => FALSE)); + ?>Html->link($sigDisplay, nl2br(h($attribute['Attribute']['value'])), array('escape' => FALSE)); + ?>  - -   + +   + Html->link('', array('action' => 'edit', $attribute['Attribute']['id']), array('class' => 'icon-edit', 'title' => 'Edit')); - echo $this->Form->postLink('',array('action' => 'delete', $attribute['Attribute']['id']), array('class' => 'icon-trash', 'title' => 'Delete'), __('Are you sure you want to delete this attribute?')); - } - echo $this->Html->link('', array('controller' => 'events', 'action' => 'view', $attribute['Attribute']['event_id']), array('class' => 'icon-list-alt', 'title' => 'View')); - ?> + if ($isAdmin || ($isAclModify && $attribute['Event']['user_id'] == $me['id']) || ($isAclModifyOrg && $attribute['Event']['org'] == $me['org'])) { + ?>Form->postLink('',array('action' => 'delete', $attribute['Attribute']['id']), array('class' => 'icon-trash', 'title' => 'Delete'), __('Are you sure you want to delete this attribute?')); + } + ?> +
    -
  • Html->link('List Events', array('controller' => 'events', 'action' => 'index')); ?>
    • +
  • List Events
    • -
  • Html->link('Add Event', array('controller' => 'events', 'action' => 'add')); ?>
    • +
  • Add Event
  • -
  • >Html->link('List Attributes', array('admin' => false, 'controller' => 'attributes', 'action' => 'index'));?>
    • -
  • >Html->link('Search Attributes', array('admin' => false, 'controller' => 'attributes', 'action' => 'search'));?>
    • +
  • >List Attributes
    • +
  • >Search Attributes
  • -
  • Html->link(__('Download results as XML'), array('admin' => false, 'controller' => 'events', 'action' => 'downloadSearchResult'));?>
    • +
  • Download results as XML
  • -
  • Html->link('Export', array('controller' => 'events', 'action' => 'export')); ?>
    • +
  • Export
    • -
  • Html->link('Automation', array('controller' => 'events', 'action' => 'automation')); ?>
    • +
  • Automation
diff --git a/app/View/Attributes/search.ctp b/app/View/Attributes/search.ctp index 7d6f52557..b7b87fa50 100755 --- a/app/View/Attributes/search.ctp +++ b/app/View/Attributes/search.ctp @@ -166,6 +166,18 @@ $(document).ready(function() { } }); + // workaround for browsers like IE and Chrome that do now have an onmouseover on the 'options' of a select. + // disadvangate is that user needs to click on the item to see the tooltip. + // no solutions exist, except to generate the select completely using html. + $("#AttributeType, #AttributeCategory").on('change', function(e) { + var $e = $(e.target); + $('#'+e.currentTarget.id).popover('destroy'); + $('#'+e.currentTarget.id).popover({ + trigger: 'manual', + placement: 'right', + content: formInfoValues[$e.val()], + }).popover('show'); + }); }); @@ -176,17 +188,17 @@ $(document).ready(function() { Js->writeBuffer(); // Write cached scripts ?>
    -
  • Html->link('List Events', array('controller' => 'events', 'action' => 'index')); ?>
    • +
  • List Events
    • -
  • Html->link('Add Event', array('controller' => 'events', 'action' => 'add')); ?>
    • +
  • Add Event
  • -
  • Html->link('List Attributes', array('controller' => 'attributes', 'action' => 'index')); ?>
    • -
  • Html->link('Search Attributes', array('controller' => 'attributes', 'action' => 'search')); ?>
    • +
  • List Attributes
    • +
  • Search Attributes
  • -
  • Html->link('Export', array('controller' => 'events', 'action' => 'export')); ?>
    • +
  • Export
    • -
  • Html->link('Automation', array('controller' => 'events', 'action' => 'automation')); ?>
    • +
  • Automation
\ No newline at end of file diff --git a/app/View/Elements/global_menu.ctp b/app/View/Elements/global_menu.ctp index 1e76de380..de6c8b262 100755 --- a/app/View/Elements/global_menu.ctp +++ b/app/View/Elements/global_menu.ctp @@ -4,7 +4,7 @@
    -
  • Html->link('home', '/');?>
    • +
  • home
  • @@ -13,17 +13,17 @@
      -
    • Html->link('List Events', array('controller' => 'events', 'action' => 'index')); ?>
      • +
    • List Events
      • -
    • Html->link('Add Event', array('controller' => 'events', 'action' => 'add')); ?>
      • +
    • Add Event
    • -
    • Html->link('List Attributes', array('controller' => 'attributes', 'action' => 'index')); ?>
      • -
    • Html->link('Search Attributes', array('controller' => 'attributes', 'action' => 'search')); ?>
      • +
    • List Attributes
      • +
    • Search Attributes
    • -
    • Html->link('Export', array('controller' => 'events', 'action' => 'export')); ?>
      • +
    • Export
      • -
    • Html->link('Automation', array('controller' => 'events', 'action' => 'automation')); ?>
      • +
    • Automation
    @@ -36,14 +36,14 @@
      -
    • Html->link(__('Import Blacklist', true), array('controller' => 'blacklists', 'action' => 'index', 'admin' => true)); ?>
      • -
    • Html->link(__('Import Regexp', true), array('controller' => 'regexp', 'action' => 'index', 'admin' => true)); ?>
      • -
    • Html->link(__('Signature Whitelist', true), array('controller' => 'whitelists', 'action' => 'index', 'admin' => true)); ?>
      • +
    • Import Blacklist
      • +
    • Import Regexp
      • +
    • Signature Whitelist
      • -
    • Html->link(__('Import Blacklist', true), array('controller' => 'blacklists', 'action' => 'index')); ?>
      • -
    • Html->link(__('Import Regexp', true), array('controller' => 'regexp', 'action' => 'index')); ?>
      • -
    • Html->link(__('Signature Whitelist', true), array('controller' => 'whitelists', 'action' => 'index')); ?>
      • +
    • Import Blacklist
      • +
    • Import Regexp
      • +
    • Signature Whitelist
    • @@ -54,13 +54,13 @@
      -
    • Html->link(__('News', true), array('controller' => 'users', 'action' => 'news', 'plugin' => false)); ?>
      • -
    • Html->link(__('My Profile', true), array('controller' => 'users', 'action' => 'view', 'me', 'plugin' => false)); ?>
      • -
    • Html->link(__('Members List', true), array('controller' => 'users', 'action' => 'memberslist', 'plugin' => false)); ?>
      • -
    • Html->link(__('User Guide', true), array('controller' => 'pages', 'action' => 'display', 'documentation', 'plugin' => false)); ?>
      • -
    • Html->link(__('Terms & Conditions', true), array('controller' => 'users', 'action' => 'terms', 'plugin' => false)); ?>
      • +
    • News
      • +
    • My Profile
      • +
    • Members List
      • +
    • User Guide
      • +
    • Terms & Conditions
    • -
    • Html->link(__('Log out', true), array('controller' => 'users', 'action' => 'logout', 'plugin' => false)); ?>
      • +
    • Log out
    @@ -71,7 +71,7 @@
      -
    • Html->link(__('List Servers'), array('controller' => 'servers', 'action' => 'index', 'plugin' => false));?>
      • +
    • List Servers
    @@ -83,16 +83,16 @@
      -
    • Html->link(__('New User', true), array('controller' => 'users', 'action' => 'add', 'admin' => true, 'plugin' => false)); ?>
      • -
    • Html->link(__('List Users', true), array('controller' => 'users', 'action' => 'index', 'admin' => true, 'plugin' => false)); ?>
      • +
    • New User
      • +
    • List Users
    • -
    • Html->link(__('New Role', true), array('controller' => 'roles', 'action' => 'add', 'admin' => true, 'plugin' => false)); ?>
      • +
    • New Role
      • -
    • Html->link(__('List Roles', true), array('controller' => 'roles', 'action' => 'index', 'admin' => true, 'plugin' => false)); ?>
      • +
    • List Roles
    • -
    • Html->link(__('Contact users', true), array('controller' => 'users', 'action' => 'email', 'admin' => true, 'plugin' => false)); ?>
      • +
    • Contact Users
    @@ -105,8 +105,8 @@
      -
    • Html->link(__('List Logs', true), array('controller' => 'logs', 'action' => 'index', 'admin' => true, 'plugin' => false)); ?>
      • -
    • Html->link(__('Search Logs', true), array('controller' => 'logs', 'action' => 'admin_search', 'admin' => true, 'plugin' => false)); ?>
      • +
    • List Logs
      • +
    • Search Logs
    @@ -115,7 +115,7 @@
    -
  • Html->link(__('Log out', true), array('controller' => 'users', 'action' => 'logout', 'plugin' => false)); ?>
    • +
  • Log out
From 0cafc7ec6bee2628eff2ff4948fb147c0319fa9f Mon Sep 17 00:00:00 2001 From: Christophe Vandeplas Date: Mon, 10 Jun 2013 12:26:32 +0200 Subject: [PATCH 09/13] fix documentation link --- app/View/Elements/global_menu.ctp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/View/Elements/global_menu.ctp b/app/View/Elements/global_menu.ctp index de6c8b262..4a5017d9f 100755 --- a/app/View/Elements/global_menu.ctp +++ b/app/View/Elements/global_menu.ctp @@ -57,7 +57,7 @@
  • News
  • My Profile
  • Members List
    • -
  • User Guide
    • +
  • User Guide
  • Terms & Conditions
  • Log out
    • From 3ed50e2aeffa424e665f25a761d4bf8e6045bf06 Mon Sep 17 00:00:00 2001 From: Christophe Vandeplas Date: Mon, 10 Jun 2013 17:24:41 +0200 Subject: [PATCH 10/13] improve UI of event index filtering --- app/Controller/EventsController.php | 3 + app/View/Events/index.ctp | 274 +++++++++++++++++----------- app/View/Events/view.ctp | 2 +- 3 files changed, 170 insertions(+), 109 deletions(-) diff --git a/app/Controller/EventsController.php b/app/Controller/EventsController.php index d1376b387..856824932 100755 --- a/app/Controller/EventsController.php +++ b/app/Controller/EventsController.php @@ -87,6 +87,9 @@ class EventsController extends AppController { public function index() { // list the events + // TODO information exposure vulnerability - as we don't limit the filter depending on the CyDefSIG.showorg parameter + // this filter will work if showorg=false and users will be able to perform the filtering and see what events were posted by what org. + // same goes for orgc in all cases //transform POST into GET if($this->request->is("post")) { $url = array('action'=>'index'); diff --git a/app/View/Events/index.ctp b/app/View/Events/index.ctp index 5671b96e9..ec58b9a72 100755 --- a/app/View/Events/index.ctp +++ b/app/View/Events/index.ctp @@ -7,130 +7,206 @@ - Form->create('', array('action' => 'index', 'style' => 'margin-bottom:0px')); ?> -
    -
    -
    + Form->create('', array('action' => 'index', 'style' => 'margin-bottom:0px')); + ?> + - - passedArgs as $k => $v) { - if ((substr($k, 0, 6) === 'search')) { - $searchTerm = substr($k, 6); - if ($searchTerm === 'published') { - switch ($v) { - case '0' : - $value = 'No'; - break; - case '1' : - $value = 'Yes'; - break; - case '2' : - continue 2; - break; - } - } else { - if (!$v) { - continue; - } - $value = $v; - } - ?> - +
    :
    + passedArgs as $k => $v) { + if ((substr($k, 0, 6) === 'search')) { + $searchTerm = substr($k, 6); + if ($searchTerm === 'published') { + switch ($v) { + case '0' : + $value = 'No'; + break; + case '1' : + $value = 'Yes'; + break; + case '2' : + continue 2; + break; + } + } else { + if (!$v) { + continue; + } + $value = $v; + } + ?> + + 0) { - ?> - - -
    + : + Html->link('', array('controller' => 'events', 'action' => 'index'), array('class' => 'icon-remove', 'title' => 'Remove filters'));?>
    - Form->end(); - ?> + if ($count > 0) { + ?> + + Html->link('', array('controller' => 'events', 'action' => 'index'), array('class' => 'icon-remove', 'title' => 'Remove filters'));?> + + + + + - + + if ('true' == Configure::read('CyDefSIG.showorg') || $isAdmin) { + if ($isSiteAdmin) { ?> - + - + - + - + - + + + Form->end(); + ?>
    Paginator->sort('published', 'Valid.');?>
    		 + Paginator->sort('published', 'Valid.');?> + +
    + Form->input('searchpublished', array( + 'options' => array('0' => 'No', '1' => 'Yes', '2' => 'Any'), + 'default' => 2, + 'label' => '', + 'class' => 'input-mini', + 'onchange' => "$('#EventIndexForm').submit()" + )); + ?> +     +     		Paginator->sort('org'); ?> Paginator->sort('org'); ?>
    		Paginator->sort('org'); ?> + + Paginator->sort('owner org');?>
    		 + Paginator->sort('owner org');?> + +
    + Form->input('searchorgc', array( + 'value' => $this->passedArgs['searchorgc'], + 'label' => '', + 'class' => 'input-mini')); + ?> +     +     		Paginator->sort('id');?> Paginator->sort('attribute_count', '#Attr.');?> Paginator->sort('user_id', 'Email');?> Paginator->sort('date');?>
    		 + Paginator->sort('date');?> + +
    +
    + Form->input('searchDatefrom', array( + 'value' => $this->passedArgs['searchDatefrom'], + 'label' => false, + 'div' => false, + 'class' => 'span1 datepicker', + )); + ?> + + Form->input('searchDateuntil', array( + 'value' => $this->passedArgs['searchDateuntil'], + 'label' => false, + 'class' => 'span1 datepicker', + 'div' => false + )); + ?> +
    +     		Paginator->sort('risk');?> Paginator->sort('analysis');?> Paginator->sort('info');?>
    		 + Paginator->sort('info');?> + +
    + Form->input('searchinfo', array( + 'value' => $this->passedArgs['searchinfo'], + 'label' => '', + 'class' => 'input-large')); + ?> +     +     		Paginator->sort('distribution');?> Actions
    @@ -239,37 +315,19 @@ \ No newline at end of file diff --git a/app/View/Events/view.ctp b/app/View/Events/view.ctp index 4c0ec7de3..3f4560054 100755 --- a/app/View/Events/view.ctp +++ b/app/View/Events/view.ctp @@ -11,7 +11,7 @@ $mayPublish = ($isAclPublish && $event['Event']['orgc'] == $me['org']);
  • Html->link('Add Attribute', array('controller' => 'attributes', 'action' => 'add', $event['Event']['id']));?>
  • Html->link('Add Attachment', array('controller' => 'attributes', 'action' => 'add_attachment', $event['Event']['id']));?>
    • -
  • Html->link('Populate event from IOC', array('controller' => 'events', 'action' => 'addIOC', $event['Event']['id']));?>
    • +
  • Html->link('Populate from IOC', array('controller' => 'events', 'action' => 'addIOC', $event['Event']['id']));?>
  • Html->link('Propose Attribute', array('controller' => 'shadow_attributes', 'action' => 'add', $event['Event']['id']));?>
  • Html->link('Propose Attachment', array('controller' => 'shadow_attributes', 'action' => 'add_attachment', $event['Event']['id']));?>
    • From e0c0e7ccf5dde3cafab59823090eff31211a363b Mon Sep 17 00:00:00 2001 From: Christophe Vandeplas Date: Mon, 10 Jun 2013 17:57:20 +0200 Subject: [PATCH 11/13] unified links --- app/View/Events/add.ctp | 12 ++++---- app/View/Events/add_i_o_c.ctp | 32 +++++++++++++--------- app/View/Events/automation.ctp | 12 ++++---- app/View/Events/contact.ctp | 34 +++++++++++++---------- app/View/Events/edit.ctp | 30 ++++++++++---------- app/View/Events/export.ctp | 12 ++++---- app/View/Events/index.ctp | 50 +++++----------------------------- app/View/Events/view.ctp | 30 ++++++++++---------- 8 files changed, 94 insertions(+), 118 deletions(-) diff --git a/app/View/Events/add.ctp b/app/View/Events/add.ctp index 244dda8c0..a8d12e3b9 100755 --- a/app/View/Events/add.ctp +++ b/app/View/Events/add.ctp @@ -38,17 +38,17 @@ echo $this->Form->end();
      -
    • Html->link('List Events', array('controller' => 'events', 'action' => 'index')); ?>
      • +
    • List Events
      • -
    • Html->link('Add Event', array('controller' => 'events', 'action' => 'add')); ?>
      • +
    • Add Event
    • -
    • Html->link('List Attributes', array('controller' => 'attributes', 'action' => 'index')); ?>
      • -
    • Html->link('Search Attributes', array('controller' => 'attributes', 'action' => 'search')); ?>
      • +
    • List Attributes
      • +
    • Search Attributes
    • -
    • Html->link('Export', array('controller' => 'events', 'action' => 'export')); ?>
      • +
    • Export
      • -
    • Html->link('Automation', array('controller' => 'events', 'action' => 'automation')); ?>
      • +
    • Automation
    diff --git a/app/View/Events/add_i_o_c.ctp b/app/View/Events/add_i_o_c.ctp index ce834fc69..35ad77b23 100644 --- a/app/View/Events/add_i_o_c.ctp +++ b/app/View/Events/add_i_o_c.ctp @@ -16,26 +16,32 @@ echo $this->Form->end();
      -
    • Html->link('View Event', array('controller' => 'events', 'action' => 'view', $id)); ?>
      • +
    • View Event
      • -
    • Html->link('Edit Event', array('controller' => 'events', 'action' => 'edit', $id)); ?>
      • -
    • Form->postLink('Delete Event', array('controller' => 'events', 'action' => 'delete', $id), null, __('Are you sure you want to delete # %s?', $id)); ?>
      • +
    • Edit Event
      • +
    • Form->postLink('Delete Event', array('action' => 'delete', $this->request->data['Event']['id']), null, __('Are you sure you want to delete # %s?', $this->request->data['Event']['id'])); ?>
    • -
    • Html->link('Add Attribute', array('controller' => 'attributes', 'action' => 'add', $id));?>
      • -
    • Html->link('Add Attachment', array('controller' => 'attributes', 'action' => 'add_attachment', $id));?>
      • -
    • Html->link('Populate event from IOC', array('controller' => 'events', 'action' => 'addIOC', $id));?>
      • +
    • Add Attribute
      • +
    • Add Attachment
      • +
    • Populate from IOC
      • -
    • Html->link('Propose Attribute', array('controller' => 'shadow_attributes', 'action' => 'add', $id));?>
      • -
    • Html->link('Propose Attachment', array('controller' => 'shadow_attributes', 'action' => 'add_attachment', $id));?>
      • +
    • Propose Attribute
      • +
    • Propose Attachment
    • -
    • Html->link(__('Contact reporter', true), array('controller' => 'events', 'action' => 'contact', $id)); ?>
      • -
    • Html->link(__('Download as XML', true), array('controller' => 'events', 'action' => 'xml', 'download', $id)); ?>
      • -
    • Html->link(__('Download as IOC', true), array('controller' => 'events', 'action' => 'downloadOpenIOCEvent', $id)); ?>
      • + request->data['Event']['published'] && ($isAdmin || $mayPublish)): ?> +
    • Form->postLink('Publish Event', array('action' => 'alert', $this->request->data['Event']['id']), null, 'Are you sure this event is complete and everyone should be informed?'); ?>
      • +
    • Form->postLink('Publish (no email)', array('action' => 'publish', $this->request->data['Event']['id']), null, 'Publish but do NOT send alert email? Only for minor changes!'); ?>
      • + + + +
    • Contact Reporter
      • +
    • Download as XML
      • +
    • Download as IOC
    • -
    • Html->link('List Events', array('controller' => 'events', 'action' => 'index')); ?>
      • +
    • List Events
      • -
    • Html->link('Add Event', array('controller' => 'events', 'action' => 'add')); ?>
      • +
    • Add Event
    \ No newline at end of file diff --git a/app/View/Events/automation.ctp b/app/View/Events/automation.ctp index 104ee9467..0819526e8 100644 --- a/app/View/Events/automation.ctp +++ b/app/View/Events/automation.ctp @@ -58,17 +58,17 @@ This would enable you to export:

      -
    • Html->link('List Events', array('controller' => 'events', 'action' => 'index')); ?>
      • +
    • List Events
      • -
    • Html->link('Add Event', array('controller' => 'events', 'action' => 'add')); ?>
      • +
    • Add Event
    • -
    • Html->link('List Attributes', array('controller' => 'attributes', 'action' => 'index')); ?>
      • -
    • Html->link('Search Attributes', array('controller' => 'attributes', 'action' => 'search')); ?>
      • +
    • List Attributes
      • +
    • Search Attributes
    • -
    • Html->link('Export', array('controller' => 'events', 'action' => 'export')); ?>
      • +
    • Export
      • -
    • Html->link('Automation', array('controller' => 'events', 'action' => 'automation')); ?>
      • +
    • Automation
    diff --git a/app/View/Events/contact.ctp b/app/View/Events/contact.ctp index 8ac364a29..c27bb3965 100755 --- a/app/View/Events/contact.ctp +++ b/app/View/Events/contact.ctp @@ -35,26 +35,32 @@ $mayPublish = ($isAclPublish && $this->request->data['Event']['orgc'] == $me['or
      -
    • Html->link('View Event', array('controller' => 'events', 'action' => 'view', $this->request->data['Event']['id'])); ?>
      • +
    • View Event
      • -
    • Html->link('Edit Event', array('controller' => 'events', 'action' => 'edit', $this->request->data['Event']['id'])); ?>
      • -
    • Form->postLink('Delete Event', array('controller' => 'events', 'action' => 'delete', $this->request->data['Event']['id']), null, __('Are you sure you want to delete # %s?', $this->request->data['Event']['id'])); ?>
      • +
    • Edit Event
      • +
    • Form->postLink('Delete Event', array('action' => 'delete', $event['Event']['id']), null, __('Are you sure you want to delete # %s?', $event['Event']['id'])); ?>
    • -
    • Html->link('Add Attribute', array('controller' => 'attributes', 'action' => 'add', $this->request->data['Event']['id']));?>
      • -
    • Html->link('Add Attachment', array('controller' => 'attributes', 'action' => 'add_attachment', $this->request->data['Event']['id']));?>
      • -
    • Html->link('Populate event from IOC', array('controller' => 'events', 'action' => 'addIOC', $this->request->data['Event']['id']));?>
      • +
    • Add Attribute
      • +
    • Add Attachment
      • +
    • Populate from IOC
      • -
    • Html->link('Propose Attribute', array('controller' => 'shadow_attributes', 'action' => 'add', $this->request->data['Event']['id']));?>
      • -
    • Html->link('Propose Attachment', array('controller' => 'shadow_attributes', 'action' => 'add_attachment', $this->request->data['Event']['id']));?>
      • +
    • Propose Attribute
      • +
    • Propose Attachment
    • -
    • Html->link(__('Contact reporter', true), array('controller' => 'events', 'action' => 'contact', $this->request->data['Event']['id'])); ?>
      • -
    • Html->link(__('Download as XML', true), array('controller' => 'events', 'action' => 'xml', 'download', $this->request->data['Event']['id'])); ?>
      • -
    • Html->link(__('Download as IOC', true), array('controller' => 'events', 'action' => 'downloadOpenIOCEvent', $this->request->data['Event']['id'])); ?>
      • + +
    • Form->postLink('Publish Event', array('action' => 'alert', $event['Event']['id']), null, 'Are you sure this event is complete and everyone should be informed?'); ?>
      • +
    • Form->postLink('Publish (no email)', array('action' => 'publish', $event['Event']['id']), null, 'Publish but do NOT send alert email? Only for minor changes!'); ?>
      • + + + +
    • Contact Reporter
      • +
    • Download as XML
      • +
    • Download as IOC
    • -
    • Html->link('List Events', array('controller' => 'events', 'action' => 'index')); ?>
      • +
    • List Events
      • -
    • Html->link('Add Event', array('controller' => 'events', 'action' => 'add')); ?>
      • +
    • Add Event
    -
    \ No newline at end of file + diff --git a/app/View/Events/edit.ctp b/app/View/Events/edit.ctp index 35a8dfc8f..916632009 100755 --- a/app/View/Events/edit.ctp +++ b/app/View/Events/edit.ctp @@ -36,35 +36,37 @@ echo $this->Form->end();
      -
    • Html->link('View Event', array('action' => 'view', $this->request->data['Event']['id'])); ?>
      • - -
    • Html->link('Edit Event', array('action' => 'edit', $this->request->data['Event']['id'])); ?>
      • +
    • View Event
      • + +
    • Edit Event
    • Form->postLink('Delete Event', array('action' => 'delete', $this->request->data['Event']['id']), null, __('Are you sure you want to delete # %s?', $this->request->data['Event']['id'])); ?>
    • -
    • Html->link('Add Attribute', array('controller' => 'attributes', 'action' => 'add', $this->request->data['Event']['id']));?>
      • -
    • Html->link('Add Attachment', array('controller' => 'attributes', 'action' => 'add_attachment', $this->request->data['Event']['id']));?>
      • -
    • Html->link('Populate event from IOC', array('controller' => 'events', 'action' => 'addIOC', $this->request->data['Event']['id']));?>
      • +
    • Add Attribute
      • +
    • Add Attachment
      • +
    • Populate from IOC
      • + +
    • Propose Attribute
      • +
    • Propose Attachment
      • +
    • request->data['Event']['published'] && ($isAdmin || $mayPublish)): ?>
    • Form->postLink('Publish Event', array('action' => 'alert', $this->request->data['Event']['id']), null, 'Are you sure this event is complete and everyone should be informed?'); ?>
    • Form->postLink('Publish (no email)', array('action' => 'publish', $this->request->data['Event']['id']), null, 'Publish but do NOT send alert email? Only for minor changes!'); ?>
      • - request->data['Event']['published']): ?> -
    • Not published
      • -
    • Html->link(__('Contact reporter', true), array('action' => 'contact', $this->request->data['Event']['id'])); ?>
      • -
    • Html->link(__('Download as XML', true), array('action' => 'xml', 'download', $this->request->data['Event']['id'])); ?>
      • -
    • Html->link(__('Download as IOC', true), array('action' => 'downloadOpenIOCEvent', $this->request->data['Event']['id'])); ?>
      • - +
    • Contact Reporter
      • +
    • Download as XML
      • +
    • Download as IOC
    • -
    • Html->link('List Events', array('controller' => 'events', 'action' => 'index')); ?>
      • +
    • List Events
      • -
    • Html->link('Add Event', array('controller' => 'events', 'action' => 'add')); ?>
      • +
    • Add Event
    +