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

901 Commits (0eec208b45c6f9e245a48b685db65ab9b55abdfa)

Author SHA1 Message Date
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
Andras Iklody 9be1f6c550 Fixed a sanitization issue with encrypted emails 2013-04-16 17:39:28 +02:00
Christophe Vandeplas 2ff9af3164 fix merge issue 2013-04-16 17:04:48 +02:00
Christophe Vandeplas 60378a076b Merge branch 'master' of https://github.com/MISP/MISP.git 2013-04-16 16:59:47 +02:00
Christophe Vandeplas 8029d7fa29 removes multiple correlation engines Fixes #83 but after testing issue 
#95 comes to light
 2013-04-16 16:59:12 +02:00
Andras Iklody 4bd20c5355 Merge branch 'master' of https://github.com/MISP/MISP 
Conflicts:
	app/Config/bootstrap.default.php
 2013-04-16 16:18:57 +02:00
Andras Iklody 9a1bb61ed5 Small fixes 
- Comments about isAdmin vs isSiteAdmin

- Extra config line added to bootstrap.default.php for the built in e-mail
  system
 2013-04-16 15:55:33 +02:00
Andras Iklody 3d2d752d3f Small fix 2013-04-16 15:54:24 +02:00
Andras Iklody 6fc5b63fb9 Small changes 
- added an optional field to the bootstrap default (used by the e-mail
  notification system)

- Clarification about the isAdmin and isSiteAdmin (comment)
 2013-04-16 15:52:19 +02:00
Christophe Vandeplas 8d5782125d removed unused CyDefSIG.showowner field. Closes issue #93 2013-04-16 15:29:34 +02:00
Andras Iklody b9b5e60973 Merge branch 'develop' 2013-04-16 09:06:16 +02:00
Andras Iklody 230d7b4ba1 Wrong version of adminCrudComponent 
- Can cause issues when saving roles, replaced with the newer version.
 2013-04-16 09:01:03 +02:00
Andras Iklody 1b1e5a1cb6 Merge branch 'develop' 2013-04-12 13:28:00 +02:00
Andras Iklody be2d6ae3b9 Removed leftover debug code 
- forced exception to test debug output left in - removed
 2013-04-12 13:21:21 +02:00
Christophe Vandeplas 9007bc1d85 updated github url 2013-04-12 10:43:06 +02:00
iglocska 433b382055 Merge branch 'master' of https://github.com/BeDefCERT/MISP 2013-04-10 16:32:13 +02:00
iglocska 3ab63b4697 Small edit fixes #75 
- Event was not deleted when another non site-admin org user tried to
  delete an event due to the event not being read before its organisation
  was compared to that of the logged in user -> fixed.
 2013-04-10 10:48:30 +02:00