Commit Graph

2840 Commits (cd886b4a7977edc4d345d845f77c0eee0f7cb27b)

Author SHA1 Message Date
iglocska cd886b4a79 Relaxed financial attribute validation
- also added 2 new types: bank-account-nr and aba-rtn
- validation is completely relaxed
- idea is to add a visual notification in the view for these attributes types if they are not valid (invalid financial indicators are still interesting)
2015-11-09 12:36:49 +01:00
iglocska 9faf3df8ae Some fixes to the api authentication
- Handle user not found gracefully
- Log the failed authentication correctly
2015-11-09 08:52:06 +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 a3661fdcbd Merge branch 'hotfix-2.3.152' 2015-11-08 22:57:17 +01:00
iglocska c83b1e2dd0 Fix to the CSV export, fixes #710 2015-11-08 22:56:00 +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 c3ebc18afa Merge branch 'develop' 2015-11-03 17:07:19 +01:00
iglocska 8f1363df37 Merge branch 'hotfix-2.3.151' into develop 2015-11-03 17:07:12 +01:00
iglocska 42ad040d3c Removed obsolete gitignore files, fixes #704 2015-11-03 17:06:21 +01:00
iglocska 5f06e87b6c Merge branch 'hotfix-2.3.150' into develop 2015-10-31 00:29:59 +01:00
iglocska 4b24cf0c65 Documentation changes 2015-10-31 00:29:15 +01:00
iglocska 9c00d56ed4 View all proposals via the API
- Proposals that can be accepted / discarded via the API
- Can restrict the index to the proposals of a single event
2015-10-31 00:18:05 +01:00
iglocska e12d70c5c3 Merge branch 'hotfix-2.3.149' into develop 2015-10-30 16:30:34 +01:00
iglocska 70eb812060 Merge branch 'hotfix-2.3.149' 2015-10-30 16:29:32 +01:00
iglocska 345e898f5f Tagging added to the API
- Create / Edit / Remove / index / view tags via the API
2015-10-30 16:28:51 +01:00
Iglocska 7a686a2718 Merge branch 'master' into 2.4-beta
Also, reworked a lot of remaining distribution checks not handled by the main fetch methods

Conflicts:
	VERSION.json
	app/Controller/AttributesController.php
	app/Controller/ShadowAttributesController.php
	app/View/ShadowAttributes/add.ctp
	app/View/ShadowAttributes/edit.ctp
2015-10-30 13:39:12 +01:00
Iglocska fdd75f4ae4 Merge branch 'hotfix-2.3.148' into develop 2015-10-28 23:34:58 +01:00
Iglocska 70e776eff1 Merge branch 'hotfix-2.3.148' 2015-10-28 23:34:13 +01:00
Iglocska 059a8aa43a Added API for proposals
- APIs for the following actions:
  - Add new proposed attribute to an event
  - Add proposed change to an attribute
  - View a proposal
  - Accept a proposal
  - Discard a proposal

- new APIs described on the automation page
2015-10-28 23:32:30 +01:00
Iglocska f3e1654310 Merge branch 'hotfix-2.3.147' 2015-10-27 15:18:31 +01:00
Iglocska 80f29c1f33 More details on the PGP validation tool 2015-10-27 15:18:04 +01:00
Iglocska e759803334 Merge branch 'hotfix-2.3.147' into develop 2015-10-27 14:02:01 +01:00
Iglocska a9df8e4c91 Merge branch 'hotfix-2.3.147' 2015-10-27 14:01:11 +01:00
Iglocska f9da3f2d2c Small fix to the pgp key validation tool
- doesn't break on completely invalid keys anymore
2015-10-27 14:00:31 +01:00
iglocska f7f3142a91 Merge branch 'hotfix-2.3.146' into develop 2015-10-27 08:36:14 +01:00
iglocska ddd51c3a0f Merge branch 'hotfix-2.3.146' 2015-10-27 08:35:10 +01:00
iglocska aede05bdc6 Version bump 2015-10-27 08:34:59 +01:00
iglocska 7d651f094b Fix to a vulnerability found in attributescontroller
- vulnerability reported by Airbus Group CERT

- Deprecated ajax attribute view had inverse access control logic
- removed ajax path
- added XML/JSON view
2015-10-27 08:31:48 +01:00
iglocska 4dc9b911e7 Merge branch 'feature/sg' into 2.4-beta 2015-10-22 10:03:31 +02:00
iglocska 1d3ec3afa3 Merge branch 'feature/sg' of https://github.com/MISP/MISP into feature/sg 2015-10-22 10:01:25 +02:00
iglocska 0ae9c963a5 Small fix to the syslog 2015-10-22 10:00:59 +02:00
iglocska ef1d3949e7 Merge branch 'master' into feature/sg
Conflicts:
	VERSION.json
	app/Controller/ShadowAttributesController.php
	app/Lib/Tools/JSONConverterTool.php
	app/Lib/Tools/XMLConverterTool.php
	app/Model/User.php
	app/View/Elements/eventattribute.ctp
2015-10-22 09:59:00 +02:00
iglocska 679bef35f0 Merge branch 'hotfix-2.3.145' into develop 2015-10-22 09:57:18 +02:00
iglocska 07f411c71f Merge branch 'hotfix-2.3.145' 2015-10-22 09:52:04 +02:00
iglocska 6fa27d659a Reverted change in proposal file storage path that wasn't needed 2015-10-22 09:51:31 +02:00
iglocska 35661f24f8 Merge branch 'hotfix-2.3.144' into develop 2015-10-21 23:52:46 +02:00
iglocska fa55f7fa9d Merge branch 'hotfix-2.3.144' 2015-10-21 23:51:50 +02:00
iglocska f4f4f0f069 Version bump 2015-10-21 23:51:36 +02:00
iglocska 26a4705bb3 Removed junk 2015-10-21 23:50:55 +02:00
iglocska 61e865956b Fixes to several issues, fixes #693
- Fixed a critical bug in the XML export
  - As of recently XML exports include relations as they were missing before
  - the sanitisation of the event info field in related attributes was incorrectly sanitized of unicode characters
  - this can lead to the XML export breaking and also for affected events to be blocked from synchronisation

- Proposal fixes
  - fixed an invalid uuid generation that lead to an exception
  - fixed the attachments for proposals still using the old attachment system that disallows most filenames
  - added the automatic creation of hashes for attachment proposals
2015-10-21 23:44:07 +02:00
iglocska 04a4738c1c Fix to loading the correct logos in the graph view 2015-10-19 07:27:20 +02:00
iglocska a59a68366a Damn d3.js... Finally it doesn't bug out. 2015-10-19 02:00:39 +02:00
iglocska 593f166386 Fixed an issue where orgs without a logo would not have the placeholder logo shown on graphs 2015-10-19 00:23:29 +02:00
iglocska e63d10f0d4 Various bugfixes 2015-10-18 23:10:25 +02:00
iglocska ae4d0af532 Fix to the cc validator 2015-10-18 22:51:40 +02:00
iglocska 38f5c443d3 Debug removed 2015-10-18 22:25:54 +02:00
iglocska 9ea162aece Fix to the financial tool (incorrect CC validation) 2015-10-18 22:24:05 +02:00
iglocska e191a25317 Updated the server preview to work between 2.4 instances 2015-10-18 21:31:01 +02:00
iglocska 96c6ac8487 Fixed the index view to include the new objects in json view 2015-10-18 21:11:34 +02:00
iglocska 479a3bfde4 Check if a tag is pushed with an event before trying to loop through the tags... 2015-10-18 20:57:20 +02:00