gnetclisdk 1.0.55__tar.gz → 1.0.56__tar.gz

{gnetclisdk-1.0.55 → gnetclisdk-1.0.56}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: gnetclisdk
-Version: 1.0.55
+Version: 1.0.56
 Summary: Client for Gnetcli GRPC-server
 Home-page: https://github.com/annetutil/gnetcli
 Author: Alexander Balezin
@@ -16,6 +16,15 @@ Description-Content-Type: text/markdown
 Requires-Dist: protobuf>=4.24.4
 Requires-Dist: grpcio>=1.59.2
 Requires-Dist: googleapis-common-protos>=1.61.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: summary
 
 ## Python client for Gnetcli GRPC server
 
@@ -27,13 +36,14 @@ See documentation on [gnetcli server](https://annetutil.github.io/gnetcli/).
 Example:
 
 ```python
-from gnetclisdk.client import Credentials, Gnetcli
+from gnetclisdk.client import Credentials, Gnetcli, HostParams
 import os, asyncio
 
 async def example():
     api = Gnetcli(insecure_grpc=True)
+    # api = Gnetcli(insecure_grpc=True, auth_token="Basic " + base64.b64encode(f"{username}:{password}".encode('utf-8')).decode("ascii")
     dev_creds = Credentials(os.environ.get("LOGIN"), os.environ.get("PASSWORD"))
-    res = await api.cmd(hostname="myhost", device="huawei", cmd="dis clock", credentials=dev_creds)
+    res = await api.cmd(hostname="myhost", cmd="dis clock", host_params=HostParams(device="huawei", credentials=dev_creds))
     print("err=%s status=%s out=%s" % (res.error, res.status, res.out))
 
 asyncio.run(example())

{gnetclisdk-1.0.55 → gnetclisdk-1.0.56}/README.md

@@ -8,13 +8,14 @@ See documentation on [gnetcli server](https://annetutil.github.io/gnetcli/).
 Example:
 
 ```python
-from gnetclisdk.client import Credentials, Gnetcli
+from gnetclisdk.client import Credentials, Gnetcli, HostParams
 import os, asyncio
 
 async def example():
     api = Gnetcli(insecure_grpc=True)
+    # api = Gnetcli(insecure_grpc=True, auth_token="Basic " + base64.b64encode(f"{username}:{password}".encode('utf-8')).decode("ascii")
     dev_creds = Credentials(os.environ.get("LOGIN"), os.environ.get("PASSWORD"))
-    res = await api.cmd(hostname="myhost", device="huawei", cmd="dis clock", credentials=dev_creds)
+    res = await api.cmd(hostname="myhost", cmd="dis clock", host_params=HostParams(device="huawei", credentials=dev_creds))
     print("err=%s status=%s out=%s" % (res.error, res.status, res.out))
 
 asyncio.run(example())

{gnetclisdk-1.0.55 → gnetclisdk-1.0.56}/gnetclisdk/client.py

@@ -2,6 +2,7 @@ import asyncio
 import logging
 import os.path
 import uuid
+import re
 from abc import ABC, abstractmethod
 from contextlib import asynccontextmanager
 from dataclasses import dataclass, field
@@ -190,7 +191,7 @@ class Gnetcli:
         _logger.debug("connect to %s", self._server)
         async with self._grpc_channel_fn(self._server, options=self._options) as channel:
             stub = server_pb2_grpc.GnetcliStub(channel)
-            _logger.debug("executing netconf cmd: %r", pbcmd)
+            _logger.debug("executing netconf cmd: %r", mask_password(repr(pbcmd)))
             try:
                 response = await grpc_call_wrapper(stub.ExecNetconf, pbcmd)
             except Exception as e:
@@ -344,7 +345,7 @@ class GnetcliSession(ABC):
         if not self._stream:
             raise Exception("empty self._stream")
         try:
-            _logger.debug("cmd %r on %r", str(cmdpb).replace("\n", ""), self._stream)
+            _logger.debug("cmd %r on %r", mask_password(str(cmdpb)).replace("\n", ""), self._stream)
             await self._stream.write(cmdpb)
             response: Message = await self._stream.read()
         except grpc.aio.AioRpcError as e:
@@ -420,7 +421,7 @@ async def grpc_call_wrapper(stub: grpc.UnaryUnaryMultiCallable, request: Any) ->
         metadata = [
             (HEADER_REQUEST_ID, req_id),
         ]
-        _logger.debug("executing %s: %r, req_id=%s", type(request), repr(request), req_id)
+        _logger.debug("executing %s: %r, req_id=%s", type(request), mask_password(repr(request)), req_id)
         await asyncio.sleep(i * 2)
         try:
             response = await stub(request=request, metadata=metadata)
@@ -494,6 +495,10 @@ def make_cmd(
     return res
 
 
+def mask_password(line: str) -> str:
+    return re.sub(r'password: ".+?"', "password: ...", line)
+
+
 def make_files_request(files: Dict[str, File]) -> List[server_pb2.FileData]:
     res: List[server_pb2.FileData] = []
     for path, file in files.items():

{gnetclisdk-1.0.55 → gnetclisdk-1.0.56}/gnetclisdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: gnetclisdk
-Version: 1.0.55
+Version: 1.0.56
 Summary: Client for Gnetcli GRPC-server
 Home-page: https://github.com/annetutil/gnetcli
 Author: Alexander Balezin
@@ -16,6 +16,15 @@ Description-Content-Type: text/markdown
 Requires-Dist: protobuf>=4.24.4
 Requires-Dist: grpcio>=1.59.2
 Requires-Dist: googleapis-common-protos>=1.61.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: summary
 
 ## Python client for Gnetcli GRPC server
 
@@ -27,13 +36,14 @@ See documentation on [gnetcli server](https://annetutil.github.io/gnetcli/).
 Example:
 
 ```python
-from gnetclisdk.client import Credentials, Gnetcli
+from gnetclisdk.client import Credentials, Gnetcli, HostParams
 import os, asyncio
 
 async def example():
     api = Gnetcli(insecure_grpc=True)
+    # api = Gnetcli(insecure_grpc=True, auth_token="Basic " + base64.b64encode(f"{username}:{password}".encode('utf-8')).decode("ascii")
     dev_creds = Credentials(os.environ.get("LOGIN"), os.environ.get("PASSWORD"))
-    res = await api.cmd(hostname="myhost", device="huawei", cmd="dis clock", credentials=dev_creds)
+    res = await api.cmd(hostname="myhost", cmd="dis clock", host_params=HostParams(device="huawei", credentials=dev_creds))
     print("err=%s status=%s out=%s" % (res.error, res.status, res.out))
 
 asyncio.run(example())