MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
23,975 Commits
34 Branches
364 Tags
187 MiB
Commit Graph

23975 Commits (39093e97dd028e4adbe5dda9fe95481d9c036b4d)

Author SHA1 Message Date
Alexandre Dulaunoy 5bc4aff8e0
chg: [misp-galaxy] updated 2023-04-11 10:02:03 +02:00
Alexandre Dulaunoy 9788a38eb0
Merge pull request #8989 from dnso86/fix-cake-optimisetables-query 
Fix typo in OPTIMIZE MySQL commands
 2023-04-08 12:00:32 +02:00
Luciano Righetti db47d7f285 chg: move breakOnDuplicate check to Attribute::captureAttribute 2023-04-07 15:29:36 +02:00
Luciano Righetti e62e1b00db fix: handle when a batch of attributes is sent and only a subset has breakOnDuplicate=false 2023-04-07 11:28:16 +02:00
Sami Mokaddem fb806590f9
chg: [event:_add] Simplified ACL test checking whether a user can create the event 
- Simplifed code
- Removed extremely old condition `$data['Event']['orgc'] != user['Organisation']['name']` that's not relevant anymore
- Make sure that Orgc.uuid takes precedence over Event.orgc_id
 2023-04-06 15:51:50 +02:00
Luciano Righetti 4acc24580d fix: remove unused line 2023-04-06 15:38:52 +02:00
Sami Mokaddem 362156daca
fix: [event:viewAttribute] Reset pagination state when using a filter on the attribute table 
- This will certainly make @rommelfs happy :)
 2023-04-06 15:24:15 +02:00
Sami Mokaddem 336f9787af
Merge branch 'pr-8983' into develop 2023-04-06 15:09:54 +02:00
Sami Mokaddem 3503845e2b
Merge branch '2.4' of github.com:MISP/MISP into develop 2023-04-06 15:09:16 +02:00
Christophe Vandeplas 74b9d62dc7 fix: [galaxy] Clarify supported format of webui galaxy import 2023-04-05 02:17:39 +02:00
Christophe Vandeplas 125e9852d9 chg: [workflow-module:send_mail] add send_log_mail for org admin as rcpts 2023-04-01 05:11:13 +02:00
Christophe Vandeplas eea349f655 chg: [workflow-module:send_mail] allow to all admins 2023-03-31 08:24:27 +02:00
Christophe Vandeplas dc0680f464 fix: [workflows] fix undefined index in moduleView 2023-03-31 04:48:02 +02:00
Christophe Vandeplas 965b48b4ce Merge branch 'develop' of https://github.com/MISP/MISP into develop 2023-03-31 02:36:30 +02:00
Christophe Vandeplas 87b55fd07f chg: [workflows] Log After Save module 2023-03-31 02:36:10 +02:00
Christophe Vandeplas 402100c0ba fix: [workflows] Email requires misp-modules 2023-03-31 02:34:57 +02:00
vincenzocaputo fba0613499 Use existing and appropriate function to retrieve threat levels 2023-03-30 20:38:14 +02:00
vincenzocaputo 2d9203f5c2 Merge branch '2.4' of https://github.com/vincenzocaputo/MISP into add-threatlevel-if-module 2023-03-30 20:05:13 +02:00
vincenzocaputo 0d16f658c0 Remove unused properties 2023-03-30 20:03:05 +02:00
Sami Mokaddem 7ab9eab622
fix: [workflow-module:enrich_event] Do not run enrichment is no filtered elements 
If a filtering condition was set and no item were matched, the whole event was enriched. Now nothing
 2023-03-30 11:51:23 +02:00
Sami Mokaddem 7d791919e6
fix: [workflow-module:tag_if] Added support of galaxy clusters 
Fix #8959
 2023-03-30 11:32:14 +02:00
Sami Mokaddem 8ec8f4b4f2
fix: [db:workflows] Changed workflows.data from TEXT to LONGTEXT 
Should fix issue  #8979
 2023-03-30 10:42:22 +02:00
dnso86 3c74268274 fix: [AccessLog] MySQL command 2023-03-30 00:04:07 +02:00
dnso86 4b0160d78b fix: [adminShell:optimiseTables] MySQL command 2023-03-29 23:50:54 +02:00
Alexandre Dulaunoy 1072912418
chg: [misp-galaxy] updated 2023-03-29 10:39:24 +02:00
Christophe Vandeplas 92ac663ccf
Merge remote-tracking branch 'origin/feature/api_log_and_pin_ip' into develop 2023-03-29 10:30:19 +08:00
Christophe Vandeplas e6001bc9fa
Revert "Feature/api log and pin ip (#8965)" 
This reverts commit d5ce838ddc.
 2023-03-29 09:53:29 +08:00
Christophe Vandeplas d5ce838ddc
Feature/api log and pin ip (#8965) 
* fix: [sightings] don't be case insensitive on code side

* chg: [AuthKey] store IPs used to connect and show them

* chg: [AuthKey] db change

* fix: [AuthKeys] prevent race condition with double IPs

* chg: [git] exclude DebugKit plugin from git

* fix: [AuthKey] integrate mokaddem's remarks

* chg: [authkey] One-click IP as only allowed IP

* chg: [authkey] pin IP on view page

---------
 2023-03-29 09:18:47 +08:00
iglocska 3df20b30e7
Merge branch '2.4' into develop 2023-03-27 11:03:16 +02:00
iglocska 13d99cfaca
chg: [pymisp] bump 2023-03-27 11:01:42 +02:00
iglocska e498158208
chg: [pymisp] version string bump 2023-03-27 10:51:41 +02:00
Alexandre Dulaunoy 8004031d33
chg: [PyMISP] updated 2023-03-26 12:49:28 +02:00
vincenzocaputo f001481394 new: [misp-workflow-modules] Event threat level if logic module 2023-03-26 11:28:32 +02:00
Sami Mokaddem b94c7978e5
fix: [security] XSS in community index 
- As reported by Zigrin Security
 2023-03-25 09:27:57 +01:00
Luciano Righetti d2ecd00e8e cgh: add named param support for attributes:add() breakOnDuplicate 2023-03-23 15:34:56 +01:00
Luciano Righetti 287606cf4a fix: consistent hash calculation in object dup checks 2023-03-23 15:03:58 +01:00
Luciano Righetti bedd889fae chg: handle breakOnDuplicate parameter in Attribute:add() to perform upserts instead of failing 2023-03-23 11:20:29 +01:00
Christophe Vandeplas 056436f69d chg: [authkey] pin IP on view page 2023-03-23 04:43:02 +01:00
Christophe Vandeplas ce4cee7cbe chg: [authkey] One-click IP as only allowed IP 2023-03-22 13:16:49 +01:00
Luciano Righetti c979ab33f4
Update background-jobs-migration-guide.md 2023-03-21 14:56:33 +01:00
Christophe Vandeplas 60023509b7 Merge branch 'develop' into feature/api_log_and_pin_ip 2023-03-21 12:32:39 +01:00
Christophe Vandeplas ecc84d9e2b Merge remote-tracking branch 'origin/2.4' into develop 2023-03-21 19:30:26 +08:00
Alexandre Dulaunoy ce0c79f7f7
Merge pull request #8970 from righel/fix-installer-pages 
[fix] fix installer pages
 2023-03-21 11:25:22 +01:00
Luciano Righetti 263ef07577 [fix]: comment (properly) md inclusion for archived guides, cannot include from parent dir 2023-03-21 09:37:08 +01:00
Luciano Righetti cd8c8f4845 [fix]: comment md inclusion for archived guides, cannot include from parent dir 2023-03-21 09:29:52 +01:00
Luciano Righetti 75ea7a61af [fix]: relative md inclusion (archived) 2023-03-21 09:21:47 +01:00
Luciano Righetti 221ed730ae [fix]: relative md inclusion 2023-03-21 09:14:41 +01:00
Luciano Righetti 7257674831 [fix]: relative md inclusion 2023-03-21 09:07:44 +01:00
Luciano Righetti b9ad564d4f [fix]: relative md inclusion 2023-03-21 08:44:49 +01:00
Christophe Vandeplas 965ef04797 Merge branch 'develop' into feature/api_log_and_pin_ip 2023-03-21 07:04:02 +01:00