From 97f5b4eac71f825a5417fe8124b115925baf3bb9 Mon Sep 17 00:00:00 2001 From: dqy <1016751306@qq.com> Date: Tue, 24 Oct 2023 22:33:07 +0800 Subject: [PATCH 1/8] test:test --- src/client.py | 5 +++-- src/client_cli.py | 10 +++++----- src/node.py | 4 +--- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/client.py b/src/client.py index 4c4ae4e..0aa6288 100644 --- a/src/client.py +++ b/src/client.py @@ -199,7 +199,7 @@ async def send_messages( capsule_ct = Encrypt(pk, message) # type: ignore for i in range(len(node_ips)): - url = "http://" + node_ips[i][0] + ":8001" + "/user_src?message" + url = "http://" + node_ips[i][0] + ":8001" + "/user_src" print(url) payload = { "source_ip": local_ip, @@ -207,6 +207,7 @@ async def send_messages( "capsule_ct": capsule_ct, "rk": rk_list[i], } + print(payload) response = requests.post(url, json=payload) if response.status_code == 200: @@ -235,7 +236,7 @@ async def request_message(i_m: Request_Message): message_name = i_m.message_name source_ip = get_own_ip() dest_port = "8002" - url = "http://" + dest_ip + ":" + dest_port + "/recieve_request?i_m" + url = "http://" + dest_ip + ":" + dest_port + "/recieve_request" payload = { "dest_ip": dest_ip, "message_name": message_name, diff --git a/src/client_cli.py b/src/client_cli.py index 458de98..3da6a91 100644 --- a/src/client_cli.py +++ b/src/client_cli.py @@ -1,15 +1,14 @@ import argparse import requests + def send_post_request(ip_addr, message_name): - url = f"http://localhost:8002/request_message/?i_m" - data = { - "dest_ip": ip_addr, - "message_name": message_name - } + url = f"http://localhost:8002/request_message/" + data = {"dest_ip": ip_addr, "message_name": message_name} response = requests.post(url, json=data) return response.text + def main(): parser = argparse.ArgumentParser(description="Send POST request to a specified IP.") parser.add_argument("ip_addr", help="IP address to send request to.") @@ -19,5 +18,6 @@ def main(): response = send_post_request(args.ip_addr, args.message_name) print(response) + if __name__ == "__main__": main() diff --git a/src/node.py b/src/node.py index 8fd270b..aa1719a 100644 --- a/src/node.py +++ b/src/node.py @@ -106,9 +106,7 @@ async def send_user_des_message(source_ip: str, dest_ip: str, re_message): # data = {"Tuple": re_message, "ip": source_ip} # 类型不匹配 # 发送 HTTP POST 请求 - response = requests.post( - "http://" + dest_ip + "/receive_messages?message", json=data - ) + response = requests.post("http://" + dest_ip + "/receive_messages", json=data) print(response) From c6ad479f60706b156d34c6a8c918f89f04562f6f Mon Sep 17 00:00:00 2001 From: dqy <1016751306@qq.com> Date: Tue, 24 Oct 2023 22:52:39 +0800 Subject: [PATCH 2/8] test:test --- src/node.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node.py b/src/node.py index 627c39e..09a9e1c 100644 --- a/src/node.py +++ b/src/node.py @@ -95,7 +95,7 @@ async def user_src(message: Req): source_ip = message.source_ip dest_ip = message.dest_ip capsule, ct = message.capsule_ct - capsule_ct = (capsule, ct.to_bytes()) + capsule_ct = (capsule, ct.to_bytes(32)) rk = message.rk processed_message = ReEncrypt(rk, capsule_ct) From 51880b33e6ca9b97d13c9f71ad8ed34b3e7ecc88 Mon Sep 17 00:00:00 2001 From: dqy <1016751306@qq.com> Date: Tue, 24 Oct 2023 23:04:17 +0800 Subject: [PATCH 3/8] test:test --- src/node.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/node.py b/src/node.py index f744b51..0644121 100644 --- a/src/node.py +++ b/src/node.py @@ -108,8 +108,10 @@ async def send_user_des_message(source_ip: str, dest_ip: str, re_message): # data = {"Tuple": re_message, "ip": source_ip} # 类型不匹配 # 发送 HTTP POST 请求 - response = requests.post("http://" + dest_ip + "/receive_messages", json=data) - print(response) + response = requests.post( + "http://" + dest_ip + ":8002" + "/receive_messages", json=data + ) + print(response.text) if __name__ == "__main__": From cbc01940376a1f13757db37d034ca4779e3c3e96 Mon Sep 17 00:00:00 2001 From: sangge <2251250136@qq.com> Date: Wed, 25 Oct 2023 09:16:46 +0800 Subject: [PATCH 4/8] feat: add ci --- .gitea/workflow/ci.yaml | 29 +++++++++++++++++++++++++++++ doc/README_app_en.md | 4 ++-- 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 .gitea/workflow/ci.yaml diff --git a/.gitea/workflow/ci.yaml b/.gitea/workflow/ci.yaml new file mode 100644 index 0000000..4ab431d --- /dev/null +++ b/.gitea/workflow/ci.yaml @@ -0,0 +1,29 @@ +name: Deploy App + +on: + push: + branches: + - main + +jobs: + deploy: + name: Deploy to Web Server + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + + + - name: copy file via ssh password + uses: appleboy/scp-action@v0.1.4 + with: + host: "110.41.155.96,110.41.130.197,110.41.21.35" + username: ${{ secrets.USERNAME }} + password: ${{ secrets.PASSWORD }} + port: ${{ secrets.PORT }} + source: "src/server.py,src/client.py,src/node.py" + target: /root/mimajingsai/src/ + + + diff --git a/doc/README_app_en.md b/doc/README_app_en.md index 88141d1..839dda2 100644 --- a/doc/README_app_en.md +++ b/doc/README_app_en.md @@ -7,10 +7,10 @@ get method pr -docker run --rm -it -p 8000:8000 -p 8001:8001 -p 8002:8002 -v ~/mimajingsai:/app -e HOST_IP=110.41.130.197 git.mamahaha.work/sangge/tpre:base bash +docker run -it -p 8000:8000 -p 8001:8001 -p 8002:8002 -v ~/mimajingsai:/app -e HOST_IP=110.41.130.197 git.mamahaha.work/sangge/tpre:base bash -tpre3: docker run --rm -it -p 8000:8000 -p 8001:8001 -p 8002:8002 -v ~/mimajingsai:/app -e HOST_IP=110.41.21.35 git.mamahaha.work/sangge/tpre:base bash +tpre3: docker run -it -p 8000:8000 -p 8001:8001 -p 8002:8002 -v ~/mimajingsai:/app -e HOST_IP=110.41.21.35 git.mamahaha.work/sangge/tpre:base bash 110.41.155.96 tpre1 From 961e881c874ee8952c794311d0a80ef3e5eba039 Mon Sep 17 00:00:00 2001 From: sangge <2251250136@qq.com> Date: Wed, 25 Oct 2023 09:19:27 +0800 Subject: [PATCH 5/8] fix: rename folder --- .gitea/{workflow => workflows}/ci.yaml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .gitea/{workflow => workflows}/ci.yaml (100%) diff --git a/.gitea/workflow/ci.yaml b/.gitea/workflows/ci.yaml similarity index 100% rename from .gitea/workflow/ci.yaml rename to .gitea/workflows/ci.yaml From 52a70c5ed1f3ada783893dac680e0e24785c7ff5 Mon Sep 17 00:00:00 2001 From: sangge <2251250136@qq.com> Date: Wed, 25 Oct 2023 09:20:39 +0800 Subject: [PATCH 6/8] fix: use checkout v3 --- .gitea/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml index 4ab431d..cb96a82 100644 --- a/.gitea/workflows/ci.yaml +++ b/.gitea/workflows/ci.yaml @@ -12,7 +12,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: copy file via ssh password From e6dfd179d442cfac16860397fba2c572e043a17a Mon Sep 17 00:00:00 2001 From: sangge <2251250136@qq.com> Date: Wed, 25 Oct 2023 09:35:12 +0800 Subject: [PATCH 7/8] test: add quote --- .gitea/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml index cb96a82..ac3ab6a 100644 --- a/.gitea/workflows/ci.yaml +++ b/.gitea/workflows/ci.yaml @@ -23,7 +23,7 @@ jobs: password: ${{ secrets.PASSWORD }} port: ${{ secrets.PORT }} source: "src/server.py,src/client.py,src/node.py" - target: /root/mimajingsai/src/ + target: "/root/mimajingsai/src/" From b63bd8cca5ed1018a80bb105a28a8585a6b932b5 Mon Sep 17 00:00:00 2001 From: sangge <2251250136@qq.com> Date: Wed, 25 Oct 2023 09:37:13 +0800 Subject: [PATCH 8/8] test: test --- .gitea/workflows/ci.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml index ac3ab6a..a823d44 100644 --- a/.gitea/workflows/ci.yaml +++ b/.gitea/workflows/ci.yaml @@ -21,7 +21,6 @@ jobs: host: "110.41.155.96,110.41.130.197,110.41.21.35" username: ${{ secrets.USERNAME }} password: ${{ secrets.PASSWORD }} - port: ${{ secrets.PORT }} source: "src/server.py,src/client.py,src/node.py" target: "/root/mimajingsai/src/"