buildz 0.6.47__tar.gz → 0.6.48__tar.gz

{buildz-0.6.47/buildz.egg-info → buildz-0.6.48}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.47
+Version: 0.6.48
 Summary: 配置读写（基于json格式进行简化）、ioc、以及其他工具代码。a json-base file format's read and write code by python, and codes to read and product object from configure file in such format(ioc), and other tool codes
 Home-page: https://github.com/buildCodeZ/buildz
 Author: Zzz

{buildz-0.6.47 → buildz-0.6.48}/buildz/netz/mhttp/caps.py

@@ -2,21 +2,86 @@
 from . import proxy,mhttp
 import socket, threading
 log = mhttp.log
+from buildz import xf
 import ssl
+from os.path import join, isfile
 import traceback
+from buildz import fz
+
+cert_conf = xf.loads(r"""
+// 国家
+country: CN
+// 省份
+provice: fujian
+// 城镇
+local: quanzhou
+// 机构
+org: testz
+// 域名
+comman: testz
+// 邮箱
+email: netz@testz
+// 是否是ca
+ca: true
+//dns: [localhost]
+// 签名有效提前时间（签名多少天前就有效）
+valid_before: 1
+// 签名有效时间（签名后有效多少天）
+valid: 3650
+dns: []
+""")
+sign_conf = xf.loads(r"""
+// 签名有效提前时间（签名多少天前就有效）
+valid_before: 1
+// 签名有效时间（签名后有效多少天）
+valid: 3650
+""")
 class CapsDealer(proxy.ProxyDealer):
     """
         http和https抓包，要自己实现MsgRecord类处理抓包数据，否则默认只是打印抓包的url和头部数据等信息
         buildz.netz.mhttp.record.MsgRecord的实现可参考buildz.netz.mhttp.record.MsgLog
     """
-    def init(self, skt, context, srv_context, channel_read_size=1024000, record=None):
+    def init(self, skt, ca, srv_context, channel_read_size=1024000, record=None,dp_cache=None):
+        if dp_cache is None:
+            dp_cache = "./res/certs"
         super().init(skt, channel_read_size, record=record)
-        self.context = context
+        self.ca = ca
         self.srv_context = srv_context
+        self.contexts = {}
+        self.dp_cache = dp_cache
+    def sign(self, hostname):
+        dp = join(self.dp_cache, "_"+hostname)
+        fz.makedir(dp)
+        fp_csr = join(dp, "csr")
+        fp_cert = join(dp, "cert")
+        fp_prv = join(dp, "prv")
+        if isfile(fp_cert):
+            return fp_cert, fp_prv, None
+        try:
+            from buildz.netz import sslz
+        except:
+            # 不能创建域名证书，则直接用根证书
+            return self.ca
+        conf = dict(cert_conf)
+        conf['comman']=hostname
+        conf['dns'] = [hostname]
+        sslz.gen_prv(fp_prv)
+        sslz.gen_csr(fp_csr, fp_prv, conf, None)
+        sslz.sign_csr(fp_cert, fp_csr, self.ca[0], self.ca[1],sign_conf, self.ca[2])
+        return fp_cert, fp_prv, None
+    def context(self, hostname):
+        if hostname not in self.contexts:
+            fp_cert, fp_prv, pwd = self.sign(hostname)
+            context = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
+            context.load_cert_chain(fp_cert, fp_prv, password=pwd)
+            self.contexts[hostname]=context
+        return self.contexts[hostname]
     def deal_channel(self, skt_cli, skt_srv):
         #self.wskt.closefile()
         #wskt.closefile()
-        skt_cli = mhttp.WSocket.Bind(self.context.wrap_socket(skt_cli.skt, server_side=True))
+        hostname = skt_srv.addr[0]
+        context = self.context(hostname)
+        skt_cli = mhttp.WSocket.Bind(context.wrap_socket(skt_cli.skt, server_side=True))
         #context = ssl._create_unverified_context(ssl.PROTOCOL_TLS_CLIENT)
         skt_srv = mhttp.WSocket.Bind(self.srv_context.wrap_socket(skt_srv.skt, server_side=False))
         self.record.set_ssl(True)
@@ -40,10 +105,11 @@ class CapsProxy(proxy.Proxy):
         http和https抓包，要自己实现MsgRecord类处理抓包数据，否则默认只是打印抓包的url和头部数据等信息
         buildz.netz.mhttp.record.MsgRecord的实现可参考buildz.netz.mhttp.record.MsgLog
     """
-    def init(self, addr, fp_sign, fp_prv, password = None,listen=5, record=None,cafile=None, capath=None, cadata=None,check_hostname=True):
+    def init(self, addr, fp_sign, fp_prv, password = None,listen=5, record=None,cafile=None, capath=None, cadata=None,check_hostname=True, dp_cache = None):
         super().init(addr, listen, record)
-        context = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
-        context.load_cert_chain(fp_sign, fp_prv, password=password)
+        # context = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
+        # context.load_cert_chain(fp_sign, fp_prv, password=password)
+        self.ca = fp_sign, fp_prv, password
         if cafile is not None or capath is not None or cadata is not None:
             # 导入根证书，需要单个根证书文件cafile或者根证书文件夹capath或者根证书数据cadata
             # cadata是证书数据，不清楚能不能多个证书字节码拼在一起
@@ -53,8 +119,11 @@ class CapsProxy(proxy.Proxy):
         else:
             # 不会校验服务端https证书是否有效，可能有风险？
             srv_context = ssl._create_unverified_context(ssl.PROTOCOL_TLS_CLIENT)
-        self.context = context
+        #self.context = context
         self.srv_context = srv_context
+        if dp_cache is None:
+            dp_cache = "./res/certs"
+        self.dp_cache = dp_cache
     def call(self):
         self.running=True
         skt = socket.socket()
@@ -63,7 +132,7 @@ class CapsProxy(proxy.Proxy):
         self.skt = skt
         while self.running:
             skt,addr = self.skt.accept()
-            deal = CapsDealer(skt, self.context, self.srv_context, record=self.record.clone())
+            deal = CapsDealer(skt, self.ca, self.srv_context, record=self.record.clone(), dp_cache = self.dp_cache)
             th = threading.Thread(target=deal,daemon=True)
             th.start()
             self.ths.append(th)

{buildz-0.6.47 → buildz-0.6.48}/buildz/netz/mhttp/mhttp.py

@@ -120,9 +120,9 @@ class WSocket(Base):
         skt.connect(addr)
         return skt
     @staticmethod
-    def Bind(skt, buffer_size=-1):
+    def Bind(skt, buffer_size=-1, addr=None):
         wskt = WSocket(buffer_size)
-        wskt.bind(skt)
+        wskt.bind(skt, addr)
         return wskt
     def init(self, buffer_size=-1):
         self.buffer_size = buffer_size
@@ -130,8 +130,10 @@ class WSocket(Base):
         if w_buffer_size<0:
             w_buffer_size=0
         self.w_buffer_size = w_buffer_size
-    def bind(self, skt):
-        self.addr = skt.getpeername()
+    def bind(self, skt, addr=None):
+        if addr is None:
+            addr = skt.getpeername()
+        self.addr = addr
         rfile = skt.makefile('rb', self.buffer_size)
         wfile = skt.makefile('wb', self.w_buffer_size)
         self.skt = skt 
@@ -148,7 +150,7 @@ class WSocket(Base):
             skt = socket.socket()
             log.debug(f"connect: {addr}")
             skt.connect(tuple(addr))
-        self.bind(skt)
+        self.bind(skt, addr)
     def closefile(self):
         try:
             self.rfile.close()

{buildz-0.6.47 → buildz-0.6.48}/buildz/netz/mhttp/proxy.py

@@ -132,7 +132,7 @@ class ProxyDealer(Base):
                     break
         finally:
             self.wskt.close()
-            self.monitor.close()
+            #self.monitor.close()
 
 pass
 

{buildz-0.6.47 → buildz-0.6.48}/buildz/netz/sslz/gen.py

@@ -287,7 +287,7 @@ def loadf_certs(fp):
 def load_certs(bs):
     spt = b"-----END CERTIFICATE-----"
     pems = bs.split(spt)
-    pems = [k.strip()+spt for k in pems if k.strip()!=b""]
+    pems = [k+spt for k in pems if k.strip()!=b""]
     certs = [x509.load_pem_x509_certificate(pem) for pem in pems]
     return certs
 def verify_certs_fp(fp, cas = None, verify_time=True):

{buildz-0.6.47 → buildz-0.6.48}/buildz/netz/test/test.py

@@ -14,6 +14,30 @@ path.set("res", "./res")
 fp_prv = path.res("ca.prv")
 fp_cert = path.res("ca.crt")
 ca_pwd = "test"
+
+
+ca_conf = xf.loads(r"""
+// 国家
+country: CN
+// 省份
+provice: fujian
+// 城镇
+local: quanzhou
+// 机构
+org: buildz
+// 域名
+comman: buildz
+// 邮箱
+email: netz@buildz
+// 是否是ca
+ca: true
+//dns: [localhost]
+// 签名有效提前时间（签名多少天前就有效）
+valid_before: 1
+// 签名有效时间（签名后有效多少天）
+valid: 3650
+ca:true
+""")
 log = logz.simple(path.res("caps/%Y%m%d.log"))
 fz.makedir(path.res())
 def gen_cert():
@@ -44,26 +68,3 @@ def caps():
 #pyz.lc(locals(), caps)
 
 
-
-
-ca_conf = xf.loads(r"""
-// 国家
-country: CN
-// 省份
-provice: fujian
-// 城镇
-local: quanzhou
-// 机构
-org: buildz
-// 域名
-comman: buildz
-// 邮箱
-email: netz@buildz
-// 是否是ca
-ca: true
-//dns: [localhost]
-// 签名有效提前时间（签名多少天前就有效）
-valid_before: 1
-// 签名有效时间（签名后有效多少天）
-valid: 3650
-""")

{buildz-0.6.47 → buildz-0.6.48}/buildz/netz/test/test_cli.py

@@ -5,6 +5,11 @@ except:
     print("need package requests: pip install requests")
     raise
 session = rq.session()
+from buildz import pathz
+
+path = pathz.Path()
+path.set("res", "./res")
+fp_cert = path.res("ca.crt")
 import sys
 ip = "127.0.0.1"
 port=9999
@@ -19,12 +24,12 @@ proxies = {
 }
 
 url = "https://www.baidu.com"
-verify=False
-rp = rq.get(url, proxies = proxies,verify=verify)
+verify=fp_cert
+rp = session.get(url, proxies = proxies,verify=verify)
 print(rp,len(rp.content))
 
 url = "http://www.baidu.com"
-rp = rq.get(url, proxies = proxies,verify=verify)
+rp = session.get(url, proxies = proxies,verify=verify)
 print(rp,len(rp.content))
 
 url = "https://www.bilibili.com/"
@@ -34,5 +39,5 @@ headers = {
     "Accept-Encoding":"gzip, deflate, br, zstd",
     "Accept-Language":"zh-CN,zh;q=0.9"
 }
-rp = rq.get(url, proxies = proxies,verify=verify,headers=headers)
+rp = session.get(url, proxies = proxies,verify=verify,headers=headers)
 print(rp,len(rp.content))

{buildz-0.6.47 → buildz-0.6.48/buildz.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buildz
-Version: 0.6.47
+Version: 0.6.48
 Summary: 配置读写（基于json格式进行简化）、ioc、以及其他工具代码。a json-base file format's read and write code by python, and codes to read and product object from configure file in such format(ioc), and other tool codes
 Home-page: https://github.com/buildCodeZ/buildz
 Author: Zzz

{buildz-0.6.47 → buildz-0.6.48}/setup.py

@@ -7,7 +7,7 @@ from setuptools import setup, find_packages
 
 setup(
     name = 'buildz',
-    version = '0.6.47',
+    version = '0.6.48',
     keywords='buildz',
     long_description=open('README.md', 'r', encoding="utf-8").read(),
     long_description_content_type='text/markdown',