deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-06-29 10:21:35 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Add timeoffset option to gam version (#1002)

Browse Source 
* Add timeoffset option to gam version

* Update timeOffset checking
This commit is contained in:
Ross Scroggs
2019-08-29 11:32:45 -07:00
committed by Jay Lee
parent e3ab846d70
commit 8f4a40bc9a
3 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/gam.py
View File

@@ -720,6 +720,14 @@ def SetGlobalVariables():
GM_Globals[GM_CACHE_DISCOVERY_ONLY] = False
return True
def getLocalGoogleTimeOffset(testLocation='www.googleapis.com'):
localUTC = datetime.datetime.now(datetime.timezone.utc)
try:
googleUTC = dateutil.parser.parse(_createHttpObj().request('https://'+testLocation, 'HEAD')[0]['date'])
return (localUTC-googleUTC).total_seconds()
except (httplib2.ServerNotFoundError, RuntimeError, ValueError) as e:
systemErrorExit(4, str(e))
def doGAMCheckForUpdates(forceCheck=False):
def _gamLatestVersionNotAvailable():
@@ -774,9 +782,7 @@ def doGAMCheckForUpdates(forceCheck=False):
return
def doGAMVersion(checkForArgs=True):
force_check = False
simple = False
extended = False
force_check = extended = simple = timeOffset = False
testLocation = 'www.googleapis.com'
if checkForArgs:
i = 2
@@ -791,6 +797,9 @@ def doGAMVersion(checkForArgs=True):
elif myarg == 'extended':
extended = True
i += 1
elif myarg == 'timeoffset':
timeOffset = True
i += 1
elif myarg == 'location':
testLocation = sys.argv[i+1]
i += 2
@@ -804,6 +813,8 @@ def doGAMVersion(checkForArgs=True):
sys.version_info[1], sys.version_info[2], struct.calcsize('P')*8,
sys.version_info[3], googleapiclient.__version__,
platform.platform(), platform.machine(), GM_Globals[GM_GAM_PATH]))
if timeOffset:
print('Time offset from Google, correct local time if more than %s seconds: %s' % (MAX_LOCAL_GOOGLE_TIME_OFFSET, getLocalGoogleTimeOffset(testLocation)))
if force_check:
doGAMCheckForUpdates(forceCheck=True)
if extended:
@@ -1483,6 +1494,9 @@ def buildGmailGAPIObject(user):
return (userEmail, buildGAPIServiceObject('gmail', userEmail))
def doCheckServiceAccount(users):
timeOffset = getLocalGoogleTimeOffset()
if timeOffset > MAX_LOCAL_GOOGLE_TIME_OFFSET:
systemErrorExit(4, 'Time offset from Google is more than %s seconds, correct local time: %s' % (MAX_LOCAL_GOOGLE_TIME_OFFSET, timeOffset))
all_scopes = []
for _, scopes in list(API_SCOPE_MAPPING.items()):
for scope in scopes: