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

14988 Commits (9edd7a6bb9215e58579a1b89fdad75e6012fb41f)

Author SHA1 Message Date
iglocska 7f9afb84e7
fix: [Sharing groups] capturing a sharing group correctly ignores the incoming data's active flag when editing 
- based on PR #7101 by @lfortemps
 2021-03-03 00:19:46 +01:00
Andras Iklody 2fee084250
Merge pull request #6661 from cudeso/2.4 
Azure Active Directory Authentication
 2021-03-03 00:14:30 +01:00
Andras Iklody 3904f7f85e
Merge pull request #7100 from lfortemps/local-tags-fix 
Prevent pulling local tags
 2021-03-03 00:08:00 +01:00
iglocska bf1621c650
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-03-03 00:07:08 +01:00
iglocska b08befbf26
Merge branch '2.4' into develop 2021-03-03 00:07:02 +01:00
iglocska ef261ecd47
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2021-03-03 00:06:52 +01:00
Andras Iklody 18346e078d
Merge pull request #7059 from adammchugh/patch-1 
Inclusion of full-name under person
 2021-03-03 00:04:54 +01:00
Andras Iklody d519374f7d
Merge pull request #7130 from Wachizungu/fix-shortcut-manager-triangle-popup 
chg: [UI] fix keyboard shortcut manager popup triangle
 2021-03-02 23:59:30 +01:00
Andras Iklody e45949dd0b
Merge pull request #7114 from Wachizungu/add-short-event-block-rule-explanation 
chg: [UI] Add small description of what event block rules do
 2021-03-02 23:53:22 +01:00
Andras Iklody 9cef95f756
Merge pull request #6736 from JakubOnderka/sighting-deletion 
chg: [sighting] Simplified sighting deletion
 2021-03-02 23:50:03 +01:00
Andras Iklody 53642be804
Merge pull request #7080 from StefanKelm/2.4 
Update resolved_misp_format.ctp
 2021-03-02 23:47:59 +01:00
Andras Iklody ef21065e33
Merge pull request #7092 from lfortemps/patch-2 
fix: [email_otp] Trim value for increased UX
 2021-03-02 23:46:23 +01:00
iglocska f83fc6ca24
fix: [sharing groups] fixed regression with updating local sharing groups 2021-03-02 23:42:54 +01:00
Jeroen Pinoy 7431beefa1
chg: [UI] fix keyboard shortcut manager popup triangle 2021-03-02 22:03:05 +00:00
Jakub Onderka c8533ead78 chg: [internal] Cleanup code that is resposible for fetching server setting 2021-03-02 18:04:49 +01:00
Jakub Onderka 62537961f0 fix: [internal] Undefined index when importing from module 2021-03-02 14:44:41 +01:00
iglocska 66e371a19c
fix: [comments] updated for two recent changes in the code 2021-03-02 13:03:54 +01:00
Jakub Onderka 4bcf270233 chg: [UI] Simplify keyboard-shortcuts.js 2021-03-02 11:36:23 +01:00
Jakub Onderka 55d695bd10 chg: [UI] Use Page Visibility API 2021-03-02 10:04:49 +01:00
iglocska 76a2727583
fix: [sharing groups] Allow users to see events they own, even if their organisation is not explicitly mentioned in the SG 
- however, show a clear message that this is the case
- in-line with the rest of the ACL
 2021-03-02 00:09:37 +01:00
iglocska ca13fee271
fix: [security] sharing group all org flag too lax 
- the all org flag was used as a trigger to make the sharing group obejct itself viewable to all local organisations
- even if the all org flag was set for an instance other than the local one

- as reported by Jeroen Pinoy
 2021-03-01 23:47:01 +01:00
iglocska 11c89e5c0a
fix: [tag index] remove sorting on count fields 
- doesn't work anyway
 2021-03-01 23:41:33 +01:00
iglocska b07d76070c
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-03-01 23:33:55 +01:00
iglocska 7bb9466e9c
Merge branch '2.4' into develop 2021-03-01 23:33:42 +01:00
iglocska 498d6215e3
chg: [genericForm] added description field to the explanation 2021-03-01 23:33:04 +01:00
iglocska 1727a748eb
fix: [pull] invalid internal vs external server lookup when deciding whether to pull local tags 2021-03-01 23:32:25 +01:00
iglocska ce88fd3ac2
fix: [sharing group] saving fixed 
invalid boolean operator when encoding the local org
 2021-03-01 23:31:53 +01:00
Jeroen Pinoy 6654eff47e
chg: [UI] Add small description of what event block rules do 2021-03-01 22:03:20 +00:00
Jakub Onderka 6f74097c37 chg: [optimise] Faster loading galaxy cluster index 2021-03-01 22:46:35 +01:00
Jakub Onderka ce98ce48ac chg: [UI] Do not show published for default galaxy clusters 2021-03-01 19:48:54 +01:00
Jakub Onderka 99ca948555 new: [UI] Render galaxy cluster description as markdown 2021-03-01 19:37:32 +01:00
Jakub Onderka 98ec79db60 chg: [internal] Set cookie name just when no name is set 2021-03-01 17:22:39 +01:00
mokaddem 9fa273ed1f
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-03-01 15:59:13 +01:00
mokaddem 6a646edf01
fix: [galaxyCluster] Revoke relations on sync 
- Relationships are now re-build from scratch for the cluster being sync
- This cancels any modification done locally (which should not have
happened in the first place)
 2021-03-01 15:57:17 +01:00
mokaddem 2e817c8ed8
fix: [galaxyClusterRelations] Bump cluster's timestamp after performing CRUD on relations 2021-03-01 15:56:58 +01:00
iglocska 76f588e039
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-03-01 11:43:28 +01:00
iglocska ccdbdd1606
Merge branch '2.4' into develop 2021-03-01 11:39:29 +01:00
iglocska d24e2a085a
fix: [Sharing group] refactored and fixed 
- include own org in pulled sharing groups (to avoid implicit inclusion not being visible after a pull)
- refactor the pulling method to be more maintainable
- avoid pulling proposals/sightings on each event cherry pick
 2021-03-01 11:38:05 +01:00
Jakub Onderka af4e248690
Merge pull request #7094 from JakubOnderka/oidc-readme 
new: [oidc] Readme
 2021-03-01 08:59:11 +01:00
Jakub Onderka 37dd3038b1 new: [oidc] Readme 2021-03-01 08:58:45 +01:00
Alexandre Dulaunoy 9df5d31294
Merge pull request #7106 from Wachizungu/add-short-org-blocklist-explanation 
chg: [UI] Add small description of what org blocklist does. Fix #4363
 2021-02-27 20:26:24 +01:00
Jakub Onderka 1a732063a6
Merge pull request #7105 from JakubOnderka/oidc-roles 
chg: [oidc] Use first match as user role
 2021-02-27 20:09:22 +01:00
Jeroen Pinoy 8bcdd5b053 chg: [UI] correct edit org blocklist entries view 2021-02-27 18:36:46 +00:00
Jeroen Pinoy ec63f58d36 chg: Add small description of what org blocklist does. Fix #4363 2021-02-27 18:08:36 +00:00
Jakub Onderka 8cf1bbb9a9 chg: [oidc] Use first match as user role 2021-02-27 16:54:23 +01:00
Alexandre Dulaunoy eec55c3438
Merge branch '2.4' into develop 2021-02-27 10:26:38 +01:00
Alexandre Dulaunoy 19ef63f521
chg: [taxonomies] updated to the latest version 2021-02-27 10:24:40 +01:00
Jakub Onderka fd6f1bd398
Merge pull request #7095 from JakubOnderka/event-report-empty-objects 
fix: [internal] Empty object when getting event info for event report
 2021-02-26 14:37:39 +01:00
Jakub Onderka 8edfdc14e8
Merge pull request #7097 from JakubOnderka/csp 
new: [security] Content-Security-Policy support
 2021-02-26 14:33:35 +01:00
Jakub Onderka 8a3144f112 new: [security] Content-Security-Policy support 2021-02-26 13:21:00 +01:00
Jakub Onderka 60dd660565 chg: [UI] Disable sync XHR 2021-02-26 10:49:15 +01:00
Golbark 14b9463fb5 fix: [sync] prevent local tags from being pulled 2021-02-26 09:59:57 +01:00
Jakub Onderka 70049971d8 fix: [internal] Empty object when getting event info for event report 2021-02-25 20:17:05 +01:00
Loïc Fortemps 08f4211841
fix: [email_otp] Trim value for increased UX 2021-02-25 13:30:49 +01:00
Loïc Fortemps 7ce4a8a305
fix: [email_otp] skip OTP for disabled users 2021-02-25 13:17:26 +01:00
Jakub Onderka 38f785ea63
Merge pull request #7090 from JakubOnderka/fix-saving-log 
fix: [internal] Correctly save log
 2021-02-25 12:26:56 +01:00
iglocska 158304dd54
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-02-25 11:58:20 +01:00
iglocska b4e84726f1
Merge branch '2.4' into develop 2021-02-25 11:58:11 +01:00
Jakub Onderka 266b280869 fix: [internal] Correctly save log 2021-02-25 11:55:00 +01:00
iglocska e6c86072c4
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2021-02-25 11:39:20 +01:00
iglocska 64879b836e
new: [CLI] check if updates are done yet or not 
usage:

- /var/www/MISP/app/Console/cake Admin updatesDone [blocking]
- returns True or False based on whether it is done
- When the blocking parameter is set, it will not return until all updates are done
 2021-02-25 11:37:37 +01:00
Jakub Onderka fd3003da3a
Merge pull request #7089 from JakubOnderka/fix-tag-split 
fix: [internal] Incorrect tag three components split
 2021-02-25 11:14:08 +01:00
Jakub Onderka 5ac07c4a2f
Merge pull request #7083 from JakubOnderka/event-index-galaxy-elements 
fix: [UI] Fetch GalaxyElements for event index
 2021-02-25 11:13:44 +01:00
Jakub Onderka c7166224bc
Merge pull request #7088 from JakubOnderka/event-report-pagination 
fix: [UI] Pagination for event reports in event view
 2021-02-25 11:13:29 +01:00
Jakub Onderka 494e5b58af fix: [internal] Incorrect tag three components split 2021-02-25 11:12:46 +01:00
Jakub Onderka 657253ea72 fix: [UI] Pagination for event reports in event view 2021-02-25 08:55:58 +01:00
Jakub Onderka 4c92cd4fe6 fix: [internal] Bad 7085 2021-02-25 08:04:50 +01:00
Alexandre Dulaunoy c8ac769450
chg: [misp-objects] updated to the latest version 2021-02-25 07:45:50 +01:00
iglocska add5882d8b
fix: [sync] Fixed a critical issue causing sharing groups to lose orgs/instance information on sync when using non sync users on a pull 2021-02-24 20:45:19 +01:00
Jakub Onderka bc4d5c35de chg: [internal] When caching feed, save progress to db less often 2021-02-24 20:28:37 +01:00
Jakub Onderka 792ec55700 chg: [ineternal] Opimise GalaxyCluster::fetchGalaxyClusters when full is True 2021-02-24 18:05:59 +01:00
Jakub Onderka 46ac09aacb fix: [internal] Bad merge that prevents language change 2021-02-24 16:59:57 +01:00
Jakub Onderka 94ef325a77 fix: [UI] Fetch GalaxyElements for event index 2021-02-24 16:52:44 +01:00
Jakub Onderka 8dc9407009
Merge pull request #7049 from JakubOnderka/ui-form-fixes 
chg: [UI] Make different forms nicer
 2021-02-24 14:38:27 +01:00
Jakub Onderka 044ddb33e3
Merge pull request #7056 from Wachizungu/add-can-access-check-for-menu-entry-correlation-exclusions 
chg: [UI] Add can access check for correlation exclusions menu entry
 2021-02-24 14:37:42 +01:00
Jakub Onderka c84b35b82b
Merge pull request #7079 from JakubOnderka/fix-sightings-pushing 
fix: [sync] Undefined index when pushing sightings
 2021-02-24 14:36:59 +01:00
StefanKelm b8fafd1318
Update resolved_misp_format.ctp 
slight rewording
 2021-02-24 13:31:50 +01:00
Jakub Onderka 5b4763cea7
Merge pull request #7078 from JakubOnderka/missing-taxonomies 
Missing taxonomies
 2021-02-24 10:11:52 +01:00
Jakub Onderka bb1be01293 fix: [sync] Undefined index when pushing sightings 2021-02-24 09:47:58 +01:00
Jakub Onderka 56189414cb
Merge pull request #7069 from JakubOnderka/tag-edit-delete 
fix: [internal] perm_tag_editor can just create tags
 2021-02-24 08:52:10 +01:00
Jakub Onderka 7d8fdc25a4 chg: [internal] Check missing taxonomies at one place 2021-02-24 08:13:45 +01:00
Jakub Onderka 5449b753b3 chg: [internal] New method Taxonomy::splitTagToComponents 2021-02-24 08:07:22 +01:00
Patrizio Tufarolo 6d27fc278f
fix: ui _ function does not exist, l10n function is __ 2021-02-24 07:58:56 +01:00
Jakub Onderka d38e2175d5 fix: [internal] Include cluster elements for user interface 2021-02-23 22:06:29 +01:00
Fredrik Soderblom 33f31cd55d fix: syntax error in constructTaxonomyInfo() 2021-02-23 14:51:48 +01:00
Jakub Onderka b9b13c56de fix: [internal] perm_tag_editor can just create tags 2021-02-23 08:36:58 +01:00
Jakub Onderka 0ba05044bf fix: [internal] Really disable password change 2021-02-22 20:45:42 +01:00
iglocska 1830d5dc7b
Merge branch '2.4' into develop 2021-02-22 15:43:33 +01:00
iglocska 48c8eaa59c
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2021-02-22 14:17:12 +01:00
iglocska 0e280c443f
fix: [API] password reset was broken for admins 2021-02-22 14:16:43 +01:00
adammchugh aed61504c8
Inclusion of full-name under person 
Proposing the inclusion of full-name under person to allow for better capture and correlation of full names of identified persons in events. Particularly where there are multiple identities within an event which may create confusion with multiple first-name and last-name entries.
 2021-02-22 22:06:59 +10:30
Jakub Onderka aefcbec9bd
Merge pull request #7048 from JakubOnderka/xhr-401-handling 
XHR 401 handling
 2021-02-22 10:08:53 +01:00
Jakub Onderka f959907c4e
Merge pull request #7055 from JakubOnderka/fast-event-galaxies 
chg: [internal] Faster fetching galaxy clusters when fetching event
 2021-02-22 10:07:29 +01:00
Jakub Onderka 7e0516cb7a
Merge pull request #7057 from JakubOnderka/tag-local 
new: [api] When creating object, allow to mark tag as local
 2021-02-22 10:06:39 +01:00
Jakub Onderka e7b7f5c18e new: [api] When creating object, allow to mark tag as local 2021-02-22 08:53:13 +01:00
Jakub Onderka 28b6a9066b chg: [internal] Faster fetching galaxy clusters when fetching event 2021-02-22 08:18:40 +01:00
Jeroen Pinoy 131c9e15ce chg: Add can access check for correlation exclusions menu entry 2021-02-21 22:27:08 +00:00
Alexandre Dulaunoy 3228588921
Merge pull request #7037 from Wachizungu/add-list-auth-keys-button-to-global-menu 
Adds 'List Auth Keys' button to Administration in global menu
 2021-02-21 17:53:12 +01:00
Alexandre Dulaunoy cd75f7b9cc
Merge pull request #7052 from patriziotufarolo/patch-1 
fix: [server] Add application/x-pie-executable to the list of accepted mimetypes in testForBinExec
 2021-02-21 17:40:52 +01:00
Jakub Onderka 2ec82ebea3
Merge pull request #7050 from JakubOnderka/cluster-relation 
fix: [galaxy] GalaxyClusterRelation doesn't have Org and Orgc
 2021-02-21 17:05:52 +01:00
eCrimeLabs bc04f6966d Fix for #7040 and #7039 
The following commit contains the fix for ZeroMQ only listening on 0.0.0.0
 2021-02-21 14:50:43 +01:00
Alexandre Dulaunoy 7d9251e7ad
fix: [schema feed] remove non-required fields in feed format 2021-02-21 07:30:47 +01:00
Patrizio Tufarolo 2d97eb9f4d
fix: [server] Add application/x-pie-executable to the list of accepted mimetypes in testForBinExec 2021-02-21 01:46:52 +01:00
Jakub Onderka 170ea2c64d fix: [galaxy] GalaxyClusterRelation doesn't have Org and Orgc 2021-02-19 22:43:38 +01:00
Alexandre Dulaunoy c473019e67
Merge branch '2.4' into develop 2021-02-19 22:28:35 +01:00
Alexandre Dulaunoy df80f488eb
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2021-02-19 22:27:52 +01:00
iglocska b27c9f25c9
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-02-19 20:33:56 +01:00
iglocska 6b5715386a
Merge branch '2.4' into develop 2021-02-19 20:33:44 +01:00
iglocska c63468fd2f
fix: [restsearch] fixed a bug introduced via the new page/limit filters 2021-02-19 20:33:00 +01:00
Jakub Onderka a4a17f79ec
Merge pull request #7027 from JakubOnderka/galaxy-view-mini 
Galaxy view mini
 2021-02-19 19:57:57 +01:00
iglocska bf0bc494b2
Merge branch '2.4' into develop 2021-02-19 19:43:14 +01:00
iglocska 5654b536bd
fix: [caching] monkey-patching a client side MISP bug causing the caching to loop endlessly 
- MISP caching can run into an endless loop if errors are returned for whatever reason
- This patch handles the specific case when the remote MISP requests an attribute range for caching that has an offset beyond the highest ID (should never happen)

- It's a dirty fix but should have nearly no impact on performance whilst resolving the issue
 2021-02-19 19:41:12 +01:00
Alexandre Dulaunoy 80ec77eec2
new: [type] new dkim and dkim-signature attribute type 2021-02-19 18:18:07 +01:00
mokaddem c522631ce8
fix: [server] Caching a server ensures that the returned data is an actual UUID 2021-02-19 17:29:06 +01:00
mokaddem e4bc54ede6
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-02-19 16:47:26 +01:00
mokaddem baa0deef0f
chg: [server] DBSchemaDiagnostic consider nullable inconsistencies as critical 2021-02-19 16:46:56 +01:00
Jakub Onderka 2e6e5d825a
Merge pull request #7029 from JakubOnderka/galaxy-cluster-description 
chg: [galaxy] Make Galaxy cluster description optional
 2021-02-19 16:40:11 +01:00
Jakub Onderka 4e48d937aa chg: [UI] Put type under name for object add form 2021-02-19 16:36:46 +01:00
Jakub Onderka 55685bb236 chg: [UI] Nicer Object pre-save review 2021-02-19 16:35:39 +01:00
Andras Iklody 4903e22f4c
fix: [ACL] opened up postTest to all roles 2021-02-19 16:33:48 +01:00
mokaddem 50575cbb8b
fix: [securityAudit] Display python version 2021-02-19 16:01:49 +01:00
Jakub Onderka 2cde2970de chg: [UI] Make different forms nicer 2021-02-19 16:01:20 +01:00
mokaddem 7b3be9362b
fix: [dashboard] Saving an invalid JSON when importing templates shows an error 2021-02-19 15:53:00 +01:00
Jakub Onderka 4f135279f5
Merge pull request #7043 from JakubOnderka/cluster-relattion-missing-var 
fix: [galaxy] Missing variable when editing relation
 2021-02-19 15:50:44 +01:00
Jakub Onderka 59d97832c5 fix: [js] Use error callback for relevant ajax calls 2021-02-19 15:38:03 +01:00
Jakub Onderka 88bfa53b87 chg: [js] Use proper message when remote server returns 401 2021-02-19 15:16:56 +01:00
Jakub Onderka 09118be762 fix: [js] Remove async default value 2021-02-19 15:14:02 +01:00
mokaddem 2779077cbd
fix: [attributes] full_group_by fix for statistics. Fix #7014 2021-02-19 14:26:43 +01:00
Jakub Onderka 31e5a4638f fix: [galaxy] Missing variable when editing relation 2021-02-19 12:25:54 +01:00
mokaddem ba13f9db04
chg: [genericPicker] Allow using picker for galaxy matrixes 2021-02-19 09:53:32 +01:00
mokaddem 600b6085b5
chg: [objectReference] Renamed function 2021-02-19 09:11:17 +01:00
mokaddem f1d10ebbcf
Merge branch 'feature-reference-for-extended-event' into develop 2021-02-19 09:09:21 +01:00
mokaddem 487253b712
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-02-19 09:01:26 +01:00
mokaddem 8d9d0e6411
fix: [restClient] Make sure to split value on strings 
Fix #7032
 2021-02-19 09:00:45 +01:00
mokaddem 0e2e5bdbe1
chg: [restResponse] Return role_id along with its name 2021-02-19 08:59:54 +01:00
Jakub Onderka 4ca548cf1c
Merge pull request #6742 from JakubOnderka/post-user-disabled 
fix: [post] Do not send emails to disabled user for new posts
 2021-02-18 21:03:07 +01:00
Jakub Onderka 1f937ab27a
Merge pull request #6925 from JakubOnderka/event-locks 
new: [UI] Event locks for background jobs and automatic tools
 2021-02-18 20:41:57 +01:00
Jakub Onderka c1399b36f9 new: [UI] Event locks for background jobs and automatic tools 2021-02-18 19:03:54 +01:00
Jakub Onderka a197d4a252
Merge pull request #6943 from JakubOnderka/ui-create-button 
fix: [UI] Attribute create button nicer
 2021-02-18 18:55:48 +01:00
Jakub Onderka 7438b29b71
Merge pull request #7002 from JakubOnderka/code-cleanup 
fix: [UI] Remove unnecessary CSS from default template
 2021-02-18 18:34:16 +01:00
Jakub Onderka a047b9b9c1
Merge pull request #7034 from JakubOnderka/taxonomy-tag-info 
new: [UI] Show tag info in taxonomy view
 2021-02-18 18:32:52 +01:00
Jakub Onderka dd3d3f43bf chg: [UI] Remove authors from galaxy cluster popover 2021-02-18 18:31:33 +01:00
Jakub Onderka 412d9dba1d
Merge pull request #6906 from JakubOnderka/compressed-requests 
new: [sync] Compressed requests support
 2021-02-18 18:03:11 +01:00
Jakub Onderka cd9714fd37
Merge pull request #6871 from JakubOnderka/faster-pull 
chg: [internal] Faster Event::removeOlder method used when pulling
 2021-02-18 18:02:18 +01:00
Jakub Onderka bf004ad52d chg: [internal] Simplified ServersController::serverSettings 2021-02-18 17:58:34 +01:00
Jakub Onderka 8342f4e8b4 new: [security] Security audit 2021-02-18 17:58:34 +01:00
Jakub Onderka 1b91cb3cbc
Merge pull request #6938 from tomking2/feature/attribute_sightings 
[API] Update attribute sightings from REST POST
 2021-02-18 17:42:12 +01:00
Jakub Onderka c60bd9804e
Merge pull request #6984 from JakubOnderka/oidc 
new: [oidc] OpenID Connect authentication
 2021-02-18 17:38:21 +01:00
Jakub Onderka 6259404bd7
Merge pull request #7020 from JakubOnderka/feed-saving-simplified 
chg: [feed] Simplified code for saving feed
 2021-02-18 17:34:30 +01:00
Jeroen Pinoy 557a546815 Adds 'List Auth Keys' button to Administration in global menu 2021-02-18 17:08:21 +01:00
mokaddem 309db2a37a
chg: [objectReference] Added objectReference/view endpoint 2021-02-18 15:42:00 +01:00
mokaddem 5b8a32f851
Merge remote-tracking branch 'origin/2.4' into develop 2021-02-18 15:23:24 +01:00
mokaddem f6feaeb9ee
Merge branch '2.4' of github.com:MISP/MISP into fix-sync-object-relations 2021-02-18 15:22:22 +01:00
mokaddem 4913171ff5
fix: [objectReference] Make sure to bump timestamp 2021-02-18 15:20:15 +01:00
mokaddem 3b61527ec5
fix: [objectReference] Make sure to save source_uuid field as well 2021-02-18 15:18:40 +01:00
mokaddem a225ac4483
fix: [Event] Correctly save references after sync 2021-02-18 15:02:22 +01:00
Jakub Onderka 3f06de5fba
Merge pull request #7035 from JakubOnderka/galaxy-fix-undefined-variable 
fix: [galaxy] Fix undefined variable when capturing clusters
 2021-02-18 14:40:53 +01:00
Jakub Onderka 6a91bb832b new: [UI] Show tag info in taxonomy view 2021-02-18 14:27:44 +01:00
Jakub Onderka ec8012c83f fix: [galaxy] Fix undefined variable when capturing clusters 2021-02-18 14:11:34 +01:00
mokaddem 5acf3e9fbe
Merge branch 'develop' into feature-reference-for-extended-event 2021-02-18 10:04:57 +01:00
mokaddem ea50250f40
fix: [feed defaults] Removed some required properties in the validation schema 
- Propoerties like IDs are instance dependant and therefore are not
necessary
 2021-02-18 10:02:46 +01:00
mokaddem 00b3665db3
Merge remote-tracking branch 'origin/develop' into tomking2-bug/galaxy_cluster 2021-02-18 09:17:57 +01:00
Jakub Onderka df66521e19 chg: [galaxy] Make Galaxy cluster description optional 2021-02-17 18:51:52 +01:00
Jakub Onderka ffc3b14f76 chg: [UI] Do not create links for galaxy cluster source popover 
Links are not clickable in popovers
 2021-02-17 16:58:16 +01:00
Jakub Onderka 5ef077d0ff chg: [UI] Do not show refs for galaxy cluster popover, becasue links are not clickable 2021-02-17 16:56:51 +01:00
Jakub Onderka b1501e6f4d chg: [UI] Do not show description if is empty for galaxy cluster popover 2021-02-17 16:56:19 +01:00
mokaddem 0c1019bc5e
fix: [dashboard] Saving an invalid JSON shows an error. 
Fix #6975
 2021-02-17 15:17:41 +01:00
mokaddem 2b98a1c025
fix: [event] Fix retreiving selected referenced element data 2021-02-17 13:54:27 +01:00
iglocska a470643ef3
Merge branch '2.4' into develop 2021-02-17 13:08:16 +01:00
iglocska 8233f0f614
fix: [feed defaults] removed a bunch of feeds and clarified the description of some, fixes #7006 2021-02-17 13:06:55 +01:00
iglocska df6c68ad88
new: [devshell] added a new shell for developer related tasks 
- 1 task currently, cleanFeedDefault
  - runs some cleanup on the feed definition file to remove local IDs etc
 2021-02-17 13:06:05 +01:00
iglocska 065449b33e
chg: [dashboard] added to the root level of the top menu 2021-02-17 13:05:34 +01:00
mokaddem a2a1dca26c
fix: [event] Provide text for missing referenced elements 
- The event might not contain the referenced elements if they belong to
an extended event
 2021-02-17 12:26:28 +01:00
mokaddem 58d0900ae0
fix: [events:eventGraph] Make sure to include event_id for attribute nodes 2021-02-17 12:25:00 +01:00
mokaddem ad92322560
chg: [events:eventGraph] Improved hull algorithm and UI 2021-02-17 10:59:51 +01:00
Tom King 8077eeaa3c Merge remote-tracking branch 'upstream/2.4' into bug/galaxy_cluster 2021-02-17 09:56:08 +00:00
Jakub Onderka 423559fd11 chg: [feed] Simplified code for loading feeds 2021-02-16 16:10:25 +01:00
mokaddem cc4ef95da2
new: [objectReference] Allow adding reference across extended events 
Fix #6255
 2021-02-16 15:02:34 +01:00
iglocska 1cfc9a2bc5
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-02-16 13:09:48 +01:00
iglocska b3e90968bc
fix: [feeds] feed edit ignored the headers field, ffixes #6780 2021-02-16 13:09:17 +01:00
iglocska 1041707638
fix: [feed] edit ignored changes to the header, fixes #6780 2021-02-16 13:08:29 +01:00
Jakub Onderka 8e70dd57fa
Merge pull request #7017 from JakubOnderka/fix-galaxies-pagination 
fix: [UI] Galaxy pagination
 2021-02-16 12:36:59 +01:00
Jakub Onderka fa00387072
Merge pull request #7015 from JakubOnderka/redis-static 
chg: [internal] Make Redis connection static
 2021-02-16 11:57:17 +01:00
Jakub Onderka 6149d6e611 fix: [UI] Galaxy pagination 2021-02-16 11:53:22 +01:00
iglocska 94b9fc5f1e
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-02-16 11:52:25 +01:00
iglocska 1293471d6f
Merge branch '2.4' into develop 2021-02-16 11:52:07 +01:00
iglocska 6fd2c4807a
fix: [dashboard] removed training example left in the code 
- restricted new module to only 3 user IDs
 2021-02-16 11:36:11 +01:00
Jakub Onderka 58bcffe70e
Merge pull request #7016 from JakubOnderka/fix-user-view-time 
fix: [UI] Showing date and time in user profile
 2021-02-16 11:21:05 +01:00
Jakub Onderka 4ee48aa1f1 fix: [UI] Showing date and time in user profile 2021-02-16 11:14:13 +01:00
mokaddem 3cb87fcf9b
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-02-16 11:06:17 +01:00
mokaddem a7834a291b
new: [object] Allows updating from an unknown object templates 2021-02-16 11:04:11 +01:00
Jakub Onderka 29e9a5da95 new: [UI] Show threat level icons on event index 2021-02-16 10:52:50 +01:00
Jakub Onderka 08925f4612 new: [oidc] OpenID Connect authentication 2021-02-16 10:47:56 +01:00
Jakub Onderka 1ac21e04c6 chg: [internal] Make Redis connection static 2021-02-16 09:50:46 +01:00
Jakub Onderka fea5d831e8
Merge pull request #7008 from JakubOnderka/update-taxnomies-faster 
chg: [internal] Faster updating taxonomies
 2021-02-16 09:49:40 +01:00
iglocska 4ed99708f6
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-02-16 08:45:32 +01:00
iglocska 8a46933641
fix: [event index] changed the galaxy cluster field width 
- no longer looks like it was sandwiched between two semis
 2021-02-16 08:44:36 +01:00
Jakub Onderka 2589962b79
Merge pull request #7007 from JakubOnderka/object-template 
fix: [UI] Object template
 2021-02-16 08:29:56 +01:00
Jakub Onderka 23aedd7411 fix: [UI] Object template pagination 2021-02-16 08:26:59 +01:00
Jakub Onderka ccbb2e8e91 fix: [internal] Remove unused ServerTag 2021-02-16 08:13:00 +01:00
Jakub Onderka 1aae9f8424 fix: [internal] Remove unused layouts 2021-02-16 08:13:00 +01:00
Jakub Onderka 426dce2005 fix: [internal] Remove unused roboto font 2021-02-16 08:13:00 +01:00
Jakub Onderka c9ca98ef04 chg: [js] Move code from template to misp.js 2021-02-16 08:13:00 +01:00
Jakub Onderka 5e48a484b0 fix: [UI] Remove unnecessary CSS from default template 2021-02-16 08:13:00 +01:00
iglocska 3e81735833
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-02-16 00:16:45 +01:00
iglocska 8bde7d01f4
fix: [breakOnDuplicate] on event add fixed, fixes #6917 
- add breakOnDuplicate on the event level as a flag
  - {"Event":{"breakOnDuplicate":1, "info": "foo", ...}}

- correctly handle 2 equal objects added to the same event in memory
 2021-02-16 00:15:18 +01:00
iglocska 8e3ccb3d5f
fix: [auto logout] disabled 
- this crap just causes issues and is pretty pointless
 2021-02-15 23:40:39 +01:00
Jakub Onderka 9cf35c9b68
Merge pull request #7012 from JakubOnderka/row-attribute-escaping 
fix: [UI] Escaping in row_attribute
 2021-02-15 20:50:08 +01:00
Jakub Onderka 3b155d7c0f
Merge pull request #7011 from JakubOnderka/http-socket-fied-name 
fix: [internal] Field name in HttpSocketExtended
 2021-02-15 20:49:55 +01:00
Jakub Onderka 2741da9dc1 fix: [UI] Escaping in row_attribute 2021-02-15 20:16:33 +01:00
Jakub Onderka 1b5c058733 fix: [internal] Field name in HttpSocketExtended 2021-02-15 20:06:06 +01:00
iglocska e7a7f30ba2
new: [widget] Eventstream widget and index widget UI added 
- EventStream
  - add a lightweight event index to your dashboard
  - configure filters for the events you're interested in (tags, orgs, published)
  - set the number of events to display (limit)
  - set the list of fields it should display (id, orgc, info, tags, threat_level, analysis, date)

- Index widget UI
  - uses the generic index builder
  - build simple index like UIs
 2021-02-15 18:10:15 +01:00
iglocska 74aaf2de0b
chg: [array lookup index field] updatd to work correctly 2021-02-15 18:09:35 +01:00
iglocska 6112c0d406
chg: [event model] fetchEvent() now accepts page/limit/order as parameters 2021-02-15 18:08:41 +01:00
iglocska ff828cbb30
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-02-15 17:27:07 +01:00
iglocska 75ba83b40b
fix: [dashboard] Typo breakig the dashboards fixed 2021-02-15 17:26:48 +01:00
iglocska 9f026749dd
fix: [eventreport] add fixed to avoid ID collisions 2021-02-15 16:45:09 +01:00
mokaddem b6f5844350
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-02-15 16:37:00 +01:00
mokaddem ac836fcca9
fix: [event] `merge from` feature correctly saves object relations. Fix #6969 2021-02-15 16:36:17 +01:00
mokaddem c9e0326d4e
fix: [event] Includes eventReport when using the `merge from` feature 2021-02-15 16:35:20 +01:00
mokaddem 08e556e198
new: [event] Added supports of eventReport coming from modules 2021-02-15 16:32:47 +01:00
Alexandre Dulaunoy 4fc5214088
Merge branch '2.4' into develop 2021-02-15 15:18:52 +01:00
Alexandre Dulaunoy 54bd6e0951
chg: [misp-objects] updated to the latest version 2021-02-15 15:17:58 +01:00
mokaddem d54afd12d6
chg: [events] Enables index search for object. Fix #6961 2021-02-15 15:17:00 +01:00
mokaddem 37a724ddf3
fix: [events] Attach cluster from matrix in multiselect. Fix #6956 2021-02-15 15:05:23 +01:00
mokaddem 43db6029db
fix: [eventTimeline] Refrsh attribute index when dragging. Fix #6958 2021-02-15 14:21:32 +01:00
mokaddem 5f30ecf322
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-02-15 13:55:03 +01:00
mokaddem 0b8055c260
fix: [taxonomy] Hide unselectable tags by default. Fix #6912 2021-02-15 13:54:03 +01:00
Alexandre Dulaunoy 28ccbc9426
fix: [STIX] fix typo in message 2021-02-15 11:51:06 +01:00
Alexandre Dulaunoy 7398c71403
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-02-15 11:50:13 +01:00
Alexandre Dulaunoy d76c0559fb
fix: [STIX] fix typo in message 2021-02-15 11:49:17 +01:00
mokaddem 4f593b3a06
Merge remote-tracking branch 'origin/2.4' into develop 2021-02-15 11:15:44 +01:00
mokaddem 00edd1382c
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2021-02-15 11:10:22 +01:00
mokaddem 9b706c8837
fix: [event] Publishing to pub/sub queues includes all tags 2021-02-15 11:09:33 +01:00
Alexandre Dulaunoy 5d5c77a0df
chg: [organisation] "International" typo fixed + Europe added 
Notes TODO: Improve the selection using the region galaxy in addition to
country galaxy
 2021-02-15 11:05:20 +01:00
Alexandre Dulaunoy 404a96ebc2
chg: [organisation] "International" typo fixed + Europe added 
Notes TODO: Improve the selection using the region galaxy in addition to
country galaxy
 2021-02-15 11:01:44 +01:00
Jakub Onderka 6147f4061a chg: [internal] Faster updating taxonomies 2021-02-14 14:15:55 +01:00
Jakub Onderka 79adaed52a
Merge pull request #7001 from JakubOnderka/nicer-event-preview 
chg: [UI] Make event preview nicer
 2021-02-14 09:59:15 +01:00
Alexandre Dulaunoy 9e21aced11
chg: [LogsController] add missing EventReport in log search 2021-02-12 15:13:16 +01:00
iglocska 073c2530db
fix: [logs] aded eventgraph to log search 2021-02-12 15:05:11 +01:00
Jakub Onderka 5c0cd560a5
Merge pull request #7004 from JakubOnderka/bad-variable 
fix: [internal] Bad variable
 2021-02-12 10:26:00 +01:00
Jakub Onderka 335b916d20 fix: [internal] Bad variable 2021-02-12 10:10:18 +01:00
Jakub Onderka 2c90523dc3 chg: [UI] Make event preview nicer 2021-02-12 09:47:44 +01:00
iglocska 2d628456dd
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-02-11 17:48:35 +01:00
iglocska 6850870846
Merge branch '2.4' into develop 2021-02-11 17:48:23 +01:00
iglocska 4e3d97f9e0
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2021-02-11 17:47:20 +01:00
iglocska bf8bd21a35
chg: [connection test] clarified that read only users can pull. 
- Reduced error level to "orange"
- Added a clarification that they can still pull
 2021-02-11 17:46:32 +01:00
Tom King b0b4e691ad Merge remote-tracking branch 'upstream/2.4' into feature/attribute_sightings 2021-02-11 16:35:11 +00:00
Tom King 053ab340b0 Merge branch '2.4' into feature/attribute_sightings 2021-02-11 16:33:54 +00:00
Tom King 626443af47 chg: Use a more suitable Sighting creation function as recommended, grab the Org ID from the user if present 2021-02-11 16:31:51 +00:00