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 0aa6288..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 @@ -200,11 +201,10 @@ async def send_messages( for i in range(len(node_ips)): url = "http://" + node_ips[i][0] + ":8001" + "/user_src" - print(url) 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) @@ -245,6 +245,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/client_cli.py b/src/client_cli.py index 3da6a91..1846f52 100644 --- a/src/client_cli.py +++ b/src/client_cli.py @@ -3,7 +3,7 @@ import requests def send_post_request(ip_addr, message_name): - url = f"http://localhost:8002/request_message/" + 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 diff --git a/src/node.py b/src/node.py index aa1719a..fa40bd7 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)