Commit graph

735 commits

Author SHA1 Message Date
t3chn0m4g3
519a101fdf tweaking 2024-02-28 21:05:03 +01:00
t3chn0m4g3
be74fc75ca tweaking
healthcheck, watch pid not cpu
cleanup dockerfiles
bump dicompot, heralding, elasticpot, endlessh to alpine 3.19
bump dionaea, heralding to latest master
2024-02-28 19:07:22 +01:00
t3chn0m4g3
285b37a00d cleanup 2024-02-27 20:28:07 +01:00
t3chn0m4g3
f9a9c8c4bf tweak deploy, add autoheal, start update Dockerfiles
- tweak deploy a little further
- start with rebuilding Dockerfiles
- rework healthcheck for adbhoney CPU issues
- bump adbhoney, ciscoasa, citrixhoneypot, conpot, cowriepot, ddospot to alpine 3.19
- fix conpot issue with py 3.11
- bump conpot to latest master
- bump cowrie to latest master
- add autoheal to tpotinit to restart unhealthy container (if healthcheck enabled)
2024-02-27 20:23:30 +01:00
t3chn0m4g3
31f09413e0 continue working on env, tpotinit and deploy 2024-02-23 16:41:52 +01:00
t3chn0m4g3
4f41b84103 Adjust T-Pot config file, tpotinit
fix logrotate.conf path
add tpotinit logging
add support for LS_WEB_USER in tpot config (.env)
make tpotinit always validate config / adjust users on tpotinit start
2024-02-19 17:34:14 +01:00
Marco Ochse
09b75cb5be Start working on new landing page
Remove old code
2024-02-16 19:32:02 +01:00
Marco Ochse
0dda858ac1 Start working on new landing page
Remove old code
2024-02-16 19:15:17 +01:00
Marco Ochse
0c9b58b6ac Remove Cockpit 2024-02-15 18:32:16 +01:00
Marco Ochse
380ade13a3 make heralding work with py3.10+ 2024-02-14 22:47:41 +01:00
Marco Ochse
e94f70a15f Revert to medpot (75a2e6134cf926c35b6017d62542274434c87388) from 2 years ago since current master is broken. 2024-02-14 21:14:40 +01:00
Marco Ochse
8bbfe7ac62 Fix manuf location 2024-02-14 20:16:13 +01:00
Marco Ochse
7ae6c73b88 Testing and developing in alpha branch 2024-02-14 19:23:25 +01:00
t3chn0m4g3
efd5465837 work on permissions, folders and tpotinit 2024-02-14 19:04:05 +01:00
Marco Ochse
ef2f5b3f93 Rework .env / env.example
Add more functions to customizer.py (improve port and service checks, improve user output)
Adjust docker-compose files
2024-02-13 19:02:40 +01:00
t3chn0m4g3
2fe2d59129 remove auto reload 2024-01-05 22:07:19 +01:00
t3chn0m4g3
7ba5567e70 add logstash http_input support for nginx
remove cockpit support entirely
cleanup / housekeeping
2024-01-05 21:31:13 +01:00
t3chn0m4g3
1da37b5f85 re-implement distributed feature, without ssh
add sensor compose file
add distributed option to tpot config
housekeeping / cleanup
2024-01-05 20:19:50 +01:00
t3chn0m4g3
faec613b9a add persistence to ENVs
add ENVs checker to keep tpotinit from starting if ENVs are not present or incorrectly set
2023-12-08 18:00:09 +01:00
t3chn0m4g3
406a7314ee fix logrotate config, fix version 2023-12-07 18:44:24 +01:00
Marco Ochse
32ba41497a Update 2023-07-20 19:16:10 +02:00
Marco Ochse
d2eaaab4df Update builder to push to GHCR and DockerHub 2023-07-20 18:59:01 +02:00
Marco Ochse
a8f5555324 - Prepare a docker compose file for a Raspberry Showcase
- Add config settings for the T-Pot Attack Map 2.1.0
2023-07-20 18:41:56 +02:00
Marco Ochse
12af5c9d46 Handle password securely, needs htpasswd to create user:password:
- Update tpotinit and entrypoint.sh to reflect this
- Update install.sh to reflect this
- Update .env / env.example to reflect this

Reorder recommended packages in T-Pot Playbook
Add packages to T-Pot Playbook to ensure manual deployment via Ansible will offer the same environment as manual local installation via install.sh and local Ansible deployment.
2023-07-05 23:03:41 +02:00
t3chn0m4g3
4c74690c41 tweaking 2023-06-29 13:29:42 +02:00
t3chn0m4g3
9815453623 add support for local cache 2023-06-29 13:06:43 +02:00
t3chn0m4g3
81aad58c2f adjust build script for docker engine
builder setup is no longer needed
amd64 and arm64 support
2023-06-29 12:22:19 +02:00
t3chn0m4g3
ef812c6b82 Merge branch 'master' into dev 2023-06-27 11:58:39 +00:00
t3chn0m4g3
a0c5a8c0e7 fix port definitions
- docker-compose no longer accepts ports definitions when network_mode: host is set
- previous versions simply ignored the ports definitions, the updated docker-compose breaks with an error however
2023-06-27 09:23:52 +00:00
Marco Ochse
050c898149 Begin of restructuring ...
- tweaking before re-work tpotinit
2023-06-14 02:17:09 +02:00
Marco Ochse
ecb1dcd338
Merge pull request #1351 from telekom-security/master
fixes #1346
2023-06-14 00:02:35 +02:00
Marco Ochse
2c4eaf0794 Begin of restructuring ...
- deprecate old release
- set virtual version
- we need tpot user / group, adding to installer
- tweaking
- do not use the dev branch, it will break stuff
2023-06-13 23:59:09 +02:00
t3chn0m4g3
c1808161e4 fixes #1346 2023-06-07 05:54:17 +00:00
Marco Ochse
e3b1fd298a Prepare fix for #1336. 2023-05-31 17:21:15 +02:00
t3chn0m4g3
1a2d34c013 bump elk to 8.6.2, rebuild images 2023-05-30 14:35:45 +00:00
Marco Ochse
87ef005c17 tweaking for tpotlight 2023-05-27 14:49:20 +02:00
t3chn0m4g3
f438be7e27 Allow for automatic geoip db downloads 2023-05-07 18:10:23 +02:00
t3chn0m4g3
efd5f4c54c fixes #1320 2023-05-03 22:01:36 +00:00
t3chn0m4g3
35188ef28e add option to retrieve ENVs from file 2023-05-02 13:11:05 +02:00
t3chn0m4g3
918a408357 Merge branch 'master' of https://github.com/telekom-security/tpotce 2023-04-27 18:44:30 +02:00
t3chn0m4g3
5fd0d158e6 Add Nginx Cockpit Awareness 2023-04-27 18:42:38 +02:00
t3chn0m4g3
5265e3945a bump ewsposter to 1.25.0 2023-04-26 08:47:28 +00:00
t3chn0m4g3
a08a475f57 tweaking 2023-04-25 17:47:44 +00:00
marco
ff7c368c7f update landing page
make relative links (T-Pot home) dynamic to display them only if services are available
adjust dimensions for link container
correct github link
place attack-map link in the home container
2023-04-25 15:03:26 +02:00
t3chn0m4g3
668a4d91a7 bump ewsposter to 1.24.0 2023-02-24 14:34:49 +00:00
Dave
350179fc89
Added detailed comment
Added a detailed comment on what the change is needed for and why it's there
2023-02-23 16:51:42 +01:00
Dave
f3a6461eaa
Fixing uri max size
Changing URI max size from 1024 to 1280 bytes
2023-02-21 01:13:52 +01:00
t3chn0m4g3
fc17d850b5 bump t-pot-attack-map to v2.0.1 2023-02-14 17:41:02 +00:00
t3chn0m4g3
72a3b51bd4 bump t-pot-attack-map to 1.2.0 2023-02-04 00:29:26 +00:00
t3chn0m4g3
f786769527 bump t-pot-attack-map to 1.1.2 2023-02-03 20:37:27 +00:00
t3chn0m4g3
23934bc693 bump t-pot-attack-map to 1.1.1, add nginx cache header 2023-02-03 18:16:32 +00:00
t3chn0m4g3
7e60b46732 fixes #1254, fixes #1253
- #1254: new ELK images will be provided shortly
- #1253: documentation and updater will now reflect that an update from 20.06.x is no longer possible
2023-01-26 10:49:24 +00:00
t3chn0m4g3
c178d878ab bump ELK to 8.5.3 2023-01-23 16:33:09 +00:00
t3chn0m4g3
390390fd43 bump to alpine 3.17, tweaking, fixes for py 3.10 2023-01-23 15:42:59 +00:00
t3chn0m4g3
8119aca317 tweaking 2023-01-23 12:04:40 +00:00
t3chn0m4g3
2fd0f62484 bump to alpine 3.17 2023-01-20 17:48:46 +00:00
t3chn0m4g3
90eab744b1 bump cyberchef to 9.55.0, fix glitches 2023-01-20 17:42:17 +00:00
t3chn0m4g3
8547699061 bump cowrie to 2.5.0 2023-01-19 17:15:08 +00:00
t3chn0m4g3
4382413672 bump t-pot-attack-map to 1.1.0, buildx to 0.10.0 2023-01-19 11:42:25 +00:00
t3chn0m4g3
516bec1deb fixes #1241 2023-01-10 17:56:18 +00:00
t3chn0m4g3
ede61b81d9 update map to fix CVE 2023-01-06 19:53:05 +00:00
t3chn0m4g3
59cca98e7f update geoip map to latest release
update nginx to include brotli and gzip compression
improve load performance
2023-01-06 18:58:03 +00:00
t3chn0m4g3
2641d1e743 bump elastic stack to 8.4.3 2022-11-02 16:37:01 +00:00
t3chn0m4g3
3b2e8a4c70 tweaking 2022-11-02 07:54:42 +00:00
t3chn0m4g3
16fe4b1d28 bump sentrypeer to 2.0 2022-11-01 15:26:24 +00:00
t3chn0m4g3
b34644f1a8 add link for py3 2022-11-01 11:59:52 +00:00
t3chn0m4g3
7fa447943d bump medpot to latest fork master 2022-11-01 10:52:47 +00:00
t3chn0m4g3
38edadb3da bump log4pot to latest master 2022-11-01 09:39:11 +00:00
t3chn0m4g3
5da8431e3a bump cyberchef, esvue to latest master 2022-10-31 17:01:04 +01:00
t3chn0m4g3
ccb94b1529 revert buildx to 0.8.1 2022-10-31 15:41:59 +00:00
t3chn0m4g3
e2cbd981ca bump hellpot to latest master 2022-10-14 14:55:28 +00:00
t3chn0m4g3
48f3c842b5 bump fatt to latest master 2022-10-13 14:06:09 +00:00
t3chn0m4g3
f9179e3e21 bump cowrie to 2.4.0 2022-10-13 08:44:55 +00:00
t3chn0m4g3
8410f84fe9 bump adbhoney to latest master 2022-10-12 11:52:17 +00:00
t3chn0m4g3
b8e3df97dc bump ewsposter to latest master, update packages 2022-10-11 15:13:47 +00:00
t3chn0m4g3
1122d3728e Bump ELK Stack to 8.3.3 2022-08-17 16:34:53 +00:00
t3chn0m4g3
a3bda5de8f bump Elastic stack to 8.2.3 2022-06-15 14:29:23 +00:00
t3chn0m4g3
5f0c337f09 bump elk, log4pot, honeytrap, dionaea to ubuntu 22.04 2022-06-14 10:47:11 +00:00
t3chn0m4g3
fc93db2bc4 fix cleanup medpot 2022-06-14 08:04:35 +00:00
t3chn0m4g3
421b3d3020 bump medpot to latest master 2022-06-14 07:51:14 +00:00
t3chn0m4g3
1eaec0036e prep for new medpot, honeypots and some tweaking 2022-06-13 11:59:40 +00:00
t3chn0m4g3
15f7a17935 Comment ENV opt-in for SentryPeer 2022-06-08 11:09:29 +00:00
t3chn0m4g3
dcf15ca489 Opt-In for SentryPeer DHT mode, fixes #1110 2022-06-08 09:10:29 +00:00
t3chn0m4g3
a28dfec046 bump qHoneypots to latest master, adjust config for commands input 2022-06-07 11:19:34 +00:00
t3chn0m4g3
8993f59001 Bump Glutton to Alpine 3.16, decrease image size 2022-06-03 14:21:55 +00:00
t3chn0m4g3
09c682cd7b Bump to Alpine 3.16 for most of the images.
Glutton, Heralding, Mailoney and Snare/Tanner need work.
2022-06-02 15:47:17 +00:00
t3chn0m4g3
409e4bde3e Bump Cyberchef to 9.38.0, Elasticvue to 0.40.1
Bump Nginx, Spiderfoot to Alpine 3.16
2022-06-02 13:36:54 +00:00
t3chn0m4g3
aaef85c49d Bump SentryPeer to 1.4.1 2022-06-02 08:31:18 +00:00
t3chn0m4g3
73b54f5504 Bump Elastic Stack to 8.2.2 2022-06-01 10:26:49 +00:00
t3chn0m4g3
55da6a4841 Bump Elastic Stack to 8.2.0, update objects 2022-05-25 14:53:29 +00:00
t3chn0m4g3
f13d08287f prep for elk 8.1.2 2022-04-15 13:11:25 +00:00
t3chn0m4g3
fc123d10f9 bump spiderfoot to 4.0 2022-04-14 17:15:43 +00:00
t3chn0m4g3
ded2124932 bump cyberchef, esvue to latest release 2022-04-14 16:52:48 +00:00
Marco Ochse
c2aa0af2f3
Merge branch 'master' into 22.x 2022-04-11 16:47:44 +02:00
t3chn0m4g3
36774d0b71 update tags / version to 2204, tweaking README 2022-04-08 13:45:53 +00:00
t3chn0m4g3
f49f454a42 tweaking ciscoasa 2022-04-01 12:55:21 +00:00
t3chn0m4g3
5f18f7f17f finetune logstash image and compose settings 2022-03-31 14:46:56 +00:00
t3chn0m4g3
bf39f85df0 pin sentrypeer to v1.2.0 2022-03-31 12:20:45 +00:00
t3chn0m4g3
572d540ead tweaking ntp and logstash
remove ntp and replace with timesyncd (client only)

adjust logstash config
2022-03-30 20:32:24 +00:00
t3chn0m4g3
9705538dba fix typo 2022-03-30 18:00:15 +00:00
t3chn0m4g3
22276d1cc6 fix permissions for distributed setup 2022-03-30 15:53:08 +00:00
t3chn0m4g3
5bbe07de9e fix dep 2022-03-25 14:52:28 +00:00
t3chn0m4g3
328139d9b9 image builder, tweaking 2022-03-24 18:54:56 +01:00
t3chn0m4g3
e2752458d4 bump elk to 7.17.0 to support 8.0.1 in 22.x 2022-03-18 16:23:27 +00:00
t3chn0m4g3
b7096d6df6 bump elk to 8.0.1 2022-03-18 07:58:00 +00:00
t3chn0m4g3
dd5f2c2a8d reduce build times, tweaking 2022-03-14 21:50:19 +00:00
t3chn0m4g3
9a0e6bf1d8 tweaking process cpu 2022-03-14 10:37:11 +00:00
t3chn0m4g3
3bcf85a92f tweaking, reduce build times 2022-03-13 10:19:08 +00:00
t3chn0m4g3
e87a6fa53f heralding, honeypots reduce build time, tweaking 2022-03-12 17:59:31 +00:00
t3chn0m4g3
a0d82ddc45 tweaking, reduce build times 2022-03-12 15:11:20 +00:00
t3chn0m4g3
1974a7e6ab cowrie, ddospot, reduce build times, tweaking 2022-03-12 14:42:34 +00:00
t3chn0m4g3
96d5986407 cowrie, test reduce build times 2022-03-12 14:27:34 +00:00
t3chn0m4g3
f39b371d6b tweaking 2022-03-12 13:27:28 +00:00
t3chn0m4g3
ae52dafdaf conpot, test reduce build times 2022-03-12 13:13:31 +00:00
t3chn0m4g3
886a7f159e add /modify cpu healtchecks for adbhoney, conpot, dionaea 2022-03-11 18:02:20 +00:00
t3chn0m4g3
068f4bb67e adbhoney add healtcheck for CPU usage, tweaking 2022-03-11 13:29:44 +00:00
Marco Ochse
0a8ff0297f tweaking 2022-03-09 23:07:28 +01:00
t3chn0m4g3
4bcd24ed19 tweaking 2022-03-09 20:46:12 +00:00
t3chn0m4g3
99c719eed4 bump conpot to latest master, cleanup 2022-03-09 15:19:51 +00:00
t3chn0m4g3
9d7c24892d image tweaking 2022-03-08 23:36:03 +00:00
t3chn0m4g3
22904d402a drop root privileges for suricata 2022-03-08 17:29:03 +00:00
t3chn0m4g3
02d4d79a60 tweaking 2022-03-05 00:50:47 +00:00
t3chn0m4g3
075551d218 harden, reduce size log4pot 2022-03-04 13:13:48 +00:00
t3chn0m4g3
3b65fb039b bump log4pot to latest master 2022-03-04 11:45:25 +00:00
t3chn0m4g3
518c56def9 spiderfoot, editions tweaking 2022-02-28 22:00:54 +00:00
t3chn0m4g3
c496b274f3 fix entrypoint 2022-02-25 17:14:42 +00:00
t3chn0m4g3
3d0d69c541 tweaking, license info, readme credits, avoid redis port conflict 2022-02-25 16:59:17 +00:00
t3chn0m4g3
8f8bdcbefa fix expose from parent 2022-02-25 13:47:00 +00:00
t3chn0m4g3
5237215bf0 tweaking, add sentrypeer to logstash config 2022-02-24 17:39:57 +00:00
t3chn0m4g3
aa6afc37fe prep for sentrypeer 2022-02-23 23:19:18 +00:00
t3chn0m4g3
8d16d7587d add sentrypeer, wordpot tweaking, fix udp src_ip issues 2022-02-22 17:57:55 +00:00
t3chn0m4g3
af2174ee9f fix websocket timeout 2022-02-21 11:43:41 +00:00
t3chn0m4g3
fc7c748b20 add attack map to web gui 2022-02-20 23:11:24 +00:00
t3chn0m4g3
656c99446e fix template 2022-02-20 16:38:15 +00:00
t3chn0m4g3
a73c4b67d9 reduce index refresh to 1s 2022-02-18 19:55:31 +00:00
t3chn0m4g3
416d4a810f redis tweaking 2022-02-17 01:26:10 +00:00
t3chn0m4g3
7ee263e8e8 bump elastic stack to 8.0.0 2022-02-16 02:55:20 +00:00
t3chn0m4g3
17a1cbdf40 update map 2022-02-15 21:46:43 +00:00
t3chn0m4g3
e9a907ef7b tweaking 2022-02-14 00:35:37 +00:00
t3chn0m4g3
e1643308b2 tweaking 2022-02-14 00:32:57 +00:00
t3chn0m4g3
264120c751 bump map_server to latest master 2022-02-14 00:30:18 +00:00
t3chn0m4g3
6fed549f58 map server tweaking 2022-02-12 01:04:02 +00:00
t3chn0m4g3
53afb1ba10 incl. XFF for qhoneypots, some tweaking 2022-02-11 10:32:31 +00:00
t3chn0m4g3
2a4fe20b88 work in progress (map, wordpot) 2022-02-09 19:13:18 +00:00
t3chn0m4g3
278c7aa61a bump elastic stack to 7.17.0 2022-02-02 22:57:50 +00:00
t3chn0m4g3
b37178ba98 tweaking honeysap, rdpy, editions, installer
move honeysap, rdpy to deprecated as currently no Py3 version available
remove honeysap, rdpy from editions
adjust installer for running on ARM64 (post-install)
2022-01-31 16:59:36 +00:00
t3chn0m4g3
778c6c6a70 tweak cyberchef size by removing zip 2022-01-30 01:07:12 +00:00
t3chn0m4g3
72289e07d6 tweaking for nginx, cyberchef, elasticvue
create builder for cyberchef and elasticvue based on respective masters
builders will build webapps and copy output to nginx html folder as tgz
some tweaking for elasticvue to properly load original favicon
with cyberchef now run as nginx webapp we gain another 40MB of RAM
while webapps will be built on AMD64 all final docker images can now be built as multi arch images for AMD64 and ARM64
2022-01-30 00:48:10 +00:00
t3chn0m4g3
a51744988f adjust editions for new nginx 2022-01-29 00:45:41 +00:00
t3chn0m4g3
e6f392a098 Tweaking
Finalize qhoneypots config, thanks to @giga-a for native JSON logging!
Completely rework T-Pot Landing Page based on Bento (https://github.com/migueravila/Bento).
New NGINX image is down by 100MB and only uses 3.3 MB of RAM at runtime.
Keep legacy Sensor option (without logstash).
2022-01-29 00:00:29 +00:00