coosld/rustdesk-api-server
1
0
Fork 0
mirror of https://github.com/kingmo888/rustdesk-api-server.git synced 2026-02-21 10:27:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

解决反代时IP不正确的情况

Browse Source
This commit is contained in:
kingmo888 2024-09-09 23:56:47 +08:00
parent 7b8951d441
commit 175e1165db
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
api/views_api.py
View File

@ -14,6 +14,15 @@ from .views_front import *
from django.utils.translation import gettext as _ from django.utils.translation import gettext as _
def get_client_ip(request):
x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR')
if x_forwarded_for:
ip = x_forwarded_for.split(',')[0]
else:
ip = request.META.get('REMOTE_ADDR')
return ip
def login(request): def login(request):
result = {} result = {}
if request.method == 'GET': if request.method == 'GET':
@ -226,7 +235,7 @@ def sysinfo(request):
if request.method == 'GET': if request.method == 'GET':
result['error'] = _('错误的提交方式！') result['error'] = _('错误的提交方式！')
return JsonResponse(result) return JsonResponse(result)
client_ip = request.META.get('REMOTE_ADDR') client_ip = get_client_ip(request)
postdata = json.loads(request.body) 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: if not device:
@ -255,7 +264,7 @@ def heartbeat(request):
postdata = json.loads(request.body) 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: if device:
client_ip = request.META.get('REMOTE_ADDR') client_ip = get_client_ip(request)
device.ip_address = client_ip device.ip_address = client_ip
device.save() device.save()
# token保活 # token保活

4
api/views_front.py
View File

@ -295,7 +295,7 @@ def share(request):
sharelinks = ShareLink.objects.filter(Q(uid=request.user.id) & Q(is_used=False) & Q(is_expired=False)) sharelinks = ShareLink.objects.filter(Q(uid=request.user.id) & Q(is_used=False) & Q(is_expired=False))
# 省资源：处理已过期请求，不主动定时任务轮询请求，在任意地方请求时，检查是否过期，过期则保存。 # 省资源：处理已过期请求，不主动定时任务轮询请求，在任意地方请求时，检查是否过期，过期则保存。
now = datetime.datetime.now() # now = datetime.datetime.now()
for sl in sharelinks: for sl in sharelinks:
check_sharelink_expired(sl) check_sharelink_expired(sl)
sharelinks = ShareLink.objects.filter(Q(uid=request.user.id) & Q(is_used=False) & Q(is_expired=False)) sharelinks = ShareLink.objects.filter(Q(uid=request.user.id) & Q(is_used=False) & Q(is_expired=False))
@ -327,7 +327,7 @@ def share(request):
# 自己的peers若重叠，需要跳过 # 自己的peers若重叠，需要跳过
peers_self_ids = [x.rid for x in RustDeskPeer.objects.filter(Q(uid=request.user.id))] peers_self_ids = [x.rid for x in RustDeskPeer.objects.filter(Q(uid=request.user.id))]
peers_share = RustDeskPeer.objects.filter(Q(rid__in=peers) & Q(uid=sharelink.uid)) peers_share = RustDeskPeer.objects.filter(Q(rid__in=peers) & Q(uid=sharelink.uid))
peers_share_ids = [x.rid for x in peers_share] # peers_share_ids = [x.rid for x in peers_share]
for peer in peers_share: for peer in peers_share:
if peer.rid in peers_self_ids: if peer.rid in peers_self_ids: