code for flake8, change menu level

This commit is contained in:
kingmo888 2024-08-09 18:35:58 +08:00
parent f90f707fd0
commit e26dc2d073
4 changed files with 156 additions and 133 deletions

View File

@ -37,10 +37,14 @@
<li class="layui-nav-item"><a href="/webui" target="_blank">{% trans "网页控制" %}</a></li>
{% if u.is_admin %}
<li class="layui-nav-item"><a href="/api/conn_log">{% trans "连接日志" %}</a></li>
<li class="layui-nav-item"><a href="/api/file_log">{% trans "文件传输日志" %}</a></li>
<li class="layui-nav-item"><a href="/admin" target="_blank">{% trans "管理后台" %}</a>
<li class="layui-nav-item">
<a href="">{% trans "日志" %}</a>
<dl class="layui-nav-child">
<dd><a href="/api/conn_log">{% trans "连接日志" %}</a></dd>
<dd><a href="/api/file_log">{% trans "文件传输日志" %}</a></dd>
</dl>
</li>
<li class="layui-nav-item"><a href="/admin" target="_blank">{% trans "管理后台" %}</a></li>
{% endif %}
<li class="layui-nav-item"><a href="/api/user_action?action=logout" target="_blank">{% trans "退出" %}</a></li>
</ul>

View File

@ -3,10 +3,10 @@ from django.http import JsonResponse
import json
import time
import datetime
import hashlib
# import hashlib
import math
from django.contrib import auth
from django.forms.models import model_to_dict
# from django.forms.models import model_to_dict
from api.models import RustDeskToken, UserProfile, RustDeskTag, RustDeskPeer, RustDesDevice, ConnLog, FileLog
from django.db.models import Q
import copy
@ -21,7 +21,7 @@ def login(request):
return JsonResponse(result)
data = json.loads(request.body.decode())
username = data.get('username', '')
password = data.get('password', '')
rid = data.get('id', '')
@ -29,19 +29,19 @@ def login(request):
autoLogin = data.get('autoLogin', True)
rtype = data.get('type', '')
deviceInfo = data.get('deviceInfo', '')
user = auth.authenticate(username=username,password=password)
user = auth.authenticate(username=username, password=password)
if not user:
result['error'] = _('帐号或密码错误请重试多次重试后将被锁定IP')
return JsonResponse(result)
user.rid = rid
user.uuid = uuid
user.autoLogin = autoLogin
user.rtype = rtype
user.rtype = rtype
user.deviceInfo = json.dumps(deviceInfo)
user.save()
token = RustDeskToken.objects.filter(Q(uid=user.id) & Q(username=user.username) & Q(rid=user.rid)).first()
# 检查是否过期
if token:
now_t = datetime.datetime.now()
@ -49,7 +49,7 @@ def login(request):
if nums >= EFFECTIVE_SECONDS:
token.delete()
token = None
if not token:
# 获取并保存token
token = RustDeskToken(
@ -57,33 +57,33 @@ def login(request):
uid=user.id,
uuid=user.uuid,
rid=user.rid,
access_token=getStrMd5(str(time.time())+salt)
access_token=getStrMd5(str(time.time()) + salt)
)
token.save()
result['access_token'] = token.access_token
result['type'] = 'access_token'
result['user'] = {'name':user.username}
result['user'] = {'name': user.username}
return JsonResponse(result)
def logout(request):
if request.method == 'GET':
result = {'error':_('请求方式错误!')}
result = {'error': _('请求方式错误!')}
return JsonResponse(result)
data = json.loads(request.body.decode())
rid = data.get('id', '')
uuid = data.get('uuid', '')
user = UserProfile.objects.filter(Q(rid=rid) & Q(uuid=uuid)).first()
if not user:
result = {'error':_('异常请求!')}
result = {'error': _('异常请求!')}
return JsonResponse(result)
token = RustDeskToken.objects.filter(Q(uid=user.id) & Q(rid=user.rid)).first()
if token:
token.delete()
result = {'code':1}
result = {'code': 1}
return JsonResponse(result)
@ -92,17 +92,17 @@ def currentUser(request):
if request.method == 'GET':
result['error'] = _('错误的提交方式!')
return JsonResponse(result)
postdata = json.loads(request.body)
rid = postdata.get('id', '')
uuid = postdata.get('uuid', '')
# postdata = json.loads(request.body)
# rid = postdata.get('id', '')
# uuid = postdata.get('uuid', '')
access_token = request.META.get('HTTP_AUTHORIZATION', '')
access_token = access_token.split('Bearer ')[-1]
token = RustDeskToken.objects.filter(Q(access_token=access_token) ).first()
token = RustDeskToken.objects.filter(Q(access_token=access_token)).first()
user = None
if token:
user = UserProfile.objects.filter(Q(id=token.uid)).first()
if user:
if token:
result['access_token'] = token.access_token
@ -116,53 +116,53 @@ def ab(request):
'''
access_token = request.META.get('HTTP_AUTHORIZATION', '')
access_token = access_token.split('Bearer ')[-1]
token = RustDeskToken.objects.filter(Q(access_token=access_token) ).first()
token = RustDeskToken.objects.filter(Q(access_token=access_token)).first()
if not token:
result = {'error':_('拉取列表错误!')}
result = {'error': _('拉取列表错误!')}
return JsonResponse(result)
if request.method == 'GET':
result = {}
uid = token.uid
tags = RustDeskTag.objects.filter(Q(uid=uid) )
tags = RustDeskTag.objects.filter(Q(uid=uid))
tag_names = []
tag_colors = {}
if tags:
tag_names = [str(x.tag_name) for x in tags]
tag_colors = {str(x.tag_name):int(x.tag_color) for x in tags if x.tag_color!=''}
tag_colors = {str(x.tag_name): int(x.tag_color) for x in tags if x.tag_color != ''}
peers_result = []
peers = RustDeskPeer.objects.filter(Q(uid=uid) )
peers = RustDeskPeer.objects.filter(Q(uid=uid))
if peers:
for peer in peers:
tmp = {
'id':peer.rid,
'username':peer.username,
'hostname':peer.hostname,
'alias':peer.alias,
'platform':peer.platform,
'tags':peer.tags.split(','),
'hash':peer.rhash,
'id': peer.rid,
'username': peer.username,
'hostname': peer.hostname,
'alias': peer.alias,
'platform': peer.platform,
'tags': peer.tags.split(','),
'hash': peer.rhash,
}
peers_result.append(tmp)
result['updated_at'] = datetime.datetime.now()
result['data'] = {
'tags':tag_names,
'peers':peers_result,
'tag_colors':json.dumps(tag_colors)
'tags': tag_names,
'peers': peers_result,
'tag_colors': json.dumps(tag_colors)
}
result['data'] = json.dumps(result['data'])
return JsonResponse(result)
else:
postdata = json.loads(request.body.decode())
data = postdata.get('data', '')
data = {} if data=='' else json.loads(data)
data = {} if data == '' else json.loads(data)
tagnames = data.get('tags', [])
tag_colors = data.get('tag_colors', '')
tag_colors = {} if tag_colors=='' else json.loads(tag_colors)
tag_colors = {} if tag_colors == '' else json.loads(tag_colors)
peers = data.get('peers', [])
if tagnames:
# 删除旧的tag
RustDeskTag.objects.filter(uid=token.uid).delete()
@ -189,32 +189,34 @@ def ab(request):
platform=one['platform'],
tags=','.join(one['tags']),
rhash=one['hash'],
)
newlist.append(peer)
RustDeskPeer.objects.bulk_create(newlist)
result = {
'code':102,
'data':_('更新地址簿有误')
'code': 102,
'data': _('更新地址簿有误')
}
return JsonResponse(result)
def ab_get(request):
# 兼容 x86-sciter 版客户端,此版客户端通过访问 "POST /api/ab/get" 来获取地址簿
request.method = 'GET'
return ab(request)
def sysinfo(request):
# 客户端注册服务后,才会发送设备信息
result = {}
if request.method == 'GET':
result['error'] = _('错误的提交方式!')
return JsonResponse(result)
postdata = json.loads(request.body)
device = RustDesDevice.objects.filter(Q(rid=postdata['id']) & Q(uuid=postdata['uuid']) ).first()
device = RustDesDevice.objects.filter(Q(rid=postdata['id']) & Q(uuid=postdata['uuid'])).first()
if not device:
device = RustDesDevice(
rid=postdata['id'],
@ -231,25 +233,27 @@ def sysinfo(request):
postdata2 = copy.copy(postdata)
postdata2['rid'] = postdata2['id']
postdata2.pop('id')
RustDesDevice.objects.filter(Q(rid=postdata['id']) & Q(uuid=postdata['uuid']) ).update(**postdata2)
RustDesDevice.objects.filter(Q(rid=postdata['id']) & Q(uuid=postdata['uuid'])).update(**postdata2)
result['data'] = 'ok'
return JsonResponse(result)
def heartbeat(request):
postdata = json.loads(request.body)
device = RustDesDevice.objects.filter(Q(rid=postdata['id']) & Q(uuid=postdata['uuid']) ).first()
device = RustDesDevice.objects.filter(Q(rid=postdata['id']) & Q(uuid=postdata['uuid'])).first()
if device:
device.save()
# token保活
create_time = datetime.datetime.now() + datetime.timedelta(seconds=EFFECTIVE_SECONDS)
RustDeskToken.objects.filter(Q(rid=postdata['id']) & Q(uuid=postdata['uuid']) ).update(create_time=create_time)
RustDeskToken.objects.filter(Q(rid=postdata['id']) & Q(uuid=postdata['uuid'])).update(create_time=create_time)
result = {}
result['data'] = _('在线')
return JsonResponse(result)
def audit(request):
postdata = json.loads(request.body)
#print(postdata)
# print(postdata)
audit_type = postdata['action'] if 'action' in postdata else ''
if audit_type == 'new':
new_conn_log = ConnLog(
@ -263,7 +267,7 @@ def audit(request):
uuid=postdata['uuid'] if 'uuid' in postdata else '',
)
new_conn_log.save()
elif audit_type =="close":
elif audit_type == "close":
ConnLog.objects.filter(Q(conn_id=postdata['conn_id'])).update(conn_end=datetime.datetime.now())
elif 'is_file' in postdata:
print(postdata)
@ -284,15 +288,16 @@ def audit(request):
peer = postdata['peer']
ConnLog.objects.filter(Q(conn_id=postdata['conn_id'])).update(session_id=postdata['session_id'])
ConnLog.objects.filter(Q(conn_id=postdata['conn_id'])).update(from_id=peer[0])
except:
print(postdata)
except Exception as e:
print(postdata, e)
result = {
'code':1,
'data':'ok'
'code': 1,
'data': 'ok'
}
return JsonResponse(result)
def convert_filesize(size_bytes):
if size_bytes == 0:
return "0B"
@ -301,17 +306,19 @@ def convert_filesize(size_bytes):
p = math.pow(1024, i)
s = round(size_bytes / p, 2)
return "%s %s" % (s, size_name[i])
def users(request):
result = {
'code':1,
'data':_('好的')
'code': 1,
'data': _('好的')
}
return JsonResponse(result)
def peers(request):
result = {
'code':1,
'data':'ok'
'code': 1,
'data': 'ok'
}
return JsonResponse(result)
return JsonResponse(result)

View File

@ -28,6 +28,7 @@ from django.utils.translation import gettext as _
salt = 'xiaomo'
EFFECTIVE_SECONDS = 7200
def getStrMd5(s):
if not isinstance(s, (str,)):
s = str(s)
@ -37,6 +38,7 @@ def getStrMd5(s):
return myHash.hexdigest()
def model_to_dict2(instance, fields=None, exclude=None, replace=None, default=None):
"""
:params instance: 模型对象不能是queryset数据集
@ -49,21 +51,21 @@ def model_to_dict2(instance, fields=None, exclude=None, replace=None, default=No
if not isinstance(instance, Model):
raise Exception(_('model_to_dict接收的参数必须是模型对象'))
# 对替换数据库字段名字校验
if replace and type(replace) == dict:
if replace and type(replace) == dict: # noqa
for replace_field in replace.values():
if hasattr(instance, replace_field):
raise Exception(_(f'model_to_dict,要替换成{replace_field}字段已经存在了'))
# 对要新增的默认值进行校验
if default and type(default) == dict:
if default and type(default) == dict: # noqa
for default_key in default.keys():
if hasattr(instance, default_key):
raise Exception(_(f'model_to_dict,要新增默认值,但字段{default_key}已经存在了'))
raise Exception(_(f'model_to_dict,要新增默认值,但字段{default_key}已经存在了')) # noqa
opts = instance._meta
data = {}
for f in chain(opts.concrete_fields, opts.private_fields, opts.many_to_many):
# 源码下:这块代码会将时间字段剔除掉,我加上一层判断,让其不再剔除时间字段
if not getattr(f, 'editable', False):
if type(f) == DateField or type(f) == DateTimeField:
if type(f) == DateField or type(f) == DateTimeField: # noqa
pass
else:
continue
@ -76,22 +78,22 @@ def model_to_dict2(instance, fields=None, exclude=None, replace=None, default=No
key = f.name
# 获取字段对应的数据
if type(f) == DateTimeField:
if type(f) == DateTimeField: # noqa
# 字段类型是DateTimeFiled 使用自己的方式操作
value = getattr(instance, key)
value = datetime.datetime.strftime(value, '%Y-%m-%d %H:%M')
elif type(f) == DateField:
elif type(f) == DateField: # noqa
# 字段类型是DateFiled 使用自己的方式操作
value = getattr(instance, key)
value = datetime.datetime.strftime(value, '%Y-%m-%d')
elif type(f) == CharField or type(f) == TextField:
elif type(f) == CharField or type(f) == TextField: # noqa
# 字符串数据是否可以进行序列化转成python结构数据
value = getattr(instance, key)
try:
value = json.loads(value)
except Exception as _:
except Exception as _: # noqa
value = value
else:#其他类型的字段
else: # 其他类型的字段
# value = getattr(instance, key)
key = f.name
value = f.value_from_object(instance)
@ -100,15 +102,15 @@ def model_to_dict2(instance, fields=None, exclude=None, replace=None, default=No
if replace and key in replace.keys():
key = replace.get(key)
data[key] = value
#2、新增默认的字段数据
# 2、新增默认的字段数据
if default:
data.update(default)
return data
def index(request):
print('sdf',sys.argv)
if request.user and request.user.username!='AnonymousUser':
print('sdf', sys.argv)
if request.user and request.user.username != 'AnonymousUser':
return HttpResponseRedirect('/api/work')
return HttpResponseRedirect('/api/user_action?action=login')
@ -124,6 +126,7 @@ def user_action(request):
else:
return
def user_login(request):
if request.method == 'GET':
return render(request, 'login.html')
@ -131,14 +134,15 @@ def user_login(request):
username = request.POST.get('account', '')
password = request.POST.get('password', '')
if not username or not password:
return JsonResponse({'code':0, 'msg':_('出了点问题,未获取用户名或密码。')})
return JsonResponse({'code': 0, 'msg': _('出了点问题,未获取用户名或密码。')})
user = auth.authenticate(username=username,password=password)
user = auth.authenticate(username=username, password=password)
if user:
auth.login(request, user)
return JsonResponse({'code':1, 'url':'/api/work'})
return JsonResponse({'code': 1, 'url': '/api/work'})
else:
return JsonResponse({'code':0, 'msg':_('帐号或密码错误!')})
return JsonResponse({'code': 0, 'msg': _('帐号或密码错误!')})
def user_register(request):
info = ''
@ -146,8 +150,8 @@ def user_register(request):
return render(request, 'reg.html')
ALLOW_REGISTRATION = settings.ALLOW_REGISTRATION
result = {
'code':0,
'msg':''
'code': 0,
'msg': ''
}
if not ALLOW_REGISTRATION:
result['msg'] = _('当前未开放注册,请联系管理员!')
@ -161,7 +165,7 @@ def user_register(request):
result['msg'] = info
return JsonResponse(result)
if len(password1)<8 or len(password1)>20:
if len(password1) < 8 or len(password1) > 20:
info = _('密码长度不符合要求, 应在8~20位。')
result['msg'] = info
return JsonResponse(result)
@ -174,28 +178,30 @@ def user_register(request):
user = UserProfile(
username=username,
password=make_password(password1),
is_admin = True if UserProfile.objects.count()==0 else False,
is_superuser = True if UserProfile.objects.count()==0 else False,
is_active = True
is_admin=True if UserProfile.objects.count() == 0 else False,
is_superuser=True if UserProfile.objects.count() == 0 else False,
is_active=True
)
user.save()
result['msg'] = info
result['code'] = 1
return JsonResponse(result)
@login_required(login_url='/api/user_action?action=login')
def user_logout(request):
info = ''
# info=''
auth.logout(request)
return HttpResponseRedirect('/api/user_action?action=login')
def get_single_info(uid):
peers = RustDeskPeer.objects.filter(Q(uid=uid))
rids = [x.rid for x in peers]
peers = {x.rid:model_to_dict(x) for x in peers}
#print(peers)
peers = {x.rid: model_to_dict(x) for x in peers}
# print(peers)
devices = RustDesDevice.objects.filter(rid__in=rids)
devices = {x.rid:x for x in devices}
devices = {x.rid: x for x in devices}
now = datetime.datetime.now()
for rid, device in devices.items():
peers[rid]['create_time'] = device.create_time.strftime('%Y-%m-%d')
@ -204,39 +210,42 @@ def get_single_info(uid):
peers[rid]['memory'] = device.memory
peers[rid]['cpu'] = device.cpu
peers[rid]['os'] = device.os
peers[rid]['status'] = _('在线') if (now-device.update_time).seconds <=120 else _('离线')
peers[rid]['status'] = _('在线') if (now - device.update_time).seconds <= 120 else _('离线')
for rid in peers.keys():
peers[rid]['has_rhash'] = _('') if len(peers[rid]['rhash'])>1 else _('')
peers[rid]['has_rhash'] = _('') if len(peers[rid]['rhash']) > 1 else _('')
return [v for k, v in peers.items()]
return [v for k,v in peers.items()]
def get_all_info():
devices = RustDesDevice.objects.all()
peers = RustDeskPeer.objects.all()
devices = {x.rid:model_to_dict2(x) for x in devices}
devices = {x.rid: model_to_dict2(x) for x in devices}
now = datetime.datetime.now()
for peer in peers:
user = UserProfile.objects.filter(Q(id=peer.uid)).first()
device = devices.get(peer.rid, None)
if device:
devices[peer.rid]['rust_user'] = user.username
for k, v in devices.items():
devices[k]['status'] = _('在线') if (now-datetime.datetime.strptime(v['update_time'], '%Y-%m-%d %H:%M')).seconds <=120 else _('离线')
return [v for k,v in devices.items()]
devices[k]['status'] = _('在线') if (now - datetime.datetime.strptime(v['update_time'], '%Y-%m-%d %H:%M')).seconds <= 120 else _('离线')
return [v for k, v in devices.items()]
@login_required(login_url='/api/user_action?action=login')
def work(request):
username = request.user
u = UserProfile.objects.get(username=username)
show_type = request.GET.get('show_type', '')
show_all = True if show_type == 'admin' and u.is_admin else False
paginator = Paginator(get_all_info(), 15) if show_type == 'admin' and u.is_admin else Paginator(get_single_info(u.id), 15)
page_number = request.GET.get('page')
page_obj = paginator.get_page(page_number)
return render(request, 'show_work.html', {'u':u, 'show_all':show_all, 'page_obj':page_obj})
return render(request, 'show_work.html', {'u': u, 'show_all': show_all, 'page_obj': page_obj})
@login_required(login_url='/api/user_action?action=login')
def down_peers(request):
@ -246,7 +255,7 @@ def down_peers(request):
if not u.is_admin:
print(u.is_admin)
return HttpResponseRedirect('/api/work')
all_info = get_all_info()
f = xlwt.Workbook(encoding='utf-8')
sheet1 = f.add_sheet(_(u'设备信息表'), cell_overwrite_ok=True)
@ -257,7 +266,7 @@ def down_peers(request):
if i == 0:
# 写入列名
sheet1.write(i, j, name)
sheet1.write(i+1, j, one.get(name, '-'))
sheet1.write(i + 1, j, one.get(name, '-'))
sio = BytesIO()
f.save(sio)
@ -266,12 +275,13 @@ def down_peers(request):
response['Content-Disposition'] = 'attachment; filename=DeviceInfo.xls'
response.write(sio.getvalue())
return response
def check_sharelink_expired(sharelink):
now = datetime.datetime.now()
if sharelink.create_time > now:
return False
if (now - sharelink.create_time).seconds <15 * 60:
if (now - sharelink.create_time).seconds < 15 * 60:
return False
else:
sharelink.is_expired = True
@ -284,19 +294,18 @@ def share(request):
peers = RustDeskPeer.objects.filter(Q(uid=request.user.id))
sharelinks = ShareLink.objects.filter(Q(uid=request.user.id) & Q(is_used=False) & Q(is_expired=False))
# 省资源:处理已过期请求,不主动定时任务轮询请求,在任意地方请求时,检查是否过期,过期则保存。
now = datetime.datetime.now()
for sl in sharelinks:
check_sharelink_expired(sl)
sharelinks = ShareLink.objects.filter(Q(uid=request.user.id) & Q(is_used=False) & Q(is_expired=False))
peers = [{'id':ix+1, 'name':f'{p.rid}|{p.alias}'} for ix, p in enumerate(peers)]
sharelinks = [{'shash':s.shash, 'is_used':s.is_used, 'is_expired':s.is_expired, 'create_time':s.create_time, 'peers':s.peers} for ix, s in enumerate(sharelinks)]
peers = [{'id': ix + 1, 'name': f'{p.rid}|{p.alias}'} for ix, p in enumerate(peers)]
sharelinks = [{'shash': s.shash, 'is_used': s.is_used, 'is_expired': s.is_expired, 'create_time': s.create_time, 'peers': s.peers} for ix, s in enumerate(sharelinks)]
if request.method == 'GET':
url = request.build_absolute_uri()
if url.endswith('share'):
return render(request, 'share.html', {'peers':peers, 'sharelinks':sharelinks})
return render(request, 'share.html', {'peers': peers, 'sharelinks': sharelinks})
else:
shash = url.split('/')[-1]
sharelink = ShareLink.objects.filter(Q(shash=shash))
@ -323,15 +332,15 @@ def share(request):
for peer in peers_share:
if peer.rid in peers_self_ids:
continue
#peer = RustDeskPeer.objects.get(rid=peer.rid)
# peer = RustDeskPeer.objects.get(rid=peer.rid)
peer_f = RustDeskPeer.objects.filter(Q(rid=peer.rid) & Q(uid=sharelink.uid))
if not peer_f:
msg += f"{peer.rid}已存在,"
continue
if len(peer_f) > 1:
msg += f'{peer.rid}存在多个,已经跳过。 '
continue
msg += f'{peer.rid}存在多个,已经跳过。 '
continue
peer = peer_f[0]
peer.id = None
peer.uid = request.user.id
@ -342,52 +351,52 @@ def share(request):
title = _(title)
msg = _(msg)
return render(request, 'msg.html', {'title':msg, 'msg':msg})
return render(request, 'msg.html', {'title': msg, 'msg': msg})
else:
data = request.POST.get('data', '[]')
data = json.loads(data)
if not data:
return JsonResponse({'code':0, 'msg':_('数据为空。')})
return JsonResponse({'code': 0, 'msg': _('数据为空。')})
rustdesk_ids = [x['title'].split('|')[0] for x in data]
rustdesk_ids = ','.join(rustdesk_ids)
sharelink = ShareLink(
uid=request.user.id,
shash = getStrMd5(str(time.time())+salt),
shash=getStrMd5(str(time.time()) + salt),
peers=rustdesk_ids,
)
sharelink.save()
return JsonResponse({'code':1, 'shash':sharelink.shash})
return JsonResponse({'code': 1, 'shash': sharelink.shash})
def get_conn_log():
logs = ConnLog.objects.all()
logs = {x.id:model_to_dict(x) for x in logs}
logs = {x.id: model_to_dict(x) for x in logs}
for k, v in logs.items():
try:
peer = RustDeskPeer.objects.get(rid=v['rid'])
logs[k]['alias'] = peer.alias
except:
except: # noqa
logs[k]['alias'] = _('UNKNOWN')
try:
peer = RustDeskPeer.objects.get(rid=v['from_id'])
logs[k]['from_alias'] = peer.alias
except:
except: # noqa
logs[k]['from_alias'] = _('UNKNOWN')
#from_zone = tz.tzutc()
#to_zone = tz.tzlocal()
#utc = logs[k]['logged_at']
#utc = utc.replace(tzinfo=from_zone)
#logs[k]['logged_at'] = utc.astimezone(to_zone)
# from_zone = tz.tzutc()
# to_zone = tz.tzlocal()
# utc = logs[k]['logged_at']
# utc = utc.replace(tzinfo=from_zone)
# logs[k]['logged_at'] = utc.astimezone(to_zone)
try:
duration = round((logs[k]['conn_end'] - logs[k]['conn_start']).total_seconds())
m, s = divmod(duration, 60)
h, m = divmod(m, 60)
#d, h = divmod(h, 24)
# d, h = divmod(h, 24)
logs[k]['duration'] = f'{h:02d}:{m:02d}:{s:02d}'
except:
except: # noqa
logs[k]['duration'] = -1
sorted_logs = sorted(logs.items(), key=lambda x: x[1]['conn_start'], reverse=True)
@ -397,20 +406,21 @@ def get_conn_log():
return [v for k, v in new_ordered_dict.items()]
def get_file_log():
logs = FileLog.objects.all()
logs = {x.id:model_to_dict(x) for x in logs}
logs = {x.id: model_to_dict(x) for x in logs}
for k, v in logs.items():
try:
peer_remote = RustDeskPeer.objects.get(rid=v['remote_id'])
logs[k]['remote_alias'] = peer_remote.alias
except:
except: # noqa
logs[k]['remote_alias'] = _('UNKNOWN')
try:
peer_user = RustDeskPeer.objects.get(rid=v['user_id'])
logs[k]['user_alias'] = peer_user.alias
except:
except: # noqa
logs[k]['user_alias'] = _('UNKNOWN')
sorted_logs = sorted(logs.items(), key=lambda x: x[1]['logged_at'], reverse=True)
@ -420,16 +430,18 @@ def get_file_log():
return [v for k, v in new_ordered_dict.items()]
@login_required(login_url='/api/user_action?action=login')
def conn_log(request):
paginator = Paginator(get_conn_log(), 20)
page_number = request.GET.get('page')
page_obj = paginator.get_page(page_number)
return render(request, 'show_conn_log.html', {'page_obj':page_obj})
return render(request, 'show_conn_log.html', {'page_obj': page_obj})
@login_required(login_url='/api/user_action?action=login')
def file_log(request):
paginator = Paginator(get_file_log(), 20)
page_number = request.GET.get('page')
page_obj = paginator.get_page(page_number)
return render(request, 'show_file_log.html', {'page_obj':page_obj})
return render(request, 'show_file_log.html', {'page_obj': page_obj})

Binary file not shown.