mirror of https://github.com/MISP/MISP
Changes to the distribution handling of attributes
- Only the creating org of the event can change the distribution of attributes - Attribute distribution setting are only pushed on edits if they were manually changed (so that the distribution level of events on the creating server doesn't get degraded by an edit and push of the event at a synced server when using connected community settings). - slight change to the batch attribute search, the search terms are only echoed up to 9 terms to prevent the mass echoing of a long listpull/63/head
Andras Iklody
parent
341814a1d4
commit
6dc73314bf
|
|
@ -552,10 +552,11 @@ class AttributesController extends AppController {
|
|||
if ('true' == Configure::read('CyDefSIG.private')) {
|
||||
$this->request->data = $this->Attribute->massageData($this->request->data);
|
||||
}
|
||||
|
||||
// reposition to get the attribute.id with given uuid
|
||||
debug($this->request->data['Attribute']);
|
||||
// Notice (8): Undefined index: uuid [APP/Controller/AttributesController.php, line 502]
|
||||
// Fixed - uuid was not passed back from the form since it's not a field. Set the uuid in a variable for non rest users, rest should have uuid.
|
||||
// Generally all of this should be _isRest() only, but that's something for later to think about
|
||||
if ($this->_isRest()) {
|
||||
$existingAttribute = $this->Attribute->findByUuid($this->request->data['Attribute']['uuid']);
|
||||
} else {
|
||||
|
|
@ -574,6 +575,21 @@ class AttributesController extends AppController {
|
|||
|
||||
$this->loadModel('Event');
|
||||
$this->Event->id = $eventId;
|
||||
|
||||
// enabling / disabling the distribution field in the edit view based on whether user's org == orgc in the event
|
||||
$this->Event->read();
|
||||
if(!$this->_isRest()) {
|
||||
$canEditDist = false;
|
||||
if ($this->Event->data['Event']['orgc'] == $this->_checkOrg()) {
|
||||
$this->set('canEditDist', true);
|
||||
$canEditDist = true;
|
||||
} else {
|
||||
$this->set('canEditDist', false);
|
||||
}
|
||||
if ($this->request->data['Attribute']['distribution'] != $existingAttribute['Attribute']['distribution']) {
|
||||
$this->request->data['Attribute']['dist_change'] = 1 + $existingAttribute['Attribute']['dist_change'];
|
||||
}
|
||||
}
|
||||
if ($this->Attribute->save($this->request->data)) {
|
||||
$this->Session->setFlash(__('The attribute has been saved'));
|
||||
|
||||
|
|
@ -597,6 +613,7 @@ class AttributesController extends AppController {
|
|||
} else {
|
||||
$this->request->data = $this->Attribute->read(null, $id);
|
||||
}
|
||||
|
||||
$this->set('attribute', Sanitize::clean($this->request->data));
|
||||
|
||||
// enabling / disabling the distribution field in the edit view based on whether user's org == orgc in the event
|
||||
|
|
@ -621,7 +638,6 @@ class AttributesController extends AppController {
|
|||
$categories = $this->_arrayToValuesIndexArray($categories);
|
||||
$this->set('categories', $categories);
|
||||
|
||||
// None of this needed if distribution can't be edited due to org restrictions
|
||||
if ($canEditDist) {
|
||||
$this->loadModel('Event');
|
||||
$events = $this->Event->findById($eventId);
|
||||
|
|
@ -736,6 +752,7 @@ class AttributesController extends AppController {
|
|||
$type = $this->request->data['Attribute']['type'];
|
||||
$category = $this->request->data['Attribute']['category'];
|
||||
$this->set('keywordSearch', $keyword);
|
||||
$keyWordText = null;
|
||||
$this->set('typeSearch', $type);
|
||||
$this->set('isSearch', 1);
|
||||
$this->set('categorySearch', $category);
|
||||
|
|
@ -743,12 +760,18 @@ class AttributesController extends AppController {
|
|||
$conditions = array();
|
||||
if ($keyword) {
|
||||
$keywordArray = explode("\n", $keyword);
|
||||
$i = 0;
|
||||
$i = 1;
|
||||
$temp = array();
|
||||
foreach ($keywordArray as $keywordArrayElement) {
|
||||
$keywordArrayElement = '%' . trim($keywordArrayElement) . '%';
|
||||
if ($keywordArrayElement != '%%') array_push($temp, array('Attribute.value LIKE' => $keywordArrayElement));
|
||||
$saveWord = trim($keywordArrayElement);
|
||||
$keywordArrayElement = '%' . trim($keywordArrayElement) . '%';
|
||||
if ($keywordArrayElement != '%%') array_push($temp, array('Attribute.value LIKE' => $keywordArrayElement));
|
||||
if ($i == 1 && $saveWord != '') $keyWordText = $saveWord;
|
||||
else if (($i > 1 && $i < 10) && $saveWord != '') $keyWordText = $keyWordText .', '. $saveWord;
|
||||
else if ($i == 10 && $saveWord != '') $keyWordText = $keyWordText . ' and several other keywords';
|
||||
$i++;
|
||||
}
|
||||
$this->set('keywordSearch', $keyWordText);
|
||||
$conditions['OR'] = $temp;
|
||||
}
|
||||
if ($type != 'ALL') {
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ class EventsController extends AppController {
|
|||
|
||||
public $paginate = array(
|
||||
'limit' => 60,
|
||||
'maxLimit' => 9999, // LATER we will bump here on a problem once we have more than 9999 events
|
||||
'maxLimit' => 9999, // LATER we will bump here on a problem once we have more than 9999 events <- no we won't, this is the max a user van view/page.
|
||||
'order' => array(
|
||||
'Event.id' => 'DESC'
|
||||
)
|
||||
|
|
@ -429,7 +429,7 @@ class EventsController extends AppController {
|
|||
$data['Event']['user_id'] = $auth->user('id');
|
||||
$data['Event']['org'] = $auth->user('org');
|
||||
//$data['Event']['org'] = strlen($or) ? $or : $auth->user('org'); // FIXME security - org problem
|
||||
if(!$fromXml){
|
||||
if (!$fromXml) {
|
||||
$data['Event']['orgc'] = $data['Event']['org'];
|
||||
}
|
||||
unset ($data['Event']['id']);
|
||||
|
|
@ -468,7 +468,7 @@ class EventsController extends AppController {
|
|||
} else {
|
||||
$fieldList = array(
|
||||
'Event' => array('org', 'orgc', 'date', 'risk', 'analysis', 'info', 'user_id', 'published', 'uuid', 'private', 'cluster', 'communitie', 'hop_count', 'dist_change', 'from'),
|
||||
'Attribute' => array('event_id', 'category', 'type', 'value', 'value1', 'value2', 'to_ids', 'uuid', 'revision', 'private', 'cluster', 'communitie')
|
||||
'Attribute' => array('event_id', 'category', 'type', 'value', 'value1', 'value2', 'to_ids', 'uuid', 'revision', 'private', 'cluster', 'communitie', 'dist_change')
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -515,7 +515,7 @@ class EventsController extends AppController {
|
|||
// if (!$this->_IsAdmin()) {
|
||||
$this->Event->read(null, $id);
|
||||
// // check for if private and user not authorised to edit, go away
|
||||
if(!$this->isSiteAdmin() && !$this->checkAction('perm_sync') && $this->Event->data['Event']['distribution'] == 'Your organization only'){
|
||||
if (!$this->isSiteAdmin() && !$this->checkAction('perm_sync') && $this->Event->data['Event']['distribution'] == 'Your organization only') {
|
||||
if (($this->Event->data['Event']['org'] != $this->_checkOrg()) || !($this->checkAction('perm_modify'))) {
|
||||
$this->Session->setFlash(__('You are not authorised to do that.'));
|
||||
$this->redirect(array('controller' => 'events', 'action' => 'index'));
|
||||
|
|
@ -561,6 +561,12 @@ class EventsController extends AppController {
|
|||
} else {
|
||||
$this->set('canEditDist', false);
|
||||
}
|
||||
|
||||
$fieldList = array(
|
||||
'Event' => array('date', 'risk', 'analysis', 'info', 'published', 'uuid', 'dist_change', 'from'),
|
||||
'Attribute' => array('event_id', 'category', 'type', 'value', 'value1', 'value2', 'to_ids', 'uuid', 'revision', 'private', 'communitie', 'cluster', 'dist_change')
|
||||
);
|
||||
|
||||
if ("ii" == Configure::read('CyDefSIG.rest')) {
|
||||
// reposition to get the attribute.id with given uuid
|
||||
$c = 0;
|
||||
|
|
@ -569,15 +575,16 @@ class EventsController extends AppController {
|
|||
$existingAttribute = $this->Event->Attribute->findByUuid($attribute['uuid']);
|
||||
if (count($existingAttribute)) {
|
||||
$this->request->data['Attribute'][$c]['id'] = $existingAttribute['Attribute']['id'];
|
||||
if (!($this->request->data['Attribute'][$c]['dist_change'] > $existingAttribute['Attribute']['dist_change'])) {
|
||||
unset($this->request->data['Attribute'][$c]['private']);
|
||||
unset($this->request->data['Attribute'][$c]['cluster']);
|
||||
unset($this->request->data['Attribute'][$c]['communitie']);
|
||||
}
|
||||
}
|
||||
$c++;
|
||||
}
|
||||
}
|
||||
}
|
||||
$fieldList = array(
|
||||
'Event' => array('date', 'risk', 'analysis', 'info', 'published', 'uuid', 'dist_change', 'from'),
|
||||
'Attribute' => array('event_id', 'category', 'type', 'value', 'value1', 'value2', 'to_ids', 'uuid', 'revision', 'communitie', 'cluster', 'private')
|
||||
);
|
||||
|
||||
if ($this->request->data['Event']['dist_change'] > $existingEvent['Event']['dist_change']) {
|
||||
array_push($fieldList['Event'], 'private', 'communitie', 'cluster');
|
||||
|
|
@ -706,7 +713,7 @@ class EventsController extends AppController {
|
|||
}
|
||||
|
||||
if (!$this->_isSiteAdmin()) {
|
||||
if (!$this->Event->data['Event']['org'] == $this->_checkOrg()){
|
||||
if (!$this->Event->data['Event']['org'] == $this->_checkOrg()) {
|
||||
throw new MethodNotAllowedException();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1 +1,2 @@
|
|||
ALTER TABLE `events` ADD `dist_change` INT NOT NULL DEFAULT '0'
|
||||
ALTER TABLE `events` ADD `dist_change` INT NOT NULL DEFAULT '0'
|
||||
ALTER TABLE `attributes` ADD `dist_change` INT NOT NULL DEFAULT '0'
|
||||
462
app/MYSQL.sql
462
app/MYSQL.sql
|
|
@ -1,230 +1,232 @@
|
|||
-- phpMyAdmin SQL Dump
|
||||
-- version 3.3.9.2
|
||||
-- http://www.phpmyadmin.net
|
||||
--
|
||||
-- Host: localhost
|
||||
-- Generation Time: Jun 14, 2012 at 09:57 AM
|
||||
-- Server version: 5.5.9
|
||||
-- PHP Version: 5.3.6
|
||||
|
||||
SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
|
||||
|
||||
--
|
||||
-- Database: `cydefsig`
|
||||
--
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
--
|
||||
-- Table structure for table `attributes`
|
||||
--
|
||||
|
||||
CREATE TABLE `attributes` (
|
||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
||||
`event_id` int(11) NOT NULL,
|
||||
`category` varchar(255) COLLATE utf8_bin NOT NULL,
|
||||
`type` varchar(100) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
|
||||
`value1` text CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
|
||||
`value2` text CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
|
||||
`to_ids` tinyint(1) NOT NULL DEFAULT '1',
|
||||
`uuid` varchar(40) COLLATE utf8_bin NOT NULL,
|
||||
`revision` int(10) NOT NULL DEFAULT '0',
|
||||
`private` tinyint(1) NOT NULL,
|
||||
`cluster` tinyint(1) NOT NULL,
|
||||
`communitie` tinyint(1) NOT NULL,
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `event_id` (`event_id`),
|
||||
KEY `value1_key` (`value1`(5)),
|
||||
KEY `value2_key` (`value2`(5))
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin AUTO_INCREMENT=1 ;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
--
|
||||
-- Table structure for table `blacklist`
|
||||
--
|
||||
|
||||
CREATE TABLE `blacklist` (
|
||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
||||
`name` varchar(254) NOT NULL,
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin AUTO_INCREMENT=1 ;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
--
|
||||
-- Table structure for table `bruteforces`
|
||||
--
|
||||
|
||||
CREATE TABLE `bruteforces` (
|
||||
`ip` varchar(255) COLLATE utf8_bin NOT NULL,
|
||||
`username` varchar(255) COLLATE utf8_bin NOT NULL,
|
||||
`expire` datetime NOT NULL
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
--
|
||||
-- Table structure for table `correlations`
|
||||
--
|
||||
|
||||
DROP TABLE IF EXISTS `correlations`;
|
||||
CREATE TABLE `correlations` (
|
||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
||||
`1_event_id` int(11) NOT NULL,
|
||||
`1_attribute_id` int(11) NOT NULL,
|
||||
`1_private` tinyint(1) NOT NULL,
|
||||
`event_id` int(11) NOT NULL,
|
||||
`attribute_id` int(11) NOT NULL,
|
||||
`org` varchar(255) COLLATE utf8_bin NOT NULL,
|
||||
`private` tinyint(1) NOT NULL,
|
||||
`cluster` tinyint(1) NOT NULL,
|
||||
`date` date NOT NULL,
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM AUTO_INCREMENT=118 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
--
|
||||
-- Table structure for table `events`
|
||||
--
|
||||
|
||||
CREATE TABLE `events` (
|
||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
||||
`org` varchar(255) COLLATE utf8_bin NOT NULL,
|
||||
`date` date NOT NULL,
|
||||
`risk` enum('Undefined','Low','Medium','High') COLLATE utf8_bin NOT NULL,
|
||||
`info` text CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
|
||||
`user_id` int(11) NOT NULL,
|
||||
`published` tinyint(1) NOT NULL DEFAULT '0',
|
||||
`uuid` varchar(40) COLLATE utf8_bin NOT NULL,
|
||||
`revision` int(10) NOT NULL DEFAULT '0',
|
||||
`private` tinyint(1) NOT NULL,
|
||||
`cluster` tinyint(1) NOT NULL,
|
||||
`analysis` tinyint(4) NOT NULL,
|
||||
`communitie` tinyint(1) NOT NULL,
|
||||
`attribute_count` int(11) UNSIGNED DEFAULT NULL,
|
||||
`hop_count` int(11) UNSIGNED DEFAULT 0,
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin AUTO_INCREMENT=1 ;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
--
|
||||
-- Table structure for table `roles`
|
||||
--
|
||||
|
||||
CREATE TABLE `roles` (
|
||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
||||
`name` varchar(100) COLLATE utf8_bin NOT NULL,
|
||||
`created` datetime NOT NULL,
|
||||
`modified` datetime NOT NULL,
|
||||
`perm_add` tinyint(1) NOT NULL,
|
||||
`perm_modify` tinyint(1) NOT NULL,
|
||||
`perm_modify_org` tinyint(1) NOT NULL,
|
||||
`perm_publish` tinyint(1) NOT NULL,
|
||||
`perm_sync` tinyint(1) NOT NULL,
|
||||
`perm_full` tinyint(1) NOT NULL,
|
||||
`perm_auth` tinyint(1) NOT NULL,
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin AUTO_INCREMENT=1 ;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
--
|
||||
-- Table structure for table `logs`
|
||||
--
|
||||
|
||||
CREATE TABLE `logs` (
|
||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
||||
`title` varchar(255) COLLATE utf8_bin NOT NULL,
|
||||
`created` datetime NOT NULL,
|
||||
`model` varchar(20) COLLATE utf8_bin NOT NULL,
|
||||
`model_id` int(11) NOT NULL,
|
||||
`action` varchar(20) COLLATE utf8_bin NOT NULL,
|
||||
`user_id` int(11) NOT NULL,
|
||||
`change` varchar(255) COLLATE utf8_bin,
|
||||
`email` varchar(255) COLLATE utf8_bin NOT NULL,
|
||||
`org` varchar(255) COLLATE utf8_bin NOT NULL,
|
||||
`description` varchar(255) COLLATE utf8_bin NOT NULL,
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin AUTO_INCREMENT=1 ;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
--
|
||||
-- Table structure for table `regexp`
|
||||
--
|
||||
|
||||
CREATE TABLE `regexp` (
|
||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
||||
`regexp` varchar(255) COLLATE utf8_bin NOT NULL,
|
||||
`replacement` varchar(255) COLLATE utf8_bin NOT NULL,
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM AUTO_INCREMENT=16 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
--
|
||||
-- Table structure for table `servers`
|
||||
--
|
||||
|
||||
CREATE TABLE `servers` (
|
||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
||||
`url` varchar(255) COLLATE utf8_bin NOT NULL,
|
||||
`authkey` varchar(40) COLLATE utf8_bin NOT NULL,
|
||||
`org` varchar(255) COLLATE utf8_bin NOT NULL,
|
||||
`organization` varchar(10) COLLATE utf8_bin NOT NULL,
|
||||
`push` tinyint(1) NOT NULL,
|
||||
`pull` tinyint(1) NOT NULL,
|
||||
`lastpushedid` int(11) NOT NULL,
|
||||
`lastpulledid` int(11) NOT NULL,
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin AUTO_INCREMENT=1 ;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
--
|
||||
-- Table structure for table `users`
|
||||
--
|
||||
|
||||
CREATE TABLE `users` (
|
||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
||||
`password` varchar(40) COLLATE utf8_bin NOT NULL,
|
||||
`org` varchar(255) COLLATE utf8_bin NOT NULL,
|
||||
`email` varchar(255) COLLATE utf8_bin NOT NULL,
|
||||
`autoalert` tinyint(1) NOT NULL,
|
||||
`authkey` varchar(40) COLLATE utf8_bin NOT NULL,
|
||||
`invited_by` int(11) NOT NULL,
|
||||
`gpgkey` longtext COLLATE utf8_bin NOT NULL,
|
||||
`nids_sid` int(15) NOT NULL,
|
||||
`termsaccepted` tinyint(1) NOT NULL,
|
||||
`change_pw` tinyint(1) NOT NULL,
|
||||
`newsread` date NOT NULL,
|
||||
`role_id` int(11) NOT NULL,
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `email` (`email`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin AUTO_INCREMENT=2 ;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
--
|
||||
-- Table structure for table `whitelist`
|
||||
--
|
||||
|
||||
CREATE TABLE `whitelist` (
|
||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
||||
`name` varchar(254) NOT NULL,
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin AUTO_INCREMENT=1 ;
|
||||
|
||||
|
||||
--
|
||||
-- Dumping data for table `attributes`
|
||||
--
|
||||
|
||||
-- Dumping data for table `users`
|
||||
--
|
||||
|
||||
INSERT INTO `users` (`id`, `password`, `org`, `email`, `autoalert`, `authkey`, `invited_by`, `gpgkey`, `nids_sid`, `termsaccepted`, `newsread`, `role_id`) VALUES(1, 'babc86e0869015b3f0b4d48ca48700d3a9d1b9d7', 'ADMIN', 'admin@admin.test', 0, 'vlf4o42bYSVVWLm28jLB85my4HBZWXTri8vGdySb', 1, '', 4000000, 0, '2012-03-13', '');
|
||||
INSERT INTO `regexp` (`id`, `regexp`, `replacement`) VALUES (1,'/C:.Users.(\\w+).AppData.Local.Temp./','%TEMP%\\\\'),(3,'/C:.Users.(\\w+).AppData.Local./','%LOCALAPPDATA%\\\\'),(4,'/C:.Users.(\\w+).AppData.Roaming./','%APPDATA%\\\\'),(5,'/C:.Users.(\\w+)./','%UserProfile%\\\\'),(6,'/C:.Documents and Settings.(\\w+) (\\w+)./','%UserProfile%\\\\'),(7,'/C:.DOCUME~1.(\\w+)./','%UserProfile%\\\\'),(8,'/C:.Documents and Settings.All Users/','%AllUsersProfile%'),(9,'/.REGISTRY.USER.S(-[0-9]{1}){2}-[0-9]{2}(-[0-9]{9}){1}(-[0-9]{10}){1}-[0-9]{9}-[0-9]{4}/','HKCU'),(10,'@.REGISTRY.USER.S(-[0-9]{1}){2}-[0-9]{2}(-[0-9]{10}){2}-[0-9]{9}-[0-9]{4}@','HKCU'),(11,'@.REGISTRY.USER.S(-[0-9]{1}){2}-[0-9]{2}(-[0-9]{10}){3}-[0-9]{4}@','HKCU'),(13,'@.REGISTRY.MACHINE.@','HKLM\\\\'),(14,'@.Registry.Machine.@','HKLM\\\\'),(15,'','not allowed'),(16,'/not allowed/',''),(26,'/%AppData\\\\\\\\/','%AppData%'),(27,'/%APPDATA%/','%AppData%'),(20,'','replacements to uniform the data'),(25,'/%allusers%/','%AllUsers%'),(28,'/%APPDATA%/','%AppData%'),(29,'/%LocalSettings&\\\\\\\\/','%LocalSettings%'),(30,'/%Programfiles%/','%ProgramFiles%'),(31,'/%systemroot%/','%SystemRoot%'),(32,'/%Temp\\\\\\\\/','%TEMP%'),(33,'/%Temp%/','%TEMP%'),(34,'/%temp%/','%TEMP%'),(35,'/%UserProfile\\\\\\\\/','%UserProfile%'),(36,'/%userprofile%/','%UserProfile%'),(37,'/%Windir%/','%windir%'),(38,'/%WINDIR%/','%windir%');
|
||||
-- phpMyAdmin SQL Dump
|
||||
-- version 3.3.9.2
|
||||
-- http://www.phpmyadmin.net
|
||||
--
|
||||
-- Host: localhost
|
||||
-- Generation Time: Jun 14, 2012 at 09:57 AM
|
||||
-- Server version: 5.5.9
|
||||
-- PHP Version: 5.3.6
|
||||
|
||||
SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
|
||||
|
||||
--
|
||||
-- Database: `cydefsig`
|
||||
--
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
--
|
||||
-- Table structure for table `attributes`
|
||||
--
|
||||
|
||||
CREATE TABLE `attributes` (
|
||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
||||
`event_id` int(11) NOT NULL,
|
||||
`category` varchar(255) COLLATE utf8_bin NOT NULL,
|
||||
`type` varchar(100) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
|
||||
`value1` text CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
|
||||
`value2` text CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
|
||||
`to_ids` tinyint(1) NOT NULL DEFAULT '1',
|
||||
`uuid` varchar(40) COLLATE utf8_bin NOT NULL,
|
||||
`revision` int(10) NOT NULL DEFAULT '0',
|
||||
`private` tinyint(1) NOT NULL,
|
||||
`cluster` tinyint(1) NOT NULL,
|
||||
`communitie` tinyint(1) NOT NULL,
|
||||
`dist_change` int(11) NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `event_id` (`event_id`),
|
||||
KEY `value1_key` (`value1`(5)),
|
||||
KEY `value2_key` (`value2`(5))
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin AUTO_INCREMENT=1 ;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
--
|
||||
-- Table structure for table `blacklist`
|
||||
--
|
||||
|
||||
CREATE TABLE `blacklist` (
|
||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
||||
`name` varchar(254) NOT NULL,
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin AUTO_INCREMENT=1 ;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
--
|
||||
-- Table structure for table `bruteforces`
|
||||
--
|
||||
|
||||
CREATE TABLE `bruteforces` (
|
||||
`ip` varchar(255) COLLATE utf8_bin NOT NULL,
|
||||
`username` varchar(255) COLLATE utf8_bin NOT NULL,
|
||||
`expire` datetime NOT NULL
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
--
|
||||
-- Table structure for table `correlations`
|
||||
--
|
||||
|
||||
DROP TABLE IF EXISTS `correlations`;
|
||||
CREATE TABLE `correlations` (
|
||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
||||
`1_event_id` int(11) NOT NULL,
|
||||
`1_attribute_id` int(11) NOT NULL,
|
||||
`1_private` tinyint(1) NOT NULL,
|
||||
`event_id` int(11) NOT NULL,
|
||||
`attribute_id` int(11) NOT NULL,
|
||||
`org` varchar(255) COLLATE utf8_bin NOT NULL,
|
||||
`private` tinyint(1) NOT NULL,
|
||||
`cluster` tinyint(1) NOT NULL,
|
||||
`date` date NOT NULL,
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM AUTO_INCREMENT=118 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
--
|
||||
-- Table structure for table `events`
|
||||
--
|
||||
|
||||
CREATE TABLE `events` (
|
||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
||||
`org` varchar(255) COLLATE utf8_bin NOT NULL,
|
||||
`date` date NOT NULL,
|
||||
`risk` enum('Undefined','Low','Medium','High') COLLATE utf8_bin NOT NULL,
|
||||
`info` text CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
|
||||
`user_id` int(11) NOT NULL,
|
||||
`published` tinyint(1) NOT NULL DEFAULT '0',
|
||||
`uuid` varchar(40) COLLATE utf8_bin NOT NULL,
|
||||
`revision` int(10) NOT NULL DEFAULT '0',
|
||||
`private` tinyint(1) NOT NULL,
|
||||
`cluster` tinyint(1) NOT NULL,
|
||||
`analysis` tinyint(4) NOT NULL,
|
||||
`communitie` tinyint(1) NOT NULL,
|
||||
`attribute_count` int(11) UNSIGNED DEFAULT NULL,
|
||||
`hop_count` int(11) UNSIGNED DEFAULT 0,
|
||||
`dist_change` int(11) NOT NULL DEFAULT '0'
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin AUTO_INCREMENT=1 ;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
--
|
||||
-- Table structure for table `roles`
|
||||
--
|
||||
|
||||
CREATE TABLE `roles` (
|
||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
||||
`name` varchar(100) COLLATE utf8_bin NOT NULL,
|
||||
`created` datetime NOT NULL,
|
||||
`modified` datetime NOT NULL,
|
||||
`perm_add` tinyint(1) NOT NULL,
|
||||
`perm_modify` tinyint(1) NOT NULL,
|
||||
`perm_modify_org` tinyint(1) NOT NULL,
|
||||
`perm_publish` tinyint(1) NOT NULL,
|
||||
`perm_sync` tinyint(1) NOT NULL,
|
||||
`perm_full` tinyint(1) NOT NULL,
|
||||
`perm_auth` tinyint(1) NOT NULL,
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin AUTO_INCREMENT=1 ;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
--
|
||||
-- Table structure for table `logs`
|
||||
--
|
||||
|
||||
CREATE TABLE `logs` (
|
||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
||||
`title` varchar(255) COLLATE utf8_bin NOT NULL,
|
||||
`created` datetime NOT NULL,
|
||||
`model` varchar(20) COLLATE utf8_bin NOT NULL,
|
||||
`model_id` int(11) NOT NULL,
|
||||
`action` varchar(20) COLLATE utf8_bin NOT NULL,
|
||||
`user_id` int(11) NOT NULL,
|
||||
`change` varchar(255) COLLATE utf8_bin,
|
||||
`email` varchar(255) COLLATE utf8_bin NOT NULL,
|
||||
`org` varchar(255) COLLATE utf8_bin NOT NULL,
|
||||
`description` varchar(255) COLLATE utf8_bin NOT NULL,
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin AUTO_INCREMENT=1 ;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
--
|
||||
-- Table structure for table `regexp`
|
||||
--
|
||||
|
||||
CREATE TABLE `regexp` (
|
||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
||||
`regexp` varchar(255) COLLATE utf8_bin NOT NULL,
|
||||
`replacement` varchar(255) COLLATE utf8_bin NOT NULL,
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM AUTO_INCREMENT=16 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
--
|
||||
-- Table structure for table `servers`
|
||||
--
|
||||
|
||||
CREATE TABLE `servers` (
|
||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
||||
`url` varchar(255) COLLATE utf8_bin NOT NULL,
|
||||
`authkey` varchar(40) COLLATE utf8_bin NOT NULL,
|
||||
`org` varchar(255) COLLATE utf8_bin NOT NULL,
|
||||
`organization` varchar(10) COLLATE utf8_bin NOT NULL,
|
||||
`push` tinyint(1) NOT NULL,
|
||||
`pull` tinyint(1) NOT NULL,
|
||||
`lastpushedid` int(11) NOT NULL,
|
||||
`lastpulledid` int(11) NOT NULL,
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin AUTO_INCREMENT=1 ;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
--
|
||||
-- Table structure for table `users`
|
||||
--
|
||||
|
||||
CREATE TABLE `users` (
|
||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
||||
`password` varchar(40) COLLATE utf8_bin NOT NULL,
|
||||
`org` varchar(255) COLLATE utf8_bin NOT NULL,
|
||||
`email` varchar(255) COLLATE utf8_bin NOT NULL,
|
||||
`autoalert` tinyint(1) NOT NULL,
|
||||
`authkey` varchar(40) COLLATE utf8_bin NOT NULL,
|
||||
`invited_by` int(11) NOT NULL,
|
||||
`gpgkey` longtext COLLATE utf8_bin NOT NULL,
|
||||
`nids_sid` int(15) NOT NULL,
|
||||
`termsaccepted` tinyint(1) NOT NULL,
|
||||
`change_pw` tinyint(1) NOT NULL,
|
||||
`newsread` date NOT NULL,
|
||||
`role_id` int(11) NOT NULL,
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `email` (`email`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin AUTO_INCREMENT=2 ;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
--
|
||||
-- Table structure for table `whitelist`
|
||||
--
|
||||
|
||||
CREATE TABLE `whitelist` (
|
||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
||||
`name` varchar(254) NOT NULL,
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin AUTO_INCREMENT=1 ;
|
||||
|
||||
|
||||
--
|
||||
-- Dumping data for table `attributes`
|
||||
--
|
||||
|
||||
-- Dumping data for table `users`
|
||||
--
|
||||
|
||||
INSERT INTO `users` (`id`, `password`, `org`, `email`, `autoalert`, `authkey`, `invited_by`, `gpgkey`, `nids_sid`, `termsaccepted`, `newsread`, `role_id`) VALUES(1, 'babc86e0869015b3f0b4d48ca48700d3a9d1b9d7', 'ADMIN', 'admin@admin.test', 0, 'vlf4o42bYSVVWLm28jLB85my4HBZWXTri8vGdySb', 1, '', 4000000, 0, '2012-03-13', '');
|
||||
INSERT INTO `regexp` (`id`, `regexp`, `replacement`) VALUES (1,'/C:.Users.(\\w+).AppData.Local.Temp./','%TEMP%\\\\'),(3,'/C:.Users.(\\w+).AppData.Local./','%LOCALAPPDATA%\\\\'),(4,'/C:.Users.(\\w+).AppData.Roaming./','%APPDATA%\\\\'),(5,'/C:.Users.(\\w+)./','%UserProfile%\\\\'),(6,'/C:.Documents and Settings.(\\w+) (\\w+)./','%UserProfile%\\\\'),(7,'/C:.DOCUME~1.(\\w+)./','%UserProfile%\\\\'),(8,'/C:.Documents and Settings.All Users/','%AllUsersProfile%'),(9,'/.REGISTRY.USER.S(-[0-9]{1}){2}-[0-9]{2}(-[0-9]{9}){1}(-[0-9]{10}){1}-[0-9]{9}-[0-9]{4}/','HKCU'),(10,'@.REGISTRY.USER.S(-[0-9]{1}){2}-[0-9]{2}(-[0-9]{10}){2}-[0-9]{9}-[0-9]{4}@','HKCU'),(11,'@.REGISTRY.USER.S(-[0-9]{1}){2}-[0-9]{2}(-[0-9]{10}){3}-[0-9]{4}@','HKCU'),(13,'@.REGISTRY.MACHINE.@','HKLM\\\\'),(14,'@.Registry.Machine.@','HKLM\\\\'),(15,'','not allowed'),(16,'/not allowed/',''),(26,'/%AppData\\\\\\\\/','%AppData%'),(27,'/%APPDATA%/','%AppData%'),(20,'','replacements to uniform the data'),(25,'/%allusers%/','%AllUsers%'),(28,'/%APPDATA%/','%AppData%'),(29,'/%LocalSettings&\\\\\\\\/','%LocalSettings%'),(30,'/%Programfiles%/','%ProgramFiles%'),(31,'/%systemroot%/','%SystemRoot%'),(32,'/%Temp\\\\\\\\/','%TEMP%'),(33,'/%Temp%/','%TEMP%'),(34,'/%temp%/','%TEMP%'),(35,'/%UserProfile\\\\\\\\/','%UserProfile%'),(36,'/%userprofile%/','%UserProfile%'),(37,'/%Windir%/','%windir%'),(38,'/%WINDIR%/','%windir%');
|
||||
|
|
|
|||
|
|
@ -382,7 +382,6 @@ class Attribute extends AppModel {
|
|||
$this->data['Attribute']['value2'] = '';
|
||||
}
|
||||
}
|
||||
|
||||
// always return true after a beforeSave()
|
||||
return true;
|
||||
}
|
||||
|
|
@ -682,7 +681,6 @@ class Attribute extends AppModel {
|
|||
break;
|
||||
case 'link':
|
||||
if (preg_match('#^(http|ftp)(s)?\:\/\/((([a-z|0-9|\-]{1,25})(\.)?){2,7})($|/.*$)#i', $value) && !preg_match("#\n#", $value)) {
|
||||
debug('here');
|
||||
$returnValue = true;
|
||||
}
|
||||
break;
|
||||
|
|
|
|||
Loading…
Reference in New Issue