Commit Graph

315 Commits (1ffa52e032d2d53b95bb118a250c5745e673edb9)

Author SHA1 Message Date
iglocska 3431d2cc0d Rework of the e-mailing, part 1
- Reworking the way e-mails are sent - all of it goes through a centralised e-mail method
- just pass the recipient, recipient encryption key collection, body, alternate body if the message cannot be encrypted, subject, reply to address and pgp key for reply to along and the method will do the rest

- encrypt if possible, check if sending without encryption is allowed, signing, adding attachment for reply to encryption key, using alternate sanitised body if it is enforced for accounts that cannot use encryption is all done in one place

- easy to maintain and expand with future changes (such as the S/MIME pull request on github)
2015-05-25 17:18:39 +02:00
iglocska 9b4974d394 Merge branch 'unencrypted' into hotfix-2.3.69 2015-05-25 10:25:25 +02:00
iglocska 2afea61ea0 Added the missing ways to exploit the rpz functionality
- rpz added to exports, both old-style and with background workers
- per event rpz functionality added
2015-05-20 16:23:42 +02:00
iglocska 35134a7f2e Implemented correct from / to api parameter checks
- based on stevengoossensB's pull request
2015-05-13 16:12:06 +02:00
Iglocska 3abf1d0536 Progress on the sync
- Creating objects whenever necessary during sync (sharing groups, organisations, etc)
- it's still WIP, but time to sleep
2015-04-27 00:44:28 +02:00
Iglocska 6b43b94811 More changes to the sync
- pushes are now taking into account the push_rules and pull_rules fields
2015-04-26 20:13:34 +02:00
Iglocska 1e2ee26635 Further work on the sync
- sharing groups are now correctly checked in restfullEventToServer
- The rules are very simple, the event has to:
  - be of distribution value 2 or 3
  - or 4 given that the attached sharing group meets the following requirements:
    - The sync user is in the sharing group's org list (otherwise he can't transfer it / become the owner)
    - Or the instance that is being synced to has to be set to "all_orgs"
    - The SG has to either not include any instances
    - Or include the instance that is being synced to
2015-04-26 17:59:22 +02:00
Iglocska ad1a15f36e Work on the sync
- commit to update secondary test instance
2015-04-26 13:21:51 +02:00
Iglocska 93c2194e5f Some fixes to the background workers
- also added date tracking on jobs
2015-04-20 13:32:34 +02:00
Iglocska bb5f4a96dd Tags added to the e-mail 2015-04-20 12:12:10 +02:00
Iglocska c24704a6c2 Lots of progress
- further work on implementing the SG changes everywhere
- reworked the alert e-mails
- reworked a lot of the logging
- several convenience methods
2015-04-20 11:46:55 +02:00
iglocska 51ea9c090d Further progress 2015-04-18 07:53:18 +02:00
Iglocska 1e3db8a8ba Further work on the new version
- org checks fixed in a lot of places
- fixed the searches to work with the new organisations
2015-04-14 17:51:38 +02:00
Iglocska b163164450 Further work on the sharing groups 2015-04-13 17:52:04 +02:00
Iglocska 28069a0a0f Further work and some cleanup
- decision to be revised: exports don't expose Sharing groups / org uuids to users unless they are admin (for the future: at least sync users have to be added for the new sync)
2015-04-13 16:20:21 +02:00
Iglocska 5f70207051 Progress in moving all exports to the new distribution system 2015-04-13 12:42:26 +02:00
Iglocska e0ef372392 Merge branch 'master' into feature/sg
Conflicts:
	app/Controller/EventsController.php
	app/Controller/UsersController.php
	app/Model/Event.php
2015-04-12 10:40:31 +02:00
iglocska 0e7b2448d2 Further work on the sharing groups
- correlations should work fine now
- users can only see events they should be allowed to see on the event index / event view / event history view
2015-04-10 15:23:53 +02:00
iglocska 5abd8dfead Further work on the sharing groups:
- changes to the data model
- correlation engine updated
2015-04-09 17:27:34 +02:00
Iglocska 1ff0ade5cb Merge branch 'triple-dots' into hotfix-2.3.59 2015-04-08 22:41:54 +02:00
Iglocska 9f09d6d7e5 Merge branch 'cakeresque-queues' into hotfix-2.3.59 2015-04-08 22:37:30 +02:00
Iglocska 348923691f Merge branch 'stix-info' into hotfix-2.3.59 2015-04-08 22:29:36 +02:00
Iglocska 094f932616 Merge branch 'disallow_unpublished_events' into hotfix-2.3.59 2015-04-08 22:22:22 +02:00
Richard van den Berg c49c387337 Only truncate string if adding ... will make it shorter 2015-04-08 14:08:38 +02:00
Richard van den Berg 9b8a3e9873 Removed extraneous dash 2015-03-24 14:28:59 +01:00
Richard van den Berg fa112d77c3 Use correct CakeResque queues 2015-03-23 17:58:41 +01:00
Richard van den Berg d2556ff91d Use org name and baseurl in XML namespace for STIX 2015-02-19 15:46:54 +01:00
iglocska fbca80d680 Added more contextual info for the CSV exports, fixes #391 2015-02-16 14:47:21 +01:00
Richard van den Berg 12dc5b6579 Make unpublished events private if MISP.unpublishedprivate == true 2015-02-05 17:16:40 +01:00
Richard van den Berg d3c0144b25 Merge remote-tracking branch 'upstream/master' 2015-02-05 14:17:10 +01:00
iglocska 2401cedfdc Left off file in previous hotfix added
- added a file that was not pushed during the last hotfix
- some improvements to the XML export to lower memory usage
2015-02-04 11:06:41 +01:00
iglocska f0aa849d04 Various improvements to the exports
- Unified the way exports accept negated parameters
- Fixed the documentation
- Most exports are now restrictable by the event date (From/To parameters)
- none cached XML export now writes to file after converting each event, clearing the memory and resolving any potential memory issues
2015-02-03 17:06:05 +01:00
Richard van den Berg 253e579307 Disallow unpublished events 2015-01-27 10:10:22 +01:00
Richard van den Berg 886d36438e Do not send details of events unencrypted 2015-01-27 09:26:25 +01:00
iglocska 71d36b9c64 Several issues fixed
- MYSQL.sql file now correctly includes the task entries
- GenerateCorrelation admin task is now a background job
- Organisation of events pulled now get the org in the server object as the owner instead of the one who initiates the pull
- Small fix to wrapping text in the pivot graph
2014-11-27 14:47:13 +01:00
iglocska 4b7e56a43c Fix to an issue with the CSV export
- missing linebreak after header row added
- fixed an issue with quotes in the value field not being escaped properly
2014-11-12 15:36:07 +01:00
iglocska b178358f2a Default config.php added 2014-09-10 11:48:48 +02:00
iglocska 79127902b7 Cleanup, MISP health tool
- cleanup of a lot of deprecated settings
- tool to help assess and alter issues with the instance settings
- new mechanism to store settings
2014-09-10 09:43:22 +02:00
iglocska d118a22b53 Added event distribution to alert e-mail, fixes #127 2014-08-21 17:04:02 +02:00
iglocska be00fbebff Publishing now immediately sets the event to published. A failed push will keep the event published, but it will note that it failed in the jobs / flash message. 2014-08-21 16:53:03 +02:00
iglocska 4e613bb049 Added the option to export the event info field with each attribute in the csv exports 2014-08-19 10:33:10 +02:00
iglocska bd6b206ac5 Further work on the sync
- changed the pull implementation for proposals
2014-08-14 11:33:33 +02:00
iglocska 77971d97db Publishing now also pushes proposals
This is especially important to push deleted proposals once a proposal has been accepted
2014-08-13 14:29:39 +02:00
iglocska 6bca13b3e5 Further work on the sync fixes 2014-08-12 15:35:32 +02:00
iglocska 8b16f0cf18 Push now also only does a differential push
- send uuids of events to be pushed together with timestamps to the other instance
- other instance removes events that are already up to date or locally created from the array
- sends the remaining uuids back
- first instance initiates the push of events that were not filtered out
2014-08-12 11:54:00 +02:00
iglocska e6c28fe69a Futher work on the proposal sync 2014-08-11 16:40:09 +02:00
iglocska 1bbf678f70 Further changes 2014-08-11 16:26:49 +02:00
iglocska 99c04afa85 First round of fixes 2014-08-11 15:11:57 +02:00
iglocska a6a353252e Merge branch 'hotfix-2.2.34' into develop 2014-08-06 13:47:51 +02:00
iglocska f86bb89e14 Commas in CSV now escaped properly fixes #281 2014-08-06 13:46:52 +02:00
iglocska 83d5e191fc Updates to the STIX export 2014-08-04 18:07:15 +02:00
iglocska e1988690c6 Merge branch 'feature/templates' into develop
Conflicts:
	app/Model/Event.php
2014-07-19 15:51:30 +02:00
iglocska 45d826a252 First version of the templating feature complete
- still needs some refinement, but it's feature-complete
2014-07-02 16:20:19 +02:00
iglocska 4b19de1033 Merge branch 'hotfix-2.2.33' into develop 2014-06-27 21:38:31 +02:00
iglocska 72d4db3007 2 Background worker issues fixed
- Start-up script could only be started from the script's location

- Division by zero in e-mail alerts when calculating the progress of the background job
2014-06-27 21:36:14 +02:00
iglocska ba751a0662 Merge branch 'hotfix-2.2.28' into develop 2014-05-06 10:47:12 +02:00
iglocska 2c72b129a5 Update to the installation instructions (fixes #257) and the 2.2 upgrade script
- fixed 2 incorrect entries in the installation.txt file

- fixed an incorrect variable name in the 2.2 event upgrade script
2014-05-06 10:44:53 +02:00
iglocska 291892be05 Merge branch 'develop' into features/ajaxification
Conflicts:
	app/View/Elements/img.ctp
2014-05-05 09:56:42 +02:00
iglocska 14976bd7bb Ajaxification of the event page done also, replaced histogram in memberslist
- AJAX requests now also respond with a small message at the bottom of the page, notifying the user of the result
- The following actions work now on the event page via ajax:

1. Add / remove tags
2. quick edit any attribute field if eligible
3. quickly create a proposal of any attribute field if not eligible to edit
4. popover attribute creation (also works with batch add)
5. popover proposal creation (also works with batch add)
6. delete attributes
7. accept/discard proposals
8. mass edit / delete attributes

Also, replaced the old memberslist, with a small lightweight css/js based one.
2014-05-02 14:29:15 +02:00
iglocska dac1c2b17c CSV export now includes date for each attribute, fixes #255 2014-04-30 11:00:20 +02:00
iglocska 4a96209d5a Fix to event REST add
- upgrade script broke adding events via the rest interface if they had an xml_version included

- fixed, also, add now more flexible with directly adding events from an export encapsulated in a response tag
2014-03-31 13:24:47 +02:00
iglocska 705964a556 First commit of the event view ajaxification
- pagination of the attribute index within the event view
- add attributes in a pop-up window
- instantly refresh attributes
2014-03-24 16:33:40 +01:00
iglocska a849d15b0f Event description in alert e-mail subject made optional, fixes #231 2014-03-14 09:19:35 +01:00
iglocska 1a777901b2 CSV exports have a new column: to_ids
- event level exports from the event view now export all attributes regardless of to_ids value

- to_ids value now has its own column in the csv exports
2014-03-13 15:23:29 +01:00
iglocska 0b04c6369c Fix to comments not being synced
- attribute comments will now be correctly synced
2014-03-13 14:44:53 +01:00
iglocska 3439cc4237 small change to the new alert e-mail titles
- the event description in the subject shortened to 55 characters maximum.
2014-03-13 13:39:47 +01:00
Chris Clark d799c8ad16 Tweaks To Email Output
Small tweaks to email formatting to sync up with UI Changes.. also added event title to Subject (questionable if this is something desired globally as it would not be encrypted).
2014-03-12 13:29:29 -07:00
iglocska 2b2c61bc3b CSV export changes
- It is now possible to restrict the CSV automation export by type / category

- updated the automation page to describe how the syntax works

- fixed an issue with line breaks not being sanitized for the CSV export
2014-03-11 14:45:35 +01:00
iglocska c11a492f10 Incorrect branching code closing bracket 2014-02-25 16:11:17 +01:00
iglocska b1de06eb37 Xen0ph0n's patch updated according to his recommendation
- replace '.' in domain names, ip-src and ip-dst with '[.]' instead of '-'
2014-02-25 15:31:15 +01:00
iglocska c0a4953f81 Merge pull request #217 from Xen0ph0n/patch-5
Code to defang URLs/Emails/Domains/IPs in Alerts
2014-02-25 15:29:06 +01:00
iglocska 8fc85f95b9 Fixes with the synchronisation
- background pulls fixed
- now correctly logs changes
- now correctly updates attributes
2014-02-25 12:27:20 +01:00
iglocska e06c4b9299 Incremental pull and fixes to pulling shadow attributes
- during the event id pull, the local server already checks the timestamps, removing the ids of events that are not newer than the local version
- this results in only the event metadata being pulled for all events, and the attributes of only those events that need to be updated are pulled resulting in much quicker pulls

- Fixed an issue with proposals that got pulled not finding the attribute that they are proposals to (for proposals that belong to an attribute)
2014-02-20 17:28:39 +01:00
Chris Clark 92ab6ba752 Code to defang URLs/Emails/Domains/IPs in Alerts 2014-02-18 15:48:08 -05:00
iglocska 411c017707 Bug fixes
- issues with the way users were passed to the related event finder during a publish
2014-02-14 13:32:19 +01:00
iglocska 07c4536932 Fixed various things
- logging of event publishing enabled for background jobs
- disabled a gpg debug mode that was enabled by accident
- better feedback for publishing
2014-02-10 00:29:46 +01:00
iglocska 0e1bf5567f Various changes
- regexp structural changes added to the upgrade script (type)
- Added publish / alert to the background jobs
- fixed a misalignment with the statistics
2014-02-09 22:09:29 +01:00
iglocska 22c8105f58 Mass replace replace of the old CyDefSig name to MISP - fixes #82 2014-02-05 15:01:26 +01:00
iglocska 65dd2be039 CSV added to tag searches
- also, fixed an issue where an incorrect tag search would return all possible IDs that are visible to the user
2014-02-02 18:34:38 +01:00
iglocska fc94376f0e Several changes in one (xml version, tag filters for exports)
- xml version now included in the xml exports
- MISP will now check the xml version on all imports related to sync / add MISP XML and try to update the incoming info if it detects an older version

- exports now take tag names as a parameter (affected exports: XML, text, HIDS, NIDS)

- eventtags now correctly get removed when an event is deleted
2014-02-02 18:10:21 +01:00
iglocska 70c7f650f6 Changes to the logging and scheduling
- Scheduled tasks for pull / push now working as intended
- Rescheduling of all tasks fixed
- protection against the rescheduled task ending up in the past

- further event history fixes
- fixed lots of erroneous logging
- performance improvement with logging (no longer loading controllers for no reason)
- logging extra actions that weren't logged before (proposal accept / discard, server pull / push)
2014-01-29 15:52:09 +01:00
iglocska bec1287968 Tagging system
- new special role for tagging
- can create tags with a name + colour combination (using a colour picker plugin)
- users can assign tags to events
- can filter events by tags on the index
2014-01-23 12:25:04 +01:00
iglocska 89bf5f06b6 Threat level changes
- upgrade script that populates threat level from the old risk field for every event that doesn't have a threat level set.
- threat levels in an event (from a sync for example) that are unknown to the local instance now show the numeric value of the threat level
2014-01-21 13:32:24 +01:00
iglocska 7545de6a6c Changes to the admin methods
- cleaned up the methods, they all now return results without debug mode enabled
- Added a verification method for all user GPG keys (as an expired key for example would send out empty messages)
2014-01-21 11:28:18 +01:00
iglocska c10d3e9b95 SSL certificate changes
- you can now upload a certificate file and allow a server link to use a provided self signed certificate. This should solve the issues that some organisations are having when trying to connect their instances
2014-01-16 08:47:25 +01:00
iglocska 43e3b98326 Cosmetic changes
- Valid renamed to Published on the event index
- Attributes that are flagged as IDS signatures are now shown with a (IDS) notation at the end of the line in the alert e-mail
2014-01-14 10:15:41 +01:00
iglocska 2e82ee6a36 Some minor changes and fix to a vulnerability
- fix to the creator of a proposal being able to also accept it
- new attributes are now shown in the e-mail denoted by a * when an event is republished
- the date of an attribute's creation is shown
2014-01-13 16:38:49 +01:00
iglocska 2114f55ddd Changes to the attributes
- attributes in the event view now show the date when they were added / modified

- the alert e-mail now shows which attributes are new since the last commit
2014-01-13 11:39:35 +01:00
iglocska 772f60ff40 Proposal changes
- anyone can see proposals that can see an event
- fixed a vulnerability where a user could add a proposal to an event blindly that he couldn't see
2014-01-10 14:56:21 +01:00
iglocska cbcd7ac625 Some small fixes
- Corrected some weak notifications on background jobs
- Changed the view slightly to view background jobs
- fixed an issue where editing a sync server setting would cause an error due to the id not being passed to the logging plugin
2014-01-07 11:08:21 +01:00
iglocska 785f57143a Merge branch 'feature/CakeResque' into feature/test 2014-01-06 12:12:51 +01:00
iglocska c6fd29fb29 Several features
- Sync for background jobs (pull + push)
- more e-mailing delegated to background jobs
- A bunch of bug fixes and minor changes
2014-01-06 05:15:47 +01:00
iglocska a380ab444a Work on the background job and the proposals
- Proposals now get synced on pull
- several bug fixes
- new startup script for the background workers
2014-01-05 21:30:39 +01:00
iglocska 98304855b4 Further work on the background jobs
- contact reporter now moved to the model
- backround job not implemented for it yet
2013-12-04 16:52:35 +01:00
iglocska 50f3fa40d0 Merge branch 'develop' into feature/CakeResque
Also, more work on the background jobs
- started work on publishing
- started making the background jobs an optional setting in bootstrap

Conflicts:
	app/Controller/AppController.php
	app/Controller/EventsController.php
2013-12-04 11:58:01 +01:00
Alexandru Ciobanu e84503603f Call the TAXII client if it's enabled in configuration 2013-11-28 14:25:48 +01:00
Alexandru Ciobanu f36cc43955 replace Risk with ThreatLevel [skip ci]
- Event.risk has been replaced by Event.threat_level_id.
      all functionality remains the same and users should not see
      any difference.
      ENUM() used for Event.risk is vendor specific and requires
      too many hacks to play nicely with bake.
    - Added default schema file, SQL dumps should be avoided since
      they make updating/upgrading a pain.
    - Removed old unused schemas
2013-11-17 17:54:15 +01:00
iglocska d54793ffe6 Most of the export caching done
- also a fair bit of refactoring of the code, fatter models, thinner controllers, component moved to Lib
2013-11-15 15:39:34 +01:00
iglocska fcc7a66a55 More work on the background jobs
- Started work on the exports
2013-11-07 15:58:29 +01:00
iglocska d7b4c28552 Contextual comments
- Attributes now have a comment field
2013-10-30 16:00:46 +01:00
iglocska d27ddee207 First rework of the siteadmin role
- ADMIN org removed.

- Siteadmins are now identified by the perm_site_admin flag

- Siteadmins can now be of any organisation

- editing the regexp / whitelist rules can now be done by a special user with the perm_regexp_access in his/her role

- Executing a mass replace of attribute values based on the regexp rules cannot be initiated by a regexp/whitelist user, only by a site admin

- If the login page is reached without any users / roles defined they are automatically created (perviously it was only the user that was created)

- Org admins are restricted from assigning perm_site_admin, perm_sync and perm_regexp_access roles to users. This can only be done by a site admin.
2013-10-03 11:45:27 +02:00
iglocska 285ff481a5 Further updates to the sync 2013-08-12 17:23:32 +02:00
iglocska eac87af41a Attributes won't show two links to the same event anymore on the event view 2013-08-08 11:44:18 +02:00
iglocska 58f72ab4d1 Merge branch 'develop' of https://github.com/MISP/MISP into develop 2013-07-18 10:58:54 +02:00
iglocska dde52f124a Initial refactoring of the event view / xml exports
- event view and xml exports all use __fetchEvent now

- unified the permission checks

- same output for event/id.xml and the xml exports
2013-07-18 10:58:10 +02:00
Christophe Vandeplas 8e8f41ab13 Fixes in server push 2013-07-17 14:27:51 +02:00
Christophe Vandeplas 8fc0f9756b removed TODO 2013-07-16 14:43:54 +02:00
iglocska 3e9a967188 Removal of some references to the old private flag 2013-07-11 17:25:47 +02:00
iglocska 0104f7956b Continued rework of the regexp
- Regular expressions are now only checked for attributes

- Regular expressions are now defined and checked on a type by type
basis, with the setting "ALL" affecting all attributes

- creation / deletion of several attributes in one edit to accommodate
for several checked type options

- perform on all admin option now only saves attributes that actually
get changed by the regexp, making the function usable again for larger
databases

- Some feedback on what got changed during a perform on all

- UI changes in the index / regexp add / edit views to reflect the type
sensitivity changes
2013-07-08 17:15:04 +02:00
iglocska 7e6f73a776 Removal of the blacklist
- Since regexp can be used to blacklist things, there's no need to have
two separate features that accomplish the same thing

- Add a regexp named /1.1.1.1/ with nothing as replacement and it will
behave the same as adding a blacklist for 1.1.1.1 in the old system.
2013-07-05 14:34:32 +02:00
Christophe Vandeplas ac5c59e9af minor changes 2013-06-24 15:12:30 +02:00
Christophe Vandeplas 3b28d6f1e8 (workaround) better error message when HTTP problem with Server Pull 2013-06-18 09:12:09 +02:00
Christophe Vandeplas fdfd3ba486 micro improvement 2013-06-11 00:44:04 +02:00
Iglocska f8f290375e Further changes to the degradation of the distribution 2013-06-10 23:00:45 +02:00
Iglocska 638a99e0e7 Few changes 2013-06-10 20:34:05 +02:00
iglocska 3c23ac3a86 Change to new distribution
- first stage
2013-06-10 17:33:03 +02:00
iglocska 1e7665cd6d Saving over night, something still blocks the timestamp from being saved
after a push...
2013-06-06 18:43:26 +02:00
iglocska 5522578f68 Update to the shadow attributes
- UI changes
- changed the relationship between shadowattributes and events to be
hasMany
2013-06-03 16:25:43 +02:00
Christophe Vandeplas 03a9b2bcc2 UI event fixes 2013-06-01 11:05:15 +02:00
Christophe Vandeplas e3ed847ba0 fixing some REST API and XML issues 2013-05-28 11:15:21 +02:00
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