Commit Graph

3605 Commits (688585b323cf3e07ccc74b513e191d4c1cac7406)

Author SHA1 Message Date
iglocska 6b95047c1e
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-06-22 11:11:31 +02:00
iglocska 2eccb31636
fix: [ACL] unpublished_private global setting tightened to include correlations
- Thanks to Jakub Onderka for reporting and providing a fix to this!
2020-06-22 11:10:25 +02:00
iglocska 609bfbd450
fix: [security] missing ACL lookup on attribute correlations
- attribute correlation ACL checks are skipped when querying the attribute restsearch API revealing metadata about a correlating but unreachable attribute.

- Thanks to Jakub Onderka for his tireless work and for reporting this!
2020-06-22 11:00:56 +02:00
Jakub Onderka 7eb464a58f
fix: [UI] Typo 2020-06-18 16:34:01 +02:00
chrisr3d 8f539b26b7 Merge branch '2.4' of https://github.com/MISP/MISP into rework_stix 2020-06-17 13:24:40 +02:00
Jakub Onderka 5346190afb new: [correlations] Enable CIDR correlations for ip-src|port and ip-dst|port types 2020-06-17 11:11:51 +02:00
Jakub Onderka 48c9c32e48 chg: [correlations] Faster IPv4 CIDR correlation 2020-06-17 09:17:57 +02:00
Jakub Onderka 8454ca38c7 chg: [correlations] Faster IPv6 correlation 2020-06-17 09:17:57 +02:00
Jakub Onderka 1d0d913972 chg: [correlations] Big speedup when correlating CIDR 2020-06-17 09:17:57 +02:00
chrisr3d 72d6a275dc Merge branch '2.4' of https://github.com/MISP/MISP into rework_stix 2020-06-16 23:38:11 +02:00
Andras Iklody ccf0352458
Merge pull request #5992 from JakubOnderka/download-event-log-exception
chg: [internal] Log exception if exception is thrown during event dow…
2020-06-16 14:17:27 +02:00
chrisr3d f0b039437b Merge branch '2.4' of https://github.com/MISP/MISP into rework_stix 2020-06-15 13:16:02 +02:00
iglocska 82425123ab
fix: [internal] object level restsearch issues resolved when querying via filters on the attribute scope, fixes #6016
- use subqueries instead of trying to query on the current scope
- associated find queries don't work on habtm relationships
2020-06-14 20:23:48 +02:00
chrisr3d 52b6f6452c Merge branch '2.4' of https://github.com/MISP/MISP into rework_stix 2020-06-11 19:31:46 +02:00
Andras Iklody 3cb9f4b83b
Merge pull request #5993 from JakubOnderka/pull-progress
fix: [pull] Correct progress for pull job
2020-06-11 11:42:22 +02:00
deku 651adce333 Fix issue #6006 - sgsids never set
This value is never set.  I expect it should be $sgids from the incoming function variable.
2020-06-10 21:48:34 -04:00
chrisr3d a954e4183f Merge branch '2.4' of https://github.com/MISP/MISP into rework_stix 2020-06-10 12:17:37 +02:00
GlennHD 7c7787ec14
Fixed typo
Fixed typo
2020-06-09 16:55:54 -05:00
chrisr3d c41f2a4deb Merge branch '2.4' of https://github.com/MISP/MISP into rework_stix 2020-06-08 16:51:26 +02:00
Andras Iklody a4963f167f
Merge pull request #5991 from JakubOnderka/drop-big-index
chg: [internal] Drop correlations indexes
2020-06-08 10:40:09 +02:00
mokaddem a5e7e46cd4
Merge branch '2.4' of github.com:MISP/MISP into decaying-v2 2020-06-08 08:26:15 +02:00
mokaddem f75a0865df
chg: [decayingModel:listTaxoWithNumericalValue] Cleaner usage of
uppercased tag
2020-06-08 08:25:25 +02:00
Jakub Onderka b2c193c984 fix: [pull] Correct progress for pull job 2020-06-07 22:25:32 +02:00
Jakub Onderka 90498fa1e2 chg: [internal] Log exception if exception is thrown during event downloading 2020-06-07 20:25:39 +02:00
Jakub Onderka aab0dc75a9 chg: [internal] Drop correlations.{org_id,sharing_group_id,a_sharing_group_id} indexes 2020-06-07 19:16:33 +02:00
Jakub Onderka ad9a729ffe chg: [internal] Drop correlations.value index 2020-06-07 18:58:04 +02:00
chrisr3d c18d65315c Merge branch '2.4' of https://github.com/MISP/MISP into rework_stix 2020-06-05 18:59:46 +02:00
Jakub Onderka 9665b8a091
fix: [internal] Removing attributes from empty event 2020-06-05 16:48:53 +02:00
chrisr3d ffb09f1c87 Merge branch '2.4' of https://github.com/MISP/MISP into rework_stix 2020-06-05 16:24:39 +02:00
Jakub Onderka 4d38673129
chg: [internal] Log exception when querying modules 2020-06-05 11:08:26 +02:00
chrisr3d e2a5c0acb6 Merge branch '2.4' of https://github.com/MISP/MISP into rework_stix 2020-06-05 10:08:16 +02:00
mokaddem 4147ca257f
chg: [taxonomy] Fixed typo 2020-06-05 07:59:15 +02:00
mokaddem e35179602e
Merge branch '2.4' of github.com:MISP/MISP into decaying-v2 2020-06-05 07:56:36 +02:00
mokaddem 8a3f92bed8
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-06-05 07:47:36 +02:00
mokaddem ff7ef393c5
fix: [EventShell:enrichment] Improved reporting of error messages 2020-06-05 07:46:46 +02:00
mokaddem a5f4fdc233
chg: [tags:checkForOverride] Do not duplicate user id variable 2020-06-04 13:30:28 +02:00
mokaddem d022b0fca2
fix: [feeds:saveFreetext] Soft-delete Attributes when performing a
delta-merge
2020-06-03 16:17:16 +02:00
mokaddem 314d9fab71
new: [Tag] Allow Tag's numerical_values to be overriden by userSettings 2020-06-02 09:33:08 +02:00
chrisr3d d551aac5fe Merge branch '2.4' of https://github.com/MISP/MISP into rework_stix 2020-05-29 16:04:44 +02:00
mokaddem bb167029eb
new: [userSettings] New setting `default_restsearch_parameters`
It allows users to supply restSearch parameters that will be injected
(and possibly overridden) into the restSearch filters.
2020-05-29 15:23:27 +02:00
mokaddem 591bd8f9c5
fix: [attribute:fetchAttribute] Prevent notices if tags not set while
computing decay
2020-05-29 15:20:07 +02:00
mokaddem a1548adc53
chg: [decaying] `last_seen` takes precedence over `timestamp`
If `last_seen` is set, it will take precedence over the timestamp if no
sightings have been recorded.
By doing so, we prevent the score to be refreshed if the attribute is
slightly modified (a tag is added/removed)
2020-05-29 14:40:13 +02:00
Jakub Onderka d8ff30b0b8
fix: [internal] Remove unused method 2020-05-29 09:23:13 +02:00
chrisr3d 7e04b5f2fe Merge branch '2.4' of https://github.com/MISP/MISP into rework_stix 2020-05-27 15:46:22 +02:00
Raphaël Vinot 27cdcf2c65
Merge pull request #5941 from MISP/git-commit-id
new: [type] git-commit-id
2020-05-26 15:03:52 +02:00
Andras Iklody 130e2970b5
Merge pull request #5942 from JakubOnderka/correlation-saving
Correlation saving
2020-05-26 14:28:51 +02:00
Jakub Onderka f1a1f3d81f chg: [correlation] When generating correlation, just fetch attributes that can correlate 2020-05-26 13:15:19 +02:00
Jakub Onderka 04c783afd7 chg: [correlations] Refactored correlation saving
* Always show other correlating value (useful for CIDR correlations)
* Make correlation saving faster (move more work to database, do not fetch not necessary fields) 
* Fix some small bugs
2020-05-26 13:14:57 +02:00
Raphaël Vinot c03670cf0d new: [type] git-commit-id 2020-05-26 12:26:24 +02:00
Andras Iklody ffed7fed4c
Merge pull request #5906 from JakubOnderka/fix-ipv4-cidr-validation
fix: [attribute] Do not allow for IPv4 CIDR masklen bigger than 32
2020-05-26 08:59:05 +02:00