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

14590 Commits (4b72d6f3db16c75112c1291df4e552a96fc19828)

Author SHA1 Message Date
iglocska 9913d194fa
fix: [correlations] fix to an issue where attribute edits could purge correlations 
- bug introduced by a merge gone wrong
- attribute edits that modify fields that do not affect the correlations (such as to_ids, comment, etc) would cause correlations to be purged
 2020-02-26 14:28:29 +01:00
iglocska ca6a984992
chg: [UI] show customauth header 2020-02-25 17:47:49 +01:00
iglocska 4668cbadb5
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-02-25 16:49:05 +01:00
iglocska aaafd95c74
fix: [sync] allow for both the minimal and searchminimal keywords to be used on the event index 
- until now due to a bug only searchminimal was used
- sync negotiation uses minimal as the key
- this should greatly speed up the negotiation phase
 2020-02-25 16:48:05 +01:00
Raphaël Vinot c8966246cb
:magic: 2020-02-23 22:40:22 +01:00
iglocska d8afa98736
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-02-23 19:14:23 +01:00
iglocska c310b30177
fix: [custom auth] correctly use HTTP_ as the default header namespace 2020-02-23 19:13:48 +01:00
mokaddem 980dbf557e
fix: [decaying:tool] Support strict sql mode while fetching available 
Object type
 2020-02-21 16:33:34 +01:00
mokaddem f94c693aa0
fix: [decaying] Attributes not having a DM associated will be defaulted 
as `not decayed`
 2020-02-21 14:47:52 +01:00
mokaddem 49ef787a34
fix: [eventGraph] Request picture for valid attachement only 2020-02-21 14:42:20 +01:00
mokaddem 782ba603c5
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-02-21 08:50:49 +01:00
mokaddem 1e7f0d5c5a
fix: [server:edit] Prevent undefined variable 2020-02-21 08:26:20 +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
Steve Clement c35f5c34dc
Merge pull request #5659 from SteveClement/misp-dash 
fix: [dash] Dashboard not working at the moment
 2020-02-20 14:56:55 +08:00
Steve Clement 3bca484307
fix: [installer] Some typos 2020-02-20 14:53:49 +08:00
Steve Clement 081ea798c5
Merge branch '2.4' into misp-dash 2020-02-20 11:37:53 +08:00
Steve Clement 45bbf44854
fix: [dash] Dashboard not working at the moment 2020-02-20 11:33:11 +08:00
iglocska 0f632236fa
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-02-19 16:13:30 +01:00
iglocska 2de0e3a941
fix: [enveloping] Fixed typo and added actual event ID to the message saved 
gremmar meestakes are anoying.
 2020-02-19 16:12:23 +01:00
Andras Iklody 49100f626d
Merge pull request #5654 from coolacid/issue-5653 
fix: Force schema columns lowercase to match expected
 2020-02-19 14:31:44 +01:00
Jason Kendall 1647d927e4 fix: Force schema columns lowercase to match expected 2020-02-19 08:16:32 -05:00
Alexandre Dulaunoy 7e8a753651
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-02-19 09:30:54 +01:00
Alexandre Dulaunoy 8131e11cd3
chg: [misp-objects] updated to the latest version 2020-02-19 09:30:19 +01:00
Andras Iklody 42c16351f7
Merge pull request #5647 from coolacid/issue-5598 
Allow forcing tag creation for galaxies
 2020-02-19 09:27:45 +01:00
Jason Kendall 47d0c41a55 Allow forcing tag creation for galaxies 2020-02-18 14:11:54 -05:00
mokaddem 0a605ed4d3
fix: [server:edit] Always echo internal instance notice 2020-02-18 15:04:48 +01:00
Andras Iklody 26fff7f053
Merge pull request #5639 from JakubOnderka/patch-92 
fix: [UI] Correct title for '+' button
 2020-02-18 10:10:45 +01:00
Jakub Onderka 9d0c0c1a6a
fix: [UI] Correct title for '+' button 2020-02-18 09:47:52 +01:00
iglocska 4bf9fd2d8d
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-02-18 09:29:41 +01:00
iglocska c677183069
new: [communities] Added Danish community and some fixes to the community system 2020-02-18 09:29:06 +01:00
Andras Iklody 6776ea2b26
Merge pull request #5612 from coolacid/issue-5611 
Ensure we only have the last line from the shell command
 2020-02-17 08:39:35 +01:00
Andras Iklody 8d36f2af42
Merge pull request #5633 from JakubOnderka/patch-91 
chg: [internal] Removed unused function
 2020-02-16 16:12:48 +01:00
Jakub Onderka cfe18d8c39
chg: [internal] Removed unused function 2020-02-16 14:13:34 +01:00
Andras Iklody 079ecc0b26
Merge pull request #5628 from JakubOnderka/patch-87 
chg: [internal] Little bit faster ssdeep saving
 2020-02-14 15:50:13 +01:00
Andras Iklody 35536267a2
Merge pull request #5631 from JakubOnderka/patch-90 
fix: [pubsub] Do not fetch setting for every push
 2020-02-14 15:49:41 +01:00
Andras Iklody d7a21e95cf
Merge pull request #5630 from JakubOnderka/patch-89 
chg: [mispzmq] Do not create array every 0.1 sec
 2020-02-14 15:48:50 +01:00
Andras Iklody f94f922eba
Merge pull request #5629 from JakubOnderka/patch-88 
fix: [UI] UUID term should be uppercase
 2020-02-14 15:47:58 +01:00
Jakub Onderka 8717c3f1c5
fix: [pubsub] Do not fetch setting for every push 2020-02-14 15:26:49 +01:00
Jakub Onderka 5ef92f5a3f
chg: [mispzmq] Do not create array every 0.1 sec 
Should lead to little bit lower CPU usage
 2020-02-14 15:23:57 +01:00
Jakub Onderka c1d1bd27d0
fix: [UI] UUID term should be uppercase 2020-02-14 15:18:46 +01:00
Jakub Onderka a730dbca66
chg: [internal] Little bit faster ssdeep saving 2020-02-14 15:16:10 +01:00
Andras Iklody ee0f708187
Merge pull request #5623 from stricaud/2.4 
version 2.4.221 + ask about baseurl during package installation
 2020-02-13 19:09:13 +01:00
Andras Iklody a312296403
Merge pull request #5625 from JakubOnderka/patch-86 
fix: [internal] Remove unused function
 2020-02-13 16:07:12 +01:00
Jakub Onderka 3770886bb8
fix: [internal] Remove unused function 2020-02-13 15:57:58 +01:00
Andras Iklody 385b777656
Merge pull request #5149 from JakubOnderka/update-composer 
chg: [internal] Update composer.phar to version 1.9.0
 2020-02-13 14:38:25 +01:00
Alexandre Dulaunoy 2309520508
chg: [objects] updated to the latest version 2020-02-13 13:13:17 +01:00
Sebastien Tricaud 6437d2d8f5 * Adding baseurl as a question when finalizing the package installation. 
* bump to version 2.4.221
 2020-02-12 14:46:22 -08:00
Andras Iklody 413399611e
Merge pull request #5616 from jay-carter/patch-1 
chg: [version] bump
 2020-02-11 14:31:24 +01:00
Andras Iklody f656a6d4d8
Merge pull request #5617 from stricaud/debian 
Adding instructions to build a Debian Package
 2020-02-11 09:44:24 +01:00
Sebastien Tricaud 50d9178662 Remove useless test 2020-02-11 00:40:25 -08:00