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

19622 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 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
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
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 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
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
Christian Studer 6ecea2c334
chg: [misp-stix] BUmped latest version 2023-09-22 20:10:18 +02:00
Alexandre Dulaunoy 32ba832485
chg: [warning-lists] updated 2023-09-22 15:34:39 +02:00
iglocska 5763d143d5
Merge branch 'tag_scope' into develop 2023-09-22 14:23:11 +02:00
iglocska 95bcaf54c2
Merge branch 'discussion_view' into develop 2023-09-22 14:15:08 +02:00
iglocska 2c7d3b7434
chg: [escaping] added to event ID 2023-09-22 14:14:47 +02:00
iglocska 0455088508
Merge branch 'cli_reset' into develop 2023-09-22 14:09:59 +02:00
iglocska 784f25cb6d
Merge branch '2.4' into develop 2023-09-22 13:56:29 +02:00
Sami Mokaddem 28179ced9c
chg: [config:customAuth_header] Default to upper case. 
- See $_SERVER make passed headers upper case
 2023-09-22 11:43:02 +02:00
Sami Mokaddem a829ddc5cb
chg: [console:TrainingShell] Allow overriding existing user data 2023-09-22 11:38:09 +02:00
Sami Mokaddem a8bb507694
Merge branch 'develop' of github.com:MISP/MISP into develop 2023-09-22 10:55:35 +02:00
Sami Mokaddem 7fb2ab9f5d
Merge remote-tracking branch 'origin/2.4' into develop 2023-09-22 10:55:27 +02:00
Andras Iklody 084f9ee037
Merge pull request #9255 from Wachizungu/add-cli-cmd-trigger-pw-change-for-old-pws 
Add cli cmd to trigger pw change for old pws
 2023-09-22 10:41:49 +02:00
Andras Iklody c6e1ccfe06
Merge pull request #9282 from elliotechayush/feature/EllioFeed 
chg: [feeds] change name to Community version
 2023-09-22 10:38:04 +02:00
iglocska 664034b193
Merge branch 'develop' of github.com:MISP/MISP into develop 2023-09-22 10:36:40 +02:00