YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Apply easy fixes from code review

Browse source 
Co-authored-by: ljf (zamentur) <zamentur@users.noreply.github.com>
This commit is contained in:
Corentin Mercier 2021-05-25 13:46:09 +02:00 • committed by GitHub
parent 914bd1f20a
commit e40f8fb861
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
data/actionsmap/yunohost.yml
View file

@ -450,7 +450,7 @@ domain:
### domain_push_config() ### domain_push_config()
push_config: push_config:
action_help: Push DNS records to registrar action_help: Push DNS records to registrar
api: GET /domains/push api: GET /domains/<domain>/push
arguments: arguments:
domain: domain:
help: Domain name to add help: Domain name to add
@ -568,11 +568,13 @@ domain:
help: The path to check (e.g. /coffee) help: The path to check (e.g. /coffee)
### domain_setting() ### domain_setting()
setting: setting:
action_help: Set or get an app setting value action_help: Set or get a domain setting value
api: GET /domains/<domain>/settings api: GET /domains/<domain>/settings
arguments: arguments:
domain: domain:
help: Domain name help: Domain name
extra:
pattern: *pattern_domain
key: key:
help: Key to get/set help: Key to get/set
-v: -v:
@ -589,23 +591,38 @@ domain:
### domain_registrar_set() ### domain_registrar_set()
set: set:
action_help: Set domain registrar action_help: Set domain registrar
api: POST /domains/registrar api: POST /domains/<domain>/registrar
arguments: arguments:
domain: domain:
help: Domain name help: Domain name
extra:
pattern: *pattern_domain
registrar: registrar:
help: registrar_key, see yunohost domain registrar list help: registrar_key, see yunohost domain registrar list
-a: -a:
full: --args full: --args
help: Serialized arguments for app script (i.e. "domain=domain.tld&path=/path") help: Serialized arguments for registrar API (i.e. "auth_token=TOKEN&auth_username=USER").
### domain_registrar_set() ### domain_registrar_set()
get: get:
action_help: Get domain registrar action_help: Get domain registrar
api: GET /domains/registrar api: GET /domains/<domain>/registrar
arguments:
domain:
help: Domain name
extra:
pattern: *pattern_domain
### domain_registrar_list() ### domain_registrar_list()
list: list:
action_help: List available registrars action_help: List registrars configured by DNS zone
api: GET /domains/registrar/list api: GET /domains/registrars
catalog:
action_help: List supported registrars API
api: GET /domains/registrars/catalog
arguments:
-f:
full: --full
help: Display all details, including info to create forms
action: store_true
############################# #############################
# App # # App #

28
src/yunohost/domain.py
View file

@ -131,7 +131,7 @@ def domain_add(operation_logger, domain, dyndns=False):
# Do not allow to subscribe to multiple dyndns domains... # Do not allow to subscribe to multiple dyndns domains...
if _guess_current_dyndns_domain("dyndns.yunohost.org") != (None, None): if _guess_current_dyndns_domain("dyndns.yunohost.org") != (None, None):
raise YunohostValidationError('domain_dyndns_already_subscribed') raise YunohostValidationError("domain_dyndns_already_subscribed")
# Check that this domain can effectively be provided by # Check that this domain can effectively be provided by
# dyndns.yunohost.org. (i.e. is it a nohost.me / noho.st) # dyndns.yunohost.org. (i.e. is it a nohost.me / noho.st)
@ -208,8 +208,8 @@ def domain_remove(operation_logger, domain, remove_apps=False, force=False):
# the 'force' here is related to the exception happening in domain_add ... # the 'force' here is related to the exception happening in domain_add ...
# we don't want to check the domain exists because the ldap add may have # we don't want to check the domain exists because the ldap add may have
# failed # failed
if not force and domain not in domain_list()['domains']: if not force and domain not in domain_list()["domains"]:
raise YunohostValidationError('domain_name_unknown', domain=domain) raise YunohostValidationError("domain_name_unknown", domain=domain)
# Check domain is not the main domain # Check domain is not the main domain
if domain == _get_maindomain(): if domain == _get_maindomain():
@ -223,7 +223,9 @@ def domain_remove(operation_logger, domain, remove_apps=False, force=False):
other_domains="\n * " + ("\n * ".join(other_domains)), other_domains="\n * " + ("\n * ".join(other_domains)),
) )
else: else:
raise YunohostValidationError("domain_cannot_remove_main_add_new_one", domain=domain) raise YunohostValidationError(
"domain_cannot_remove_main_add_new_one", domain=domain
)
# Check if apps are installed on the domain # Check if apps are installed on the domain
apps_on_that_domain = [] apps_on_that_domain = []
@ -515,12 +517,12 @@ def _build_dns_conf(domains):
] ]
# DKIM/DMARC record # DKIM/DMARC record
dkim_host, dkim_publickey = _get_DKIM(domain) dkim_host, dkim_publickey = _get_DKIM(domain_name)
if dkim_host: if dkim_host:
mail += [ mail += [
[dkim_host, ttl, "TXT", dkim_publickey], [dkim_host, ttl, "TXT", dkim_publickey],
["_dmarc", ttl, "TXT", '"v=DMARC1; p=none"'], [f"_dmarc{child_domain_suffix}", ttl, "TXT", '"v=DMARC1; p=none"'],
] ]
######## ########
@ -528,8 +530,8 @@ def _build_dns_conf(domains):
######## ########
if domain["xmpp"]: if domain["xmpp"]:
xmpp += [ xmpp += [
["_xmpp-client._tcp", ttl, "SRV", "0 5 5222 %s." % domain_name], [f"_xmpp-client._tcp{child_domain_suffix}", ttl, "SRV", f"0 5 5222 {domain_name}."],
["_xmpp-server._tcp", ttl, "SRV", "0 5 5269 %s." % domain_name], [f"_xmpp-server._tcp{child_domain_suffix}", ttl, "SRV", f"0 5 5269 {domain_name}."],
["muc" + child_domain_suffix, ttl, "CNAME", name], ["muc" + child_domain_suffix, ttl, "CNAME", name],
["pubsub" + child_domain_suffix, ttl, "CNAME", name], ["pubsub" + child_domain_suffix, ttl, "CNAME", name],
["vjud" + child_domain_suffix, ttl, "CNAME", name], ["vjud" + child_domain_suffix, ttl, "CNAME", name],
@ -542,10 +544,10 @@ def _build_dns_conf(domains):
if ipv4: if ipv4:
extra.append(["*", ttl, "A", ipv4]) extra.append([f"*{child_domain_suffix}", ttl, "A", ipv4])
if ipv6: if ipv6:
extra.append(["*", ttl, "AAAA", ipv6]) extra.append([f"*{child_domain_suffix}", ttl, "AAAA", ipv6])
# TODO # TODO
# elif include_empty_AAAA_if_no_ipv6: # elif include_empty_AAAA_if_no_ipv6:
# extra.append(["*", ttl, "AAAA", None]) # extra.append(["*", ttl, "AAAA", None])
@ -727,7 +729,7 @@ def _load_domain_settings():
new_domains[domain] = {} new_domains[domain] = {}
# new_domains[domain] = { "main": is_maindomain } # new_domains[domain] = { "main": is_maindomain }
# Set other values (default value if missing) # Set other values (default value if missing)
for setting, default in [ ("xmpp", is_maindomain), ("mail", is_maindomain), ("owned_dns_zone", default_owned_dns_zone), ("ttl", 3600), ("provider", False)]: for setting, default in [ ("xmpp", is_maindomain), ("mail", True), ("owned_dns_zone", default_owned_dns_zone), ("ttl", 3600), ("provider", False)]:
if domain_in_old_domains and setting in old_domains[domain].keys(): if domain_in_old_domains and setting in old_domains[domain].keys():
new_domains[domain][setting] = old_domains[domain][setting] new_domains[domain][setting] = old_domains[domain][setting]
else: else:
@ -773,7 +775,7 @@ def domain_setting(domain, key, value=None, delete=False):
if "ttl" == key: if "ttl" == key:
try: try:
ttl = int(value) ttl = int(value)
except: except ValueError:
# TODO add locales # TODO add locales
raise YunohostError("bad_value_type", value_type=type(ttl)) raise YunohostError("bad_value_type", value_type=type(ttl))
@ -934,7 +936,7 @@ def domain_push_config(domain):
for key in types: for key in types:
for distant_record in distant_records[key]: for distant_record in distant_records[key]:
print('distant_record:', distant_record); logger.debug(f"distant_record: {distant_record}");
for local_record in flatten_dns_conf: for local_record in flatten_dns_conf:
print('local_record:', local_record); print('local_record:', local_record);