Commit Graph

934 Commits (c770347828e46d00f03c0f9c9dbc090a429f3392)

Author SHA1 Message Date
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 89c80a8b7c Some security fixes 2014-01-10 13:56:35 +01:00
iglocska 65753a096a Some minor changes
- Statistics page has gotten a lot of extra information
- Removed some old junk files
- Made the size of the graph in the memberslist larger to fit all the new attribute types
2014-01-09 17:13:07 +01:00
Chris Clark 00ea48b734 Error When Exporting as IOC if not Site Admin
This was comparing the wrong value to the event org to determine org membership and thus $isMyEvent value for privileges for export of IOCs if not a site admin.
2014-01-09 10:38:33 +01:00
Chris Clark a6999597f1 Tweak to allow IOC Export of events you don't own but are shared
Conflicts:
	app/Controller/Component/IOCExportComponent.php
2014-01-09 10:35:25 +01:00
iglocska ba4e136ace First version of the new statistics page
- shows a heatmap of user activity based on the logs
- can show it for all users or for users of a specific org
2014-01-09 10:04:53 +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 d1094c92d0 Fix of a new pagination rule overwriting the rest allowing users to see more than they should 2014-01-06 12:16:47 +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 54b1b44080 More work on the background jobs
- added scheduler to the export caching
- site admins can set up the intervals of the automated caches, and the exact times at which they should be executed.
2014-01-03 15:26:35 +01:00
iglocska ae23b288e5 Further work on the background jobs
- started work on scheduling
- view to add scheduled tasks (still needs work)
- moved cache job bulk-code to the job model from the controller
- bootstrap timepicker
2014-01-02 15:51:41 +01:00
iglocska 1c997992d8 Revert "Merge branch 'master' into develop"
This reverts commit fbe2eddc7a, reversing
changes made to b59965b971.
2013-12-20 11:17:41 +01:00
iglocska fbe2eddc7a Merge branch 'master' into develop
Conflicts:
	INSTALL/MYSQL.sql
	app/Controller/EventsController.php
	app/Model/Attribute.php
2013-12-20 11:02:21 +01:00
Chris Clark 8678103d59 Tweak to allow IOC Export of events you don't own but are shared 2013-12-19 14:27:53 -05:00
Chris Clark 1aec3ac01b Merge pull request #1 from Xen0ph0n/patch-2
Error When Exporting as IOC if not Site Admin
2013-12-19 11:12:25 -08:00
Chris Clark 6a4b4d2870 Error When Exporting as IOC if not Site Admin
This was comparing the wrong value to the event org to determine org membership and thus $isMyEvent value for privileges for export of IOCs if not a site admin.
2013-12-19 14:11:17 -05:00
Chris Clark 7d370a9703 Error When Exporting as IOC if not Site Admin
Fixed Syntax error if not site admin.. also fix in event component which was comparing wrong values to establish ownership of event
2013-12-19 14:08:35 -05:00
iglocska 7f3e8a5910 Merge branch 'hotfix-2.1.33' 2013-12-18 17:10:08 +01:00
iglocska 31477ac611 Few minor tweaks 2013-12-18 17:09:50 +01:00
iglocska dac0545620 Merge branch 'master' of https://github.com/MISP/MISP 2013-12-18 16:36:46 +01:00
iglocska e0dd74a7ba Update to the GFI import
- fixed an issue where a blacklisted value added through uloadattachments would break the import

- fixed the distribution level of attributes created by the GFI import always being your org only

- removed registry attributes that do not contain a malware sample or a dropped file in the value

- fixed a set of regular expressions dealing with the sanitisation of user names that would fail on user names consisting of more than one word

- added a few regular expressions
2013-12-18 16:31:42 +01:00
iglocska 0e744871bd Further work on the scheduled tasks
- Also some changes left off from the previous commit
2013-12-17 11:38:06 +01:00
iglocska bc42fb99a8 Preparing for the scheduled tasks
- incorporated cidr from develop
- some other improvements to the background jobs
2013-12-17 10:15:04 +01:00
Chris Clark 629ab27275 Update to allow clean entry of Whitelist Items
Updated this along with whitelist.php to allow for simple entry of names in the whitelist, this file will allow proper application of those blocked names to exported NIDS sigs.
2013-12-16 10:21:08 -05:00
iglocska eab4923144 Merge branch 'hotfix-2.1.32' into develop
- Also, added CIDR to rest searches. Make sure you use the following format:

a.b.c.d|e

Conflicts:
	app/Controller/AttributesController.php
2013-12-16 15:54:14 +01:00
iglocska ff84b955ab Fix for incorrect values returned through CIDR search 2013-12-16 14:44:23 +01:00
iglocska 1f1661e81f CIDR searches fixes #190
- possible to use CIDR when searching attributes
2013-12-16 14:11:30 +01:00
iglocska f0944ab9b0 Proposal changes Fixes #192
- Contextual comments for proposals
- shows proposal count in the top bar
- new view showing all of the events of the user's organisation with an active proposal
2013-12-12 16:25:20 +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
iglocska 48383fe25b Next version of exports done 2013-11-19 11:03:30 +01:00
Alexandru Ciobanu 5f155f47cc Fixed validation on Event::_add()
Try atomic save for events
Add threat level to JSON sample
2013-11-18 16:36:18 +01:00
iglocska 6015a6f201 Further work on the exports 2013-11-18 11:35:02 +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
Alexandru Ciobanu 233a30b9fd Basic JSON API CRUD [ci skip]
- adds JSON example to shell scripts
    - adds sample JSON event
    - ??? for some redundant Attribute model conditions
    - updates travis with CakePHP installation
2013-11-14 12:43:31 +01:00
Alexandru Ciobanu fca87bf491 Initial JSON REST
Some small travins changes too.
FYI there's an automated travis build available at
https://travis-ci.org/MISP/MISP
We don't have unit testing and travis setup is subpar so everything will fail
for now.
2013-11-12 16:23:37 +01:00
iglocska 38e95a32e8 Merge branch 'hotfix-2.1.31' into develop 2013-11-12 15:15:53 +01:00
iglocska 7f6c8425ae Fix to users with auth key access not being able to reset their authkey 2013-11-12 15:11:59 +01:00
iglocska fcc7a66a55 More work on the background jobs
- Started work on the exports
2013-11-07 15:58:29 +01:00
iglocska 5ee9cb7f08 Removed debugkit 2013-11-06 11:08:56 +01:00
iglocska 1c3425fc91 Merge branch 'develop' into feature/CakeResque
- develop and the first CakeResque implementation merged

Conflicts:
	app/View/Layouts/default.ctp
2013-11-06 11:02:23 +01:00
iglocska 0f80145c6d :q 2013-11-06 10:52:18 +01:00
iglocska be723fc821 Merge branch 'feature/discussion' into develop 2013-11-06 10:13:47 +01:00
iglocska 54a7b66a4b Merge branch 'hotfix-2.1.29' into develop 2013-11-05 13:52:41 +01:00
iglocska 2a28591bf7 Loosened the filename validation on attachments
- filenames without extensions were blocked for example
2013-11-05 13:48:39 +01:00
iglocska 8a53831b2d Update to the discussions
- Moved the menues out of the views to the common menu element
2013-11-04 11:31:15 +01:00
iglocska 08cb33b2bd Some minor changes
- Contextual comments added to all imports (GFI, ThreatConnect, OpenIOC)

- Some minor fixes to OpenIOC exports and linebreaks in attributes
2013-11-04 10:11:58 +01:00
iglocska d7b4c28552 Contextual comments
- Attributes now have a comment field
2013-10-30 16:00:46 +01:00
iglocska bbbc17a95b Merge remote-tracking branch 'origin/feature/XML_and_UI' into feature/discussion
- Also some improvements to the shadow attributes

- some minor UI changes

Conflicts:
	app/Controller/EventsController.php
	app/View/Elements/global_menu.ctp
	app/View/Layouts/default.ctp
2013-10-30 10:06:12 +01:00
iglocska b2b76779b9 More changes to the discussion boards
- quote / event tags

- anonymised e-mail addresses
2013-10-29 13:45:53 +01:00
iglocska 0591db2a67 Small changes after merging the two feature branches
- Update to the representation of the new permission flags

- some small issues with the merge resolved
2013-10-25 11:31:35 +02:00
iglocska 2b11a78e22 Merge branch 'feature/roleChanges' into feature/XML_and_UI
Conflicts:
	app/Controller/UsersController.php
	app/View/Regexp/admin_add.ctp
	app/View/Regexp/admin_edit.ctp
	app/View/Regexp/admin_index.ctp
	app/View/Roles/admin_add.ctp
	app/View/Servers/add.ctp
	app/View/Servers/edit.ctp
	app/View/Servers/index.ctp
	app/View/Servers/pull.ctp
	app/View/Servers/push.ctp
2013-10-25 10:39:18 +02:00
iglocska 3c58e0071a Further work on the UI
- reworked almost all of the side menues to be centralised

- Some fixes for the IOC export not handling two new-ish types correctly

- Some changes to the menues (including a few options that didn't exist before)

- rework of the popovers in some forms
2013-10-24 16:41:42 +02:00
iglocska 0cb7653d41 Merge branch 'develop' into feature/XML_and_UI 2013-10-24 16:10:58 +02:00
iglocska d5d2e900c4 First revision of the unified menu and XML upload
- centalising the side menu for easier maintainability

- XML upload of event(s) from the interactive interface
2013-10-24 10:33:34 +02:00
iglocska 195993dd3a Quick fix for the export changes
- pass by references on method calls removed
2013-10-17 17:41:46 +02:00
Christophe Vandeplas 04afc57bd5 Merge branch 'feature/IDSsuri' into develop 2013-10-17 15:16:03 +02:00
Christophe Vandeplas 9ed21a0b21 snort export, updated urls, new url is backwards compatible 2013-10-17 15:13:49 +02:00
Christophe Vandeplas 61f027e862 NIDS - fixes issue from last commit 2013-10-17 13:53:14 +02:00
Christophe Vandeplas a7009ada9d NIDS - substitute illegal chars, improved some rules 2013-10-17 13:49:22 +02:00
iglocska f445c0ddb8 Merge branch 'hotfix-2.1.26' into develop
Conflicts:
	app/Controller/AttributesController.php
2013-10-15 10:35:08 +02:00
Christophe Vandeplas ed266c7262 performance improvements in email and dns. rule for user agent 2013-10-15 07:49:38 +02:00
Christophe Vandeplas 23edf3dd06 improvements in the email NIDS rules 2013-10-11 15:21:45 +02:00
Christophe Vandeplas d06bc16577 improved smtp rules 2013-10-10 15:16:59 +02:00
Christophe Vandeplas 29a0f30041 start of different structure for multiple rule-formats 2013-10-10 15:02:47 +02: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 e0e5e6a5c8 Some permission issues with restSearch of an event
- __fetchEvent used, which checked the currently logged in user

- instead now, __fetchEvent has a new optional parameter that automation methods can use to pass the org along that was read from the provided auth key
2013-09-27 11:34:11 +02:00
iglocska 1deddf0075 Fix to the conditions when doing a restsearch
- Was always searching for 'value' due to a bug. Fixed.
2013-09-27 10:06:36 +02:00
iglocska 10747e9366 Change to the attribute download method
- Permissions weren't checked correctly when downloading attachments
2013-09-20 14:26:06 +02:00
iglocska c48edd6732 First release of the new API features 2013-09-20 11:40:26 +02:00
iglocska 8e75f0826f Security fix and new download attachment feature
- users can now download attachments using the APIkey

- security issue fixed where a user could download attachments that he/she can't even see by navigating to attributes/download/<attribute_id>
2013-09-19 17:28:55 +02:00
iglocska 6d1dc6df95 First round of implementations for the new API searches
- users can search RESTfully for attributes based on various filtering mechanisms and get either an event that includes the located attribute(s) or just an array of attributes returned.

- users can also request all attributes of a (or several) types and get them returned as an XML
2013-09-19 12:05:08 +02:00
iglocska 861b5d3ddd First version of the api search
- requires the auth key of a user and the user has to have auth key permission

- user can specify what should be returned (event / attribute) - currently only event is implemented

- user can specify 4 filters (value, type, category, org)

- all these fields can have several values separated by &&

- Values can be negated by putting "!" infront of them
2013-09-16 17:22:44 +02:00
iglocska cf787a84ce Fix to the download of attribute search results as XML
- now uses the unified __fetchEvent method to retrieve the events

- __fetchEvent has a new optional parameter "idList" which restricts the results to an array of event IDs.
2013-09-16 11:23:47 +02:00
iglocska 44b714eb01 Fix to the exports not working since the new pivoting
- Helper echoed a blank line, breaking the xml export

- Helper will now only be called during view when it's not a rest request.
2013-09-12 16:53:59 +02:00
iglocska 828d11c0c8 Accidental debug removed 2013-09-11 10:41:51 +02:00
iglocska 628bd5283a Change to the proposal list
- removed own proposals from the list
- allowing site admin to see all proposals of any org
2013-09-11 10:35:50 +02:00
iglocska 6895548877 Merge branch 'develop' into feature/discussion
- Pivots, attributes, discussions hideable

Conflicts:
	app/Controller/EventsController.php
	app/webroot/css/main.css
2013-09-10 16:51:56 +02:00
iglocska bec0d0e55f Thread creation if it doesn't exist for an event 2013-09-10 14:54:11 +02:00
iglocska de372d469d debug info removed 2013-09-10 10:49:46 +02:00
iglocska 494827e76d Previous commit fixed 2013-09-10 10:48:29 +02:00
iglocska 77e29f7068 Fixed a case that could cause overlapping pivot elements to appear
- The height calculation did not take into account gaps between child elements caused by them having several children. This caused a newly added sibling's children to overlap. Fixed by compensating for the vertical displacement between children when returning the height data.
2013-09-10 10:30:20 +02:00
iglocska 6d0c26b9d4 Delete button gone from pivot elements that should not be deleted
- When looking at an event, a user should not be able to delete the pivot path that he/she took to get to that particular event.

- Deleting the root pivot item is an exception, this will simply reset the pivoting.
2013-09-06 15:01:18 +02:00
iglocska 16abc9eddb Height adjustment was not cummulative
- inserting a branch to a previous sibling only pushed the next sibling down a line, not the following one. Fixed.
2013-09-06 10:20:43 +02:00
iglocska 5d25348780 Fix to removing the root element causing issues with pivoting 2013-09-06 10:04:15 +02:00
iglocska 22593b2378 Finished the first version of the new pivoting
- Users can go back to a previous event and branch the pivoting by choosing a new relation

- users can remove individual pivoted branches
2013-09-06 09:51:46 +02:00
iglocska 1b901bfacb Further work on the pivoting
- still has some issues with arranging the height for some branching
2013-09-05 17:00:15 +02:00
iglocska 9890d40b2b Heights / depths calculated for rearranging the pivot thread in view
- The idea is to draw a horizontal path instead of a vertical one
2013-09-05 11:00:06 +02:00
iglocska 4ef6b2b9fd First refactoring of the pivoting 2013-09-05 10:40:53 +02:00
iglocska 807cc4c090 Deleting attributes deletes associated shadow attributes
There was a bug causing "zombie" shadowattributes to stay in events if the attribute has been deleted
2013-09-04 08:52:30 +02:00
iglocska a5c100309b Fixes to the Shadow attribute e-mailing
- E-mail locks are now correctly reset by discarding / accepting a proposal

- Also, new index page to see the list of proposals that a user can accept
2013-09-03 15:29:44 +02:00
Christophe Vandeplas 23223155c7 fix bug in pull updated events, improved performance 2013-09-02 15:26:31 +02:00
iglocska 28901cc682 Left-over line removed 2013-09-02 11:46:22 +02:00
iglocska a6a6c6bd35 Small cleanup 2013-09-02 11:36:27 +02:00
iglocska e10d6a0afd Attachments correctly exported with events/view/1.xml now
- bug that broke transfer of attachments on pull fixed

- data only exported on view() not mass xml exports
2013-09-02 11:31:34 +02:00
iglocska a98d94469a Export fixes
- conversion of the array in the XML export to be compatible with the XML parser (some invalid characters could break it)

- New separate CSV export that includes all visible unpublished and non IDS signature attributes on request
2013-08-29 14:49:42 +02:00
iglocska b0f91729aa A fix to the csv export 2013-08-29 13:56:19 +02:00
iglocska 40886018da Fix to a typo causing exports to fail 2013-08-29 12:43:08 +02:00
iglocska ebcbcdc6bf Removed a left-over junk line from the shadow attribute controller 2013-08-28 14:56:40 +02:00
iglocska dc8ed81448 Fix to sync users being able to edit events that don't belong to them interactively 2013-08-23 15:34:03 +02:00
iglocska 20efca4d79 A previous change reverted by accident in the previous commit 2013-08-21 13:08:28 +02:00
iglocska b7d95ed743 Upgrade script for 2.1.8
- we have introduced the "locked" flag for events to protect events of the original creator from being edited by a sync user

- IMPORTANT: before running the script below, make sure to create the locked field for the event table (see INSTALL/LOCKED.sql)

- This script (generateLocked found in the Administrative tools menu) will attempt to set the locked value for existing events to ease the transition

- The default value for locked is 0, and all events created on the instance should be set to this value

- events that were synced from another instance should have their locked value set to 1

- this script checks for local organisations and sets the locked field to 1 for all events not created by them

- a local organisation, as defined for the scope of this scrips is: an organisation with at least 2 members or an organisation with a single member that is not a sync user.

- The script is only accessible by site admins and will return a notification about the number of events altered.
2013-08-21 11:33:30 +02:00
iglocska 994b701fe0 Merge branch 'hotfix-2.1.11' into hotfix-2.1.8 2013-08-21 08:48:39 +02:00
iglocska dde8c8d43c Fix to the e-mailing 2013-08-20 17:52:12 +02:00
iglocska 4e32336878 Small fix to the previous commit 2013-08-20 17:20:37 +02:00
iglocska 33965eac0d Changes to the shadow attribute controller
- users that weren't publishers couldn't accept / discard proposals

- emails were blocked by an incorrect debug mode for the e-mailer
2013-08-20 17:04:42 +02:00
iglocska 8ec5a83768 Some smaller fixes
- PGP key of the user shown in the profile instead of always showing N/A

- Contact e-mails now include the instance's owning org in the subject

- Users can now enable/disable contact e-mail subscriptions
2013-08-20 14:19:08 +02:00
iglocska 4056e163c1 Users weren't able to change the contactalert field 2013-08-20 11:26:24 +02:00
iglocska c989e4ce1d Fix to not being able to accept shadowAttributes
- recursive -1 used for loading attribute, then referencing the event
2013-08-20 10:17:37 +02:00
iglocska ea3b62f88a AJAX upgrade to the discussion board
- Quickpost without reloading the page with AJAX

- for page changes / adding posts show an animated spinner

- spinner div / styles available from every page (the div is located in the default layout and is hidden unless manually shown)
2013-08-19 17:26:06 +02:00
iglocska cf58ae2dc0 Discussions
- fully working version
- some improvements still possible (hiding discussion on demand, add/edit with ajax)
2013-08-19 10:03:18 +02:00
iglocska 1ad3a8ffd6 Discussion boards
- First fully working version
- Create threads or create a thread attached to an event
- Add posts to threads / edit them / delete them
2013-08-14 17:46:57 +02:00
iglocska 62bec39759 First version of the event discussion UI 2013-08-14 08:45:05 +02:00
iglocska 932f5b89df Introduced a typo in the previous commit. 2013-08-12 17:31:45 +02:00
iglocska 285ff481a5 Further updates to the sync 2013-08-12 17:23:32 +02:00
iglocska 49f90b59f2 Fix to the distribution changes breaking threatconnect imports 2013-08-08 13:59:10 +02:00
iglocska 87a03b756e Changes to the initial distribution settings
- The initial attribute distribution level now allows the option for 'event', inheriting the event's distribution level
2013-08-08 12:16:03 +02:00
iglocska 720e742139 Fix to incorrect distribution setting in the openIOC importer 2013-08-08 11:20:55 +02:00
iglocska 0ee45af902 Default distribution level flags in bootstrap.php
- Each instance can now have its own default event and attribute distribution level set
2013-08-06 11:53:12 +02:00
iglocska 5011b50c65 Notification on rest add of published events. Fixes #138 2013-08-06 09:43:00 +02:00
Christophe Vandeplas cb6482fd54 Merge branch 'develop' into 'master' for v2.1 2013-08-02 15:39:54 +02:00
iglocska fa1af3cd3b Pivot thread changed slightly
- There is a reset button in the first arrow

- adding an event that exists already in the list should not create a new pivot point
2013-08-02 15:23:48 +02:00
iglocska bfa8aa3d28 Jumping between pivot thread points changed
- no longer adds the event to the thread
2013-08-02 14:58:35 +02:00
iglocska 66a7791b33 Pivot threads and other changes
- Users can now see the path they took while jumping from related event to related event

- Removed the breadcrumbs

- Some UI changes (user menues were not showing the active page, etc)
2013-08-02 11:53:17 +02:00
iglocska 64f32389e9 Fixes to the openIOC import tool
- should handle nested OR branches better now
- domain now mapped to Network/DNS
2013-07-30 11:01:16 +02:00
iglocska 70c49f3e1b Change to the confusing invalid event message 2013-07-30 09:03:42 +02:00
iglocska 3f0eaa73a4 Changes to the filename validation
- . allowed in filenames to allow for names such as test-1.0.ext
2013-07-29 17:19:08 +02:00
iglocska 3206702e25 IOC file import filename regex fix
- Didn't account for several words separated by '.'-s (file.name.ext)
2013-07-29 15:23:40 +02:00
iglocska b3f6032857 Fixes an issue with the upload of malware samples not generating an md5
hash if the file is too large
2013-07-26 10:13:44 +02:00
Christophe Vandeplas 84b552fb74 fixes #141 2013-07-26 08:17:33 +02:00
iglocska 8bf54e7c01 Removed password creation for new users through the contact users menu 2013-07-25 17:23:52 +02:00
iglocska 96170dae29 Fixed an issue with siteadmin contact e-mails resetting passwords of non existing users
- a site admin could issue a password reset to a non-existing user
2013-07-25 14:45:34 +02:00
Christophe Vandeplas bd61f73bd2 fixed a newly created bug in memberslist 2013-07-18 12:18:10 +02:00
iglocska 7486f478e0 Merge branch 'develop' of https://github.com/MISP/MISP into develop 2013-07-18 11:33:11 +02:00
iglocska 7fb1e6f70e Some bugs fixed
- Resetting the auth key for a user that doesn't exist created an empty
user 

- change_pw showed an admin menu on the side

- rerouting after an incorrect auth request fixed (users/index doesn't
exist)

- temporarily disabled the redirect after login
2013-07-18 11:32:26 +02:00
Christophe Vandeplas 4bca5b9e30 memberslist based on orgc, is more logic to reflect the contributions 2013-07-18 11:14:11 +02:00
Christophe Vandeplas 00d8d24434 minor NIDS export performance improvement 2013-07-18 11:04:00 +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 2424cbbf26 Server push lower memory footprint solving OoM problem.
Enabled per-id push like pull
2013-07-17 14:06:24 +02:00
Christophe Vandeplas e13c2e883c fixing problems in pull with distribution data validation 2013-07-16 15:28:04 +02:00
iglocska 30d6bebcf8 Change of domain type in IOC Export fixes #134 2013-07-16 08:45:36 +02:00
iglocska 85a7e8c97c OpenIOC issue
- Attribute type domain exported into the wrong ioc term.
2013-07-15 17:23:53 +02:00
iglocska 1f5aa5420f Security issue fixed with UsersController
- users could view other user profiles

- users could view other user profiles through edit user
2013-07-15 16:46:44 +02:00
iglocska 32a6c61938 Removed quotation marks from csv export
- Not needed, linebreaks are removed anyway
2013-07-15 11:35:15 +02:00
Christophe Vandeplas ca30cf006f Import ThreatConnect attributes into event, see issue #119 2013-07-15 09:10:18 +02:00
Christophe Vandeplas 130f470c90 Revert "fix bug in removing remote attributes if push is not enabled"
This reverts commit c4d5344153.
2013-07-13 08:22:37 +02:00
Christophe Vandeplas c4d5344153 fix bug in removing remote attributes if push is not enabled 2013-07-13 08:21:42 +02:00
Christophe Vandeplas a0dabb83dc cleanup: hidden functions to _function and removed unnecessary function 2013-07-13 07:39:46 +02:00
Christophe Vandeplas 2a8efc5770 minor admin tools improvements 2013-07-12 15:35:00 +02:00
Christophe Vandeplas e328dc948e huge performance increase in generateCount 2013-07-12 14:55:56 +02:00
Christophe Vandeplas b314a04e58 fixes bug introduced in commit 2334599f3d 2013-07-12 12:59:10 +02:00
Christophe Vandeplas 66ce874b99 do not change 'info' field upon pull (was: Imported from $url) 2013-07-12 10:34:59 +02:00
Christophe Vandeplas 2334599f3d redirects to filtered events page upon delete 2013-07-12 09:36:04 +02:00
iglocska 3e9a967188 Removal of some references to the old private flag 2013-07-11 17:25:47 +02:00
iglocska 53675fe3a3 Some UI changes and reattached the regexp for the admin validation tool
- org only events have a redish background in the event index

- org only events and attributes have their distribution level marked in
red
2013-07-11 16:38:39 +02:00
Christophe Vandeplas ff2f08f60d fixes bug in previous commit. 2013-07-11 14:28:12 +02:00
Christophe Vandeplas 7949181fbc improved password generation algorithm in reset password 2013-07-11 14:26:28 +02:00
iglocska 6818d55a0d Merge branch 'develop' of https://github.com/MISP/MISP into develop 2013-07-11 13:44:25 +02:00
iglocska 7c04a116ac First refactoring of the regexp 2013-07-11 13:43:36 +02:00
Christophe Vandeplas 7cda2a5dc2 minor change in reportValidationIssueAttributes() 2013-07-11 12:47:46 +02:00
iglocska 0b807a2666 Some cleanup
- removal of references to the old blacklist
2013-07-11 10:47:44 +02:00
iglocska 23017fd9a8 Change to the GFI import and the attachment downloads
- GFI import issue fixed with attribute ID 1 not existing causing the
import to fail for several attributes

- GFI import change: registry keys with binary value are now artifacts
dropped instead of persistance mechanism

- GFI import change: files with size of 0 will be omitted

- file attachment download change: moved away from the deprecated media
view in favour of cakeresponse->file()
2013-07-10 17:31:18 +02:00
iglocska 1f411c74cf Some UI fixes related to the debug/nondebug alignment 2013-07-09 10:05:19 +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
iglocska 10f895e641 bug in a previous commit
- left in some debug used to escape php encryption during testing
2013-07-05 11:12:55 +02:00
iglocska eeac31bee8 Regexp changes, UI changes
- first cleanup of regexp

- some changes left off from the UI changes that were not in the views
themselves
2013-07-04 15:45:11 +02:00
iglocska abde2a47af Several fixes
- Fixed the search pagination beyond the first page

- Hard coded routing of the menues in the global actions area
2013-06-28 14:28:58 +02:00
iglocska 5948a7c329 Several copy paste failures fixed in the previous commit
- /facepalm
2013-06-27 17:57:33 +02:00
iglocska 8cdf97ff66 ACL checks changed
- until now checkAction was used to check permissions of a user

- but since all of the role permissions are checked beforefilter in
appcontroller and saved into a public array, doing a lookup of the
array saves an SQL call for each permission check.
2013-06-27 17:53:36 +02:00
iglocska 7cd742dce4 Fix to users not being able to edit attributes 2013-06-27 16:43:03 +02:00
iglocska e2601d3623 Merge branch 'master' of https://github.com/MISP/MISP 2013-06-27 16:40:31 +02:00
iglocska 406d04a260 Bug with attribute edits
- users without publishing rights couldn't edit attributes. Fixed
2013-06-27 16:39:06 +02:00
iglocska f730661979 Small change to the xml search download 2013-06-27 14:11:58 +02:00
iglocska 3812d02309 Search result downloads (CSV format)
- added the button for the CSV download
- fixed a bug with the csv search result downloader blocking non IOC
results even if the search terms did not specify IOCs only.
2013-06-27 13:53:49 +02:00
iglocska c604241487 Bugfix for the creation of several attributes with the same UUID
- SHA256 and SHA1 hash attributes that get auto-generated on malware
sample upload had the same hash as the filename|md5. Fixed.
2013-06-26 17:25:38 +02:00
iglocska 39e99554c9 Views updated to include CSV in the menues
- CSV and also IOC downloads on events are now hidden if the event is
not published
2013-06-26 17:20:56 +02:00
iglocska 5e9d19196d Update to the exports
- export page updated to include the CSV export

- some changes to the CSV export and incorrect handling of data for
admins
2013-06-26 16:58:20 +02:00
iglocska 1283451efc More changes to the whitelists, exports 2013-06-26 16:30:37 +02:00
iglocska e87c28863e Firther work on the exports
- Some refactoring of the whitelist checks
- tighter rules for published / to_ids on certain exports
- attribute search now has the IOC checkbox
2013-06-26 15:31:28 +02:00
iglocska 776ef3ae07 Changes to export validation, CSV export, Whitelist redesign
- CSV export for individual events, all events, search results
- Whitelists are now preg_matches instead of simple string matches
- whitelist checks are to be applied on almost all exports
(implementation in progress)
- the exception will be the search result exports, if the (to be
implemented) to_ids only checkbox isn't checked
2013-06-26 14:48:25 +02:00
Christophe Vandeplas 592180700e solves memory exhaustion upon generateCorrelation 2013-06-24 15:18:16 +02:00
iglocska 24ebbcca5c Update to the attribute search
- Use ! to exclude terms in the value/id/org fields

- org search works the same way as value / id now, you can enter several
terms separated by a newline. Also, adding ! infront of a term will
exclude the organisation from the results

- sub string search for organisations
2013-06-24 13:24:08 +02:00
iglocska f430176ddf Filter logic reworked
- Affects org and info field

- terms have to be saparated by pipe (|) 

- terms can be terms that will be OR-d or excluded terms that will be
AND-ed

- to exclude a term use !

- A valid filter search for info would be: 'term1|term2|!term3'
-> this would result in all events with the info field containing term1
or term2 but not term3
2013-06-24 11:22:06 +02:00
iglocska 997dea0acf NOT filter for orgs on the event index
- entering for example '!futuremark' would exclude all events created by
the organisation 'futuremark'
2013-06-24 10:50:35 +02:00
iglocska 640080d2e7 Some fixes to the filters event index
- siteadmins can now search the creator org instead of the owner org
(like normal users would)

- Changed the org search to be a partial match instead of an exact match
2013-06-24 10:02:35 +02:00
Iglocska 6146df10d0 Two small changes
- email of the user creating an event shown if current user's org ==
  event's orgc

- on export, the check for to_ids will happen outside of the if branch
  that sets extra restrictions of non site admins. Otherwise site-admins
  would accidentally include attributes that aren't iocs.
2013-06-21 15:20:49 +02:00
Iglocska 9d3664081b Tightened the export rules
- text, xml, ioc exports of attributes with to_ids == 0 are now
  blocked.
2013-06-21 15:11:55 +02:00
iglocska 55f47d3166 ShadowAttribute notifications, and some minor fixes
- New field for events, locking an event from sending out a contact
e-mail when a proposal is made to it
- Default setting for the new field is 0, if a shadow attribute is
added an e-mail is sent to all subscribing members of the orgc and the
new field is set to 1
- Accepting a change resets the field to 0
2013-06-20 16:21:55 +02:00
iglocska f524f6d2c0 extra access control restriction for reportValidationIssues 2013-06-20 08:53:47 +02:00
iglocska 3bad739d69 Sanitization of the data when creating .ioc files 2013-06-19 16:37:01 +02:00
iglocska 20f8d18cc8 Merge branch 'feature/sync/timestamp' of https://github.com/MISP/MISP into feature/sync/timestamp 2013-06-19 16:22:55 +02:00
iglocska c436d8ed67 Sanitisation of the data when generating .ioc file 2013-06-19 16:18:22 +02:00
Christophe Vandeplas 8fe83c333f micro cleanup of servers index 2013-06-19 14:58:48 +02:00
Christophe Vandeplas 435c52c457 reportValidationIssues function 2013-06-19 14:51:58 +02:00
Christophe Vandeplas 8fa33f0733 first start of report functions. see issue #122 2013-06-19 12:28:55 +02:00
Christophe Vandeplas da3580de35 little bit more details about sync errors 2013-06-19 12:13:45 +02:00
iglocska 441c6c94f4 Addition of the Event History
- uses the logs to generate a list of actions affecting the selected
event and all of its attributes

- view is very minimalistic, not to show anything restricted
2013-06-18 12:27:59 +02:00
Christophe Vandeplas dbf1065b3b sync pull backwards compatibility with MISPv2 2013-06-18 11:19:43 +02:00
Christophe Vandeplas 3b28d6f1e8 (workaround) better error message when HTTP problem with Server Pull 2013-06-18 09:12:09 +02:00
iglocska 277aecf463 UI consistency 2013-06-17 17:15:04 +02:00
iglocska 77e028dd9c Several smaller changes
- Fix to the proposed attribute edit that got broken in a previous
commit

- Fix to the org filters for non admin users

- Some changes to the documentation
2013-06-17 15:23:21 +02:00
iglocska 708156ee49 Some UI changes and partial update to the manual 2013-06-13 16:10:28 +02:00
iglocska d2fcda7cc6 Added 2 new type of attributes
- sha256 / filename|sha256
- uploading a malware sample now automatically creates a filename|sha1
and a filename|sha256 in addition to the sample|md5
2013-06-12 16:50:21 +02:00
Christophe Vandeplas 001151adc8 fix incorrect order of checking user info (with REST authkey) 2013-06-12 17:09:03 +03:00
Christophe Vandeplas 2bb51bd383 Merge branch 'feature/sync/timestamp' of https://github.com/MISP/MISP into feature/sync/timestamp 2013-06-12 14:55:00 +03:00
Christophe Vandeplas ac76a337a8 fix bug in iocexport 2013-06-12 14:52:50 +03:00
iglocska 4cf08b2322 Bug fixed with event creation
- Previous commit unsetting new attribute IDs breaks if no attributes
present -> fixed
2013-06-11 17:34:34 +02:00
Christophe Vandeplas 1c387add74 Merge branch 'feature/sync/timestamp' of https://github.com/MISP/MISP into feature/sync/timestamp 2013-06-11 14:53:44 +02:00
Christophe Vandeplas 45cfafca98 fix file download missing extension 2013-06-11 14:52:54 +02:00
iglocska 5d8e0c6f22 Protection against lost attributes with saveAssociated
- attributes that are added have to have their id unset before being
added in order to avoid overwriting existing attributes
2013-06-11 14:42:35 +02:00
iglocska fd077e7bd4 Shadow attribute change
- fixed incorrect link to edit shadow attributes and the distribution
checks
2013-06-11 13:51:11 +02:00
iglocska be950da012 Update to the publish
- _publish doesn't attempt to upload events that have a distribution of
0 or 1 (private and community) but instead just set to published and
return true
2013-06-11 11:05:30 +02:00
iglocska db24e8c1f4 Update to the IOCImprt/Export
- bringing the two components up to date with the distribution changes
2013-06-11 10:50:16 +02:00
iglocska 17b570ec1f Typo in UsersController fixed 2013-06-11 10:37:56 +02:00
Iglocska a3edc6a4ee UI changes and more work on the sync
- updated the side menu
2013-06-11 01:20:27 +02:00
Iglocska 1635d99d8f Pull can not edit events / attributes
- added the _edit method in EventsController
2013-06-11 00:41:43 +02:00
Iglocska 040227d66a Some more fixes to the sync 2013-06-10 23:34:47 +02:00
Iglocska 4242108b3e Merge branch 'feature/sync/timestamp' of https://github.com/MISP/MISP into feature/sync/timestamp 2013-06-10 23:01:08 +02:00
Iglocska f8f290375e Further changes to the degradation of the distribution 2013-06-10 23:00:45 +02:00
Christophe Vandeplas 68c2fd09fe Merge branch 'develop' of https://github.com/MISP/MISP into feature/sync/timestamp
Conflicts:
	app/View/Attributes/index.ctp
	app/View/Events/add.ctp
	app/View/Events/edit.ctp
2013-06-10 23:00:37 +02:00
Iglocska b74179bc84 Further work on the distribution 2013-06-10 21:38:04 +02:00
Iglocska 06ca5ba0cd Further changes to the distribution
- changed to use the new int field
2013-06-10 20:49:31 +02:00
iglocska 3c23ac3a86 Change to new distribution
- first stage
2013-06-10 17:33:03 +02:00
Christophe Vandeplas 3ed50e2aef improve UI of event index filtering 2013-06-10 17:24:41 +02:00
Christophe Vandeplas d4d24a3aea peformance 2013-06-08 11:31:22 +02:00
iglocska 7059eac08c Small change to the timestamp
- Moved the timestamp generation for attributes and events that are
being saved and don't have one to Model->beforeValidate()
2013-06-07 10:24:03 +02:00
iglocska 58c00150ba First cleanup of AttributesController and EventsController after the
move to timestamps
2013-06-07 09:45:26 +02:00
Iglocska 4f249d21d6 Small mistake in the previous commit 2013-06-07 02:49:08 +02:00
Iglocska 22284d04d1 Update to the sync
- timestamp now correctly compared, events that have an older timestamp
  will be discarded, same with attributes

- right now the response is the same as a successful edit though, should
  be handled more gracefully

- pull is not yet tested

- attachments and shadow attributes not yet implemented

- backflow is nicely blocked by the timestamp as intended

- needs cleanup (from, dist_change)
2013-06-07 02:44: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 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
iglocska 90dd14808d Bug with adding an event and the org being set incorrectly 2013-06-06 11:01:10 +02:00
iglocska cb3ac8be15 Changes to the event filtering
- there was a bug that pushed the data entered into the "published"
filter field to the date fields -> fixed

- Also a bug in the serverscontroller, pulling threw an undefined
warning from the log controller because a single saveField was used and
the logController couldn't save the url data for the action
2013-06-06 10:24:27 +02:00
iglocska 361fb238e0 Merge branch 'feature/gui' of https://github.com/MISP/MISP into feature/gui
Conflicts:
	app/Controller/EventsController.php
2013-06-05 17:46:35 +02:00
iglocska bc42dbd78c Filters updated and some changes for the sync
- visual changes
- date from/until fields
- published field
- a reset form button

- the org of an event added by a sync user will be that of the host
instance's own organisation identifier
2013-06-05 17:45:01 +02:00
Christophe Vandeplas e21acac23e fix incorrect location of loadModel for Attribute 2013-06-05 13:50:33 +02:00
iglocska 2543916944 Merge branch 'feature/gui' of https://github.com/MISP/MISP into feature/gui 2013-06-04 17:41:53 +02:00
iglocska 0410c1465e First version of the new filters on event index 2013-06-04 17:41:27 +02:00
Christophe Vandeplas 213290961b force passwd change for admin user on creation 2013-06-04 13:22:05 +02:00
Christophe Vandeplas 38897d9af3 create default admin user automatically 2013-06-04 13:06:57 +02:00
iglocska 5b6544e580 Small fix to event view attribute access permissions
- Server only attributes not visible to members of another organisation
- fixed
2013-06-04 09:03:12 +02:00
iglocska c09097705a Merge branch 'feature/gui' of https://github.com/MISP/MISP into feature/gui 2013-06-03 17:24:12 +02:00