MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
1,017 Commits
35 Branches
366 Tags
190 MiB
Commit Graph

1017 Commits (4242108b3e4a32c3681162056ed84186fceacc8d)

Author SHA1 Message Date
Iglocska c4bcf1c077 Fixes #88 
- events searchable by uuid
	-> /events/view/<uuid>
 2013-04-30 16:55:13 +02:00
iglocska e5087be61f Merge branch 'develop' of https://github.com/MISP/MISP into develop 2013-04-30 14:19:23 +02:00
iglocska c572e76afe Added the component from the previous commit 2013-04-30 14:18:54 +02:00
Iglocska cf9546b3b0 Moved the ioc export to a component 
- Less clutter
 2013-04-30 14:17:48 +02:00
Iglocska 2b47fec2a5 Further changes to the export features 
- fixed issues with some download exports not being downloaded
- eliminated some code repetition
 2013-04-30 11:24:02 +02:00
Christophe Vandeplas 2776513395 moved fragmented massagedata to Model::beforeValidate() 2013-04-30 08:20:23 +02:00
Iglocska 87e3973e93 Issue with event publish logs failing 
- info was not set with saveField. Fixed.
 2013-04-29 16:17:58 +02:00
Iglocska 4c4696d4ea Changes to the export conditions 
- attributes with to_ids == 0 won't be exported unless it's an XML
export
- Fix to a typo in the IOC export
 2013-04-29 15:17:05 +02:00
iglocska 1663d77f85 Merge branch 'develop' of https://github.com/MISP/MISP into develop 
Conflicts:
	app/Controller/EventsController.php
 2013-04-29 14:13:31 +02:00
Iglocska af011e2b5f Typo with several _isSiteAdmin() calls fixed 2013-04-29 13:58:53 +02:00
Christophe Vandeplas 0182b2a2d3 Merge branch 'develop' of https://github.com/MISP/MISP into develop 2013-04-29 13:47:55 +02:00
Christophe Vandeplas 4cdfaf5730 first minor cleanup of export #78 2013-04-29 11:35:31 +02:00
iglocska c3aeb5ab69 Merge branch 'develop' of https://github.com/MISP/MISP into develop 2013-04-29 11:27:46 +02:00
Andras Iklody b5cbdfedd5 Update to the installation instructions 
- to reflect the removal of the old ACL
 2013-04-29 11:27:02 +02:00
Christophe Vandeplas 73e1053f4e fix rest authentication and further auth clean up 2013-04-29 11:22:46 +02:00
Andras Iklody 6332dbf05b Removal of more remnants of the old ACL and tightening of the filename 
checks

- actAs acl removed from role and user models together with some extra
code related to the ACL

- Fix of the filename regex as pointed out by cvandeplas.
 2013-04-29 10:52:07 +02:00
Andras Iklody 0eec208b45 Further changes to the authorisation 2013-04-26 15:46:39 +02:00
iglocska c23c130e85 Merge branch 'develop' of https://github.com/MISP/MISP into develop 2013-04-26 15:03:27 +02:00
Andras Iklody eeaa071024 Removal of the remains of the old authorization / adding new ones where 
needed
 2013-04-26 14:43:44 +02:00
Andras Iklody 9a3ae39967 db changes for the integrated ownership 
- updated the MYSQL.sql file,
	- tables aros, acos, aros_acos removed and shadow_attributes added
 2013-04-26 08:50:52 +02:00
Andras Iklody 33de5c0067 Reference to a now gone method fixed 2013-04-25 15:42:08 +02:00
Andras Iklody b98818ebfb Small errors with the merge corrected 
- some errors managed to slip through during the merge, should be fixed
 2013-04-25 15:37:49 +02:00
Andras Iklody 4396cec8ea Integrated ownership, ACL and minor fixes 
- Orgs can propose new attributes or changes to existing attributes for
  events that they do not own

- publishing users of the owner organisation can see, accept or discard
  them

- Reworked the access control

- minor fixes
 2013-04-25 14:04:08 +02:00
Christophe Vandeplas 912cddaf13 Merge branch 'feature/cleansanitize' into develop 
Fixes #96
 2013-04-24 16:02:56 +02:00
Christophe Vandeplas 8e720f87f2 fix sanitization in AppController #96 2013-04-24 16:01:44 +02:00
Christophe Vandeplas b0f9c92434 fix sanitization in AdminCrudComponent #96 2013-04-24 15:56:08 +02:00
Christophe Vandeplas 3be869a9d5 fix sanitization in Events #96 2013-04-24 15:49:35 +02:00
Christophe Vandeplas 8a74635e3a fix sanitization in Regexp #96 2013-04-24 15:33:22 +02:00
Christophe Vandeplas 01f7cc1027 fix sanitization in Roles #96 2013-04-24 15:24:39 +02:00
Christophe Vandeplas e9bcacfbc3 fix sanitization in Attributes #96 2013-04-24 15:20:20 +02:00
Christophe Vandeplas d11422831e fix sanitization in Users #96 2013-04-24 13:06:35 +02:00
Christophe Vandeplas e3b4179ee9 fix sanitization in Blacklists #96 2013-04-24 12:30:33 +02:00
Christophe Vandeplas 5c0fc36b79 fix sanitization in Servers #96 2013-04-24 12:23:03 +02:00
Christophe Vandeplas 31aefac521 fix sanitization in Whitelist 2013-04-22 16:45:32 +02:00
Christophe Vandeplas 7fab436229 fix sanitization in Logs 2013-04-22 16:39:47 +02:00
Christophe Vandeplas ad6427c225 Merge branch 'develop' of https://github.com/MISP/MISP into develop 2013-04-22 15:27:01 +02:00
Christophe Vandeplas 9a487c2bde Merge branch 'feature/correlation' into develop 2013-04-22 15:23:09 +02:00
Christophe Vandeplas 665defe7b1 cleanup crappy sanitization 2013-04-22 15:22:20 +02:00
Christophe Vandeplas 23742c543c rewrote fetching of the related events 2013-04-22 15:04:27 +02:00
Andras Iklody f6dade1e18 Performance tweak 
- User/Role not looked up recursively anymore for authorisation checks -
  improves performance significantly. Also, checking perm_add and
  perm_modify instead of doing a lookup in the ACL tables
 2013-04-22 14:44:55 +02:00
Christophe Vandeplas 97f93248f9 remove unused function 2013-04-22 11:14:49 +02:00
Christophe Vandeplas bc3921eece new logic to generate correlation, relates to issue #95 . Updated DB 
schema !
 2013-04-22 10:59:55 +02:00
Andras Iklody 63ef768665 Issue with Correlations going missing 
- Update to the delete in afterSaveCorrelation
 2013-04-18 11:06:10 +02:00
Andras Iklody 3e89c80d09 Removed some obsolete code 
- getName functions removed

- Fixed a reference to it in the logable behaviour
 2013-04-18 08:49:59 +02:00
Andras Iklody ada0fd2bfb Some fixes to indeces not set 
- Affecting Event creation, attribute deletion remotely and logging of
  event deletion
 2013-04-17 15:40:01 +02:00
Andras Iklody a6e2e8cfac Merge branch 'removeprivate' into develop 2013-04-17 11:18:15 +02:00
Andras Iklody 9a6733acfd Removal of deprecated code 
- The flag private is deprecated, removed together with the code that was
  affected by it
 2013-04-17 11:13:09 +02:00
Andras Iklody 2288a18603 Merge branch 'master' into develop 
Conflicts:
	app/Config/bootstrap.default.php
 2013-04-17 08:47:18 +02:00
Christophe Vandeplas a0f3db3881 Merge branch 'master' of https://github.com/MISP/MISP.git 2013-04-16 22:10:10 +02:00
Christophe Vandeplas 06038ca39c updated gitignore 2013-04-16 22:09:03 +02:00