MISP
/
misp-dashboard
mirror of https://github.com/MISP/misp-dashboard
2
0
Fork 0
Code Issues Releases Wiki Activity
564 Commits
8 Branches
5 Tags
9.6 MiB
Commit Graph

564 Commits (b313b7cc74550274a7372428c86aeec269dde791)

Author SHA1 Message Date
Sami Mokaddem eafc61e058 fix: solve comparing int and string 2018-05-09 12:59:03 +02:00
Sami Mokaddem f2c91c14e6 fix: typo 2018-05-09 11:57:31 +02:00
Sami Mokaddem 2ff3eabc47 fix: [GeoHelper] fix invalid coordinate 
In some cases, the coordinate given to redis may not match EPSG:900913 /
EPSG:3785 / OSGEO:41001, throwing an error. This fix adds a check and
skip the addition if it occurs
 2018-05-09 11:25:50 +02:00
Steve Clement 8ea5d01260
Merge pull request #56 from SteveClement/master 
Fixed pathing for config.cfg and ranking.cfg
 2018-04-06 23:47:19 +02:00
Steve Clement 834a1b18d8 - Fixed maxMindDb path in config.cfg creation" 2018-04-06 07:52:34 +02:00
Steve Clement 90543b716a - Added some checks if "stuff" is running 
-- ⚠️ This works but is not 100% reliable ⚠️
 2018-04-06 07:27:38 +02:00
Steve Clement c71834ef30 - Added cake… 2018-04-05 16:25:10 +02:00
Steve Clement 8f50423f89 - Added Licensing notes to 3/4/5.svg 2018-04-05 16:07:27 +02:00
Steve Clement ba7f7dec27 Merge remote-tracking branch 'upstream/master' 2018-04-05 15:58:14 +02:00
Steve Clement 7f1699553b - Added missing HonorableIcons assets 2018-04-05 15:54:23 +02:00
Steve Clement 4f5fe8d9bd - some formatting updates 2018-04-05 09:49:12 +02:00
Steve Clement dba2c4cfed - Gave up on screen, it is just not doable with my current skill-set… 
- removed obsolete redis-server from source detection (redis is at a usuable version in latest ubuntu)
 2018-04-02 15:20:52 +09:00
Steve Clement 1f23524dbc - Small typo and remove absolute pathing due to "cd" in the beginning (not ideal but now good enough) 2018-04-02 14:42:06 +09:00
Steve Clement 03f2da36eb - After some buggering about, I think this will now finally work 
- bash -c wants to have positional parmeters, anything else is wrong,
    man bash: If the -c option is present, then commands are read from string.  If  there  are  arguments after the string, they are assigned to the positional parameters, starting with $0.
 2018-04-02 14:13:46 +09:00
Steve Clement 0426b07a58 - Remove set -e, which prevents execution as soon as a process returns an exit code != 0 2018-04-02 13:37:57 +09:00
Steve Clement 721fadba60 - Go to misp-dashboard home directory 
- Add a more sane bash way of checking for netstat results
 2018-04-02 13:32:32 +09:00
Steve Clement e070b94b4e - Maybe a fix for a very weird bash behaviour… see: http://pastebin.lu/ovilikesos.bash 2018-04-02 13:10:21 +09:00
Steve Clement 9691536a21 - Remove DASH_HOME legacy… 
-- Now more dynamic
- Added python venv check
- Removed necessity of activating the the venv
 2018-04-02 01:59:08 +09:00
Steve Clement a3ef669e80 - Added very flaky check if something is running on port 6250 
-- Mostly added this because the VM builder already launches a redis on port 6250
 2018-03-31 19:58:38 +09:00
Steve Clement 4924da6ce5 - config directory is one up. 2018-03-31 19:43:50 +09:00
Steve Clement 1d57ce4525 - Another typo, closing parenthesis 2018-03-31 19:40:03 +09:00
Steve Clement b7be2afaa1 - Small typo, one _ missing on each side ;) 2018-03-31 19:36:17 +09:00
Steve Clement a6c4f2928d - Fixed the brokeness of: - echo export DASH_CONFIG=$(pwd)/config/ >> ./DASHENV/bin/activate 
-- This is mostly wrong for people not running misp-dashboard interactively.
-- It also assumes people use DASHEN as their virtualenv name (One more issue along those lines remain, $DASH_HOME)
 2018-03-31 19:21:52 +09:00
Steve Clement 6e225f8778 - Brain fart, oversaw (read didn't look for) start_all.sh 2018-03-31 18:55:16 +09:00
Steve Clement 294eb8688b Merge branch 'master' of github.com:MISP/misp-dashboard 2018-03-28 16:24:11 +00:00
Steve Clement 7b13e4079b - run.sh for tmux integration on-boot 2018-03-28 16:23:36 +00:00
Steve Clement 9733fc327d
Merge pull request #54 from SteveClement/master 
- Fixed md formatting typo
 2018-03-28 15:10:50 +09:00
Steve Clement de8fed90c2 - Fixed md formatting typo 2018-03-28 15:10:16 +09:00
Steve Clement fc921febef
Merge pull request #47 from SteveClement/master 
- Made sure GeoLite is a symlink (thus GeoLite updates do not face…
 2018-03-16 01:05:36 +09:00
Steve Clement b47daae144 - Made sure GeoLite is a symlink (thus GeoLite updates do not face date changes) 
- Added update gotcha
 2018-03-16 01:02:53 +09:00
Steve Clement 0d063d41fe
Merge pull request #45 from SteveClement/master 
- Added conditional if config file has changed
 2018-03-16 00:19:38 +09:00
Steve Clement d07d8c00b0 - Added conditional if config file has changed 2018-03-16 00:17:57 +09:00
Steve Clement cb88714759
Merge pull request #44 from SteveClement/master 
- Added missing dependency "unzip"
 2018-03-16 00:09:14 +09:00
Steve Clement 32e29cf9ef - Added missing dependency "unzip" 2018-03-16 00:08:25 +09:00
Alexandre Dulaunoy 67ee53af06
Merge pull request #42 from P4rs3R/patch-4 
Simply Python3
 2018-03-14 17:11:11 +01:00
Alexandre Dulaunoy 05b491e0b4
Merge pull request #41 from P4rs3R/patch-3 
Port option on redis-server
 2018-03-14 17:10:07 +01:00
A. Cristallo 5da749cc2a
Simply Python3 
With header /usr/bin/env python3.5 doesn't run with the last python3 (3.6), so imho it's better not specify the subversion (.5, .6 and so on), simply leaving "python3".

Tested with Python 3.6.3 onVM "Linux misp" (Ubuntu kernel 4.13 x64)
 2018-03-14 17:08:45 +01:00
A. Cristallo c7bddf41e7
Port option on redis-server 
You can specify the port by adding "--port", "-p" doesn't rule. (Checked also on https://redis.io/topics/config)- "-p" is for redis-cli (https://redis.io/topics/rediscli).
 2018-03-14 16:56:55 +01:00
Sami Mokaddem 9e097326e3
Update config.cfg.default 
Being consistent with launch script
 2018-03-12 09:40:21 +01:00
Sami Mokaddem 3c4f36dc4b
Merge pull request #40 from P4rs3R/patch-2 
simply python3
 2018-03-07 18:22:56 +01:00
Sami Mokaddem 3f34204d0c
Merge pull request #39 from P4rs3R/patch-1 
Simply python3
 2018-03-07 18:22:40 +01:00
A. Cristallo 3a36928240
simply python3 
With header /usr/bin/env python3.5 doesn't run with the last python3 (3.6), so imho it's better not specify the subversion (.5, .6 and so on), simply leaving "python3".

Tested with Python 3.6.3 onVM "Linux misp" (Ubuntu kernel 4.13 x64)
 2018-03-07 18:13:17 +01:00
A. Cristallo 93576ce07a
Simply python3 
With header /usr/bin/env python3.5 doesn't run with the last python3 (3.6), so imho it's better not specify the subversion (.5, .6 and so on), simply leaving "python3".

Tested with Python 3.6.3 onVM "Linux misp" (Ubuntu kernel 4.13 x64)
 2018-03-07 18:07:40 +01:00
Alexandre Dulaunoy d3f565ed20
Merge pull request #38 from mokaddem/master 
Fix: Added a stroke to border the pie chart
 2018-02-23 13:29:23 +01:00
Sami Mokaddem 3b6881fd26 fix #32: Added black stroke for pie chart so that blank color is visible 2018-02-22 10:35:59 +01:00
Sami Mokaddem 6825e10128 Merge remote-tracking branch 'upstream/master' 2018-02-22 10:17:31 +01:00
Sami Mokaddem fdcc02c77a Merge remote-tracking branch 'upstream/master' 
Resyncing with upstream
 2018-02-22 10:13:04 +01:00
Sami Mokaddem 07a66403d9
Merge pull request #37 from mokaddem/quick-fix 
fix: register tags from attributes
 2018-02-22 09:48:18 +01:00
Sami Mokaddem 8e59307ab4 fix: Attribute 'Tag' in misp_json.Attributes does not contain the field 'Tag' anymore 2018-02-22 09:45:33 +01:00
Sami Mokaddem de1880a2fc fix: message_passing picture better reflect reality 2018-02-21 18:24:40 +01:00