|
|
|
@ -25,7 +25,7 @@ https://github.com/GAM-team/GAM/wiki
|
|
|
|
|
"""
|
|
|
|
|
|
|
|
|
|
__author__ = 'GAM Team <google-apps-manager@googlegroups.com>'
|
|
|
|
|
__version__ = '7.06.13'
|
|
|
|
|
__version__ = '7.07.01'
|
|
|
|
|
__license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
|
|
|
|
|
|
|
|
|
|
#pylint: disable=wrong-import-position
|
|
|
|
@ -5655,8 +5655,8 @@ def getGDataUserCredentials(api, user, i, count):
|
|
|
|
|
handleOAuthTokenError(e, True, True, i, count)
|
|
|
|
|
return (userEmail, None)
|
|
|
|
|
|
|
|
|
|
def getContactsObject(contactFeed):
|
|
|
|
|
contactsObject = initGDataObject(gdata.apps.contacts.service.ContactsService(contactFeed=contactFeed),
|
|
|
|
|
def getContactsObject():
|
|
|
|
|
contactsObject = initGDataObject(gdata.apps.contacts.service.ContactsService(contactFeed=True),
|
|
|
|
|
API.CONTACTS)
|
|
|
|
|
return (GC.Values[GC.DOMAIN], contactsObject)
|
|
|
|
|
|
|
|
|
@ -16497,8 +16497,10 @@ def getRoleId():
|
|
|
|
|
invalidChoiceExit(role, GM.Globals[GM.MAP_ROLE_NAME_TO_ID], True)
|
|
|
|
|
return (role, roleId)
|
|
|
|
|
|
|
|
|
|
# gam create adminrole <String> privileges all|all_ou|<PrivilegesList> [description <String>]
|
|
|
|
|
# gam update adminrole <RoleItem> [name <String>] [privileges all|all_ou|<PrivilegesList>] [description <String>]
|
|
|
|
|
# gam create adminrole <String> [description <String>]
|
|
|
|
|
# privileges all|all_ou|<PrivilegesList>|(select <FileSelector>|<CSVFileSelector>)
|
|
|
|
|
# gam update adminrole <RoleItem> [name <String>] [description <String>]
|
|
|
|
|
# [privileges all|all_ou|<PrivilegesList>|(select <FileSelector>|<CSVFileSelector>)]
|
|
|
|
|
def doCreateUpdateAdminRoles():
|
|
|
|
|
def expandChildPrivileges(privilege):
|
|
|
|
|
for childPrivilege in privilege.get('childPrivileges', []):
|
|
|
|
@ -16529,8 +16531,12 @@ def doCreateUpdateAdminRoles():
|
|
|
|
|
elif privs == 'ALL_OU':
|
|
|
|
|
body['rolePrivileges'] = [{'privilegeName': p, 'serviceId': v} for p, v in ouPrivileges.items()]
|
|
|
|
|
else:
|
|
|
|
|
if privs == 'SELECT':
|
|
|
|
|
privsList = [p.upper() for p in getEntityList(Cmd.OB_PRIVILEGE_LIST)]
|
|
|
|
|
else:
|
|
|
|
|
privsList = privs.replace(',', ' ').split()
|
|
|
|
|
body.setdefault('rolePrivileges', [])
|
|
|
|
|
for p in privs.split(','):
|
|
|
|
|
for p in privsList:
|
|
|
|
|
if p in allPrivileges:
|
|
|
|
|
body['rolePrivileges'].append({'privilegeName': p, 'serviceId': allPrivileges[p]})
|
|
|
|
|
elif p in ouPrivileges:
|
|
|
|
@ -16540,6 +16546,8 @@ def doCreateUpdateAdminRoles():
|
|
|
|
|
elif ':' in p:
|
|
|
|
|
priv, serv = p.split(':')
|
|
|
|
|
body['rolePrivileges'].append({'privilegeName': priv, 'serviceId': serv.lower()})
|
|
|
|
|
elif p == 'SUPPORT':
|
|
|
|
|
pass
|
|
|
|
|
else:
|
|
|
|
|
invalidChoiceExit(p, list(allPrivileges.keys())+list(ouPrivileges.keys())+list(childPrivileges.keys()), True)
|
|
|
|
|
elif myarg == 'description':
|
|
|
|
@ -16557,12 +16565,12 @@ def doCreateUpdateAdminRoles():
|
|
|
|
|
customer=GC.Values[GC.CUSTOMER_ID], body=body, fields='roleId,roleName')
|
|
|
|
|
else:
|
|
|
|
|
result = callGAPI(cd.roles(), 'patch',
|
|
|
|
|
throwReasons=[GAPI.BAD_REQUEST, GAPI.CUSTOMER_NOT_FOUND, GAPI.FORBIDDEN]+[GAPI.NOT_FOUND, GAPI.FAILED_PRECONDITION],
|
|
|
|
|
throwReasons=[GAPI.BAD_REQUEST, GAPI.CUSTOMER_NOT_FOUND, GAPI.FORBIDDEN]+[GAPI.NOT_FOUND, GAPI.FAILED_PRECONDITION, GAPI.CONFLICT],
|
|
|
|
|
customer=GC.Values[GC.CUSTOMER_ID], roleId=roleId, body=body, fields='roleId,roleName')
|
|
|
|
|
entityActionPerformed([Ent.ADMIN_ROLE, f"{result['roleName']}({result['roleId']})"])
|
|
|
|
|
except GAPI.duplicate as e:
|
|
|
|
|
entityActionFailedWarning([Ent.ADMIN_ROLE, f"{body['roleName']}"], str(e))
|
|
|
|
|
except (GAPI.notFound, GAPI.forbidden, GAPI.failedPrecondition) as e:
|
|
|
|
|
except (GAPI.notFound, GAPI.forbidden, GAPI.failedPrecondition, GAPI.conflict) as e:
|
|
|
|
|
entityActionFailedWarning([Ent.ADMIN_ROLE, roleId], str(e))
|
|
|
|
|
except (GAPI.badRequest, GAPI.customerNotFound):
|
|
|
|
|
accessErrorExit(cd)
|
|
|
|
@ -16605,61 +16613,53 @@ def _showAdminRole(role, i=0, count=0):
|
|
|
|
|
Ind.Decrement()
|
|
|
|
|
|
|
|
|
|
# gam info adminrole <RoleItem> [privileges]
|
|
|
|
|
def doInfoAdminRole():
|
|
|
|
|
cd = buildGAPIObject(API.DIRECTORY)
|
|
|
|
|
fieldsList = PRINT_ADMIN_ROLES_FIELDS[:]
|
|
|
|
|
_, roleId = getRoleId()
|
|
|
|
|
while Cmd.ArgumentsRemaining():
|
|
|
|
|
myarg = getArgument()
|
|
|
|
|
if myarg == 'privileges':
|
|
|
|
|
fieldsList.append('rolePrivileges')
|
|
|
|
|
else:
|
|
|
|
|
unknownArgumentExit()
|
|
|
|
|
fields = getFieldsFromFieldsList(fieldsList)
|
|
|
|
|
try:
|
|
|
|
|
role = callGAPI(cd.roles(), 'get',
|
|
|
|
|
throwReasons=[GAPI.NOT_FOUND, GAPI.FORBIDDEN, GAPI.FAILED_PRECONDITION,
|
|
|
|
|
GAPI.BAD_REQUEST, GAPI.CUSTOMER_NOT_FOUND],
|
|
|
|
|
customer=GC.Values[GC.CUSTOMER_ID], roleId=roleId, fields=fields)
|
|
|
|
|
role.setdefault('isSuperAdminRole', False)
|
|
|
|
|
role.setdefault('isSystemRole', False)
|
|
|
|
|
_showAdminRole(role)
|
|
|
|
|
except (GAPI.notFound, GAPI.forbidden, GAPI.failedPrecondition) as e:
|
|
|
|
|
entityActionFailedWarning([Ent.ADMIN_ROLE, roleId], str(e))
|
|
|
|
|
except (GAPI.badRequest, GAPI.customerNotFound):
|
|
|
|
|
accessErrorExit(cd)
|
|
|
|
|
|
|
|
|
|
# gam print adminroles|roles [todrive <ToDriveAttribute>*]
|
|
|
|
|
# [privileges] [oneitemperrow]
|
|
|
|
|
# gam show adminroles|roles [privileges]
|
|
|
|
|
def doPrintShowAdminRoles():
|
|
|
|
|
# [role <RoleItem>] [privileges] [oneitemperrow]
|
|
|
|
|
# gam show adminroles|roles
|
|
|
|
|
# [role <RoleItem>] [privileges]
|
|
|
|
|
def doInfoPrintShowAdminRoles():
|
|
|
|
|
cd = buildGAPIObject(API.DIRECTORY)
|
|
|
|
|
fieldsList = PRINT_ADMIN_ROLES_FIELDS[:]
|
|
|
|
|
csvPF = CSVPrintFile(fieldsList, PRINT_ADMIN_ROLES_FIELDS) if Act.csvFormat() else None
|
|
|
|
|
oneItemPerRow = False
|
|
|
|
|
if Act.Get() != Act.INFO:
|
|
|
|
|
roleId = None
|
|
|
|
|
else:
|
|
|
|
|
_, roleId = getRoleId()
|
|
|
|
|
while Cmd.ArgumentsRemaining():
|
|
|
|
|
myarg = getArgument()
|
|
|
|
|
if csvPF and myarg == 'todrive':
|
|
|
|
|
csvPF.GetTodriveParameters()
|
|
|
|
|
elif roleId is None and myarg == 'role':
|
|
|
|
|
_, roleId = getRoleId()
|
|
|
|
|
elif myarg == 'privileges':
|
|
|
|
|
fieldsList.append('rolePrivileges')
|
|
|
|
|
elif myarg == 'oneitemperrow':
|
|
|
|
|
oneItemPerRow = True
|
|
|
|
|
else:
|
|
|
|
|
unknownArgumentExit()
|
|
|
|
|
if csvPF:
|
|
|
|
|
if csvPF and 'rolePrivileges' in fieldsList:
|
|
|
|
|
if not oneItemPerRow:
|
|
|
|
|
csvPF.AddTitles(['rolePrivileges'])
|
|
|
|
|
else:
|
|
|
|
|
csvPF.AddTitles(['privilegeName', 'serviceId'])
|
|
|
|
|
fields = getItemFieldsFromFieldsList('items', fieldsList)
|
|
|
|
|
printGettingAllAccountEntities(Ent.ADMIN_ROLE)
|
|
|
|
|
try:
|
|
|
|
|
roles = callGAPIpages(cd.roles(), 'list', 'items',
|
|
|
|
|
pageMessage=getPageMessage(),
|
|
|
|
|
throwReasons=[GAPI.BAD_REQUEST, GAPI.CUSTOMER_NOT_FOUND, GAPI.FORBIDDEN],
|
|
|
|
|
customer=GC.Values[GC.CUSTOMER_ID], fields=fields)
|
|
|
|
|
except (GAPI.badRequest, GAPI.customerNotFound, GAPI.forbidden):
|
|
|
|
|
if roleId is None:
|
|
|
|
|
fields = getItemFieldsFromFieldsList('items', fieldsList)
|
|
|
|
|
printGettingAllAccountEntities(Ent.ADMIN_ROLE)
|
|
|
|
|
roles = callGAPIpages(cd.roles(), 'list', 'items',
|
|
|
|
|
pageMessage=getPageMessage(),
|
|
|
|
|
throwReasons=[GAPI.BAD_REQUEST, GAPI.CUSTOMER_NOT_FOUND, GAPI.FORBIDDEN],
|
|
|
|
|
customer=GC.Values[GC.CUSTOMER_ID], fields=fields)
|
|
|
|
|
else:
|
|
|
|
|
fields = getFieldsFromFieldsList(fieldsList)
|
|
|
|
|
roles = [callGAPI(cd.roles(), 'get',
|
|
|
|
|
throwReasons=[GAPI.NOT_FOUND, GAPI.FORBIDDEN, GAPI.FAILED_PRECONDITION,
|
|
|
|
|
GAPI.BAD_REQUEST, GAPI.CUSTOMER_NOT_FOUND],
|
|
|
|
|
customer=GC.Values[GC.CUSTOMER_ID], roleId=roleId, fields=fields)]
|
|
|
|
|
except (GAPI.notFound, GAPI.forbidden, GAPI.failedPrecondition) as e:
|
|
|
|
|
entityActionFailedWarning([Ent.ADMIN_ROLE, roleId], str(e))
|
|
|
|
|
except (GAPI.badRequest, GAPI.customerNotFound):
|
|
|
|
|
accessErrorExit(cd)
|
|
|
|
|
for role in roles:
|
|
|
|
|
role.setdefault('isSuperAdminRole', False)
|
|
|
|
@ -19996,7 +19996,9 @@ def dedupEmailAddressMatches(contactsManager, emailMatchType, fields):
|
|
|
|
|
fields[CONTACT_EMAILS] = savedAddresses
|
|
|
|
|
return updateRequired
|
|
|
|
|
|
|
|
|
|
def _createContact():
|
|
|
|
|
# gam create contact <ContactAttribute>+
|
|
|
|
|
# [(csv [todrive <ToDriveAttribute>*] (addcsvdata <FieldName> <String>)*))| returnidonly]
|
|
|
|
|
def doCreateDomainContact():
|
|
|
|
|
entityType = Ent.DOMAIN
|
|
|
|
|
contactsManager = ContactsManager()
|
|
|
|
|
parameters = {'csvPF': None, 'titles': ['Domain', CONTACT_ID], 'addCSVData': {}, 'returnIdOnly': False}
|
|
|
|
@ -20007,7 +20009,7 @@ def _createContact():
|
|
|
|
|
csvPF.AddTitles(sorted(addCSVData.keys()))
|
|
|
|
|
returnIdOnly = parameters['returnIdOnly']
|
|
|
|
|
contactEntry = contactsManager.FieldsToContact(fields)
|
|
|
|
|
user, contactsObject = getContactsObject(True)
|
|
|
|
|
user, contactsObject = getContactsObject()
|
|
|
|
|
try:
|
|
|
|
|
contact = callGData(contactsObject, 'CreateContact',
|
|
|
|
|
throwErrors=[GDATA.BAD_REQUEST, GDATA.SERVICE_NOT_APPLICABLE, GDATA.FORBIDDEN],
|
|
|
|
@ -20032,11 +20034,6 @@ def _createContact():
|
|
|
|
|
if csvPF:
|
|
|
|
|
csvPF.writeCSVfile('Contacts')
|
|
|
|
|
|
|
|
|
|
# gam create contact <ContactAttribute>+
|
|
|
|
|
# [(csv [todrive <ToDriveAttribute>*] (addcsvdata <FieldName> <String>)*))| returnidonly]
|
|
|
|
|
def doCreateDomainContact():
|
|
|
|
|
_createContact()
|
|
|
|
|
|
|
|
|
|
def _clearUpdateContacts(updateContacts):
|
|
|
|
|
entityType = Ent.DOMAIN
|
|
|
|
|
contactsManager = ContactsManager()
|
|
|
|
@ -20058,7 +20055,7 @@ def _clearUpdateContacts(updateContacts):
|
|
|
|
|
unknownArgumentExit()
|
|
|
|
|
if not contactClear['emailClearPattern']:
|
|
|
|
|
missingArgumentExit('emailclearpattern')
|
|
|
|
|
user, contactsObject = getContactsObject(True)
|
|
|
|
|
user, contactsObject = getContactsObject()
|
|
|
|
|
if queriedContacts:
|
|
|
|
|
entityList = queryContacts(contactsObject, contactQuery)
|
|
|
|
|
if entityList is None:
|
|
|
|
@ -20129,7 +20126,8 @@ def doClearDomainContacts():
|
|
|
|
|
def doUpdateDomainContacts():
|
|
|
|
|
_clearUpdateContacts(True)
|
|
|
|
|
|
|
|
|
|
def _dedupContacts():
|
|
|
|
|
# gam dedup contacts <ContactEntity>|<ContactSelection> [matchType [<Boolean>]]
|
|
|
|
|
def doDedupDomainContacts():
|
|
|
|
|
entityType = Ent.DOMAIN
|
|
|
|
|
contactsManager = ContactsManager()
|
|
|
|
|
contactQuery = _initContactQueryAttributes()
|
|
|
|
@ -20140,7 +20138,7 @@ def _dedupContacts():
|
|
|
|
|
emailMatchType = getBoolean()
|
|
|
|
|
else:
|
|
|
|
|
_getContactQueryAttributes(contactQuery, myarg, -1, False)
|
|
|
|
|
user, contactsObject = getContactsObject(True)
|
|
|
|
|
user, contactsObject = getContactsObject()
|
|
|
|
|
contacts = queryContacts(contactsObject, contactQuery)
|
|
|
|
|
if contacts is None:
|
|
|
|
|
return
|
|
|
|
@ -20180,15 +20178,12 @@ def _dedupContacts():
|
|
|
|
|
break
|
|
|
|
|
Ind.Decrement()
|
|
|
|
|
|
|
|
|
|
# gam dedup contacts <ContactEntity>|<ContactSelection> [matchType [<Boolean>]]
|
|
|
|
|
def doDedupDomainContacts():
|
|
|
|
|
_dedupContacts()
|
|
|
|
|
|
|
|
|
|
def _deleteContacts():
|
|
|
|
|
# gam delete contacts <ContactEntity>|<ContactSelection>
|
|
|
|
|
def doDeleteDomainContacts():
|
|
|
|
|
entityType = Ent.DOMAIN
|
|
|
|
|
contactsManager = ContactsManager()
|
|
|
|
|
entityList, contactQuery, queriedContacts = _getContactEntityList(-1, False)
|
|
|
|
|
user, contactsObject = getContactsObject(True)
|
|
|
|
|
user, contactsObject = getContactsObject()
|
|
|
|
|
if queriedContacts:
|
|
|
|
|
entityList = queryContacts(contactsObject, contactQuery)
|
|
|
|
|
if entityList is None:
|
|
|
|
@ -20228,10 +20223,6 @@ def _deleteContacts():
|
|
|
|
|
break
|
|
|
|
|
Ind.Decrement()
|
|
|
|
|
|
|
|
|
|
# gam delete contacts <ContactEntity>|<ContactSelection>
|
|
|
|
|
def doDeleteDomainContacts():
|
|
|
|
|
_deleteContacts()
|
|
|
|
|
|
|
|
|
|
CONTACT_TIME_OBJECTS = {CONTACT_UPDATED}
|
|
|
|
|
CONTACT_FIELDS_WITH_CRS_NLS = {CONTACT_NOTES, CONTACT_BILLING_INFORMATION}
|
|
|
|
|
|
|
|
|
@ -20299,7 +20290,10 @@ def _getContactFieldsList(contactsManager, displayFieldsList):
|
|
|
|
|
else:
|
|
|
|
|
invalidChoiceExit(field, contactsManager.CONTACT_ARGUMENT_TO_PROPERTY_MAP, True)
|
|
|
|
|
|
|
|
|
|
def _infoContacts(contactFeed):
|
|
|
|
|
# gam info contacts <ContactEntity>
|
|
|
|
|
# [basic|full]
|
|
|
|
|
# [fields <ContactFieldNameList>] [formatjson]
|
|
|
|
|
def doInfoDomainContacts():
|
|
|
|
|
entityType = Ent.DOMAIN
|
|
|
|
|
contactsManager = ContactsManager()
|
|
|
|
|
entityList = getEntityList(Cmd.OB_CONTACT_ENTITY)
|
|
|
|
@ -20314,7 +20308,7 @@ def _infoContacts(contactFeed):
|
|
|
|
|
_getContactFieldsList(contactsManager, displayFieldsList)
|
|
|
|
|
else:
|
|
|
|
|
FJQC.GetFormatJSON(myarg)
|
|
|
|
|
user, contactsObject = getContactsObject(contactFeed)
|
|
|
|
|
user, contactsObject = getContactsObject()
|
|
|
|
|
j = 0
|
|
|
|
|
jcount = len(entityList)
|
|
|
|
|
if not FJQC.formatJSON:
|
|
|
|
@ -20342,19 +20336,13 @@ def _infoContacts(contactFeed):
|
|
|
|
|
break
|
|
|
|
|
Ind.Decrement()
|
|
|
|
|
|
|
|
|
|
# gam info contacts <ContactEntity>
|
|
|
|
|
# [basic|full]
|
|
|
|
|
# gam print contacts [todrive <ToDriveAttribute>*] <ContactSelection>
|
|
|
|
|
# [basic|full|countsonly] [showdeleted] [orderby <ContactOrderByFieldName> [ascending|descending]]
|
|
|
|
|
# [fields <ContactFieldNameList>] [formatjson [quotechar <Character>]]
|
|
|
|
|
# gam show contacts <ContactSelection>
|
|
|
|
|
# [basic|full|countsonly] [showdeleted] [orderby <ContactOrderByFieldName> [ascending|descending]]
|
|
|
|
|
# [fields <ContactFieldNameList>] [formatjson]
|
|
|
|
|
def doInfoDomainContacts():
|
|
|
|
|
_infoContacts(True)
|
|
|
|
|
|
|
|
|
|
# gam info gal <ContactEntity>
|
|
|
|
|
# [basic|full]
|
|
|
|
|
# [fields <ContactFieldNameList>] [formatjson]
|
|
|
|
|
def doInfoGAL():
|
|
|
|
|
_infoContacts(False)
|
|
|
|
|
|
|
|
|
|
def _printShowContacts(contactFeed):
|
|
|
|
|
def doPrintShowDomainContacts():
|
|
|
|
|
entityType = Ent.DOMAIN
|
|
|
|
|
entityTypeName = Ent.Singular(entityType)
|
|
|
|
|
contactsManager = ContactsManager()
|
|
|
|
@ -20380,7 +20368,7 @@ def _printShowContacts(contactFeed):
|
|
|
|
|
pass
|
|
|
|
|
else:
|
|
|
|
|
FJQC.GetFormatJSONQuoteChar(myarg, True)
|
|
|
|
|
user, contactsObject = getContactsObject(contactFeed)
|
|
|
|
|
user, contactsObject = getContactsObject()
|
|
|
|
|
contacts = queryContacts(contactsObject, contactQuery)
|
|
|
|
|
if countsOnly:
|
|
|
|
|
jcount = countLocalContactSelects(contactsManager, contacts, contactQuery)
|
|
|
|
@ -20466,24 +20454,6 @@ def _printShowContacts(contactFeed):
|
|
|
|
|
if csvPF:
|
|
|
|
|
csvPF.writeCSVfile(CSVTitle)
|
|
|
|
|
|
|
|
|
|
# gam print contacts [todrive <ToDriveAttribute>*] <ContactSelection>
|
|
|
|
|
# [basic|full|countsonly] [showdeleted] [orderby <ContactOrderByFieldName> [ascending|descending]]
|
|
|
|
|
# [fields <ContactFieldNameList>] [formatjson [quotechar <Character>]]
|
|
|
|
|
# gam show contacts <ContactSelection>
|
|
|
|
|
# [basic|full|countsonly] [showdeleted] [orderby <ContactOrderByFieldName> [ascending|descending]]
|
|
|
|
|
# [fields <ContactFieldNameList>] [formatjson]
|
|
|
|
|
def doPrintShowDomainContacts():
|
|
|
|
|
_printShowContacts(True)
|
|
|
|
|
|
|
|
|
|
# gam print gal [todrive <ToDriveAttribute>*] <ContactSelection>
|
|
|
|
|
# [basic|full] [orderby <ContactOrderByFieldName> [ascending|descending]]
|
|
|
|
|
# [fields <ContactFieldNameList>] [formatjson [quotechar <Character>]]
|
|
|
|
|
# gam show gal <ContactSelection>
|
|
|
|
|
# [basic|full|countsonly] [orderby <ContactOrderByFieldName> [ascending|descending]]
|
|
|
|
|
# [fields <ContactFieldNameList>] [formatjson]
|
|
|
|
|
def doPrintShowGAL():
|
|
|
|
|
_printShowContacts(False)
|
|
|
|
|
|
|
|
|
|
# Prople commands utilities
|
|
|
|
|
#
|
|
|
|
|
def normalizePeopleResourceName(resourceName):
|
|
|
|
@ -28213,78 +28183,174 @@ def doDeleteChromePolicy():
|
|
|
|
|
except (GAPI.notFound, GAPI.permissionDenied, GAPI.invalidArgument, GAPI.serviceNotAvailable, GAPI.quotaExceeded) as e:
|
|
|
|
|
entityActionFailedWarning(kvList, str(e))
|
|
|
|
|
|
|
|
|
|
CHROME_SCHEMA_TYPE_MESSAGE = {
|
|
|
|
|
'chrome.users.AutoUpdateCheckPeriodNew':
|
|
|
|
|
{'autoupdatecheckperiodminutesnew':
|
|
|
|
|
{'casedField': 'autoUpdateCheckPeriodMinutesNew',
|
|
|
|
|
'type': 'duration', 'minVal': 1, 'maxVal': 720, 'scale': 60}},
|
|
|
|
|
CHROME_SCHEMA_SPECIAL_CASES = {
|
|
|
|
|
'chrome.users.AutoUpdateCheckPeriodNewV2':
|
|
|
|
|
{'autoupdatecheckperiodminutesnew':
|
|
|
|
|
{'casedField': 'autoUpdateCheckPeriodMinutesNew',
|
|
|
|
|
'type': 'duration', 'minVal': 1, 'maxVal': 720, 'scale': 60}},
|
|
|
|
|
'chrome.users.BrowserSwitcherDelayDuration':
|
|
|
|
|
{'browserswitcherdelayduration':
|
|
|
|
|
{'casedField': 'browserSwitcherDelayDuration',
|
|
|
|
|
'type': 'duration', 'minVal': 0, 'maxVal': 30, 'scale': 1}},
|
|
|
|
|
'chrome.users.CloudReportingUploadFrequencyV2':
|
|
|
|
|
{'cloudreportinguploadfrequency':
|
|
|
|
|
{'casedField': 'cloudReportingUploadFrequency',
|
|
|
|
|
'type': 'count', 'minVal': 3, 'maxVal': 24, 'scale': 1}},
|
|
|
|
|
'chrome.users.FetchKeepaliveDurationSecondsOnShutdown':
|
|
|
|
|
{'fetchkeepalivedurationsecondsonshutdown':
|
|
|
|
|
{'casedField': 'fetchKeepaliveDurationSecondsOnShutdown',
|
|
|
|
|
'type': 'duration', 'minVal': 0, 'maxVal': 5, 'scale': 1}},
|
|
|
|
|
'chrome.users.MaxInvalidationFetchDelay':
|
|
|
|
|
{'maxinvalidationfetchdelay':
|
|
|
|
|
{'casedField': 'maxInvalidationFetchDelay',
|
|
|
|
|
'type': 'duration', 'minVal': 1, 'maxVal': 30, 'scale': 1, 'default': 10}},
|
|
|
|
|
'chrome.users.PrintingMaxSheetsAllowed':
|
|
|
|
|
{'printingmaxsheetsallowednullable':
|
|
|
|
|
{'casedField': 'printingMaxSheetsAllowedNullable',
|
|
|
|
|
'type': 'value', 'minVal': 1, 'maxVal': None, 'scale': 1}},
|
|
|
|
|
'chrome.users.PrintJobHistoryExpirationPeriodNew':
|
|
|
|
|
{'printjobhistoryexpirationperioddaysnew':
|
|
|
|
|
{'casedField': 'printJobHistoryExpirationPeriodDaysNew',
|
|
|
|
|
'type': 'duration', 'minVal': -1, 'maxVal': None, 'scale': 86400}},
|
|
|
|
|
'chrome.users.RelaunchNotificationWithDurationV2':
|
|
|
|
|
{'relaunchnotificationperiodduration':
|
|
|
|
|
{'casedField': 'relaunchNotificationPeriodDuration',
|
|
|
|
|
'type': 'duration', 'minVal': -1, 'maxVal': None, 'scale': 3600}},
|
|
|
|
|
'chrome.users.SecurityTokenSessionSettings':
|
|
|
|
|
{'securitytokensessionnotificationseconds':
|
|
|
|
|
{'casedField': 'securityTokenSessionNotificationSeconds',
|
|
|
|
|
'type': 'duration', 'minVal': 0, 'maxVal': 9999, 'scale': 1}},
|
|
|
|
|
'chrome.users.SessionLength':
|
|
|
|
|
{'sessiondurationlimit':
|
|
|
|
|
{'casedField': 'sessionDurationLimit',
|
|
|
|
|
'type': 'duration', 'minVal': 1, 'maxVal': 1440, 'scale': 60}},
|
|
|
|
|
'chrome.users.UpdatesSuppressed':
|
|
|
|
|
{'updatessuppresseddurationmin':
|
|
|
|
|
{'casedField': 'updatesSuppressedDurationMin',
|
|
|
|
|
'type': 'count', 'minVal': 1, 'maxVal': 1440, 'scale': 1},
|
|
|
|
|
'updatessuppressedstarttime':
|
|
|
|
|
{'casedField': 'updatesSuppressedStartTime',
|
|
|
|
|
'type': 'timeOfDay'}},
|
|
|
|
|
'chrome.devices.managedguest.Avatar':
|
|
|
|
|
{'useravatarimage':
|
|
|
|
|
{'casedField': 'userAvatarImage',
|
|
|
|
|
'type': 'downloadUri'}},
|
|
|
|
|
'chrome.devices.managedguest.Wallpaper':
|
|
|
|
|
{'wallpaperimage':
|
|
|
|
|
{'casedField': 'wallpaperImage',
|
|
|
|
|
'type': 'downloadUri'}},
|
|
|
|
|
'chrome.devices.SignInWallpaperImage':
|
|
|
|
|
{'devicewallpaperimage':
|
|
|
|
|
{'casedField': 'deviceWallpaperImage',
|
|
|
|
|
'type': 'downloadUri'}},
|
|
|
|
|
'type': 'duration', 'minVal': 1, 'maxVal': 720}},
|
|
|
|
|
'chrome.users.Avatar':
|
|
|
|
|
{'useravatarimage':
|
|
|
|
|
{'casedField': 'userAvatarImage',
|
|
|
|
|
'type': 'downloadUri'}},
|
|
|
|
|
'chrome.users.BrowserSwitcherDelayDurationV2':
|
|
|
|
|
{'browserswitcherdelayduration':
|
|
|
|
|
{'casedField': 'browserSwitcherDelayDuration',
|
|
|
|
|
'type': 'duration', 'minVal': 0, 'maxVal': 30}},
|
|
|
|
|
'chrome.users.BrowsingDataLifetimeV2':
|
|
|
|
|
{'browsinghistoryttl':
|
|
|
|
|
{'casedField': 'browsingHistoryTtl',
|
|
|
|
|
'type': 'duration', 'minVal': 1, 'maxVal': None},
|
|
|
|
|
'downloadhistoryttl':
|
|
|
|
|
{'casedField': 'downloadHistoryTtl',
|
|
|
|
|
'type': 'duration', 'minVal': 1, 'maxVal': None},
|
|
|
|
|
'cookiesandothersitedatattl':
|
|
|
|
|
{'casedField': 'cookiesAndOtherSiteDataTtl',
|
|
|
|
|
'type': 'duration', 'minVal': 1, 'maxVal': None},
|
|
|
|
|
'cachedimagesandfilesttl':
|
|
|
|
|
{'casedField': 'cachedImagesAndFilesTtl',
|
|
|
|
|
'type': 'duration', 'minVal': 1, 'maxVal': None},
|
|
|
|
|
'passwordsigninttl':
|
|
|
|
|
{'casedField': 'passwordSigninTtl',
|
|
|
|
|
'type': 'duration', 'minVal': 1, 'maxVal': None},
|
|
|
|
|
'autofillttl':
|
|
|
|
|
{'casedField': 'autofillTtl',
|
|
|
|
|
'type': 'duration', 'minVal': 1, 'maxVal': None},
|
|
|
|
|
'sitesettingsttl':
|
|
|
|
|
{'casedField': 'siteSettingsTtl',
|
|
|
|
|
'type': 'duration', 'minVal': 1, 'maxVal': None},
|
|
|
|
|
'hostedappdatattl':
|
|
|
|
|
{'casedField': 'hostedAppDataTtl',
|
|
|
|
|
'type': 'duration', 'minVal': 1, 'maxVal': None}},
|
|
|
|
|
'chrome.users.CloudReportingUploadFrequencyV2':
|
|
|
|
|
{'cloudreportinguploadfrequency':
|
|
|
|
|
{'casedField': 'cloudReportingUploadFrequency',
|
|
|
|
|
'type': 'duration', 'minVal': 3, 'maxVal': 24}},
|
|
|
|
|
'chrome.users.FetchKeepaliveDurationSecondsOnShutdownV2':
|
|
|
|
|
{'fetchkeepalivedurationsecondsonshutdown':
|
|
|
|
|
{'casedField': 'fetchKeepaliveDurationSecondsOnShutdown',
|
|
|
|
|
'type': 'duration', 'minVal': 0, 'maxVal': 5}},
|
|
|
|
|
'chrome.users.MaxInvalidationFetchDelayV2':
|
|
|
|
|
{'maxinvalidationfetchdelay':
|
|
|
|
|
{'casedField': 'maxInvalidationFetchDelay',
|
|
|
|
|
'type': 'duration', 'minVal': 1, 'maxVal': 30, 'default': 10}},
|
|
|
|
|
'chrome.users.PrintingMaxSheetsAllowed':
|
|
|
|
|
{'printingmaxsheetsallowednullable':
|
|
|
|
|
{'casedField': 'printingMaxSheetsAllowedNullable',
|
|
|
|
|
'type': 'value', 'minVal': 1, 'maxVal': None}},
|
|
|
|
|
'chrome.users.PrintJobHistoryExpirationPeriodNewV2':
|
|
|
|
|
{'printjobhistoryexpirationperioddaysnew':
|
|
|
|
|
{'casedField': 'printJobHistoryExpirationPeriodDaysNew',
|
|
|
|
|
'type': 'duration', 'minVal': -1, 'maxVal': None}},
|
|
|
|
|
'chrome.users.RelaunchNotificationWithDurationV2':
|
|
|
|
|
{'relaunchnotificationperiodduration':
|
|
|
|
|
{'casedField': 'relaunchNotificationPeriodDuration',
|
|
|
|
|
'type': 'duration', 'minVal': -1, 'maxVal': None}},
|
|
|
|
|
'chrome.users.SecurityTokenSessionSettingsV2':
|
|
|
|
|
{'securitytokensessionnotificationseconds':
|
|
|
|
|
{'casedField': 'securityTokenSessionNotificationSeconds',
|
|
|
|
|
'type': 'duration', 'minVal': 0, 'maxVal': 9999}},
|
|
|
|
|
'chrome.users.SessionLengthV2':
|
|
|
|
|
{'sessiondurationlimit':
|
|
|
|
|
{'casedField': 'sessionDurationLimit',
|
|
|
|
|
'type': 'duration', 'minVal': 1, 'maxVal': 1440}},
|
|
|
|
|
'chrome.users.UpdatesSuppressed':
|
|
|
|
|
{'updatessuppresseddurationmin':
|
|
|
|
|
{'casedField': 'updatesSuppressedDurationMin',
|
|
|
|
|
'type': 'count', 'minVal': 1, 'maxVal': 1440},
|
|
|
|
|
'updatessuppressedstarttime':
|
|
|
|
|
{'casedField': 'updatesSuppressedStartTime',
|
|
|
|
|
'type': 'timeOfDay'}},
|
|
|
|
|
'chrome.users.Wallpaper':
|
|
|
|
|
{'wallpaperimage':
|
|
|
|
|
{'casedField': 'wallpaperImage',
|
|
|
|
|
'type': 'downloadUri'}},
|
|
|
|
|
'chrome.devices.EnableReportUploadFrequencyV2':
|
|
|
|
|
{'reportdeviceuploadfrequency':
|
|
|
|
|
{'casedField': 'reportDeviceUploadFrequency',
|
|
|
|
|
'type': 'duration', 'minVal': 60, 'maxVal': 25379}},
|
|
|
|
|
'chrome.devices.ScheduledRebootDurationV2':
|
|
|
|
|
{'uptimelimitduration':
|
|
|
|
|
{'casedField': 'uptimeLimitDuration',
|
|
|
|
|
'type': 'duration', 'minVal': 1, 'maxVal': 365}},
|
|
|
|
|
'chrome.devices.SignInWallpaperImage':
|
|
|
|
|
{'devicewallpaperimage':
|
|
|
|
|
{'casedField': 'deviceWallpaperImage',
|
|
|
|
|
'type': 'downloadUri'}},
|
|
|
|
|
'chrome.devices.kiosk.AcPowerSettingsV2':
|
|
|
|
|
{'acidletimeout':
|
|
|
|
|
{'casedField': 'acIdleTimeout',
|
|
|
|
|
'type': 'duration', 'minVal': 1, 'maxVal': 35000},
|
|
|
|
|
'acwarningtimeout':
|
|
|
|
|
{'casedField': 'acWarningTimeout',
|
|
|
|
|
'type': 'duration', 'minVal': 0, 'maxVal': 35000},
|
|
|
|
|
'acdimtimeout':
|
|
|
|
|
{'casedField': 'acDimTimeout',
|
|
|
|
|
'type': 'duration', 'minVal': 0, 'maxVal': 35000},
|
|
|
|
|
'acscreenofftimeout':
|
|
|
|
|
{'casedField': 'acScreenOffTimeout',
|
|
|
|
|
'type': 'duration', 'minVal': 0, 'maxVal': 35000}},
|
|
|
|
|
'chrome.devices.kiosk.BatteryPowerSettingsV2':
|
|
|
|
|
{'batteryidletimeout':
|
|
|
|
|
{'casedField': 'batteryIdleTimeout',
|
|
|
|
|
'type': 'duration', 'minVal': 1, 'maxVal': 35000},
|
|
|
|
|
'batterywarningtimeout':
|
|
|
|
|
{'casedField': 'batteryWarningTimeout',
|
|
|
|
|
'type': 'duration', 'minVal': 0, 'maxVal': 35000},
|
|
|
|
|
'batterydimtimeout':
|
|
|
|
|
{'casedField': 'batteryDimTimeout',
|
|
|
|
|
'type': 'duration', 'minVal': 0, 'maxVal': 35000},
|
|
|
|
|
'batteryscreenofftimeout':
|
|
|
|
|
{'casedField': 'batteryScreenOffTimeout',
|
|
|
|
|
'type': 'duration', 'minVal': 0, 'maxVal': 35000}},
|
|
|
|
|
'chrome.devices.managedguest.Avatar':
|
|
|
|
|
{'useravatarimage':
|
|
|
|
|
{'casedField': 'userAvatarImage',
|
|
|
|
|
'type': 'downloadUri'}},
|
|
|
|
|
'chrome.devices.managedguest.BrowsingDataLifetimeV2':
|
|
|
|
|
{'browsinghistoryttl':
|
|
|
|
|
{'casedField': 'browsingHistoryTtl',
|
|
|
|
|
'type': 'duration', 'minVal': 1, 'maxVal': None},
|
|
|
|
|
'downloadhistoryttl':
|
|
|
|
|
{'casedField': 'downloadHistoryTtl',
|
|
|
|
|
'type': 'duration', 'minVal': 1, 'maxVal': None},
|
|
|
|
|
'cookiesandothersitedatattl':
|
|
|
|
|
{'casedField': 'cookiesAndOtherSiteDataTtl',
|
|
|
|
|
'type': 'duration', 'minVal': 1, 'maxVal': None},
|
|
|
|
|
'cachedimagesandfilesttl':
|
|
|
|
|
{'casedField': 'cachedImagesAndFilesTtl',
|
|
|
|
|
'type': 'duration', 'minVal': 1, 'maxVal': None},
|
|
|
|
|
'passwordsigninttl':
|
|
|
|
|
{'casedField': 'passwordSigninTtl',
|
|
|
|
|
'type': 'duration', 'minVal': 1, 'maxVal': None},
|
|
|
|
|
'autofillttl':
|
|
|
|
|
{'casedField': 'autofillTtl',
|
|
|
|
|
'type': 'duration', 'minVal': 1, 'maxVal': None},
|
|
|
|
|
'sitesettingsttl':
|
|
|
|
|
{'casedField': 'siteSettingsTtl',
|
|
|
|
|
'type': 'duration', 'minVal': 1, 'maxVal': None},
|
|
|
|
|
'hostedappdatattl':
|
|
|
|
|
{'casedField': 'hostedAppDataTtl',
|
|
|
|
|
'type': 'duration', 'minVal': 1, 'maxVal': None}},
|
|
|
|
|
'chrome.devices.managedguest.MaxInvalidationFetchDelayV2':
|
|
|
|
|
{'maxinvalidationfetchdelay':
|
|
|
|
|
{'casedField': 'maxInvalidationFetchDelay',
|
|
|
|
|
'type': 'duration', 'minVal': 1, 'maxVal': 30, 'default': 10}},
|
|
|
|
|
'chrome.devices.managedguest.PrintJobHistoryExpirationPeriodNewV2':
|
|
|
|
|
{'printjobhistoryexpirationperioddaysnew':
|
|
|
|
|
{'casedField': 'printJobHistoryExpirationPeriodDaysNew',
|
|
|
|
|
'type': 'duration', 'minVal': -1, 'maxVal': None}},
|
|
|
|
|
'chrome.devices.managedguest.SecurityTokenSessionSettingsV2':
|
|
|
|
|
{'securitytokensessionnotificationseconds':
|
|
|
|
|
{'casedField': 'securityTokenSessionNotificationSeconds',
|
|
|
|
|
'type': 'duration', 'minVal': 0, 'maxVal': 9999}},
|
|
|
|
|
'chrome.devices.managedguest.SessionLengthV2':
|
|
|
|
|
{'sessiondurationlimit':
|
|
|
|
|
{'casedField': 'sessionDurationLimit',
|
|
|
|
|
'type': 'duration', 'minVal': 1, 'maxVal': 1440}},
|
|
|
|
|
'chrome.devices.managedguest.Wallpaper':
|
|
|
|
|
{'wallpaperimage':
|
|
|
|
|
{'casedField': 'wallpaperImage',
|
|
|
|
|
'type': 'downloadUri'}},
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
CHROME_TARGET_VERSION_CHANNEL_MINUS_PATTERN = re.compile(r'^([a-z]+)-(\d+)$')
|
|
|
|
@ -28296,9 +28362,7 @@ CHROME_TARGET_VERSION_PATTERN = re.compile(r'^(\d{1,4}\.){1,4}$')
|
|
|
|
|
# [(printerid <PrinterID>)|(appid <AppID>)]
|
|
|
|
|
def doUpdateChromePolicy():
|
|
|
|
|
def getSpecialVtypeValue(vtype, value):
|
|
|
|
|
if vtype == 'duration':
|
|
|
|
|
return {vtype: f'{value}s'}
|
|
|
|
|
if vtype in {'value', 'downloadUri'}:
|
|
|
|
|
if vtype in {'duration', 'value', 'downloadUri'}:
|
|
|
|
|
return {vtype: value}
|
|
|
|
|
if vtype == 'count':
|
|
|
|
|
return value
|
|
|
|
@ -28356,8 +28420,8 @@ def doUpdateChromePolicy():
|
|
|
|
|
for field in jsonData.get('fields', []):
|
|
|
|
|
casedField = field['name']
|
|
|
|
|
lowerField = casedField.lower()
|
|
|
|
|
# Handle TYPE_MESSAGE fields with durations, values, counts and timeOfDay as special cases
|
|
|
|
|
tmschema = CHROME_SCHEMA_TYPE_MESSAGE.get(schemaName, {}).get(lowerField)
|
|
|
|
|
# Handle fields with durations, values, counts and timeOfDay as special cases
|
|
|
|
|
tmschema = CHROME_SCHEMA_SPECIAL_CASES.get(schemaName, {}).get(lowerField)
|
|
|
|
|
if tmschema:
|
|
|
|
|
body['requests'][-1]['policyValue']['value'][casedField] = getSpecialVtypeValue(tmschema['type'], field['value'])
|
|
|
|
|
body['requests'][-1]['updateMask'] += f'{casedField},'
|
|
|
|
@ -28393,8 +28457,8 @@ def doUpdateChromePolicy():
|
|
|
|
|
body['requests'][-1]['policyValue']['value'][casedField] = value
|
|
|
|
|
body['requests'][-1]['updateMask'] += f'{casedField},'
|
|
|
|
|
break
|
|
|
|
|
# Handle TYPE_MESSAGE fields with durations, values, counts and timeOfDay as special cases
|
|
|
|
|
tmschema = CHROME_SCHEMA_TYPE_MESSAGE.get(schemaName, {}).get(field)
|
|
|
|
|
# Handle fields with durations, values, counts and timeOfDay as special cases
|
|
|
|
|
tmschema = CHROME_SCHEMA_SPECIAL_CASES.get(schemaName, {}).get(field)
|
|
|
|
|
if tmschema:
|
|
|
|
|
casedField = tmschema['casedField']
|
|
|
|
|
vtype = tmschema['type']
|
|
|
|
@ -28402,9 +28466,9 @@ def doUpdateChromePolicy():
|
|
|
|
|
value = getString(Cmd.OB_STRING)
|
|
|
|
|
elif vtype != 'timeOfDay':
|
|
|
|
|
if 'default' not in tmschema:
|
|
|
|
|
value = getInteger(minVal=tmschema['minVal'], maxVal=tmschema['maxVal'])*tmschema['scale']
|
|
|
|
|
value = getInteger(minVal=tmschema['minVal'], maxVal=tmschema['maxVal'])
|
|
|
|
|
else:
|
|
|
|
|
value = getIntegerEmptyAllowed(minVal=tmschema['minVal'], maxVal=tmschema['maxVal'], default=tmschema['default'])*tmschema['scale']
|
|
|
|
|
value = getIntegerEmptyAllowed(minVal=tmschema['minVal'], maxVal=tmschema['maxVal'], default=tmschema['default'])
|
|
|
|
|
else:
|
|
|
|
|
value = getHHMM()
|
|
|
|
|
body['requests'][-1]['policyValue']['value'][casedField] = getSpecialVtypeValue(vtype, value)
|
|
|
|
@ -28537,20 +28601,14 @@ def doPrintShowChromePolicies():
|
|
|
|
|
'chrome.users.apps.ManagedConfiguration'} and 'managedConfiguration' in values:
|
|
|
|
|
values['managedConfiguration'] = json.dumps(values['managedConfiguration'], ensure_ascii=False).replace('\\n', '').replace('\\"', '"')[1:-1]
|
|
|
|
|
for setting, value in values.items():
|
|
|
|
|
# Handle TYPE_MESSAGE fields with durations, values, counts and timeOfDay as special cases
|
|
|
|
|
schema = CHROME_SCHEMA_TYPE_MESSAGE.get(name, {}).get(setting.lower())
|
|
|
|
|
# Handle fields with durations, values, counts and timeOfDay as special cases
|
|
|
|
|
schema = CHROME_SCHEMA_SPECIAL_CASES.get(name, {}).get(setting.lower())
|
|
|
|
|
if schema and setting == schema['casedField']:
|
|
|
|
|
vtype = schema['type']
|
|
|
|
|
if vtype in {'duration', 'value'}:
|
|
|
|
|
if vtype in {'duration', 'value', 'downloadUri'}:
|
|
|
|
|
value = value.get(vtype, '')
|
|
|
|
|
if value:
|
|
|
|
|
if value.endswith('s'):
|
|
|
|
|
value = value[:-1]
|
|
|
|
|
value = int(value) // schema['scale']
|
|
|
|
|
elif vtype == 'count':
|
|
|
|
|
pass
|
|
|
|
|
elif vtype == 'downloadUri':
|
|
|
|
|
value = value.get(vtype, '')
|
|
|
|
|
else: #timeOfDay
|
|
|
|
|
hours = value.get(vtype, {}).get('hours', 0)
|
|
|
|
|
minutes = value.get(vtype, {}).get('minutes', 0)
|
|
|
|
@ -75613,7 +75671,7 @@ MAIN_COMMANDS_WITH_OBJECTS = {
|
|
|
|
|
),
|
|
|
|
|
'info':
|
|
|
|
|
(Act.INFO,
|
|
|
|
|
{Cmd.ARG_ADMINROLE: doInfoAdminRole,
|
|
|
|
|
{Cmd.ARG_ADMINROLE: doInfoPrintShowAdminRoles,
|
|
|
|
|
Cmd.ARG_ALERT: doInfoAlert,
|
|
|
|
|
Cmd.ARG_ALIAS: doInfoAliases,
|
|
|
|
|
Cmd.ARG_BUILDING: doInfoBuilding,
|
|
|
|
@ -75645,7 +75703,6 @@ MAIN_COMMANDS_WITH_OBJECTS = {
|
|
|
|
|
Cmd.ARG_DRIVEFILEACL: doInfoDriveFileACLs,
|
|
|
|
|
Cmd.ARG_DRIVELABEL: doInfoDriveLabels,
|
|
|
|
|
Cmd.ARG_INSTANCE: doInfoInstance,
|
|
|
|
|
Cmd.ARG_GAL: doInfoGAL,
|
|
|
|
|
Cmd.ARG_GROUP: doInfoGroups,
|
|
|
|
|
Cmd.ARG_GROUPMEMBERS: doInfoGroupMembers,
|
|
|
|
|
Cmd.ARG_INBOUNDSSOASSIGNMENT: doInfoInboundSSOAssignment,
|
|
|
|
@ -75688,7 +75745,7 @@ MAIN_COMMANDS_WITH_OBJECTS = {
|
|
|
|
|
'print':
|
|
|
|
|
(Act.PRINT,
|
|
|
|
|
{Cmd.ARG_ADDRESSES: doPrintAddresses,
|
|
|
|
|
Cmd.ARG_ADMINROLE: doPrintShowAdminRoles,
|
|
|
|
|
Cmd.ARG_ADMINROLE: doInfoPrintShowAdminRoles,
|
|
|
|
|
Cmd.ARG_ADMIN: doPrintShowAdmins,
|
|
|
|
|
Cmd.ARG_ALERT: doPrintShowAlerts,
|
|
|
|
|
Cmd.ARG_ALERTFEEDBACK: doPrintShowAlertFeedback,
|
|
|
|
@ -75740,7 +75797,6 @@ MAIN_COMMANDS_WITH_OBJECTS = {
|
|
|
|
|
Cmd.ARG_DRIVELABEL: doPrintShowDriveLabels,
|
|
|
|
|
Cmd.ARG_DRIVELABELPERMISSION: doPrintShowDriveLabelPermissions,
|
|
|
|
|
Cmd.ARG_FEATURE: doPrintShowFeatures,
|
|
|
|
|
Cmd.ARG_GAL: doPrintShowGAL,
|
|
|
|
|
Cmd.ARG_GROUP: doPrintGroups,
|
|
|
|
|
Cmd.ARG_GROUPMEMBERS: doPrintGroupMembers,
|
|
|
|
|
Cmd.ARG_GROUPTREE: doPrintShowGroupTree,
|
|
|
|
@ -75821,7 +75877,7 @@ MAIN_COMMANDS_WITH_OBJECTS = {
|
|
|
|
|
),
|
|
|
|
|
'show':
|
|
|
|
|
(Act.SHOW,
|
|
|
|
|
{Cmd.ARG_ADMINROLE: doPrintShowAdminRoles,
|
|
|
|
|
{Cmd.ARG_ADMINROLE: doInfoPrintShowAdminRoles,
|
|
|
|
|
Cmd.ARG_ADMIN: doPrintShowAdmins,
|
|
|
|
|
Cmd.ARG_ALERT: doPrintShowAlerts,
|
|
|
|
|
Cmd.ARG_ALERTFEEDBACK: doPrintShowAlertFeedback,
|
|
|
|
@ -75858,7 +75914,6 @@ MAIN_COMMANDS_WITH_OBJECTS = {
|
|
|
|
|
Cmd.ARG_DRIVELABEL: doPrintShowDriveLabels,
|
|
|
|
|
Cmd.ARG_DRIVELABELPERMISSION: doPrintShowDriveLabelPermissions,
|
|
|
|
|
Cmd.ARG_FEATURE: doPrintShowFeatures,
|
|
|
|
|
Cmd.ARG_GAL: doPrintShowGAL,
|
|
|
|
|
Cmd.ARG_GROUPMEMBERS: doShowGroupMembers,
|
|
|
|
|
Cmd.ARG_GROUPTREE: doPrintShowGroupTree,
|
|
|
|
|
Cmd.ARG_GUARDIAN: doPrintShowGuardians,
|
|
|
|
|