deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-07-03 20:31:35 +00:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Avoid requests to impersonate a resource calendar (#1122)

Browse Source 
* Avoid requests to impersonate a resource calendar

Fixes jay0lee/GAM#1120

* Also avoid impersonating Group calendars
This commit is contained in:
ejochman
2020-03-20 10:19:48 -07:00
committed by GitHub
parent d78d68b4da
commit 0feee6e007
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gapi/calendar.py
View File

@@ -30,14 +30,18 @@ def buildCalendarGAPIObject(calname):
def buildCalendarDataGAPIObject(calname): def buildCalendarDataGAPIObject(calname):
calendarId = normalizeCalendarId(calname) calendarId = normalizeCalendarId(calname)
# Force service account token request. If we fail fall back to using
# admin for authentication # Try to impersonate the calendar owner. If we fail, fall back to using
# admin for authentication. Resource calendars cannot be impersonated,
# so we need to access them as the admin.
cal = None
if (not calname.endswith('@resource.calendar.google.com') and
not calname.endswith('@group.calendar.google.com')):
cal = __main__.buildGAPIServiceObject('calendar', calendarId, False) cal = __main__.buildGAPIServiceObject('calendar', calendarId, False)
if cal is None: if cal is None:
_, cal = buildCalendarGAPIObject(__main__._getValueFromOAuth('email')) _, cal = buildCalendarGAPIObject(__main__._getValueFromOAuth('email'))
return (calendarId, cal) return (calendarId, cal)
def printShowACLs(csvFormat): def printShowACLs(csvFormat):
calendarId, cal = buildCalendarDataGAPIObject(sys.argv[2]) calendarId, cal = buildCalendarDataGAPIObject(sys.argv[2])
if not cal: if not cal: