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

768 Commits (a1d51d4dfadf9df6b46a13ee8ade5034bd2f577c)

Author SHA1 Message Date
noud 253d8e1b58 Merge branch 'master' into develop 
Conflicts:
	app/Controller/EventsController.php
	app/Model/Attribute.php
	app/View/Events/view.ctp
 2012-09-17 13:02:53 +02:00
noud 0f4a0dffea Sync & Correlation. 
During sync and correlation = db,
an attachment or malware did not get processed into
Attribute.data, so will not be synced.
Now, conform other correlation methods being 'default' or 'sql'
the attachment or malware is synced as well.
(master has been synced with mil.be not using db correlation,
so should have the data.)
 2012-09-13 08:50:30 +02:00
noud f57f78f45b NIAS 
CyDefSIG.showowner=false, to not show email.
CyDefSIG.sync=false, to not show the text 'private'.*)

*) note, this does remove List Servers and no sync from NATO
to MIL.be in functionality besides missing the account so credentials
there.
 2012-09-06 14:18:58 +02:00
noud 07b0498591 Merge branch 'master' of ssh://misp.ncirc.nato.int/home/git/cydefsig.git 2012-09-06 13:45:46 +02:00
noud db222f8e5e REST. 
Small correction to delete attribute after uuid change.
 2012-09-06 08:38:15 +02:00
Christophe Vandeplas 84205bca35 Merge branch 'master' of git@code.lab.modiss.be:cydefsig.git 2012-09-05 17:15:52 +02:00
Christophe Vandeplas 17f7200b88 temporary workaround for bug in slow NIDS export 2012-09-05 17:15:11 +02:00
noud 6b52841521 Login. 
small shell script to reset password. Used like:
./Console/cake password <email> <passwd>
 2012-09-05 13:46:24 +02:00
Christophe Vandeplas e07950c68d removed published from 2012-09-05 13:28:40 +02:00
Andrzej Dereszowski a63e75619f Merge branch 'master' of code.lab.modiss.be:cydefsig 2012-09-05 09:11:17 +02:00
noud 53b22b4c57 Sync. 
On publish and no configured GnuPG, do tell
event is published but no email sent.
 2012-09-05 09:08:44 +02:00
noud abd3b55fef Sync and REST. 
REST delete event working again after uuid change.
 2012-09-05 08:45:59 +02:00
Andrzej Dereszowski 2a7f36d5f9 Merge branch 'master' of code.lab.modiss.be:cydefsig 2012-09-04 12:07:34 +02:00
Christophe Vandeplas fd05d14602 fixes inconsistent relatedAttributes and relatedEvents arrays with 
different correlation implementations
 2012-09-04 16:14:10 +02:00
noud 6303d687ba Sync and gpg. 
If no gnupg installed.. do not tell, for NIAS demo.
 2012-09-04 15:53:11 +02:00
noud 2842e4a81f validation 
add event and empty info now does not MethodNotAllowedException
but Flash and show the invalid.
 2012-09-04 15:29:15 +02:00
Christophe Vandeplas bc0dbd5b97 removes 'Published from' reference 2012-09-04 15:25:45 +02:00
noud f782005c6a Sync. 
small correction after uuid correction,
so delete attribute works again.
 2012-09-03 16:29:22 +02:00
Andrzej Dereszowski 23bbaa9843 Merge branch 'master' of code.lab.modiss.be:cydefsig 2012-09-03 10:29:21 +02:00
noud 488a535fcf REST 
cURL scripts, used besides example-rest.py to do REST testing.
 2012-09-03 13:53:44 +02:00
noud fc1f2c69a4 REST (and Sync) 
Make REST edit work.
 2012-09-03 13:44:19 +02:00
Christophe Vandeplas 8e7312cd9f Merge branch 'master' of git@code.lab.modiss.be:cydefsig.git 2012-09-03 11:36:16 +02:00
Christophe Vandeplas 111644b16a refactored uuid integration (moved to beforeFilter) 2012-09-03 11:35:21 +02:00
noud 8a021ba82d Sync. 
get the user and org correct,
given authkey them are known to the system.
 2012-09-03 10:26:13 +02:00
Christophe Vandeplas 35e1a455cd further cleanup of logo improvement 2012-08-31 10:45:54 +02:00
Christophe Vandeplas 05efc43f36 fixes bug of bad implementation of header logo 2012-08-31 10:45:39 +02:00
Christophe Vandeplas b8fe8bd4eb cleaned up artifacts from refactored logo display 2012-08-31 10:38:14 +02:00
Christophe Vandeplas 79ea3be258 python REST example script 2012-08-31 10:30:45 +02:00
Christophe Vandeplas be10754474 improve logo and email display features 2012-08-31 10:23:40 +02:00
Christophe Vandeplas 33df513f11 fix document-root location (security) 2012-08-31 09:06:29 +02:00
noud 73f5d5e3c9 database schema 
MYSQL.txt is initial schema, so whitelist table must be inhere as well.
 2012-08-30 16:33:12 +02:00
Andrzej Dereszowski 74764d4e8b Merge branch 'master' of code.lab.modiss.be:cydefsig 
Conflicts:
	app/Controller/Component/NidsExportComponent.php
 2012-08-30 10:59:07 +02:00
noud 29c5d29609 Sync. 
Database schema updated for sync and re-added event.user_id.
 2012-08-29 13:41:30 +02:00
noud 5c39a46fc8 Sync. 
Better square and croped images.
 2012-08-29 13:11:00 +02:00
noud 36afd45217 Sync. 
To test it's handy to run a virtual hosted CyDefSIG having it's own
database besides an already existing CyDefSIG.
This is the Apache virtual host setup.
 2012-08-29 08:42:26 +02:00
noud 9a8b963d67 Sync. 
Example data describing the NATO CyDefSIG server.
 2012-08-29 08:40:25 +02:00
noud eb8827314d Sync. 
The actual logos used for visable flags in Events::index.
 2012-08-28 15:49:24 +02:00
noud 4ae71fc963 Sync. 
Sync worked, but we did not know what to do with user_id and org.
Now, on sync, anonymize the user_id, get the Server.organization and put
that into Event.org.
And, display owning flag if Event.user_id or get the Server.logo
belonging to Event.org (=Server.organization) when Event.user_id is
empty (=0).

To this there is organization name and logo in bootstrap and
other organizations names and logos in Servers.
 2012-08-28 15:36:14 +02:00
Christophe Vandeplas 6673b56c61 fixes bug where expired GPG keys break the email-alert system. 2012-08-27 11:23:55 +02:00
noud 6b874a6aff Extra bug. 
Add attribute, do not fill in any, and hit Submit, gives error messages.
 2012-08-24 14:10:20 +02:00
noud ea5ea121e3 Add attribute. 
Add attribute, do not fill in any, and hit Submit, did give error
messages.
 2012-08-24 14:09:17 +02:00
noud 4cec4e69f9 correlation. 
do not use the AttributesController::event now,
just use the old EventsController::view.
 2012-08-24 14:06:08 +02:00
noud 2459bca386 (Audit) logs. 
The writing of the log in User was done by me using calls to the PHP db
driver (during my second or third day). Very wrong given that is driver
and db dependant. Now use CakePHPs calls to have abstraction.
 2012-08-23 10:25:14 +02:00
noud 7d98c5f31e GFI Sandbox upload. 
If add event, give a GFI Sandbox export file upload field option.
Unzip, read .xml, add attachment malware, created files and ip-dst.
 2012-08-22 16:04:55 +02:00
noud 19bb9b0a81 LogableBehavior. 
removed some debug() and fixed writing to syslog when deleting event
with attributes.
 2012-08-22 15:57:22 +02:00
noud 7e23e3bc77 Event.user_id rollback(-part). 2012-08-22 15:19:28 +02:00
noud 8c1cfa731a loggable behaviour. 
some merge correction for events and servers, so we log again.
 2012-08-22 14:39:41 +02:00
noud cf40a908d4 SysLog.SysLog lib import. 2012-08-22 14:05:39 +02:00
Christophe Vandeplas f6e45587e4 bugfix snort rule-rewriting where some required variables were not given 
to the snortRule() function
 2012-08-22 08:46:07 +02:00
noud 474058cc24 use DS in stead of '/'. 2012-08-21 16:57:42 +02:00