Alex-Devera/tpotce
1
0
Fork 0
mirror of https://github.com/telekom-security/tpotce.git synced 2025-10-30 20:12:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
2116 commits 9 branches 18 tags 393 MiB
Commit graph

341 commits

Author SHA1 Message Date
Marco Ochse
5d8ad0a623 add spiderfoot persistence 2017-05-25 21:59:26 +00:00
Marco Ochse
2bbafbc791 handle iptables differently 2017-05-23 23:32:07 +00:00
Marco Ochse
345df08941 improvements 
use docker-compose from pypi with support for 2.1 compose file version
logstash, kibana, head & netdata are now depending on a healthy elasticsearch container before starting
remove alerta-cli
tweak installer
 2017-05-22 19:36:41 +00:00
Marco Ochse
931ac2dd85 tweaking 
update dps.sh
adjust docker-compose related tpot configs for dionaea (stdin_open: true)
adjust tpot.service (suritcata / p0f prep) to be aware of a situation without local network route ( Fixes#99 )
 2017-05-11 17:01:21 +00:00
Marco Ochse
ce0e42e555 get latest ctop 2017-05-04 22:52:32 +00:00
Marco Ochse
b36c63962d tweaking, prepare for elk microservice 2017-05-03 20:55:18 +00:00
Marco Ochse
3de02ee7b0 tweaking for docker-compose 
get rid of self-check scripts, docker-compose takes care of that now
use tpot.yml config for tpot scripts
wipe crontab clean of legacy scripts
check.lock no longer needed (rc.local)
adjust installer (invisible cursor, get image info from tpot.yml, some tweaking)
 2017-05-01 19:03:27 +00:00
Marco Ochse
365e1a1e5c prepare switch to docker-compose 2017-04-30 23:34:30 +00:00
Marco Ochse
291034d53e feed newlines when patching sshd config 2017-04-26 20:01:15 +02:00
Marco Ochse
dc30cd81c2 fix token for everything installation 2017-04-24 17:21:45 +02:00
Marco Ochse
0d684cc825 add pypi to list of internet checks 2017-04-24 16:57:58 +02:00
Marco Ochse
843ba30762 final touches on installer 
move tsec password dialog from debian installer to t-pot-installer
check for secure password for tsec and web user
fix layout issue
 2017-04-24 16:06:23 +02:00
Marco Ochse
50a93f5abf neatify two installer widgets 2017-04-22 20:05:12 +02:00
Marco Ochse
66dd2398e8 cleanup and prettyfy installer 
reorganized installer
now using dialog throughout the whole installation
 2017-04-21 01:11:10 +02:00
Marco Ochse
8417ed2fbd fix path 2017-04-19 15:48:27 +02:00
Marco Ochse
845a11e240 fix path 2017-04-19 15:39:34 +02:00
Marco Ochse
9fea0461fc Clean up, add Spiderfoot 
tpot configs are now stored in /etc/tpot/
tpot related scripts are now stored /usr/share/tpot/bin
some scripts are improved
some scripts are cleaned of old comments
spiderfoot is now part of tpot
 2017-04-19 12:22:51 +00:00
Marco Ochse
62ce12a8a9 disable logging for installer 
1. improve performance
2. improve convenience, user sees progress
3. infos and errors are displayed
 2017-04-17 00:53:47 +02:00
Marco Ochse
5b267b396f improve installer 2017-04-16 23:44:19 +02:00
Marco Ochse
c9827f0f03 manage kibana objetcs, ES dump and restore, ES folder backup 2017-04-14 22:08:35 +00:00
Marco Ochse
90592e7388 manage kibana objetcs, dump and restore 2017-04-12 20:46:12 +00:00
Marco Ochse
d54702ece8 include updates 2017-04-10 20:38:22 +00:00
Marco Ochse
1453e26f76 prepare for forward logs to cc 2017-04-07 15:20:56 +00:00
Marco Ochse
ff4a87ff42 set linux as term 2017-03-22 18:42:24 +00:00
Marco Ochse
9090b5cfd7 installer ui improvements 2017-03-22 18:27:43 +00:00
Marco Ochse
052a3489e9 fix typo 2017-03-17 23:49:29 +00:00
Marco Ochse
ffc0edd587 prepare for elk 5.x and improvements 2017-03-17 23:47:04 +00:00
Marco Ochse
a94b34c8a8 add some colors 2017-03-15 09:28:12 +00:00
Marco Ochse
71e1069dbe fix 2017-03-13 22:17:02 +00:00
Marco Ochse
412c7fa508 fix 2017-03-13 21:58:48 +00:00
Marco Ochse
fcbb2952d3 fixes and improvements 2017-03-13 21:19:28 +00:00
Marco Ochse
a556a193f7 fix netdata error 2017-03-13 19:44:02 +00:00
Marco Ochse
d3599bcc10 update ui-for-docker systemd 2017-03-13 16:29:51 +00:00
Marco Ochse
fddfc68ff3 improvements 2017-03-13 16:10:37 +00:00
Marco Ochse
ff75c6c588 modify installer for 17.06 2017-03-13 10:07:46 +00:00
Marco Ochse
a98e6bfc53 prepare for 17.06 dev env 2017-03-13 00:38:43 +00:00
Marco Ochse
4a67a47a04 remove some services from myip.sh 2017-03-12 23:50:27 +00:00
Marco Ochse
4a58f7488a fix bug myip.sh 2017-03-12 23:46:12 +00:00
Marco Ochse
c5de828d7e prepare for new ewsposter 2017-03-12 23:31:34 +00:00
Marco Ochse
fb02d41e57 add latest ctop 2017-03-12 20:57:56 +00:00
Marco Ochse
35700a731b update /etc/issue 2017-03-12 12:05:22 +00:00
Marco Ochse
26a9357d84 modify elk service 2017-03-08 17:06:13 +00:00
Marco Ochse
fab294bdda remove patching docker defaults 
handled in systemd scripts for each container
 2017-03-04 21:24:50 +01:00
Marco Ochse
9fbdcf80f5 add working solution for head 2017-02-27 17:42:34 +00:00
Marco Ochse
6298afae4a Update install.sh 2017-02-26 12:29:38 +01:00
Marco Ochse
20759a7c5c starting with elk5 2017-02-26 11:22:56 +00:00
Marco Ochse
4c3b6e819c Update ews.cfg 2017-02-24 12:20:08 +01:00
Marco Ochse
1175541d5c add conpot support 2017-02-22 20:21:56 +01:00
t3chn0m4g3
7036a7fc77 include a better solution to fetch external ip 2017-02-22 15:04:48 +00:00
Marco Ochse
3099f6f3f3 Fix broken proxy support by using curl with different IP service 
... leaving comment for DNS variant
 2017-02-22 15:21:10 +01:00
Marco Ochse
5f12ea7543 fix problem with ext ip resolving 2017-02-15 14:26:28 +01:00
Marco Ochse
41a3b610eb improve wlan example config 2016-12-06 13:18:00 +01:00
Marco Ochse
aecb9380f2 fix docker proxy issue 
starting with systemd docker only sources /etc/default/docker which means for proxy to work the export commands need to be removed.
 2016-12-06 10:44:04 +01:00
Marco Ochse
d1b85a497d fix namegen issue when using a proxy 2016-12-06 09:55:41 +01:00
Marco Ochse
fca1b3fd37 switch to docker.io 
improve proxy support
 2016-12-03 21:47:53 +01:00
Marco Ochse
fb71d49a56 fix proxy issue with wetty install 
fixes #63
 2016-11-29 18:03:49 +01:00
Marco Ochse
8d55eed8e5 fix grep for untagged images 2016-11-09 17:51:58 +01:00
t3chn0m4g3
6d7608d112 tweaking, fixing 
lift resolution constraints (keep autodetect from kernel fb)
thanks to @sunshine112 reporting issue #62 - the reason why the install fails is due to the fact that the latest kernel is very picky about a clean unmount of the used block device. the block device will now be unmounted cleanly as soon as the write operation of the ISO Maker is finished writing the image to the USB drive.
 2016-10-28 15:08:55 +02:00
t3chn0m4g3
72a9105db5 fix permissions after merge 2016-10-28 10:51:14 +02:00
t3chn0m4g3
a4f1af68a5 fix merge 2016-10-27 16:47:58 +00:00
t3chn0m4g3
574739b0fe fix typo in dashboard, improve readability of installer 2016-10-27 15:23:43 +00:00
t3chn0m4g3
091025fcfb fix bugs, issues 
fix an issue with nginx upgrades where index.html was overwritten without asking
fix an issue with dashboards where positions were mixed up after removing welcome message and saving as default
 2016-10-27 11:11:51 +00:00
t3chn0m4g3
974eea9a7e fix bug in fuECHO, improve readability of installation menu 2016-10-26 01:21:42 +02:00
t3chn0m4g3
be12a24c2f tested and final: include installation type into installer... 
it is finally possible to go without the ISO maker if you just want to try out a different T-Pot edition.
 2016-10-25 23:33:20 +02:00
Marco Ochse
6f992604b8 experimental: include installation type into installer... 2016-10-25 18:35:39 +02:00
t3chn0m4g3
4cbe7842a8 tweaking lookup url fields 2016-10-23 18:16:30 +00:00
t3chn0m4g3
8aea1914bb add grace period after docker restart 2016-10-23 15:34:11 +02:00
t3chn0m4g3
1316834c9b include dashboard for rc 2016-10-23 12:59:06 +00:00
t3chn0m4g3
40c2b2c386 fix bugs, prepare for rc 2016-10-23 14:54:57 +02:00
t3chn0m4g3
93b00cb47a tweaking 2016-10-23 13:38:44 +02:00
t3chn0m4g3
c8f2739d11 bring dashboards back, tweaking and prepare for beta 2016-10-23 10:34:08 +00:00
t3chn0m4g3
8051e32f95 set kibana as homepage 2016-10-18 08:28:12 +00:00
Marco Ochse
b677a190da update ports 2016-10-17 10:37:40 +02:00
t3chn0m4g3
09da808e6e rename time field 2016-10-12 07:33:44 +00:00
t3chn0m4g3
f4427442e0 rename remote_addr field to src_ip 2016-10-11 12:42:18 +00:00
t3chn0m4g3
52d542a646 enable nginx JSON logging 2016-10-11 12:30:30 +00:00
t3chn0m4g3
e2d86dc0a7 modify systemd configs for dionaea and honeytrap 2016-09-24 16:54:49 +00:00
t3chn0m4g3
c445d82f6e tweaking 2016-09-10 21:10:31 +00:00
t3chn0m4g3
0aa7865e42 tweaking 2016-08-29 23:24:25 +00:00
t3chn0m4g3
0f2f5ff1db add dashboard notification 2016-08-29 19:21:35 +00:00
t3chn0m4g3
154ea080f6 fix bug suricata systemd 
ethtool is unable to change interface settings
 2016-08-29 19:10:39 +00:00
t3chn0m4g3
173e2c040b cowrie just learned telnet, adjusting systemd configs 2016-08-28 14:09:08 +00:00
t3chn0m4g3
7fe0f23b83 tweaking 2016-08-26 11:54:22 +00:00
Marco Ochse
f5a5478732 account for new es cluster name 2016-08-26 13:28:41 +02:00
t3chn0m4g3
fd14e731d2 account for hostname gen fail 2016-08-22 15:24:48 +00:00
t3chn0m4g3
bd29236c47 tweaking dps.sh 2016-08-15 05:46:57 +00:00
Marco Ochse
a90f7cdf23 add user and root prompt, cleanup 2016-08-12 22:21:02 +02:00
t3chn0m4g3
79790c51a9 suricata, find interface in absence of default gateway 2016-08-09 23:26:03 +00:00
Marco Ochse
b6707b70ba find interface in absence of default gateway 2016-08-10 00:51:34 +02:00
t3chn0m4g3
f72af08666 change button titles 2016-08-09 21:10:32 +00:00
t3chn0m4g3
ca81647e28 add navbar background with magenta 2016-08-09 03:33:14 +00:00
t3chn0m4g3
8456878a5b tweak /ui/ location 2016-08-09 03:26:08 +00:00
Marco Ochse
f651bf32a0 change spacings, margins 2016-08-08 17:03:23 +02:00
t3chn0m4g3
fcbd650ba2 cleanup 2016-08-08 13:54:25 +00:00
t3chn0m4g3
8372e715b6 change landing page topnav with frame 2016-08-08 13:52:24 +00:00
Marco Ochse
f038173920 Web based access 
It is now possible to access T-Pot web based and without a SSH tunnel
 2016-08-08 02:21:02 +02:00
Marco Ochse
2619e943a1 tweaking, fixing 2016-08-07 19:13:07 +02:00
Marco Ochse
d16698877b tweaking, bugfixing 2016-08-07 19:08:13 +02:00
t3chn0m4g3
bbb708b988 tweaking, bugfixes 2016-08-06 22:06:31 +00:00
t3chn0m4g3
62b349eab3 modify installer for new config 2016-08-01 13:25:58 +00:00
t3chn0m4g3
12842527bb some basic config stuff 2016-07-30 00:32:03 +00:00
Marco Ochse
caf35b485f tweaking 2016-07-29 20:38:33 +02:00
Marco Ochse
67b8031453 old indices were not deleted 
escaping timestring format fixes it
 2016-07-21 17:42:53 +02:00
Marco Ochse
cef8e5fded old indices were not deleted 
escaping timestring format fixes it
 2016-07-21 17:39:40 +02:00
Marco Ochse
0df2d3bbf6 allow tunneled connections for head plugin 2016-07-19 18:39:20 +02:00
Marco Ochse
869320652c Reduce Installer Size to <50MB 
T-Pot ISO Creator will now create images based on the Ubuntu Network Installer (mini.iso). This results in a greatly reduced size for the T-Pot Installer with now being just about 49MB. T-Pot was only using the base install packages of the 700MB Ubuntu Server ISO and still had to download the latest packages anyway. The advantages are a) reduced download size for the Ubuntu Network Installer instead of the full image, b) the latest packages are already installed during the base installation and c) the resulting T-Pot ISO can be distributed easier.
 2016-07-09 01:23:12 +02:00
Marco Ochse
4fce521579 include alerta-cli 2016-06-19 00:20:02 +02:00
Marco Ochse
574ff3f9a7 add cgroup option at boot 2016-06-17 16:05:11 +02:00
Marco Ochse
f3f20f1d39 typo 2016-06-02 18:54:09 +02:00
Marco Ochse
c955d641c3 tweaking 2016-06-02 18:50:43 +02:00
Marco Ochse
00dd446f7d Move install upgrades towards end of the installer since update of some kernel modules prevent docker daemon from starting if not rebooted first. 2016-06-01 22:10:31 +02:00
Marco Ochse
bf7478442e update dionaea path layout 2016-06-01 17:46:06 +02:00
Marco Ochse
862bb550b0 update dionaea log path 2016-06-01 16:08:23 +02:00
Marco Ochse
ae2224a2ce remove upstart path / add systemd path 2016-05-30 22:38:28 +02:00
t3chn0m4g3
acf1c804ee point to 16.10 images on dockerhub 2016-05-30 14:51:32 +00:00
Marco Ochse
dac91cc208 systemd - follow up services 2016-05-29 14:48:17 +02:00
Marco Ochse
faff7a17bf systemd - a service awakens 2016-05-29 00:03:46 +02:00
Marco Ochse
fbfb5a1d90 very basic installation stuff 2016-05-12 19:26:06 +02:00
Marco Ochse
6e3f3b8d24 restart docker service to avoid race ... 
... if images have been deleted.
 2016-04-20 18:44:22 +02:00
Marco Ochse
61cb968deb include updated kibana objects 2016-03-15 14:39:04 +01:00
t3chn0m4g3
3d67132c91 correct typo 2016-03-13 03:24:52 +01:00
t3chn0m4g3
8706a4343a host auth.log, syslog => ELK 
change local timezone to UTC, incl. new .kibana index, update upstart
for elk
 2016-03-13 02:05:40 +01:00
t3chn0m4g3
f64c84930a need to delete all log files 2016-03-11 16:44:54 +01:00
t3chn0m4g3
0769d1fb24 update 2016-03-10 18:44:59 +01:00
t3chn0m4g3
d0cd1fe11f fix race 2016-03-10 18:40:28 +01:00
t3chn0m4g3
d5a299c34c update 2016-03-10 17:34:42 +01:00
t3chn0m4g3
e23eab4897 elk log files need housekeeping 2016-03-10 15:36:16 +01:00
t3chn0m4g3
c7516ae1f8 keep elkbase.tgz 
In some rare occasions the .kibana index might be corrupted
(IOException) resulting in missing translogs and thus preventing
.kibana index from getting indexed (happens during a power failure). A
quick fix is to delete the contents in
“/data/elk/data/elasticsearch/nodes/0/indices/.kibana/*“, extract
elkbase.tgz to a temp folder (tar xvfz elkbase.tgz /tmp/) and copy “cp
-R /tmp/data/elk/data/elasticsearch/nodes/0/indices/.kibana/*
/data/elk/data/elasticsearch/nodes/0/indices/.kibana/“.
Make sure to stop service checks (“/etc/crontab”) and stop elk (service
elk stop) before doing this.
 2016-03-09 22:10:44 +01:00
t3chn0m4g3
f9e67c897c clean up, update readme 2016-03-09 14:05:06 +01:00
Marco Ochse
6f18240ade only apt-get upgrade during install 2016-03-08 18:37:37 +01:00
t3chn0m4g3
4c83de3995 rewrite 2fa_enable, delete ssh_enable 2016-03-07 15:48:44 +01:00
t3chn0m4g3
71b838c6e2 rewrite 2fa_enable, delete ssh_enable 2016-03-07 15:48:07 +01:00
t3chn0m4g3
211894753f tweaking 2016-03-07 13:13:52 +01:00
t3chn0m4g3
392fb9c344 T-Pot is now in beta 2 - stage 2016-03-06 17:51:54 +01:00
t3chn0m4g3
4ef5252c85 update version info 2016-03-06 17:38:33 +01:00
t3chn0m4g3
c7341998bc install docker-engine 1.10.2 2016-03-06 17:21:49 +01:00
t3chn0m4g3
2d5c498860 tweaking, persistence 2016-03-04 21:47:14 +01:00
t3chn0m4g3
a7f98902e3 turn persistence off by default 2016-03-03 17:48:04 +01:00
t3chn0m4g3
ed797cf62d update readme, upstart 2016-03-03 17:45:49 +01:00
Marco Ochse
68556e8651 conpot - support persistence 2016-03-02 17:12:58 +01:00
Marco Ochse
1089993579 update housekeeping for elasticsearch, keep indexes for <=90 days 2016-03-02 16:21:17 +01:00
t3chn0m4g3
1902696c75 include new index, dashbaords, tweaks 2016-02-22 17:47:24 +01:00
t3chn0m4g3
994aed3e31 include conpot 2016-02-19 17:52:45 +01:00
Marco Ochse
1c5279907e update docker 1.10.1-0~trusty 2016-02-15 18:07:03 +01:00
Marco Ochse
702de8c281 modify installer and image selection 2016-02-13 00:21:44 +01:00
Marco Ochse
2dc676868d scripts, configs, optimizations, dashboard base 2016-02-12 22:47:19 +01:00
Marco Ochse
792142a6f1 update for elasticpotpy 2016-02-11 18:52:45 +01:00
t3chn0m4g3
4797fb155c update emobility/ews logging 2016-02-11 15:52:19 +01:00
t3chn0m4g3
6615046d02 update docker installation method 2016-02-11 14:59:22 +01:00
t3chn0m4g3
6cc229c610 update docker installation method 2016-02-11 14:57:10 +01:00