MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
3,304 Commits
34 Branches
364 Tags
186 MiB
Commit Graph

201 Commits (4fea371c4b417e6eac5cdefe0baf77840f5752a1)

Author SHA1 Message Date
noud 911c9a8da6 RBAC 
admin can always publish.
 2012-11-09 11:35:32 +01:00
noud 55f9b594d7 RBAC 
just edit your own did still give edit org as well.
can be tested if now correct.
 2012-11-09 10:14:40 +01:00
noud a2bc237bcd RBAC 
should now respect Manage, so also edit, own and org events.‏
 2012-11-08 14:09:52 +01:00
noud 12ebfafe16 RBAC 
role only add could still publish her own events,
this should be not possible anymore.
 2012-11-07 16:02:36 +01:00
noud f66b199f26 distribution 
removed No push as a distribution.
 2012-11-05 13:05:31 +01:00
noud 2b478605a5 Flags 
correct from 50*50 to 48*48, so it's an icon size.
 2012-10-31 15:54:15 +01:00
noud ed56d7c29c distribution 
if distribution is All, so not displayed in an index nor in attributes
per event, there is missing a line-part in IE.
Did add 1 space for All, this will maybe display the line-part again.
 2012-10-30 13:16:46 +01:00
noud f296a9381e RBAC 
real inactive buttons.
 2012-10-25 15:00:43 +02:00
noud e01dd6de77 distribution 
do not display distribution 'All' in Events index or Event view.
 2012-10-24 08:57:41 +02:00
noud 4b096fa584 distribution 
changes and cleanup.
 2012-10-23 11:28:39 +02:00
Andrzej Dereszowski 25e63dda68 Wording change 
Changed Private column to Distribution + some minor vocabulary changes.
 2012-10-22 16:29:08 +02:00
noud e693571fde private 
description in event::view().
 2012-10-22 11:18:53 +02:00
noud 7077d1e8d4 GFI sandbox. 
better representation of a downloadable attribute
in a link (just href the file name, not including the path).
 2012-10-19 10:04:20 +02:00
noud 67e50cb612 Private 
Private events are true private and
running a server in 2 modes (private and sync),
so real private (red) or private to server (amber)
or full distributable (green).

Mind this needs a change to tables events, attributes and correlation.
These are in MYSQL.private.sql.
 2012-10-17 14:45:26 +02:00
noud 8f3d624c1a Merge branch 'master' into develop 
Conflicts:
	app/Controller/AppController.php
	app/Controller/AttributesController.php
	app/Controller/EventsController.php
	app/Controller/ServersController.php
	app/Controller/UsersController.php
	app/Model/Attribute.php
	app/Model/Event.php
	app/Model/Server.php
	app/Model/User.php
	app/View/Attributes/edit.ctp
	app/View/Attributes/index.ctp
	app/View/Elements/actions_menu.ctp
	app/View/Events/add.ctp
	app/View/Events/index.ctp
	app/View/Events/view.ctp
	app/View/Events/xml/view.ctp
	app/View/Servers/index.ctp
	app/View/Users/admin_index.ctp
 2012-09-24 16:02:01 +02:00
noud 1d04652476 CakePHP Coding Standards 
changed to camel caps format where needed.
 2012-09-19 11:05:10 +02:00
noud 94a367c2f5 CakePHP Coding Standards 
http://book.cakephp.org/2.0/en/contributing/cakephp-coding-conventions.html

Eclipse:
Window->Preferences
	General->Editors->Text Editors
		Displayed tab width:	4
		Insert spaces for tabs	NOT
	PHP->Code Style->Formatter
		Tab policy:	Tabs
File->Convert Line Delimeters To->Unix [default]

http://mark-story.com/posts/view/static-analysis-tools-for-php
for instance:
phpcs --standard=CakePHP app/Model/

Not yet done is all camel caps format.
 2012-09-18 15:30:32 +02:00
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
Christophe Vandeplas fd05d14602 fixes inconsistent relatedAttributes and relatedEvents arrays with 
different correlation implementations
 2012-09-04 16:14:10 +02:00
Christophe Vandeplas be10754474 improve logo and email display features 2012-08-31 10:23:40 +02:00
noud 2dea0e347d Correlation performance gain. 
in Config/bootstrap.php add
Configure::write('CyDefSIG.correlation', 'sql');

possible values: 
- default, like it was
- db, correlation in database
- sql, selection on attributes i.s.o. per attribute
  (sql improvement possible if result conform db above)

Network activity, ip-src
30 class-C network ip addresses
(7650 tupels) (time in ms)

          default     db    sql
all         25366  16601  15941
            24839  16604  15611
paginated   16759   8447   6615
            17734   8639   8846

this is used in both:
- events/view/<id>
- attributes/event/<id>
 2012-08-03 12:00:16 +02:00
Andrzej Dereszowski 3ff180e898 Merge branch 'develop_0.2.2-0.2.3' into develop 
Conflicts:
	app/Config/Schema/schema_0.2.2.php
	app/Config/routes.php
	app/Controller/AppController.php
	app/Controller/UsersController.php
	app/Model/User.php
	app/README.txt
 2012-07-24 16:09:48 +02:00
noud 25d5ff4290 Show events with user.email if admin. 2012-07-19 14:53:12 +02:00
deresz dbf7fafea8 Correction to "link" attribute type - links were not actually created. 
Also changed it to proper "cake" way.
 2012-07-04 15:51:19 +02:00
noud 66c5312ea6 DataBase migrate, Audit and Access Control granulation. 2012-06-28 17:24:12 +02:00
root b4558887ce Revert "Audit and ACL first cut." 
This reverts commit 5818231f48.
 2012-06-26 09:40:52 +02:00
noud 5818231f48 Audit and ACL first cut. 2012-06-25 15:54:52 +02:00
Christophe Vandeplas e453ee0e97 Sanitize::html() to h() for views is the way to go 2012-06-05 10:00:36 +02:00
Andrzej Dereszowski 7ee4d29fac Fixed merge conflicts with HEAD at belmod 
Merge branch 'develop' of code.lab.modiss.be:cydefsig into develop

Conflicts:
	app/Controller/EventsController.php
	app/Model/Attribute.php
 2012-05-29 17:19:36 +02:00
Andrzej Dereszowski 1a91c2f49b Help messages implementation (forms and list views). 2012-05-29 16:53:50 +02:00
Christophe Vandeplas c713d6498f fixes previous commit 2012-05-21 13:41:04 +02:00
Christophe Vandeplas 04ffe374a1 layout improvement in attribute display 2012-05-21 13:34:53 +02:00
Christophe Vandeplas aea079b8c4 bugfix in Attribute validation 
Do not search for related attributes for specific types
 2012-04-25 10:30:23 +02:00
Christophe Vandeplas 49aaced78a Merge commit '9e043116228c4866b18e92acb076462845bcf22a' into develop 
Fixed conflicts in: app/View/Events/view.ctp
 2012-04-04 17:53:51 +02:00
Andrzej Dereszowski faffe87ea6 - some bugfixes in validation corrected 
- new attribute type - link to external site
 2012-04-02 19:24:50 +02:00
Andrzej Dereszowski 62ceed286c - signatures are displayed by category always in the same order defined in model 2012-04-02 11:53:44 +02:00
Christophe Vandeplas 2142585710 Implemented basics for private, nonsyncable, Events or Attributes. 2012-04-01 18:41:47 +02:00
Christophe Vandeplas 19eaa12050 Allow publishing of events without sending email. 2012-03-31 22:07:35 +02:00
Christophe Vandeplas 0fff291c67 fixed minor CSRF vulnerability + added google link on vulnerability type 2012-03-31 21:55:09 +02:00
Christophe Vandeplas 95455f51a6 Fixed minor bugs 2012-03-27 18:58:11 +02:00
Christophe Vandeplas 20cddd07db changed alerted -> published 
other minor fixes
 2012-03-27 14:49:31 +02:00
Christophe Vandeplas 7c4394682d Renamed Signature to Attribute 2012-03-26 19:56:44 +02:00
Christophe Vandeplas 803bdbdf87 micro HTML bugfixes in views 2012-03-25 16:25:16 +02:00
Christophe Vandeplas 86b760cd54 Print Cascading Stylesheets and minor layout fixes 2012-03-25 15:02:15 +02:00
Christophe Vandeplas da2687846b Implemented file-upload of attachment or password protected 
malware-samples. Base code contributed by Andrzej Dereszowski
 2012-03-23 20:04:22 +01:00
Christophe Vandeplas 23572019bb Signature is now known as Attribute 2012-03-21 21:25:16 +01:00
Christophe Vandeplas 4bbbfc36c3 Not finished editing -> not published 2012-03-21 11:01:37 +01:00
Christophe Vandeplas c5954b081b Layout improvements 2012-03-20 15:11:02 +01:00
Christophe Vandeplas 495cc1a6c2 UUID support for syncing 2012-03-20 13:40:58 +01:00
Christophe Vandeplas 2c7f01f61e Rename Finish Edit to Publish Event 2012-03-20 08:26:57 +01:00
Christophe Vandeplas 865a24d0bd Migration to CakePHP 2.1. 
Most of the functionality migrated, Q&A review required.
 2012-03-15 15:06:45 +01:00