Commit Graph

642 Commits (8bc3088e1219d991be55ea31515a4f776671aac5)

Author SHA1 Message Date
Sami Mokaddem 62ca877f0b
Merge branch 'develop' of github.com:cerebrate-project/cerebrate into develop-unstable 2022-02-08 08:42:25 +01:00
Sami Mokaddem b01d75aaa6
fix: [helpers:bootstrap] Support of cell variant in table 2022-02-07 13:25:33 +01:00
Sami Mokaddem ad3e89199b
chg: [settingTable] Added value validation before saving the setting 2022-02-07 12:01:07 +01:00
Sami Mokaddem 336dfb091c
chg: [settingTable] Gracefully handle if file not writeable 2022-02-07 11:11:25 +01:00
Sami Mokaddem 14ec995c2b
fix: [userSettings] Perform URI validation for bookmarks
- As reported by Dawid Czarnecki from Zigrin Security
2022-02-07 10:48:55 +01:00
iglocska c7b226f844
chg: [flood protection] added cleanup 2022-02-07 02:14:53 +01:00
iglocska d45a4dc499
new: [registration] added optional registration flood protection
- As reported by Dawid Czarnecki from Zigrin Security
2022-02-07 02:03:41 +01:00
iglocska e6643365d2
new: [flood protection] behaviour added
simple expiration system to allow flood protections to be added to any functionality
2022-02-07 02:01:59 +01:00
iglocska a9c1619bda
new: [Exception] 429 added 2022-02-07 01:59:33 +01:00
iglocska 88f3cc7944
fix: [security] user settings allow enumeration of usernames
- as reported by Dawid Czarnecki from Zigrin Security
2022-02-04 00:45:42 +01:00
iglocska a263234917
fix: [security] open endpoints should only be open when enabled
- as reported by Dawid Czarnecki from Zigrin Security
2022-02-04 00:36:31 +01:00
iglocska 15190b930e
fix: [security] Sharing group ACL fixes
- added indirect object reference protection
- added correct ACL functionalities to delete, addOrg, removeOrg

- as reported by Dawid Czarnecki from Zigrin Security
2022-02-04 00:16:24 +01:00
iglocska 5fbd53883f
fix: [sync] created field rules added
- should stop issues of SG/Individual downloads from remote brood
2022-01-31 09:35:33 +01:00
iglocska 788feab011
chg: [Version] bump 2022-01-27 22:12:35 +01:00
iglocska cf67c3d1f0
fix: [roles] setting default should be exclusive
- added aftersave action to remove default from other roles
2022-01-27 22:06:26 +01:00
iglocska 1ca0f21b86
chg: [user add] form defaults
- org will default to own org for site admins
- role will default to the default role (if set)
2022-01-27 21:54:59 +01:00
iglocska 93d4917953
Merge branch 'develop' of github.com:cerebrate-project/cerebrate into develop 2022-01-27 21:00:32 +01:00
iglocska c983c6f130
fix: [Keycloak baseurl] remove trailing slashes 2022-01-27 20:59:58 +01:00
iglocska eb5f7aa675
chg: [base settings provider] pass settings by reference for evaluation
- opens it up for modifications by the hooking functions
2022-01-27 20:59:20 +01:00
iglocska 7834ab3d62
chg: [settingsTable] Use settings array for the actual saving in saveSetting
- allows us to modify a value in the processing steps before the value is committed to disk
2022-01-27 20:57:35 +01:00
Andras Iklody 6443f36650
Merge pull request #86 from righel/add-inter-connection-tests
Add inter-connection test
2022-01-27 16:13:35 +01:00
Sami Mokaddem 7de1c14407
chg: [userSettings:add] Adhere to the passed user context 2022-01-27 10:44:47 +01:00
Sami Mokaddem 789bd9926f
chg: [navigation:users] Restored breadcrumb navigation to access user profile settings 2022-01-27 08:41:31 +01:00
Sami Mokaddem 2e7aabf704
fix: [users:toggle] Prevent users to disable admins 2022-01-26 16:10:33 +01:00
Sami Mokaddem fcffad6777
fix: [users:delete] Typo copy paste error 2022-01-26 15:45:57 +01:00
Luciano Righetti d91a362e99 Merge branch 'develop' into add-inter-connection-tests 2022-01-26 15:31:49 +01:00
iglocska 665999b8f4
Merge branch 'develop' of github.com:cerebrate-project/cerebrate into develop 2022-01-26 15:29:53 +01:00
iglocska 95ecc2bc80
fix: [security] fields not adhered to in CRUD components edit
- users can circumvent restrictions on editable fields
- can lead to privilege escalation when users edit themselves
2022-01-26 15:28:10 +01:00
Sami Mokaddem 2602b60eb0
Merge branch 'develop' of github.com:cerebrate-project/cerebrate into develop 2022-01-26 15:12:46 +01:00
iglocska 006b0aab99
chg: [MISP connector] user edit/delete temporarily commented out as they're not implemented yet 2022-01-26 15:05:38 +01:00
Sami Mokaddem d05868106d
Merge branch 'develop' of github.com:cerebrate-project/cerebrate into develop 2022-01-26 14:59:57 +01:00
iglocska 519fcd2b1a
fix: [lax URL validation] added for Broodstable
- can be reused elsewhere too
- allows for http://hostname style urls
2022-01-26 14:57:43 +01:00
iglocska f695744bd7
fix: [user view] ACL fixed 2022-01-26 14:57:01 +01:00
iglocska b7facf226d
chg: [Navigationcomponent] added missing changes from previous commit 2022-01-26 14:55:47 +01:00
Sami Mokaddem 74e95855bd
Merge branch 'develop' of github.com:cerebrate-project/cerebrate into develop 2022-01-26 14:54:03 +01:00
iglocska 4b5bccae28
chg: [Organisation] Entity accessibility rules
- make created only accessible when creating new objects
2022-01-26 14:24:53 +01:00
iglocska c186c88d5c
chg: [navigation] Breadcrumb generation is user aware
- moved the initialisation of the generation to be invoked from the appcontroller's beforefilter, after the user is loaded into the ACL component
- Only show user setting edits when the user is editing themselves
2022-01-26 14:21:27 +01:00
iglocska 9a0ddef2af
new: [ACL] added canEditUser() function
- simple comparison between two users
- checks role + org based permission
2022-01-26 14:16:28 +01:00
Sami Mokaddem 54ee91ba1a
Merge branch 'develop' of github.com:cerebrate-project/cerebrate into develop 2022-01-26 12:11:53 +01:00
Sami Mokaddem f53b458103
fix: [userSettings] Allow admin to edit other user's settings 2022-01-26 12:11:44 +01:00
Luciano Righetti d18471ba95 fix: failing when request is empty json object 2022-01-25 18:02:41 +01:00
iglocska 19c81b7c11
fix: [Sharing groups] UUID and owner org shouldn't be editable 2022-01-25 17:09:29 +01:00
iglocska 1086e41086
fix: [modified] saving fixed for sync captures
- set the field as not dirty to force an update
- stops the exceptions thrown on pulling these objects in
2022-01-25 17:01:27 +01:00
iglocska acc9c94baa
Merge branch 'main' into develop 2022-01-25 15:59:31 +01:00
iglocska 55782af52b
fix: [users] add
- fixed role selection
2022-01-25 15:58:31 +01:00
Sami Mokaddem 44913c5ed7
fix: [users:settings] Allow admin to see account settings of other users 2022-01-25 15:27:34 +01:00
Sami Mokaddem e05bf61251
chg: [inbox:createEntry] Checks for remote back connection is more flexible
Handle the case of trailing slash
2022-01-25 15:02:52 +01:00
Sami Mokaddem eef09f44c4
chg: [brood:connectionTest] Correctly handles network exceptions 2022-01-25 15:02:35 +01:00
Sami Mokaddem 4f8b663b87
chg: [localtTools:connectionRequest] Provide more info on exception 2022-01-25 15:02:30 +01:00
Sami Mokaddem 7d227a4387
chg: [inbox:index] Sort messages by created datetime 2022-01-25 15:02:25 +01:00
Sami Mokaddem dc2bfcb6b2
fix: [components:CRUD] Support of controller's paginate public variable 2022-01-25 15:02:16 +01:00
Sami Mokaddem 5682f2a816
fix: [localToolConnectors:MISP] Fixed bad merge 2022-01-25 14:04:32 +01:00
iglocska e9f77aff51
Merge branch 'develop' into main 2022-01-25 11:36:06 +01:00
iglocska 7830e24e68
Merge branch 'main' of github.com:cerebrate-project/cerebrate into main 2022-01-25 11:35:19 +01:00
iglocska 57e2c75352
fix: [users] role based action filtering added
- to avoid annoying clickable, but blocked actions for og admins
2022-01-25 11:34:22 +01:00
Sami Mokaddem 74df550419
chg: [inbox:collectNotifications] Collect notifications for the logged in user 2022-01-25 11:32:09 +01:00
Sami Mokaddem dd3a1b8a15
chg: [appcontroller] Breadcrumbs and notifications are fetched only if the user is logged in 2022-01-25 11:29:50 +01:00
Sami Mokaddem 249892c3e0
chg: [notifications] Support of modal when clicking on notification element 2022-01-25 09:32:16 +01:00
Sami Mokaddem 38caafb76e
chg: [inbox:createEntry] Checks for remote back connection is more flexible
Handle the case of trailing slash
2022-01-24 17:37:32 +01:00
Sami Mokaddem b343c22f23
chg: [brood:connectionTest] Correctly handles network exceptions 2022-01-24 16:35:42 +01:00
Sami Mokaddem 7535cd2bdf
chg: [localtTools:connectionRequest] Provide more info on exception 2022-01-24 16:12:46 +01:00
Sami Mokaddem 5cac62a9b8
fix: [localToolConnectors:MISP] Fixed typo 2022-01-24 15:16:18 +01:00
Sami Mokaddem 6321725fa9
new: [notification] Added initial version of the notification system 2022-01-24 15:13:28 +01:00
Andras Iklody b556f7f22a
Update VERSION.json 2022-01-21 14:39:43 +01:00
iglocska 932a28288d
new: [CRUD] added some new useful features
- afterFind for the edit functions to make last minute decisions on the modification after already having loaded the data to be modified
- moved the field restrictions to be able to pass it to the view
- try/catch for bulk deletions. A single failure in the beforeSave call will no longer block the entire saving process
2022-01-21 13:41:29 +01:00
Sami Mokaddem 7c557f6d85
chg: [inbox:index] Sort messages by created datetime 2022-01-21 09:48:53 +01:00
Sami Mokaddem a59f59ba0d
fix: [components:CRUD] Support of controller's paginate public variable 2022-01-21 09:35:55 +01:00
Sami Mokaddem b8bc79e072
new: [helper:valueGetter] Helper to help execute closure to get a value if needed 2022-01-21 09:07:21 +01:00
Sami Mokaddem 38a9aa9869
chg: [auditlog] Allow filtering and searching the table 2022-01-20 13:55:27 +01:00
Sami Mokaddem 420bbb9207
fix: [auditlog] Typo in field name 2022-01-20 13:54:59 +01:00
Sami Mokaddem ec76948ebd
fix: [component:CRUD] Filtering view variables get correctly set 2022-01-20 13:54:17 +01:00
Sami Mokaddem e6ec31ff23
fix: [appTable:table_statistics] Compute timeline only if the fields exist in the DB schema 2022-01-20 13:44:19 +01:00
Sami Mokaddem f3813dd5a7
fix: [auditlog] Clean up of leftover copy paste 2022-01-20 13:43:29 +01:00
Sami Mokaddem a98c7f8f32
fix: [metaTemplate] Various fixed on meta-templates updates 2022-01-20 12:00:39 +01:00
Sami Mokaddem 86946719c7
chg: [component:CRUD] Fixed typo 2022-01-20 11:57:48 +01:00
Sami Mokaddem a60ca95120
chg: [ui:api] Moved API navigation link into admin section and created breadcrumb config 2022-01-20 09:32:39 +01:00
Sami Mokaddem 2e0051401f
chg: [appController] Don't generate nav breadcrumbs in API context 2022-01-20 09:31:51 +01:00
Sami Mokaddem 6be08e3100
fix: [appTable:activityStatistics] Variation take for the activity of the last x days 2022-01-20 09:05:02 +01:00
Sami Mokaddem 324ac1ce40
Merge branch 'develop' of github.com:cerebrate-project/cerebrate into refactor-metatemplates 2022-01-20 09:00:45 +01:00
Andras Iklody 80cd93da40
Merge pull request #80 from righel/add-integration-tests
Add integration tests
2022-01-19 16:25:19 +01:00
iglocska 475a13847e
Merge branch 'develop' of github.com:cerebrate-project/cerebrate into develop 2022-01-19 14:59:48 +01:00
iglocska d488f01051
fix: [authkey] add fixed
- incorrectly potentially filter out valid options when adding a key by a regular user
2022-01-19 14:39:03 +01:00
Sami Mokaddem b42941dc8e
Merge remote-tracking branch 'origin/develop' into develop 2022-01-19 09:04:20 +01:00
Sami Mokaddem 20cc6017d0
fix: [localTool:CommonConnector] Ensure one logger per connector 2022-01-19 09:04:10 +01:00
Luciano Righetti ee5c723c71 Merge branch 'develop' into add-integration-tests 2022-01-18 18:11:53 +01:00
iglocska f75d0829d1
fix: [user edit] fixed for non admins 2022-01-18 17:52:59 +01:00
iglocska dbaa2ba7b3
fix: [encryption keys] several fixes
- fix the user view to correctly point to the list of related encryption keys
- fix the lookup on the index to be based on owner_model + owner_id combo
- fix the filtering of the dropdown in the encryption key add form to only valid options
2022-01-18 16:56:38 +01:00
Luciano Righetti afcfe57767 Merge branch 'develop' into add-integration-tests 2022-01-18 16:26:06 +01:00
iglocska eae8e62e5e
fix: [CRUD] delete post message fix
- correct order of execution for the beforesave command
2022-01-18 16:24:24 +01:00
Luciano Righetti 6e31005d79 Merge branch 'develop' into add-integration-tests 2022-01-18 16:11:23 +01:00
iglocska f55365a03b
Merge branch 'develop' of github.com:cerebrate-project/cerebrate into develop 2022-01-18 15:37:20 +01:00
iglocska 8cb24baf5f
fix: [ACL] tightening for delete functions
- implemented beforeSave() function in the CRUD::delete() functionality
- added correct handling for the organisation level encryption keys in the beforeSave constructor
2022-01-18 15:35:55 +01:00
iglocska c35d67ebca
fix: [encryption keys] functionality to filter orgs/individuals fixed
- actually execute the query rather than just build it
2022-01-18 14:59:41 +01:00
Luciano Righetti f48c1a5a17 Merge branch 'develop' into add-integration-tests 2022-01-18 14:29:54 +01:00
Sami Mokaddem 5eeda6b682
new: [localtool:commonConnectorTools] Added new logger for each local tools 2022-01-18 11:51:54 +01:00
iglocska a29a4ea024
Merge branch 'main' into develop 2022-01-18 00:23:19 +01:00
iglocska ec994b05ed
chg: [user] edit restricted to password only for self 2022-01-18 00:20:53 +01:00
iglocska b80d778e1a
fix: [encryption keys] tightened ACL across all CRUD functions 2022-01-18 00:17:47 +01:00
iglocska 8c97c3b3a0
Merge branch 'main' into develop 2022-01-17 17:17:31 +01:00
iglocska 6d13d4aba0
fix: [authkeys] tighten requirements to add authkeys for other org admins
- site admin: can add to all
- org admin: can add to all in org, except site admin
- everyone else: can add to self only
2022-01-17 17:16:03 +01:00
Sami Mokaddem 49a3dd1623
chg: [instance] Added support of API response for 2 endpoints 2022-01-17 15:55:55 +01:00
Sami Mokaddem 0c9b032536
Merge branch 'develop' of github.com:cerebrate-project/cerebrate into develop 2022-01-17 15:30:07 +01:00
Sami Mokaddem 98e8272810
fix: [ACL] Allow anyone to view encryption keys 2022-01-17 15:29:58 +01:00
Sami Mokaddem ef2827e87a
fix: [userSettings] Various permissions issues 2022-01-17 15:24:30 +01:00
Sami Mokaddem 1c81257b75
fix: [helpers:bootstrap] Table's cell generator gets the correct row index 2022-01-17 15:22:52 +01:00
iglocska 244020802c
Merge branch 'main' into develop 2022-01-17 13:17:51 +01:00
iglocska 453c838dfe
fix: [placeholder removed] WiP functionality for local_tool->local_tool connections within the same brood temporarily removed
- was never fully implemented
2022-01-17 13:15:26 +01:00
iglocska acf85e6d10
Merge branch 'develop' of github.com:cerebrate-project/cerebrate into develop 2022-01-17 12:49:27 +01:00
iglocska 1b4c681a88
new: [Outbox] entity added
- to inherit the appModel functions
2022-01-17 12:47:48 +01:00
Sami Mokaddem f18307b3cb
chg: [localTools:local_tool_connectors] Added support of CodeMirror placeholder 2022-01-17 11:30:26 +01:00
iglocska 12d7607aae
new: [encryption key] view added
- was missing, despite links to it
2022-01-17 09:45:45 +01:00
iglocska caf48c9060
fix: [ACL] proper error messages on user edit
- don't just silently redirect to the own user editing if the user isn't authorised to modify another user
2022-01-17 09:19:53 +01:00
iglocska 87723c2100
fix: [ACL] added correct file for previous fix (user edit admin permission check) 2022-01-12 10:32:47 +01:00
iglocska 204c60f739
fix: [ACL] fixed ACL check on user edit for the admin permission
- invalid name used for the lookup (perm_side_admin instead of perm_admin) leading to incorrect downgrading of the permissions
2022-01-12 10:31:06 +01:00
Luciano Righetti 241e760ad2 add: add API menu option 2022-01-10 16:20:22 +01:00
Luciano Righetti ce1a51cc39 fix: incorrect check 2022-01-10 11:59:23 +01:00
Luciano Righetti a69608530c new: add /api openapi spec view with redoc, add faker to fixtures, validate api responses with openapi spec, add /api/v1/ prefix to api routes 2022-01-07 13:45:52 +01:00
Luciano Righetti f45727704f fix: deprecation warning 2022-01-05 17:44:24 +01:00
Luciano Righetti a473a9d3fb new: initial api and integration tests. 2022-01-05 17:44:02 +01:00
iglocska aa23b3e293
Merge branch 'develop' of github.com:cerebrate-project/cerebrate into develop 2021-12-22 12:27:04 +01:00
iglocska 136148705a
chg: [keycloak] added screw to loosen timing issues 2021-12-22 12:26:37 +01:00
iglocska 58e32782ca
chg: misp connector index changes 2021-12-22 12:13:27 +01:00
Sami Mokaddem 30ec856dc3
fix: [local_tool:batchApiAction] Various UI and backend fixes 2021-12-21 12:36:36 +01:00
Sami Mokaddem 3ed5af776a
fix: [local_tool:batchApiAction] Various UI and backend fixes 2021-12-21 12:34:37 +01:00
Sami Mokaddem e346a8cb05
fix: [instance:searchAll] Correct usage of parameters 2021-12-21 08:30:37 +01:00
Sami Mokaddem 0dea5ab486
chg: [metaTemplate] Added endpoint to load template from disk by uuid 2021-12-20 14:24:20 +01:00
Sami Mokaddem fa364c2b2f
fix: [metaTemplate] Repaired update_all 2021-12-15 15:33:58 +01:00
Sami Mokaddem 02cc0c30a3
chg: [metaTemplate] Major refactoring and documentation - WiP 2021-12-14 15:09:40 +01:00
Sami Mokaddem f7ae58a22d
chg: [component:crud] Renaming the default `all` contextual filter 2021-12-14 15:08:28 +01:00
Sami Mokaddem a5a959df2d
fix: [metatemplate] Removed unused code 2021-12-13 09:37:49 +01:00
Sami Mokaddem aa83b1aa37
chg: [metaTemplate] Update system and conflict resolution interfaces - WiP 2021-12-08 11:11:46 +01:00
Sami Mokaddem 8b5bb087e4
fix: [helper:bootstrap] Support of string and array for badge's class parameter 2021-12-08 11:05:52 +01:00
iglocska 4c7dc85d0e
fix: [encryptions] fixed adding encryption keys 2021-12-01 15:24:08 +01:00
iglocska 1e31f4d1dd
new: [ACL Helper] check access for controller / action pair for given user
- accesible everywhere in the UI
2021-12-01 14:25:34 +01:00
iglocska e408f29a05
chg: [appcontroller] minor changes
- getRoleAccess now returns array format
- moved setting of view variables behind a rest check, to avoid additional unused actions for API queries
- current user's role access matrix passed to view via "roleAccess"
2021-12-01 14:24:32 +01:00
iglocska fbb1a52724
new: [ACL component] new functionalities
- getRoleAccess now returns either URLs or arrays
- array format allows for easy checking of controller + action pairs
2021-12-01 14:22:02 +01:00
Sami Mokaddem 819d96e805
new: [metaTemplate] Interface and functions to update meta-templates - WiP
Actual update not implemented yet.
2021-12-01 11:01:31 +01:00
Sami Mokaddem da889c4ca2
fix: [helpers:bootstrap] Make sure to sanitize passed text 2021-12-01 08:26:17 +01:00
Sami Mokaddem d2a88b3a18
chg: [Component:Navigation] Breadcrumbs get loaded before rendering to have access to view var
So that it can have access to view variables
2021-12-01 08:25:20 +01:00
iglocska 392faa60e4
new: [ACL] getRoleAccess endpoint added
- prints all valid URLs for the current user's role
2021-11-30 00:00:05 +01:00
iglocska c7d40d42c7
fix: [ACL] added missing entries 2021-11-29 23:37:41 +01:00
iglocska 22be309dc2
fix: [ACL] fix wildcard controller checks failing 2021-11-28 23:42:22 +01:00
iglocska 7fa0537cfd
fix: [encryption keys] only show valid options when creating keys as a user 2021-11-27 23:51:32 +01:00
iglocska 312229751b
fix: [keycloak] enrollment org_id issues fixed 2021-11-25 11:55:51 +01:00
iglocska cc5c750de8
chg: [audit log] change field renamed to changed
- change is a reserved keyword
- this way quoting of field names is no longer needed in the cakePHP settings
2021-11-25 00:57:31 +01:00
iglocska 1ee895cedf
Merge branch 'main' into develop 2021-11-25 00:36:25 +01:00
iglocska 033f6d7f97
fix: [typo] organisations != oganisations 2021-11-25 00:02:16 +01:00
iglocska c2cefb4311
fix: [user init] generation fixed 2021-11-24 23:59:34 +01:00
iglocska c7768921fb
fix: [user init] explicit uuid creation removed
- added behavior wherever it was missing
2021-11-24 23:32:17 +01:00
iglocska 716f6b1147
fix: [default user creation] explicitly create UUIDs 2021-11-24 23:24:04 +01:00