Compare commits

..

No commits in common. "7871a3302cad5bd496c6eecc31fd4f56b8cc823d" and "8f282ad629453637bde2d3e83380a8f0304bfcdc" have entirely different histories.

View file

@ -47,21 +47,18 @@ def init_prog(argv):
required=False, required=False,
default=default_conf_file, default=default_conf_file,
help="Specifity config file (default: {})".format(default_conf_file)) help="Specifity config file (default: {})".format(default_conf_file))
parser.add_argument("--liste", default=False, action='store_true', required=False,
help="Richiedi i certificati per liste.indivia.net")
parser.add_argument("--hosting", default=False, action='store_true', required=False,
help="Richiedi i certificati per i siti in hosting")
parser.add_argument("--webmail", default=False, action='store_true', required=False,
help="Richiedi i certificati per le webmail")
parser.add_argument("--smtp", default=False, action='store_true', required=False,
help="Richiedi i certificati per il server SMTP")
parser.add_argument("--mbox", default=False, action='store_true', required=False,
help="Richiedi i certificati per il server POP/IMAP")
parser.add_argument("--renew", default=False, action='store_true', required=False, parser.add_argument("--renew", default=False, action='store_true', required=False,
help="Invoca solamente il renew per i certificati gia' presenti") help="Invoca solamente il renew per i certificati gia' presenti")
service_group = parser.add_mutually_exclusive_group(required=True)
service_group.add_argument("--liste", default=False, action='store_true', required=False,
help="Richiedi i certificati per liste.indivia.net")
service_group.add_argument("--hosting", default=False, action='store_true', required=False,
help="Richiedi i certificati per i siti in hosting")
service_group.add_argument("--webmail", default=False, action='store_true', required=False,
help="Richiedi i certificati per le webmail")
service_group.add_argument("--smtp", default=False, action='store_true', required=False,
help="Richiedi i certificati per il server SMTP")
service_group.add_argument("--mbox", default=False, action='store_true', required=False,
help="Richiedi i certificati per il server POP/IMAP")
args = parser.parse_args() args = parser.parse_args()
try: try:
config = configparser.ConfigParser() config = configparser.ConfigParser()
@ -159,33 +156,6 @@ def get_alias_list(config, dns_conn, query, aliases):
return result_list return result_list
def acme_renew(config, pre_hook_cmd, post_hook_cmd, dryrun=False):
args = config['certbot']['base_args']
# args += " -m {} ".format(config['certbot']['email'])
# args += "--server {} ".format(config['certbot']['server'])
if dryrun:
args += "--dry-run "
if not pre_hook_cmd is None:
args +=' --pre-hook "{}"'.format(pre_hook_cmd)
if not post_hook_cmd is None:
args +=' --post-hook "{}"'.format(post_hook_cmd)
args += " renew"
if dryrun:
logging.info("{} {}".format(config['certbot']['bin'], args))
else:
os.system("{} {}".format(config['certbot']['bin'], args))
return True
def acme_request(config, domain_name, acme_test='DNS-01', webroot=None, dryrun=False, domains_list=None): def acme_request(config, domain_name, acme_test='DNS-01', webroot=None, dryrun=False, domains_list=None):
args = config['certbot']['base_args'] args = config['certbot']['base_args']
@ -249,156 +219,121 @@ if __name__ == '__main__':
dryrun=config['main'].getboolean('dryrun') dryrun=config['main'].getboolean('dryrun')
service_reload = dict() service_reload = dict()
ot_conn=connect_db(dict(config['ot_db']))
dns_conn=connect_db(dict(config['dns_db']))
if dryrun: if dryrun:
print("DRYRUN, nessun certificato verra' richiesto, nessun link/file creato o modificato") print("DRYRUN, nessun certificato verra' richiesto, nessun link/file creato o modificato")
if args.renew:
pre_hook_cmd = None
post_hook_cmd = None
logging.info('Renewing certificates ')
if args.webmail or args.hosting or args.liste:
post_hook_cmd = "systemctl reload apache2"
elif args.smtp:
post_hook_cmd = "systemctl reload postfix"
elif args.mbox:
post_hook_cmd = "systemctl restart dovecot"
logger.debug("post_hook_cmd: {}".format(post_hook_cmd)) # Caso speciale per le webmail
if args.webmail:
logging.info('Asking certificates for webmail')
vhost_name = config['webmail']['vhost'].strip()
webmails_list = ["webmail.{}".format(d.strip()) for d in config['webmail']['domains'].split(',') if len(d.strip())>0]
logging.info('vhost {}, domains_list {}'.format(vhost_name, webmails_list))
if acme_request(config, vhost_name, acme_test='HTTP-01', dryrun=dryrun, domains_list=webmails_list):
link_cert(config, vhost_name, vhost_name, dryrun=dryrun)
service_reload['webmail'] = True
else:
logger.error('Error asking certificate for {}'.format(vhost_name))
if acme_renew(config, pre_hook_cmd, post_hook_cmd, dryrun=dryrun): # Caso speciale per il server POP/IMAP
logger.info("Done renew") if args.mbox:
logging.info('Asking certificates for POP/IMAP server')
else: vhost_name = config['mail']['mbox_vhost'].strip()
# Fai le nuove richieste per i certificati server_addresses = [s.strip() for s in config['mail']['mbox_server_addresses'].split(',') if len(s.strip())>0]
mbox_fmt = ','.join(['%s'] * len(server_addresses))
# Caso speciale per le webmail mbox_query = mbox_list_stmt.format(mbox_fmt)
if args.webmail: alias_list = get_alias_list(config, dns_conn, mbox_query, server_addresses)
logging.info('Asking certificates for webmail') # Per usi futuri, aggiungo l'alias 'mail.indivia.net'
vhost_name = config['webmail']['vhost'].strip() alias_list.append('mail.indivia.net')
webmails_list = ["webmail.{}".format(d.strip()) for d in config['webmail']['domains'].split(',') if len(d.strip())>0] logging.info('vhost {}, domains_list {}'.format(vhost_name, alias_list))
logging.info('vhost {}, domains_list {}'.format(vhost_name, webmails_list)) if acme_request(config, vhost_name, acme_test='HTTP-01', webroot=config['mail']['mbox_webroot'].strip(),
if acme_request(config, vhost_name, acme_test='HTTP-01', dryrun=dryrun, domains_list=webmails_list): dryrun=dryrun, domains_list=alias_list):
link_cert(config, vhost_name, vhost_name, dryrun=dryrun) # non e' richiesto il link, punto direttamente le configurazioni alle dir di letsencrypt
else: # link_cert(config, vhost_name, vhost_name, dryrun=dryrun)
logger.error('Error asking certificate for {}'.format(vhost_name)) service_reload['mbox'] = True
pass
# reload apache else:
logger.info("Reloading apache") logger.error('Error asking certificate for {}'.format(vhost_name))
# ret = subprocess.run("systemctl reload apache2")
ret = os.system("systemctl reload apache2")
logger.info(ret)
# Caso speciale per l'hosting # Caso speciale per il server SMTP
if args.hosting: if args.smtp:
logging.info('Asking certificates for hosted web domains') logging.info('Asking certificates for SMTP server')
ot_conn=connect_db(dict(config['ot_db'])) vhost_name = config['mail']['smtp_vhost'].strip()
dns_conn=connect_db(dict(config['dns_db'])) server_addresses = [s.strip() for s in config['mail']['smtp_server_addresses'].split(',') if len(s.strip())>0]
# Subdomains da escludere smtp_fmt = ','.join(['%s'] * len(server_addresses))
ex_subdomains = tuple([s.strip() for s in config['main']['special_subdomains'].split(',') if len(s.strip())>0]) smtp_query = smtp_list_stmt.format(smtp_fmt)
domains_dict = get_domain_list(config, ot_conn, dns_conn) alias_list = get_alias_list(config, dns_conn, smtp_query, server_addresses)
logging.info('vhost {}, domains_list {}'.format(vhost_name, alias_list))
if acme_request(config, vhost_name, acme_test='HTTP-01', webroot=config['mail']['smtp_webroot'].strip(),
dryrun=dryrun, domains_list=alias_list):
# non e' richiesto il link, punto direttamente le configurazioni alle dir di letsencrypt
# link_cert(config, vhost_name, vhost_name, dryrun=dryrun)
service_reload['smtp'] = True
pass
else:
logger.error('Error asking certificate for {}'.format(vhost_name))
for domain_name, domain_feat in domains_dict.items(): # Caso speciale per l'hosting
domain_feat['subdomains']=get_subdomain_list(config, domain_name, ot_conn, ex_subdomains=ex_subdomains) if args.hosting:
# Controlla se i nameserver sono gestiti da noi logging.info('Asking certificates for hosted web domains')
if domain_feat['managed_ns']: # Subdomains da escludere
# Nel caso il nameserver sia gestito, chiedi certificati per il dominio e la wildcard ex_subdomains = tuple([s.strip() for s in config['main']['special_subdomains'].split(',') if len(s.strip())>0])
logger.info('Get certificates for {}, *.{}'.format(domain_name, domain_name)) domains_dict = get_domain_list(config, ot_conn, dns_conn)
if acme_request(config, domain_name, acme_test='DNS-01', dryrun=dryrun):
link_cert(config, domain_name, domain_name, dryrun=dryrun)
# Crea il link per ogni subdomain
for subdomain in domain_feat['subdomains']:
link_cert(config, domain_name, subdomain, dryrun=dryrun)
else: for domain_name, domain_feat in domains_dict.items():
# Nel caso i nameserver NON siano gestiti, allora chiedi un certificato per ogni sottodominio domain_feat['subdomains']=get_subdomain_list(config, domain_name, ot_conn, ex_subdomains=ex_subdomains)
# Controlla se i nameserver sono gestiti da noi
if domain_feat['managed_ns']:
# Nel caso il nameserver sia gestito, chiedi certificati per il dominio e la wildcard
logger.info('Get certificates for {}, *.{}'.format(domain_name, domain_name))
if acme_request(config, domain_name, acme_test='DNS-01', dryrun=dryrun):
link_cert(config, domain_name, domain_name, dryrun=dryrun)
# Crea il link per ogni subdomain # Crea il link per ogni subdomain
for subdomain in domain_feat['subdomains']: for subdomain in domain_feat['subdomains']:
logger.info('Get certificates for {}'.format(subdomain)) link_cert(config, domain_name, subdomain, dryrun=dryrun)
if acme_request(config, subdomain, acme_test='HTTP-01', dryrun=dryrun): service_reload['hosting'] = True
link_cert(config, subdomain, subdomain, dryrun=dryrun)
ot_conn.close()
dns_conn.close()
# reload apache
logger.info("Reloading apache")
# ret = subprocess.run("systemctl reload apache2")
ret = os.system("systemctl reload apache2")
logger.info(ret)
# Caso speciale per l'interfaccia di mailman
if args.liste:
logging.info('Asking certificates for liste.indivia.net')
vhost_name = config['mailman']['vhost'].strip()
liste_list = ["liste.{}".format(d.strip()) for d in config['mailman']['domains'].split(',') if len(d.strip())>0]
if acme_request(config, vhost_name, acme_test='HTTP-01', dryrun=dryrun, domains_list=liste_list):
link_cert(config, vhost_name, vhost_name, dryrun=dryrun)
else: else:
logger.error('Error asking certificate for {}'.format(vhost_name)) # Nel caso i nameserver NON siano gestiti, allora chiedi un certificato per ogni sottodominio
# Crea il link per ogni subdomain
# reload apache for subdomain in domain_feat['subdomains']:
logger.info("Reloading apache") logger.info('Get certificates for {}'.format(subdomain))
# ret = subprocess.run("systemctl reload apache2") if acme_request(config, subdomain, acme_test='HTTP-01', dryrun=dryrun):
ret = os.system("systemctl reload apache2") link_cert(config, subdomain, subdomain, dryrun=dryrun)
logger.info(ret) service_reload['hosting'] = True
ot_conn.close()
dns_conn.close()
# Genero il certificato per l'interfaccia di mailman
# Caso speciale per il server POP/IMAP if args.liste:
if args.mbox: logging.info('Asking certificates for liste.indivia.net')
dns_conn=connect_db(dict(config['dns_db'])) vhost_name = config['mailman']['vhost'].strip()
logging.info('Asking certificates for POP/IMAP server') liste_list = ["liste.{}".format(d.strip()) for d in config['mailman']['domains'].split(',') if len(d.strip())>0]
vhost_name = config['mail']['mbox_vhost'].strip() if acme_request(config, vhost_name, acme_test='HTTP-01', dryrun=dryrun, domains_list=liste_list):
server_addresses = [s.strip() for s in config['mail']['mbox_server_addresses'].split(',') if len(s.strip())>0] link_cert(config, vhost_name, vhost_name, dryrun=dryrun)
mbox_fmt = ','.join(['%s'] * len(server_addresses)) service_reload['liste'] = True
mbox_query = mbox_list_stmt.format(mbox_fmt) else:
alias_list = get_alias_list(config, dns_conn, mbox_query, server_addresses) logger.error('Error asking certificate for {}'.format(vhost_name))
# Per usi futuri, aggiungo l'alias 'mail.indivia.net'
alias_list.append('mail.indivia.net')
logging.info('vhost {}, domains_list {}'.format(vhost_name, alias_list))
if acme_request(config, vhost_name, acme_test='HTTP-01', webroot=config['mail']['mbox_webroot'].strip(),
dryrun=dryrun, domains_list=alias_list):
# non e' richiesto il link, punto direttamente le configurazioni alle dir di letsencrypt
# link_cert(config, vhost_name, vhost_name, dryrun=dryrun)
service_reload['mbox'] = True
pass
else:
logger.error('Error asking certificate for {}'.format(vhost_name))
dns_conn.close()
# restart dovecot
logger.info("Restarting dovecot")
# ret = subprocess.run("systemctl restart dovecot")
ret = os.system("systemctl restart dovecot")
logger.info(ret)
# Caso speciale per il server SMTP if set(['webmail','hosting','liste']) & set(service_reload.keys()):
if args.smtp: # reload apache
logging.info('Asking certificates for SMTP server') logger.info("Restarting apache")
dns_conn=connect_db(dict(config['dns_db'])) # ret = subprocess.run("systemctl reload apache2")
vhost_name = config['mail']['smtp_vhost'].strip() ret = os.system("systemctl reload apache2")
server_addresses = [s.strip() for s in config['mail']['smtp_server_addresses'].split(',') if len(s.strip())>0] logger.info(ret)
smtp_fmt = ','.join(['%s'] * len(server_addresses)) if set(['smtp',]) & set(service_reload.keys()):
smtp_query = smtp_list_stmt.format(smtp_fmt) # reload postfix
alias_list = get_alias_list(config, dns_conn, smtp_query, server_addresses) logger.info("Restarting postfix")
logging.info('vhost {}, domains_list {}'.format(vhost_name, alias_list)) # ret = subprocess.run("systemctl reload postfix")
if acme_request(config, vhost_name, acme_test='HTTP-01', webroot=config['mail']['smtp_webroot'].strip(), ret = os.system("systemctl reload postfix")
dryrun=dryrun, domains_list=alias_list): logger.info(ret)
# non e' richiesto il link, punto direttamente le configurazioni alle dir di letsencrypt if set(['mbox',]) & set(service_reload.keys()):
# link_cert(config, vhost_name, vhost_name, dryrun=dryrun) # restart dovecot
service_reload['smtp'] = True logger.info("Restarting dovecot")
pass # ret = subprocess.run("systemctl restart dovecot")
else: ret = os.system("systemctl restart dovecot")
logger.error('Error asking certificate for {}'.format(vhost_name)) logger.info(ret)
dns_conn.close()
# reload postfix
logger.info("Restarting postfix")
# ret = subprocess.run("systemctl reload postfix")
ret = os.system("systemctl reload postfix")
logger.info(ret)