You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ponymail.apache.org by hu...@apache.org on 2021/05/09 17:56:21 UTC
[incubator-ponymail-foal] branch master updated: Switch google
oauth to use urllib3
This is an automated email from the ASF dual-hosted git repository.
humbedooh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git
The following commit(s) were added to refs/heads/master by this push:
new 8cd1bce Switch google oauth to use urllib3
8cd1bce is described below
commit 8cd1bcea0eaf46f2ad9a69e6150b3819e4da369e
Author: Daniel Gruno <hu...@apache.org>
AuthorDate: Sun May 9 19:56:13 2021 +0200
Switch google oauth to use urllib3
This avoids any potential issues with the requests library and LGPL
deps.
---
server/plugins/oauthGoogle.py | 4 ++--
server/requirements.txt | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/server/plugins/oauthGoogle.py b/server/plugins/oauthGoogle.py
index 43bed18..f3aa001 100644
--- a/server/plugins/oauthGoogle.py
+++ b/server/plugins/oauthGoogle.py
@@ -6,7 +6,7 @@ oauth:
google_client_id: your-client-id-here
"""
-import google.auth.transport.requests
+import google.auth.transport.urllib3
import google.oauth2.id_token
import plugins.server
import plugins.session
@@ -14,7 +14,7 @@ import plugins.session
async def process(formdata, session, server: plugins.server.BaseServer):
js = None
- request = google.auth.transport.requests.Request()
+ request = google.auth.transport.urllib3.Request()
# This is a synchronous process, so we offload it to an async runner in order to let the main loop continue.
id_info = await server.runners.run(
google.oauth2.id_token.verify_oauth2_token,
diff --git a/server/requirements.txt b/server/requirements.txt
index 6a0058c..b54c70c 100644
--- a/server/requirements.txt
+++ b/server/requirements.txt
@@ -7,5 +7,5 @@ elasticsearch~=7.9.1 # AL2.0
certifi~=2020.6.20 # MPL2.0
netaddr~=0.8.0 # BSD, MIT
formatflowed~=2.0.0 # Python Software Foundation
-google-auth~=1.21.1 # AL2.0
+google-auth~=1.30.0 # AL2.0
aiosmtplib~=1.1.3 # MIT
\ No newline at end of file