Commit Graph

114 Commits (a61caa3a6a541e6f9761ae99c033c7457050bc0b)

Author SHA1 Message Date
mokaddem bd26a1671c
fix: [event:__prepareForPushToServer] Slight refactoring 2021-06-04 15:22:06 +02:00
mokaddem 0a68e339e8
chg: [sharinggroup] Allow pushing SG if remote internal server is not in the list of SG servers 2021-06-04 08:34:47 +02:00
mokaddem c9acae11f0
fix: [sharinggroup:capture] Re-use the ID of an existing SG if it exists
instead of the defaulted value 0
2021-05-30 11:06:51 +02:00
mokaddem c2a85e7f7e
fix: [sharinggroup:captureOrg/captureServer] Use the ID of the existing sharing group 2021-05-30 11:05:07 +02:00
Jakub Onderka ad1b373766 new: [log] Audit log 2021-05-03 13:44:44 +02:00
Jakub Onderka f8ae2f40ae
Merge pull request #7158 from JakubOnderka/sg-user-org-id
fix: [internal] Organisation object for user is not included all time
2021-04-03 17:42:17 +02:00
mokaddem 6a944c8086
Merge remote-tracking branch 'origin/2.4' into develop 2021-03-25 16:34:44 +01:00
mokaddem 0653761e2d
fix: [sharinggroup:captureSG] Correctly capture the roaming state
Fix #7254
2021-03-25 16:33:53 +01:00
iglocska 02dc2a124d
fix: [sharing groups] uuid not logged when saving failed due to invalid variable lookup 2021-03-22 10:17:29 +01:00
iglocska 91b82178a5
fix: [SG] allow saving sharing groups with empty releasabiltiy tags, fixes #7165 2021-03-05 16:16:27 +01:00
Jakub Onderka 02d797e2da fix: [internal] Organisation object for user is not included all time 2021-03-04 20:49:16 +01:00
iglocska 7f9afb84e7
fix: [Sharing groups] capturing a sharing group correctly ignores the incoming data's active flag when editing
- based on PR #7101 by @lfortemps
2021-03-03 00:19:46 +01:00
iglocska f83fc6ca24
fix: [sharing groups] fixed regression with updating local sharing groups 2021-03-02 23:42:54 +01:00
iglocska 7bb9466e9c
Merge branch '2.4' into develop 2021-03-01 23:33:42 +01:00
iglocska ce88fd3ac2
fix: [sharing group] saving fixed
invalid boolean operator when encoding the local org
2021-03-01 23:31:53 +01:00
iglocska 76f588e039
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-03-01 11:43:28 +01:00
iglocska d24e2a085a
fix: [Sharing group] refactored and fixed
- include own org in pulled sharing groups (to avoid implicit inclusion not being visible after a pull)
- refactor the pulling method to be more maintainable
- avoid pulling proposals/sightings on each event cherry pick
2021-03-01 11:38:05 +01:00
Jakub Onderka 38f785ea63
Merge pull request #7090 from JakubOnderka/fix-saving-log
fix: [internal] Correctly save log
2021-02-25 12:26:56 +01:00
Jakub Onderka 266b280869 fix: [internal] Correctly save log 2021-02-25 11:55:00 +01:00
iglocska add5882d8b
fix: [sync] Fixed a critical issue causing sharing groups to lose orgs/instance information on sync when using non sync users on a pull 2021-02-24 20:45:19 +01:00
Jakub Onderka 695af2dab1 fix: [rest] Allow to edit roaming mode of sharing group 2021-01-07 16:57:26 +01:00
Jakub Onderka eb658877cb chg: [internal] Remove unused methods 2020-12-31 11:39:37 +01:00
Jakub Onderka 4d4b306b60 new: [internal] New model method find('column') 2020-12-23 10:42:05 +01:00
Jakub Onderka a585466dff new: [security] Setting to hide orgs form sharing group view 2020-12-22 23:43:30 +01:00
iglocska 8b318320f7
fix: [internal] sharing_group graph missing org_ids - throwing notices 2020-12-18 12:05:20 +01:00
Jakub Onderka 185d3e0941 fix: [distribution graph] Graph doesn't work for non sync users when event is shared to sharing group 2020-12-13 21:47:14 +01:00
Jakub Onderka 5dd7f68560 chg: [internal] Simplified SharingGroup::checkIfOwner method 2020-12-06 15:34:49 +01:00
Jakub Onderka cb064dd9ce new: [security] Test if user can see sharing groups 2020-12-06 15:14:42 +01:00
Jakub Onderka 54b132c1a7 chg: [internal] Fetch just necessary orgs and server object for sharing groups 2020-11-21 10:56:09 +01:00
mokaddem 42d3f92c9f fix: [galaxy:update] Make sure the fake user has the perm_sync right 2020-11-18 09:36:57 +01:00
Jakub Onderka 935437d1bc chg: [internal] Invalid message for UUID contains that UUID must be RFC 4122 compliant 2020-09-18 10:56:28 +02:00
Jakub Onderka 0e916bd364 chg: [internal] Ensure that UUID is always lowecase and real UUID 2020-09-08 10:47:28 +02:00
Jakub Onderka f0f826841e fix: [security] Sharing groups for objects respect permissions 2020-08-05 12:39:11 +02:00
mokaddem 60a9707808
fix: [sharingGroup:captureSharingGroup] Fix failing capture in case of
roaming mode

- The server list check was incorrect
- When capturing, roaming mode was always defaulted to false
- The logs could not be written due to non-initialized class
2020-07-02 15:31:47 +02:00
iglocska 4e0ef6f28e
new: [internal] cache the sharing group access lookups
- should reduce the number of queries drastically for events heavy on object/attribute level sharing groups
2020-04-30 08:29:17 +02:00
mokaddem e9dc28fda7
chg: [sharingGroup:capture] Prevent capture of SG in some specific
cases - Need more testing

Should fix #5784
2020-04-20 08:51:01 +02:00
iglocska 78f3f68127
chg: [internal] Sharing group loader was grabbing organisations one by one, refactored
- simply fetch all org objects for the ACL checks in one shot instead of doing it on demand
  - has no real performance impact even on large sharing instances
  - reduces the number of queries greatly making debugging easier
2019-11-11 08:11:36 +01:00
Richard van den Berg 7417f9d6a0 Check if Organisation index exists, fixes #4809 2019-10-09 02:22:18 +02:00
iglocska 6b58b51bd3
fix: [Sharing groups] Various fixes to align the reported local instance URL as the external_baseurl if set, as opposed to always using the baseurl, fixes #4982 2019-08-13 13:00:24 +02:00
Christophe Vandeplas 67efc70bf5 fix: [style] consistent space indentation 2019-02-10 13:08:55 +01:00
iglocska 2d0259ce13 fix: [CS] coding standards script re-run 2018-11-23 14:11:33 +01:00
iglocska 7c34e9bbee fix: [sync] Fixed an issue preventing sharing group distributed data from being pushed 2018-11-15 14:57:41 +01:00
iglocska abbc036436 fix: [sharing groups] Fixed several sharing group issues preventing proper editing of events with SGs
- include the uuid and modified time in the sharing group
- fix the incorrectly embedded organisation object
2018-11-07 16:06:49 +01:00
iglocska e419c80e9e fix: [internal] Sharing group capturing fixed, fixes #3573
- As reported by @eCrimeLabs
2018-10-18 20:12:24 +02:00
iglocska 543fccdc58 fix: [api] Sharing group organisations not iterated if they don't exist 2018-10-04 22:48:50 +02:00
iglocska 1a5f764048 new: [internal] Added caching to the sharing group organisations 2018-10-01 14:49:12 +02:00
iglocska a81894f14c chg: [CS] Changed to PSR-2
- to make contributions easier, adopted PSR-2
- used php-cs-fixer to rework the style
- *sniff sniff* Goodbye tab indentation
2018-07-19 11:48:22 +02:00
iglocska cfba36dba5 new: [internal] Added convenience method to find the ID of an SG via it's UUID 2018-06-17 23:35:38 +02:00
iglocska bf4abdba14 fix: [sg bug] Fixed a bug where a user that should be allowed to extend a sharing group is blocked if they are also a sync user
- conditions requires that the sharing group has been synchronised from a remote by a different sync user
2018-06-14 12:29:49 +02:00
iglocska 9760f1144f new: New APIs to add/remove orgs and servers from sharing groups, fixes #2888
- added functions to manage the additions/removals of objects from sharing groups
- the following APIs are included:
  - /sharingGroups/addOrg/[sg_id]/[org_id]/[extend]
  - /sharingGroups/removeOrg/[sg_id]/[org_id]
  - /sharingGroups/addServer/[sg_id]/[server_id]/[all_orgs]
  - /sharingGroups/removeServer/[sg_id]/[server_id]

- All parameters are optional and can instead be passed as JSON objects such as:

  {
    "org_uuid": "55f6ea5e-2c60-40e5-964f-47a8950d210f",
    "sg_id": "49",
    "extend": 1
  }

- The API is extremely flexible with how to name objects, the following parameters are allowed:
  - Organisations:
    - org_id (The organisation's local instance ID)
    - org_uuid (The organisation's global UUID)
    - org_name (The organisation's identifier as known to the curent instance)
  - Server:
    - server_id (The server's local instance ID)
    - server_url (The URL of the server)
    - server_name (The local name of the server as assigned when adding the server)

The sharing groups can also be addressed by ID or UUID.
2018-02-02 08:46:14 +01:00