Commit Graph

77 Commits (77ca0f8dd46222c2a0c7bc38608e0215988f33f3)

Author SHA1 Message Date
Andreas Ziegler 77ca0f8dd4 chg: remove obsolete uuid() wrapper 2016-07-07 15:13:16 +02:00
Andreas Ziegler da4d005cc6 chg: remove obsolete upload function from ShadowAttribute 2016-06-22 01:16:43 +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 4dd5df53c8 Merge pull request #1255 from rotanid/bugfix
fix: case-insensitive functions calls
2016-06-12 05:41:05 +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
Andras Iklody fa8c66f6a6 Merge pull request #1218 from rotanid/newlines
chg: add newline character before EOF to non-minified (text-)files
2016-06-06 10:21:15 +02:00
Andreas Ziegler 1d06f25b38 chg: add newline character before EOF to non-minified (text-)files 2016-06-06 10:09:55 +02:00
Andras Iklody 97772c3cee Merge pull request #1217 from rotanid/zip-exec-error-handling
Zip exec error handling
2016-06-06 09:43:45 +02:00
Andreas Ziegler 8cdbafa4a5 chg: error handling after zip execution 2016-06-06 09:38:52 +02:00
Andreas Ziegler 629e8ee7b9 chg: remove comment: there is no exec wrapper in cakephp 2016-06-06 09:35:34 +02:00
Andreas Ziegler 0117555a99 chg: remove handling of unsupported OS Windows 2016-06-06 09:14:34 +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 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
Andreas Ziegler 8a9ffc1f9b remove obsolete space from: File ( 2016-05-31 18:03:59 +02:00
Andreas Ziegler dc0974a55b misc cleanup 2016-05-21 05:10:49 +02: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
Andreas Ziegler 7ae4c37f0b progressive removal of commented out if-statements 2016-05-20 00:48:54 +02:00
iglocska 73375042e6 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2016-05-13 20:47:10 +02:00
iglocska 9434a2364f fix: Fixes to issues with MYSQL >= 5.7 2016-05-13 20:44:16 +02:00
Iglocska b75cfb842b chg: Prevent attribute edit on deleted attributes, prevent proposal correlation on deleted attributes 2016-05-11 10:38:35 +02:00
devnull- bd6f5f8b20 Add 'certif_public' in the fields 2016-04-05 18:01:50 +02:00
Iglocska daeaee6483 Merge branch '2.4' into feature/enrichment
Conflicts:
	app/Model/Event.php
2016-03-19 16:55:42 +01:00
Iglocska d66a43aad1 Set proposal's deleted field to 0 if nothing is set before saving, fixes #988 2016-03-09 14:34:35 +01:00
Iglocska d111a9dc8d Fixed an issue where a proposal correlation would fail 2016-02-23 14:59:59 +01:00
Iglocska 70eebafa9f Fixed an issue where a proposal correlation would fail 2016-02-23 14:51:50 +01:00
Iglocska 2a2aaa9d1b Fix to setting the job progress before initialising the model when correlating proposals 2016-02-17 14:51:17 +01:00
Iglocska 926a5fabeb Fixed a copy paste fail 2016-02-17 14:49:38 +01:00
Iglocska 1ba8d1c1f0 Added correlations on a proposal level
- tied into automatic datamodel updates
- correlation is one way only (from proposal to attribute)
- proposals don't correlate with one another

- all distribution rules are adhered to
- further improvements on the upgrade mechanism pipeline
2016-02-17 14:43:33 +01:00
Iglocska d6c0b6d853 Fixes to several permission issues with the e-mailer
- contact e-mail recipients were incorrectly set resulting in the e-mails landing at the wrong recipient
- disabled users were not excluded from certain e-mails
2016-02-02 15:30:23 +01:00
Iglocska 2566d49278 Fix to the Proposal alerts not going out to users after one has failed 2016-01-29 14:28:42 +01:00
Iglocska a9c07371ca Fixes to the proposal system
- proposals were not synchronised during pulls due to a bug
  - affects both 2.3 and 2.4, the bug comes from the switch to json
  - missing JSON view for proposal interface
  - Also, 2.4->2.4 the organisation objects were incorrectly ommited from the sync
  - Fixes:
    - reverted back to XML for the old style proposal exchange
    - 2.3->2.4 is now fixed
    - 2.4->2.4 below 2.4.7 version will still not synchronise proposals on pull

- Proposal pull reworked
  - requires 2.4.7 on both ends or higher
  - proposals are now synced in one go
  - massive increase in speed and reduction of log entries

- Proposal e-mailing reworked
  - tied into the new 2.4 e-mailer, which was left out on 2.4's release by accident
  - triggers correctly now when a proposal is added (also on pull)
2016-01-14 02:46:10 +01:00
iglocska fea225c409 Rework of the contributor field, some MYSQL.sql tweaks
- added indeces to the MYSQL.sql file
- contributors now looks for shadow attributes instead of log entries (should make the event view much faster and resolve some timeout issues on sync when the log is massive)
2015-12-27 19:00:35 +01:00
Iglocska 5dbbe84069 Merge branch 'master' into 2.4-beta
Conflicts:
	VERSION.json
	app/Controller/EventsController.php
	app/Controller/ShadowAttributesController.php
	app/Model/Event.php
	app/View/Elements/side_menu.ctp
2015-11-30 09:37:22 +01:00
iglocska b30bfab0a5 Delete proposal attachment if the proposal was accepted / discarded
- there is no need to keep retransfering the actual attached file if all we want to convey is that the proposal is gone.
2015-11-27 09:16:17 +01:00
iglocska 91c4f67ebd Fix to an issue where a proposal with an attachment could not be correctly accepted 2015-11-27 08:49:13 +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 6fa27d659a Reverted change in proposal file storage path that wasn't needed 2015-10-22 09:51:31 +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 656a391223 Progress on the sync
- pull from 2.3 -> 2.4 should work correctly now
2015-09-21 14:55:40 +02:00