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

Implement Chrome version history (#1354)

Browse Source 
* Implement Chrome version history

* Update GamCommands.txt

* Use httpObj
This commit is contained in:
Ross Scroggs
2021-04-06 11:08:27 -07:00
committed by GitHub
parent b262c4a898
commit 1b1a0c876c
7 changed files with 716 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/gam/__init__.py
View File

@ -53,6 +53,7 @@ from gam import fileutils
from gam.gapi import calendar as gapi_calendar
from gam.gapi import cloudidentity as gapi_cloudidentity
from gam.gapi import cbcm as gapi_cbcm
from gam.gapi import chromehistory as gapi_chromehistory
from gam.gapi import chromemanagement as gapi_chromemanagement
from gam.gapi import chromepolicy as gapi_chromepolicy
from gam.gapi.cloudidentity import devices as gapi_cloudidentity_devices
@ -893,14 +894,14 @@ def getValidOauth2TxtCredentials(force_refresh=False, api=None):
return credentials
def getService(api, http):
def getService(api, httpObj):
api, version, api_version = getAPIVersion(api)
if api in GM_Globals[GM_CURRENT_API_SERVICES] and version in GM_Globals[
GM_CURRENT_API_SERVICES][api]:
service = googleapiclient.discovery.build_from_document(
GM_Globals[GM_CURRENT_API_SERVICES][api][version], http=http)
GM_Globals[GM_CURRENT_API_SERVICES][api][version], http=httpObj)
if GM_Globals[GM_CACHE_DISCOVERY_ONLY]:
http.cache = None
httpObj.cache = None
return service
if api in V1_DISCOVERY_APIS:
discoveryServiceUrl = googleapiclient.discovery.DISCOVERY_URI
@ -912,7 +913,7 @@ def getService(api, http):
service = googleapiclient.discovery.build(
api,
version,
http=http,
http=httpObj,
cache_discovery=False,
static_discovery=False,
discoveryServiceUrl=discoveryServiceUrl)
@ -920,23 +921,25 @@ def getService(api, http):
GM_Globals[GM_CURRENT_API_SERVICES][api][
version] = service._rootDesc.copy()
if GM_Globals[GM_CACHE_DISCOVERY_ONLY]:
http.cache = None
httpObj.cache = None
return service
except (httplib2.ServerNotFoundError, RuntimeError) as e:
if n != retries:
http.connections = {}
httpObj.connections = {}
controlflow.wait_on_failure(n, retries, str(e))
continue
controlflow.system_error_exit(4, str(e))
except (googleapiclient.errors.InvalidJsonError, KeyError,
ValueError) as e:
http.cache = None
httpObj.cache = None
if n != retries:
controlflow.wait_on_failure(n, retries, str(e))
continue
controlflow.system_error_exit(17, str(e))
except (http_client.ResponseNotReady, OSError,
googleapiclient.errors.HttpError) as e:
if 'The request is missing a valid API key' in str(e):
break
if n != retries:
controlflow.wait_on_failure(n, retries, str(e))
continue
@ -946,12 +949,12 @@ def getService(api, http):
disc_file, discovery = readDiscoveryFile(api_version)
try:
service = googleapiclient.discovery.build_from_document(discovery,
http=http)
http=httpObj)
GM_Globals[GM_CURRENT_API_SERVICES].setdefault(api, {})
GM_Globals[GM_CURRENT_API_SERVICES][api][
version] = service._rootDesc.copy()
if GM_Globals[GM_CACHE_DISCOVERY_ONLY]:
http.cache = None
httpObj.cache = None
return service
except (KeyError, ValueError):
controlflow.invalid_json_exit(disc_file)
@ -961,9 +964,9 @@ def buildGAPIObject(api):
GM_Globals[GM_CURRENT_API_USER] = None
credentials = getValidOauth2TxtCredentials(api=getAPIVersion(api)[0])
credentials.user_agent = GAM_INFO
http = transport.AuthorizedHttp(
httpObj = transport.AuthorizedHttp(
credentials, transport.create_http(cache=GM_Globals[GM_CACHE_DIR]))
service = getService(api, http)
service = getService(api, httpObj)
if GC_Values[GC_DOMAIN]:
if not GC_Values[GC_CUSTOMER_ID]:
resp, result = service._http.request(
@ -995,6 +998,12 @@ def buildGAPIObject(api):
return service
def buildGAPIObjectNoAuthentication(api):
GM_Globals[GM_CURRENT_API_USER] = None
httpObj = transport.create_http(cache=GM_Globals[GM_CACHE_DIR])
service = getService(api, httpObj)
return service
# Convert UID to email address
def convertUIDtoEmailAddress(emailAddressOrUID, cd=None, email_types=['user']):
if isinstance(email_types, str):
@ -1078,23 +1087,23 @@ def convertEmailAddressToUID(emailAddressOrUID, cd=None, email_type='user'):
def buildGAPIServiceObject(api, act_as, showAuthError=True):
http = transport.create_http(cache=GM_Globals[GM_CACHE_DIR])
service = getService(api, http)
httpObj = transport.create_http(cache=GM_Globals[GM_CACHE_DIR])
service = getService(api, httpObj)
GM_Globals[GM_CURRENT_API_USER] = act_as
GM_Globals[GM_CURRENT_API_SCOPES] = API_SCOPE_MAPPING.get(
api, service._rootDesc['auth']['oauth2']['scopes'])
credentials = getSvcAcctCredentials(GM_Globals[GM_CURRENT_API_SCOPES],
act_as)
request = transport.create_request(http)
request = transport.create_request(httpObj)
retries = 3
for n in range(1, retries + 1):
try:
credentials.refresh(request)
service._http = transport.AuthorizedHttp(credentials, http=http)
service._http = transport.AuthorizedHttp(credentials, http=httpObj)
break
except (httplib2.ServerNotFoundError, RuntimeError) as e:
if n != retries:
http.connections = {}
httpObj.connections = {}
controlflow.wait_on_failure(n, retries, str(e))
continue
controlflow.system_error_exit(4, e)
@ -11533,6 +11542,8 @@ def ProcessGAMCommand(args):
gapi_chromemanagement.printAppDevices()
elif argument in ['chromeversions']:
gapi_chromemanagement.printVersions()
elif argument in ['chromehistory']:
gapi_chromehistory.printHistory()
else:
controlflow.invalid_argument_exit(argument, 'gam print')
sys.exit(0)