deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2025-07-10 14:43:34 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

GAM 5.09

Browse Source
This commit is contained in:
Jay Lee
2020-05-12 14:23:29 -04:00
parent 8eb72ae6e7
commit d46dd46732
3 changed files with 120 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -210,8 +210,8 @@ script:
- if [ "$e2e" = true ]; then $gam print cros allfields nolists; fi
- if [ "$e2e" = true ]; then $gam report usageparameters customer; fi
- if [ "$e2e" = true ]; then $gam report usage customer parameters gmail:num_emails_sent,accounts:num_1day_logins; fi
- if [ "$e2e" = true ]; then $gam report customer date -5d todrive; fi
- if [ "$e2e" = true ]; then $gam report users date -5d fields accounts:is_less_secure_apps_access_allowed,gmail:last_imap_time,gmail:last_pop_time filters "accounts:last_login_time>2019-01-01T00:00:00.000Z" todrive; fi
- if [ "$e2e" = true ]; then $gam report customer todrive; fi
- if [ "$e2e" = true ]; then $gam report users fields accounts:is_less_secure_apps_access_allowed,gmail:last_imap_time,gmail:last_pop_time filters "accounts:last_login_time>2019-01-01T00:00:00.000Z" todrive; fi
- if [ "$e2e" = true ]; then $gam report admin start -3d todrive; fi
- if ([ "$e2e" = true ] && [[ "$TRAVIS_JOB_NAME" != *"Testing" ]]); then
for gamfile in gam-$GAMVERSION-*; do

28
src/gam/__init__.py
View File

@ -602,7 +602,7 @@ def doGAMCheckForUpdates(forceCheck=False):
controlflow.system_error_exit(
4, 'GAM Latest Version information not available')
current_version = gam_version
current_version = GAM_VERSION
now_time = int(time.time())
if forceCheck:
check_url = GAM_ALL_RELEASES # includes pre-releases
@ -709,15 +709,15 @@ def doGAMVersion(checkForArgs=True):
else:
controlflow.invalid_argument_exit(sys.argv[i], 'gam version')
if simple:
sys.stdout.write(gam_version)
sys.stdout.write(GAM_VERSION)
return
pyversion = platform.python_version()
cpu_bits = struct.calcsize('P') * 8
api_client_ver = pkg_resources.get_distribution(
'google-api-python-client').version
print(
(f'GAM {gam_version} - {GAM_URL} - {GM_Globals[GM_GAM_TYPE]}\n'
f'{gam_author}\n'
(f'GAM {GAM_VERSION} - {GAM_URL} - {GM_Globals[GM_GAM_TYPE]}\n'
f'{GAM_AUTHOR}\n'
f'Python {pyversion} {cpu_bits}-bit {sys.version_info.releaselevel}\n'
f'google-api-python-client {api_client_ver}\n'
f'{getOSPlatform()} {platform.machine()}\n'
@ -3296,7 +3296,7 @@ def doPrinterRegister():
'uuid':
_getValueFromOAuth('sub'),
'manufacturer':
gam_author,
GAM_AUTHOR,
'model':
'cp1',
'gcp_version':
@ -3308,7 +3308,7 @@ def doPrinterRegister():
'update_url':
GAM_RELEASES,
'firmware':
gam_version,
GAM_VERSION,
'semantic_state': {
'version': '1.0',
'printer': {
@ -8611,7 +8611,8 @@ def doCreateOrRotateServiceAccountKeys(iam=None,
max_retries = 10
for i in range(1, max_retries + 1):
try:
result = gapi.call(iam.projects().serviceAccounts().keys(),
result = gapi.call(
iam.projects().serviceAccounts().keys(),
'upload',
throw_reasons=[gapi_errors.ErrorReason.NOT_FOUND],
name=name,
@ -8622,7 +8623,9 @@ def doCreateOrRotateServiceAccountKeys(iam=None,
raise e
sleep_time = i * 5
if i > 3:
print(f'Waiting for Service Account creation to complete. Sleeping {sleep_time} seconds\n')
print(
f'Waiting for Service Account creation to complete. Sleeping {sleep_time} seconds\n'
)
time.sleep(sleep_time)
private_key_id = result['name'].rsplit('/', 1)[-1]
oauth2service_data = _formatOAuth2ServiceData(project_id, client_email,
@ -9894,8 +9897,8 @@ def doWhatIs():
],
userKey=email,
fields='id,primaryEmail')
if (user_or_alias['primaryEmail'].lower() == email) or (
user_or_alias['id'] == email):
if (user_or_alias['primaryEmail'].lower()
== email) or (user_or_alias['id'] == email):
sys.stderr.write(f'{email} is a user\n\n')
doGetUserInfo(user_email=email)
return
@ -12915,9 +12918,8 @@ def getUsersToModify(entity_type=None,
query=query)
for member in members:
email = member['primaryEmail']
if (checkSuspended is None or
checkSuspended == member['suspended']
) and email not in usersSet:
if (checkSuspended is None or checkSuspended
== member['suspended']) and email not in usersSet:
usersSet.add(email)
users.append(email)
if not silent:

153
src/gam/var.py
View File

@ -1,3 +1,4 @@
"""Variables common across modules"""
import os
import ssl
import string
@ -5,13 +6,13 @@ import sys
import platform
import re
gam_author = 'Jay Lee <jay0lee@gmail.com>'
gam_version = '5.08'
gam_license = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
GAM_AUTHOR = 'Jay Lee <jay0lee@gmail.com>'
GAM_VERSION = '5.09'
GAM_LICENSE = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
GAM_URL = 'https://git.io/gam'
GAM_INFO = (
f'GAM {gam_version} - {GAM_URL} / {gam_author} / '
f'GAM {GAM_VERSION} - {GAM_URL} / {GAM_AUTHOR} / '
f'Python {platform.python_version()} {sys.version_info.releaselevel} / '
f'{platform.platform()} {platform.machine()}')
@ -930,7 +931,12 @@ CROS_DISK_VOLUME_REPORTS_ARGUMENTS = [
CROS_SYSTEM_RAM_FREE_REPORTS_ARGUMENTS = [
'systemramfreereports',
]
CROS_LISTS_ARGUMENTS = CROS_ACTIVE_TIME_RANGES_ARGUMENTS + CROS_RECENT_USERS_ARGUMENTS + CROS_DEVICE_FILES_ARGUMENTS + CROS_CPU_STATUS_REPORTS_ARGUMENTS + CROS_DISK_VOLUME_REPORTS_ARGUMENTS + CROS_SYSTEM_RAM_FREE_REPORTS_ARGUMENTS
CROS_LISTS_ARGUMENTS = CROS_ACTIVE_TIME_RANGES_ARGUMENTS + \
CROS_RECENT_USERS_ARGUMENTS + \
CROS_DEVICE_FILES_ARGUMENTS + \
CROS_CPU_STATUS_REPORTS_ARGUMENTS + \
CROS_DISK_VOLUME_REPORTS_ARGUMENTS + \
CROS_SYSTEM_RAM_FREE_REPORTS_ARGUMENTS
CROS_START_ARGUMENTS = ['start', 'startdate', 'oldestdate']
CROS_END_ARGUMENTS = ['end', 'enddate']
@ -1097,7 +1103,8 @@ GM_Globals = {
#
# Global variables defined by environment variables/signal files
#
# Automatically generate gam batch command if number of users specified in gam users xxx command exceeds this number
# Automatically generate gam batch command if number of users specified in gam
# users xxx command exceeds this number
# Default: 0, don't automatically generate gam batch commands
GC_AUTO_BATCH_MIN = 'auto_batch_min'
# When processing items in batches, how many should be processed in each batch
@ -1110,20 +1117,24 @@ GC_CACHE_DISCOVERY_ONLY = 'cache_discovery_only'
GC_CHARSET = 'charset'
# Path to client_secrets.json
GC_CLIENT_SECRETS_JSON = 'client_secrets_json'
# GAM config directory containing client_secrets.json, oauth2.txt, oauth2service.json, extra_args.txt
# GAM config directory containing client_secrets.json, oauth2.txt,
# oauth2service.json, extra_args.txt
GC_CONFIG_DIR = 'config_dir'
# custmerId from gam.cfg or retrieved from Google
GC_CUSTOMER_ID = 'customer_id'
# If debug_level > 0: extra_args[u'prettyPrint'] = True, httplib2.debuglevel = gam_debug_level, appsObj.debug = True
# If debug_level > 0: extra_args[u'prettyPrint'] = True,
# httplib2.debuglevel = gam_debug_level, appsObj.debug = True
GC_DEBUG_LEVEL = 'debug_level'
# ID Token decoded from OAuth 2.0 refresh token response. Includes hd (domain) and email of authorized user
# ID Token decoded from OAuth 2.0 refresh token response. Includes hd (domain)
# and email of authorized user
GC_DECODED_ID_TOKEN = 'decoded_id_token'
# Domain obtained from gam.cfg or oauth2.txt
GC_DOMAIN = 'domain'
# Google Drive download directory
GC_DRIVE_DIR = 'drive_dir'
# If no_browser is False, writeCSVfile won't open a browser when todrive is set
# and doRequestOAuth prints a link and waits for the verification code when oauth2.txt is being created
# and doRequestOAuth prints a link and waits for the verification code when
# oauth2.txt is being created
GC_NO_BROWSER = 'no_browser'
# oauth_browser forces usage of web server OAuth flow that proved problematic.
GC_OAUTH_BROWSER = 'oauth_browser'
@ -1158,7 +1169,7 @@ GC_TLS_MAX_VERSION = 'tls_max_ver'
# Path to certificate authority file for validating TLS hosts
GC_CA_FILE = 'ca_file'
tls_min = 'TLSv1_2' if hasattr(ssl.SSLContext(), 'minimum_version') else None
TLS_MIN = 'TLSv1_2' if hasattr(ssl.SSLContext(), 'minimum_version') else None
GC_Defaults = {
GC_AUTO_BATCH_MIN: 0,
GC_BATCH_SIZE: 50,
@ -1186,7 +1197,7 @@ GC_Defaults = {
GC_CSV_HEADER_FILTER: '',
GC_CSV_HEADER_DROP_FILTER: '',
GC_CSV_ROW_FILTER: '',
GC_TLS_MIN_VERSION: tls_min,
GC_TLS_MIN_VERSION: TLS_MIN,
GC_TLS_MAX_VERSION: None,
GC_CA_FILE: None,
}
@ -1321,20 +1332,52 @@ CLEAR_NONE_ARGUMENT = [
'none',
]
#
MESSAGE_API_ACCESS_CONFIG = 'API access is configured in your Control Panel under: Security-Show more-Advanced settings-Manage API client access'
MESSAGE_API_ACCESS_DENIED = 'API access Denied.\n\nPlease make sure the Client ID: {0} is authorized for the API Scope(s): {1}'
MESSAGE_GAM_EXITING_FOR_UPDATE = 'GAM is now exiting so that you can overwrite this old version with the latest release'
MESSAGE_GAM_OUT_OF_MEMORY = 'GAM has run out of memory. If this is a large G Suite instance, you should use a 64-bit version of GAM on Windows or a 64-bit version of Python on other systems.'
MESSAGE_HEADER_NOT_FOUND_IN_CSV_HEADERS = 'Header "{0}" not found in CSV headers of "{1}".'
MESSAGE_HIT_CONTROL_C_TO_UPDATE = '\n\nHit CTRL+C to visit the GAM website and download the latest release or wait 15 seconds continue with this boring old version. GAM won\'t bother you with this announcement for 1 week or you can create a file named noupdatecheck.txt in the same location as gam.py or gam.exe and GAM won\'t ever check for updates.'
MESSAGE_API_ACCESS_CONFIG = 'API access is configured in your Control Panel' \
' under: Security-Show more-Advanced' \
' settings-Manage API client access'
MESSAGE_API_ACCESS_DENIED = 'API access Denied.\n\nPlease make sure the Client' \
' ID: {0} is authorized for the API Scope(s): {1}'
MESSAGE_GAM_EXITING_FOR_UPDATE = 'GAM is now exiting so that you can' \
' overwrite this old version with the' \
' latest release'
MESSAGE_GAM_OUT_OF_MEMORY = 'GAM has run out of memory. If this is a large' \
' G Suite instance, you should use a 64-bit' \
' version of GAM on Windows or a 64-bit version' \
' of Python on other systems.'
MESSAGE_HEADER_NOT_FOUND_IN_CSV_HEADERS = 'Header "{0}" not found in CSV' \
' headers of "{1}".'
MESSAGE_HIT_CONTROL_C_TO_UPDATE = '\n\nHit CTRL+C to visit the GAM website' \
' and download the latest release or wait' \
' 15 seconds continue with this boring old' \
' version. GAM won\'t bother you with this ' \
' announcement for 1 week or you can create' \
' a file named noupdatecheck.txt in the same' \
' location as gam.py or gam.exe and GAM' \
' won\'t ever check for updates.'
MESSAGE_INVALID_JSON = 'The file {0} has an invalid format.'
MESSAGE_NO_DISCOVERY_INFORMATION = 'No online discovery doc and {0} does not exist locally'
MESSAGE_NO_TRANSFER_LACK_OF_DISK_SPACE = 'Cowardly refusing to perform migration due to lack of target drive space. Source size: {0}mb Target Free: {1}mb'
MESSAGE_RESULTS_TOO_LARGE_FOR_GOOGLE_SPREADSHEET = 'Results are too large for Google Spreadsheets. Uploading as a regular CSV file.'
MESSAGE_SERVICE_NOT_APPLICABLE = 'Service not applicable for this address: {0}. Please make sure service is enabled for user and run\n\ngam user <user> check serviceaccount\n\nfor further instructions'
MESSAGE_INSTRUCTIONS_OAUTH2SERVICE_JSON = 'Please run\n\ngam create project\ngam user <user> check serviceaccount\n\nto create and configure a service account.'
MESSAGE_UPDATE_GAM_TO_64BIT = "You're running a 32-bit version of GAM on a 64-bit version of Windows, upgrade to a windows-x86_64 version of GAM"
MESSAGE_YOUR_SYSTEM_TIME_DIFFERS_FROM_GOOGLE_BY = 'Your system time differs from %s by %s'
MESSAGE_NO_DISCOVERY_INFORMATION = 'No online discovery doc and {0} does not' \
' exist locally'
MESSAGE_NO_TRANSFER_LACK_OF_DISK_SPACE = 'Cowardly refusing to perform' \
' migration due to lack of target' \
' drive space. Source size: {0}mb' \
' Target Free: {1}mb'
MESSAGE_RESULTS_TOO_LARGE_FOR_GOOGLE_SPREADSHEET = 'Results are too large for' \
' Google Spreadsheets.' \
' Uploading as a regular' \
' CSV file.'
MESSAGE_SERVICE_NOT_APPLICABLE = 'Service not applicable for this address:' \
' {0}. Please make sure service is enabled' \
' for user and run\n\ngam user <user> check' \
' serviceaccount\n\nfor further instructions'
MESSAGE_INSTRUCTIONS_OAUTH2SERVICE_JSON = 'Please run\n\ngam create project\n' \
'gam user <user> check ' \
'serviceaccount\n\nto create and' \
' configure a service account.'
MESSAGE_UPDATE_GAM_TO_64BIT = 'You\'re running a 32-bit version of GAM on a' \
' 64-bit version of Windows, upgrade to a' \
' windows-x86_64 version of GAM'
MESSAGE_YOUR_SYSTEM_TIME_DIFFERS_FROM_GOOGLE_BY = 'Your system time differs' \
' from %s by %s'
USER_ADDRESS_TYPES = ['home', 'work', 'other']
USER_EMAIL_TYPES = ['home', 'work', 'other']
@ -1587,167 +1630,151 @@ LANGUAGE_CODES_MAP = {
'ak': 'ak',
'am': 'am',
'ar': 'ar',
'az': 'az', #Luo, Afrikaans, Irish, Akan, Amharic, Arabica, Azerbaijani
'az': 'az',
'be': 'be',
'bem': 'bem',
'bg': 'bg',
'bn': 'bn',
'br': 'br',
'bs': 'bs',
'ca':
'ca', #Belarusian, Bemba, Bulgarian, Bengali, Breton, Bosnian, Catalan
'ca': 'ca',
'chr': 'chr',
'ckb': 'ckb',
'co': 'co',
'crs': 'crs',
'cs': 'cs',
'cy': 'cy',
'da':
'da', #Cherokee, Kurdish (Sorani), Corsican, Seychellois Creole, Czech, Welsh, Danish
'da': 'da',
'de': 'de',
'ee': 'ee',
'el': 'el',
'en': 'en',
'en-gb': 'en-GB',
'en-us': 'en-US',
'eo':
'eo', #German, Ewe, Greek, English, English (UK), English (US), Esperanto
'eo': 'eo',
'es': 'es',
'es-419': 'es-419',
'et': 'et',
'eu': 'eu',
'fa': 'fa',
'fi': 'fi',
'fo':
'fo', #Spanish, Spanish (Latin American), Estonian, Basque, Persian, Finnish, Faroese
'fo': 'fo',
'fr': 'fr',
'fr-ca': 'fr-ca',
'fy': 'fy',
'ga': 'ga',
'gaa': 'gaa',
'gd': 'gd',
'gl':
'gl', #French, French (Canada), Frisian, Irish, Ga, Scots Gaelic, Galician
'gl': 'gl',
'gn': 'gn',
'gu': 'gu',
'ha': 'ha',
'haw': 'haw',
'he': 'he',
'hi': 'hi',
'hr': 'hr', #Guarani, Gujarati, Hausa, Hawaiian, Hebrew, Hindi, Croatian
'hr': 'hr',
'ht': 'ht',
'hu': 'hu',
'hy': 'hy',
'ia': 'ia',
'id': 'id',
'ig': 'ig',
'in':
'in', #Haitian Creole, Hungarian, Armenian, Interlingua, Indonesian, Igbo, in
'in': 'in',
'is': 'is',
'it': 'it',
'iw': 'iw',
'ja': 'ja',
'jw': 'jw',
'ka': 'ka',
'kg':
'kg', #Icelandic, Italian, Hebrew, Japanese, Javanese, Georgian, Kongo
'kg': 'kg',
'kk': 'kk',
'km': 'km',
'kn': 'kn',
'ko': 'ko',
'kri': 'kri',
'ku': 'ku',
'ky':
'ky', #Kazakh, Khmer, Kannada, Korean, Krio (Sierra Leone), Kurdish, Kyrgyz
'ky': 'ky',
'la': 'la',
'lg': 'lg',
'ln': 'ln',
'lo': 'lo',
'loz': 'loz',
'lt': 'lt',
'lua':
'lua', #Latin, Luganda, Lingala, Laothian, Lozi, Lithuanian, Tshiluba
'lua': 'lua',
'lv': 'lv',
'mfe': 'mfe',
'mg': 'mg',
'mi': 'mi',
'mk': 'mk',
'ml': 'ml',
'mn':
'mn', #Latvian, Mauritian Creole, Malagasy, Maori, Macedonian, Malayalam, Mongolian
'mn': 'mn',
'mo': 'mo',
'mr': 'mr',
'ms': 'ms',
'mt': 'mt',
'my': 'my',
'ne': 'ne',
'nl': 'nl', #Moldavian, Marathi, Malay, Maltese, Burmese, Nepali, Dutch
'nl': 'nl',
'nn': 'nn',
'no': 'no',
'nso': 'nso',
'ny': 'ny',
'nyn': 'nyn',
'oc': 'oc',
'om':
'om', #Norwegian (Nynorsk), Norwegian, Northern Sotho, Chichewa, Runyakitara, Occitan, Oromo
'om': 'om',
'or': 'or',
'pa': 'pa',
'pcm': 'pcm',
'pl': 'pl',
'ps': 'ps',
'pt-br': 'pt-BR',
'pt-pt':
'pt-PT', #Oriya, Punjabi, Nigerian Pidgin, Polish, Pashto, Portuguese (Brazil), Portuguese (Portugal)
'pt-pt': 'pt-PT',
'qu': 'qu',
'rm': 'rm',
'rn': 'rn',
'ro': 'ro',
'ru': 'ru',
'rw': 'rw',
'sd':
'sd', #Quechua, Romansh, Kirundi, Romanian, Russian, Kinyarwanda, Sindhi
'sd': 'sd',
'sh': 'sh',
'si': 'si',
'sk': 'sk',
'sl': 'sl',
'sn': 'sn',
'so': 'so',
'sq':
'sq', #Serbo-Croatian, Sinhalese, Slovak, Slovenian, Shona, Somali, Albanian
'sq': 'sq',
'sr': 'sr',
'sr-me': 'sr-ME',
'st': 'st',
'su': 'su',
'sv': 'sv',
'sw': 'sw',
'ta':
'ta', #Serbian, Montenegrin, Sesotho, Sundanese, Swedish, Swahili, Tamil
'ta': 'ta',
'te': 'te',
'tg': 'tg',
'th': 'th',
'ti': 'ti',
'tk': 'tk',
'tl': 'tl',
'tn': 'tn', #Telugu, Tajik, Thai, Tigrinya, Turkmen, Tagalog, Setswana
'tn': 'tn',
'to': 'to',
'tr': 'tr',
'tt': 'tt',
'tum': 'tum',
'tw': 'tw',
'ug': 'ug',
'uk': 'uk', #Tonga, Turkish, Tatar, Tumbuka, Twi, Uighur, Ukrainian
'uk': 'uk',
'ur': 'ur',
'uz': 'uz',
'vi': 'vi',
'wo': 'wo',
'xh': 'xh',
'yi': 'yi',
'yo': 'yo', #Urdu, Uzbek, Vietnamese, Wolof, Xhosa, Yiddish, Yoruba
'yo': 'yo',
'zh-cn': 'zh-CN',
'zh-hk': 'zh-HK',
'zh-tw': 'zh-TW',
'zu':
'zu', #Chinese (Simplified), Chinese (Hong Kong/Traditional), Chinese (Taiwan/Traditional), Zulu
'zu': 'zu',
}
# maxResults exception values for API list calls. Should only be listed if: