adelgado/nc_password_client
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Handle error when no passwords

Browse source
This commit is contained in:
Antonio J. Delgado 2025-01-24 11:15:40 +02:00
parent c90144b20e
commit 74338be3e1
1 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
nc_password_client/nc_password_client.py
View file

@ -112,6 +112,7 @@ class NextcloudHandler:
self._log = params['logger'] self._log = params['logger']
else: else:
self._init_log(params) self._init_log(params)
self.params = params
self.http = 'https' self.http = 'https'
self.timeout = params.get('timeout', 3) self.timeout = params.get('timeout', 3)
self.ssl = True self.ssl = True
@ -391,6 +392,10 @@ class NextcloudHandler:
def debug(self, obj, unsafe=False): def debug(self, obj, unsafe=False):
'''Show debug information''' '''Show debug information'''
obj['connection'] = {
"host": self.params['host'],
"user": self.params['user']
}
self._log.debug( self._log.debug(
self._output(obj, unsafe=unsafe) self._output(obj, unsafe=unsafe)
) )
@ -444,7 +449,7 @@ class NextcloudHandler:
def get(self, path): def get(self, path):
'''Do a GET request''' '''Do a GET request'''
self.debug({ "action": "get", "message": f"Requesting {path}" }) self.debug({ "action": "get", "message": f"Requesting '{self.http}://{self.host}/{path}'" })
try: try:
r = self.session.get( r = self.session.get(
f'{self.http}://{self.host}/{path}', f'{self.http}://{self.host}/{path}',
@ -784,6 +789,13 @@ class NextcloudHandler:
return folder return folder
return False return False
def _is_uuid(self, string):
'''Test if a string is a UUID'''
match = re.match(r'^[0-9a-f\-]*$', string)
if match:
return True
return False
def create_passwords_folder(self, name): def create_passwords_folder(self, name):
'''Create passwords folder''' '''Create passwords folder'''
if not self.exists_passwords_folder(name): if not self.exists_passwords_folder(name):
@ -903,7 +915,10 @@ class NextcloudHandler:
} }
) )
if new_obj.get('folder', '') != '': if new_obj.get('folder', '') != '':
folder_id = self.get_folder_id(new_obj['folder']) if self._is_uuid(new_obj['folder']):
folder_id = new_obj['folder']
else:
folder_id = self.get_folder_id(new_obj['folder'])
if not folder_id: if not folder_id:
created_folder = self.create_passwords_folder(new_obj['folder']) created_folder = self.create_passwords_folder(new_obj['folder'])
if created_folder: if created_folder:
@ -1636,8 +1651,12 @@ class NcPasswordClient:
"field_replacements": self.field_replacements, "field_replacements": self.field_replacements,
} }
self.destination_nc = NextcloudHandler(params) self.destination_nc = NextcloudHandler(params)
for password in self.nc.list_passwords(): all_passwords = self.nc.list_passwords()
self.destination_nc.create_password(password, update=True) if all_passwords:
for password in all_passwords:
self.destination_nc.create_password(password, update=True)
else:
return False
return True return True
def _init_log(self): def _init_log(self):