MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
21,626 Commits
34 Branches
364 Tags
187 MiB
Commit Graph

1043 Commits (3e706867e93973fae3e84e74080268ced30ddc58)

Author SHA1 Message Date
iglocska 3e706867e9
new: [emailing] add custom templates to override existing ones 
- currently implemented for event publish alerts and user enrollment (password_reset.ctp, alert.ctp)
- simply place the new templates in MISP/app/View/Emails/[text|html]/Custom
 2022-04-15 16:28:36 +02:00
Jakub Onderka 9d8fc81678 chg: [internal] Throw exception if Redis class not found 2022-03-19 12:31:55 +01:00
Jakub Onderka f208c656ea chg: [cryptograhicKey] Simplified code for event pushing 2022-03-17 13:58:25 +01:00
iglocska 20fffac92b
chg: [signing validation] re-added to the new ServerSyncTool 2022-03-17 01:44:33 +01:00
iglocska e8dcb31623
Merge branch 'feature/protected_mode' into develop 2022-03-17 01:43:44 +01:00
iglocska 8eff854fce
fix: [signing validation] use the existing event rather than the incoming event for edits 
- the ground truth for allowing edits is in the LOCAL version of the event
- prevents tampering attempts

- also cleanup of repetive file upload code
 2022-03-17 00:41:55 +01:00
iglocska d49eca93ea
Merge branch 'feature/protected_mode' of github.com:MISP/MISP into feature/protected_mode 2022-03-16 01:34:19 +01:00
iglocska f6b5c7b7e3
chg: [gpgtool] validateGpgKey now also imports the key 2022-03-16 01:29:44 +01:00
iglocska c33230c2cd
Merge branch '2.4' into feature/protected_mode 2022-03-15 23:49:06 +01:00
iglocska 364eaa50c2
new: [event warnings] made modular 
- app/Lib/EventWarning contains default warnings
- app/Lib/EventWarning/Custom can be used to just drop event warnings
- use app/Lib/EventWarning/DefaultWarning as a template
 2022-03-15 09:30:56 +01:00
iglocska 2cfa89d492
chg: [tmpfiletool] allow reading into string without closing the file 2022-03-14 00:31:36 +01:00
iglocska cd3efdf225
chg: [JSONconvertertool] include cryptographic key 2022-03-13 15:12:05 +01:00
Jakub Onderka cac0e81001
Merge pull request #8154 from JakubOnderka/server-sync-push 
chg: [sync] Use ServerSyncTool for pushing events
 2022-03-12 13:19:54 +01:00
Sami Mokaddem 21997abc52
fix: [exports:context] Removed spaces 2022-03-10 09:45:47 +01:00
Sami Mokaddem b6c730f8f4
chg: [events:restSearch] Added `context-markdown` export format 2022-03-09 17:49:34 +01:00
Sami Mokaddem f08d29f1e7
Merge branch 'develop' of github.com:MISP/MISP into develop 2022-03-08 13:40:37 +01:00
Sami Mokaddem 155bf23776
new: [events:restSearch] Added `context` export format 
The `context` export format includes:
- List of used taxonomies
- List of used galaxy cluster
- List of custom tags
- Mitre Att&ck matrix
 2022-03-08 13:40:15 +01:00
Jakub Onderka a60825cbcc fix: [bgjobs] Try to avoid deadlock 2022-02-23 16:05:41 +01:00
Jakub Onderka 0cde5744c6 fix: [bgjobs] First read STDERR, then STDOUT 2022-02-23 16:05:41 +01:00
Jakub Onderka 4959173af6 fix: [bgjobs] Try to close pipes before proc_close 2022-02-23 16:05:41 +01:00
Jakub Onderka 4d9543d00a new: [bgjobs] Allow to set Redis read timeout 2022-02-23 16:05:41 +01:00
Jakub Onderka b32f397949 fix: [internal] CIDR validation 2022-02-23 10:10:57 +01:00
Jakub Onderka 330aa12313 chg: [sync] Use ServerSyncTool for pushing events 2022-02-20 13:56:13 +01:00
iglocska 607de3683c
fix: [tmpdir] default reverted to MISP/app/tmp 
- too many access errors for users with /tmp as the default
 2022-02-09 09:18:02 +01:00
chrisr3d 6263d4079f Merge branch '2.4' of https://github.com/MISP/MISP into develop 2022-02-01 14:10:19 +01:00
chrisr3d c7d25dcdba
fix: [stix export] Fixed wrong indentation causing variable name errors 2022-02-01 14:08:33 +01:00
Jakub Onderka 2f33b4ad3d new: [UI] Show TLS version for server test 2022-01-22 11:39:49 +01:00
Jakub Onderka 92546d12ff new: [security] Check TLSv1.3 connection 2022-01-22 11:39:49 +01:00
Jakub Onderka 6159a74c88 chg: [connection] Allow to define onConnect callback 2022-01-21 10:18:23 +01:00
Jakub Onderka f32c526bbe new: [security] Allow to specify min_tls_version 2022-01-21 10:18:22 +01:00
Jakub Onderka 3dbddfd9b9 new: [security] securityAuditTls 2022-01-20 16:08:50 +01:00
Jakub Onderka ca58c2467f new: [CLI] Security audit 2022-01-20 10:53:45 +01:00
Jakub Onderka 203cfb2caa
Merge pull request #8065 from fandigunawan/2.4 
fix: Removes debug print in AWS S3 Client
 2022-01-11 13:52:57 +01:00
Andras Iklody 51e461f44b
Merge pull request #8067 from righel/issue-8064 
fix: supervisord_status showing as a worker when its not
 2022-01-11 10:17:55 +01:00
Jakub Onderka 03d8eb3d66
Merge pull request #8069 from JakubOnderka/security-audit-old-os 
chg: [security] Warn about unsupported OS
 2021-12-30 16:40:34 +01:00
Jakub Onderka 66f66d7a3c chg: [security] Warn about unsupported OS 2021-12-30 15:13:47 +01:00
Jakub Onderka 50d284b643
Merge pull request #7986 from JakubOnderka/better-security 
chg: [internal] Do not modify session when not necessary
 2021-12-30 14:40:01 +01:00
Luciano Righetti 6af197693e fix: supervisord_status showing as a worker when its not 2021-12-30 09:55:52 +01:00
Fandi Gunawan 1591fee9ff
Removes debug print 2021-12-30 02:02:38 +07:00
Luciano Righetti a809b7b1c9 fix: unix timestamps should have a @ prefix 2021-12-28 16:50:08 +01:00
Luciano Righetti 40f83a0329 fix: unix timestamps should have a @ prefix 2021-12-28 16:46:11 +01:00
Richard van den Berg 1593fc1be4 fix: make SimpleBackgroundJobs work on RHEL 7 with supervisorphp/supervisor:^3.0 2021-12-24 11:59:45 +01:00
iglocska 76a0f0617a
chg: [security audit] fixed failures on kernel compilation time 
- currently the check makes a lot of invalid assumptions, made it more lax to fail gracefully
 2021-12-22 13:00:12 +01:00
chrisr3d f796071d64
Merge branch 'develop' of https://github.com/MISP/MISP into develop 2021-12-20 12:05:42 +01:00
Jakub Onderka d9cc0e8205
Merge pull request #8028 from JakubOnderka/json-convertor-static 
chg: [internal] Make JSONConverterTool method static
 2021-12-17 18:02:05 +01:00
Sami Mokaddem f6038f9cc8
Merge branch 'develop' of github.com:MISP/MISP into feature-sync-type-filtering 2021-12-17 15:24:56 +01:00
Sami Mokaddem 042e1b296a
fix: [tools:timeline] Usage of correct UUID and disabled polling extrapolation 
This half baked feature was making thing confusing for the users. If we ever need it implemented it should be something more robust and configurable.
 2021-12-17 11:36:41 +01:00
Jakub Onderka f9eeeed4fe chg: [internal] Make JSONConverterTool method static 2021-12-14 22:35:50 +01:00
chrisr3d 9c76b9ecfa
fix: [stix export] Added parameters to the temporary files deleting function 
- Can delete output files when we get an exception
  from the python scirpt
- Can delete a specific list of files that are not
  suffixed with a '.out' extension, like it is the
  case for attributes collections export as STIX 1
 2021-12-14 01:54:18 +01:00
chrisr3d bcb6f8d5e3
fix: [stix export] Removed unused variables 2021-12-14 01:53:44 +01:00