From 5115142c2fc12047820994eeafd9baa875bc405b Mon Sep 17 00:00:00 2001 From: Smart-SangGe <2251250136@qq.com> Date: Tue, 24 Oct 2023 21:44:02 +0800 Subject: [PATCH 1/2] test: test --- doc/README_app_en.md | 4 ++-- src/client.py | 4 +++- src/node.py | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) 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 diff --git a/src/client.py b/src/client.py index d80688d..ce1e387 100644 --- a/src/client.py +++ b/src/client.py @@ -187,6 +187,7 @@ async def send_messages( print(node_ips) # calculate id of nodes for node_ip in node_ips: + node_ip = node_ip[0] ip_parts = node_ip.split(".") id = 0 for i in range(4): @@ -199,7 +200,7 @@ async def send_messages( capsule_ct = Encrypt(pk, message) # type: ignore for i in range(len(node_ips)): - url = "http://" + node_ips[i] + ":8001" + "/user_src?message" + url = "http://" + node_ips[i][0] + ":8001" + "/user_src?message" payload = { "source_ip": local_ip, @@ -243,6 +244,7 @@ async def request_message(i_m: Request_Message): } try: response = requests.post(url, json=payload, timeout=3) + print(response.text) except: print("can't post") diff --git a/src/node.py b/src/node.py index 99ff06c..d6e1dbd 100644 --- a/src/node.py +++ b/src/node.py @@ -108,4 +108,4 @@ async def send_user_des_message(source_ip: str, dest_ip: str, re_message): # if __name__ == "__main__": import uvicorn # pylint: disable=e0401 - uvicorn.run("node:app", host="0.0.0.0", port=8001, reload=False) + uvicorn.run("node:app", host="0.0.0.0", port=8001, reload=True) From e9f523014fe5b1fb9e6f4a60d3b9aa0cc32c42f2 Mon Sep 17 00:00:00 2001 From: Smart-SangGe <2251250136@qq.com> Date: Tue, 24 Oct 2023 22:31:43 +0800 Subject: [PATCH 2/2] test: test --- src/client.py | 9 +++++---- src/client_cli.py | 2 +- src/node.py | 9 +++++---- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/client.py b/src/client.py index f1207c2..cd71218 100644 --- a/src/client.py +++ b/src/client.py @@ -9,6 +9,7 @@ from pydantic import BaseModel import socket import random import time +import base64 @asynccontextmanager @@ -199,14 +200,14 @@ 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" - print(url) + url = "http://" + node_ips[i][0] + ":8001" + "/user_src" payload = { "source_ip": local_ip, "dest_ip": dest_ip, - "capsule_ct": capsule_ct, + "capsule_ct": base64.b64encode(str(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..b9e2d6e 100644 --- a/src/client_cli.py +++ b/src/client_cli.py @@ -2,7 +2,7 @@ import argparse import requests def send_post_request(ip_addr, message_name): - url = f"http://localhost:8002/request_message/?i_m" + url = f"http://localhost:8002/request_message" data = { "dest_ip": ip_addr, "message_name": message_name diff --git a/src/node.py b/src/node.py index 8fd270b..2cbf6b4 100644 --- a/src/node.py +++ b/src/node.py @@ -7,6 +7,7 @@ from pydantic import BaseModel from tpre import * import os from typing import Any, Tuple +import base64 @asynccontextmanager @@ -80,7 +81,7 @@ class Req(BaseModel): @app.post("/user_src") # 接收用户1发送的信息 -async def receive_user_src_message(message: Req): +async def user_src(message: Req): global client_ip_src, client_ip_des # kfrag , capsule_ct ,client_ip_src , client_ip_des = json_data[] # 看梁俊勇 """ @@ -91,10 +92,10 @@ async def receive_user_src_message(message: Req): "rk": rk_list[i], } """ - print(type(message)) source_ip = message.source_ip dest_ip = message.dest_ip - capsule_ct = message.capsule_ct + b64capsule_ct = message.capsule_ct + capsule_ct = base64.b64decode(b64capsule_ct) rk = message.rk processed_message = ReEncrypt(rk, capsule_ct) @@ -107,7 +108,7 @@ async def send_user_des_message(source_ip: str, dest_ip: str, re_message): # # 发送 HTTP POST 请求 response = requests.post( - "http://" + dest_ip + "/receive_messages?message", json=data + "http://" + dest_ip + "/receive_messages", json=data ) print(response)