Commit Graph

917 Commits (d8c7acc5f95bbc1de4d0b7735b6b85492cd42d49)

Author SHA1 Message Date
iglocska 291892be05 Merge branch 'develop' into features/ajaxification
Conflicts:
	app/View/Elements/img.ctp
2014-05-05 09:56:42 +02:00
iglocska 8dc797dc39 Clearer disctinction between proposals that belong to an attribute and proposals to an event 2014-05-02 15:19:15 +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 4b31c3c497 Merge branch 'hotfix-2.2.24' into develop 2014-04-30 11:01:05 +02:00
iglocska dac1c2b17c CSV export now includes date for each attribute, fixes #255 2014-04-30 11:00:20 +02:00
iglocska 303de0e3aa Further work on the ajaxification
- mass deletes / mass edits

- tagging now done via ajax

- also, several small unrelated issues fixed
2014-04-24 15:10:08 +02:00
iglocska f3bca2cdb0 Merge branch 'hotfix-2.2.22' into develop 2014-04-22 10:39:42 +02:00
iglocska 9640dcd4ed Automation authentication via header fixes #254
- Authentication via headers was only allowed if _isRest() returned true
- this only happened for pages returning JSON or XML content

- a new check, _isAutomation() was added that allows authentication via headers for certain methods used by the automation system
2014-04-22 10:36:37 +02:00
iglocska c88bfc11b2 Rework of the way the ajax editing works
- forms are now dynamically pulled onclick
- performance greatly enhanced
- solves the issues with the CSRF protection kicking in if the user edits a field after using the back button
2014-04-17 11:44:40 +02:00
iglocska 979bb370e7 next step in the ajaxification
- multiselect / multidelete
- some additional UI changes for the event view
2014-04-16 15:52:25 +02:00
iglocska 9ff83d5056 Merge branch 'hotfix-2.2.21' into develop
Conflicts:
	app/Controller/AttributesController.php
2014-04-15 17:11:12 +02:00
iglocska 2f526f6dad Several fixes. Fixes #246 and fixes #248
- Exporting a JSON object erroneously included related objects which prevented the exported event from being added back to MISP via the API

- Downloading search results as XML / CSV now correctly includes all of the search results instead of just the 60 visible ones on the UI (cut off by the pagination)

- The tags parameter in the exports now correctly accepts null as a valid value even if it is the last parameter
2014-04-15 16:55:04 +02:00
iglocska 77a4cd71f6 Next step in the ajaxification of the event view
- users can now edit all fields in an attribute whilst on the event page

- issues left to fix:
	- tag changes after an attribute change run into CSRF protection
	- batch add not handled gracefully yet
	- going back to the event view and editing a field gives users an error message over the CSRF protection - instead, silently check if the page is loaded in a dirty way and refresh the ajax fields silently
	- quickadd of attributes still missing
2014-04-14 15:13:01 +02:00
iglocska 7237c015f5 Merge branch 'hotfix-2.2.20' into develop 2014-04-02 13:28:43 +02:00
iglocska 50f1425526 Missing parantheses
- fixed.
2014-04-02 13:27:54 +02:00
iglocska 3e8ba027e8 Merge branch 'hotfix-2.2.20' into develop 2014-04-01 16:36:15 +02:00
iglocska 1054ff6e85 Very large PGP keys would prevent users from logging in - fixes #142
- removed the PGP key from the Auth user

- PGP key of currently logged in user is looked up on demand and not stored in the session
2014-04-01 16:20:47 +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 b3b67dafa9 Merge branch 'feature/paramToPost' into develop 2014-03-21 15:32:55 +01:00
iglocska 4dc2fe80a9 API improvements fixes #234
- events/restSearch, attributes/restSearch, events/xml, attributes/returnAttributes

- users can now POST a search array in XML / json instead of sending the parameters in the url
2014-03-21 15:30:49 +01:00
iglocska 1a650d5c7c Merge branch 'hotfix-2.2.16' into develop 2014-03-20 15:45:51 +01:00
iglocska 0f060b5589 RestSearch can now return a json (both attribute and event) fixes #233
- also a whitelisting issue fixed
- tag search field not set now correctly returns all events regardless of tags
2014-03-20 15:15:51 +01:00
iglocska d84048a5d9 Merge branch 'hotfix-2.2.15' into develop 2014-03-17 15:14:16 +01:00
iglocska 444e828699 Fixed text attribute exports not working with the auth key in the url
- legacy attribute export was broken due to the text action in the attributescontroller not being allowed globally
2014-03-17 15:12:54 +01:00
iglocska bebe0ab310 Merge branch 'feature/alternate_search' into develop 2014-03-13 16:06:20 +01:00
iglocska 789839649d Alternate search results
- Users can now elect to receive their attribute search results in the new alternative view

- instead of receiving a list of attributes matching the search options, users are presented with a list of events that contain matching attributes

- number of matches and a percentage of those matches being marked as indicators for IDSes are shown

- the events are ordered by the percentage of IDS worthy attribute
2014-03-13 16:03:16 +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
Chris Clark 9e91eeda27 Remove Missing GPG flash if Unencrypted Email is enabled
Adds a check for a true value in GnuPG.onlyencrypted and will only display the "No GPG Key Set in your Profile" message to the user if it is missing AND MISP is set to send only encrypted email. This way orgs not using GPG will not see the banner on every index view.
2014-03-12 14:54:54 -07:00
iglocska 006e1d0254 Added CSV to pages allowed to be visited without being logged in for automation
- same as the other export formats
2014-03-11 15:29:19 +01: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 cf6a430d10 The list of contributors no longer show the logo of an org that hasn't made a proposal
- Until now, organisations that have made any change to an event in the past (even including an admin running scripts that update the event) would flag an event as having an extra contributor

- From now on, the Contributors field only shows orgs that have created proposals
2014-03-03 14:18:26 +01:00
iglocska a2bf7a3362 Fix to the xml automation export and various other changes
- xml export now correctly exports all attachments if specified as parameter

- print view fixes

- disclaimer for old IE versions (< 10) and compatibility mode users when viewing the statistics (The heatmap calendar requires 10+)
2014-03-03 12:00:48 +01:00
iglocska 526bb18627 Previous commit was incorrect, fixed 2014-02-28 12:00:16 +01:00
iglocska e07cb6e5e2 Fixed a bug that allowed read-only users to create an event 2014-02-28 11:54:41 +01:00
iglocska 09f2e5a0bc Anonymising the e-mail addresses in discussions
- The email addresses were shown on the event view even if the post was made by a user of another org
- fixed
2014-02-28 11:06:43 +01:00
iglocska 73159dd4e5 Restricting the event log to show only proposals when selecting the contributions of an org
- the event changes that a proposal creation creates are also logged (such as disarming the proposal email lock) -> this should not be shown in this log view.
2014-02-26 14:14:59 +01:00
iglocska 8956236319 Incorrect method call
- updateXML was moved to the event model, but some calls still tried to call it within the EventsController
2014-02-26 10:21:59 +01:00
iglocska 764161e998 Incorrect check in the API when using the authkey in the URL
- check lead to the user incorrectly being passed on after authentication, not returning any private data of their own organisation.

- Also, publishing an event with the background jobs enabled now correctly shows that the job was added to the queue instead of telling the user that the event has been published.
2014-02-25 17:09:01 +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
iglocska 4279ca5130 Changes to the tagging
- tags can now be set correctly for all events
- some UI changes to the tags
- moved the deletion of all event_tags when a tag gets deleted to beforefilter
2014-02-20 10:07:51 +01:00
iglocska 914687142e Deleting tags fixed
- now it correctly deletes tags
- also deletes all EventTags
2014-02-19 17:38:31 +01:00
iglocska 5796320e84 Update to the tag automation tag searches
- A colon in the tag search tag will render the tag search invalid. Since colons are commonly used in tag names, this poses an issue - users should use a semi-colon instead, which gets automatically converted to a colon.
2014-02-19 17:07:24 +01:00
iglocska da8b62d3f8 Added OpenIOC mapping for DnsEntryItem/RecordName fixes #210 2014-02-17 16:20:16 +01:00
iglocska 11b1ff6926 Changes to uploading a ca file for a server link
- create folder if it doesn't exist
- correctly save file if edited
2014-02-17 11:40:44 +01:00
iglocska 85e3837919 Update to the threatconnect import
- Threatconnect import now allows any valid threatconnect csv file to be imported as long as type, value, confidence, description and source are included
2014-02-14 11:09:04 +01:00
iglocska 722f17f38d Deprecated flag used to check it sync is enabled
- fixed, now correctly looking for MISP.sync
2014-02-14 10:27:09 +01:00
iglocska 19302aca4f Thread count now correctly displayed in the statistics
- Viewing an event without a discussion thread creates an empty thread in preparation of future posts - these empty threads should not count as active threads though.
2014-02-14 10:19:57 +01:00
iglocska 16f1072120 Statistics changes
- remove actions such as login, logout, changepw
- fixed range so that a addinga a massive event doesn't make every other day seem less active
2014-02-12 17:17:15 +01:00
iglocska 5990600983 updated message for old browsers 2014-02-12 13:54:13 +01:00
iglocska 3b8f9b9e2b Removal of obsolete stuff
- taking out the trash
2014-02-11 17:39:16 +01:00
iglocska 6124489e2b Some fixes to the automation and an updated manual
- made it easier to provide null values if the user would want to specify the n+1th parameter whilst leaving the nth on null
2014-02-11 17:16:31 +01:00
iglocska 667b34e350 xml export now takes null in the eventid parameter as null
- also a debug method removed
2014-02-11 16:29:16 +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 f25f3f1266 Bug with the exports
- only events that could be seen were checked when calculating whether the user's org needs to recache the exports. This meant that the information was incorrect if another org has a visible event that was newer.
2014-02-06 14:48:42 +01:00
iglocska 3ee2bcbed1 Typo fixed 2014-02-06 14:42:51 +01:00
iglocska 6bf1063a66 Small fixes 2014-02-06 09:59:41 +01:00
iglocska 4b8c4f4e4a New upgrade scripts and more
- MYSQL.sql updated
- upgrade_2.2.sql updated

- List of active proposals for you and your organisation now shows the org logos of the contributing organisations
2014-02-05 17:06:49 +01:00
iglocska 4776b91f98 Visual changes to the attribute list / search Fixes #162
- org shown for each attribute
- performance improvement (only necessary fields loaded for the event)
2014-02-05 15:22:42 +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 f51d61f8f9 Various changes
- contributors shown on the event view (list of the organisation logos of users that have contributed through proposals)
- these link to the event history containing only entries from their organisation

- changes to the activity heatmap
- heatmap now dynamically changes the range on the graph based on the obtained values
- performance improved
- buttons to move back or forward in time on the calendar

- Attributes:
- warning for the user if he/she has selected the attribute category "targeting-data" or "attribution" as these could contain classified information
- UI improvements across most attribute and shadowattribute input views

- Updated cal-heatmap to the newest version
2014-02-05 13:45:18 +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 2740da9094 Changes to the log system
- View Event history now shows the logo of the org whose action triggered the log entry
- View Event History now shows different fields than before
- Proposals now logged
- Accepting / Discarding a proposal now doesn't create junk edit / delete entries as before.
- Creators of an event can now see all of the log entries altering an event in the event history log. This includes deleted events.
2014-01-28 16:27:58 +01:00
iglocska feff355144 incorrect argument passed to cache generation 2014-01-24 13:20:00 +01:00
iglocska 467408d9f7 Org admins should be able to delete / edit their own server links 2014-01-24 10:43:07 +01:00
iglocska fb7f084e70 Permission issue with delete servers
- fixed a bug that prevented the deletion of sync links
2014-01-24 10:40:46 +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 3f65618845 New permission
- tagger: a user that can create / edit / delete the list of tags that is usable for events
2014-01-21 16:59:21 +01:00
iglocska a9d945ff19 Changes to the sync action pages
- fixed access control
- any admin can now encode new servers. Org admins can pull/push for their own instances.

- Upload certificates during an edit
2014-01-21 16:41:32 +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 8b1ca649d2 Changes to the misc admin functions
- cleaned them up a bit, views for results
- removed query() and replaced it with CakePHP find()
2014-01-17 09:53:23 +01:00
iglocska 61753690a1 Changes to the automation
- authorization key should be sent through headers.
- passing it in the url is deprecated
- updated automation page to reflect the changes

- csv export now has headers
2014-01-16 17:19:51 +01:00
iglocska a1cd813070 Accepting / Discarding Proposals changed to POST only
- it is not possible to discard / accept a proposal with a GET request anymore
2014-01-16 10:11:44 +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 ffcdcaf823 Merge branch 'feature/test_attribute_date' into feature/test 2014-01-13 16:41:33 +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 9c649ffe6d Small fix to the date filter
- fixed the datefilter to be inclusive of the border values. Entering all events from the 13th of january should include events that were created on that day, not just the 14th and newer.
2014-01-13 13:02:50 +01:00
iglocska 065f40fdf6 Some changes from master branch
- regexp default list
- GFI improvements (removed a lot of junk imports, distribution taken from the event)
2014-01-13 12:47:43 +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 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