|
@@ -84,11 +84,11 @@ class SFTPGoApiRequests:
|
|
|
denied_patterns=[], allowed_patterns=[], s3_upload_part_size=0, s3_upload_concurrency=0,
|
|
|
max_upload_file_size=0, denied_protocols=[], az_container='', az_account_name='', az_account_key='',
|
|
|
az_sas_url='', az_endpoint='', az_upload_part_size=0, az_upload_concurrency=0, az_key_prefix='',
|
|
|
- az_use_emulator=False, az_access_tier=''):
|
|
|
+ az_use_emulator=False, az_access_tier='', additional_info=''):
|
|
|
user = {'id':user_id, 'username':username, 'uid':uid, 'gid':gid,
|
|
|
'max_sessions':max_sessions, 'quota_size':quota_size, 'quota_files':quota_files,
|
|
|
'upload_bandwidth':upload_bandwidth, 'download_bandwidth':download_bandwidth,
|
|
|
- 'status':status, 'expiration_date':expiration_date}
|
|
|
+ 'status':status, 'expiration_date':expiration_date, 'additional_info':additional_info}
|
|
|
if password is not None:
|
|
|
user.update({'password':password})
|
|
|
if public_keys:
|
|
@@ -285,7 +285,7 @@ class SFTPGoApiRequests:
|
|
|
denied_login_methods=[], virtual_folders=[], denied_patterns=[], allowed_patterns=[],
|
|
|
s3_upload_part_size=0, s3_upload_concurrency=0, max_upload_file_size=0, denied_protocols=[], az_container="",
|
|
|
az_account_name='', az_account_key='', az_sas_url='', az_endpoint='', az_upload_part_size=0,
|
|
|
- az_upload_concurrency=0, az_key_prefix='', az_use_emulator=False, az_access_tier=''):
|
|
|
+ az_upload_concurrency=0, az_key_prefix='', az_use_emulator=False, az_access_tier='', additional_info=''):
|
|
|
u = self.buildUserObject(0, username, password, public_keys, home_dir, uid, gid, max_sessions,
|
|
|
quota_size, quota_files, self.buildPermissions(perms, subdirs_permissions), upload_bandwidth, download_bandwidth,
|
|
|
status, expiration_date, allowed_ip, denied_ip, fs_provider, s3_bucket, s3_region, s3_access_key,
|
|
@@ -293,7 +293,7 @@ class SFTPGoApiRequests:
|
|
|
gcs_credentials_file, gcs_automatic_credentials, denied_login_methods, virtual_folders, denied_patterns,
|
|
|
allowed_patterns, s3_upload_part_size, s3_upload_concurrency, max_upload_file_size, denied_protocols,
|
|
|
az_container, az_account_name, az_account_key, az_sas_url, az_endpoint, az_upload_part_size,
|
|
|
- az_upload_concurrency, az_key_prefix, az_use_emulator, az_access_tier)
|
|
|
+ az_upload_concurrency, az_key_prefix, az_use_emulator, az_access_tier, additional_info)
|
|
|
r = requests.post(self.userPath, json=u, auth=self.auth, verify=self.verify)
|
|
|
self.printResponse(r)
|
|
|
|
|
@@ -306,7 +306,7 @@ class SFTPGoApiRequests:
|
|
|
allowed_patterns=[], s3_upload_part_size=0, s3_upload_concurrency=0, max_upload_file_size=0,
|
|
|
denied_protocols=[], disconnect=0, az_container='', az_account_name='', az_account_key='', az_sas_url='',
|
|
|
az_endpoint='', az_upload_part_size=0, az_upload_concurrency=0, az_key_prefix='', az_use_emulator=False,
|
|
|
- az_access_tier=''):
|
|
|
+ az_access_tier='', additional_info=''):
|
|
|
u = self.buildUserObject(user_id, username, password, public_keys, home_dir, uid, gid, max_sessions,
|
|
|
quota_size, quota_files, self.buildPermissions(perms, subdirs_permissions), upload_bandwidth, download_bandwidth,
|
|
|
status, expiration_date, allowed_ip, denied_ip, fs_provider, s3_bucket, s3_region, s3_access_key,
|
|
@@ -314,7 +314,7 @@ class SFTPGoApiRequests:
|
|
|
gcs_credentials_file, gcs_automatic_credentials, denied_login_methods, virtual_folders, denied_patterns,
|
|
|
allowed_patterns, s3_upload_part_size, s3_upload_concurrency, max_upload_file_size, denied_protocols,
|
|
|
az_container, az_account_name, az_account_key, az_sas_url, az_endpoint, az_upload_part_size,
|
|
|
- az_upload_concurrency, az_key_prefix, az_use_emulator, az_access_tier)
|
|
|
+ az_upload_concurrency, az_key_prefix, az_use_emulator, az_access_tier, additional_info)
|
|
|
r = requests.put(urlparse.urljoin(self.userPath, 'user/' + str(user_id)), params={'disconnect':disconnect},
|
|
|
json=u, auth=self.auth, verify=self.verify)
|
|
|
self.printResponse(r)
|
|
@@ -608,6 +608,7 @@ def addCommonUserArguments(parser):
|
|
|
help='User\'s status. 1 enabled, 0 disabled. Default: %(default)s')
|
|
|
parser.add_argument('--max-upload-file-size', type=int, default=0,
|
|
|
help='Maximum allowed size, as bytes, for a single file upload, 0 means unlimited. Default: %(default)s')
|
|
|
+ parser.add_argument('--additional-info', type=str, default='', help='Free form text field. Default: %(default)s')
|
|
|
parser.add_argument('-E', '--expiration-date', type=validDate, default='',
|
|
|
help='Expiration date as YYYY-MM-DD, empty string means no expiration. Default: %(default)s')
|
|
|
parser.add_argument('-Y', '--allowed-ip', type=str, nargs='+', default=[],
|
|
@@ -815,7 +816,7 @@ if __name__ == '__main__':
|
|
|
args.s3_upload_part_size, args.s3_upload_concurrency, args.max_upload_file_size, args.denied_protocols,
|
|
|
args.az_container, args.az_account_name, args.az_account_key, args.az_sas_url, args.az_endpoint,
|
|
|
args.az_upload_part_size, args.az_upload_concurrency, args.az_key_prefix, args.az_use_emulator,
|
|
|
- args.az_access_tier)
|
|
|
+ args.az_access_tier, args.additional_info)
|
|
|
elif args.command == 'update-user':
|
|
|
api.updateUser(args.id, args.username, args.password, args.public_keys, args.home_dir, args.uid, args.gid,
|
|
|
args.max_sessions, args.quota_size, args.quota_files, args.permissions, args.upload_bandwidth,
|
|
@@ -828,7 +829,7 @@ if __name__ == '__main__':
|
|
|
args.s3_upload_concurrency, args.max_upload_file_size, args.denied_protocols, args.disconnect,
|
|
|
args.az_container, args.az_account_name, args.az_account_key, args.az_sas_url, args.az_endpoint,
|
|
|
args.az_upload_part_size, args.az_upload_concurrency, args.az_key_prefix, args.az_use_emulator,
|
|
|
- args.az_access_tier)
|
|
|
+ args.az_access_tier, args.additional_info)
|
|
|
elif args.command == 'delete-user':
|
|
|
api.deleteUser(args.id)
|
|
|
elif args.command == 'get-users':
|