Commit Graph

692 Commits (2.4)

Author SHA1 Message Date
Luciano Righetti 4218787934 chg: move initTool() logic to constructor 2021-11-09 08:43:39 +01:00
Luciano Righetti 99b3f9da65 fix: revert bad merge 2021-11-09 08:24:51 +01:00
Luciano Righetti 01ef5eb186 fix: replace splat operator, follow cake 2.x private methods naming 2021-11-08 14:30:16 +01:00
Luciano Righetti f2c9d12eae chg: merge develop, fix conflicts. 2021-11-08 11:35:20 +01:00
Jakub Onderka 012b8c4b21 new: [CLI] admin reencrypt command 2021-11-07 17:51:04 +01:00
Jakub Onderka 0198c7b0db chg: [internal] Make system setting more secure 2021-11-06 21:23:22 +01:00
Jakub Onderka 51feb8034f new: [CLI] Allow to set setting value to `null` 2021-11-06 00:53:52 +01:00
Jakub Onderka c7cbdadccb new: [setting] Allow to encrypt setting 2021-11-05 16:15:52 +01:00
Luciano Righetti f80fcec2db chg: rename settings 2021-11-05 15:46:42 +01:00
Jakub Onderka c9597ba3e9 new: Store system settings in database 2021-11-05 09:19:56 +01:00
Luciano Righetti b6361c0f7c chg: rename conf name 2021-11-04 11:39:10 +01:00
Luciano Righetti b1eaed2b1b chg: merge develop, fix conflicts 2021-11-03 13:54:20 +01:00
Luciano Righetti c3c0c15182 chg: use new bg job tool in post model, refactor command 2021-11-03 10:58:35 +01:00
Luciano Righetti cce5e581d4 fix: add missing jobId param to enqueue() calls 2021-11-02 16:25:43 +01:00
Luciano Righetti dc27f11e0b chg: add user to worker class, make /servers/getWorkers compatible with new bg jobs 2021-10-29 16:20:06 +02:00
Luciano Righetti 321acb629e chg: fix issues with servershell pull/push commands 2021-10-29 14:52:42 +02:00
Jakub Onderka 55a4fb6036
Merge pull request #7899 from JakubOnderka/admin-shell
new: [CLI] New task for removeOrphanedCorrelations and optimiseTables
2021-10-29 12:50:18 +02:00
Jakub Onderka b9ab3332a2 chg: [internal] Better error messages when fetching feeds 2021-10-29 11:59:08 +02:00
Jakub Onderka 30ee33f1ef new: [CLI] New task for removeOrphanedCorrelations and optimiseTables 2021-10-29 10:54:37 +02:00
Luciano Righetti 145b54f401 chg: refactor server shell background jobs to use new tool 2021-10-27 17:03:16 +02:00
Luciano Righetti 9bb95db27e chg: remove hardcode response, map shell/cmd names. 2021-10-26 11:14:11 +02:00
Luciano Righetti 35cf34fab2 Merge branch 'develop' into add_simple_background_jobs 2021-10-26 10:55:13 +02:00
Luciano Righetti 5b08bc3578 chg: pass sql Job to new job handler 2021-10-26 10:31:17 +02:00
Luciano Righetti f3d05e6ff8 add: add initial new simple background jobs. 2021-10-21 13:39:26 +02:00
Jakub Onderka e96c850272 fix: [CLI] Cluster publishing 2021-10-20 11:45:07 +02:00
Jakub Onderka 3773fdff93 new: [CLI] Assign UserSetting to list output 2021-10-18 10:08:20 +02:00
Jakub Onderka 459afd6f67 chg: [internal] Code cleanup for Server::pull method 2021-10-16 09:26:42 +02:00
Jakub Onderka d983d10c14 chg: [internal] Use FileAccessTool for publishing sightings 2021-10-12 11:09:37 +02:00
Jakub Onderka 0faf986b78 fix: [shell] EventShell::contactemail command 2021-10-09 15:44:55 +02:00
Jakub Onderka 3562899af0 chg: [internal] Background processing refactoring 2021-10-09 15:00:28 +02:00
Jakub Onderka 96d2199726 fix: [internal] Server save setting file 2021-10-08 15:28:31 +02:00
Jakub Onderka 923f2501d3 fix: [internal] Bad merge 2021-10-05 19:41:57 +02:00
Sami Mokaddem 9a6d0b2b96
Merge remote-tracking branch 'origin/2.4' into develop 2021-10-05 16:15:44 +02:00
Jakub Onderka 544c9ee8b9 new: [internal] Store MISP live status also in Redis 2021-10-04 10:07:32 +02:00
Jakub Onderka c48ad84708
Merge pull request #7779 from JakubOnderka/create-job
new: [internal] Method Job::createJob
2021-09-30 13:51:58 +02:00
Jakub Onderka 48016120b7 chg: [internal] Use AdminSetting::getSetting method 2021-09-30 13:09:46 +02:00
Jakub Onderka ac4f042868 new: [internal] Method Job::createJob 2021-09-30 13:05:29 +02:00
Jakub Onderka 4c75854d07 new: [CLI] UserShell::ip_user command 2021-09-27 15:01:53 +02:00
Jakub Onderka 8ee60523b3
Merge pull request #7772 from JakubOnderka/update-cleanup
chg: [internal] Cleanup AdminShell::{updateJSON,runUpdates}
2021-09-27 13:16:40 +02:00
Jakub Onderka fdf6f5ca9e chg: [internal] Cleanup AdminShell::{updateJSON,runUpdates} 2021-09-26 21:52:18 +02:00
Jakub Onderka 353a503384 new: [CLI] New tasks that will check if Redis is available 2021-09-26 21:41:02 +02:00
Luciano Righetti 19af2d8d82 fix: incorrect check for alertemail and publishSightings event commands 2021-09-24 16:04:10 +02:00
Luciano Righetti e3d0769f12 fix: incorrect check for publish event command 2021-09-24 14:08:31 +02:00
Jakub Onderka 81eddfdb76 chg: [internal] Do not fetch keys from db for authkey login 2021-09-15 09:51:02 +02:00
Jakub Onderka 9afce6f2cf
Merge pull request #7725 from JakubOnderka/server-shell
chg: [internal] Simplify ServerShell code
2021-09-13 09:42:07 +02:00
Jakub Onderka a539b2ee7c
Merge pull request #7579 from JakubOnderka/publish_alerts_summary_only_deprecate
chg: [alert] Deprecate `MISP.publish_alerts_summary_only`
2021-09-07 12:19:01 +02:00
Jakub Onderka 9c1fc45330 new: [shell] Tag merging 2021-09-07 12:14:51 +02:00
Jakub Onderka ef410687a7 chg: [internal] Simplify ServerShell code 2021-09-03 08:48:44 +02:00
Jakub Onderka 902be03f2b new: [CLI] User shell 2021-08-25 09:48:14 +02:00
Jakub Onderka 157dbed32b chg: [sync] Simplify server post test code 2021-08-21 11:29:14 +02:00
Matjaz Rihtar eaae8c3ca7
fix: [shells] Sync improved cmd line help to 9d7da310 2021-08-16 21:56:04 +02:00
Matjaz Rihtar 4d86ac4842 Merge branch '2.4' into cmdLineHelp
# Conflicts:
#	app/Console/Command/AdminShell.php
#	app/Console/Command/EventShell.php
#	app/Model/Server.php
2021-08-16 19:06:11 +02:00
Jakub Onderka 3bc4f90122 new: [test] Check schema diagnostics in CI 2021-08-03 14:38:50 +02:00
Jakub Onderka 5c56518aaf fix: [test] After CLI setSetting change 2021-07-26 12:37:17 +02:00
iglocska 567bcdc1ca
chg: [CLI] better error messages when a setting change fails
- explain why it failed
- explain how a user can override it
2021-07-26 10:23:57 +02:00
Jakub Onderka 82065624ac fix: [internal] Argument parsing for testEventNotificationEmail command 2021-07-20 15:24:01 +02:00
Jakub Onderka 52d8ac6060 chg: [alert] Deprecate `publish_alerts_summary_only`, this option just duplicate `event_alert_metadata_only` 2021-07-20 15:19:10 +02:00
mokaddem 7a01c4a813
Merge remote-tracking branch 'origin/2.4' into develop 2021-07-16 15:15:11 +02:00
mokaddem e7fd73e50e
chg: [user:updateToAdvancedAuthKeys] Functionality accessible via the CLI 2021-07-16 15:13:55 +02:00
Jakub Onderka f747d98877
Merge pull request #6817 from JakubOnderka/upload-sightings
chg: [sync] New separate method for uploading sightings to remote server
2021-07-09 12:25:16 +02:00
Jakub Onderka 82878632e5 new: [internal] Support Cake installation by composer 2021-06-12 19:53:04 +02:00
Amaury Leroy 987473a7fe function pushAll -- push all servers 2021-05-19 14:59:23 +02:00
Amaury Leroy c34d320186 function cacheServerAll -- cache all server 2021-05-19 14:55:19 +02:00
Jakub Onderka a1212f2df6 new: [log] LogShell 2021-05-03 13:44:44 +02:00
Jakub Onderka ad1b373766 new: [log] Audit log 2021-05-03 13:44:44 +02:00
iglocska 0d348bfd01
new: [Correlations] Added cached toplist
- stored via zset in redis
- very fast, but needs to be generated
- generation background processed
2021-04-27 00:40:40 +02:00
iglocska 823a870ca0
Merge branch 'develop' of github.com:MISP/MISP into develop 2021-04-25 17:54:53 +02:00
iglocska 5622546d5d
new: [correlations] added new background task for correlating individual values 2021-04-25 17:40:41 +02:00
Andras Iklody 6734e9d30e
Merge pull request #7366 from righel/allow-cake-cli-set-null-settings
fix: allow setting org_id=0 via cake console, add --force option
2021-04-23 15:08:34 +02:00
Luciano Righetti da0f9c4148 fix: allow setting org_id=0 via cake console, add --force option to force settings. 2021-04-23 12:01:07 +02:00
mokaddem 7675427170
new: [galaxyCluster:wipe_default] New endpoint to wipe out all default clusters 2021-04-21 12:53:05 +02:00
mokaddem eb0db3226e
new: [Console] New API shell to create API documentation from RestResponseComponent 2021-04-01 11:13:51 +02:00
Jeroen Pinoy 70a28372f3 new: [cli] enable all tags for a taxonomy 2021-03-24 20:36:51 +00:00
mokaddem d7de209623
fix: [command:admin] UpdateTaxonomies provides correct feedback
Fix #7132
2021-03-24 11:34:50 +01:00
Matjaz Rihtar d76a066ccb
fix: [shells] Additional command line help 2021-03-19 19:09:50 +01:00
Matjaz Rihtar 93b2355260
fix: [shells] Fixed/improved command line help 2021-03-18 23:45:20 +01:00
Jakub Onderka 683e52702d new: [sync] When saving sightings, push just new sightings 2021-03-14 09:28:15 +01:00
Jakub Onderka d989759211
Merge pull request #7191 from JakubOnderka/create-no-need
fix: [internal] Remove unnecessary create call
2021-03-11 12:14:16 +01:00
Jakub Onderka a748134551 fix: [internal] Remove unnecessary create call 2021-03-11 12:03:00 +01:00
Jakub Onderka 3f12e95571 new: [test] Alert email generating 2021-03-06 12:03:53 +01:00
Jakub Onderka 29040c4f1c new: [email] New setting `MISP.event_alert_metadata_only` 2021-03-06 10:39:16 +01:00
Jakub Onderka d523025b6d new: [email] Command for testing generated alert email 2021-03-06 10:39:16 +01:00
iglocska 78a48ddc87
new: [server shell] list servers, fixes #7115
- simple human readable listing
- kept the old weird JSON producing listServers intact
2021-03-03 00:30:35 +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
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
Jakub Onderka a5ff4d40bf fix: [CLI] Check user existence 2021-02-08 08:26:49 +01:00
mokaddem e93526c19e
chg: [console:admin] Improved feedback when updating object templates. Fix #6715 2021-01-22 10:49:33 +01:00
iglocska b8823b86e2
new: [correlation] added system to exclude certain values from the correlation engine
- simply add values at /exclude_correlations
- new values coming in will not correlate if they trip over the values listed there
- to remove existing correlations run the cleaner tool on the above endpoint

- values can be 1:1 matches, or substring searches (denoted with a leading, ending, or both '%')
  - https://www.google.com/%  will match anything starting with https://www.google.com/
  - %google.com% will match anything that contains google.com
2021-01-07 09:31:38 +01:00
iglocska b9d69bc2e3
fix: [statistics] Local org flag fixed to show the correct count 2020-12-18 12:23:09 +01:00
iglocska bd303874ca
fix: [mistake in a comment fixed] 2020-12-18 12:22:31 +01:00
iglocska db2c92b591
new: [Statistics shell] Added new statistics shell
- (R)etrieval (o)f (m)etrics (m)atrix (e)xtended (f)or (s)tatistics

- run it via /var/www/MISP/app/Console/cake Statistics rommelfs
2020-12-18 12:15:57 +01:00
Jakub Onderka 4d0daf6981 new: [CLI] Import events with compressed file support
Useful for importing big files
2020-12-09 17:06:04 +01:00
mokaddem 150b4cb7d1
Merge remote-tracking branch 'origin/2.4' into galaxy-cluster2.0 2020-11-09 10:07:43 +01:00
iglocska 3c8b9c0fe4
chg: [statistics shell] yearly growth now takes a local only flag as parameter 2020-10-25 09:11:45 +01:00
iglocska ecda5c3f7b
new: [statistics shell] year over year org growth added 2020-10-25 09:06:24 +01:00
iglocska adea237af3
chg: [statistics shell] added org engagement function to get insights on first event creation 2020-10-25 08:36:28 +01:00
Jakub Onderka 49660255fe new: [av] Malware protection for uploaded files 2020-10-22 16:38:07 +02:00
Jakub Onderka 46ba51a32e new: [sync] Show client certificate info in connection test 2020-10-19 09:57:06 +02:00
iglocska 79394d0933
fix: [CLI] missing ; 2020-10-01 15:28:24 +02:00
Richard van den Berg bb8981353b chg: [Shell] Add MISP.osuser for updates. Fix #6368 2020-10-01 13:47:51 +02:00
mokaddem eb84b3344f
Merge remote-tracking branch 'origin/2.4' into galaxy-cluster2.0 2020-09-22 12:08:12 +02:00
Jakub Onderka d88cc19a21 chg: [mail] Simplified mail generation 2020-09-21 13:17:00 +02:00
Jakub Onderka 76b2a51253 fix: [ACL] Permissions when sending contact and alert emails 2020-09-21 13:17:00 +02:00
mokaddem ca61d45441
chg: [event] Forced usage of worker for event recovery 2020-09-16 10:33:05 +02:00
Golbark 3a0bedb104 chg: [internal] Using Allowedlist instead of Whitelist 2020-09-01 16:28:20 +02:00
mokaddem 28890d0ee7
fix: [serverShell:cacheFeeds] Correct usage of __n function. Fix #6238 2020-09-01 08:42:13 +02:00
Vito Piserchia 850034ecc0 recover from upstream version missing bits 2020-08-17 17:57:30 +02:00
Vito Piserchia 7da8b32ada rebase continue 2020-08-17 17:25:02 +02:00
Jakub Onderka 1714c086b6 fix: [cli] Show error when invalid user ID provided 2020-08-12 18:32:12 +02:00
Jakub Onderka e4b061c744 fix: [security] Respect ACL for freetext import 2020-08-05 17:37:05 +02:00
iglocska 69c3234005
fix: [administration] added missing column 2020-07-29 18:30:31 +02:00
iglocska 1c22d5e514
fix: [administration] fixed var name 2020-07-29 18:29:21 +02:00
iglocska 32166db089
new: [administration] lightweight slow query log analysis added
usage: /var/www/MISP/app/Console/cake Statistics analyse_slow_logs [path_to_slow_log]
2020-07-29 18:17:27 +02:00
mokaddem afbf870e16
fix: [feed:importFreeText] Make sure to update the timestamp when soft-deleting after delta-merge
Fix #6013
2020-07-21 12:13:59 +02:00
mokaddem ad81c60986
Merge branch '2.4' of github.com:MISP/MISP into galaxy-cluster2.0 2020-07-21 08:09:25 +02:00
Jakub Onderka 9e8353971f
Merge pull request #6065 from JakubOnderka/job-progress
chg: [internal] Better job progress and status logging
2020-07-19 15:43:09 +02:00
mokaddem f3a9481c61
Merge remote-tracking branch 'origin/2.4' into galaxy-cluster2.0 2020-07-01 16:22:55 +02:00
Alex Resnick 673edb1e44 Allow you to mannually set the API key for automation purposes 2020-06-30 20:22:26 -05:00
Jakub Onderka f0fa71627d chg: [internal] Better job progress and status logging 2020-06-28 09:06:27 +02:00
mokaddem b54edc0c3a
new: [galaxyCluster:publish] Upon publishing, push the cluster to remote
servers
2020-06-26 15:48:50 +02:00
iglocska a2c4b5ae38
chg: [statistics shell] added total commit count 2020-06-23 21:08:59 +02:00
iglocska 28048871b7
new: [statistics] shell added for the git codebase's contributor counters
- to be extended with other similar tasks
2020-06-23 21:05:08 +02:00
mokaddem e48763a1c1
chg: [server:pull] Improved pull process for galaxyClusters 2020-06-10 09:37:25 +02:00
Jakub Onderka fdb7f1d78b new: [cli] Command for pulling from all remote servers 2020-06-09 10:19:22 +02:00
mokaddem ff7ef393c5
fix: [EventShell:enrichment] Improved reporting of error messages 2020-06-05 07:46:46 +02:00
Steve Clement 031565de46
fix: [www] webserver user is www on OpenBSD 2020-06-01 14:33:38 +09:00
mokaddem dcd3664bba
Merge branch '2.4' of github.com:MISP/MISP into pr-5256 2020-05-18 14:14:51 +02:00
mokaddem 944b613a19
Merge branch '2.4' of github.com:MISP/MISP into pr-5856 2020-05-18 09:22:46 +02:00
iglocska 15d6c30649
new: [sync] (for now) undocumented force pull added
- can only be triggered via the CLI for now
- usage: /var/www/MISP/app/Console/cake Server pull [user_id] [server_id] [technique] [force]
  - the force flag has to be passed as 'force' to avoid accidentally triggering it

- What it does:
  - pulls ignoring the timetamp differences
  - this means that even older states of events, attributes, objects are ingested
  - useful for when wanting to reset an event / all events to align with an upstream server
- Caveats:
  - attributes added on the low side are maintained
  - tags added on the low side are maintained
  - keep in mind this WILL override attributes that are soft deleted
2020-05-14 09:34:49 +02:00
Jakub Onderka 94b36c9259 chg: [feed] Provide more info when caching feeds about failures 2020-05-11 15:00:52 +02:00
Jakub Onderka a0476bda3d new: [internal] Do not log auhtkeys 2020-05-04 15:13:17 +02:00
mokaddem d71b9a9dc6
fix: [Console:Server] Added `configLoad` task. Fix #5793 2020-04-27 11:51:04 +02:00
mokaddem 27ac2aa05f
fix: [console:admin] getSetting can be used to retrieve all settings 2020-04-06 13:57:55 +02:00
iglocska 93d26f8789
new: country galaxy generator 2020-03-23 12:08:27 +01:00
iglocska 9f3f50544f
fix: [CLI] change authkey description fixed 2020-03-02 23:02:57 +01:00
iglocska eb6b260c5e
fix: [CLI] allow for calling the update via the CLI without passing a process ID 2020-02-26 16:18:37 +01:00
iglocska 363d0cd69a
new: [logging] Log user IPs on login
- feature is optional and needs to be enabled in the server settings
- on successful login logs the associated user ID for a given IP (30 day retention)
- also logs the IP for the associated user ID (indefinite retention)
- added two command line tools to query
  - Get IPs For User ID: MISP/app/Console/cake Admin UserIP [user_id]
  - Get User ID For User IP: MISP/app/Console/cake Admin IPUser [ip]
2020-02-20 16:07:10 +01:00
iglocska 5a29964924
chg: [cleanup] Taking out the trash
- old unused functions removed
2020-02-10 16:10:55 +01:00
iglocska af881189e5
new: [config load task] Added a task that will reload the settings on any console shell execution, fixes #5498
- helps with background workers being forced to fetch new settings whenever they start a new job
2020-02-10 15:15:59 +01:00
iglocska 46c3968755
fix: [internal] cleanup of unused line 2020-01-31 11:46:32 +01:00
iglocska 4806652448
fix: [API] several fixes to the Bro API
- always use flatten:1 to also include object attributes
- fix the generated full export to only include the header once
2020-01-31 11:45:23 +01:00
Jakub Onderka c4db35bbf8
fix: [CLI] Die if setting name is not correct 2020-01-27 10:12:36 +01:00
mokaddem 0b1c71e1d9
chg: [dbschema] Pretty print db_schema and removed Object.comment and
ShadowAttr.comment from the index list
2020-01-23 11:48:47 +01:00
mokaddem 4100af2a30
chg: [console:server] Stop execution if user does not exists 2020-01-22 16:07:59 +01:00
Sami Mokaddem c628375e96
fix: [serverShell] Stopped usage of reserver keyword
Renamed function name to let PHP 5.x parse the shell script correctly
2020-01-21 14:05:22 +01:00
mokaddem 7be275aced
chg: [diagnostic:DBIndexes] Cleanup, bug fix and updated db_schema 2019-12-18 16:21:13 +01:00
mokaddem 637e2806ef
new: [diagnostic:DBIndexes] Added complete diagnostic for database
indexes
2019-12-18 15:53:20 +01:00
iglocska 34f1031188
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-12-16 13:20:59 +01:00
iglocska 0d3e4dbf46
fix: [CLI] updateObjectTemplates handles fetching the user correctly now 2019-12-16 13:20:19 +01:00
Sami Mokaddem 2be36fb611
chg: [Console:admin] Allow `travis` user to bring the database up to date 2019-12-16 12:46:37 +01:00
iglocska b3771f3913
fix: [CLI] invalid variable used for server caching log entry 2019-12-10 09:24:56 +01:00
Andras Iklody add02eb29a
Merge pull request #5280 from vpiserchia/fix-feed-cli
Server shell: use the right array key
2019-11-26 19:30:58 +01:00
Richard van den Berg dd963c2e21 Sync sightings on push, pull and push on add 2019-11-22 21:53:51 +01:00
StefanKelm 79ad82f58b
Update AdminShell.php
Adding "wwwrun" as a user since it is common under SUSE Linux
2019-11-21 10:31:06 +01:00
mokaddem d63f81076b
Merge branch '2.4' of github.com:MISP/MISP into revisedUpdateProcess 2019-10-30 13:58:43 +01:00
mokaddem 0087a49fcc
chg: Usage of camelCase instead of snake_case 2019-10-29 09:57:25 +01:00
Jan Skalny 0ef0cf49cb new: [cli] server connectivity test 2019-10-22 20:13:11 +02:00
mokaddem 80b1061639
Merge branch '2.4' of github.com:MISP/MISP into revisedUpdateProcess 2019-10-10 09:54:51 +02:00
Vito Piserchia 3190ff88ea Server shell: use the right array key 2019-10-08 09:30:24 +02:00
Jakub Onderka 4db9553f16
fix: [iternal] Remove unused method EventShell::__recursiveEcho 2019-10-06 21:06:06 +02:00
mokaddem c8a1f85909
chg: [dbSchemaDiagnostic] Added `db_schema.json` and `dumpDBSchema.sh` 2019-10-01 16:12:10 +02:00
mokaddem 6fd52393b7
chg: [update] Added new worker type `update` to perform updates 2019-10-01 13:36:37 +02:00
mokaddem ae5d900b40
chg: [update] Keep track of update number in job - WiP 2019-09-30 15:31:49 +02:00
mokaddem 900317d5fe
Merge remote-tracking branch 'origin/2.4' into revisedUpdateProcess 2019-09-30 10:40:01 +02:00
Jakub Onderka bd9d65a2a1
fix: [shell] Update updateWarningLists from CLI 2019-09-27 14:18:35 +02:00
mokaddem 84290eaae6
chg: [dbSchemaDiagnostic] Added support of db_version 2019-09-26 15:20:32 +02:00
mokaddem c72f04dd90
Merge branch '2.4' into revisedUpdateProcess 2019-09-26 12:13:49 +02:00
iglocska 3240a6cac4
new: [CLI] Added cleanup tool to purge all events related to a feed
- Simply run /var/www/MISP/app/Console/cake Admin purgeFeedEvents [user_id] [feed_id]
- works for CSV/Freetext feeds
2019-09-13 10:48:43 +02:00
iglocska 75acd63c46
fix: [security] Fix to a vulnerability related to the server index
- along with various support tools
- more information coming soon
2019-09-09 13:00:21 +02:00
mokaddem 91768dc881
Merge branch '2.4' of github.com:MISP/MISP into revisedUpdateProcess 2019-09-09 11:42:03 +02:00
Jakub Onderka 7d438673c1 chg: [feed] Handle exceptions for ServerShell::enqueueFeedCache 2019-09-02 20:37:18 +02:00
Jakub Onderka de2b143748 chg: [feed] Better error handling for cacheFeedInitiator method 2019-09-02 19:52:41 +02:00
Bechkalo Evgeny 9cf2ef3a46 fix: more issues with PostgreSQL
- fixed error during update Job date_modified field (SQLSTATE[22008]:
Datetime field overflow: 7 ERROR:  date/time field value out of range)
- fixed error during fetching events while updating from feeds (
SQLSTATE[42P01]: Undefined table: 7 ERROR: missing FROM-clause entry for
table events)
- fixed Feed edit view with wrong boolean forms (combobox instead
checkbox)
2019-08-29 18:36:47 +03:00
mokaddem 5c3f2a8c80
chg: [update] Update function name are more explicit 2019-08-14 12:26:54 +02:00
mokaddem 0fe9b490b8
Merge branch 'workerForDBUpdate' into revisedUpdateProcess 2019-08-14 12:14:39 +02:00
iglocska e8dd0e536f
chg: [CLI] server shell -> push now allows passing the event ID to push
- also, changed tabs to spaces
2019-08-08 11:18:21 +02:00
iglocska c6c8dc1696
new: [CLI] Added cleanCaches command 2019-08-01 15:15:20 +02:00
Andras Iklody 6248ae6121
fix: [CLI] Response after a CLI pull threw notice error
Proposal pull now returns int instead of a list of proposals, meaning that count($data) was trying to count an int.
2019-07-16 13:29:31 +02:00
iglocska ce7dc6ecb0
fix: [CLI] admin->setDatabaseVersion fixed 2019-07-08 15:46:29 +02:00
chrisr3d 543dc04d7a Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-05-23 14:45:07 +02:00
iglocska 1c9cf7f484
fix: [upgrade process] For the recovery script, also take "failed" upgrades into account
- not all update script errors are actual failures, some insertions of table rows that already exist to resolve potential previous update issues would otherwise not be flagged
2019-05-22 11:01:46 +02:00
chrisr3d 11da6855ce Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-05-10 16:22:51 +02:00
mokaddem 8418e89c7f fix: [update] Started changing worker place in the update process 2019-05-08 15:07:26 +02:00
mokaddem e6b8f32729 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-05-08 11:59:07 +02:00
mokaddem 3d74ce99ef chg: [adminShell] Added recovery function to replay updates
It fetches the last successful DB update number in the log, then
re-apply all of them up to the latest available.
2019-05-08 11:51:26 +02:00
Steve Clement 44e5f940a2 fix: [AdminShell] Yet another tyope :( 2019-05-08 17:44:15 +09:00
Steve Clement db0fb9432e fix: [AdminShell] Fixed typo 2019-05-08 17:41:28 +09:00
Steve Clement 5844d2534d fix: [AdminShell] Added apache user 2019-05-08 17:21:29 +09:00
Steve Clement 95bfb9783f Merge branch '2.4' into tools 2019-05-08 17:20:33 +09:00
Steve Clement 968035c218
fix: [AdminShell] very dirt fix to get updateObjectTemplates working (#4585)
fix: [AdminShell] very dirt fix to get updateObjectTemplates working
2019-05-08 09:14:48 +09:00
Steve Clement b7ccee7e72 chg: [AdminShell] Some comments on current state of bugs 2019-05-08 09:13:59 +09:00
Steve Clement c6f26909b3 chg: [AdminShell] Let's at least tell what ID was not found. 2019-05-08 09:12:18 +09:00
Steve Clement 9280cc736b fix: [AdminShell] very dirt fix to get updateObjectTemplates working from the CLI 2019-05-08 09:09:41 +09:00
chrisr3d e3788408f7 Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-05-07 10:09:29 +02:00
Steve Clement ef4c99d964 fix: [AdminShell] Misplaced the debug message. 2019-05-07 11:31:26 +09:00
Steve Clement 536d199a21 chg: [AdminShell] Let the user know as which user he exectued the script. 2019-05-07 11:24:09 +09:00
Steve Clement 022a3c9d9f fix: [AdminShell] CentOS/RHEL use 'apache' by default. 2019-05-07 11:22:31 +09:00
chrisr3d 34092b599f Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-05-02 11:57:29 +02:00
Steve Clement 3e58ecadcb
Merge pull request #4556 from SteveClement/tools
chg: [AdminShell] return the name of the setting change and what we changed it to
2019-05-01 22:30:21 +09:00
Steve Clement 9bccd93826 chg: [AdminShell] Adde PHP_EOLs where it made sense. (QoL enhancement) 2019-05-01 22:27:38 +09:00
Steve Clement 082cf53225 chg: [AdminShell] return the name of the setting change and what we changed it to. 2019-05-01 13:47:44 +09:00
mokaddem 47e13c8369 chg: [updates] Implented changes requested by the PR's review #4534. 2019-04-29 11:09:04 +02:00
mokaddem ee735f00d4 new: [update] Injected update-related files/changes from zoidberg 2019-04-26 09:45:03 +02:00
chrisr3d 937b7cf484
fix: [cleanup] Fixed indentation 2019-04-24 08:50:33 +02:00
chrisr3d fdc726e609 Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-04-12 23:53:00 +02:00
iglocska b2da4b789c fix: [CLI] Worker start script reverted
- new script moved to start_dynamic.sh
- stuck workers could not be restarted
2019-04-10 16:17:13 +02:00
chrisr3d 16ade8856c Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-04-10 13:27:29 +02:00
iglocska 29598c2475 new: [API] Update JSON exposed to the API 2019-04-10 10:09:25 +02:00
iglocska e549179e43 chg: [CLI] line-break added at the end of execution 2019-04-10 08:50:25 +02:00
iglocska e175433ecd fix: [merge] issue 2019-04-10 08:40:03 +02:00
iglocska f52f847445 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-04-10 08:36:16 +02:00
iglocska bc98a44c58 new: [CLI] Update all JSON structures in one shot 2019-04-10 08:29:28 +02:00
Steve Clement 356a4636d5
Merge branch '2.4' into submoduleUpdatev4 2019-04-10 13:15:35 +09:00
chrisr3d b47626c970 Merge branch '2.4' of https://github.com/MISP/MISP into rework_modules 2019-04-09 21:07:42 +02:00
iglocska 90fc9f26c2 new: [CLI] Worker management added
- Added a more exhaustive worker management CLI script package
  - list workers
  - start a worker
  - restart a worker
  - kill a worker
2019-04-09 13:32:35 +02:00
chrisr3d 7b4c09a249
wip: [enrichment] Capturing objects & attributes 2019-04-08 19:07:13 +02:00
chrisr3d d13d898f7a
fix: [cleanup] Fixed indentations 2019-04-08 18:57:41 +02:00
iglocska 79aed910a9 new: [CLI] reset / set a user's API key via the CLI 2019-04-07 16:24:44 +02:00
iglocska b1816c678d new: [CLI] Change password with the --override_password_change (or -o) flag to avoid forcing a password reset 2019-04-06 20:44:45 +02:00
mokaddem 95bdff2093 chg: [diagnostic:submodule] continued sync DB after pull done - WiP 2019-04-05 16:04:22 +02:00
mokaddem fe00c4d193 chg: [diagnostic:submodule] Started integration of update DB after pull
with workers
2019-04-05 14:28:19 +02:00
iglocska aaf6738064 new: [CLI] Set default role via the CLI 2019-04-04 16:35:27 +02:00
iglocska b6cbd47d10 fix: [Training] Further fixes 2019-04-02 13:50:14 +02:00
iglocska 3a729061a4 fix: [Training] typos fixed 2019-04-02 13:47:03 +02:00
iglocska fa133114b4 fix: [Training] Fixed user password reset remotely 2019-04-02 12:07:47 +02:00
iglocska 538daa389b fix: [Training] Minor fixes 2019-04-02 11:48:47 +02:00
iglocska f05acd1def fix: [Training] org name vs id mixup fixed 2019-04-02 11:46:51 +02:00
iglocska 9dd5b6fc03 fix: [Training] Further tuning 2019-04-02 11:45:26 +02:00
iglocska ed12caef5d fix: [Training] Further error handling 2019-04-02 11:43:14 +02:00
iglocska f441ce87d7 fix: [Training] added more debugging 2019-04-02 11:33:27 +02:00
iglocska 456fdc9a8a fix: [Training] host org fixed 2019-04-02 11:08:00 +02:00
iglocska ca3d23dbe1 fix: [Training] Org ID for sync users fixed 2019-04-02 10:58:43 +02:00
iglocska 4bbe7f1cd2 fix: [Training] small fixes 2019-04-02 10:53:15 +02:00
iglocska 3bf3cca970 new: [CLI] Added restartworkers and update MISP 2019-04-02 10:18:00 +02:00
iglocska a4163d057e fix: [Training] Fix to the setup script 2019-04-02 09:27:42 +02:00
iglocska 43f0010cab fix: [Training] Some clarifications 2019-03-17 12:13:23 +01:00
iglocska 136019e681 fix: [Training] Function extraction fail
- Shame. Shame. Shame.
2019-03-17 11:03:35 +01:00
iglocska ef6c5045a9 fix: [Training] Invalid user input capture fixed 2019-03-17 10:56:07 +01:00
iglocska b207489616 chg: [Training] Further cleanup and interactive mode
- splitting of some nastier unreadable functions
- added interactive mode
2019-03-17 10:43:11 +01:00
iglocska a8d4d15cff fix: [training] Added created sync users to the reporting 2019-03-16 20:52:41 +01:00
iglocska bdbba8d009 fix: [Training] Interesting link
- Someone just told us about fmylife.com - if this day continues like this I might have to post there about the development
2019-03-14 14:28:49 +01:00
iglocska b1f37257c6 fix: [training] Inverse conditional fixed 2019-03-14 14:26:20 +01:00
iglocska 8c4dc4275a fix: [Training] Duplicate user add handling 2019-03-14 14:20:49 +01:00
iglocska 975f09de6e fix: [Training] Handle sync connections failing to be saved better 2019-03-14 14:18:24 +01:00
iglocska 7bf2968785 fix: [training] Small fix 2019-03-14 14:13:42 +01:00
iglocska 3eafffad4e fix: [training] fixes to the org creation 2019-03-14 14:10:51 +01:00
iglocska b74728bdd0 chg: [Training script] Improvements
- Create reverse sync accounts/link on demand
- Create admin users for the player teams on demand
- Some minor fixes
2019-03-14 13:15:41 +01:00
iglocska eaf71ef6eb fix: [Training] Cause I'm a lumberjack and I'm ok 2019-03-13 18:06:31 +01:00
iglocska 0e76537f7a fix: [Training] AAARGH 2019-03-13 17:31:07 +01:00
iglocska af8f730ebf fix: [training] Further work on the script 2019-03-13 17:27:20 +01:00