deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2025-07-08 21:53:36 +00:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Allow reader in doCalendarAddACL, fix infinite loops in doPop, doCreateUser, doUpdateUser

Browse Source
This commit is contained in:
Ross Scroggs
2015-11-24 16:51:06 -08:00
parent ab6f8fa7bf
commit edb17ad06e
1 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/gam.py
View File

@ -2433,12 +2433,12 @@ def doCalendarAddACL(calendarId=None, act_as=None, role=None, scope=None, entity
body[u'role'] = role body[u'role'] = role
else: else:
body[u'role'] = sys.argv[4].lower() body[u'role'] = sys.argv[4].lower()
if body[u'role'] not in [u'freebusy', u'read', u'editor', u'owner', u'none']: if body[u'role'] not in [u'freebusy', u'read', u'reader', u'editor', u'owner', u'none']:
print u'ERROR: Role must be freebusy, read, editor, owner or none. Not %s' % body['role'] print u'ERROR: Role must be freebusy, read, editor, owner or none. Not %s' % body['role']
sys.exit(2) sys.exit(2)
if body[u'role'] == u'freebusy': if body[u'role'] == u'freebusy':
body[u'role'] = u'freeBusyReader' body[u'role'] = u'freeBusyReader'
elif body[u'role'] == u'read': elif body[u'role'] in [u'read', u'reader']:
body[u'role'] = u'reader' body[u'role'] = u'reader'
elif body[u'role'] == u'editor': elif body[u'role'] == u'editor':
body[u'role'] = u'writer' body[u'role'] = u'writer'
@ -3778,6 +3778,9 @@ def doPop(users):
elif sys.argv[i+1].lower() == u'newmail': elif sys.argv[i+1].lower() == u'newmail':
enable_for = u'MAIL_FROM_NOW_ON' enable_for = u'MAIL_FROM_NOW_ON'
i += 2 i += 2
else:
print u'ERROR: %s is not a valid argument for "gam <users> pop for"' % sys.argv[i]
sys.exit(2)
elif sys.argv[i].lower() == u'action': elif sys.argv[i].lower() == u'action':
if sys.argv[i+1].lower() == u'keep': if sys.argv[i+1].lower() == u'keep':
action = u'KEEP' action = u'KEEP'
@ -3788,6 +3791,9 @@ def doPop(users):
elif sys.argv[i+1].lower() == u'delete': elif sys.argv[i+1].lower() == u'delete':
action = u'DELETE' action = u'DELETE'
i += 2 i += 2
else:
print u'ERROR: %s is not a valid argument for "gam <users> pop action"' % sys.argv[i]
sys.exit(2)
elif sys.argv[i].lower() == u'confirm': elif sys.argv[i].lower() == u'confirm':
i += 1 i += 1
else: else:
@ -4828,6 +4834,9 @@ def doCreateUser():
address[u'primary'] = True address[u'primary'] = True
i += 1 i += 1
break break
else:
print u'ERROR: invalid argument (%s) for account address details' % sys.argv[i]
sys.exit(2)
try: try:
body[u'addresses'].append(address) body[u'addresses'].append(address)
except KeyError: except KeyError:
@ -4877,6 +4886,9 @@ def doCreateUser():
organization[u'primary'] = True organization[u'primary'] = True
i += 1 i += 1
break break
else:
print u'ERROR: invalid argument (%s) for account organization details' % sys.argv[i]
sys.exit(2)
try: try:
body[u'organizations'].append(organization) body[u'organizations'].append(organization)
except KeyError: except KeyError:
@ -4905,6 +4917,9 @@ def doCreateUser():
phone[u'primary'] = True phone[u'primary'] = True
i += 1 i += 1
break break
else:
print u'ERROR: invalid argument (%s) for account phone details' % sys.argv[i]
sys.exit(2)
try: try:
body[u'phones'].append(phone) body[u'phones'].append(phone)
except KeyError: except KeyError:
@ -5305,6 +5320,9 @@ def doUpdateUser(users):
address[u'primary'] = True address[u'primary'] = True
i += 1 i += 1
break break
else:
print u'ERROR: invalid argument (%s) for account address details' % sys.argv[i]
sys.exit(2)
try: try:
body[u'addresses'].append(address) body[u'addresses'].append(address)
except KeyError: except KeyError:
@ -5326,7 +5344,7 @@ def doUpdateUser(users):
i += 2 i += 2
elif argument == u'type': elif argument == u'type':
organization[u'type'] = sys.argv[i+1].lower() organization[u'type'] = sys.argv[i+1].lower()
if organization[u'type'] not in [u'domain_only', 'school', 'unknown', 'work']: if organization[u'type'] not in [u'domain_only', u'school', u'unknown', u'work']:
print u'ERROR: organization type must be domain_only, school, unknown or work. Got %s' % organization[u'type'] print u'ERROR: organization type must be domain_only, school, unknown or work. Got %s' % organization[u'type']
sys.exit(2) sys.exit(2)
i += 2 i += 2
@ -5355,6 +5373,9 @@ def doUpdateUser(users):
organization[u'primary'] = True organization[u'primary'] = True
i += 1 i += 1
break break
else:
print u'ERROR: invalid argument (%s) for account organization details' % sys.argv[i]
sys.exit(2)
try: try:
body[u'organizations'].append(organization) body[u'organizations'].append(organization)
except KeyError: except KeyError:
@ -5384,6 +5405,9 @@ def doUpdateUser(users):
phone[u'primary'] = True phone[u'primary'] = True
i += 1 i += 1
break break
else:
print u'ERROR: invalid argument (%s) for account phone details' % sys.argv[i]
sys.exit(2)
try: try:
body[u'phones'].append(phone) body[u'phones'].append(phone)
except KeyError: except KeyError: