更新说明

.github/workflows/auto-close-issues.yml

@@ -0,0 +1,56 @@
+name: Auto Close Issues if Not Starred
+
+on:
+  issues:
+    types: [opened]
+
+jobs:
+  close_issue:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Check if user has starred the repo
+      id: check_star
+      run: |
+        ISSUE_USER=$(jq -r '.issue.user.login' < $GITHUB_EVENT_PATH)
+        echo "Issue created by user: $ISSUE_USER"
+        PAGE=1
+        STARRED=""
+        
+        while [[ -z "$STARRED" ]]; do
+          STARRED_RESPONSE=$(curl -s -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
+              "https://api.github.com/repos/${{ github.repository }}/stargazers?per_page=100&page=$PAGE")
+          echo "STARRED_RESPONSE=$STARRED_RESPONSE"  # 输出 API 返回的数据以检查结构
+
+          if [[ -z "$STARRED_RESPONSE" || "$STARRED_RESPONSE" == "[]" ]]; then
+            break
+          fi
+
+          STARRED=$(echo "$STARRED_RESPONSE" | jq -r '.[] | select(.login == "'$ISSUE_USER'") | .login')
+          PAGE=$((PAGE + 1))
+        done
+
+        if [[ -z "$STARRED" ]]; then
+          echo "User has not starred the repo."
+        else
+          echo "User has starred the repo."
+        fi
+
+        echo "starred=$STARRED" >> $GITHUB_ENV
+
+
+
+
+    - name: Close issue if not starred
+      if: env.starred == '0'
+      run: |
+        ISSUE_NUMBER=$(jq -r '.issue.number' < $GITHUB_EVENT_PATH)
+        echo "Closing issue #$ISSUE_NUMBER"
+        curl -s -X POST -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
+        -H "Accept: application/vnd.github.v3+json" \
+        https://api.github.com/repos/${{ github.repository }}/issues/$ISSUE_NUMBER/comments \
+        -d '{"body":"Please star the project before submitting an issue."}'
+
+        curl -s -X PATCH -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
+        -H "Accept: application/vnd.github.v3+json" \
+        https://api.github.com/repos/${{ github.repository }}/issues/$ISSUE_NUMBER \
+        -d '{"state":"closed"}'

README.md

@@ -6,7 +6,7 @@
 <p align="center">
     <i>一个 python 实现的 Rustdesk API 接口，支持 WebUI 管理</i>
     <br/>
-    <img src ="https://img.shields.io/badge/Version-1.5.0-blueviolet.svg"/>
+    <img src ="https://img.shields.io/badge/Version-1.5.2-blueviolet.svg"/>
     <img src ="https://img.shields.io/badge/Python-3.7|3.8|3.9|3.10|3.11-blue.svg" />
     <img src ="https://img.shields.io/badge/Django-3.2+|4.x-yelow.svg" />
     <br/>
@@ -15,6 +15,9 @@
 </p>
 
 # 1.2.3版本与1.2.6+版本区别
+#### **请使用自定义key，因不填写key、或使用服务端自动生成的key而引起的链接超时或建立链接时间过长的问题，不在本项目解决范围内。**
+
+
 > rustdesk官方在其新版服务端中已[强制要求key](https://rustdesk.com/docs/zh-cn/self-host/rustdesk-server-oss/install/#key)(rustdesk-server版本号大概>=1.1.10)
 
 - rustdesk版本<=1.2.3, 服务端请配合使用rustdesk-server<=1.1.10
@@ -27,6 +30,12 @@
 
   ![demo](images/compose_demo.png)
 
+`key是保证别人不能在知道你中继服务器的IP后，利用你的IP做中继。如果不配置key，就做好中继IP的保密工作，不要泄露给其他人。
+而只要服务端配置了密钥，无论是随机生成（生成后本身就固定了），还是自定义的，如果控制客户端不配置对应key就无法控制其他机器（被控机器可以不填key）`
+
+对于自定义key是否生效，请看rustdesk server中`hbbs`的日志：
+![demo](images/key_activate.png)
+
 ## 展示
 
 ![主页面](images/front_main.png)

README_EN.md

@@ -9,7 +9,7 @@
 <p align="center">
     <i>A Rustdesk API interface implemented in Python, with WebUI management support</i>
     <br/>
-    <img src ="https://img.shields.io/badge/Version-1.5.0-blueviolet.svg"/>
+    <img src ="https://img.shields.io/badge/Version-1.5.1-blueviolet.svg"/>
     <img src ="https://img.shields.io/badge/Python-3.7|3.8|3.9|3.10|3.11-blue.svg" />
     <img src ="https://img.shields.io/badge/Django-3.2+|4.x-yelow.svg" />
     <br/>

api/migrations/0008_rustdesdevice_ip_address.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2 on 2024-09-09 10:37
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0007_alter_rustdesdevice_options_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='rustdesdevice',
+            name='ip_address',
+            field=models.CharField(blank=True, max_length=60, verbose_name='IP'),
+        ),
+    ]

api/models_work.py

@@ -3,6 +3,7 @@ from django.db import models
 from django.contrib import admin
 from django.utils.translation import gettext as _
 
+
 class RustDeskToken(models.Model):
     ''' Token
     '''
@@ -12,17 +13,19 @@ class RustDeskToken(models.Model):
     uuid = models.CharField(verbose_name=_('uuid'), max_length=60)
     access_token = models.CharField(verbose_name=_('access_token'), max_length=60, blank=True)
     create_time = models.DateTimeField(verbose_name=_('登录时间'), auto_now_add=True)
-    #expire_time = models.DateTimeField(verbose_name='过期时间')
+    # expire_time = models.DateTimeField(verbose_name='过期时间')
+
     class Meta:
         ordering = ('-username',)
         verbose_name = "Token"
-        verbose_name_plural = _("Token列表") 
+        verbose_name_plural = _("Token列表")
+
 
 class RustDeskTokenAdmin(admin.ModelAdmin):
     list_display = ('username', 'uid')
     search_fields = ('username', 'uid')
-    list_filter = ('create_time', ) #过滤器
+    list_filter = ('create_time', )  # 过滤器
-    
+
 
 class RustDeskTag(models.Model):
     ''' Tags
@@ -30,17 +33,18 @@ class RustDeskTag(models.Model):
     uid = models.CharField(verbose_name=_('所属用户ID'), max_length=16)
     tag_name = models.CharField(verbose_name=_('标签名称'), max_length=60)
     tag_color = models.CharField(verbose_name=_('标签颜色'), max_length=60, blank=True)
-    
+
     class Meta:
         ordering = ('-uid',)
         verbose_name = "Tags"
         verbose_name_plural = _("Tags列表")
 
+
 class RustDeskTagAdmin(admin.ModelAdmin):
     list_display = ('tag_name', 'uid', 'tag_color')
     search_fields = ('tag_name', 'uid')
     list_filter = ('uid', )
-    
+
 
 class RustDeskPeer(models.Model):
     ''' Pees
@@ -53,19 +57,19 @@ class RustDeskPeer(models.Model):
     platform = models.CharField(verbose_name=_('平台'), max_length=30)
     tags = models.CharField(verbose_name=_('标签'), max_length=30)
     rhash = models.CharField(verbose_name=_('设备链接密码'), max_length=60)
-    
+
     class Meta:
         ordering = ('-username',)
         verbose_name = "Peers"
-        verbose_name_plural = _("Peers列表" )
+        verbose_name_plural = _("Peers列表")
-        
+
 
 class RustDeskPeerAdmin(admin.ModelAdmin):
     list_display = ('rid', 'uid', 'username', 'hostname', 'platform', 'alias', 'tags')
     search_fields = ('deviceid', 'alias')
     list_filter = ('rid', 'uid', )
-    
+
-    
+
 class RustDesDevice(models.Model):
     rid = models.CharField(verbose_name=_('客户端ID'), max_length=60, blank=True)
     cpu = models.CharField(verbose_name='CPU', max_length=100)
@@ -75,21 +79,24 @@ class RustDesDevice(models.Model):
     uuid = models.CharField(verbose_name='uuid', max_length=100)
     username = models.CharField(verbose_name=_('系统用户名'), max_length=100, blank=True)
     version = models.CharField(verbose_name=_('客户端版本'), max_length=100)
+    ip_address = models.CharField(verbose_name=_('IP'), max_length=60, blank=True)
     create_time = models.DateTimeField(verbose_name=_('设备注册时间'), auto_now_add=True)
     update_time = models.DateTimeField(verbose_name=('设备更新时间'), auto_now=True, blank=True)
-    
+
     class Meta:
         ordering = ('-rid',)
         verbose_name = _("设备")
-        verbose_name_plural = _("设备列表" )
+        verbose_name_plural = _("设备列表")
-    
+
+
 class RustDesDeviceAdmin(admin.ModelAdmin):
     list_display = ('rid', 'hostname', 'memory', 'uuid', 'version', 'create_time', 'update_time')
     search_fields = ('hostname', 'memory')
     list_filter = ('rid', )
 
+
 class ConnLog(models.Model):
-    id = models.IntegerField(verbose_name='ID',primary_key=True)
+    id = models.IntegerField(verbose_name='ID', primary_key=True)
     action = models.CharField(verbose_name='Action', max_length=20, null=True)
     conn_id = models.CharField(verbose_name='Connection ID', max_length=10, null=True)
     from_ip = models.CharField(verbose_name='From IP', max_length=30, null=True)
@@ -100,13 +107,15 @@ class ConnLog(models.Model):
     session_id = models.CharField(verbose_name='Session ID', max_length=60, null=True)
     uuid = models.CharField(verbose_name='uuid', max_length=60, null=True)
 
+
 class ConnLogAdmin(admin.ModelAdmin):
     list_display = ('id', 'action', 'conn_id', 'from_ip', 'from_id', 'rid', 'conn_start', 'conn_end', 'session_id', 'uuid')
     search_fields = ('from_ip', 'rid')
     list_filter = ('id', 'from_ip', 'from_id', 'rid', 'conn_start', 'conn_end')
 
+
 class FileLog(models.Model):
-    id = models.IntegerField(verbose_name='ID',primary_key=True)
+    id = models.IntegerField(verbose_name='ID', primary_key=True)
     file = models.CharField(verbose_name='Path', max_length=500)
     remote_id = models.CharField(verbose_name='Remote ID', max_length=20, default='0')
     user_id = models.CharField(verbose_name='User ID', max_length=20, default='0')
@@ -115,11 +124,13 @@ class FileLog(models.Model):
     direction = models.IntegerField(verbose_name='Direction', default=0)
     logged_at = models.DateTimeField(verbose_name='Logged At', null=True)
 
+
 class FileLogAdmin(admin.ModelAdmin):
     list_display = ('id', 'file', 'remote_id', 'user_id', 'user_ip', 'filesize', 'direction', 'logged_at')
     search_fields = ('file', 'remote_id', 'user_id', 'user_ip')
     list_filter = ('id', 'file', 'remote_id', 'user_id', 'user_ip', 'filesize', 'direction', 'logged_at')
 
+
 class ShareLink(models.Model):
     ''' 分享链接
     '''
@@ -129,16 +140,14 @@ class ShareLink(models.Model):
     is_used = models.BooleanField(verbose_name=_('是否使用'), default=False)
     is_expired = models.BooleanField(verbose_name=_('是否过期'), default=False)
     create_time = models.DateTimeField(verbose_name=_('生成时间'), auto_now_add=True)
-    
 
-    
     class Meta:
         ordering = ('-create_time',)
         verbose_name = _("分享链接")
-        verbose_name_plural = _("链接列表" )
+        verbose_name_plural = _("链接列表")
-        
+
 
 class ShareLinkAdmin(admin.ModelAdmin):
     list_display = ('shash', 'uid', 'peers', 'is_used', 'is_expired', 'create_time')
     search_fields = ('peers', )
-    list_filter = ('is_used', 'uid', 'is_expired' )
+    list_filter = ('is_used', 'uid', 'is_expired')

api/templates/show_work.html

@@ -23,6 +23,7 @@
                 <th>{{ "系统" | translate }}</th>
                 <th>{{ "CPU" | translate }}</th>
                 <th>{{ "内存" | translate }}</th>
+                <th>{{ "IP" | translate }}</th>
                 <th>{{ "注册时间" | translate }}</th>
                 <th>{{ "更新时间" | translate }}</th>
                 <th>{{ "状态" | translate }}</th>
@@ -41,6 +42,7 @@
                 <td>{{one.os}}</td>
                 <td>{{one.cpu}}</td>
                 <td>{{one.memory}}</td>
+                <td>{{one.ip_address}}</td>
                 <td>{{one.create_time}}</td>
                 <td>{{one.update_time}}</td>
                 <td>{{one.status}} </td>
@@ -67,10 +69,10 @@
               <button class="layui-btn" ><a href="?page={{ page_obj.paginator.num_pages }}">{{ "尾页" | translate }} &raquo;</a></button>
           {% endif %}
       </span>
-  </div>  
+  </div>
     {% endif %}
 
-    
+
     {% if u.is_admin and show_all %}
     <div class="layui-col-md15">
       <div class="layui-card">
@@ -89,6 +91,7 @@
                 <th>{{ "系统" | translate }}</th>
                 <th>{{ "CPU" | translate }}</th>
                 <th>{{ "内存" | translate }}</th>
+                <th>{{ "IP" | translate }}</th>
                 <th>{{ "注册日期" | translate }}</th>
                 <th>{{ "更新时间" | translate }}</th>
                 <th>{{ "状态" | translate }}</th>
@@ -106,6 +109,7 @@
                 <td>{{one.os}} </td>
                 <td>{{one.cpu}} </td>
                 <td>{{one.memory}} </td>
+                <td>{{one.ip_address}}</td>
                 <td>{{one.create_time}} </td>
                 <td>{{one.update_time}} </td>
                 <td>{{one.status}} </td>
@@ -132,11 +136,11 @@
               <button class="layui-btn" ><a href="?show_type=admin&page={{ page_obj.paginator.num_pages }}">{{ "尾页" | translate }} &raquo;</a></button>
           {% endif %}
       </span>
-  </div>  
+  </div>
     {% endif %}
 
- 
+
-  
+
 
   </div>
 </div>

api/views_api.py

@@ -14,6 +14,15 @@ from .views_front import *
 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):
     result = {}
     if request.method == 'GET':
@@ -39,6 +48,18 @@ def login(request):
     user.rtype = rtype
     user.deviceInfo = json.dumps(deviceInfo)
     user.save()
+    # 绑定设备  20240819
+    peer = RustDeskPeer.objects.filter(Q(rid=rid)).first()
+    if not peer:
+        device = RustDesDevice.objects.filter(Q(uuid=uuid)).first()
+        if device:
+            peer = RustDeskPeer()
+            peer.uid = user.id
+            peer.rid = device.rid
+            # peer.abid = ab.guid    # v2,  current version not used
+            peer.hostname = device.hostname
+            peer.username = device.username
+            peer.save()
 
     token = RustDeskToken.objects.filter(Q(uid=user.id) & Q(username=user.username) & Q(rid=user.rid)).first()
 
@@ -214,7 +235,7 @@ def sysinfo(request):
     if request.method == 'GET':
         result['error'] = _('错误的提交方式！')
         return JsonResponse(result)
-
+    client_ip = get_client_ip(request)
     postdata = json.loads(request.body)
     device = RustDesDevice.objects.filter(Q(rid=postdata['id']) & Q(uuid=postdata['uuid'])).first()
     if not device:
@@ -227,6 +248,7 @@ def sysinfo(request):
             username=postdata.get('username', '-'),
             uuid=postdata['uuid'],
             version=postdata['version'],
+            ip_address=client_ip
         )
         device.save()
     else:
@@ -242,6 +264,8 @@ def heartbeat(request):
     postdata = json.loads(request.body)
     device = RustDesDevice.objects.filter(Q(rid=postdata['id']) & Q(uuid=postdata['uuid'])).first()
     if device:
+        client_ip = get_client_ip(request)
+        device.ip_address = client_ip
         device.save()
     # token保活
     create_time = datetime.datetime.now() + datetime.timedelta(seconds=EFFECTIVE_SECONDS)

api/views_front.py

@@ -229,6 +229,9 @@ def get_all_info():
         if device:
             devices[peer.rid]['rust_user'] = user.username
 
+    for rid in devices.keys():
+        if not devices[rid].get('rust_user', ''):
+            devices[rid]['rust_user'] = _('未登录')
     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()]
@@ -295,7 +298,7 @@ def share(request):
     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:
         check_sharelink_expired(sl)
     sharelinks = ShareLink.objects.filter(Q(uid=request.user.id) & Q(is_used=False) & Q(is_expired=False))
@@ -327,7 +330,7 @@ def share(request):
                     # 自己的peers若重叠，需要跳过
                     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_ids = [x.rid for x in peers_share]
+                    # peers_share_ids = [x.rid for x in peers_share]
 
                     for peer in peers_share:
                         if peer.rid in peers_self_ids: