Merge pull request #47 from openziti/update-ziti-sdk-0.32.0

update ziti-sdk-c@0.32.2

Author: ekoby

setup.cfg

@@ -38,4 +38,4 @@ tag_prefix = v
 parentdir_prefix = openziti-
 
 [openziti]
-ziti_sdk_version = 0.31.5
+ziti_sdk_version = 0.32.2

src/openziti/__main__.py

@@ -23,6 +23,19 @@ def do_enroll():
         id_json = zitilib.enroll(jwt, key=args.key, cert=args.cert)
         id_file.write(bytes(id_json, 'utf-8'))
 
+def show_version():
+    from openziti._version import get_versions
+    modver = get_versions()
+    v = modver['version']
+    if args.verbose:
+        modrev = modver['full-revisionid']
+        version = zitilib.version()
+        ziti_ver = version.version.decode()
+        ziti_rev = version.revision.decode()
+        print(f'version: {v}@{modrev}')
+        print(f'ziti:    {ziti_ver}@{ziti_rev}')
+    else:
+        print(v)
 
 if __name__ == '__main__':
     import argparse
@@ -38,6 +51,10 @@ def do_enroll():
     enroll_cmd.add_argument('-c', '--cert')
     enroll_cmd.set_defaults(func=do_enroll)
 
+    version_cmd = subcommands.add_parser('version', help='show version')
+    version_cmd.set_defaults(func=show_version)
+    version_cmd.add_argument('-v', '--verbose', action='store_true')
+
     args = parser.parse_args()
     if args.subcommand is None:
         parser.print_help()

src/openziti/zitilib.py

@@ -229,7 +229,8 @@ def ziti_socket(type):
 
 
 def ziti_close(fd):
-    _ziti_close(fd)
+    if fd:
+        _ziti_close(fd)
 
 
 def shutdown():

tests/ziti_tests.py

@@ -39,7 +39,7 @@ def test_monkeypatch(self):
         with self.assertRaises(ConnectionError):
             get_httpbin('http://httpbin.ziti/json')
 
-    def test_resolve(selfs):
+    def test_resolve(self):
         with openziti.monkeypatch():
             import socket
             addrlist = socket.getaddrinfo(host='httpbin.ziti', port=80, type=socket.SOCK_STREAM)
@@ -54,3 +54,12 @@ def test_resolve(selfs):
             assert addr[1] == 80
             assert addr[0].startswith('100.64.0.')
 
+    def test_monkeypatch_bypass(self):
+        with openziti.monkeypatch():
+            from json import dumps
+            r = get_httpbin('http://httpbin.org/anything')
+            assert r.status_code == 200
+            body = r.json()
+            print(dumps(body, indent=2))
+            self.assertRegex(body['headers']['User-Agent'], r'python-requests/.*')
+