Iglocska
99e8263447
Small fixes
2015-12-09 02:29:04 +01:00
Iglocska
b40e0fdc7c
Merge branch 'master' into 2.4-syncrework
...
Conflicts:
VERSION.json
app/Controller/AttributesController.php
app/Controller/ShadowAttributesController.php
app/Lib/Tools/ComplexTypeTool.php
app/Model/Attribute.php
app/View/Pages/administration.ctp
2015-12-09 02:00:23 +01:00
Iglocska
5debff6b0d
Visual fixes
2015-12-09 01:50:50 +01:00
Iglocska
af92e29e3c
Further progress on the sync
...
- also, added maintenance mode
- various fixes
2015-12-09 01:43:54 +01:00
iglocska
eaab990620
Double quoting of quoted messages in discussion threads fixed
2015-12-08 15:27:03 +01:00
iglocska
5f153b36c6
Invalid message fixed when accepting several proposals at once
2015-12-08 15:18:34 +01:00
iglocska
fbd97df3ac
Several fixes, among others fixes #748
...
- Double sanitisation when edditing an attribute/proposal comment removed
- Fixed an issue where an ip/resource was recognised as a CIDR notation IP range instead of a url
- Changed the flash message for publishing without e-mails to something less scary
2015-12-08 15:12:13 +01:00
Iglocska
24fc2399cc
Further progress
2015-12-07 02:02:32 +01:00
Iglocska
3831ee2e90
Further work on the sync
2015-12-07 01:32:51 +01:00
Iglocska
fa7fa322cb
First stab at the push filters influencing the pull of a remote instance
2015-12-06 19:41:29 +01:00
Iglocska
e66c38d6f9
Further work on the discussions complete for now
...
- adding a new post automatically scrolls to the new post
- adding/editing/deleting posts persists the context (discussion thread vs event view)
2015-12-06 15:28:21 +01:00
Iglocska
1584ddfc48
Finish of the new discussion post add
...
- flips to the page where the post was added
- scrolls to the last post
2015-12-06 00:44:57 +01:00
Iglocska
d66d26d383
Merge and rework of the thread pagination
...
- not complete yet
Merge branch 'master' into 2.4-beta
Conflicts:
VERSION.json
app/Controller/EventsController.php
2015-12-05 22:17:43 +01:00
iglocska
63ca467a0c
Fix to a missing Log Model init causing an exception
2015-12-04 15:56:39 +01:00
iglocska
5e79c30974
Fix to the previous fix
...
- Flipped it the wrong way, fixed now
2015-12-04 14:28:02 +01:00
iglocska
a82addb981
Small fix to the previous commit
...
- Small fix to a copy-paste fail
2015-12-04 14:23:42 +01:00
iglocska
65faeb48d9
Further tweaks
...
- fixed some corner cases
- added support for the same defanging to the freetext import tool
2015-12-04 11:33:14 +01:00
iglocska
744cf50fb9
Update to attribute validation and the freetext import tool, fixes #742
...
- defanged URL type attributes are refanged on input
- admin script to do the same for all existing attributes
- admin tool doesn't recognise a word followed by a . as a url
2015-12-04 10:43:38 +01:00
Iglocska
39945ca39e
Fixes to the logging
...
- in some places MISP tried to save the org ID instead of the org name in the logs
- fixed
2015-12-03 10:20:29 +01:00
Iglocska
ab26eafd63
Added the possibility to enable debug for site admins
...
- new option in server settings
- enable debug (equal to normal debug level 1) for site admins only
- regular users will be unaffected
2015-12-03 01:45:38 +01:00
Iglocska
d433618c71
Also, enabled the filtering on pull
...
Merge branch 'master' into 2.4-beta
Conflicts:
VERSION.json
app/Controller/EventsController.php
app/Lib/Tools/XMLConverterTool.php
app/Model/Event.php
app/Model/Server.php
2015-12-03 00:27:56 +01:00
iglocska
7763b63dc2
Junk left in the previous commit
2015-12-02 22:12:54 +01:00
iglocska
9f684d230d
Filter and discussion changes
...
- event index filtering now accepts POST requests with a json object
- format has to be filter syntax passed for each field. Example:
- {"tags":"OSINT|TLP:WHITE|!PRIVINT", "published":"1"}
- Fixed an issue with no tags being recognised leading to the index returning an unfiltered list
- Required for filtered pulls from 2.4
- Discussions
- Event discussion thread initiated on first post instead of first view
2015-12-02 22:07:54 +01:00
iglocska
864298e9e5
Fix to an incorrect call on sending out alert emails on edit
2015-12-02 01:15:43 +01:00
iglocska
0265e92486
Fix to a newly introduced bug that breaks updates of attributes via pulls
2015-12-02 00:46:41 +01:00
iglocska
268c7683a0
Rework of the event add/edit
...
- allows for saving an event even if an attribute fails
- logs attributes that fail validation
- same for edit
- add_misp_export updated with the above in mind
2015-12-01 15:39:12 +01:00
Iglocska
5dbbe84069
Merge branch 'master' into 2.4-beta
...
Conflicts:
VERSION.json
app/Controller/EventsController.php
app/Controller/ShadowAttributesController.php
app/Model/Event.php
app/View/Elements/side_menu.ctp
2015-11-30 09:37:22 +01:00
iglocska
85eaea724c
Version bump
2015-11-30 02:29:52 +01:00
iglocska
9eb5680ee8
Reimplementation of the Add XML feature
...
- called Add MISP export now
- can be an XML / JSON file
- result browser with explanations of failures
- REST XML/JSON add/edit of events returns errors instead of the partially succeeding event
2015-11-30 02:28:07 +01:00
Iglocska
184949cc9f
Some small taxonomy fixes
2015-11-29 22:36:14 +01:00
Iglocska
714ed198e5
Various fixes throughout the application
...
- org field still used in some places other than the legitimate use-cases
2015-11-28 23:49:52 +01:00
Iglocska
908f2c4c46
Rework of the taxonomies
...
- users can now add taxonomy tags separately from normal tags on the event view
- tag index now shows taxonomy
2015-11-27 17:41:41 +01:00
Iglocska
d20946f5ed
Fix to logging causing certain functions to fail on migrated installations
2015-11-27 14:10:25 +01:00
iglocska
b30bfab0a5
Delete proposal attachment if the proposal was accepted / discarded
...
- there is no need to keep retransfering the actual attached file if all we want to convey is that the proposal is gone.
2015-11-27 09:16:17 +01:00
iglocska
91c4f67ebd
Fix to an issue where a proposal with an attachment could not be correctly accepted
2015-11-27 08:49:13 +01:00
iglocska
8cac54fd66
Updated CakePHP version to 2.7.7
2015-11-26 18:36:25 +01:00
iglocska
72db1ab211
Left off the view file from the previous commit
2015-11-26 17:13:01 +01:00
iglocska
57c5696d96
Backport of a fix to 2.4 adding comments to proposed attachments
2015-11-26 17:06:33 +01:00
iglocska
c94d67275f
Fix to an issue with the proposal uploader
...
- also a small fix to the baseurl auto detection
2015-11-26 16:38:39 +01:00
Iglocska
93af832abe
Blocked the colour update when the taxonomies are updated
...
- better to not overwrite the local tag colours unless the tag is refreshed from the taxonomy view. A gree tlp:red looks silly.
2015-11-26 09:21:51 +01:00
Iglocska
c104a1763b
Temporarily re-added org field for jobs
2015-11-26 04:38:57 +01:00
Iglocska
0572b2030e
Further work on the taxonomies
...
- colour coding
- filters on the index
- mass tag creation
2015-11-26 04:31:24 +01:00
Iglocska
1328d83fe5
Updated taxonomies
2015-11-25 15:43:45 +01:00
iglocska
b5857696e9
Update to the Taxonomies
2015-11-24 12:02:39 +01:00
iglocska
3784209cf5
First bash at Taxonomies
...
What works:
- added submodules for taxonomies
- added import tool for taxonomies
- added models and convenience functions for taxonomies
- site admins can update taxonomy libraries
- list taxonomies / view indvidual ones (with all resolved tags)
- create tags manually if a taxonomy is enabled
- view related tags / events quickly from the Taxonomy view
What doesn't work:
- Users still cannot choose a tag from taxonomy lists (this will be the main functionality)
- Feature cannot be disabled
2015-11-24 03:27:14 +01:00
iglocska
71cbaefae3
Removed nested gitignores
2015-11-23 19:44:57 +01:00
iglocska
ba8728abb9
Merge branch 'master' into 2.4-beta
...
Conflicts:
VERSION.json
app/Controller/Component/IOCImportComponent.php
2015-11-22 17:53:08 +01:00
iglocska
97f6da18da
Added file as an option when a url like google.com is recognised
2015-11-22 17:50:22 +01:00
iglocska
ca51b55d6b
Changes to the OpenIOC Import, fixes #725
...
- Removed the OpenIOC Indicator UUID persistence and moved it to a comment
- this allows for the same OpenIOC report to be imported into separate events and won't result in a UUID collision
- Reworked the composite indicator resolver
- more generic, allows for 3 part composites (to allow for regkeypath/regkey/regvalue combinations)
- Registry values now correctly recognised
2015-11-22 17:38:11 +01:00
iglocska
74ab203fda
Memberslist now links to the organisations
2015-11-21 23:55:48 +01:00