MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
2,726 Commits
35 Branches
365 Tags
189 MiB
Commit Graph

2726 Commits (c3ebc18afa81a68fa3fa0722cb7a1d0fa8ea8eb4)

Author SHA1 Message Date
iglocska c3ebc18afa Merge branch 'develop' 2015-11-03 17:07:19 +01:00
iglocska 8f1363df37 Merge branch 'hotfix-2.3.151' into develop 2015-11-03 17:07:12 +01:00
iglocska 42ad040d3c Removed obsolete gitignore files, fixes #704 2015-11-03 17:06:21 +01:00
iglocska 5f06e87b6c Merge branch 'hotfix-2.3.150' into develop 2015-10-31 00:29:59 +01:00
iglocska 4b24cf0c65 Documentation changes 2015-10-31 00:29:15 +01:00
iglocska 9c00d56ed4 View all proposals via the API 
- Proposals that can be accepted / discarded via the API
- Can restrict the index to the proposals of a single event
 2015-10-31 00:18:05 +01:00
iglocska e12d70c5c3 Merge branch 'hotfix-2.3.149' into develop 2015-10-30 16:30:34 +01:00
iglocska 70eb812060 Merge branch 'hotfix-2.3.149' 2015-10-30 16:29:32 +01:00
iglocska 345e898f5f Tagging added to the API 
- Create / Edit / Remove / index / view tags via the API
 2015-10-30 16:28:51 +01:00
Iglocska fdd75f4ae4 Merge branch 'hotfix-2.3.148' into develop 2015-10-28 23:34:58 +01:00
Iglocska 70e776eff1 Merge branch 'hotfix-2.3.148' 2015-10-28 23:34:13 +01:00
Iglocska 059a8aa43a Added API for proposals 
- APIs for the following actions:
  - Add new proposed attribute to an event
  - Add proposed change to an attribute
  - View a proposal
  - Accept a proposal
  - Discard a proposal

- new APIs described on the automation page
 2015-10-28 23:32:30 +01:00
Iglocska f3e1654310 Merge branch 'hotfix-2.3.147' 2015-10-27 15:18:31 +01:00
Iglocska 80f29c1f33 More details on the PGP validation tool 2015-10-27 15:18:04 +01:00
Iglocska e759803334 Merge branch 'hotfix-2.3.147' into develop 2015-10-27 14:02:01 +01:00
Iglocska a9df8e4c91 Merge branch 'hotfix-2.3.147' 2015-10-27 14:01:11 +01:00
Iglocska f9da3f2d2c Small fix to the pgp key validation tool 
- doesn't break on completely invalid keys anymore
 2015-10-27 14:00:31 +01:00
iglocska f7f3142a91 Merge branch 'hotfix-2.3.146' into develop 2015-10-27 08:36:14 +01:00
iglocska ddd51c3a0f Merge branch 'hotfix-2.3.146' 2015-10-27 08:35:10 +01:00
iglocska aede05bdc6 Version bump 2015-10-27 08:34:59 +01:00
iglocska 7d651f094b Fix to a vulnerability found in attributescontroller 
- vulnerability reported by Airbus Group CERT

- Deprecated ajax attribute view had inverse access control logic
- removed ajax path
- added XML/JSON view
 2015-10-27 08:31:48 +01:00
iglocska 679bef35f0 Merge branch 'hotfix-2.3.145' into develop 2015-10-22 09:57:18 +02:00
iglocska 07f411c71f Merge branch 'hotfix-2.3.145' 2015-10-22 09:52:04 +02:00
iglocska 6fa27d659a Reverted change in proposal file storage path that wasn't needed 2015-10-22 09:51:31 +02:00
iglocska 35661f24f8 Merge branch 'hotfix-2.3.144' into develop 2015-10-21 23:52:46 +02:00
iglocska fa55f7fa9d Merge branch 'hotfix-2.3.144' 2015-10-21 23:51:50 +02:00
iglocska f4f4f0f069 Version bump 2015-10-21 23:51:36 +02:00
iglocska 26a4705bb3 Removed junk 2015-10-21 23:50:55 +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 8abe186661 Merge branch 'hotfix-2.3.143' into develop 2015-10-15 17:45:17 +02:00
Iglocska 1aedfebf33 Merge branch 'hotfix-2.3.143' 2015-10-15 17:45:03 +02:00
Iglocska 4a358c9fee Removed junk 2015-10-15 17:44:33 +02:00
Iglocska d3ef52d54c Merge branch 'hotfix-2.3.143' into develop 2015-10-15 17:41:07 +02:00
Iglocska 136daa1be1 Merge branch 'hotfix-2.3.143' 2015-10-15 17:40:53 +02:00
Iglocska 7fab2ce2be Added the attribute relations to the XML / JSON output, fixes #687 2015-10-15 17:39:17 +02:00
Alexandre Dulaunoy d2e8cb8acb Copyright notices as a list. 2015-10-14 15:50:25 +02:00
Alexandre Dulaunoy eabd5c622a Update following recommendation #686 2015-10-14 15:45:17 +02:00
Alexandre Dulaunoy 1c3f98502f Merge branch 'master' of github.com:MISP/MISP 2015-10-14 15:39:09 +02:00
Alexandre Dulaunoy 56854c0a06 Updates following recommendation #686 2015-10-14 15:36:46 +02:00
Iglocska 9ed9052401 Merge branch 'hotfix-2.3.142' into develop 2015-10-14 15:10:32 +02:00
Iglocska abd9fbbd00 Merge branch 'master' of https://github.com/MISP/MISP 2015-10-14 15:09:49 +02:00
Iglocska 3a7b2dd120 Merge branch 'hotfix-2.3.142' 2015-10-14 15:08:58 +02:00
Iglocska 3dc83778c2 Fixed the current user check while removing dead workers, fixes #685 
- as pointed out by RichieB2B
 2015-10-14 15:07:29 +02:00
Alexandre Dulaunoy 737578a112 Merge branch 'master' of github.com:MISP/MISP 2015-10-13 15:49:39 +02:00
Alexandre Dulaunoy abd9fc18d6 Licensed updated to AGPL 3.0 - #686 2015-10-13 15:48:59 +02:00
Iglocska 8c24e77912 Merge branch 'hotfix-2.3.141' into develop 2015-10-13 10:52:47 +02:00
Iglocska dbea871d5e Merge branch 'hotfix-2.3.141' 2015-10-13 10:52:11 +02:00
Iglocska c9bf8105e6 Replaced get_current_user for the process owner identification, fixes #685 
- As RichieB2B noted, get_current_user() gets the owner of the script in CentOS / RHEL not the user executing the script (as in Ubuntu)

- Current solution uses posix_getpwuid and posix_geteuid if the php-posix package is installed
- if not, it uses whoami
 2015-10-13 10:49:55 +02:00
Iglocska 79ff93a3a2 Merge branch 'hotfix-2.3.140' into develop 2015-10-12 16:52:02 +02:00
Iglocska ab6ae4be67 Merge branch 'master' of https://github.com/MISP/MISP 2015-10-12 16:50:50 +02:00