MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
24,552 Commits
35 Branches
366 Tags
190 MiB
Commit Graph

24552 Commits (b33720aa46c912d0f35da2cafcd152c2f92f1fbd)

Author SHA1 Message Date
Andras Iklody b33720aa46
Merge pull request #9310 from tomking2/bug/attribute_sharinggroup_filter 
Regression - Rest search with 'attributes' controller no longer filters by sharing group ID
 2023-10-04 14:12:42 +02:00
Andras Iklody 284b9940dd
Merge pull request #9312 from Wachizungu/add-option-to-limit-site-admins-to-host-org 
new: [User] Add setting to limit site admin roles to instance's host …
 2023-10-04 14:10:45 +02:00
Sami Mokaddem 182e7aa87f
Merge branch 'develop' of github.com:MISP/MISP into develop 2023-10-04 13:17:26 +02:00
Sami Mokaddem 00c7a7169e
fix: [security] XSS in selectGalaxy 
- As reported by Zigrin Security
 2023-10-04 13:16:33 +02:00
Jeroen Pinoy 02e173b769
new: [User] Add setting to limit site admin roles to instance's host org. 2023-10-04 12:40:04 +02:00
Tom King 24ac6ae4b8 fix: [Attribute REST] Add sharinggroup as an allowed parameter for attribute filtering 2023-10-03 14:41:55 +01:00
iglocska b6386674c4
Merge branch '2.4' into develop 2023-10-02 15:30:51 +02:00
iglocska 7bd64bc23f
fix: [search] pagination fix 2023-10-02 15:30:17 +02:00
Sami Mokaddem 4ddf3b41f3
fix: [Console:EventShell] Correctly interpret returned data 2023-09-29 11:56:14 +02:00
Sami Mokaddem 215234315e
fix: [Console:EventShell] Correctly interpret returned data 2023-09-29 11:55:35 +02:00
Sami Mokaddem 8d09cadc77
fix: [console:EventShell] Fixed parameter parsing and typo 2023-09-29 10:36:04 +02:00
Sami Mokaddem d84084c11c
fix: [console:EventShell] Fixed parameter parsing and typo 2023-09-29 10:35:33 +02:00
Alexandre Dulaunoy 290a2b834f
fix: [misp-vagrant] submodule removed 2023-09-29 08:33:43 +02:00
Alexandre Dulaunoy 442e8a19ac
chg: [misp-objects] updated 2023-09-28 16:23:04 +02:00
Christian Studer 47526fa675
chg: [upload_stix] Properly getting the changes on the Galaxies handling option from the form 2023-09-28 13:12:56 +02:00
Christian Studer 35ea184c2d
chg: [upload_stix] Visual improvement with descriptions added 
- More information on the different options to
  handle galaxies and clusters while importing
  STIX 2 content
- More information on the debugging options
 2023-09-28 12:46:43 +02:00
Christian Studer d04e191e19 Merge branch 'develop' of github.com:MISP/MISP into develop 2023-09-28 12:40:59 +02:00
Christian Studer 1de4b1d9b1 Merge branch '2.4' of github.com:MISP/MISP into develop 2023-09-28 12:40:49 +02:00
Sami Mokaddem 53d837011c
Merge branch 'develop' of github.com:MISP/MISP into develop 2023-09-28 11:50:06 +02:00
Jeroen Pinoy d684b2e112
[users] fix user view totp delete checks (#9301) 2023-09-28 11:49:49 +02:00
Sami Mokaddem 206831565f
Merge branch '2.4' of github.com:MISP/MISP into develop 2023-09-28 11:49:39 +02:00
Sami Mokaddem 4de2f03013
fix: [console:TrainingShell] Typo in datasource model. 
-- Seriously..
 2023-09-28 11:46:49 +02:00
Sami Mokaddem e9c9441b54
fix: [console:TrainingShell] Typo in authkey condition 2023-09-28 11:44:53 +02:00
Sami Mokaddem 769c6e10c3
fix: [console:TrainingShell] Typo in authkey condition 2023-09-28 11:44:10 +02:00
Sami Mokaddem feb01fae09
Merge branch '2.4' of github.com:MISP/MISP into develop 2023-09-28 11:39:22 +02:00
Sami Mokaddem 9bed8d142d
Merge branch 'develop' of github.com:MISP/MISP into develop 2023-09-28 11:38:59 +02:00
Sami Mokaddem 086266c0c3
chg: [console:TrainingShell] Added wipeAllAuthkeys function 2023-09-28 11:38:24 +02:00
Jeroen Pinoy 5b627c076a
fix: [AuthKeys] Allow users to edit own authkeys, fix #9292 (#9293) 2023-09-28 11:15:18 +02:00
Jeroen Pinoy 2f790c2f17
[users:totp] set correct rest response action for totp_delete (#9303) 2023-09-28 10:57:01 +02:00
Sami Mokaddem fbc84647ed
chg: [Command:TrainingShell] Only override org_id if org_uuid is provided 2023-09-27 15:54:20 +02:00
Sami Mokaddem 4b9a92f99f
Merge branch 'develop' of github.com:MISP/MISP into develop 2023-09-27 15:53:50 +02:00
Sami Mokaddem cfc12b38cf
chg: [Command:TrainingShell] Only override org_id if org_uuid is provided 2023-09-27 15:53:07 +02:00
iglocska 43e8114eaa
Merge branch 'develop' into 2.4 2023-09-25 14:36:36 +02:00
Christian Studer 4a01551e4a
fix: [misp-stix] Bumped latest version with a fix on the file patterns parsing 2023-09-25 10:33:07 +02:00
iglocska bc5f234f16
Merge branch '2.4' into develop 2023-09-24 22:23:02 +02:00
iglocska 710bfff592
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2023-09-24 22:22:48 +02:00
iglocska 6780a96750
Merge branch 'develop' into 2.4 2023-09-24 22:22:27 +02:00
iglocska cdcee020f6
chg: [tests] testing disabling the timestamp greater as old timestamp for password changes 2023-09-24 22:07:17 +02:00
iglocska b987f0b232
fix: [tests] added some sleeps to avoid timestamps of follow up tests being within 1 second of the previous test 2023-09-24 21:50:20 +02:00
iglocska 2c931c6058
fix: [API] filter parameters added 2023-09-24 19:29:43 +02:00
iglocska e9c410687b
chg: [tests] make em happy with re-including a filter parameter that worked before, albeit unintentionally 2023-09-24 14:34:13 +02:00
Raphaël Vinot 732974be23 fix: [PyMISP/CI] Disavle search logs for now. 2023-09-24 14:00:23 +02:00
iglocska a316e9ff64
fix: [ibternal] invalid ; instead of , 
- Me not think good.
 2023-09-24 09:21:32 +02:00
iglocska f852d17713
Merge branch 'develop' of github.com:MISP/MISP into develop 2023-09-24 08:43:35 +02:00
iglocska 83ffa8eb9f
fix: [restsearch] parameters fixed 2023-09-24 08:43:13 +02:00
iglocska dad92308cf
new: [dev] added a shell script to generate the restsearch parameters 
- it's dumb but it should get the job done
 2023-09-24 08:42:12 +02:00
Raphaël Vinot cca83bc954 chg: [CI] Enable debug and timing, take 4 2023-09-23 17:24:11 +02:00
Raphaël Vinot 8fc7ea6deb chg: [CI] Enable debug and timing, take 3 2023-09-23 16:56:39 +02:00
Raphaël Vinot 0951d20ffe chg: [CI] Enable debug and timing, take 2 2023-09-23 16:08:56 +02:00
Raphaël Vinot cc150e3880 chg: [CI] Enable debug and timing 2023-09-23 15:09:10 +02:00