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

392 Commits (a61caa3a6a541e6f9761ae99c033c7457050bc0b)

Author SHA1 Message Date
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 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 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