MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
7,542 Commits
42 Branches
370 Tags
181 MiB
Commit Graph

499 Commits (82e5a64441671504464eda90a3c65a1899a54960)

Author SHA1 Message Date
iglocska c09741ebfc new: Further work on the objects 
- uuids of both sides saved in references
- attachment adding fixed
 2017-09-01 17:42:54 +02:00
iglocska 5552d7c030 new: Several new features 
- added multiple flag among other things
 2017-08-29 18:28:18 +02:00
iglocska 961bc76393 Merge branch '2.4' into objects_wip 2017-08-21 10:17:16 +02:00
iglocska 859d6e1c46 new: Added object relations 2017-08-21 10:13:19 +02:00
iglocska be38a769c2 fix: Fixed mistyped field 2017-08-16 22:25:56 +02:00
iglocska 8be3f61be6 fix: Fixes to the galaxy import tool 2017-08-16 22:18:32 +02:00
iglocska e9caf3c180 fix: Fixed an outdated index pointing to a now non-existant field 2017-08-10 09:12:21 +02:00
iglocska 0e7dd2eddc new: Added first iteration of object references and other changes 
- various fixes
- rework of the pagination library
 2017-08-09 17:53:25 +02:00
iglocska 8f6b53ee24 new: Progress on the Objects 
- Fixed UI elements in the event view
- Added object-aware filtering to the event view
- Objects can now be deleted and viewed once deleted
  - object sanitisation if the setting is set is implemented
- Edit objects directly from the interface (if the template exists)
- Various other fixes
 2017-08-06 18:23:24 +02:00
iglocska 48423fa181 fix: Added description field to object template elements 2017-08-03 14:44:33 +02:00
iglocska 1bf51908ea fix: Fixed previous commit 2017-08-03 14:26:11 +02:00
iglocska 04ffe988a5 fix: Missing field in object template elements added to match upgrade script 2017-08-03 14:23:35 +02:00
iglocska 3b004d5686 Merge branch '2.4' into objects_wip 2017-08-03 11:20:34 +02:00
Johnny 9eeeb9a4f7 Adds missing sudo invocation 2017-07-27 16:30:26 -07:00
iglocska f89a9ce061 fix: Added user password length change to the MYSQL.sql file 2017-07-12 15:59:20 +02:00
Deventual e4be865e1b minor adjustments 2017-07-10 17:45:56 +03:00
Alexandre Dulaunoy 7886b58b46 Merge branch '2.4' into patch-10 2017-07-10 16:33:05 +02:00
Deventual 59be217fae fix minor instructions 2017-07-10 15:25:20 +03:00
Deventual d665a9326f added mixbox update instructions 2017-07-10 15:22:36 +03:00
iglocska a5d582750e fix: Updated fields 2017-07-06 15:02:19 +02:00
iglocska 38d02692df fix: Removed obsolete table 2017-07-05 10:55:07 +02:00
iglocska 38620a4c0e fix: Fixed object references table 2017-07-05 10:36:45 +02:00
iglocska d10c7cd4b0 Merge branch '2.4' into objects_wip 2017-07-02 00:08:14 +02:00
iglocska ee1c1c5de9 new: Further progress on the objects 2017-07-02 00:05:15 +02:00
iglocska f53d954c51 fix: Removed unused fulltext index in favour of 255 length index 2017-06-29 07:44:14 +02:00
Phi|eas |ebada dcfa6ed7b1 Fix gpgv2+ key generation 
This resolves failing of gpgv2 key generation with the following error message:
```
gpg: agent_genkey failed: Permission denied
Key generation failed: Permission denied
```

# Explanation
gpgv2's `pinentry-curses` requires access to a current `tty`. If you `su` or `sudo` between users, your tty's permission will stay the same as the initial login user (see illustrating below). You could, in general, work around issues like this by:
 - `old_perms=$(stat -c "%U:%G" $(tty)); chown "www-data:tty" "$(tty)" && { sudo -u www-data gpg --gen-key; chown "${old_perms}" "$(tty)"; }` (uncertain security implications and won't probably work)
 - starting screen/tmux within the newuser and then running `gpg --gen-key`
 - starting a script session

But first point can't really be recommended, latter two will fail because www-data login shell is `/usr/sbin/nologin`. 

Just for illustrating the problem better for you:
```
ssh alice@somehost:
stat -c "%U:%G $(tty)" $(tty)
alice:tty /dev/pts/1
su - root
stat -c "%U:%G $(tty)" $(tty)
alice:tty /dev/pts/1
`
 2017-06-28 13:40:53 +02:00
SHSauler 0c390817f6 fix: cleanup/sync of installation guides 2017-06-27 21:17:14 +02:00
Kevin Allix 2b6ee46e9a Change (where needed) shebang to /usr/bin/env xxx for better portability 2017-06-24 13:37:42 +02:00
dc 5f103469c9 Fixes #2278 2017-06-22 14:43:48 +02:00
dc 70939ef37d Fixes #2278 2017-06-22 14:43:12 +02:00
Fafner [_KeyZee_] 7d4fcd62bb Update INSTALL.debian9.txt 2017-06-20 16:00:01 +02:00
Fafner [_KeyZee_] 0ad98bc6af Update INSTALL.debian9.txt 2017-06-20 15:57:57 +02:00
Fafner [_KeyZee_] 5cf41785b3 Create INSTALL.debian9.txt 2017-06-20 15:48:55 +02:00
iglocska 1db9f8c074 fix: Added Mixbox to the STIX installation, fixes #2262 ##comma## fixes 2261 
- provided by @newdominic
 2017-06-14 10:31:27 +02:00
iglocska 93a99208c6 Merge branch '2.4' into feature/objects 2017-06-13 12:08:26 +02:00
iglocska 2b6ddaff95 chg: Added new fields to mysql 2017-06-13 12:00:32 +02:00
Steffen Sauler 032a592642 fix: logrotate, database.php settings explanation 2017-05-30 17:48:44 +02:00
iglocska c80621d2ef fix: Removed two duplicate fields from MYSQL.sql 2017-05-10 14:33:05 +02:00
iglocska 4ba1fb8fd8 fix: Added missing fields causing pulled events to not contain attributes, fixes #2171 2017-05-10 14:24:34 +02:00
Ángel González 926895733b Cosmetic changes 
Change space indents to tabs
Remove ?> at end of file
Add or remove some indentation where appropriate
 2017-05-08 00:45:57 +02:00
Andras Iklody 699be1ed30 Merge pull request #1947 from SekoiaLab/fix/install_sql 
Fix/install sql
 2017-04-30 18:42:45 +02:00
devnull- 9835b8932f Merge branch '2.4' into issues_1643 2017-04-27 10:04:32 +02:00
juju4 47cfcd1047 Remove default value for column comment 
ERROR 1101 (42000) at line 20: BLOB, TEXT, GEOMETRY or JSON column 'comment' can't have a default value
https://travis-ci.org/juju4/ansible-MISP/jobs/222624828#L7561
(ubuntu xenial, mysql 5.7)
https://dev.mysql.com/doc/refman/5.7/en/blob.html

Strangely, this does not affect centos7 and mariadb 5.5 even if corresponding documentation states the same.
https://travis-ci.org/juju4/ansible-MISP/jobs/222624827#L4862
 2017-04-16 18:05:47 -04:00
Hannah Ward b0a70af731
fix: remove now unneeded JS deps 2017-04-13 10:52:54 +01:00
Hannah Ward ecf1406ae4
fix: Only require node for development purposes - compiles to JS 2017-04-13 09:14:34 +01:00
Hannah Ward d1d7d0c632
chg: add npm instructions in install 2017-04-11 16:32:18 +01:00
iglocska 8acd4a783d chg: DB changes pre-loaded for 2.4.71 2017-04-10 17:25:10 +02:00
Justin Hopple aea4003422 Update xINSTALL.centos6.txt 2017-03-27 19:46:56 -05:00
Richard van den Berg bc37031530 Add perm_sighting to initial database and roles 2017-03-17 14:43:41 +01:00
iglocska 048cfab5a9 fix: Fixed sql fail 2017-03-08 17:55:20 +01:00
iglocska e1baec2896 fix: Fixed some default value issues with taxonomy colours 2017-03-08 15:04:38 +01:00
iglocska 46695b8ca2 fix: Several blacklist related fixes 
- turned the functionality to a default on feature
- added indexes
- fixed some default values
 2017-03-07 17:39:44 +01:00
devnull- 89e76bc859 Merge branch '2.4' into issues_1643 2017-02-28 15:47:28 +01:00
iglocska 470f90b5b5 fix: More invalid MySQL fields fixed 2017-02-24 11:17:10 +01:00
iglocska 72d6b275ba fix: Fixed a mysql issue 2017-02-24 11:12:30 +01:00
iglocska a59aab9b23 fix: Re-added the accidentally removed code in a merge, fixes #1965 
- affects f0e1a27b7d
 2017-02-20 18:43:36 +01:00
devnull- f35d247930 Merge branch '2.4' into issues_1643 2017-02-20 09:23:07 +01:00
iglocska 1251eb8189 fix: Added missing column in MYSQL.sql and some indexing 2017-02-17 09:46:07 +01:00
iglocska 2f80d46dcf fix: typo 2017-02-17 09:39:24 +01:00
iglocska 88c08af7df fix: MYSQL.sql brought up to date 2017-02-17 09:34:56 +01:00
iglocska dc8a9707c0 Merge branch '2.4' into feature/enhanced_sightings 2017-02-16 22:52:53 +01:00
devnull- f24682f86a Merge branch '2.4' into issues_1643 2017-02-16 21:49:45 +01:00
iglocska 01eb208697 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2017-02-16 18:01:34 +01:00
iglocska 18272cd7ed fix: Changed installation behaviour of composer 
- no longer requires the live download and execution of the composer package
  - compromising https://getcomposer.org/ could lead to RCE for new MISP installations during the installation

- As reported by Trey Darley (@treyka)
 2017-02-16 17:59:19 +01:00
Trey Darley e74552a3e7 remove spurious php5-xml 
php5-xml is not a separate package; it's included with libapache2-mod-php5.
 2017-02-16 16:00:11 +00:00
Adrien RAFFIN 7149a7c7f8 fix: Add event_blacklists and org_blacklists in POSTGRESQL install scripts 
Also fix small bug in imported MYSQL syntax

WARNING: NOT tested in production

Tests were only done to create database structure, MISP wasn't run with
this database. It still could have incompatibilities with Model
 2017-02-16 13:04:30 +01:00
Adrien RAFFIN 9dd55f5380 fix: Add event_blacklists and org_blacklists in MYSQL install scripts 2017-02-16 13:04:30 +01:00
Andras Iklody 1f0c6cf6ab Merge pull request #1942 from Deventual/patch-5 
fixed install instructions
 2017-02-16 12:10:33 +01:00
Andras Iklody 23fa621f76 Merge pull request #1944 from Deventual/patch-7 
fixed install instructions
 2017-02-16 12:10:13 +01:00
Andras Iklody 8718cfbfcd Merge pull request #1945 from Deventual/patch-8 
Fixed install instructions
 2017-02-16 12:09:56 +01:00
Deventual 84687f77f8 Fixed install instructions 
Added php-xml, without it this issue can rise:
Class 'DOMDocument' not found in [/var/www/MISP/app/Lib/cakephp/lib/Cake/Utility/Xml.php
 2017-02-16 12:35:08 +02:00
Deventual cbf890cf72 fixed install instructions 
Added php-xml, without it this issue can rise:
Class 'DOMDocument' not found in [/var/www/MISP/app/Lib/cakephp/lib/Cake/Utility/Xml.php
 2017-02-16 12:33:57 +02:00
Deventual ce41ad02b5 Update INSTALL.debian7.txt 2017-02-16 12:30:40 +02:00
Deventual 822bd04c45 fixed install instructions 
Added php-xml, without it this issue can rise:
Class 'DOMDocument' not found in [/var/www/MISP/app/Lib/cakephp/lib/Cake/Utility/Xml.php
 2017-02-16 12:27:40 +02:00
Deventual ae90644ef6 fixed install instructions 
Added php-xml, without it this issue can rise:
Class 'DOMDocument' not found in [/var/www/MISP/app/Lib/cakephp/lib/Cake/Utility/Xml.php
 2017-02-16 12:26:04 +02:00
Andras Iklody db91b4864b Merge pull request #1937 from Deventual/patch-4 
Fixed install instructions
 2017-02-16 11:18:04 +01:00
Deventual 00c8de9868 Fixed install instructions 
Added php-xml, without it this issue can rise:
Class 'DOMDocument' not found in [/var/www/MISP/app/Lib/cakephp/lib/Cake/Utility/Xml.php
 2017-02-15 18:30:26 +02:00
Deventual 5d9f4f0999 fixed install instructions 
Added php-xml, without it this issue can rise:
Class 'DOMDocument' not found in [/var/www/MISP/app/Lib/cakephp/lib/Cake/Utility/Xml.php
 2017-02-15 18:27:03 +02:00
Richard van den Berg 2ccb10c198 Add sudo for cp logrotate 2017-02-12 17:08:06 +01:00
Richard van den Berg 0bcb3376e5 Add logrotation for MISP workers output 2017-02-06 17:26:17 +01:00
iglocska 4ad022b03c Merge branch '2.4' into feature/attribute-tagging 2017-01-16 16:15:06 +01:00
iglocska 44fcf5dfdb chg: Added event ID to the attribute level tags 2017-01-14 00:16:05 +01:00
mdtro 3406375bb8 Fixed typo in dependency installs 
rh-php56-bcmath should be rh-php56-php-bcmath
 2017-01-10 17:12:06 -06:00
Ben Drysdale 7903064014 Fixed typo in xINSTALL.centos7.txt 2017-01-10 22:50:07 +00:00
devnull- d500f8682d Update the database schema unpublish_event (servers) & PublishWithoutEmail (servers) 2017-01-05 16:40:40 +01:00
devnull- c4d66e03e9 Update the database schema unpublish_event (servers) 2017-01-05 16:38:24 +01:00
devnull- c42e9dc2f9 Update the database schema PublishWithoutEmail (servers) 2017-01-05 16:38:19 +01:00
iglocska 7146652059 Merge branch '2.4' into feature/attribute-tagging 2016-12-26 23:30:21 +01:00
iglocska 5a58d0d8d5 chg: Added colour fields to sql files 2016-12-25 18:13:51 +01:00
Richard van den Berg 50f684d1c5 Add missing indexes 2016-12-15 18:38:51 +01:00
Moshe Kaplan c895f898c3 Update xINSTALL.centos7.txt 2016-12-14 08:24:14 -05:00
Richard van den Berg 9d89516e58 Add fulltext indexes from AppModel.php to MYSQL.sql 2016-12-13 10:34:29 +01:00
Moshe Kaplan 4957edcd22 Update xINSTALL.centos7.txt 2016-12-12 13:24:27 -05:00
Richard van den Berg e8ce32f0a2 Set proposal_to_delete default to 0 2016-12-09 09:54:08 +01:00
Iglocska 0280fad3e6 fix: index length fixed for several text fields 2016-12-06 00:38:11 +01:00
Iglocska 2ac3d543f3 fix: Escape field names again 
- TODO, have a backtick replacement script for postgres
 2016-12-06 00:21:19 +01:00
Iglocska b8c28c20b1 fix: Attempt at a fix for SQL woes 2016-12-06 00:02:32 +01:00
Iglocska 8302048dd9 fix: Fixed an issue where a normal index was attempted to be created for a text field causing the installation to fail 2016-12-05 23:31:23 +01:00
Iglocska fe49d598f6 new: Added galaxy tables 2016-12-03 23:43:48 +01:00
Iglocska 2875789804 fix: Some additional changes to accomodate for the automatically enabled sightings 2016-11-21 17:57:55 +01:00