From 9ecc91356db27b3eba661aa383966743bc1b0f72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Tsai?= Date: Wed, 6 Apr 2022 11:14:44 +0800 Subject: [PATCH] updates --- deploy.sh | 7 ++- dnslog/settings.py | 2 +- dnslog/urls.py | 1 + logview/views.py | 9 +++- templates/views.html | 114 +++++++++++++++++++++++++++++++++++++++++-- 5 files changed, 126 insertions(+), 7 deletions(-) diff --git a/deploy.sh b/deploy.sh index 3f4014b..d7fd506 100644 --- a/deploy.sh +++ b/deploy.sh @@ -13,10 +13,15 @@ mysql_secure_installation # [mysqld] # character-set-server=utf8 # +# DROP DATABASE `dnslog`; +# CREATE DATABASE `dnslog` CHARACTER SET utf8 COLLATE utf8_general_ci; curl https://pyenv.run | bash echo -e '''export PATH="/root/.pyenv/bin:$PATH"\neval "$(pyenv init -)"\neval "$(pyenv virtualenv-init -)"''' >>/root/.bashrc source /root/.bashrc +mkdir ~/.pyenv/cache +# For chinese user: +wget -P ~/.pyenv/cache/ https://registry.npmmirror.com/-/binary/python/3.8.2/Python-3.8.2.tar.xz pyenv install 3.8.2 pyenv virtualenv 3.8.2 dnslog ~/.pyenv/versions/dnslog/bin/pip3 install -r ./requirements.txt @@ -29,4 +34,4 @@ cp dnslog_nginx.conf /etc/nginx/conf.d/ setsebool httpd_can_network_connect on setenforce permissive systemctl restart nginx -timedatectl set-timezone Asia/Shanghai \ No newline at end of file +timedatectl set-timezone Asia/Shanghai diff --git a/dnslog/settings.py b/dnslog/settings.py index 5a2ee50..583e6bd 100644 --- a/dnslog/settings.py +++ b/dnslog/settings.py @@ -7,7 +7,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) # SECURITY WARNING: keep the secret key used in production secret! SECRET_KEY = '#ma=s-l!2obwj%h-6uu^sbw+4%i2w79%v3^ill62k3&7tjf5dc' -DEBUG = True +DEBUG = False ALLOWED_HOSTS = ['*'] diff --git a/dnslog/urls.py b/dnslog/urls.py index e60e61f..3b7287f 100644 --- a/dnslog/urls.py +++ b/dnslog/urls.py @@ -18,6 +18,7 @@ urlpatterns = [ re_path(r'^web/$', views.web_view, name='web_view'), re_path(r'^web/delete$', views.web_delete, name='web_delete'), re_path(r'^config/$', views.config_view, name='config_view'), + re_path(r'^payloads/$', views.payloads_view, name='payloads_view'), re_path(r'^rebind/$', views.rebind_view, name='rebind_view'), re_path(r'^rebind/gen$', views.rebind_gen, name='rebind_gen'), re_path(r'^as_admin/$', views.as_admin, name='as_admin'), diff --git a/logview/views.py b/logview/views.py index c326869..776622b 100644 --- a/logview/views.py +++ b/logview/views.py @@ -265,6 +265,10 @@ def rebind_view(request): return log_view(request, 'rebind') +def payloads_view(request): + return log_view(request, 'payloads') + + def log_view(request, type): userid = request.session.get('userid', None) if not userid: @@ -361,9 +365,10 @@ def log_view(request, type): context['page'] = 0 context['query_prefix'] = '' context['host'] = request.scheme + '://' + request.get_host() + elif type == 'payloads': + context['title'] = 'Payloads大全' else: return HttpResponseRedirect('/') - context['userdomain'] = user.user_domain + '.' + settings.DNS_DOMAIN context['token'] = user.token context['username'] = user.username @@ -377,7 +382,7 @@ def api(request, type, username, prefix): token = request.GET.get('token', '') if not User.objects.filter(username=username, token=token): return HttpResponse('Invalid token') - + host = "%s.%s.%s" % (prefix, username, settings.DNS_DOMAIN) if type == 'dns': res = DNSLog.objects.filter(host=host) diff --git a/templates/views.html b/templates/views.html index be40a82..db59e61 100644 --- a/templates/views.html +++ b/templates/views.html @@ -31,10 +31,11 @@