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

cleanup random string generation

Browse Source
This commit is contained in:
Jay Lee
2019-05-23 21:26:41 -04:00
parent 71536c50a2
commit 2c4bbbbbfb
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gam.py
View File

@@ -3422,7 +3422,7 @@ def doPrintJobFetch():
result = callGAPI(cp.printers(), 'get', result = callGAPI(cp.printers(), 'get',
printerid=printerid) printerid=printerid)
checkCloudPrintResult(result) checkCloudPrintResult(result)
valid_chars = '-_.() abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789' valid_chars = '-_.() '+string.ascii_letters+string.ascii_digits
ssd = '{"state": {"type": "DONE"}}' ssd = '{"state": {"type": "DONE"}}'
if ((not sortorder) or (sortorder == 'CREATE_TIME_DESC')) and (older_or_newer == 'newer'): if ((not sortorder) or (sortorder == 'CREATE_TIME_DESC')) and (older_or_newer == 'newer'):
timeExit = True timeExit = True
@@ -7463,7 +7463,7 @@ def getUserAttributes(i, cd, updateCmd):
else: else:
systemErrorExit(2, '%s is not a valid argument for "gam %s user"' % (sys.argv[i], ['create', 'update'][updateCmd])) systemErrorExit(2, '%s is not a valid argument for "gam %s user"' % (sys.argv[i], ['create', 'update'][updateCmd]))
if need_password: if need_password:
body['password'] = ''.join(random.sample('abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789~`!@#$%^&*()-=_+:;"\'{}[]\\|', 25)) body['password'] = ''.join(random.sample(string.printable, 25))
if 'password' in body and need_to_hash_password: if 'password' in body and need_to_hash_password:
body['password'] = gen_sha512_hash(body['password']) body['password'] = gen_sha512_hash(body['password'])
body['hashFunction'] = 'crypt' body['hashFunction'] = 'crypt'
@@ -7481,7 +7481,6 @@ def _run_oauth_flow(client_id, client_secret, scopes, access_type, login_hint=No
} }
flow = google_auth_oauthlib.flow.InstalledAppFlow.from_client_config(client_config, scopes) flow = google_auth_oauthlib.flow.InstalledAppFlow.from_client_config(client_config, scopes)
kwargs = { kwargs = {
'prompt': 'consent',
'access_type': access_type, 'access_type': access_type,
} }
if login_hint: if login_hint: