rc 0.0.1
Добавил функцию удаления папок которых нет в списке для обновления. Организовал main. Пока остались тестовые комментарии.
This commit is contained in:
@@ -2,110 +2,188 @@
|
||||
from caddy_worker import CaddyWorker
|
||||
from service_functions import ServiceFunctions
|
||||
from dsm_worker import DSMWorker
|
||||
import logging
|
||||
from pathlib import Path
|
||||
import shutil
|
||||
from structs import CertInfo, DSMAuthInfo
|
||||
|
||||
def main():
|
||||
|
||||
|
||||
service_worker = ServiceFunctions()
|
||||
worker = CaddyWorker()
|
||||
|
||||
#### Тест CaddyWorker ##################
|
||||
pem_cert = None
|
||||
|
||||
print(f"search_cert_caddy")
|
||||
cert_path = worker.search_cert_caddy(
|
||||
"D:/Work/Programming/Python/CaddyToDSM/TestData/certs",
|
||||
"wud.stadidisk.ru"
|
||||
)
|
||||
|
||||
print(f"Path to cert: {cert_path}")
|
||||
print(f"\n")
|
||||
|
||||
if cert_path:
|
||||
print(f"get_cert_info")
|
||||
cert_info = worker.get_cert_info(cert_path)
|
||||
service_worker.save_cert_info(cert_info, Path("D:/Work/Programming/Python/CaddyToDSM/TestData/pems"))
|
||||
|
||||
|
||||
print(f"Domain: {cert_info.domain_name}")
|
||||
print(f"Fingerprint: {cert_info.fingerprint}")
|
||||
print(f"Expires at: {cert_info.expires_at}")
|
||||
print(f"Key path: {cert_info.path_to_key}")
|
||||
print(f"Dir cert: {cert_info.dir_cert}")
|
||||
print(f"\n")
|
||||
|
||||
print(f"convert_to_dsm")
|
||||
pem_cert = worker.convert_to_dsm(cert_info.dir_cert,
|
||||
"D:/Work/Programming/Python/CaddyToDSM/TestData/pems")
|
||||
|
||||
if(pem_cert):
|
||||
print(f"Cert Name: {pem_cert.certificate_name}")
|
||||
print(f"Path to private key: {pem_cert.private_key_path}")
|
||||
print(f"Path to pem: {pem_cert.private_key_path}")
|
||||
print(f"Path to fullchain: {pem_cert.private_key_path}")
|
||||
print(f"\n")
|
||||
else:
|
||||
print("Convert Certificate Fail")
|
||||
print(f"\n")
|
||||
|
||||
settings = service_worker.load_config()
|
||||
#Проверяем все ли папки нужны
|
||||
if service_worker.remove_unnecessary_dsm_certs(settings.path_to_save_folder, settings.list_domains):
|
||||
logging.info(f"DSM certificate folders checked successfully")
|
||||
else:
|
||||
print("Certificate not found")
|
||||
print(f"\n")
|
||||
logging.error(f"Error in removing unnecessary DSM certs")
|
||||
|
||||
dsm_worker = DSMWorker(settings.nas_url)
|
||||
caddy_worker = CaddyWorker()
|
||||
|
||||
#Ищем в папке Caddy те сертификаты которые необходимо обновить, они приведены в настройках
|
||||
list_candidate_update_certs = service_worker.search_caddy_cert(settings.path_to_caddy_cert, settings.list_domains)
|
||||
|
||||
######### Тест DSM worker #################
|
||||
list_update_certs = service_worker.check_update_certs(settings.path_to_save_folder,
|
||||
settings.path_to_caddy_cert,
|
||||
list_candidate_update_certs)
|
||||
|
||||
dsm_worker = DSMWorker("http://stadidisk.local")
|
||||
auth_info = dsm_worker.auth_in_DSM(Path("D:/Work/Programming/Python/CaddyToDSM/TestData/.secret"))
|
||||
print("Starting dsm_worker\n")
|
||||
if not list_update_certs:
|
||||
logging.info(f"No found updated certs for update")
|
||||
return
|
||||
|
||||
if dsm_worker.logout_dsm():
|
||||
print("Logout Success\n")
|
||||
else:
|
||||
print("Logout Fail\n")
|
||||
#Получили все сертификаты которые нужнго обновить
|
||||
if not dsm_worker.auth_in_DSM(Path(settings.credentials)):
|
||||
logging.error(f"Authentication in DSM failed")
|
||||
raise RuntimeError("Authentication in DSM failed")
|
||||
|
||||
if auth_info:
|
||||
print(f"Session id: {auth_info.sid}")
|
||||
print(f"Token: {auth_info.token}")
|
||||
print("\n")
|
||||
|
||||
print("Starting get_list_certs\n")
|
||||
try:
|
||||
list_certs = dsm_worker.get_list_certs()
|
||||
if not list_certs:
|
||||
logging.error(f"Error in get DSM certificate")
|
||||
return
|
||||
|
||||
print("Starting get_list_services\n")
|
||||
list_services = dsm_worker.get_list_services(list_certs)
|
||||
if not list_services:
|
||||
logging.error(f"Error in get list services DSM")
|
||||
return
|
||||
|
||||
if list_services:
|
||||
print(f"Service List: {list_services}\n")
|
||||
else:
|
||||
print("Service list empty\n")
|
||||
for cert in list_update_certs:
|
||||
cert_path = caddy_worker.search_cert_caddy(settings.path_to_caddy_cert, cert)
|
||||
if not cert_path:
|
||||
logging.error(f"Error in searching cert {cert}")
|
||||
continue
|
||||
|
||||
if list_certs:
|
||||
print(f"Cert list: {list_certs}\n")
|
||||
cert_info = caddy_worker.get_cert_info(cert_path)
|
||||
if not cert_info:
|
||||
logging.error(f"Error in get cert info")
|
||||
continue
|
||||
|
||||
print("Starting dsm_worker\n")
|
||||
dsm_cert_info = dsm_worker.import_cert(pem_cert)
|
||||
if dsm_cert_info:
|
||||
print(f"Cert Import Success\n")
|
||||
path_to_dsm_cert = service_worker.save_cert_info(cert_info, Path(settings.path_to_save_folder))
|
||||
|
||||
isSetCert = dsm_worker.set_cert_on_service(list_services, dsm_cert_info)
|
||||
pem_cert = caddy_worker.convert_to_dsm(cert_info.dir_caddy_cert, settings.path_to_save_folder)
|
||||
if not pem_cert:
|
||||
logging.error(f"Error in request PEM certificate")
|
||||
shutil.rmtree(path_to_dsm_cert)
|
||||
continue
|
||||
|
||||
if isSetCert:
|
||||
print(f"Cert Set Success\n")
|
||||
else:
|
||||
print("Cert Set Fail\n")
|
||||
dsm_info = dsm_worker.import_cert(pem_cert)
|
||||
if not dsm_info:
|
||||
logging.error(f"Error in import DSM certificate")
|
||||
shutil.rmtree(path_to_dsm_cert)
|
||||
continue
|
||||
|
||||
else:
|
||||
print(f"Cert Import Fail\n")
|
||||
if not dsm_worker.set_cert_on_service(list_services, dsm_info):
|
||||
logging.error(f"Set cert in DSM failed")
|
||||
shutil.rmtree(path_to_dsm_cert)
|
||||
continue
|
||||
finally:
|
||||
dsm_worker.logout_dsm()
|
||||
|
||||
else:
|
||||
print("Cert list is empty\n")
|
||||
|
||||
else:
|
||||
print(f"Error getting auth data")
|
||||
print("\n")
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
# #### Тест CaddyWorker ##################
|
||||
# pem_cert = None
|
||||
#
|
||||
# print(f"search_cert_caddy")
|
||||
# cert_path = worker.search_cert_caddy(
|
||||
# "D:/Work/Programming/Python/CaddyToDSM/TestData/certs",
|
||||
# "wud.stadidisk.ru"
|
||||
# )
|
||||
#
|
||||
# print(f"Path to cert: {cert_path}")
|
||||
# print(f"\n")
|
||||
#
|
||||
# if cert_path:
|
||||
# print(f"get_cert_info")
|
||||
# cert_info = worker.get_cert_info(cert_path)
|
||||
# service_worker.save_cert_info(cert_info, Path("D:/Work/Programming/Python/CaddyToDSM/TestData/pems"))
|
||||
#
|
||||
#
|
||||
# print(f"Domain: {cert_info.domain_name}")
|
||||
# print(f"Fingerprint: {cert_info.fingerprint}")
|
||||
# print(f"Expires at: {cert_info.expires_at}")
|
||||
# print(f"Key path: {cert_info.path_to_key}")
|
||||
# print(f"Dir cert: {cert_info.dir_cert}")
|
||||
# print(f"\n")
|
||||
#
|
||||
# print(f"convert_to_dsm")
|
||||
# pem_cert = worker.convert_to_dsm(cert_info.dir_cert,
|
||||
# "D:/Work/Programming/Python/CaddyToDSM/TestData/pems")
|
||||
#
|
||||
# if(pem_cert):
|
||||
# print(f"Cert Name: {pem_cert.certificate_name}")
|
||||
# print(f"Path to private key: {pem_cert.private_key_path}")
|
||||
# print(f"Path to pem: {pem_cert.private_key_path}")
|
||||
# print(f"Path to fullchain: {pem_cert.private_key_path}")
|
||||
# print(f"\n")
|
||||
# else:
|
||||
# print("Convert Certificate Fail")
|
||||
# print(f"\n")
|
||||
#
|
||||
# else:
|
||||
# print("Certificate not found")
|
||||
# print(f"\n")
|
||||
#
|
||||
#
|
||||
#
|
||||
# ######### Тест DSM worker #################
|
||||
#
|
||||
# dsm_worker = DSMWorker("http://stadidisk.local")
|
||||
# auth_info = dsm_worker.auth_in_DSM(Path("D:/Work/Programming/Python/CaddyToDSM/TestData/.secret"))
|
||||
# print("Starting dsm_worker\n")
|
||||
#
|
||||
# if dsm_worker.logout_dsm():
|
||||
# print("Logout Success\n")
|
||||
# else:
|
||||
# print("Logout Fail\n")
|
||||
#
|
||||
# if auth_info:
|
||||
# print(f"Session id: {auth_info.sid}")
|
||||
# print(f"Token: {auth_info.token}")
|
||||
# print("\n")
|
||||
#
|
||||
# print("Starting get_list_certs\n")
|
||||
# list_certs = dsm_worker.get_list_certs()
|
||||
#
|
||||
# print("Starting get_list_services\n")
|
||||
# list_services = dsm_worker.get_list_services(list_certs)
|
||||
#
|
||||
# if list_services:
|
||||
# print(f"Service List: {list_services}\n")
|
||||
# else:
|
||||
# print("Service list empty\n")
|
||||
#
|
||||
# if list_certs:
|
||||
# print(f"Cert list: {list_certs}\n")
|
||||
#
|
||||
# print("Starting dsm_worker\n")
|
||||
# dsm_cert_info = dsm_worker.import_cert(pem_cert)
|
||||
# if dsm_cert_info:
|
||||
# print(f"Cert Import Success\n")
|
||||
#
|
||||
# isSetCert = dsm_worker.set_cert_on_service(list_services, dsm_cert_info)
|
||||
#
|
||||
# if isSetCert:
|
||||
# print(f"Cert Set Success\n")
|
||||
# else:
|
||||
# print("Cert Set Fail\n")
|
||||
#
|
||||
# else:
|
||||
# print(f"Cert Import Fail\n")
|
||||
#
|
||||
# else:
|
||||
# print("Cert list is empty\n")
|
||||
#
|
||||
# else:
|
||||
# print(f"Error getting auth data")
|
||||
# print("\n")
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user