MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
17,853 Commits
35 Branches
366 Tags
190 MiB
Commit Graph

14188 Commits (a6b76e70ae94996ea05540f43b8dff5aba163666)

Author SHA1 Message Date
Jakub Onderka 0bfc0bf38a fix: [security] XSS in authkey comment field 2020-12-04 16:20:02 +01:00
mokaddem 0e2ef44fe3
chg: [galaxyClusters:view_relation_tree] Adjust height based on the 
number of nodes
 2020-12-04 09:05:21 +01:00
iglocska 56f91f9b5f
fix: [baseurl] validation relaxed 
- no more arbitrary junk blocking https://localhost
 2020-12-01 13:41:52 +01:00
iglocska a332e1379c
Merge branch '2.4' into cerebrate 2020-11-30 23:49:40 +01:00
iglocska 776405c5ec
chg: [ACL] cerebrate added to the ACL 2020-11-30 23:48:20 +01:00
iglocska 320191bbd8
chg: [querystring] bump 2020-11-30 23:46:37 +01:00
iglocska 03deb585c8
chg: [image] added cerebrate logo 2020-11-30 23:46:07 +01:00
iglocska a016c00569
new: [factories] generic confirmation UI factory added 2020-11-30 23:45:12 +01:00
iglocska 84933646f7
new: [Cerebrates] added Cerebrate sync functionality 
- add/modify cerebrate links
- preview cerebrate instanes for organisations
- fetch organisations from cerebrate
  - ingests new organisations and updates existing ones

- More to come in the future
 2020-11-30 23:43:44 +01:00
iglocska 18593bfedf
chg: [js] runIndexQuickFilter changes 
- added optional url parameter to set a fixed URL to search from
- added target parameter for ajax refreshes (target css selector)
- added possibility to pass ordered parameters in addition to key value pairs
- added ajax lookups
 2020-11-30 23:41:34 +01:00
iglocska 90d8504b79
chg: [Cerebrate] added to the global menu 2020-11-30 23:41:08 +01:00
iglocska d962beaf16
fix: [communities] search fixed, context no longer defaults to "pending" which is an unknown value 2020-11-30 23:40:07 +01:00
iglocska da3ec7a201
fix: [authkey] fixed a bug causing recurring authkey lookups via model binding failing 
- missing parameter caused the linking to be single use
 2020-11-30 23:39:31 +01:00
iglocska dfb0810e10
fix: [community] removed invalid filter field causing notice errors 2020-11-30 23:39:05 +01:00
iglocska e65b255a62
new: [Cerebrate] db update added 2020-11-30 23:38:38 +01:00
iglocska bcd261cdba
chg: [synctool] added custom model support for the setuphttpsocket() function 2020-11-30 23:37:59 +01:00
iglocska e34b1c29fa
fix: [custompagination tool] hardcoded modelname fixed 2020-11-30 23:37:27 +01:00
iglocska 84afe9f0d3
chg: [CRUD component] call model functions in the afterfind 
- added the option to either use anonymous functions or call model functions in the hook
- fixed a bug with a missing modelname in the lookup scope for fields (carryover from cerebrate)
 2020-11-30 23:35:02 +01:00
iglocska 37af48d8dd
new: [view factories rework] 
indextable:
  - org lookup field cleaned up and made more resilient
  - remote status: status field for checking of the local vs remote state of objects added
  - pagination system updated to allow for ajax pagination
  - random named container added for the index table's scaffolding

side menu:
  - added cerebrate options

side panels:
  - new factory type added for side panel elements (for the usual 2:1 split views)
  - added logo element

single views:
  - child reworked to use the accordion element
  - added side panel support
 2020-11-30 23:30:44 +01:00
Jakub Onderka f202128af1
Merge pull request #6673 from JakubOnderka/news-date-format-change 
chg: [UI] Normalize date format to match rest of MISP
 2020-11-30 21:58:19 +01:00
Jakub Onderka 568e58aa42 chg: [UI] Normalize date format to match rest of MISP 2020-11-30 21:44:59 +01:00
Jakub Onderka e1bf73937a fix: [sightings] Support mysql in sql_mode=only_full_group_by 2020-11-30 19:50:52 +01:00
Jakub Onderka 2c7d6e4466 new: [auth] Allow to enforce auth plugin authentication 2020-11-30 14:46:36 +01:00
StefanKelm 74b47cba8b
Update event-timeline.js 
Few typos...
 2020-11-30 11:41:06 +01:00
Jakub Onderka 53fa20adef
Merge pull request #6665 from JakubOnderka/remove-hashed-keys 
fix: [security] Remove hashed advanced keys from response
 2020-11-29 20:44:03 +01:00
Jakub Onderka 03001303a6 fix: [security] Remove hashed advanced keys from response 2020-11-29 20:34:21 +01:00
Andras Iklody 8fbdaddca2
fix: [bindmodel] added reset = false to the linking of users to authkeys 
- added reset = false in parameters (otherwise consecutive calls to the user model will not include the relation)
 2020-11-29 12:10:53 +01:00
Jakub Onderka 9631f9e09d fix: [UI] Correctly handle truncated values for import 2020-11-27 22:25:24 +01:00
Jakub Onderka cb82ef2755 chg: [composer] Raise minimal PHP version to 7.2 and disable support for 8.0 2020-11-27 17:21:25 +01:00
Jakub Onderka 9a315d33d1
Merge pull request #6578 from JakubOnderka/sighting-statistics 
Experimental: Faster loading sighting statistics
 2020-11-27 16:24:24 +01:00
Jakub Onderka 02b29c1d19
Merge pull request #6657 from JakubOnderka/app-controller-cleanup 
fix: [internal] Remove unused method from AppController
 2020-11-27 09:05:27 +01:00
Jakub Onderka 165da72fdf fix: [internal] Remove unused method from AppController 2020-11-27 09:01:35 +01:00
Jakub Onderka 41d612ee8c
Merge pull request #6633 from JakubOnderka/sg-fetching-optim 
chg: [internal] Fetch just necessary orgs and server object for sg
 2020-11-26 20:52:31 +01:00
Alexandre Dulaunoy 58f7341af7
chg: [misp-galaxy] MITRE ATT&CK updated 2020-11-26 14:29:48 +01:00
Andras Iklody 953f044481
chg: [vhash] removed validation altogether 
- vhash is like a box of chocolates, you never know what you're going to get.
 2020-11-25 21:53:56 +01:00
Jakub Onderka c9e96322a9 new: [shibb] Allow to get organisation UUID from HTTP headers 2020-11-25 21:21:14 +01:00
Jakub Onderka 61f9566b3e
Merge pull request #6613 from JakubOnderka/security-tests 
new: [test] Security test suite
 2020-11-25 19:39:57 +01:00
mokaddem db1fb361e8
fix: [csvExport] Prevent override when using `includeContext` parameter 
Fix #3774
 2020-11-25 09:36:49 +01:00
mokaddem 2c29b78098
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-11-25 08:20:39 +01:00
mokaddem 2eb23a9215
chg: [events:view] Possibility to fetch events without attachments via the API 2020-11-25 08:17:51 +01:00
mokaddem 2681138b88
chg: [galaxyCluster:relationsTreeTool] Ignore duplicated cluster UUIDs 
- Some default clusters have the same UUID. They are the same entity but
stored in a different cluster package. It should be addressed in the
future
 2020-11-25 08:16:06 +01:00
iglocska 75061f6266
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-11-25 08:14:33 +01:00
iglocska 71ba725fd1
fix: [text export] cull duplicates after fetching the data 
- pros: No more full group by exceptions
        Handles duplicate culling across internally paginated workloads

- cons: The returned dataset's size will not always match the requested count as duplicates are culled
 2020-11-25 08:11:28 +01:00
Jakub Onderka e15ca97f33
Merge pull request #6081 from JakubOnderka/security_disable_browser_cache 
new: [security] HTTP headers hardening
 2020-11-24 21:00:02 +01:00
Jakub Onderka 54efe760a4 chg: [internal] Better exception description for PGP key validation 2020-11-24 19:21:22 +01:00
Jakub Onderka 4b44db22a9 new: [test] Security test suite 2020-11-24 19:03:17 +01:00
Jakub Onderka 5b9f8dd20a
Merge pull request #6644 from JakubOnderka/fix-redis-unlink 
fix: [internal] Redis unlink method for old Redis versions
 2020-11-24 18:31:16 +01:00
Jakub Onderka d56fe702eb fix: [internal] Redis unlink method for old Redis versions 2020-11-24 18:21:52 +01:00
Jakub Onderka d92b18970a chg: [sighting] Support for postgres 2020-11-24 16:30:03 +01:00
Jakub Onderka 982b7378de fix: [UI] Favourite only for tags 2020-11-24 16:30:03 +01:00
Jakub Onderka b48df40e8e chg: [tag] Simplified taxonomy handling 2020-11-24 16:30:03 +01:00
Jakub Onderka 7c7a8f2817 chg: [tag] Fetch event count for tags in one query 2020-11-24 16:30:03 +01:00
Jakub Onderka 261d15265d chg: [sighting] Speedup loading sighting for tags and galaxies 2020-11-24 16:30:03 +01:00
Jakub Onderka 8df9bc9116 chg: [sighting] Speedups list all sightings 2020-11-24 16:30:03 +01:00
Jakub Onderka b1a5770ce9 chg: [sighting] Reworked listing sightings 2020-11-24 16:30:03 +01:00
Jakub Onderka 1f258ebe66 chg: [sighting] Sighting statistics 2020-11-24 16:30:00 +01:00
iglocska 56b3c7e0e8
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-11-24 16:28:50 +01:00
iglocska 68fc0eca7d
fix: [authkey] only link the model if the instance is already updated 2020-11-24 16:28:10 +01:00
Jakub Onderka d23dcb5bc9
Merge pull request #6634 from JakubOnderka/attribute-search-optimisation 
chg: [internal] Optimise attribute search in UI
 2020-11-24 16:19:19 +01:00
iglocska 91f87d7e2a
fix: [UI] user add 
S/MIME label misaligned
 2020-11-24 15:42:28 +01:00
iglocska ddca7bf2ef
chg: [internal] removed void return promise 
- to make EOL php versions happy
 2020-11-24 13:51:13 +01:00
Jakub Onderka b626b23abd chg: [internal] Attach event correlations in one call for attribute UI search 2020-11-24 13:28:12 +01:00
Jakub Onderka ef7fdf1f65 chg: [internal] Attach feed correlations in one call for attribute UI search 2020-11-24 13:28:12 +01:00
Jakub Onderka 17d7b8349e chg: [internal] Optimise attribute search in UI 2020-11-24 13:28:12 +01:00
Alexandre Dulaunoy ca3201c6ae
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-11-24 12:19:47 +01:00
Alexandre Dulaunoy f980494d73
chg: [attribute] new process-state type 2020-11-24 12:19:05 +01:00
mokaddem 311cb85abd
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-11-24 12:18:35 +01:00
mokaddem 423750573d
fix: [security] Make cluster's elements adhere to ACL 2020-11-24 12:15:42 +01:00
Alexandre Dulaunoy cb71644ba8
Merge pull request #6638 from korrosivesec/feature/jarm 
new: [datamodels] added jarm-fingerprint type
 2020-11-24 11:26:39 +01:00
iglocska 68efb37cbc
fix: [galaxy update] tag capture fixed 
- set random colour and some other default values
 2020-11-23 22:38:50 +01:00
iglocska 3729fd80a0
fix: [galaxy update] force flag should be cast to boolean 2020-11-23 22:30:54 +01:00
iglocska 20bfe637e4
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-11-23 22:17:41 +01:00
Kory Kyzar 9d0eff5f2a new: [datamodels] added jarm-fingerprint type 2020-11-23 14:03:36 -06:00
iglocska 7e172fb627
chg: [galaxy update] improvements 
- should be a fair bit faster
 2020-11-23 19:38:19 +01:00
Raphaël Vinot 7dab02b1e5 chg: [PyMISP] Bump version 2020-11-23 10:07:11 +01:00
Alexandre Dulaunoy 0c14611ed7
chg: [warning-lists] updated to the latest version 2020-11-23 09:03:02 +01:00
Alexandre Dulaunoy a8cce42c83
chg: [misp-objects] updated to the latest version 2020-11-23 09:02:40 +01:00
Alexandre Dulaunoy 89d4358a3a
chg: [misp-galaxy] updated to the latest version 2020-11-23 09:02:17 +01:00
Jakub Onderka 54b132c1a7 chg: [internal] Fetch just necessary orgs and server object for sharing groups 2020-11-21 10:56:09 +01:00
Alexandre Dulaunoy 9e64cfb018
Merge pull request #6632 from StefanKelm/2.4 
Update Server.php
 2020-11-20 20:07:49 +01:00
mokaddem 83ce94ac70
chg: [servers:schema_diagnostic] Added notice concerning benign deltas 2020-11-20 13:54:14 +01:00
StefanKelm d667847815
Update Server.php 
Tiny re-wording
 2020-11-20 12:56:27 +01:00
mokaddem 50185e45f0
fix: [eventReport:reportFromEvent] Correctly apply filter conditions 
Fix #6631
 2020-11-20 10:59:54 +01:00
mokaddem 23695d1e3f
fix: [tags] Pass user object to massaging function 2020-11-20 10:54:17 +01:00
mokaddem 38981be108
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-11-20 10:37:16 +01:00
mokaddem 22bca70f6b
chg: [event:index] Allow passing list when filtering 2020-11-20 10:36:20 +01:00
mokaddem 4270075c35
fix: [event:index] Pass missing parameter 2020-11-20 10:35:41 +01:00
Jakub Onderka df97c9f768 chg: [internal] Faster updating JSON structures 2020-11-19 23:41:35 +01:00
Jakub Onderka 66eb224409 chg: [UI] Allow to set syslog setting from UI 2020-11-19 21:32:14 +01:00
Jakub Onderka 088c573040 chg: [internal] Code style 2020-11-19 21:16:32 +01:00
Jakub Onderka a00227bb07 chg: [logging] Allow to define syslog identifier 2020-11-19 21:16:32 +01:00
Jakub Onderka 3a253cda6d chg: [logging] Allow to disable syslog logging to stderr 2020-11-19 21:16:31 +01:00
Jakub Onderka 206c38d5d7
Merge pull request #6625 from JakubOnderka/setting-change-exception 
chg: [internal] Throw exception if setting name doesn't exists
 2020-11-19 21:10:16 +01:00
Jakub Onderka af0e4f354d
Merge pull request #6626 from JakubOnderka/no-empty-job 
fix: [internal] Do not try to fetch empty job
 2020-11-19 19:30:25 +01:00
Jakub Onderka 3b791aea7e fix: [internal] Do not try to fetch empty job 2020-11-19 19:16:12 +01:00
Jakub Onderka 071f8877b3 chg: [internal] Throw exception if setting name doesn't exists 2020-11-19 19:08:14 +01:00
mokaddem e6c4088cd8
Merge remote-tracking branch 'origin/2.4' into JakubOnderka-galaxy-cluster-fetch 2020-11-19 19:02:26 +01:00
mokaddem 71e9bc8173
chg: [galaxyClusterRelations:index] Show edit button for users having the permission 2020-11-19 18:56:05 +01:00
mokaddem e5735f7a16
chg: [galaxyCluster:view_relations] Moved custom relation option at the top 2020-11-19 18:53:03 +01:00
mokaddem fb479d4b72
chg: [galaxyClusterRelations:add] Added picker for relation type 2020-11-19 18:48:57 +01:00
mokaddem 3fe41cd22d
chg: [galaxyClusterBlocklist:add] Added picker for cluster 2020-11-19 18:23:57 +01:00
mokaddem a890ff1021
new: [galaxyCluster:index] Added badge showing number of custom clusters 2020-11-19 18:17:20 +01:00
mokaddem 8b2cea7cdc
chg: [galaxyClusters] Sort by version then by value 2020-11-19 17:47:19 +01:00
mokaddem bc6f1f3550
fix: [tags] Pass user object to massaging function 2020-11-19 17:40:59 +01:00
mokaddem e45174f83c
fix: [appController] Prevent notice for `perm_galaxy_editor` if update is still running 2020-11-19 17:35:30 +01:00
Jakub Onderka a635fb535d fix: [logs] Add missing AuthKey model to log search 2020-11-19 15:47:39 +01:00
Jakub Onderka 48eafd4d47 fix: [authkey] There is no AuthKey.timestamp column 2020-11-19 13:19:43 +01:00
Jakub Onderka 2302974cc9 fix: [UI] There is nothing like AuthKey.disabled 2020-11-19 13:19:43 +01:00
Jakub Onderka 1c5b3c8e3d chg: [UI] Change colors for auth key expiration field 2020-11-19 13:19:43 +01:00
Jakub Onderka 8b5538c93d chg: [UI] Always use auth key with space in UI 2020-11-19 13:19:43 +01:00
Jakub Onderka b7c01e262a chg: [UI] Use quick click select for new generated authkey 2020-11-19 13:19:43 +01:00
Jakub Onderka 035a7e99de chg: [UI] Use monospace font for showing autkeys 2020-11-19 13:19:43 +01:00
Jakub Onderka 8d21f7c269 chg: [UI] Add information about key expiration to title 2020-11-19 13:19:43 +01:00
Jakub Onderka f72d425921 fix: [UI] Auto prevent default for index table actions 2020-11-19 13:19:43 +01:00
Jakub Onderka 4a11759395 fix: [UI] Add label to delete auth key icon 2020-11-19 13:19:43 +01:00
mokaddem fa1f391fc1
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-11-19 11:55:11 +01:00
Jakub Onderka 9d82d70e64
Merge pull request #6559 from JakubOnderka/fist-last-seen-sort 
new: [UI] Allow to sort attributes or objects by first and last seen
 2020-11-19 11:46:44 +01:00
mokaddem 8c87d5036c Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-11-19 11:45:21 +01:00
mokaddem 758e0de557 fix: [server:sqlRecoveryQuery] Added support of unsigned int 
Fix #6618
 2020-11-19 11:45:02 +01:00
Jakub Onderka aa7d29de81
Merge pull request #6617 from JakubOnderka/freetext-feed-saving 
chg: [feed] Optimise freetext feed caching
 2020-11-19 10:31:47 +01:00
Jakub Onderka 08166be060
Merge pull request #6609 from JakubOnderka/remove-inbox-controller 
fix: [UI] Remove unused inbox controller and menu link
 2020-11-19 10:30:39 +01:00
Jakub Onderka 0b480baebe
Merge pull request #6621 from JakubOnderka/extension-version 
new: [diagnostic] Check extensions version
 2020-11-19 10:28:19 +01:00
Jakub Onderka 001122189e new: [diagnostic] Check extensions version 2020-11-19 10:11:56 +01:00
Jakub Onderka ffcb54edc3 chg: [feed] Optimise freetext feed caching 2020-11-19 09:53:02 +01:00
mokaddem 91f6479660 fix: [galaxy:update] Correctly delete clusters when performing a force update 2020-11-19 08:19:18 +01:00
Jakub Onderka 769bdecb98 chg: [galaxy] Do not fetch full galaxy info for event view UI 2020-11-18 17:25:25 +01:00
mokaddem b9dd089be3 fix: [object] Send all required arguments 2020-11-18 12:07:29 +01:00
mokaddem eb2fa7b393 Merge branch '2.4' into galaxy-cluster2.0 2020-11-18 11:45:01 +01:00
iglocska 360dadc35f
fix: [authkey] default value incorrect 2020-11-18 11:37:23 +01:00
mokaddem 42d3f92c9f fix: [galaxy:update] Make sure the fake user has the perm_sync right 2020-11-18 09:36:57 +01:00
mokaddem 89f307bd07 Merge branch '2.4' of github.com:MISP/MISP into galaxy-cluster2.0 2020-11-18 09:22:40 +01:00
Jakub Onderka 0dc06f0777 fix: [UI] Remove unused inbox controller and menu link 2020-11-18 08:50:13 +01:00
mokaddem 626ca544ff
fix: [security] XSS in the template element index view 
- As reported by Rubin Azad
 2020-11-18 06:29:55 +01:00
Jakub Onderka 7d7bd14145
Merge pull request #6496 from JakubOnderka/experimental-stream-convert 
Experimental: new: [internal] JSON stream convert
 2020-11-18 00:15:18 +01:00
Jakub Onderka 2104f617b0
Merge pull request #6589 from JakubOnderka/group-search-current-value 
chg: [UI] For search field, by default put current search term
 2020-11-17 22:24:32 +01:00
Jakub Onderka 12f84b0d69
Merge pull request #6587 from JakubOnderka/authkey-view 
Authkey view permission fix
 2020-11-17 21:25:38 +01:00
Jakub Onderka 791dc9deab new: [internal] JSON stream convert 2020-11-17 19:28:59 +01:00
Jakub Onderka 83945e4885
Merge pull request #6604 from JakubOnderka/github-test-changes 
GitHub test changes
 2020-11-17 17:32:44 +01:00
Jakub Onderka f1d8bf60e4
Merge pull request #6605 from JakubOnderka/php-extension-diagnostic 
chg: [diagnostic] Smarter PHP extension diagnostics
 2020-11-17 17:06:15 +01:00
Jakub Onderka db1e7621b2 fix: [internal] MISP update without branch 2020-11-17 15:04:08 +01:00
Jakub Onderka 5a597ca3db chg: [diagnostic] Smarter PHP extension diagnostics 2020-11-17 14:08:37 +01:00
mokaddem c8462c5791
Merge branch '2.4' of github.com:MISP/MISP into feature-report-from-event 2020-11-17 13:35:40 +01:00
Alexandre Dulaunoy eb4f739b7e
chg: [warning-list] updated 2020-11-17 13:30:14 +01:00
mokaddem 8c87998981
chg: [export:textExport] Filter out deplicated values 
Fix #6603 for attribute scope
 2020-11-17 12:09:45 +01:00
mokaddem ffa0ab54f9
fix: [attribute:fetch_attributes] Respect group_by request 2020-11-17 12:08:46 +01:00
mokaddem 217abfc2f8
fix: [mispObject:save_object] Returns error in correct format. 
Fix #6598
 2020-11-17 11:37:40 +01:00
mokaddem 9135a1ca8d
Merge branch '2.4' of github.com:MISP/MISP into feature-report-from-event 2020-11-17 11:05:44 +01:00
mokaddem 399f2f7720
Merge branch '2.4' of github.com:MISP/MISP into galaxy-cluster2.0 2020-11-17 11:04:41 +01:00
Sami Mokaddem 32e7a3a5c3
Merge pull request #6580 from Maddosaurus/fix-plugin-setting-spelling 
Fix: Fix spelling of sightings_anonymise_as description
 2020-11-17 11:04:25 +01:00
mokaddem 3ccaa50a37
Merge branch '2.4' of github.com:MISP/MISP into galaxy-cluster2.0 2020-11-17 10:33:22 +01:00
mokaddem 86b0f75700
Merge branch '2.4' of github.com:MISP/MISP into feature-report-from-event 2020-11-17 10:31:39 +01:00
Jakub Onderka 15ffa8e967
Merge pull request #6601 from JakubOnderka/fix-diagnostic-download 
fix: [internal] Diagnostic data download
 2020-11-16 23:59:54 +01:00
Jakub Onderka 7c85cdf88c fix: [internal] Diagnostic data download 2020-11-16 23:48:01 +01:00
Jakub Onderka 24301af247 fix: [internal] Server::update method 2020-11-16 23:22:27 +01:00
Jakub Onderka a2449f9c02
Merge pull request #6597 from JakubOnderka/zmq-setting-change-fix 
fix: [internal] Initialize ZMQ just when necessary after setting change
 2020-11-16 21:48:35 +01:00
Jakub Onderka 14efe5681c fix: [internal] Initialize ZMQ just when necessary after setting change 2020-11-16 20:37:27 +01:00
Jakub Onderka fd9baef7c0
Merge pull request #6588 from JakubOnderka/gpg-version-diagnostics 
new: [diagnostic] Show installed GnuPG version
 2020-11-16 17:46:31 +01:00
iglocska 459144011e
fix: [event index] search via attribute key allows for empty input now 2020-11-16 16:17:47 +01:00
mokaddem 9db29821b4
Merge remote-tracking branch 'origin/2.4' into galaxy-cluster2.0 2020-11-16 16:11:17 +01:00
mokaddem 334b7cabe1
fix: [tag:search] Correctly pass user data 2020-11-16 15:14:37 +01:00
mokaddem f0bc398e60
Merge branch '2.4' of github.com:MISP/MISP into galaxy-cluster2.0 2020-11-16 14:59:17 +01:00
Jakub Onderka c51cd36ac3 fix: [internal] Destroy session just when session is started 2020-11-16 14:58:12 +01:00
iglocska 09c578d2c3
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-11-16 14:43:24 +01:00
iglocska 2f736d8c64
fix: [index search] allow for list of values to be passed via the attribute key 2020-11-16 14:42:58 +01:00
Jakub Onderka 73b63e2ccd new: [diagnostic] Show installed GnuPG version 2020-11-16 14:38:40 +01:00
Raphaël Vinot 2e883d3e09 chg: Bump warning-lists 2020-11-16 13:14:05 +01:00
Jakub Onderka 08f5969cb5 chg: [UI] For search field, by default put current search term 2020-11-16 10:52:24 +01:00
mokaddem ea0c3fc635
fix: [acl] Added report_from_event entry in ACL 2020-11-16 10:48:36 +01:00
mokaddem 51066e786c
Merge branch '2.4' of github.com:MISP/MISP into feature-report-from-event 2020-11-16 10:46:07 +01:00
Jakub Onderka b38a4d5246
Merge pull request #6561 from JakubOnderka/rest-attribute-include-context 
chg: [rest] For attribute REST search with includeContext, fetch events just once
 2020-11-16 08:48:02 +01:00
Jakub Onderka 55fd2dbd97 fix: [UI] Correct path to user profile from authkey view 2020-11-15 18:04:34 +01:00
Jakub Onderka 000706251b fix: [security] Proper check who can view new authkeys 2020-11-15 18:04:34 +01:00
iglocska a306784844
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-11-15 10:21:50 +01:00
Jakub Onderka b057426b9f fix: [security] Properly validate new auth key 2020-11-14 22:33:05 +01:00
Jakub Onderka 7f2aec7f34 fix: [UI] Cerebrate -> MISP 2020-11-14 22:32:47 +01:00
Jakub Onderka 82bac52899 fix: [UI] Put back requesting API access to user page 2020-11-14 17:59:12 +01:00
Jakub Onderka 7e67dafe46 chg: [UI] Simplified user edit forms and interface 2020-11-14 17:44:17 +01:00
Jakub Onderka 2e4825e741 chg: [internal] Simplified ACLComponent::printRoleAccess 2020-11-14 17:44:17 +01:00
Jakub Onderka 985b2232d7 chg: [UI] Authkey reset position 2020-11-14 17:44:17 +01:00
Jakub Onderka 3b8b0019af new: [user] Setting `disable_user_add` to disable user creation by org admins 2020-11-14 17:44:17 +01:00
Jakub Onderka 02b43fff1e chg: [UI] Ajax user list 2020-11-14 17:44:16 +01:00
Jakub Onderka 93feec5ded chg: [ACL] User different way how to use dynamic rules 2020-11-14 17:44:16 +01:00
Jakub Onderka d7fff01b4e new: [user] Disabling password and login changes apply also for org admins 2020-11-14 17:44:16 +01:00
Jakub Onderka 272142637b new: [UI] Add `disable_user_password_change` and `disable_user_login_change` setting 2020-11-14 17:44:16 +01:00
Jakub Onderka 5ea0ab36ec chg: [UI] Add link to user org from profile 2020-11-14 17:44:16 +01:00
Jakub Onderka c8fcfaf5e2 new: [user] Allow to disable user login change 2020-11-14 17:44:16 +01:00
Jakub Onderka 8e76af6370 new: [user] Allow to disable user password change 2020-11-14 17:44:16 +01:00
mokaddem dc65c79130
Merge branch '2.4' of github.com:MISP/MISP into galaxy-cluster2.0 2020-11-13 16:26:35 +01:00
mokaddem e1f82ba6ee
chg: [eventReport:reportFromEvent] Added support of attributes and objects 2020-11-13 15:59:53 +01:00
mokaddem e3d42ffe2a
new: [eventReport] Report from event 2020-11-13 13:56:28 +01:00
iglocska 1703f85cd9
chg: [automation] page updated to accomodate new authkey system 
- since the API keys can no longer be retrieved, point the user to where they can manage their keys
 2020-11-13 12:56:02 +01:00
iglocska aed287d202
fix: [authkey] convert existing keys 
- added functionality to convert old style API keys to the setting description
 2020-11-13 12:55:07 +01:00
iglocska 2eec8878cd
new: [authkey] generate authkeys automatically when creating users 
- when using the new authkey system
 2020-11-13 12:54:14 +01:00
iglocska c3a1fd7df9
fix: [UI] various smaller fixes 2020-11-13 12:53:52 +01:00
iglocska 03e5ad741d
fix: [authkey] various improvements 
- correct lookup of users by API key when no expiration is set
- added authkey reset functions
 2020-11-13 12:52:20 +01:00
iglocska 0bfac46701
chg: [user] views aligned with new authkeys 
- adding users should display the newly created authkey
- other views should not show anything
- API responses fixed
 2020-11-13 12:49:56 +01:00
iglocska 2dfe32ce57
fix: [rest client] implenented changes for advanced authkeys 
- strip auth headers in the history
- but not in the actual request
 2020-11-13 12:49:14 +01:00
iglocska cea665a97e
fix: [various fixes] to the authkeys controller 
- invalid admin lookup fixed
- restriction to individual users added when using a user view to access the authkey index
 2020-11-13 12:48:27 +01:00
Mat c21ba85a08 Fix: Fix spelling of sightings_anonymise_as description 2020-11-13 12:38:05 +01:00
mokaddem 8846a03b75
fix: [galaxyCluster] Improved compatibility detection 2020-11-13 12:24:06 +01:00
mokaddem e9dfc80692
fix: [galaxyCluster] Bump timestamp after soft-deletion and restoration 2020-11-13 11:50:06 +01:00
mokaddem 59b708e32c
chg: [galaxyCluster] Remote feature support check is based on flag rather than strict version number 2020-11-13 11:45:26 +01:00
mokaddem 6e1dad515b
Merge branch '2.4' of github.com:MISP/MISP into galaxy-cluster2.0 2020-11-13 11:04:33 +01:00
mokaddem 41d385fdce
fix: [galaxyCluster] Apply deleteAll on correct model 2020-11-13 08:59:55 +01:00
iglocska 39911b16c6
Merge branch '2.4' into CRUD 2020-11-13 08:47:22 +01:00
Jakub Onderka 843b2ce7cf
Merge pull request #6560 from JakubOnderka/rest-client-handle-exceptions 
fix: [RestClient] Catch exceptions and show error message to user
 2020-11-12 23:36:55 +01:00
mokaddem 65f65adc1a
chg: [galaxyClusters] Returns created json blob instead of interface 
response
 2020-11-12 16:18:51 +01:00
mokaddem 7ea735a5b1
chg: [events:automation] Added entry for galaxy cluster restSearch 2020-11-12 16:08:49 +01:00
mokaddem ab493e2150
chg: [galaxyCluster:add] Adapt page title if forking 2020-11-12 15:41:53 +01:00
mokaddem 60da050e12
chg: [galaxyCluster:view_relations] Improved UI for relations 2020-11-12 15:31:15 +01:00
mokaddem 569ee27bb1
fix: [galaxyClusters:view_relations] No galaxy matrix in the picker 2020-11-12 14:47:22 +01:00
mokaddem 6f2217bde5
fix: [galaxyCluster] Allow forks with same name to appear in the picker 2020-11-12 14:38:22 +01:00
mokaddem bdbed2946f
chg: [galaxyCluster] Drop all elements before capture 2020-11-12 11:55:37 +01:00
mokaddem aff0bff826
fix: [galaxyClusterController:edit] Default empty list to empty string 2020-11-12 11:36:20 +01:00
mokaddem ab5507f8a5
chg: [server:index] Changed icon for pull relevant clusters 2020-11-12 11:26:37 +01:00
mokaddem 7d07a631f2
chg: [galaxy] Added logging behavior for galaxies, clusters and relations 2020-11-12 11:18:36 +01:00
mokaddem 410e3fbeee
chg: [appModel] Logout users after update 2020-11-12 11:08:08 +01:00
mokaddem b1cac77aeb
chg: [galaxyCluster:publish] Returns true regardless of the result for pushing to other 
servers
 2020-11-12 11:05:58 +01:00
mokaddem 05ff918ade
fix: [galaxies:export] typo 2020-11-12 10:48:46 +01:00
mokaddem 818e4ea892
fix: [galaxyCluster] Fixed publishing cluster permissions 2020-11-12 10:28:29 +01:00
mokaddem 34adc5f968
fix: [galaxyCluster:edit] Edit do not require distribution field 2020-11-12 10:09:46 +01:00
mokaddem 0dac8137cc
chg: [galaxyClusters:index] Added local ID in the index 2020-11-12 10:03:37 +01:00
mokaddem d9d9d3719b
fix: [galaxies] Correctly highlight galaxy in index scope 2020-11-12 10:00:54 +01:00
mokaddem 63d3cf39e6
fix: [galaxyClusters:index] Apply find on correct model for REST 
requests
 2020-11-12 09:42:12 +01:00
mokaddem 97d38eaaa5
fix: [galaxyClusterRelations:index] Added baseurl 2020-11-12 09:37:13 +01:00
mokaddem 1879bc05b7
Merge branch '2.4' of github.com:MISP/MISP into galaxy-cluster2.0 2020-11-12 09:05:12 +01:00
iglocska 693ef171c3
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-11-12 08:21:58 +01:00
iglocska 46bc6ef4b2
fix: [regression] invalid server loaded for connection test 2020-11-12 08:21:24 +01:00
mokaddem df9b4ce872
chg: [galaxy:export] Improved misp-galaxy format export and added notice 2020-11-11 14:52:13 +01:00
iglocska dbffebe503
Merge branch '2.4' into CRUD 2020-11-11 11:19:23 +01:00
mokaddem c216642767
fix: [servers:restClient] Keep HTTP body on template selection if it changed 
Making someone happy:
oooooooooooooooo+++ssyyyysso++ooooooooooosssyyysoo
oooooooooooooo+shmMNNNNNNNmmmdys+ooooooooyyyyysyhs
oooooooooooo+yNMNMNNNNNNNNNNNNdhds/ooooooosooooooo
oooooooooo+omMMMMMNNNNNNNNNNNNNmhdy/oooooooooooooo
ooooooooo++NMMMMNMNNNNNNNNNNmmmmdhm/oooooooooooooo
ooooooooo+yMMMMMMMMMNNNNNNNmmdmdmhN/oooooooooooooo
ooooooooo+oNMMNNmNMMMMMMNNNmddmdmhN/oooooooooooooo
oooooooooooodddhmys+.yyyhNNmdmNdNhh/oooooooooooooo
oooooooooooss/y+syso+s---+smdNhomdy+oooooooooooooo
ooooooooooooos:+oo+/-.....:hoos+Nmo+oooooooooooooo
oooooooooooo+sysso/-.......-.ohmNd/ooooooooooooooo
ooooooooooooo+yooo:-........-hNmh/+ooooooooooooooo
oooooooooooooo/ho+-.......-:+dhs//oooooooooooooooo
ooooooooooooooo+ys/::::/o++ooh:.:/+o+/+ooooooooooo
oooooooooooooooo+ooyhydNyoshy+.`````:++o++oooooooo
ooooooooooooooo+osssossyyhyo+-`````/:.``:y/+oooooo
ooooooooooooo+oyooosssssso/-````../:-````+s/oooooo
oooooooooooo++hosssssso+-```````::/:+hhyyyd:oooooo
oooooooooooo/hossssso+:````````./oo+ymsdyym:oooooo
ooooooooooo/ssoyysso/.```````.:+ho+smNmmmmN/+ooooo
ooooooooooo/moshdyyso/`````:osydsoohodddhym/oooooo
oooooooooo+yyossdhsooo-``.-ossshosd/:-..-sd/oooooo
oooooooooo/msshdd++/:--//+++oo+sss++:.```oy+oooooo
oooooooooo/mosssshhs+oo+/::-..``-/++--```m++oooooo
oooooooooo/d++ooossdmhs++oooo++/:--:-.``:d/ooooooo
 2020-11-11 11:05:18 +01:00
iglocska 2b395be661
chg: [cleanup] removed superfluous </div> 2020-11-11 10:49:55 +01:00
iglocska a8addc3378
chg: [boolean] field added to the single view fields 2020-11-11 10:49:21 +01:00
iglocska d6c4e693ce
chg: [user view] removed separate admin view 2020-11-11 10:48:33 +01:00
iglocska 706b416104
chg: [authkey] add view added 2020-11-11 10:48:06 +01:00
iglocska 92f5886493
new: [standardised delete] view factory added 2020-11-11 10:47:42 +01:00
iglocska bf7c9e8394
chg: [REST client] adapted to the APIkey changes 2020-11-11 10:47:10 +01:00
iglocska 5b256405c0
new: [advanced authkey] system 2020-11-11 10:46:38 +01:00
iglocska cd1217b36e
new: [CRUD component] backport from Cerebrate 2020-11-11 10:45:39 +01:00
iglocska 7e065ab10d
new: [genericForm] system backport from Cerebrate 2020-11-11 10:44:46 +01:00
iglocska d19dbd00a6
chg: [Roles] CRUD rework 2020-11-11 10:44:06 +01:00
iglocska 8192ded7dd
new: [indextable] scaffolding added along with a list of improvements 2020-11-11 10:42:41 +01:00
mokaddem f9bbf357b8
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-11-11 09:58:29 +01:00
mokaddem 774c4c104a
fix: [object:deltaMerge] Stopped updating object's attributes when updating the FS/LS. 
- Make sure to compare the correct date value of FS/LS and not their representation
 2020-11-11 09:56:05 +01:00
Jakub Onderka 99455a4192
Merge pull request #6566 from JakubOnderka/distribution-disable-correlation 
fix: [internal] Do not fetch unnecessary correlations for distributio…
 2020-11-10 14:57:25 +01:00
mokaddem 17c793d10f
chg: Bumped queryversion 2020-11-10 13:31:43 +01:00
mokaddem 54e4819dc2
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-11-10 13:31:06 +01:00
mokaddem 10bb2a7045
chg: [warninglists:index] Migrated index to factory view 2020-11-10 13:30:32 +01:00
Alexandre Dulaunoy dbbfdb14d5
chg: [warning-lists] updated to the latest version 2020-11-10 11:56:41 +01:00
mokaddem ac7eeda6c3
chg: [galaxy:export] Started conversion tool to misp-galaxy format - WiP 2020-11-10 10:16:20 +01:00