Commit Graph

132 Commits (4e2685e0c6f965c5fefccf632f9e9e0a49f5156f)

Author SHA1 Message Date
iglocska 4e2685e0c6 More work on the timestamps
- Event correctly changes timestamp when attribute edited in the UI
- Attribute correctly changes timestamp when edited in the UI

- Still very much work in progress, several parts are not supposed to
work yet
2013-06-06 16:03:28 +02:00
iglocska d52b0a6e70 First (still non-working) version of the timestamp + uuid sync
- timestamp field added to events and attributes (int length 11 called
timestamp, default value 0)
- timestamps created on add / edit when apprioriate
- during an add, if an event/attribute is not being pushed through a
sync with an existing timestamp, create a timestamp
- on edit, check whether the timestamp is newer than the old one and
only add the attribute or event then
2013-06-06 14:55:13 +02:00
Christophe Vandeplas e3ed847ba0 fixing some REST API and XML issues 2013-05-28 11:15:21 +02:00
Christophe Vandeplas 3bbd12f461 further cleanup of the REST XML output 2013-05-22 11:21:52 +02:00
Christophe Vandeplas 2776513395 moved fragmented massagedata to Model::beforeValidate() 2013-04-30 08:20:23 +02:00
Andras Iklody 6332dbf05b Removal of more remnants of the old ACL and tightening of the filename
checks

- actAs acl removed from role and user models together with some extra
code related to the ACL

- Fix of the filename regex as pointed out by cvandeplas.
2013-04-29 10:52:07 +02:00
Andras Iklody eeaa071024 Removal of the remains of the old authorization / adding new ones where
needed
2013-04-26 14:43:44 +02:00
Andras Iklody b98818ebfb Small errors with the merge corrected
- some errors managed to slip through during the merge, should be fixed
2013-04-25 15:37:49 +02:00
Andras Iklody 4396cec8ea Integrated ownership, ACL and minor fixes
- Orgs can propose new attributes or changes to existing attributes for
  events that they do not own

- publishing users of the owner organisation can see, accept or discard
  them

- Reworked the access control

- minor fixes
2013-04-25 14:04:08 +02:00
Christophe Vandeplas e9bcacfbc3 fix sanitization in Attributes #96 2013-04-24 15:20:20 +02:00
Andras Iklody ada0fd2bfb Some fixes to indeces not set
- Affecting Event creation, attribute deletion remotely and logging of
  event deletion
2013-04-17 15:40:01 +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
Christophe Vandeplas 8029d7fa29 removes multiple correlation engines Fixes #83 but after testing issue
#95 comes to light
2013-04-16 16:59:12 +02:00
iglocska b134ffd940 Extensions of filenames now validate if a number is included 2013-03-19 14:33:56 +01:00
iglocska 30c4969cbe Update to the validation of file names to allow _ in the extension 2013-03-19 14:31:35 +01:00
iglocska f008eb9f07 Search for attributes by organisation
- New search functionality on request - restrict attributes by
  organisation

- Also, attributes in the list attributes and search attributes result
  pages, that belong to the user's organisation will have a red event ID
2013-03-19 11:54:14 +01:00
iglocska 32de082c88 New export feature
- To restrict the authentication key from being used by interactive users,
implemented a new export page that uses the uses cake's user
authentication

- the old export features still exist for users with perm_auth enabled
  accounts - renamed to automation

- Exporting the events that found attributes belong to in a search
  attributes result page

- exporting of individual events to file by clicking a link in event view
2013-03-18 11:48:36 +01:00
Andras Iklody 019e976783 Removed the js title bubble for related events
- Removed javascripts based title bubble showing the event info in related
  events / attributes and in the search attribute view.

- Replaced it with values provided by extra cake queries as the delay for
  fetching the info field through a js rest request was annoyingly slow

- some coding standards
2013-03-08 13:16:02 +01:00
Andras Iklody 0e18aa099b Attribute and event access
- Updated the check for authorisation to view an event and attribute as
  the system hid some valid combinations (such as a server only attribute
  in a higher distribution level event).
2013-03-07 18:16:00 +01:00
Andras Iklody 32dc28adb9 Update to the admin privileges
- Changed the requirement for a lot of functions to be site admin as
  opposed to admin.
2013-03-05 15:19:58 +01:00
Andras Iklody 4a368918eb Colouring of search terms works in links
- links now have proper colouring to make the found terms more visible
2013-03-04 18:05:17 +01:00
Andras Iklody 036308bc0e Some changes to the search
- changes to the validation of the results

- fixes an issue where the escaping of slashes showed up with a //

- made the found results more visible and case insensitive
2013-03-04 17:33:34 +01:00
Andras Iklody 581fc5e851 Slight update to the filename regex
- accept extensions from 2 to 4 characters in length
2013-03-04 15:42:16 +01:00
Andras Iklody a72503161b Fixed some regex issues and file name validation
- Fixed an issue that caused attribute values to be converted to 1 on
  save in case of an empty regexp table

- Filename validation now happens via whitelisting instead of filename
  sanitization
2013-03-04 14:53:52 +01: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 a0616558e9 Still issues with the attribute search
- should be ok now
2013-02-28 10:16:42 +01:00
Andras Iklody 5ab2de4824 Fix to the updated search attributes
- issue on the live server with the search field left empty, fixed
2013-02-28 09:57:43 +01:00
Andras Iklody 01649046c0 Several things (search, migration)
- Changes to the default setting for non private events after migration

- search attribute update to be able to exclude events
2013-02-27 17:15:09 +01:00
Andras Iklody a735822ca1 Updated the migration script (SQL)
- Script updated based on the issues during testing

- Changed the file upload/downoad mechanism.
2013-02-27 15:24:38 +01:00
Andras Iklody 6dc73314bf 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 list
2013-02-25 16:38:04 +01:00
Andras Iklody 0969752dc5 Attribute edit fixed
- Editing attributes caused an error because the uuid was not passed back
  from the form (and it is used to find the attribute locally for rest)

- UUID is now used from the read attribute for non rest users. In the long
  run it would be cleaner to not allow non rest users to reach that part
  of the code.
2013-02-22 11:29:22 +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 f754eec840 Minor change to the validation
- Some types didn't have any validation info, defaulting in an incorrect
input - fixed

- re-enabled the sanitization of file names
2013-02-11 17:23:07 +01:00
Andras Iklody e17228490b Minor changes to the validation 2013-02-11 15:56:10 +01:00
Andras Iklody afed0f2046 Changes to link validation and minor fixes
- Links get validated now to filter malicios code

- removed a double edit button in the case of an admin editing himself

- fixed an error with adding new attributes
2013-02-11 11:26:34 +01:00
Andras Iklody e976242878 Reworked aros_acos creation
- moved and fixed the aros_acos creation on the new role creation

- new method in appController that sets all the aros_acos from scratch
  (for example for a new instance, or a changed acos / aros table)

- some minor changes, redirects to the terms page on invalid events
  removed, etc.
2013-02-05 17:22:37 +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 Iklody 879a5fb282 Temporary fix for file-uploads under windows
Added an alternate file-upload/download path creation for PHP_OS ==
'WINNT'

Also removed autofill for the login field
2013-01-31 10:25:03 +01:00
Andras Iklody cd78baeb14 Issue with uploading attachments fixed
Uploading an attachment would fail while trying to set the event to
unpublished. Fixed.
2013-01-28 15:51:54 +01:00
Noud de Brouwer 4c83ad3cfe coding standards
Coding Standards.
2013-01-28 08:42:20 +00:00
Noud de Brouwer a6371f5ad8 coding standards
Coding Standards.
2013-01-28 08:32:01 +00:00
Andras Iklody 6afc1e993f Attribute distributions
Added feature to block distribution levels that would get overruled by the
event distribution. The distribution of the event will be the currently
selected distribution when creating an attribute.
2013-01-25 13:44:43 +01:00
Noud de Brouwer 3b07348849 distribution
attributes inherit distribution from event.
2013-01-25 11:25:18 +00:00
Noud de Brouwer 8526459173 Merge branch 'develop' of ssh://misp.ncirc.nato.int/home/git/cydefsig into develop 2013-01-22 10:06:31 +00:00
Andras Iklody 3e0bc0a4fd Small change to batch searches
An empty new line caused every attribute to be displayed. Fixed.
2013-01-18 11:31:06 +01:00
Andras Iklody f544ac2e08 Batch search for attributes
Implementation of request to be able to do batch attribute searches
2013-01-17 16:03:04 +01:00
Noud de Brouwer 4c4a2bcb89 error
behavior error or just plain wrong on our side.
2013-01-16 15:31:52 +00:00
Noud de Brouwer 755f19c560 error
behavior error or just plain wrong on our side.
2013-01-16 15:27:15 +00:00
Noud de Brouwer 4073bd9b65 error
behavior error or just plain wrong on our side.
2013-01-16 14:11:02 +00:00
Noud de Brouwer 804a0cf0f6 PHP practice
array-content.
2013-01-14 16:32:09 +00:00