MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
2,529 Commits
42 Branches
370 Tags
181 MiB
Commit Graph

2529 Commits (00005bca97e02747e4cc2a9d32b5d503c27c8757)

Author SHA1 Message Date
Iglocska 00005bca97 Merge branch 'master' into feature/sg 
Conflicts:
	VERSION.json
	app/Model/Attribute.php
 2015-07-22 19:30:45 +02:00
Iglocska a7e30bfd55 Merge branch 'hotfix-2.3.100' 2015-07-22 19:28:27 +02:00
Iglocska 616629e9b5 Fixed an issue with the NIDS export not correctly working for single events 2015-07-22 19:27:56 +02:00
Iglocska 47cc0e4d18 Merge branch 'master' into feature/sg 
Conflicts:
	VERSION.json
	app/Model/Attribute.php
	app/Model/Event.php
 2015-07-22 18:04:02 +02:00
Iglocska 9e547cae70 Updated MYSQL.sql 2015-07-22 17:19:23 +02:00
Iglocska 1bf2995f4e Merge branch 'master' into feature/sg 
Conflicts:
	VERSION.json
 2015-07-22 17:19:13 +02:00
Iglocska c6e4b2dc61 Merge branch 'hotfix-2.3.99' 2015-07-20 16:28:28 +02:00
Iglocska 684be69ed0 Incremental export generation for HIDS and NIDS exports 
- Instead of fetching all events at once for the export, events are fetched one by one
- Greatly reduces memory footprint (It mostly depends on the event with the most eligible attributes now, instead of the combined list of all events)
- Because of the lower memory usage, the time taken for the export is also slashed to a fragment of what it was before
 2015-07-20 16:25:16 +02:00
Iglocska f628861f2c Merge branch 'hotfix-2.3.98' 2015-07-17 15:43:24 +02:00
Iglocska 265088a0ea Merge branch '570' into hotfix-2.3.98 2015-07-17 15:09:27 +02:00
Iglocska b089cf077f Some changes to the workers 
- some fixes with the previous iteration of the background workers
- PID now checked using ps -p instead of looking for it in /proc
 2015-07-17 15:06:38 +02:00
Iglocska 93f9a01c87 Changes to the hids exports 
- fixed some issues with unset variables (from, to, last) when triggered by the background workers
- reduced memory usage of the hids exports (removed storing the hashes twice in memory, drastically removed the data retrieved from the db when preparing the export)
 2015-07-17 10:50:50 +02:00
Richard van den Berg 0b7df293ea Convert tab to spaces 2015-07-16 18:05:41 +02:00
Richard van den Berg 93c1849780 Remove unused relatedTTP 2015-07-16 18:04:39 +02:00
Richard van den Berg b126db534a Add timezone +00:00 to timestamp 2015-07-16 17:56:52 +02:00
Richard van den Berg 27d09b4e22 Change incident description to title 2015-07-16 17:53:49 +02:00
Richard van den Berg 2e1864f28d Add Indicated_TTP 2015-07-16 17:49:51 +02:00
Richard van den Berg ab2aeeb868 Add Valid_Time_Position 2015-07-16 12:55:20 +02:00
Richard van den Berg f68bd3f785 Add indicator types 2015-07-16 12:36:42 +02:00
Iglocska 1da5b71011 Some work on the new types 2015-07-16 09:18:21 +02:00
Richard van den Berg c15a178013 Add condition attributes 2015-07-15 17:10:55 +02:00
Iglocska a0ce8bf1e6 Merge branch 'hotfix-2.3.97' 2015-07-13 11:24:32 +02:00
Iglocska 28ea167f75 Version bump 2015-07-13 11:24:21 +02:00
Iglocska c906cacd81 Merge branch 'pr567' into hotfix-2.3.97 2015-07-13 11:23:29 +02:00
Iglocska 47ad24fbad Merge branch 'pr564' into hotfix-2.3.97 2015-07-13 11:23:24 +02:00
Iglocska 6a9893affd Merge branch 'pr546' into hotfix-2.3.97 2015-07-13 11:23:19 +02:00
Richard van den Berg 4b5bc3736a Use setupHttpSocket for fetchPGPKey 2015-07-13 11:05:53 +02:00
Iglocska 3f74ed0b39 Merge branch 'hotfix-2.3.96' 2015-07-12 21:46:06 +02:00
Iglocska 1645ee1e3b Rework of the diagnostics for background workers 
- shows dead background workers
- allows site admins to add workers to any queue on the fly
- allows site admins to kill workers on the fly
 2015-07-12 21:45:11 +02:00
David André 2b6ec81891 Edited comment for RPZ_Policy 
Removed copy/pasta and added a correct comment for RPZ_Policy
 2015-07-09 11:49:58 +02:00
David André a4a98009ed Merge pull request #1 from MISP/master 
Update to latest MISP master
 2015-07-09 11:43:26 +02:00
Iglocska aee185be99 Merge branch 'hotfix-2.3.95' 2015-07-09 10:57:25 +02:00
Iglocska 2438ec2f35 Some tuning to the hostname / url type recognition in the freetext import tool, fixes #562 2015-07-09 10:56:17 +02:00
Iglocska cb435a82bf Merges 2015-07-08 14:48:30 +02:00
Iglocska f1a5ba52e5 Merge branch 'master' into feature/sg 
Conflicts:
	VERSION.json
	app/Lib/Tools/XMLConverterTool.php
	app/Model/Event.php
 2015-07-08 14:02:54 +02:00
Iglocska cded8b858e Merge branch 'hotfix-2.3.94' 2015-07-08 10:39:20 +02:00
Iglocska 6a25471ea4 Fix to an error with very large strings in an array causing a failure in the XML conversion of simpleXML, fixes #500 
Moved the XML conversion in restfullEventToServer() to MISP's own xml conversion tool
 2015-07-08 10:37:20 +02:00
Iglocska 01d32cf9cf Merge branch 'hotfix-2.3.93' 2015-07-07 14:44:29 +02:00
Iglocska e706562cd5 Fixes to the RPZ export based on the testing of elhoim 
- some errors in the format (wrong comment character used, rpz-ip not appended to IP addresses, missing semi-colon)
- removed hostnames that are on domains blocked by the rules based on domain attributes
 2015-07-07 14:42:28 +02:00
Iglocska 038ccd99bd Work on the new attribute types 2015-07-06 18:19:51 +02:00
Iglocska b2e50768ac Merge branch 'hotfix-2.3.92' 2015-07-01 11:06:40 +02:00
Iglocska 27cc167c33 Fix to an incorrect validation of temporary filenames 2015-07-01 11:06:11 +02:00
Iglocska b433a19c83 Merge branch 'hotfix-2.3.91' into develop 2015-07-01 09:52:18 +02:00
Iglocska b17c447550 Merge branch 'hotfix-2.3.91' 2015-07-01 09:51:59 +02:00
Iglocska 45fdbf7839 File management fixed in server settings 
- a previous patch removed the contents of the page
 2015-07-01 09:50:51 +02:00
Iglocska 137db75099 Merge branch 'hotfix-2.3.90' into develop 2015-07-01 09:02:17 +02:00
Iglocska a8b225c8f5 Merge branch 'hotfix-2.3.90' 2015-07-01 09:01:59 +02:00
Iglocska a05afbdd11 GnuPG.binary demoted to optional setting as it should be 2015-07-01 09:01:32 +02:00
Iglocska a532e64321 Merge branch 'hotfix-2.3.90' into develop 2015-07-01 08:49:53 +02:00
Iglocska 717f616bff Merge branch 'hotfix-2.3.90' 2015-07-01 08:48:47 +02:00