增加自动官网翻译、并且将其设置为默认

cnf/const.py

@@ -37,6 +37,11 @@
 
 template_file = "./template/主机扫描报告模板-202104.docx"
 
+# 翻译工具: BaiDu YouDao Tenable
+# BaiDu :   百度翻译，需要配置key、secret
+# YouDao :  网易翻译，需要配置key、secret
+# Tenable : 官网翻译，无需配置
+translate_tool = "Tenable"
 translate_status = True
 translate_auto_db = True  # 翻译结果默认添加到db中
 translate_sem = 9  # 协程限制
@@ -46,8 +51,10 @@
 translate_baidu_secret = "XXXXXX"
 
 translate_youdao_url = "https://openapi.youdao.com/api"
-translate_youdao_appkey = "xxxxxxxx"
-translate_youdao_appsecret = "xxxxxxxx"
+translate_youdao_appkey = ""
+translate_youdao_appsecret = ""
+
+translate_tenable_url = "https://zh-cn.tenable.com/plugins/nessus/"
 
 translate_order = {
     "name_en": "name_cn",

config.py

@@ -27,7 +27,6 @@
 #    ````':.          ':::::::::'                  ::::..
 #                       '.:::::'                    ':'````..
 # ------------------------------------------------------------
-from datetime import datetime
 
 config_data = {
     "user": {

modle/common/translate/baidu.py

@@ -32,6 +32,8 @@
 import hashlib
 import random
 
+from aiohttp import ClientResponse
+
 from cnf.const import translate_baidu_url, translate_baidu_appid, translate_baidu_secret
 from cnf.const import translate_order
 from modle.common.loophole.loopholes import Loopholes
@@ -80,8 +82,11 @@ def _make_en_reqinfos(self):
 
         return en_reqinfos
 
-    def _analysis_cn_resinfo(self, resinfo):
+    async def _analysis_cn_resinfo(self, response: ClientResponse, type_cn):
         """
         解析响应体中的中文数据
         """
-        return resinfo["trans_result"][0]["dst"]
+        res_json = await response.json()
+        return {
+            type_cn: res_json["trans_result"][0]["dst"]
+        }

modle/common/translate/base.py

@@ -31,6 +31,7 @@
 import logging
 from abc import abstractmethod
 
+from aiohttp import ClientResponse
 from aiohttp.client import ClientSession, ClientTimeout
 
 from cnf.const import translate_sem, translate_qps, translate_status, translate_auto_db, json_loops_error, vuln_db_file
@@ -58,14 +59,15 @@ async def _tran_http_with_sem(self, reqinfo, sem):
 
     async def _tran_http(self, reqinfo, sem=None):
         await asyncio.sleep(1)
-        async with ClientSession(timeout=self.timeout) as session:
+        async with ClientSession(timeout=self.timeout, headers=reqinfo.get("headers", {})) as session:
             try:
                 async with session.request(method=reqinfo["method"], url=reqinfo["url"],
                                            **reqinfo["kwargs"]) as response:
-                    data = await response.json()
+
+                    data = await self._analysis_cn_resinfo(response, reqinfo["type_cn"])
                     self.tran_number += 1
                     print("------翻译漏洞进度：{0}/{1}".format(int(self.tran_number / 3) + 1, self.tran_count), end='\r')
-                    return [reqinfo["plugin_id"], reqinfo["type_cn"], data]
+                    return [reqinfo["plugin_id"], data]
             except Exception as e:
                 print(e)
 
@@ -100,13 +102,14 @@ def _make_en_reqinfos(self):
         pass
 
     @abstractmethod
-    def _analysis_cn_resinfo(self, resinfo):
+    async def _analysis_cn_resinfo(self, response: ClientResponse, type_cn):
         pass
 
     def run(self):
         cn_resinfos = asyncio.run(self._async_main())
-        for plugin_id, type_cn, resinfo in cn_resinfos:
-            self.LOOPHOLES[plugin_id][type_cn] = self._analysis_cn_resinfo(resinfo)
+        for plugin_id, resinfo in cn_resinfos:
+            for type_cn, cn_text in resinfo.items():
+                self.LOOPHOLES[plugin_id][type_cn] = cn_text
         self._check_en2cn()
         self.LOOPHOLES.dump_loops()
         if translate_auto_db:

modle/common/translate/youdao.py

@@ -31,15 +31,17 @@
 import time
 import uuid
 
+from aiohttp import ClientResponse
+
 from cnf.const import translate_youdao_url, translate_youdao_appkey, translate_youdao_appsecret, translate_order
 from modle.common.loophole.loopholes import Loopholes
 from modle.common.translate.base import TranBase
 
 
-class TranYoudao(TranBase):
+class TranYouDao(TranBase):
 
     def __init__(self, LOOPHOLES: Loopholes):
-        super(TranYoudao, self).__init__(LOOPHOLES)
+        super(TranYouDao, self).__init__(LOOPHOLES)
 
     def _make_en_reqinfos(self):
 
@@ -88,8 +90,11 @@ def truncate(q):
 
         return en_reqinfos
 
-    def _analysis_cn_resinfo(self, resinfo):
+    async def _analysis_cn_resinfo(self, response: ClientResponse, type_cn):
         """
-        解析响应体
+        解析响应体中的中文数据
         """
-        return resinfo["translation"]
+        res_json = await response.json()
+        return {
+            type_cn: res_json["translation"]
+        }

modle/handle.py

@@ -30,8 +30,11 @@
 
 import logging
 
+from cnf.const import translate_tool
 from modle.common.loophole.loopholes import Loopholes
 from modle.common.translate.baidu import TranBaidu
+from modle.common.translate.tenable import TranTenable
+from modle.common.translate.youdao import TranYouDao
 from modle.data.hosts import DataHosts
 from modle.data.loops import DataLoops
 from modle.docx.host import DocxHost
@@ -52,7 +55,12 @@ def __init__(self, docxtype):
         self.LOOPHOLES.run()
 
         logging.info("---开始翻译数据")
-        TranBaidu(self.LOOPHOLES).run()
+        func_translate_tools = {
+            "BaiDu": TranBaidu,
+            "YouDao": TranYouDao,
+            "Tenable": TranTenable
+        }
+        func_translate_tools[translate_tool](self.LOOPHOLES).run()
 
     def run_hosts(self):
         """