Merge pull request #17 from mailgun/thrawn/develop

PIP-711: Skip auth if disabled
mailgun · Jan 15, 2020 · 0463547 · 0463547
2 parents 8008684 + 0cd445d
commit 0463547
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/etcd3/_client.py b/etcd3/_client.py
@@ -201,14 +201,15 @@ def _dial(self, endpoint):
         if not self._tls_creds:
             return grpc.insecure_channel(endpoint)
 
+        creds = self._tls_creds
+
         if self._auth_rq:
             token = self._authenticate(endpoint)
-            token_plugin = _TokenAuthMetadataPlugin(token)
-            token_creds = grpc.metadata_call_credentials(token_plugin)
-            creds = grpc.composite_channel_credentials(self._tls_creds,
-                                                       token_creds)
-        else:
-            creds = self._tls_creds
+            if token:
+                token_plugin = _TokenAuthMetadataPlugin(token)
+                token_creds = grpc.metadata_call_credentials(token_plugin)
+                creds = grpc.composite_channel_credentials(self._tls_creds,
+                                                           token_creds)
 
         return grpc.secure_channel(endpoint, creds)
 
@@ -218,7 +219,11 @@ def _authenticate(self, endpoint):
             auth_stub = AuthStub(grpc_channel)
             rs = auth_stub.Authenticate(self._auth_rq, timeout=self._timeout)
             return rs.token
-
+        except grpc.RpcError as e:
+            if "authentication is not enabled" in e.details():
+                _log.error("server authentication disabled; skipping")
+                return None
+            raise
         finally:
             grpc_channel.close()
 

diff --git a/setup.py b/setup.py
@@ -31,7 +31,7 @@
       ],
       install_requires=[
           'enum34;python_version<"3.4"',
-          'grpcio',
-          'protobuf',
+          'grpcio==1.20.1',
+          'protobuf==3.7.1',
           'six'
       ])