Commit Graph

106 Commits (898ea1d97c5aae2841450b1afc2fa7cb88f65277)

Author SHA1 Message Date
Andreas Ziegler 898ea1d97c remove whitespace (space/tab) from empty lines 2016-06-04 01:08:16 +02:00
Iglocska f08ec04426 new: Enable/disable feed via API
- simply POST to /feeds/enable/feed_id or /feeds/disable/feed_id to enable and disable a feed
2016-05-26 01:39:31 +02:00
Iglocska 21111498c3 new: Added Statixtics for taxonomy and tag usage, fixes 1158 2016-05-22 23:35:24 +02:00
Andras Iklody b79bfe2336 Merge pull request #1152 from rotanid/misc1
misc cleanup round 1
2016-05-21 09:59:58 +02:00
Andreas Ziegler dc0974a55b misc cleanup 2016-05-21 05:10:49 +02:00
Andreas Ziegler 36036af7e4 IOCImportComponent.php: correct order of braces 2016-05-21 03:17:38 +02:00
Iglocska 6b6877099a fix: Added the option for users to see and undelete attributes if an event was created by their org, fixes #1144
- Also some minor fixes to the ACL
2016-05-20 11:20:03 +02:00
Iglocska d02adf2085 new: Added the news functionality back
- admins can add/edit/delete news items
- users get redirected if there is a newsitem that they haven't seen yet
2016-05-20 01:17:26 +02:00
Andreas Ziegler 800721bf2f improve quality of PR#976 (kerberos auth) 2016-05-19 03:41:10 +02:00
Iglocska 6b83e988f7 chg: Small comment fix 2016-04-29 16:15:19 +02:00
Iglocska 65f40aea90 fix: Fixed an ACL issue preventing normal users from viewing the instance version
- this is required by the enrichment modules
2016-04-29 15:59:02 +02:00
Iglocska d826d62fd0 fix: Fixed some issues with the favourite tags 2016-04-28 16:16:23 +02:00
Iglocska 267caa3315 Merge branch '2.4' into smime
Conflicts:
	app/Controller/AppController.php
2016-04-25 23:12:57 +02:00
Iglocska a1a27da0cf First version of the warnings finished 2016-04-22 15:03:20 +02:00
Iglocska 68d6cae7ac Org admins could not see the roles index 2016-04-19 10:32:22 +02:00
Iglocska 24c7fa61fe Merge branch 'permissionfix' into 2.4 2016-04-18 17:41:59 +02:00
Iglocska 42c612601f Merge branch 'kerberos' into 2.4 2016-04-18 17:25:21 +02:00
Iglocska a6c880c4d2 Fix to the URL generation
- sometimes the URLs are inconsistent in links within MISP (/shadowAttributes vs shadow_attributes)
- the URL generation now takes both cases into consideration
2016-04-18 15:39:55 +02:00
Iglocska 7c6ef14621 Some ACL fixes 2016-04-18 15:32:09 +02:00
Iglocska a20ba21774 change_pw was blocked for normal users 2016-04-18 14:52:05 +02:00
Iglocska b8f34ee844 Added some statistics APIs for attribute types / categories 2016-04-18 14:40:08 +02:00
Iglocska 1ecc4c2f37 Fixed a capitalisation fail 2016-04-18 14:06:17 +02:00
Iglocska b39d178211 some small changes 2016-04-18 09:46:08 +02:00
Iglocska 057ff5e831 Small fixes 2016-04-18 09:14:36 +02:00
Iglocska 92952cc5e4 Rework of the ACL 2016-04-18 03:19:01 +02:00
Iglocska d56f31e888 Work on the new ACL system 2016-04-17 23:13:39 +02:00
devnull- ed2e7efcef unset the user 'certif_public' 2016-04-04 19:01:42 +02:00
Iglocska 4b606c939b Organisation blacklisting added 2016-03-26 23:42:50 +01:00
Tristan METAYER e8eb42755b add modification for erreur with ldap user
modification for dc in conf file
2016-03-17 09:12:23 +01:00
trucky dev 8cb32887e0 Add kerberos Authentification fonction 2016-02-24 23:33:06 +01:00
William Robinet 4fea371c4b Fix permissions 2016-02-11 17:03:51 +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 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 94072f7c60 Fixed a newly introduced bug in the IOC import component 2015-11-20 01:50:10 +01:00
iglocska 0fb9a70449 Merge branch 'master' into 2.4-beta
Conflicts:
	VERSION.json
2015-11-20 00:15:17 +01:00
iglocska 56adab6122 Bugfix pack, fixes #724, fixes #721
- Fixed an issue with the new UUID generation method call in OpenIOC
- Fixed an invalid validation check on the salt key

- Added a note on the server page to make it more obvious that values can be changed by double clicking them
2015-11-19 16:50:14 +01:00
iglocska 324418dcf9 Merge branch 'master' into 2.4-beta
Merge and upgrade of several new features

Conflicts:
	VERSION.json
	app/Controller/ShadowAttributesController.php
	app/Controller/TagsController.php
	app/Model/AppModel.php
	app/Model/Event.php
	app/Plugin/SysLogLogable/Model/Behavior/SysLogLogableBehavior.php
2015-11-08 23:26:19 +01:00
iglocska 16e7974fc0 Improved logging, fixes #695
- Added logging of failed login attempts
- Added (optional) logging of successful authentications
  - admin setting that has to be enabled
  - will log all API calls (both HTTP method and target url)

- optional logging of user IP address for all logs
  - each log entry created while this setting is enabled will log the IP address of the client
  - disabling it also hides the IPs from the interface
  - added new IP field for the log search (only if enabled)
2015-11-08 22:35:46 +01:00
Iglocska 328c666e3a Merge branch 'master' into feature/sg
Merging all the new changes from master

Conflicts:
	VERSION.json
	app/Console/Command/AdminShell.php
	app/Controller/AttributesController.php
	app/Controller/EventsController.php
	app/Model/Attribute.php
	app/Model/Event.php
	app/Model/Log.php
	app/Model/Server.php
	app/Model/User.php
	app/View/Elements/side_menu.ctp
	app/View/Pages/administration.ctp
	app/View/Users/admin_index.ctp
2015-10-12 09:41:20 +02:00
Iglocska dc638adac2 Upgrade to CakePHP 2.7, fixes #684
- cakephp submodule updated to 2.7
- make sure that you update your instance!

- not updating will not break compatibility
2015-10-09 15:59:25 +02:00
Iglocska 704880ce59 Merge branch 'master' into feature/sg
Conflicts:
	VERSION.json
	app/Controller/AttributesController.php
	app/Controller/EventsController.php
	app/Model/Attribute.php
	app/Model/Event.php
	app/Model/Server.php
2015-08-30 13:29:05 +02:00
Iglocska bd7555b185 Various fixes to the OpenIOC import and the password reset, fixes #600, fixes #599, fixes #565
- OpenIOC import now correctly sets IDS flags based on type
- OpenIOC import specifies the source file in the comments

- Fixed a blackhole issue with the password reset popups
2015-08-19 13:20:14 +02:00
Iglocska ce2e6a769d Some fixes to the OpenIOC import tool
- added support for SHA types
- fixed an issue that caused the import to fail with duplicate attributes (the list gets pruned now)
- fixed an issue where no supplied contextual fields would lead to empty attributes being created
- removed the requirement for the files to have the .ioc extension
2015-08-18 17:16:58 +02:00
Iglocska b163164450 Further work on the sharing groups 2015-04-13 17:52:04 +02:00
iglocska a98dd9b489 Fix to the STIX export fixes #311 and a temporary fix to an OpenIOC import issue
- STIX export had 2 issues as pointed out by RichieB2B:
    - Incorrect name assigned to incidents due to copy-pasta fail
    - Historyitems incorrectly handled

- For the OpenIOC import:
    - Mapping DnsEntryItem/Host to hostname
    - Mapping of hostnames to Network activity failed due to incorrect capitalistion
    - Temporarily removed the ignore function on certain indicators. Ignoring an element in an AND-ed branch happens without a pruning of the element IDs
2014-10-30 10:30:55 +01:00
iglocska e5806906ed Fixed authored date format, closes #283 2014-08-28 10:17:00 +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 da8b62d3f8 Added OpenIOC mapping for DnsEntryItem/RecordName fixes #210 2014-02-17 16:20:16 +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 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