RUSTDESK/rdgen-sunlix
1
0
Fork 0
forked from shaytan/rdgen
Code Pull Requests Activity

remove the need for ftp server

Browse Source
This commit is contained in:
Bryan Gerlach
2024-11-05 13:58:14 -06:00
parent bace58ac1f
commit bfadbb8cd5
4 changed files with 55 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
.github/workflows/generator-android.yml vendored
View File

@@ -552,15 +552,21 @@ jobs:
#
- name: Upload to FTP
# - name: Upload to FTP
# if: ${{ fromJson(inputs.extras).rdgen == 'true' }}
# uses: nerdoza/action-simple-file-upload@v2
# with:
# user: ${{ secrets.GEN_FTP_USER }}
# password: ${{ secrets.GEN_FTP_PASSWORD }}
# host: ${{ secrets.GEN_FTP_SERVER }}
# src: ./signed-apk/${{ inputs.filename }}-${{ matrix.job.arch }}.apk
# dest: /root/rdgen/exe/${{ env.UUIDFOLDER }}/${{ inputs.filename }}-${{ matrix.job.arch }}.apk
- name: send file to api server
if: ${{ fromJson(inputs.extras).rdgen == 'true' }}
uses: nerdoza/action-simple-file-upload@v2
with:
user: ${{ secrets.GEN_FTP_USER }}
password: ${{ secrets.GEN_FTP_PASSWORD }}
host: ${{ secrets.GEN_FTP_SERVER }}
src: ./signed-apk/${{ inputs.filename }}-${{ matrix.job.arch }}.apk
dest: /root/rdgen/exe/${{ env.UUIDFOLDER }}/${{ inputs.filename }}-${{ matrix.job.arch }}.apk
shell: bash
run: |
curl -i -X POST -H "Content-Type: multipart/form-data" -H "Authorization: Bearer ${{ fromJson(inputs.extras).token }}" -F "file=@./signed-apk/${{ inputs.filename }}-${{ matrix.job.arch }}.apk" ${{ secrets.GENURL }}/save_custom_client
- name: send file to api server
if: ${{ fromJson(inputs.extras).rdgen == 'false' }}

24
.github/workflows/generator-linux.yml vendored
View File

@@ -524,15 +524,23 @@ jobs:
# rustdesk-*.deb
# rustdesk-*.rpm
- name: Upload to FTP
# - name: Upload to FTP
# if: ${{ fromJson(inputs.extras).rdgen == 'true' }}
# uses: SamKirkland/FTP-Deploy-Action@v4.3.5
# with:
# server: ${{ secrets.GEN_FTP_SERVER }}
# username: ${{ secrets.GEN_FTP_USER }}
# password: ${{ secrets.GEN_FTP_PASSWORD }}
# local-dir: output/
# server-dir: /root/rdgen/exe/${{ env.UUIDFOLDER }}/
- name: send file to rdgen server
if: ${{ fromJson(inputs.extras).rdgen == 'true' }}
uses: SamKirkland/FTP-Deploy-Action@v4.3.5
with:
server: ${{ secrets.GEN_FTP_SERVER }}
username: ${{ secrets.GEN_FTP_USER }}
password: ${{ secrets.GEN_FTP_PASSWORD }}
local-dir: output/
server-dir: /root/rdgen/exe/${{ env.UUIDFOLDER }}/
shell: bash
run: |
curl -i -X POST -H "Content-Type: multipart/form-data" -H "Authorization: Bearer ${{ fromJson(inputs.extras).token }}" -F "file=@./output/${{ inputs.filename }}.deb" -F "uuid=${{ inputs.uuid }}" ${{ secrets.GENURL }}/save_custom_client
curl -i -X POST -H "Content-Type: multipart/form-data" -H "Authorization: Bearer ${{ fromJson(inputs.extras).token }}" -F "file=@./output/${{ inputs.filename }}.rpm" -F "uuid=${{ inputs.uuid }}" ${{ secrets.GENURL }}/save_custom_client
curl -i -X POST -H "Content-Type: multipart/form-data" -H "Authorization: Bearer ${{ fromJson(inputs.extras).token }}" -F "file=@./output/${{ inputs.filename }}-suse.rpm" -F "uuid=${{ inputs.uuid }}" ${{ secrets.GENURL }}/save_custom_client
- name: send file to api server
if: ${{ fromJson(inputs.extras).rdgen == 'false' }}

21
.github/workflows/generator-windows.yml vendored
View File

@@ -515,15 +515,20 @@ jobs:
run: |
mv ./SignOutput/rustdesk.exe "./SignOutput/${{ inputs.filename }}.exe" || echo "rustdesk"
- name: Upload to FTP
# - name: Upload to FTP
# if: ${{ fromJson(inputs.extras).rdgen == 'true' }}
# uses: SamKirkland/FTP-Deploy-Action@v4.3.5
# with:
# server: ${{ secrets.GEN_FTP_SERVER }}
# username: ${{ secrets.GEN_FTP_USER }}
# password: ${{ secrets.GEN_FTP_PASSWORD }}
# local-dir: ./SignOutput/
# server-dir: /root/rdgen/exe/${{ env.UUIDFOLDER }}/
- name: send file to rdgen server
if: ${{ fromJson(inputs.extras).rdgen == 'true' }}
uses: SamKirkland/FTP-Deploy-Action@v4.3.5
with:
server: ${{ secrets.GEN_FTP_SERVER }}
username: ${{ secrets.GEN_FTP_USER }}
password: ${{ secrets.GEN_FTP_PASSWORD }}
local-dir: ./SignOutput/
server-dir: /root/rdgen/exe/${{ env.UUIDFOLDER }}/
shell: bash
run: |
curl -i -X POST -H "Content-Type: multipart/form-data" -H "Authorization: Bearer ${{ fromJson(inputs.extras).token }}" -F "file=@./SignOutput/${{ inputs.filename }}.exe" -F "uuid=${{ inputs.uuid }}" ${{ secrets.GENURL }}/save_custom_client
- name: send file to api server
if: ${{ fromJson(inputs.extras).rdgen == 'false' }}

13
rdgenerator/views.py
View File

@@ -338,4 +338,15 @@ def save_png(file, uuid, domain):
imageJson['uuid'] = uuid
imageJson['file'] = quote(file.name)
#return "%s/%s" % (domain, file_save_path)
return json.dumps(imageJson)
return json.dumps(imageJson)
def save_custom_client(request):
file = request.FILES['file']
myuuid = request.POST.get('uuid')
file_save_path = "exe/%s/%s" % (myuuid, file.name)
Path("exe/%s" % myuuid).mkdir(parents=True, exist_ok=True)
with open(file_save_path, "wb+") as f:
for chunk in file.chunks():
f.write(chunk)
return HttpResponse("File saved successfully!")