deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2025-07-09 14:13:35 +00:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Add user agent header wrapper to requests handled by AuthorizedHttp (#721)

Browse Source 
* Revert patched google_auth_httplib2 and replace functionality by wrapping original library calls

* Wrap calls to google_auth_httplib2.Request__call__ to include a user-agent header.

* Fix bad dict key assignment syntax

* Add user agent header wrapper to requests handled by AuthorizedHttp
This commit is contained in:
ejochman
2018-04-16 17:34:27 -07:00
committed by Jay Lee
parent bbb486f7b2
commit f8c24bf86a
1 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/gam.py
View File

@ -80,25 +80,32 @@ Go to the following link in your browser:
{address}
"""
# Override and wrap google_auth_httplib2.Request.__call__ so that the GAM
# Override and wrap google_auth_httplib2 request methods so that the GAM
# user-agent string is inserted into HTTP request headers.
google_auth_httplib2_request_call = google_auth_httplib2.Request.__call__
def _request_with_user_agent(self, *args, **kwargs):
"""Inserts the GAM user-agent header in all google_auth_httplib2 requests."""
def _request_with_user_agent(request_method):
"""Inserts the GAM user-agent header kwargs sent to a method."""
GAM_USER_AGENT = GAM_INFO
if kwargs.get('headers') is not None:
if kwargs['headers'].get('user-agent'):
# Save the existing user-agent header and tack on the GAM user-agent.
kwargs['headers']['user-agent'] = '%s %s' % (
GAM_USER_AGENT, kwargs.headers['user-agent'])
def wrapped_request_method(self, *args, **kwargs):
if kwargs.get('headers') is not None:
if kwargs['headers'].get('user-agent'):
if GAM_USER_AGENT not in kwargs['headers']['user-agent']:
# Save the existing user-agent header and tack on the GAM user-agent.
kwargs['headers']['user-agent'] = '%s %s' % (
GAM_USER_AGENT, kwargs['headers']['user-agent'])
else:
kwargs['headers']['user-agent'] = GAM_USER_AGENT
else:
kwargs['headers']['user-agent'] = GAM_USER_AGENT
else:
kwargs['headers'] = {'user-agent': GAM_USER_AGENT}
return google_auth_httplib2_request_call(self, *args, **kwargs)
kwargs['headers'] = {'user-agent': GAM_USER_AGENT}
google_auth_httplib2.Request.__call__ = _request_with_user_agent
return request_method(self, *args, **kwargs)
return wrapped_request_method
google_auth_httplib2.Request.__call__ = _request_with_user_agent(
google_auth_httplib2.Request.__call__)
google_auth_httplib2.AuthorizedHttp.request = _request_with_user_agent(
google_auth_httplib2.AuthorizedHttp.request)
def showUsage():
doGAMVersion(checkForArgs=False)