Commit Graph

492 Commits (71273e11892f57f65126d9c06f12034b7dcd5fa2)

Author SHA1 Message Date
iglocska 399a039065 fix: cleanup of some unused code
- based on @rotanid's findings
2016-08-26 07:44:40 +02:00
iglocska 873b201eb0 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-08-25 11:38:59 +02:00
iglocska 822b0bf8fa chg: Cleanup of the controllers and models
- removed incorrect, useless boiler plate comments
- kept useful comments intact
- added some missing line breaks to make the codebase a bit more uniform
- removed some obviously obsolete TODO comments
2016-08-25 11:38:37 +02:00
Andreas Ziegler e8599fb16c chg: new filename regex & separate functions 2016-08-24 15:31:17 +02:00
Andras Iklody 0093bb08be Merge pull request #1471 from rotanid/filename-regexes
filename regex changes
2016-08-24 09:43:00 +02:00
iglocska b1285f5625 fix: Fixed an invalid array_merge in the attribute fetcher 2016-08-24 09:37:22 +02:00
Andreas Ziegler eb66a80c76 chg: filename regex changes 2016-08-24 02:35:04 +02:00
iglocska b08140268b fix: Some exports (HIDS, NIDS) failing on certain MySQL versions due to an only_full_group_by policy violation in the attribute fetcher, fixes #1390 2016-08-23 00:36:44 +02:00
Andreas Ziegler fa8300adea chg: fix indention in some files 2016-08-22 03:40:17 +02:00
Andreas Ziegler fb655c2ff9 chg: use 1/0 not true/false for conditions & other boolean sqlquery elements 2016-08-17 18:52:22 +02:00
Iglocska 47c6feab4d fix: Various fixes to the cached exports
- Tightened the rules for export generation when no valid published events exist
- Corrected various issues with the progress bars
- Added the missing JSON export to the caches
- XML/JSON caches now correctly take into account the cached attachent inclusion setting
- MISP will now show the users browsing the export page whether attachments will be cached with the current settings or not
- Added correct progress bar to the HIDS export
2016-07-30 18:08:19 +02:00
Andreas Ziegler dd30621155 chg: use CASE WHEN instead of IF in $virtualFields 2016-07-11 21:26:25 +02:00
Andreas Ziegler ff7a7de938 chg: use 1/0 not true/false for conditions & other boolean sqlquery elements 2016-07-11 21:26:16 +02:00
Iglocska 9522c96d54 Revert "Revert "chg: remove obsolete uuid() wrapper""
This reverts commit bae6eadfe7.
2016-07-11 00:59:47 +02:00
Andreas Ziegler d2f43eb8c4 Merge pull request #1349 from rotanid/mail-regex-change
additional chars in mail address regex
2016-07-10 01:35:56 +02:00
Andreas Ziegler efe31e8b07 fix: additional chars =~ in mail address regex 2016-07-10 01:32:37 +02:00
Iglocska bae6eadfe7 Revert "chg: remove obsolete uuid() wrapper"
This reverts commit 77ca0f8dd4.
2016-07-08 14:50:00 +02:00
Andreas Ziegler 77ca0f8dd4 chg: remove obsolete uuid() wrapper 2016-07-07 15:13:16 +02:00
Andreas Ziegler 69ae8adf1f fix: move case statement and add break 2016-06-27 14:08:54 +02:00
Andreas Ziegler 89e8307c1a chg: remove some obsolete FIXME notes
the lines have been checked, only secure values are used as part of filenames and paths
2016-06-20 22:30:57 +02:00
Andreas Ziegler 5b390a0e32 chg: compress IPv6 addresses on import 2016-06-14 02:20:31 +02:00
Andreas Ziegler 4dd5df53c8 Merge pull request #1255 from rotanid/bugfix
fix: case-insensitive functions calls
2016-06-12 05:41:05 +02:00
Andreas Ziegler 03fd7ddbb9 Merge pull request #1238 from rotanid/cleanup
cleanup obsolete code
2016-06-12 05:39:12 +02:00
Andreas Ziegler 90aaf09415 chg: remove useless empty comments at end of line 2016-06-12 05:35:52 +02:00
Andreas Ziegler 5a701e7ded fix: case-insensitive functions calls 2016-06-12 05:33:34 +02:00
Andreas Ziegler 03f71dc213 chg: use escapeshellarg() instead of addslashes() with exec() 2016-06-12 04:43:05 +02:00
Iglocska 6275e4fcd4 fix: reverted the change from addslashes -> escapeshellargs. Will revisit the reason it was causing the uploads to fail at a later point in time 2016-06-09 15:02:10 +02:00
Andreas Ziegler f6948a83a4 chg: use escapeshellarg() instead of addslashes() with exec() 2016-06-06 15:48:01 +02:00
Andreas Ziegler 8cdbafa4a5 chg: error handling after zip execution 2016-06-06 09:38:52 +02:00
Andreas Ziegler 958aa7c414 use consistent spacing around else if 2016-06-04 15:49:54 +02:00
Andreas Ziegler 985451642e add space after keywords if/for/foreach/while/switch/catch 2016-06-04 15:45:39 +02:00
Andras Iklody ca057e877b Merge pull request #1207 from rotanid/semicolon
remove obsolete semicolon after closing curly bracket
2016-06-04 09:17:56 +02:00
Andreas Ziegler 81d197ed16 remove obsolete semicolon after closing curly bracket 2016-06-04 02:21:23 +02:00
Andreas Ziegler c1eda1e04b remove single spaces after tabs 2016-06-04 01:54:19 +02:00
Andreas Ziegler 8a2352f7b8 remove single spaces in front of tabs 2016-06-04 01:14:25 +02:00
Andreas Ziegler 0fe692c56a remove whitespace at end of line 2016-06-04 01:10:45 +02:00
Andreas Ziegler 898ea1d97c remove whitespace (space/tab) from empty lines 2016-06-04 01:08:16 +02:00
Iglocska 2c690aea81 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-06-03 01:39:07 +02:00
Iglocska 3b6a852428 chg: valueIsUnique assumed the deleted flag to be set on attributes 2016-06-03 01:27:12 +02:00
Andreas Ziegler 8a9ffc1f9b remove obsolete space from: File ( 2016-05-31 18:03:59 +02:00
Steve Fossen a308f8dcf5 don't bother trimming if it's going to exit anyways.
removes a warning on empty attribute.
2016-05-27 07:00:55 -07:00
Andras Iklody 6d068e4928 Merge pull request #1151 from rotanid/filechecks
small change to file checks
2016-05-20 17:05:27 +02:00
Andreas Ziegler e21fa21de8 small change to file checks, use readable() instead of exists() 2016-05-20 16:57:34 +02:00
Andreas Ziegler 9db0777533 improve some text passages 2016-05-20 16:46:06 +02:00
Iglocska fe13207ce6 chg: Some additional cleanup after the merge of some obsolete stuff 2016-05-20 09:15:37 +02:00
Iglocska 74aaf00e2d Merge branch 'pr1148' into 2.4 2016-05-20 09:11:06 +02:00
Andreas Ziegler 8cca10cce9 simplify file readability check 2016-05-20 05:15:23 +02:00
Andreas Ziegler e5c45490cc remove unused code-lines 2016-05-20 05:14:29 +02:00
Andreas Ziegler 00e9fa58b0 remove comment: there is no exec wrapper in cakephp 2016-05-20 05:14:04 +02:00
Andreas Ziegler 6526f638e6 remove commented out code lines 2016-05-20 05:13:24 +02:00
Andreas Ziegler 5319f4e846 remove duplicate sha256 case 2016-05-20 05:12:46 +02:00
Andreas Ziegler 4713a152bb remove duplicate code 2016-05-20 05:12:24 +02:00
Andreas Ziegler 1a1bdc78c0 fix an array declaration 2016-05-20 05:11:11 +02:00
Andreas Ziegler 65d9c6b691 Attribute.php: update comments, indention, readability 2016-05-20 04:59:33 +02:00
Andreas Ziegler 7ae4c37f0b progressive removal of commented out if-statements 2016-05-20 00:48:54 +02:00
Iglocska d927f4ccc7 chg: some small fixes to the soft-delete 2016-05-11 09:43:45 +02:00
Iglocska a2bf43c88e fix: Several issues with the soft delete resolved 2016-05-10 17:39:27 +02:00
Iglocska 8c4bfd78b9 chg: Soft-delete ready for testing 2016-05-09 08:54:02 +02:00
Iglocska 738c607e0d chg: further progress on the attribute soft delete 2016-05-07 23:12:09 +02:00
Iglocska 151c782d23 chg: Further work on the attribute soft delete 2016-05-06 23:34:26 +02:00
Iglocska d33c83dca1 Removed link type from network attributes 2016-04-23 00:41:50 +02:00
Iglocska 24c7fa61fe Merge branch 'permissionfix' into 2.4 2016-04-18 17:41:59 +02:00
Iglocska 914519ac53 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-04-14 10:00:59 +02:00
Iglocska 73346125a0 sha-2 entries incorrect under Search Attributes GUI, fixes #1086 2016-04-14 10:00:17 +02:00
Andras Iklody 88949250bd Merge pull request #1084 from rotanid/bugfix
Model/Attribute.php: remove obsolete HTML-linebreak
2016-04-14 08:49:11 +02:00
Andreas Ziegler 2b0a3aa014 Model/Attribute.php: remove obsolete HTML-linebreak 2016-04-13 23:21:19 +02:00
Iglocska bc7ad89be8 Merge branch '2.4' into feature/sightings
Conflicts:
	app/Model/Event.php
	app/Model/Server.php
	app/View/Events/view.ctp
2016-04-03 22:30:53 +02:00
Iglocska 47f0c0a14c Further progress 2016-03-21 12:08:20 +01:00
Iglocska daeaee6483 Merge branch '2.4' into feature/enrichment
Conflicts:
	app/Model/Event.php
2016-03-19 16:55:42 +01:00
Iglocska 8565ce198b Merge branch 'feature/feeds' into 2.4 2016-03-10 15:27:47 +01:00
Iglocska 113d9cd82d Set attribute distribution to Inherit if it is not set. 2016-03-07 02:40:36 +01:00
Iglocska 57b38c1041 Follow up fix to the previous patch 2016-03-04 20:41:06 +01:00
Iglocska 8b352cfd2f Fixed a bug in the validation of two attribute types, fixes #1003 2016-03-04 20:37:33 +01:00
Iglocska d5c5ad0016 Fixed an issue that blocked the editing of attributes in unpublished events if the MISP.unpublishedprivate setting was set 2016-03-01 15:58:00 +01:00
Alexandre Dulaunoy 17167b4e83 typo error with registrar fixed #984 2016-02-26 21:16:46 +01:00
Iglocska 70cfbc6509 Added & to the allowed characters in the e-mail type validation, fixes #972 2016-02-24 14:58:08 +01:00
Iglocska 947e6a73a1 First implementation of the enrichment modularity 2016-02-21 23:11:56 +01:00
Iglocska 386dfc7ec8 Added new attribute type x509-fingerprint-sha1 2016-02-13 16:43:41 +01:00
Iglocska 4c14d3a859 Merge branch '2.4' into features/delegation
Conflicts:
	app/Controller/AppController.php
	app/Model/AppModel.php
	app/Model/Event.php
	app/Model/Log.php
	app/Model/Server.php
	app/View/Elements/footer.ctp
	app/webroot/css/main.css
2016-02-12 05:56:32 +01:00
William Robinet 4fea371c4b Fix permissions 2016-02-11 17:03:51 +01:00
Iglocska 97533ab272 Major speed boost to the correlation
- it seems that for some reason some conditions in the correlation lookup massacred the performance of the correlation
- doing that additional filter on a PHP level fixes it for now, but it would be interesting to investigate this further and potentially reuse the findings to improve other queries

- also fixed an issue with the indexing script failing on some fulltext fields if it has to fall back to regular indeces.
2016-02-02 09:35:14 +01:00
Alexandre Dulaunoy dc67a04305 Fixed typos for organization 2016-01-25 23:41:43 +01:00
Iglocska d4d0e6ee29 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-01-18 15:18:01 +01:00
Iglocska 5bcd35ce5b Adding URIs failed because of the missing validation entry 2016-01-18 15:17:00 +01:00
Alexandre Dulaunoy 15bed1d299 pdb attribute - format is not checked 2016-01-18 13:24:18 +01:00
Alexandre Dulaunoy 4a2210526c pdb attributes added
pdb stands for Microsoft Program database (PDB) path information
2016-01-18 12:05:14 +01:00
Alexandre Dulaunoy 72bc3032d4 whois-registrant-name attribute added 2016-01-18 10:50:49 +01:00
Iglocska e85282c878 Fix to an invalid data entry pre-validation call that broke prtn attribute entry with a leading + 2016-01-14 19:46:35 +01:00
Iglocska a1f0a88707 Fixed missing validation for malware-type type attributes 2016-01-13 13:49:57 +01:00
Iglocska 144e233fe9 Merge branch '2.4' into feature/sightings
Conflicts:
	app/Model/Attribute.php
2016-01-11 11:38:21 +01:00
Iglocska c834715aae First steps 2016-01-10 19:47:21 +01:00
Iglocska 6bf683cac6 FIxed several issues
- some performance tuning for the restSearch API
- fixed an issue where overriding the contain parameters in the attribute fetcher would lead to an exception
- fixed an issue where accepting a proposal would try to copy the sharing group of the event incorrectly (it now simply gets set to inherit event)
- fixed an issue with the rest search API failing when some fields were not set
2016-01-08 11:10:02 +01:00
Iglocska 62a20a2321 Fixed an issue where an event's sharing group ID would get set to the first available option even when a non sharing group distribution level is selected 2016-01-07 16:33:35 +01:00
Iglocska 6711c7441f Added malware sample to the file attribute filter 2016-01-04 10:28:41 +01:00
Iglocska 5d7aa73e27 First version of the quick filters for the event view 2016-01-04 10:23:07 +01:00
Iglocska f3d1a55702 Removed the test values for some attribute descriptions
- still needs some work, few empty ones remain and a few descriptions could use clarification
2016-01-02 20:02:26 +01:00
Iglocska 85c2360212 Merge branch 'portip' into 2.4
Conflicts:
	app/Model/Attribute.php
2016-01-01 14:17:50 +01:00
Alexandre Dulaunoy a5a142295b Typo fixed in whois-creation-date 2015-12-31 12:24:55 +01:00
Fafner [_KeyZee_] 9f4dc4b0b8 Update Attribute.php 2015-12-29 18:46:23 +01:00
iglocska 66a90cd60c Several fixes to the exports, fixes #790
- New generic fetch attribute method was mistakenly using the order field as a condition, resulting in some exports only displaying a subset of the data
  - the fix to this fixes the issue described in #790 for text exports
- Fix to the RPZ exports not working correctly
- Fix to the horrible performance of RPZ exports
- Fix to several background worker issues with exports
2015-12-26 02:50:50 +01:00
iglocska 61ea39a6ca Merge branch '2.4' into feature/sightings
Conflicts:
	app/Controller/SightingsController.php
	app/Model/Sighting.php
2015-12-25 00:49:23 +01:00
iglocska 85db894063 Left off from previous commit 2015-12-25 00:26:45 +01:00
iglocska 3061b37fc3 Fixed a serious issue with the snort/suricata export which would keep appending all eligible attributes over and over to the file instead of properly fetching them event by event resulting in a massive export file 2015-12-23 00:51:57 +01:00
iglocska cb42337f9b Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2015-12-21 10:39:39 +01:00
iglocska f963f8d7d8 Fixed a menu and some cleanup
- Freetext import was loading the wrong menu
- some leftover profiling code removed
2015-12-21 10:37:45 +01:00
Iglocska 868d4cdd3f First version of the sightings
- add / delete sightings via REST
- add sightings via the UI
- View sightings info on an event and attribute level (event view only for now)
- differentiate between own sightings and that of other orgs (additional information via popover still coming)

- settings:
  - 1. enable / disable sightings server wide
  - 2. set sightings policy
    - a. Only Event owner can see sightings + everyone sees what they themeselves contribute
    - b. Anyone that contributes sightings to an event can see the sightings data
    - c. Everyone that can see the event can see the sightings
  - 3. Anonymisisation (in progress, data correctly retrieved in business logic)
    - a. if true, then only own org + "other" is shown
    - b. otherwise all orgs that submitted sightings are shown

Further improvements needed for version 1 of sightings:
  - 1. Delete via the interface
  - 2. View detailed sightings information
  - 3. Graph the sightings data for the event
  - 4. Include the Sightings data in the XML/JSON views
  - 5. View sighting for attribute / event via the API
2015-12-20 13:41:52 +01:00
Iglocska e4d3b6d1ac Removed crappy automatic CakePHP sorting from recorrelation
- /facepalm
2015-12-18 12:43:34 +01:00
iglocska e215bf3313 Slightly smarter correlation for generateCorrelations 2015-12-17 13:04:49 +01:00
iglocska dd53f7bfa2 Added default values to the log entry creation to avoid empty fields giving notices, fixes #769 2015-12-17 11:01:54 +01:00
iglocska 0a48ee2c44 Fix to the correlation peformance 2015-12-17 10:25:30 +01:00
iglocska 78d58b6cbd Changes to the generation recreation 2015-12-17 01:25:23 +01:00
Iglocska 4026627a91 Fix to the HIDS export 2015-12-13 17:59:48 +01:00
Iglocska b40e0fdc7c Merge branch 'master' into 2.4-syncrework
Conflicts:
	VERSION.json
	app/Controller/AttributesController.php
	app/Controller/ShadowAttributesController.php
	app/Lib/Tools/ComplexTypeTool.php
	app/Model/Attribute.php
	app/View/Pages/administration.ctp
2015-12-09 02:00:23 +01:00
iglocska 65faeb48d9 Further tweaks
- fixed some corner cases
- added support for the same defanging to the freetext import tool
2015-12-04 11:33:14 +01:00
iglocska 744cf50fb9 Update to attribute validation and the freetext import tool, fixes #742
- defanged URL type attributes are refanged on input
- admin script to do the same for all existing attributes

- admin tool doesn't recognise a word followed by a . as a url
2015-12-04 10:43:38 +01:00
Iglocska d433618c71 Also, enabled the filtering on pull
Merge branch 'master' into 2.4-beta

Conflicts:
	VERSION.json
	app/Controller/EventsController.php
	app/Lib/Tools/XMLConverterTool.php
	app/Model/Event.php
	app/Model/Server.php
2015-12-03 00:27:56 +01:00
iglocska 268c7683a0 Rework of the event add/edit
- allows for saving an event even if an attribute fails
  - logs attributes that fail validation

- same for edit

- add_misp_export updated with the above in mind
2015-12-01 15:39:12 +01:00
Benjamin Gathmann 9cd9259f98 added domain|ip composite attribute 2015-11-24 10:40:43 +01:00
iglocska 3cc3b4f34d fixed too restrictive generateCorrelation attribute fields 2015-11-20 01:21:44 +01:00
iglocska db359170f6 some left over merging issues among other things 2015-11-17 22:01:22 +01:00
iglocska 866641fb40 Fixed an issue with the blacklists not saving the event org 2015-11-17 00:47:51 +01:00
iglocska 1c6f45de52 Merge branch 'master' into 2.4-beta
Conflicts:
	VERSION.json
	app/Controller/EventsController.php
2015-11-12 09:26:29 +01:00
iglocska 3716b38a60 Bin number added to validation 2015-11-09 13:42:22 +01:00
iglocska cd886b4a79 Relaxed financial attribute validation
- also added 2 new types: bank-account-nr and aba-rtn
- validation is completely relaxed
- idea is to add a visual notification in the view for these attributes types if they are not valid (invalid financial indicators are still interesting)
2015-11-09 12:36:49 +01:00
Iglocska 7a686a2718 Merge branch 'master' into 2.4-beta
Also, reworked a lot of remaining distribution checks not handled by the main fetch methods

Conflicts:
	VERSION.json
	app/Controller/AttributesController.php
	app/Controller/ShadowAttributesController.php
	app/View/ShadowAttributes/add.ctp
	app/View/ShadowAttributes/edit.ctp
2015-10-30 13:39:12 +01:00
iglocska ef1d3949e7 Merge branch 'master' into feature/sg
Conflicts:
	VERSION.json
	app/Controller/ShadowAttributesController.php
	app/Lib/Tools/JSONConverterTool.php
	app/Lib/Tools/XMLConverterTool.php
	app/Model/User.php
	app/View/Elements/eventattribute.ctp
2015-10-22 09:59:00 +02:00
iglocska 61e865956b Fixes to several issues, fixes #693
- Fixed a critical bug in the XML export
  - As of recently XML exports include relations as they were missing before
  - the sanitisation of the event info field in related attributes was incorrectly sanitized of unicode characters
  - this can lead to the XML export breaking and also for affected events to be blocked from synchronisation

- Proposal fixes
  - fixed an invalid uuid generation that lead to an exception
  - fixed the attachments for proposals still using the old attachment system that disallows most filenames
  - added the automatic creation of hashes for attachment proposals
2015-10-21 23:44:07 +02:00
Iglocska 044996bdb5 New feature: Proposal to delete attribute, fixes #315
- Users can now propose a deletion to an attribute
  - also tied into the mass accept mechanism
  - new UI elements to go along with this

- Code refactoring for category list retrievals
  - Until now, several methods got the list of categories from the validation code
  - Was awkward with a fake empty element that had to be removed
  - altered the validation code to read the categoryDefinitions array instead
2015-10-16 23:49:04 +02:00
Iglocska 328c666e3a Merge branch 'master' into feature/sg
Merging all the new changes from master

Conflicts:
	VERSION.json
	app/Console/Command/AdminShell.php
	app/Controller/AttributesController.php
	app/Controller/EventsController.php
	app/Model/Attribute.php
	app/Model/Event.php
	app/Model/Log.php
	app/Model/Server.php
	app/Model/User.php
	app/View/Elements/side_menu.ctp
	app/View/Pages/administration.ctp
	app/View/Users/admin_index.ctp
2015-10-12 09:41:20 +02:00
Iglocska dc638adac2 Upgrade to CakePHP 2.7, fixes #684
- cakephp submodule updated to 2.7
- make sure that you update your instance!

- not updating will not break compatibility
2015-10-09 15:59:25 +02:00
iglocska 6fa13b4ad0 Fix to the text export ignoring the rule to exclude unpublished and non-IDS flagged data, fixes #646 2015-09-18 10:53:03 +02:00
iglocska 14188f1367 Fix to a new bug introduced with the correlation engine
- an attribute could correlate with another attribut of the same event
2015-09-16 15:34:00 +02:00
iglocska 26e640e19c Further progress on several issues 2015-09-16 12:15:43 +02:00
Iglocska e1a95c62b0 Merge branch 'master' into feature/sg
Conflicts:
	VERSION.json
	app/Controller/EventsController.php
	app/Controller/ServersController.php
	app/Model/Attribute.php
	app/View/Users/statistics.ctp
2015-09-10 15:02:44 +02:00
Iglocska e7b54c2c61 Fix to a serious bug with adding attributes via the API and performance fixes
- due to a bug, setting an attribute ID in the /attributes/add API call can lead to overwriting an existing attribute

performance improvements:

- massive improvements to the correlation performance
- improvements to the attribute validation process
2015-09-07 10:06:34 +02:00
Iglocska 43c2290097 Enhancements to the reportValidationIssuesAttributes action
- now also shows issues not related to the value field
- takes an optional parameter to validate a single event's attributes
2015-09-03 10:58:54 +02:00
Iglocska 3fb7764c00 First revision of the upgrade scripts
- .sql file to add all the new fields / tables
- admin tool to convert the old organisation fields to the new objects
- still missing a cleanup method (to remove the old organisation fields once the conversion is done)
2015-09-02 01:34:52 +02:00
Iglocska 186452cd5b Further progress 2015-08-31 02:32:37 +02:00
Iglocska 704880ce59 Merge branch 'master' into feature/sg
Conflicts:
	VERSION.json
	app/Controller/AttributesController.php
	app/Controller/EventsController.php
	app/Model/Attribute.php
	app/Model/Event.php
	app/Model/Server.php
2015-08-30 13:29:05 +02:00
Iglocska 556688069a Resolved an issue that can lead to duplicate events showing up in MISP
- UUID uniqueness was previously not enforced
- changed the MYSQL.sql file to reflect the changes
- Added upgrade admin tool to remove duplicate events and make the database changes required
- Tweaked the tool for the attribute uuid fix so that it cannot created duplicate keys

- some minor fixes, such as automatically removing eventTag objects on event deletion
2015-08-25 10:32:26 +02:00
iglocska a93807439d Several bigger changes
- new functionality: Event blacklisting by UUID
  - site admins cna enable this feature in the server settings
  - enabling the feature will make the required db changes
  - any deleted event will automatically get blacklisted
  - this prevents deleted events from flowing back from a synced instance
  - site admins can manually add UUIDs to the list and remove entries

- fix to UUID duplication issues for attributes
  - simply run the admin script and it will regenerate the UUID of attributes that are duplicates, if any such exist
  - timestamps/event published status will not be affected

- config.core.php now includes a change that prevents from 404 exceptions being logged
  - the sync uses 404s to signal that an event with a given uuid does not exist when negotiating proposal synchronisation
  - this causes a dangerously high amount of noise in the logs
2015-08-17 16:10:10 +02:00
Iglocska 5273c2c5aa New functionality: API to download sample by hash
- simply pass an MD5 hash along and receive a sample if available zipped and base64 encoded in a response object
- pass any hash along with a flag set and receive any samples from events that have the passed hash

- Also, fix for an issue with the freetext import not using semi-colons as separators
2015-08-07 12:04:44 +02:00
Iglocska 7db6e9ac47 A list of changes to the way attachments are uploaded, fixes #559, fixes #482
- new API for uploading malware samples
  - allows the upload of several files
  - can be used to populate a pre-existing event, or create a new event
  - expects a JSON or an XML object with the samples base64 encoded
- new way of storing malware samples
  - original filename not used any longer
  - samples are renamed to their md5 hashes
  - original filename preserved in a secondary txt file
- removed filename validation as it is no longer used for the command line execution
  - this allows unicode name files to be uploaded!
  - changed the UI attachment upload to reflect these changes
  - code more centralised and extendible
2015-08-04 02:00:21 +02:00
Iglocska 00005bca97 Merge branch 'master' into feature/sg
Conflicts:
	VERSION.json
	app/Model/Attribute.php
2015-07-22 19:30:45 +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 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 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
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 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 0481e6eb02 Merge branch 'master' into feature/sg
Conflicts:
	VERSION.json
	app/Controller/ServersController.php
	app/Controller/ShadowAttributesController.php
	app/Controller/UsersController.php
	app/Model/Event.php
	app/webroot/js/ajaxification.js
2015-06-29 14:27:16 +02:00
Iglocska ae0e1aeacb Merge branch 'feature/rpz' into hotfix-2.3.86
Conflicts:
	app/Console/Command/EventShell.php
	app/Model/Server.php
2015-06-23 17:19:08 +02:00
iglocska a0afab66a7 Various changes and bug fixes
- contact reporter first tries to contact orgc users on the instance, if they don't exist, it will contact the owner (instead of going straight to the owner)
- hostname / domain name validation change broke validation of hostnames/domain names / email addresses with a "-"
- Some documentation changes for the REST API (more coming)
- some tuning of the freetext import
2015-06-18 14:49:25 +02:00
iglocska 3d51e34386 Small tweak to the email/domain/hostname validation, affects #551 2015-06-17 10:31:25 +02:00
iglocska 5820d899c0 Relaxed validation of tlds in domain/hostname/email-src/email-dst attributes to allow for longer custom tlds 2015-06-16 16:34:15 +02:00
Iglocska c73f71f243 Merge branch 'master' into feature/sg
The merging is complete

Conflicts:
	VERSION.json
	app/Console/Command/ServerShell.php
	app/Controller/AppController.php
	app/Controller/AttributesController.php
	app/Controller/EventsController.php
	app/Controller/PostsController.php
	app/Controller/UsersController.php
	app/Model/Attribute.php
	app/Model/Event.php
	app/Model/Log.php
	app/Model/Server.php
	app/Model/User.php
	app/View/Elements/side_menu.ctp
	app/View/Users/admin_index.ctp
	app/webroot/js/ajaxification.js
2015-06-10 22:54:20 +02:00
Iglocska 822172d425 Fixes to the e-mailer and the HIDS export
- HIDS exports did not include filename|hash types
- Sending a password reset / welcome message picked the opposite subject line
- line breaks were sent as literals.
2015-06-10 09:50:38 +02:00
Iglocska 71635b00a1 Added a new API parameter that allows to restrict events to the most recently published ones, #527
- added the new flag "last" to the list of parameters
- exports affected: XML, CSV, NIDS, HIDS, STIX, Text, RestSearch
- Valid values: number + format where format can be d, m, h for day, minute, hour (examples: 5d or 12h or 30m)
2015-06-06 20:00:57 +02:00
iglocska dedc9f5ef2 First revision of the RPZ export complete
- documented in automation view
- right now it follows the simple rule of user > admin settings > default values when generating the export
- Parameters can be passed via url / JSON object / XML object
- filters include filter on event ID, date range, tags

TODO:
- buttons for a per event download via the UI
- introduce new export option for normal users (via background workers and the old style export)
2015-05-20 15:04:41 +02:00
iglocska 99f79ec318 First version of the RPZ export
- still undocumented
- very naive policy settings
- limit per event / tags / date range
2015-05-15 14:58:53 +02:00
Iglocska c24704a6c2 Lots of progress
- further work on implementing the SG changes everywhere
- reworked the alert e-mails
- reworked a lot of the logging
- several convenience methods
2015-04-20 11:46:55 +02:00
iglocska 51ea9c090d Further progress 2015-04-18 07:53:18 +02:00
Iglocska 5340abed2e Sharing groups correctly selectable in attributes
- still needs work
2015-04-14 18:11:51 +02:00
Iglocska 1e3db8a8ba Further work on the new version
- org checks fixed in a lot of places
- fixed the searches to work with the new organisations
2015-04-14 17:51:38 +02:00
Aaron Kaplan 782be3bd0b Merge branch 'master' of https://github.com/MISP/MISP 2015-04-14 15:38:52 +02:00
Iglocska 28069a0a0f Further work and some cleanup
- decision to be revised: exports don't expose Sharing groups / org uuids to users unless they are admin (for the future: at least sync users have to be added for the new sync)
2015-04-13 16:20:21 +02:00
Iglocska 5f70207051 Progress in moving all exports to the new distribution system 2015-04-13 12:42:26 +02:00
Iglocska e0ef372392 Merge branch 'master' into feature/sg
Conflicts:
	app/Controller/EventsController.php
	app/Controller/UsersController.php
	app/Model/Event.php
2015-04-12 10:40:31 +02:00
iglocska 5abd8dfead Further work on the sharing groups:
- changes to the data model
- correlation engine updated
2015-04-09 17:27:34 +02:00
iglocska 6763159e87 Security fix
- filenames are now enclosed by quotes instead of double quotes while executing the zip command via exec
2015-03-10 10:58:15 +01:00
iglocska b5be1a36fb Correlation disabled for http-method, fixes #406 2015-02-16 13:30:15 +01:00
Aaron Kaplan 335d5b1492 Merge branch 'master' of https://github.com/MISP/MISP 2015-02-04 11:45:59 +01:00
iglocska f0aa849d04 Various improvements to the exports
- Unified the way exports accept negated parameters
- Fixed the documentation
- Most exports are now restrictable by the event date (From/To parameters)
- none cached XML export now writes to file after converting each event, clearing the memory and resolving any potential memory issues
2015-02-03 17:06:05 +01:00
Aaron Kaplan 461d2a36ab Merge branch 'master' of https://github.com/aaronkaplan/MISP 2015-01-18 20:57:38 +01:00
Aaron Kaplan 4a118cc28b should read if (defined(...)) 2015-01-18 20:56:30 +01:00
iglocska cedaac360a Fixes to the scheduled tasks and some documentation issues
- Scheduled pulls should work correctly now
- Scheduled pushes and pulls correctly display in the logs
- Scheduled caching correctly sets the next date of execution
2015-01-12 17:35:08 +01:00
iglocska 92679f6b69 New way to download a single event
- The event export buttons have been unified into a single download as... button
- clicking it loads a popup with all of the export formats
- added snort, suricata, text dump to the export options
- added the option for an extra setting for some exports (such as including non IDS flagged attributes, encoding attachments)
- easily extendable system

- moved the hidden popup divs into the general layout, can be easily reused anywhere

- removed the auth refresh option that was re-enabled recently as it seems to sometimes cause issues

- text exports now allow "all" to be specified as type, which will dump all attribute values that the user can see
- text exports now allow restricting the results based on event id
2014-12-19 13:32:16 +01:00
iglocska 79127902b7 Cleanup, MISP health tool
- cleanup of a lot of deprecated settings
- tool to help assess and alter issues with the instance settings
- new mechanism to store settings
2014-09-10 09:43:22 +02:00
iglocska 62ad489e47 Merge branch 'hotfix-2.2.35' into develop 2014-08-13 16:14:29 +02:00
iglocska cf3809ef74 Further work on the previous patch 2014-08-13 16:13:38 +02:00
iglocska 83d5e191fc Updates to the STIX export 2014-08-04 18:07:15 +02:00
iglocska ab5b9a9dae Several features finished
- first version of templating system complete
- first version of freetext importer complete
- first version of mass attribute replace tool complete

- some UI changes
2014-07-19 15:09:37 +02:00
iglocska 029ef252a2 Some fixes to the templating
- resolved bugs with permissions
- fixed the broken mass delete tool
- Fixed an issue with the type not being chosen correctly for file type attributes when created through the templating tool
2014-07-08 11:31:23 +02:00
iglocska 45d826a252 First version of the templating feature complete
- still needs some refinement, but it's feature-complete
2014-07-02 16:20:19 +02:00
iglocska 9bede8e1b4 Further work on the templates 2014-06-25 09:56:33 +02:00
iglocska a4a987e027 More work on the templates
- Templates can now be created and populated
- Users can populate an event using a template (still needs work)
- File type elements are not yet implemented
2014-06-19 08:44:35 +02:00
iglocska 7b3f578025 Further work on the templating system 2014-06-12 13:59:54 +02:00
iglocska 90ff886766 Fix to the export issue with md5 / sha1 fixes #237 2014-03-24 09:14:51 +01:00
iglocska c5644e5757 Some UI changes and other minor changes
- images updated in user manual

- fixed validation issues with named pipe (at the moment it's very loose)

- Fixed an issue with shadow attriubutes not showing for events that have no attributes

- some minor UI changes to make MISP a bit prettier
2014-03-06 17:21:57 +01:00
iglocska d40b0f8c34 bug with the text export 2014-02-12 11:53:38 +01:00
iglocska fc94376f0e Several changes in one (xml version, tag filters for exports)
- xml version now included in the xml exports
- MISP will now check the xml version on all imports related to sync / add MISP XML and try to update the incoming info if it detects an older version

- exports now take tag names as a parameter (affected exports: XML, text, HIDS, NIDS)

- eventtags now correctly get removed when an event is deleted
2014-02-02 18:10:21 +01:00
iglocska 7545de6a6c Changes to the admin methods
- cleaned up the methods, they all now return results without debug mode enabled
- Added a verification method for all user GPG keys (as an expired key for example would send out empty messages)
2014-01-21 11:28:18 +01:00
iglocska c10d3e9b95 SSL certificate changes
- you can now upload a certificate file and allow a server link to use a provided self signed certificate. This should solve the issues that some organisations are having when trying to connect their instances
2014-01-16 08:47:25 +01:00
iglocska 50096504f6 Small change to CVE notation fixes #186 2014-01-14 10:38:16 +01:00
iglocska 065f40fdf6 Some changes from master branch
- regexp default list
- GFI improvements (removed a lot of junk imports, distribution taken from the event)
2014-01-13 12:47:43 +01:00
Chris Clark d222ebbbdf Added Attribute Category and Types to Track Targeting Data 2014-01-09 10:23:11 +01:00
iglocska 50f3fa40d0 Merge branch 'develop' into feature/CakeResque
Also, more work on the background jobs
- started work on publishing
- started making the background jobs an optional setting in bootstrap

Conflicts:
	app/Controller/AppController.php
	app/Controller/EventsController.php
2013-12-04 11:58:01 +01:00
iglocska 48383fe25b Next version of exports done 2013-11-19 11:03:30 +01:00
iglocska 6015a6f201 Further work on the exports 2013-11-18 11:35:02 +01:00