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

19178 Commits (39093e97dd028e4adbe5dda9fe95481d9c036b4d)

Author SHA1 Message Date
Alexandre Dulaunoy 97610f02b8
chg: [external] updated 2023-04-19 11:33:52 +02:00
Alexandre Dulaunoy cc32b321f2
chg: [misp-galaxy] updated 2023-04-19 11:33:21 +02:00
Sami Mokaddem cd1d68992f
Merge branch 'develop' of github.com:MISP/MISP into develop 2023-04-19 10:24:54 +02:00
Sami Mokaddem 66a99a76e9
fix: [console:ls22shell] Gracefully catch case where extended event have not been sync 2023-04-19 10:24:19 +02:00
Luciano Righetti 1f4e2af37a fix: admin logs pagination 2023-04-18 16:58:35 +02:00
Sami Mokaddem d7a13da8c2
fix: [console:ls22shell] Fixed `from` and `to` param when generating scores 2023-04-18 15:24:49 +02:00
Sami Mokaddem 6075718b5d
chg: [console:ls22shell] Skip org named `ORGNAME` when generating scores 2023-04-18 15:24:16 +02:00
Sami Mokaddem 77c2d2aa3c
chg: [console:ls22shell] Only generate scores for local orgs 2023-04-18 15:23:32 +02:00
Sami Mokaddem 7fba9317fd
new: [orgBlocklist:index] Added total blocked count and last block time for each blocked orgs 2023-04-18 15:06:22 +02:00
Sami Mokaddem 31be82abcf
Merge branch 'develop' of github.com:MISP/MISP into develop 2023-04-18 11:12:32 +02:00
Sami Mokaddem c305e4e873
chg: [servers:index] Added filtering capability 2023-04-18 11:11:59 +02:00
Christian Studer e3ec75bf85 Merge branch 'develop' of github.com:MISP/MISP into develop 2023-04-16 00:13:37 +02:00
Christian Studer 093e7708a6
fix: [misp-stix] Bumped latest version with some quick fixes 2023-04-16 00:12:29 +02:00
Alexandre Dulaunoy 4c142e5e70
chg: [misp-galaxy] updated to the latest version 2023-04-14 16:26:07 +02:00
Christian Studer 576558b270
fix: [stix2 import] Fixed the STIX version value used to describe the uploaded STIX file 2023-04-13 16:37:50 +02:00
Sami Mokaddem 06d5fa5c5d
fix: [event:discussion] Fixed potential CSRF issue while adding a comment 
Fix #8916
 2023-04-13 15:45:47 +02:00
Christian Studer 8bd7e4cbb7
fix: [stix2 import] Changed the test to check the `misp-stix` conversion return message 2023-04-13 15:44:26 +02:00
Christian Studer a260fa3e83
wip: [stix2 import] Using `misp-stix` to import STIX 2 content 
- Changed the related view used to upload the
  STIX 2 files
- Added 2 parameters to choose to import Galaxies
  as tag or with a complete Galaxy content parsing
  (which will be implemented soon), and another
  one for admins to debug the errors and warnings
  messages sent by `misp-stix`
 2023-04-13 15:30:17 +02:00
Christian Studer cbfa1705d4
chg: [misp-stix] Bumped the latest version 2023-04-13 10:38:32 +02:00
Sami Mokaddem 76868d1e64
fix: [workflow:tag_if] Correctly compare cluster tags 2023-04-13 10:15:16 +02:00
Sami Mokaddem 32c819aabb
Merge branch 'develop' of github.com:MISP/MISP into chg-acl-event-add-simplification 2023-04-13 09:42:39 +02:00
Luciano Righetti af0b17a1d3 fix: unset id and uuid of object attributes if regenerateUUIDs is checked when populating event with a MISP json fixes #9012 2023-04-13 09:28:10 +02:00
Raphaël Vinot bc82b38db0 chg: [PyMISP] Bump 2023-04-12 15:59:34 +02:00
Alexandre Dulaunoy d1c72888a6
chg: [misp-warninglists] updated to the latest version 2023-04-12 15:57:38 +02:00
Alexandre Dulaunoy 75ecfc1cd5
chg: [misp-taxonomies] updated to the latest version 2023-04-12 15:57:09 +02:00
Alexandre Dulaunoy 1285140737
chg: [misp-objects] updated to the latest version 2023-04-12 15:56:37 +02:00
Alexandre Dulaunoy 3ed527683e
chg: [misp-galaxy] updated 2023-04-12 15:56:12 +02:00
Luciano Righetti b90308dd67
Merge pull request #8980 from righel/ignore-dup-attrs 
[new]: add breakOnDuplicate option to attributes/add
 2023-04-12 15:50:55 +02:00
Luciano Righetti 478d1c6440 fix: fix "'sharing_group_id' doesn't have a default value error" error when importing OpenIOC file 2023-04-12 14:54:15 +02:00
Luciano Righetti e88a64db52 fix: disable csrf checks for events/saveFreeText when CustomAuth is enabled, fixes #8991 2023-04-12 11:18:27 +02:00
Alexandre Dulaunoy ed62c2e8aa
Merge branch '2.4' into develop 2023-04-11 10:02:54 +02:00
Alexandre Dulaunoy ff67d081f8
chg: [misp-galaxy] updated to the latest version 2023-04-11 10:02:29 +02:00
Alexandre Dulaunoy 5bc4aff8e0
chg: [misp-galaxy] updated 2023-04-11 10:02:03 +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
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
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
Christophe Vandeplas 7de61dec00 fix: [AuthKey] integrate mokaddem's remarks 2023-03-21 07:02:45 +01:00
Christophe Vandeplas cb3b4b43dc fix: [AuthKeys] prevent race condition with double IPs 2023-03-19 11:57:52 +01:00
Christophe Vandeplas 16a2713403 chg: [AuthKey] db change 2023-03-19 11:52:52 +01:00
Christophe Vandeplas 758c4fd829 chg: [AuthKey] store IPs used to connect and show them 2023-03-19 11:37:29 +01:00
iglocska 7614123ed6
Merge branch '2.4' into develop 2023-03-17 15:51:29 +01:00
iglocska aa9dffb03f
fix: [galaxyCluster index] filter by galaxy should accept UUID too not just ID 2023-03-17 15:50:47 +01:00
iglocska 9a153f9a3d
fix: [sightings] don't be case insensitive on code side 2023-03-17 15:34:33 +01:00
iglocska 8594d2ab47
fix: [Galaxy index search] fixed 
- seems to be using the Cerebrate format rather than MISP?
 2023-03-17 15:25:40 +01:00
Christian Studer 947427b7ae
chg: [misp-stix] Bumped latest version 2023-03-14 11:31:17 +01:00
iglocska ddd9700b99
Merge branch 'develop' of github.com:MISP/MISP into develop 2023-03-10 14:31:25 +01:00
iglocska e77a4fced7
fix: [php7.2 compat] make 7.2 happy with no trailing comma in the funciton params 2023-03-10 14:30:20 +01:00
Raphaël Vinot 68c130a099 chg: Bump PyMISP 2023-03-10 15:14:22 +02:00
iglocska 7fa48b8772
chg: [vendor dir check diagnostic] made the execution optional if the required package is missing 2023-03-10 13:56:03 +01:00
Christophe Vandeplas eefb1fc32a Merge branch 'develop' of https://github.com/MISP/MISP into develop 2023-03-10 13:16:36 +01:00
Christophe Vandeplas 5b1bc40ba0 chg: [diagnostics] Report on Vendor dependencies 2023-03-10 13:14:39 +01:00
Sami Mokaddem 8dbcd43b42
Merge branch 'pr-8948' into develop 2023-03-10 11:22:16 +01:00
Sami Mokaddem a78b2d7b77
Merge branch 'pr-8946' into develop 2023-03-10 11:19:42 +01:00
Sami Mokaddem 92c29436d4
Merge branch 'develop' of github.com:MISP/MISP into develop 2023-03-10 11:11:58 +01:00
Sami Mokaddem 78f423451a
fix: [security] XSS in event-graph relationship tooltip 2023-03-10 11:11:13 +01:00
Sami Mokaddem 30255b8d68
fix: [security] XSS in event-graph node tooltips 
- as reported by Cyber Controls from SIX Group
 2023-03-10 11:10:42 +01:00
Anders Einar Hilden b2ad8fc687 new: [ApacheAuthenticate] Add STARTTLS support for LDAP connection 
Controlled by setting `ApacheSecureAuth.starttls`. Default (`ApacheSecureAuth.starttls undefined`) is `false`, since it is a new feature.

config.default.php is updated with `ApacheSecureAuth.starttls = true` as default and extra explanations.
 2023-03-10 10:34:26 +01:00
Anders Einar Hilden da5278d349 [new]: [doc] [ApacheSecureAuth] Add minimal docs for ApacheSecureAuth, and a bigger section about using the /users/logout401 endpoint. 2023-03-10 10:34:05 +01:00
Anders Einar Hilden ec495da477 [new]: [ApacheSecureAuth] Add endpoint /users/logout401 for logging out from HTTP Basic Auth 
This can be used by i.e. ApacheSecureAuth to make a browser forget cached HTTP Basic Auth credentials, which would otherwise result in a logut->login loop.
 2023-03-10 10:34:05 +01:00
Alexandre Dulaunoy 9898c68482
Merge branch 'develop' of github.com:MISP/MISP into develop 2023-03-10 08:46:36 +01:00
Alexandre Dulaunoy 066f49f64e
chg: [misp-galaxy] updated to the latest version 2023-03-10 08:45:52 +01:00
Sami Mokaddem 69e3948dea
fix: [workflowModules:splunkHec] Fixed indentation 2023-03-10 08:44:30 +01:00
Sami Mokaddem 7155b9afe2
Merge branch 'pr-8835' into develop 2023-03-10 08:41:22 +01:00
Sami Mokaddem f96abece4f
Merge branch 'develop' of github.com:MISP/MISP into develop 2023-03-10 08:34:01 +01:00
Sami Mokaddem 55bc56d8d7
chg: [command:ls22] Improved scoring for LS shell 2023-03-10 08:33:27 +01:00
Alexandre Dulaunoy 84d620fd9a
chg: [misp-objects] updated to the latest version 2023-03-09 18:10:04 +01:00
Alexandre Dulaunoy b17ea1c38f
chg: [misp-warning] updated to the latest version 2023-03-09 15:13:13 +01:00
iglocska 5720f25888
fix: [LS22 shell] parameter name fixed 2023-03-08 10:08:00 +01:00