Commit Graph

43 Commits (49cf9400aa5a30115a6e7956217854fa88b33621)

Author SHA1 Message Date
noud d86a0b0639 Audit log
paging now works.
2012-10-30 15:17:13 +01:00
noud f3066ddbf8 minor
cleanup of groups, logs and whitelists views.
2012-10-30 15:01:59 +01:00
noud e300ab7ffa Merge branch 'master' of ssh://misp.ncirc.nato.int/home/git/cydefsig.git 2012-10-22 15:14:33 +02:00
noud 5984f57fb9 CakePHP
CakePHP update from 2.2.2 to 2.2.3
2012-10-22 13:26:49 +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 f8a0e0c6cf Routes (logs pagination)
recommitted to be sure it's in repo.
2012-10-17 09:32:07 +02:00
noud aea3aa5934 xxx.default.php
put plugins loading into bootstrap.default.php
2012-10-10 11:43:04 +02:00
noud 870372fb07 Merge branch 'master' into develop
Conflicts:
	app/Config/bootstrap.php
2012-10-10 08:37:12 +02:00
Andrzej Dereszowski 0a5d506847 Merge branch 'master' of ssh://misp.ncirc.nato.int:55555/home/git/cydefsig 2012-10-09 14:49:41 +02:00
Andrzej Dereszowski c90ec416f0 Configuration files renamed to better handle git merges on production systems.
Please add new features with their default values. Their should contain only example values.

	renamed:    app/Config/bootstrap.php -> app/Config/bootstrap.default.php
	renamed:    app/Config/core.php -> app/Config/core.default.php
	renamed:    app/Config/database.php -> app/Config/database.default.php
2012-10-09 14:44:25 +02:00
noud d112775251 Merge branch 'master' into develop 2012-10-09 13:10:27 +02:00
noud 1d7860f633 Version.
Display a version in header.
2012-10-09 11:45:21 +02:00
noud ec0892a6ad Merge branch 'master' into develop
Conflicts:
	app/Config/bootstrap.php
2012-09-25 15:54:25 +02:00
noud 18fb8a7a64 CakePHP
Update from CakePHP to version 2.2.2
as well as needed patch files.
2012-09-25 15:41:58 +02:00
noud 0d56dfef58 db
small notes about database.
2012-09-25 12:43:24 +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 113b445bcf Better placement of plugins (touching RBAC & Audit log)
If it's just an existing behavior or lib,
place it in a plugin directory structure in <cydefsig>/plugins.

If there is a need to change an extern existing plugin,
extend the existing plugin by a new plugin in <cydefsig>/app/Plugin.

This way there is a very clean devision between own and external code.
The external code can be updated without touching own nor changed code.
2012-09-20 11:34:41 +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
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
Christophe Vandeplas 35e1a455cd further cleanup of logo improvement 2012-08-31 10:45:54 +02:00
Christophe Vandeplas be10754474 improve logo and email display features 2012-08-31 10:23:40 +02:00
noud 5c39a46fc8 Sync.
Better square and croped images.
2012-08-29 13:11:00 +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
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
Andrzej Dereszowski e2df7442a4 shit 2012-07-02 16:26:50 +02:00
noud 8216a563dc Servers.lastpushedid and Servers.lastpulledid. 2012-06-29 10:27:19 +02:00
noud 0eb52796ae Admin Paginator fix. 2012-06-29 08:56:00 +02:00
noud 4a12bf960f Admin Paginator fix. 2012-06-29 08:35:32 +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 6e9ab97791 implementation of a anti-brute-force password guessing mechanism. 2012-06-06 11:00:02 +02:00
Christophe Vandeplas 39fb9bca1d Attribute types validation is now a separate function that uses the
Attribute->type_definitions variable
2012-05-31 17:12:26 +02:00
Christophe Vandeplas e452460242 added CyDefSIG.name to allow changing the title of the site 2012-05-04 09:52:45 +02:00
Christophe Vandeplas 9e9837d59d Basic sync push seems to work 2012-05-03 14:32:49 +02:00
Christophe Vandeplas 2142585710 Implemented basics for private, nonsyncable, Events or Attributes. 2012-04-01 18:41:47 +02:00
Christophe Vandeplas bf8ae66e9c First version or REST API to export data 2012-04-01 17:30:00 +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 86b760cd54 Print Cascading Stylesheets and minor layout fixes 2012-03-25 15:02:15 +02: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