b981b3f942
fix: [conflict] resolved in user_org update script
2021-11-25 00:43:22 +01:00
1ee895cedf
Merge branch 'main' into develop
2021-11-25 00:36:25 +01:00
033f6d7f97
fix: [typo] organisations != oganisations
2021-11-25 00:02:16 +01:00
c2cefb4311
fix: [user init] generation fixed
2021-11-24 23:59:34 +01:00
b009191aa6
fix: [migrations] user org further fixes
2021-11-24 23:39:27 +01:00
94457d3b97
fix: [migration] userorg migration fixed
2021-11-24 23:36:24 +01:00
c7768921fb
fix: [user init] explicit uuid creation removed
...
- added behavior wherever it was missing
2021-11-24 23:32:17 +01:00
716f6b1147
fix: [default user creation] explicitly create UUIDs
2021-11-24 23:24:04 +01:00
999f4c8539
fix: [migration:user_org] Fixed if org_id column does not exist
2021-11-24 22:49:40 +01:00
e8e1a16673
chg: [search_all] Added drafty support of meta-fields
2021-11-24 22:39:22 +01:00
7d576bcd67
Merge branch 'main' of github.com:cerebrate-project/cerebrate into main
2021-11-24 15:08:33 +01:00
eb0a67327a
fix: [initial user] generation fixed
...
- requires a default organisation + org link now
2021-11-24 14:46:34 +01:00
2ac32911bb
fix: [mysql] action field renamed without renaming the index
2021-11-24 13:50:20 +01:00
19b98a0df4
fix: [mysql] renamed field without renaming the associated index
2021-11-24 13:48:20 +01:00
8ca22760e0
fix: [mysql] create if exists rather than drop + create
...
- made sense early in development, however, it no longer does
2021-11-24 13:47:10 +01:00
c647ae95eb
fix: typo in mysql.sql
2021-11-24 13:44:12 +01:00
8c8aba3fbc
Merge branch 'develop' into main
2021-11-24 01:53:10 +01:00
4bcdf9534a
chg: [cakephp] version bump
2021-11-24 01:52:03 +01:00
bacb3dc85e
fix: [API] fixed broken API
...
- don't call functions specifically meant for the UI when in an ACL context
- also fixed breaking issues with the logging
2021-11-24 01:50:55 +01:00
92fee87a7f
fix: [keycloak] when enrolling users in keycloak, use the user organisation_id instead of the individual's first alias
2021-11-24 01:34:15 +01:00
3cc857c42f
fix: [auditlog] use insert() rather than save() as that is not available in the behavior
...
- fixes exception on logging deletes, blocking any actual deletions
2021-11-24 01:33:26 +01:00
22e4a90af0
chg: [ACL] tightened ACL for several controllers
...
- org admins now have access to new functionalities, added ACL for them
- Affected controllers:
- Authkeys, encryptionkeys, users, sharinggroups
- sets defaults/restricts access accordingly
2021-11-24 01:32:05 +01:00
0fe7f4f931
new: [CRUD] added additional features to the CRUD component
...
- conditions passable to add/edit/index/delete
- refactored get() requests internally to finds to accomodate for additional parameters
- delete() now takes a params[] array as a second argument
2021-11-24 01:30:28 +01:00
5483357e1c
chg: [ACL] fix permissions for org admins
...
- also, fix a bug with the simple permissions being ignored
2021-11-24 01:29:39 +01:00
dad310f434
chg: [appcontroller] include user org in loaded user object during authentication
...
- also log username as username rather than name
2021-11-24 01:28:52 +01:00
6d7a555368
chg: [index views] slight changes
...
- hide inaccessible action buttons on org index
- add owner to sharing group index
2021-11-24 01:28:01 +01:00
e708730e97
chg: [roles] hide action buttons on the role index when they wouldn't be available anyway
2021-11-24 01:27:14 +01:00
ed848e9cee
chg: [sharing groups] show owner org on the index
2021-11-24 01:26:55 +01:00
061f3fc468
chg: [profile] added org to profile menu
2021-11-24 01:26:29 +01:00
81ab202917
chg: [templates] org fields added to user templates
2021-11-24 01:25:57 +01:00
e5e4e74cae
chg: [users] associated with orgs
2021-11-24 01:25:32 +01:00
9619989a94
new: [migration] organisation_id added to users
...
- also, grab the first org for a default
2021-11-24 01:24:25 +01:00
18b78e8eec
fix: [audit log] filtering now uses request_action rather than the renamed action field
2021-11-17 16:04:57 +01:00
7f138325a8
fix: [log index] use the proper action column
2021-11-17 16:04:02 +01:00
0def46149f
Merge branch 'main' into develop
2021-11-17 16:00:07 +01:00
38b4b99bb1
Merge branch 'develop' of github.com:cerebrate-project/cerebrate into develop
2021-11-17 15:59:32 +01:00
92ddd04ba0
fix: [JSON fields] fixed escaping issues
2021-11-17 15:58:52 +01:00
ff77af0a8e
new: [appmodel] moved constants related to the logging along with a getter to app model
2021-11-17 15:58:06 +01:00
fe8e217d61
chg: [audit log naming] renamed action to request_action to avoid reserved keyword usage
2021-11-17 15:57:34 +01:00
7b52d29320
new: [login] log success/failure
2021-11-17 15:49:28 +01:00
bc2e2fa488
new: [open] individualscontroller fix
...
- import badrequest exception
2021-11-17 15:48:49 +01:00
cc04373375
new: [crud component] fixes
...
- add hidden option
- fix afterfind
2021-11-17 15:47:32 +01:00
1f77569344
chg: [auditlog] log api authentication failures / successes
2021-11-17 15:46:32 +01:00
2e1ee2d064
new: [audit log] behaviour tied into the appropriate models
2021-11-17 15:43:52 +01:00
72bd564120
new: [migration] scripts added
...
- also updated mysql.sql
2021-11-17 15:40:44 +01:00
a305bdf9f1
new: [mysql] added new table for audit logs
2021-11-17 14:45:45 +01:00
af4f114f2f
chg: [audit logs] tied into side menu
2021-11-17 14:45:20 +01:00
de2ee49ccf
new: [auditlogs] UI
2021-11-17 14:44:54 +01:00
23dc460359
new: [auditlog system] added
...
- port of Jakub Onderka's implementation from MISP
- Still not fully realised, lacking search functionalities
2021-11-17 14:44:07 +01:00
d9066f4276
Merge pull request #77 from drizzit56/main
...
Added an nginx config for cerebrate
2021-11-03 10:53:15 +01:00
iglocska