Commit Graph

95 Commits (5ca8ff9571ed8fc8479f9f2775ed38de3f0b8e10)

Author SHA1 Message Date
Christophe Vandeplas 512c74e7bd minor cleanup 2013-05-22 12:49:40 +02:00
Christophe Vandeplas 62a3da46f2 removed useless hop_count 2013-05-22 08:18:34 +02:00
Christophe Vandeplas 2776513395 moved fragmented massagedata to Model::beforeValidate() 2013-04-30 08:20:23 +02:00
Christophe Vandeplas 23742c543c rewrote fetching of the related events 2013-04-22 15:04:27 +02:00
Andras Iklody 9a6733acfd Removal of deprecated code
- The flag private is deprecated, removed together with the code that was
  affected by it
2013-04-17 11:13:09 +02:00
Andras Iklody 8e6852e037 Export distribution
- Export didn't take into account distribution rules, should be fixed

- Fixed a bug with editing attributes
2013-02-28 17:16:52 +01:00
Andras Iklody fcd91b1654 Previous commit was slightly off
Changed the placing of the unset, as it broke the push of attachments.
Should be fine now.
2013-02-21 10:55:49 +01:00
Andras Iklody b1174c3733 Major bug with attributes disappearing during sync
Found a bug where an instance that has a lower attribute count pushing to
another would cause the attributes with equal attribute ID to get
overwritten with the pushed ones. Unsetting the attribute ID before the
push fixes this.
2013-02-21 10:24:48 +01:00
Andras Iklody 0f947085cb Reworked the sync / release control
- Fixed issues with the sync
	- Secondary publishes on remote servers failed
	- Introduced new fields in events to stop backward traverse of
	  edit information that lead to low performance and eroneous
	  distribution information updates when more than 2 servers were
	  linked
	- Deletion of an attribute now deletes on remote servers

- Changes to the event ownership
	- Original creator org now noted in the event itself
	- Only original creator org can change distribution
	- Events will show up with the original creator org for users
	  (admins can see both that and the owner of the event on the
	  local instance)
	- Server.organization now used in junction with the connecting
	  user's org and the instance's org (from the bootstrap) to
	  determine distribution flow control and access rights

- Lots of minor changes
2013-02-19 15:37:35 +01:00
Andras Iklody e88a3a9cf7 Updates to security
- perm_auth new toggle, can disable auth key usage for a role

- prevents sync / rest with a perm_auth == false key

- some changes to sync to provide better feedback on why it failed

- rewording of distribution options
2013-02-06 17:45:43 +01:00
Andras Iklody 7f6f166838 Fixes to access rights, some sanitization, etc
- Admins cannot manually change anyone's authkey, they need to generate a
  new one via the reset link

- Some pages could be accessed by changing the url - fixed (though needs
  further testing)

- Edited a change in the manual that may have been confusing

- Some changes to the way ACL is set up - still needs more work
2013-02-04 17:55:35 +01:00
Andras 8d88bcb2b5 Fix for the synchronisation
An error in the pull fix broke the push/publish feature. Fixed.
2013-01-27 21:27:58 +01:00
Andras Iklody ce4bf4bd1b Fixed push/publish
Fixed a few issues that caused push/publish not to work
2013-01-24 15:10:59 +01:00
Andras Iklody 2718bc6c09 Slight change to distribution description
Changed the explanation for each distribution level on event creation
2013-01-22 15:14:08 +01:00
Noud de Brouwer 6e06f665a8 Blacklist
Blacklist gets activated on Event.info and Attribute.value.
2013-01-10 14:43:37 +00:00
Noud de Brouwer 1e518f8bc0 Import Regexp
Renamed Import Whitelist to Import Regexp.
2012-12-20 18:47:38 +00:00
Andras Iklody 879154eab2 Fixed deprecated errors
Removed cause of deprecated errors (Pass by reference)
2012-12-20 14:48:23 +01:00
Noud de Brouwer f6c140e1dc coding standards
Coding Standards.
2012-12-19 13:34:40 +00:00
Andras Iklody 2497f87a41 Removed option "Sandbox" from analysis 2012-12-19 10:21:34 +01:00
Noud de Brouwer 2643da164c coding standards
Coding Standards.
2012-12-18 19:36:34 +00:00
Noud de Brouwer d89ab91dee coding standards
Coding Standards.
2012-12-18 16:44:07 +00:00
Noud de Brouwer 8864ee78f7 generateAllFor<FieldName>
so we can use an URL like:
http://localhost/<TableName>/generateAllFor<FieldName>/newValue/oldValue
for example:
http://localhost/events/generateAllForAnalysis/0/null
http://localhost/users/generateAllForInvitedBy/1/0
http://localhost/users/generateAllForRoleId/1/0
2012-12-18 03:50:52 +00:00
Andras Iklody 38506ecaf8 Added missing 4th option to analysis levels 2012-12-17 17:52:30 +01:00
Andras Iklody 7def9f6afc Fixed an issue with the events 2012-12-17 17:31:10 +01:00
Andras Iklody 1ceadab700 Added features from branch analysis_levels
-Analaysis levels setable for events as per milestone item 94
-Password change forced as per milestone item 109
-Added feedback on entered search terms for search attributes
-fixed the authentication issue
-some minor fixes
2012-12-17 15:51:30 +01:00
noud 9e9f34cb58 Merge branch 'master' into develop 2012-12-13 16:26:29 +01:00
noud 5ae254792c oeps
leftover debug() removed.
2012-12-13 16:25:53 +01:00
noud 2903493205 Merge branch 'master' into develop
Conflicts:
	app/Controller/AttributesController.php
	app/Controller/EventsController.php
2012-12-13 16:03:35 +01:00
noud 276cb5df10 RESTfull sync
this is in responce to the email
From: <User1088@QET.BE>
To: <ndebrouwer@hotmail.com>, <andrzej.dereszowski@ncirc.nato.int>
Subject: Re: sync/REST
Date: Fri, 7 Dec 2012 13:30:10 +0000
in this there is a complaint about the RESTfull sync workings.
the email hints about 2 possible options:
i) RESTfull add event without attributes (conform the web interface)
ii) RESTfull add event with attributes (more conform the code)

both are implemented and can be choisen in bootstrap.php by
Configure::write('CyDefSIG.rest', 'ii') or 'i'.
2012-12-13 15:52:00 +01:00
noud 094719fa01 Merge branch 'master' into develop
Conflicts:
	app/Controller/AttributesController.php
	app/Controller/EventsController.php
	app/Controller/ServersController.php
	app/Model/Event.php
2012-12-12 18:01:39 +01:00
noud 079ce88793 RESTfull sync
Let RESTfull only work conform the web pages (to Christophes wish),
so add/edit event apart from add/edit attribute.
(there is annotation in the code to revert back to full RESTfull and
add/edit the attribute(s) alongside add/edit the event.)
2012-12-11 16:11:45 +01:00
noud 6f4b72f214 RESTfull sync
redone delete attribute and add that to the sync.
2012-12-11 10:33:32 +01:00
noud 718691a627 RESTfull
make RESTfull event add and edit work again.
2012-12-10 13:49:56 +01:00
noud e24ff690bb RESTfull/sync
redid the sync, so if add and exist, send HTTP 302 and different
Location, and do edit there.
Still, the final result has to compare the attributes and if needed
RESTfull delete.
2012-12-07 13:56:19 +01:00
noud 2af02aa100 input regex
use RegexBehavior on Event.info and Attribute.value.
2012-11-30 13:52:09 +01:00
noud eff2f77126 trim
use the TrimBehavior on all inputable models.
2012-11-29 09:35:57 +01:00
noud 1e4597c009 distribution
if distribute upstream, do not alter org, user_id nor distribution
settings.
2012-11-28 11:09:08 +01:00
noud a3524bb0ee coding standards
correct conform coding standards.
2012-11-27 12:51:00 +01:00
noud fb6014efc4 coding standards
better parameters on callback routines.
2012-11-23 08:57:34 +01:00
noud 5d58c52281 sync
corrected pull for events having no distributable attributes.
2012-11-20 14:35:02 +01:00
noud 957b3e27b8 Merge branch 'master' into develop
Conflicts:
	app/Controller/ServersController.php
2012-11-20 11:01:18 +01:00
noud b2c268845f code standards
respect code standards.
2012-11-19 14:49:38 +01:00
noud 52c9114694 sync
array correction done so no 2 kinda the same tests during pull.
2012-11-19 13:42:41 +01:00
noud 543f7c3570 sync
pull goes okay with just one event.
pull with multiple events was already okay.
2012-11-19 13:25:40 +01:00
noud 1cddb6abe0 distribution
conform latest, having:
- Your organization only
- This server-only
- This Community-only
- Connected communities
- All communities

Push is tested, pull not yet.
2012-11-16 15:25:57 +01:00
noud 247525ccbf sync (publish)
Event publish button in events index and event view does
report push failure(s) if any remote server is down.
2012-11-16 10:09:04 +01:00
noud ea0ab59e4f code standards
corrections toward code standards.
2012-11-14 17:16:36 +01:00
noud 2785512268 distribution
removed No push leftovers as a distribution.
2012-11-07 15:41:50 +01:00
noud f66b199f26 distribution
removed No push as a distribution.
2012-11-05 13:05:31 +01:00
noud d17d5b6b8a distribution
do not push Community nor No push conform private.
2012-11-02 13:37:33 +01:00