mirror of
https://github.com/YunoHost/yunohost.git
synced 2024-09-03 20:06:10 +02:00
[mod] autopep8 on all files that aren't concerned by a PR
This commit is contained in:
Laurent Peuch
parent
a94733c1f9
commit
aad3740933
10 changed files with 181 additions and 154 deletions
|
|
@ -313,8 +313,6 @@ def backup_create(name=None, description=None, output_directory=None,
|
|||
link = "%s/%s.tar.gz" % (archives_path, name)
|
||||
os.symlink(archive_file, link)
|
||||
|
||||
|
||||
|
||||
# Clean temporary directory
|
||||
if tmp_dir != output_directory:
|
||||
_clean_tmp_dir()
|
||||
|
|
@ -323,7 +321,7 @@ def backup_create(name=None, description=None, output_directory=None,
|
|||
|
||||
# Return backup info
|
||||
info['name'] = name
|
||||
return { 'archive': info }
|
||||
return {'archive': info}
|
||||
|
||||
|
||||
def backup_restore(auth, name, hooks=[], ignore_hooks=False,
|
||||
|
|
@ -601,7 +599,7 @@ def backup_list(with_info=False, human_readable=False):
|
|||
d[a] = backup_info(a, human_readable=human_readable)
|
||||
result = d
|
||||
|
||||
return { 'archives': result }
|
||||
return {'archives': result}
|
||||
|
||||
|
||||
def backup_info(name, with_details=False, human_readable=False):
|
||||
|
|
@ -645,7 +643,7 @@ def backup_info(name, with_details=False, human_readable=False):
|
|||
size = info.get('size', 0)
|
||||
if not size:
|
||||
tar = tarfile.open(archive_file, "r:gz")
|
||||
size = reduce(lambda x,y: getattr(x, 'size', x)+getattr(y, 'size', y),
|
||||
size = reduce(lambda x, y: getattr(x, 'size', x) + getattr(y, 'size', y),
|
||||
tar.getmembers())
|
||||
tar.close()
|
||||
if human_readable:
|
||||
|
|
@ -678,7 +676,7 @@ def backup_delete(name):
|
|||
archive_file = '%s/%s.tar.gz' % (archives_path, name)
|
||||
|
||||
info_file = "%s/%s.info.json" % (archives_path, name)
|
||||
for backup_file in [archive_file,info_file]:
|
||||
for backup_file in [archive_file, info_file]:
|
||||
if not os.path.isfile(backup_file):
|
||||
raise MoulinetteError(errno.EIO,
|
||||
m18n.n('backup_archive_name_unknown', name=backup_file))
|
||||
|
|
|
|||
|
|
@ -66,10 +66,10 @@ def domain_list(auth, filter=None, limit=None, offset=None):
|
|||
result = auth.search('ou=domains,dc=yunohost,dc=org', filter, ['virtualdomain'])
|
||||
|
||||
if len(result) > offset and limit > 0:
|
||||
for domain in result[offset:offset+limit]:
|
||||
for domain in result[offset:offset + limit]:
|
||||
result_list.append(domain['virtualdomain'][0])
|
||||
|
||||
return { 'domains': result_list }
|
||||
return {'domains': result_list}
|
||||
|
||||
|
||||
def domain_add(auth, domain, dyndns=False):
|
||||
|
|
@ -83,7 +83,7 @@ def domain_add(auth, domain, dyndns=False):
|
|||
"""
|
||||
from yunohost.hook import hook_callback
|
||||
|
||||
attr_dict = { 'objectClass' : ['mailDomain', 'top'] }
|
||||
attr_dict = {'objectClass': ['mailDomain', 'top']}
|
||||
|
||||
now = datetime.datetime.now()
|
||||
timestamp = str(now.year) + str(now.month) + str(now.day)
|
||||
|
|
@ -113,7 +113,6 @@ def domain_add(auth, domain, dyndns=False):
|
|||
raise MoulinetteError(errno.EINVAL,
|
||||
m18n.n('domain_dyndns_root_unknown'))
|
||||
|
||||
|
||||
try:
|
||||
yunohost.certificate._certificate_install_selfsigned([domain], False)
|
||||
|
||||
|
|
@ -122,7 +121,6 @@ def domain_add(auth, domain, dyndns=False):
|
|||
except MoulinetteError:
|
||||
raise MoulinetteError(errno.EEXIST, m18n.n('domain_exists'))
|
||||
|
||||
|
||||
attr_dict['virtualdomain'] = domain
|
||||
|
||||
if not auth.add('virtualdomain=%s,ou=domains' % domain, attr_dict):
|
||||
|
|
@ -133,11 +131,14 @@ def domain_add(auth, domain, dyndns=False):
|
|||
service_regen_conf(names=[
|
||||
'nginx', 'metronome', 'dnsmasq', 'rmilter'])
|
||||
os.system('yunohost app ssowatconf > /dev/null 2>&1')
|
||||
except IOError: pass
|
||||
except IOError:
|
||||
pass
|
||||
except:
|
||||
# Force domain removal silently
|
||||
try: domain_remove(auth, domain, True)
|
||||
except: pass
|
||||
try:
|
||||
domain_remove(auth, domain, True)
|
||||
except:
|
||||
pass
|
||||
raise
|
||||
|
||||
hook_callback('post_domain_add', args=[domain])
|
||||
|
|
@ -165,7 +166,7 @@ def domain_remove(auth, domain, force=False):
|
|||
|
||||
# Check if apps are installed on the domain
|
||||
for app in os.listdir('/etc/yunohost/apps/'):
|
||||
with open('/etc/yunohost/apps/' + app +'/settings.yml') as f:
|
||||
with open('/etc/yunohost/apps/' + app + '/settings.yml') as f:
|
||||
try:
|
||||
app_domain = yaml.load(f)['domain']
|
||||
except:
|
||||
|
|
@ -246,7 +247,7 @@ def domain_dns_conf(domain, ttl=None):
|
|||
r'^(?P<host>[a-z_\-\.]+)[\s]+([0-9]+[\s]+)?IN[\s]+TXT[\s]+[^"]*'
|
||||
'(?=.*(;[\s]*|")v=(?P<v>[^";]+))'
|
||||
'(?=.*(;[\s]*|")k=(?P<k>[^";]+))'
|
||||
'(?=.*(;[\s]*|")p=(?P<p>[^";]+))'), dkim_content, re.M|re.S
|
||||
'(?=.*(;[\s]*|")p=(?P<p>[^";]+))'), dkim_content, re.M | re.S
|
||||
)
|
||||
if dkim:
|
||||
result += '\n{host}. {ttl} IN TXT "v={v}; k={k}; p={p}"'.format(
|
||||
|
|
@ -296,6 +297,7 @@ def _get_maindomain():
|
|||
maindomain = f.readline().rstrip()
|
||||
return maindomain
|
||||
|
||||
|
||||
def _set_maindomain(domain):
|
||||
with open('/etc/yunohost/current_host', 'w') as f:
|
||||
f.write(domain)
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@ def dyndns_subscribe(subscribe_host="dyndns.yunohost.org", domain=None, key=None
|
|||
|
||||
logger.info(m18n.n('dyndns_key_generating'))
|
||||
|
||||
os.system('cd /etc/yunohost/dyndns && ' \
|
||||
os.system('cd /etc/yunohost/dyndns && '
|
||||
'dnssec-keygen -a hmac-md5 -b 128 -r /dev/urandom -n USER %s' % domain)
|
||||
os.system('chmod 600 /etc/yunohost/dyndns/*.key /etc/yunohost/dyndns/*.private')
|
||||
|
||||
|
|
@ -104,12 +104,14 @@ def dyndns_subscribe(subscribe_host="dyndns.yunohost.org", domain=None, key=None
|
|||
|
||||
# Send subscription
|
||||
try:
|
||||
r = requests.post('https://%s/key/%s' % (subscribe_host, base64.b64encode(key)), data={ 'subdomain': domain })
|
||||
r = requests.post('https://%s/key/%s' % (subscribe_host, base64.b64encode(key)), data={'subdomain': domain})
|
||||
except requests.ConnectionError:
|
||||
raise MoulinetteError(errno.ENETUNREACH, m18n.n('no_internet_connection'))
|
||||
if r.status_code != 201:
|
||||
try: error = json.loads(r.text)['error']
|
||||
except: error = "Server error"
|
||||
try:
|
||||
error = json.loads(r.text)['error']
|
||||
except:
|
||||
error = "Server error"
|
||||
raise MoulinetteError(errno.EPERM,
|
||||
m18n.n('dyndns_registration_failed', error=error))
|
||||
|
||||
|
|
|
|||
|
|
@ -67,14 +67,14 @@ def firewall_allow(protocol, port, ipv4_only=False, ipv6_only=False,
|
|||
# Validate protocols
|
||||
protocols = ['TCP', 'UDP']
|
||||
if protocol != 'Both' and protocol in protocols:
|
||||
protocols = [protocol,]
|
||||
protocols = [protocol, ]
|
||||
|
||||
# Validate IP versions
|
||||
ipvs = ['ipv4', 'ipv6']
|
||||
if ipv4_only and not ipv6_only:
|
||||
ipvs = ['ipv4',]
|
||||
ipvs = ['ipv4', ]
|
||||
elif ipv6_only and not ipv4_only:
|
||||
ipvs = ['ipv6',]
|
||||
ipvs = ['ipv6', ]
|
||||
|
||||
for p in protocols:
|
||||
# Iterate over IP versions to add port
|
||||
|
|
@ -117,7 +117,7 @@ def firewall_disallow(protocol, port, ipv4_only=False, ipv6_only=False,
|
|||
# Validate protocols
|
||||
protocols = ['TCP', 'UDP']
|
||||
if protocol != 'Both' and protocol in protocols:
|
||||
protocols = [protocol,]
|
||||
protocols = [protocol, ]
|
||||
|
||||
# Validate IP versions and UPnP
|
||||
ipvs = ['ipv4', 'ipv6']
|
||||
|
|
@ -125,10 +125,10 @@ def firewall_disallow(protocol, port, ipv4_only=False, ipv6_only=False,
|
|||
if ipv4_only and ipv6_only:
|
||||
upnp = True # automatically disallow UPnP
|
||||
elif ipv4_only:
|
||||
ipvs = ['ipv4',]
|
||||
ipvs = ['ipv4', ]
|
||||
upnp = upnp_only
|
||||
elif ipv6_only:
|
||||
ipvs = ['ipv6',]
|
||||
ipvs = ['ipv6', ]
|
||||
upnp = upnp_only
|
||||
elif upnp_only:
|
||||
ipvs = []
|
||||
|
|
@ -178,7 +178,7 @@ def firewall_list(raw=False, by_ip_version=False, list_forwarded=False):
|
|||
ports = sorted(set(ports['ipv4']) | set(ports['ipv6']))
|
||||
|
||||
# Format returned dict
|
||||
ret = { "opened_ports": ports }
|
||||
ret = {"opened_ports": ports}
|
||||
if list_forwarded:
|
||||
# Combine TCP and UDP forwarded ports
|
||||
ret['forwarded_ports'] = sorted(
|
||||
|
|
@ -224,7 +224,7 @@ def firewall_reload(skip_upnp=False):
|
|||
# Iterate over ports and add rule
|
||||
for protocol in ['TCP', 'UDP']:
|
||||
for port in firewall['ipv4'][protocol]:
|
||||
rules.append("iptables -w -A INPUT -p %s --dport %s -j ACCEPT" \
|
||||
rules.append("iptables -w -A INPUT -p %s --dport %s -j ACCEPT"
|
||||
% (protocol, process.quote(str(port))))
|
||||
rules += [
|
||||
"iptables -w -A INPUT -i lo -j ACCEPT",
|
||||
|
|
@ -253,7 +253,7 @@ def firewall_reload(skip_upnp=False):
|
|||
# Iterate over ports and add rule
|
||||
for protocol in ['TCP', 'UDP']:
|
||||
for port in firewall['ipv6'][protocol]:
|
||||
rules.append("ip6tables -w -A INPUT -p %s --dport %s -j ACCEPT" \
|
||||
rules.append("ip6tables -w -A INPUT -p %s --dport %s -j ACCEPT"
|
||||
% (protocol, process.quote(str(port))))
|
||||
rules += [
|
||||
"ip6tables -w -A INPUT -i lo -j ACCEPT",
|
||||
|
|
@ -308,13 +308,14 @@ def firewall_upnp(action='status', no_refresh=False):
|
|||
try:
|
||||
# Remove old cron job
|
||||
os.remove('/etc/cron.d/yunohost-firewall')
|
||||
except: pass
|
||||
except:
|
||||
pass
|
||||
action = 'status'
|
||||
no_refresh = False
|
||||
|
||||
if action == 'status' and no_refresh:
|
||||
# Only return current state
|
||||
return { 'enabled': enabled }
|
||||
return {'enabled': enabled}
|
||||
elif action == 'enable' or (enabled and action == 'status'):
|
||||
# Add cron job
|
||||
with open(upnp_cron_job, 'w+') as f:
|
||||
|
|
@ -330,7 +331,8 @@ def firewall_upnp(action='status', no_refresh=False):
|
|||
try:
|
||||
# Remove cron job
|
||||
os.remove(upnp_cron_job)
|
||||
except: pass
|
||||
except:
|
||||
pass
|
||||
enabled = False
|
||||
if action == 'status':
|
||||
no_refresh = True
|
||||
|
|
@ -364,7 +366,8 @@ def firewall_upnp(action='status', no_refresh=False):
|
|||
if upnpc.getspecificportmapping(port, protocol):
|
||||
try:
|
||||
upnpc.deleteportmapping(port, protocol)
|
||||
except: pass
|
||||
except:
|
||||
pass
|
||||
if not enabled:
|
||||
continue
|
||||
try:
|
||||
|
|
@ -403,7 +406,7 @@ def firewall_upnp(action='status', no_refresh=False):
|
|||
|
||||
if action == 'enable' and not enabled:
|
||||
raise MoulinetteError(errno.ENXIO, m18n.n('upnp_port_open_failed'))
|
||||
return { 'enabled': enabled }
|
||||
return {'enabled': enabled}
|
||||
|
||||
|
||||
def firewall_stop():
|
||||
|
|
@ -444,12 +447,14 @@ def _get_ssh_port(default=22):
|
|||
pass
|
||||
return default
|
||||
|
||||
|
||||
def _update_firewall_file(rules):
|
||||
"""Make a backup and write new rules to firewall file"""
|
||||
os.system("cp {0} {0}.old".format(firewall_file))
|
||||
with open(firewall_file, 'w') as f:
|
||||
yaml.safe_dump(rules, f, default_flow_style=False)
|
||||
|
||||
|
||||
def _on_rule_command_error(returncode, cmd, output):
|
||||
"""Callback for rules commands error"""
|
||||
# Log error and continue commands execution
|
||||
|
|
|
|||
|
|
@ -87,13 +87,13 @@ def monitor_disk(units=None, mountpoint=None, human_readable=False):
|
|||
# Retrieve monitoring for unit(s)
|
||||
for u in units:
|
||||
if u == 'io':
|
||||
## Define setter
|
||||
# Define setter
|
||||
if len(units) > 1:
|
||||
def _set(dn, dvalue):
|
||||
try:
|
||||
result[dn][u] = dvalue
|
||||
except KeyError:
|
||||
result[dn] = { u: dvalue }
|
||||
result[dn] = {u: dvalue}
|
||||
else:
|
||||
def _set(dn, dvalue):
|
||||
result[dn] = dvalue
|
||||
|
|
@ -111,13 +111,13 @@ def monitor_disk(units=None, mountpoint=None, human_readable=False):
|
|||
for dname in devices_names:
|
||||
_set(dname, 'not-available')
|
||||
elif u == 'filesystem':
|
||||
## Define setter
|
||||
# Define setter
|
||||
if len(units) > 1:
|
||||
def _set(dn, dvalue):
|
||||
try:
|
||||
result[dn][u] = dvalue
|
||||
except KeyError:
|
||||
result[dn] = { u: dvalue }
|
||||
result[dn] = {u: dvalue}
|
||||
else:
|
||||
def _set(dn, dvalue):
|
||||
result[dn] = dvalue
|
||||
|
|
@ -183,11 +183,11 @@ def monitor_network(units=None, human_readable=False):
|
|||
smtp_check = m18n.n('network_check_smtp_ko')
|
||||
|
||||
try:
|
||||
answers = dns.resolver.query(domain,'MX')
|
||||
answers = dns.resolver.query(domain, 'MX')
|
||||
mx_check = {}
|
||||
i = 0
|
||||
for server in answers:
|
||||
mx_id = 'mx%s' %i
|
||||
mx_id = 'mx%s' % i
|
||||
mx_check[mx_id] = server
|
||||
i = i + 1
|
||||
except:
|
||||
|
|
@ -307,7 +307,7 @@ def monitor_update_stats(period):
|
|||
|
||||
stats = _retrieve_stats(period)
|
||||
if not stats:
|
||||
stats = { 'disk': {}, 'network': {}, 'system': {}, 'timestamp': [] }
|
||||
stats = {'disk': {}, 'network': {}, 'system': {}, 'timestamp': []}
|
||||
|
||||
monitor = None
|
||||
# Get monitoring stats
|
||||
|
|
@ -357,7 +357,7 @@ def monitor_update_stats(period):
|
|||
if 'usage' in stats['network'] and iname in stats['network']['usage']:
|
||||
curr = stats['network']['usage'][iname]
|
||||
net_usage[iname] = _append_to_stats(curr, values, 'time_since_update')
|
||||
stats['network'] = { 'usage': net_usage, 'infos': monitor['network']['infos'] }
|
||||
stats['network'] = {'usage': net_usage, 'infos': monitor['network']['infos']}
|
||||
|
||||
# Append system stats
|
||||
for unit, values in monitor['system'].items():
|
||||
|
|
@ -530,7 +530,7 @@ def binary_to_human(n, customary=False):
|
|||
symbols = ('K', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y')
|
||||
prefix = {}
|
||||
for i, s in enumerate(symbols):
|
||||
prefix[s] = 1 << (i+1)*10
|
||||
prefix[s] = 1 << (i + 1) * 10
|
||||
for s in reversed(symbols):
|
||||
if n >= prefix[s]:
|
||||
value = float(n) / prefix[s]
|
||||
|
|
@ -590,7 +590,7 @@ def _save_stats(stats, period, date=None):
|
|||
# Limit stats
|
||||
if date is None:
|
||||
t = stats['timestamp']
|
||||
limit = { 'day': 86400, 'week': 604800, 'month': 2419200 }
|
||||
limit = {'day': 86400, 'week': 604800, 'month': 2419200}
|
||||
if (t[len(t) - 1] - t[0]) > limit[period]:
|
||||
begin = t[len(t) - 1] - limit[period]
|
||||
stats = _filter_stats(stats, begin)
|
||||
|
|
@ -612,7 +612,7 @@ def _monitor_all(period=None, since=None):
|
|||
since -- Timestamp of the stats beginning
|
||||
|
||||
"""
|
||||
result = { 'disk': {}, 'network': {}, 'system': {} }
|
||||
result = {'disk': {}, 'network': {}, 'system': {}}
|
||||
|
||||
# Real-time stats
|
||||
if period == 'day' and since is None:
|
||||
|
|
@ -697,7 +697,7 @@ def _calculate_stats_mean(stats):
|
|||
s[k] = _mean(v, t, ts)
|
||||
elif isinstance(v, list):
|
||||
try:
|
||||
nums = [ float(x * t[i]) for i, x in enumerate(v) ]
|
||||
nums = [float(x * t[i]) for i, x in enumerate(v)]
|
||||
except:
|
||||
pass
|
||||
else:
|
||||
|
|
|
|||
|
|
@ -60,9 +60,9 @@ def service_add(name, status=None, log=None, runlevel=None):
|
|||
services = _get_services()
|
||||
|
||||
if not status:
|
||||
services[name] = { 'status': 'service' }
|
||||
services[name] = {'status': 'service'}
|
||||
else:
|
||||
services[name] = { 'status': status }
|
||||
services[name] = {'status': status}
|
||||
|
||||
if log is not None:
|
||||
services[name]['log'] = log
|
||||
|
|
@ -211,7 +211,7 @@ def service_status(names=[]):
|
|||
if 'runlevel' in services[name].keys():
|
||||
runlevel = int(services[name]['runlevel'])
|
||||
|
||||
result[name] = { 'status': 'unknown', 'loaded': 'unknown' }
|
||||
result[name] = {'status': 'unknown', 'loaded': 'unknown'}
|
||||
|
||||
# Retrieve service status
|
||||
try:
|
||||
|
|
@ -261,7 +261,7 @@ def service_log(name, number=50):
|
|||
|
||||
for log_path in log_list:
|
||||
if os.path.isdir(log_path):
|
||||
for log in [ f for f in os.listdir(log_path) if os.path.isfile(os.path.join(log_path, f)) and f[-4:] == '.log' ]:
|
||||
for log in [f for f in os.listdir(log_path) if os.path.isfile(os.path.join(log_path, f)) and f[-4:] == '.log']:
|
||||
result[os.path.join(log_path, log)] = _tail(os.path.join(log_path, log), int(number))
|
||||
else:
|
||||
result[log_path] = _tail(log_path, int(number))
|
||||
|
|
@ -314,13 +314,14 @@ def service_regen_conf(names=[], with_diff=False, force=False, dry_run=False,
|
|||
common_args = [1 if force else 0, 1 if dry_run else 0]
|
||||
|
||||
# Execute hooks for pre-regen
|
||||
pre_args = ['pre',] + common_args
|
||||
pre_args = ['pre', ] + common_args
|
||||
|
||||
def _pre_call(name, priority, path, args):
|
||||
# create the pending conf directory for the service
|
||||
service_pending_path = os.path.join(pending_conf_dir, name)
|
||||
filesystem.mkdir(service_pending_path, 0755, True, uid='admin')
|
||||
# return the arguments to pass to the script
|
||||
return pre_args + [service_pending_path,]
|
||||
return pre_args + [service_pending_path, ]
|
||||
pre_result = hook_callback('conf_regen', names, pre_callback=_pre_call)
|
||||
|
||||
# Update the services name
|
||||
|
|
@ -336,7 +337,7 @@ def service_regen_conf(names=[], with_diff=False, force=False, dry_run=False,
|
|||
# Iterate over services and process pending conf
|
||||
for service, conf_files in _get_pending_conf(names).items():
|
||||
logger.info(m18n.n(
|
||||
'service_regenconf_pending_applying' if not dry_run else \
|
||||
'service_regenconf_pending_applying' if not dry_run else
|
||||
'service_regenconf_dry_pending_applying',
|
||||
service=service))
|
||||
|
||||
|
|
@ -444,7 +445,7 @@ def service_regen_conf(names=[], with_diff=False, force=False, dry_run=False,
|
|||
continue
|
||||
elif not failed_regen:
|
||||
logger.success(m18n.n(
|
||||
'service_conf_updated' if not dry_run else \
|
||||
'service_conf_updated' if not dry_run else
|
||||
'service_conf_would_be_updated',
|
||||
service=service))
|
||||
if succeed_regen and not dry_run:
|
||||
|
|
@ -461,14 +462,15 @@ def service_regen_conf(names=[], with_diff=False, force=False, dry_run=False,
|
|||
return result
|
||||
|
||||
# Execute hooks for post-regen
|
||||
post_args = ['post',] + common_args
|
||||
post_args = ['post', ] + common_args
|
||||
|
||||
def _pre_call(name, priority, path, args):
|
||||
# append coma-separated applied changes for the service
|
||||
if name in result and result[name]['applied']:
|
||||
regen_conf_files = ','.join(result[name]['applied'].keys())
|
||||
else:
|
||||
regen_conf_files = ''
|
||||
return post_args + [regen_conf_files,]
|
||||
return post_args + [regen_conf_files, ]
|
||||
hook_callback('conf_regen', names, pre_callback=_pre_call)
|
||||
|
||||
return result
|
||||
|
|
@ -556,7 +558,8 @@ def _tail(file, n, offset=None):
|
|||
return lines[-to_read:offset and -offset or None]
|
||||
avg_line_length *= 1.3
|
||||
|
||||
except IOError: return []
|
||||
except IOError:
|
||||
return []
|
||||
|
||||
|
||||
def _get_files_diff(orig_file, new_file, as_string=False, skip_header=True):
|
||||
|
|
|
|||
|
|
@ -50,12 +50,12 @@ def user_list(auth, fields=None, filter=None, limit=None, offset=None):
|
|||
fields -- fields to fetch
|
||||
|
||||
"""
|
||||
user_attrs = { 'uid': 'username',
|
||||
user_attrs = {'uid': 'username',
|
||||
'cn': 'fullname',
|
||||
'mail': 'mail',
|
||||
'maildrop': 'mail-forward',
|
||||
'mailuserquota': 'mailbox-quota' }
|
||||
attrs = [ 'uid' ]
|
||||
'mailuserquota': 'mailbox-quota'}
|
||||
attrs = ['uid']
|
||||
users = {}
|
||||
|
||||
# Set default arguments values
|
||||
|
|
@ -74,12 +74,12 @@ def user_list(auth, fields=None, filter=None, limit=None, offset=None):
|
|||
raise MoulinetteError(errno.EINVAL,
|
||||
m18n.n('field_invalid', attr))
|
||||
else:
|
||||
attrs = [ 'uid', 'cn', 'mail', 'mailuserquota' ]
|
||||
attrs = ['uid', 'cn', 'mail', 'mailuserquota']
|
||||
|
||||
result = auth.search('ou=users,dc=yunohost,dc=org', filter, attrs)
|
||||
|
||||
if len(result) > offset and limit > 0:
|
||||
for user in result[offset:offset+limit]:
|
||||
for user in result[offset:offset + limit]:
|
||||
entry = {}
|
||||
for attr, values in user.items():
|
||||
try:
|
||||
|
|
@ -88,7 +88,7 @@ def user_list(auth, fields=None, filter=None, limit=None, offset=None):
|
|||
pass
|
||||
uid = entry[user_attrs['uid']]
|
||||
users[uid] = entry
|
||||
return { 'users' : users }
|
||||
return {'users': users}
|
||||
|
||||
|
||||
def user_create(auth, username, firstname, lastname, mail, password,
|
||||
|
|
@ -112,8 +112,8 @@ def user_create(auth, username, firstname, lastname, mail, password,
|
|||
|
||||
# Validate uniqueness of username and mail in LDAP
|
||||
auth.validate_uniqueness({
|
||||
'uid' : username,
|
||||
'mail' : mail
|
||||
'uid': username,
|
||||
'mail': mail
|
||||
})
|
||||
|
||||
# Validate uniqueness of username in system users
|
||||
|
|
@ -125,10 +125,10 @@ def user_create(auth, username, firstname, lastname, mail, password,
|
|||
raise MoulinetteError(errno.EEXIST, m18n.n('system_username_exists'))
|
||||
|
||||
# Check that the mail domain exists
|
||||
if mail[mail.find('@')+1:] not in domain_list(auth)['domains']:
|
||||
if mail[mail.find('@') + 1:] not in domain_list(auth)['domains']:
|
||||
raise MoulinetteError(errno.EINVAL,
|
||||
m18n.n('mail_domain_unknown',
|
||||
domain=mail[mail.find('@')+1:]))
|
||||
domain=mail[mail.find('@') + 1:]))
|
||||
|
||||
# Get random UID/GID
|
||||
uid_check = gid_check = 0
|
||||
|
|
@ -141,24 +141,24 @@ def user_create(auth, username, firstname, lastname, mail, password,
|
|||
fullname = '%s %s' % (firstname, lastname)
|
||||
rdn = 'uid=%s,ou=users' % username
|
||||
char_set = string.ascii_uppercase + string.digits
|
||||
salt = ''.join(random.sample(char_set,8))
|
||||
salt = ''.join(random.sample(char_set, 8))
|
||||
salt = '$1$' + salt + '$'
|
||||
user_pwd = '{CRYPT}' + crypt.crypt(str(password), salt)
|
||||
attr_dict = {
|
||||
'objectClass' : ['mailAccount', 'inetOrgPerson', 'posixAccount'],
|
||||
'givenName' : firstname,
|
||||
'sn' : lastname,
|
||||
'displayName' : fullname,
|
||||
'cn' : fullname,
|
||||
'uid' : username,
|
||||
'mail' : mail,
|
||||
'maildrop' : username,
|
||||
'mailuserquota' : mailbox_quota,
|
||||
'userPassword' : user_pwd,
|
||||
'gidNumber' : uid,
|
||||
'uidNumber' : uid,
|
||||
'homeDirectory' : '/home/' + username,
|
||||
'loginShell' : '/bin/false'
|
||||
'objectClass': ['mailAccount', 'inetOrgPerson', 'posixAccount'],
|
||||
'givenName': firstname,
|
||||
'sn': lastname,
|
||||
'displayName': fullname,
|
||||
'cn': fullname,
|
||||
'uid': username,
|
||||
'mail': mail,
|
||||
'maildrop': username,
|
||||
'mailuserquota': mailbox_quota,
|
||||
'userPassword': user_pwd,
|
||||
'gidNumber': uid,
|
||||
'uidNumber': uid,
|
||||
'homeDirectory': '/home/' + username,
|
||||
'loginShell': '/bin/false'
|
||||
}
|
||||
|
||||
# If it is the first user, add some aliases
|
||||
|
|
@ -166,12 +166,12 @@ def user_create(auth, username, firstname, lastname, mail, password,
|
|||
with open('/etc/yunohost/current_host') as f:
|
||||
main_domain = f.readline().rstrip()
|
||||
aliases = [
|
||||
'root@'+ main_domain,
|
||||
'admin@'+ main_domain,
|
||||
'webmaster@'+ main_domain,
|
||||
'postmaster@'+ main_domain,
|
||||
'root@' + main_domain,
|
||||
'admin@' + main_domain,
|
||||
'webmaster@' + main_domain,
|
||||
'postmaster@' + main_domain,
|
||||
]
|
||||
attr_dict['mail'] = [ attr_dict['mail'] ] + aliases
|
||||
attr_dict['mail'] = [attr_dict['mail']] + aliases
|
||||
|
||||
# If exists, remove the redirection from the SSO
|
||||
try:
|
||||
|
|
@ -192,7 +192,6 @@ def user_create(auth, username, firstname, lastname, mail, password,
|
|||
raise MoulinetteError(errno.EPERM,
|
||||
m18n.n('ssowat_persistent_conf_write_error', error=e.strerror))
|
||||
|
||||
|
||||
if auth.add(rdn, attr_dict):
|
||||
# Invalidate passwd to take user creation into account
|
||||
subprocess.call(['nscd', '-i', 'passwd'])
|
||||
|
|
@ -200,7 +199,7 @@ def user_create(auth, username, firstname, lastname, mail, password,
|
|||
# Update SFTP user group
|
||||
memberlist = auth.search(filter='cn=sftpusers', attrs=['memberUid'])[0]['memberUid']
|
||||
memberlist.append(username)
|
||||
if auth.update('cn=sftpusers,ou=groups', { 'memberUid': memberlist }):
|
||||
if auth.update('cn=sftpusers,ou=groups', {'memberUid': memberlist}):
|
||||
try:
|
||||
# Attempt to create user home folder
|
||||
subprocess.check_call(
|
||||
|
|
@ -210,12 +209,12 @@ def user_create(auth, username, firstname, lastname, mail, password,
|
|||
logger.warning(m18n.n('user_home_creation_failed'),
|
||||
exc_info=1)
|
||||
app_ssowatconf(auth)
|
||||
#TODO: Send a welcome mail to user
|
||||
# TODO: Send a welcome mail to user
|
||||
logger.success(m18n.n('user_created'))
|
||||
hook_callback('post_user_create',
|
||||
args=[username, mail, password, firstname, lastname])
|
||||
|
||||
return { 'fullname' : fullname, 'username' : username, 'mail' : mail }
|
||||
return {'fullname': fullname, 'username': username, 'mail': mail}
|
||||
|
||||
raise MoulinetteError(169, m18n.n('user_creation_failed'))
|
||||
|
||||
|
|
@ -238,9 +237,11 @@ def user_delete(auth, username, purge=False):
|
|||
|
||||
# Update SFTP user group
|
||||
memberlist = auth.search(filter='cn=sftpusers', attrs=['memberUid'])[0]['memberUid']
|
||||
try: memberlist.remove(username)
|
||||
except: pass
|
||||
if auth.update('cn=sftpusers,ou=groups', { 'memberUid': memberlist }):
|
||||
try:
|
||||
memberlist.remove(username)
|
||||
except:
|
||||
pass
|
||||
if auth.update('cn=sftpusers,ou=groups', {'memberUid': memberlist}):
|
||||
if purge:
|
||||
subprocess.call(['rm', '-rf', '/home/{0}'.format(username)])
|
||||
else:
|
||||
|
|
@ -298,34 +299,34 @@ def user_update(auth, username, firstname=None, lastname=None, mail=None,
|
|||
|
||||
if change_password:
|
||||
char_set = string.ascii_uppercase + string.digits
|
||||
salt = ''.join(random.sample(char_set,8))
|
||||
salt = ''.join(random.sample(char_set, 8))
|
||||
salt = '$1$' + salt + '$'
|
||||
new_attr_dict['userPassword'] = '{CRYPT}' + crypt.crypt(str(change_password), salt)
|
||||
|
||||
if mail:
|
||||
auth.validate_uniqueness({ 'mail': mail })
|
||||
if mail[mail.find('@')+1:] not in domains:
|
||||
auth.validate_uniqueness({'mail': mail})
|
||||
if mail[mail.find('@') + 1:] not in domains:
|
||||
raise MoulinetteError(errno.EINVAL,
|
||||
m18n.n('mail_domain_unknown',
|
||||
domain=mail[mail.find('@')+1:]))
|
||||
domain=mail[mail.find('@') + 1:]))
|
||||
del user['mail'][0]
|
||||
new_attr_dict['mail'] = [mail] + user['mail']
|
||||
|
||||
if add_mailalias:
|
||||
if not isinstance(add_mailalias, list):
|
||||
add_mailalias = [ add_mailalias ]
|
||||
add_mailalias = [add_mailalias]
|
||||
for mail in add_mailalias:
|
||||
auth.validate_uniqueness({ 'mail': mail })
|
||||
if mail[mail.find('@')+1:] not in domains:
|
||||
auth.validate_uniqueness({'mail': mail})
|
||||
if mail[mail.find('@') + 1:] not in domains:
|
||||
raise MoulinetteError(errno.EINVAL,
|
||||
m18n.n('mail_domain_unknown',
|
||||
domain=mail[mail.find('@')+1:]))
|
||||
domain=mail[mail.find('@') + 1:]))
|
||||
user['mail'].append(mail)
|
||||
new_attr_dict['mail'] = user['mail']
|
||||
|
||||
if remove_mailalias:
|
||||
if not isinstance(remove_mailalias, list):
|
||||
remove_mailalias = [ remove_mailalias ]
|
||||
remove_mailalias = [remove_mailalias]
|
||||
for mail in remove_mailalias:
|
||||
if len(user['mail']) > 1 and mail in user['mail'][1:]:
|
||||
user['mail'].remove(mail)
|
||||
|
|
@ -336,7 +337,7 @@ def user_update(auth, username, firstname=None, lastname=None, mail=None,
|
|||
|
||||
if add_mailforward:
|
||||
if not isinstance(add_mailforward, list):
|
||||
add_mailforward = [ add_mailforward ]
|
||||
add_mailforward = [add_mailforward]
|
||||
for mail in add_mailforward:
|
||||
if mail in user['maildrop'][1:]:
|
||||
continue
|
||||
|
|
@ -345,7 +346,7 @@ def user_update(auth, username, firstname=None, lastname=None, mail=None,
|
|||
|
||||
if remove_mailforward:
|
||||
if not isinstance(remove_mailforward, list):
|
||||
remove_mailforward = [ remove_mailforward ]
|
||||
remove_mailforward = [remove_mailforward]
|
||||
for mail in remove_mailforward:
|
||||
if len(user['maildrop']) > 1 and mail in user['maildrop'][1:]:
|
||||
user['maildrop'].remove(mail)
|
||||
|
|
@ -378,9 +379,9 @@ def user_info(auth, username):
|
|||
]
|
||||
|
||||
if len(username.split('@')) is 2:
|
||||
filter = 'mail='+ username
|
||||
filter = 'mail=' + username
|
||||
else:
|
||||
filter = 'uid='+ username
|
||||
filter = 'uid=' + username
|
||||
|
||||
result = auth.search('ou=users,dc=yunohost,dc=org', filter, user_attrs)
|
||||
|
||||
|
|
@ -436,8 +437,8 @@ def user_info(auth, username):
|
|||
storage_use += ' (%s%%)' % percentage
|
||||
|
||||
result_dict['mailbox-quota'] = {
|
||||
'limit' : userquota if is_limited else m18n.n('unlimit'),
|
||||
'use' : storage_use
|
||||
'limit': userquota if is_limited else m18n.n('unlimit'),
|
||||
'use': storage_use
|
||||
}
|
||||
|
||||
if result:
|
||||
|
|
@ -445,8 +446,9 @@ def user_info(auth, username):
|
|||
else:
|
||||
raise MoulinetteError(167, m18n.n('user_info_failed'))
|
||||
|
||||
|
||||
def _convertSize(num, suffix=''):
|
||||
for unit in ['K','M','G','T','P','E','Z']:
|
||||
for unit in ['K', 'M', 'G', 'T', 'P', 'E', 'Z']:
|
||||
if abs(num) < 1024.0:
|
||||
return "%3.1f%s%s" % (num, unit, suffix)
|
||||
num /= 1024.0
|
||||
|
|
|
|||
|
|
@ -424,6 +424,7 @@ def get_installed_version(*pkgnames, **kwargs):
|
|||
return versions[pkgnames[0]]
|
||||
return versions
|
||||
|
||||
|
||||
def meets_version_specifier(pkgname, specifier):
|
||||
"""Check if a package installed version meets specifier"""
|
||||
spec = SpecifierSet(specifier)
|
||||
|
|
|
|||
20
src/yunohost/vendor/acme_tiny/acme_tiny.py
vendored
20
src/yunohost/vendor/acme_tiny/acme_tiny.py
vendored
|
|
@ -1,5 +1,17 @@
|
|||
#!/usr/bin/env python
|
||||
import argparse, subprocess, json, os, sys, base64, binascii, time, hashlib, re, copy, textwrap, logging
|
||||
import argparse
|
||||
import subprocess
|
||||
import json
|
||||
import os
|
||||
import sys
|
||||
import base64
|
||||
import binascii
|
||||
import time
|
||||
import hashlib
|
||||
import re
|
||||
import copy
|
||||
import textwrap
|
||||
import logging
|
||||
try:
|
||||
from urllib.request import urlopen # Python 3
|
||||
except ImportError:
|
||||
|
|
@ -12,6 +24,7 @@ LOGGER = logging.getLogger(__name__)
|
|||
LOGGER.addHandler(logging.StreamHandler())
|
||||
LOGGER.setLevel(logging.INFO)
|
||||
|
||||
|
||||
def get_crt(account_key, csr, acme_dir, log=LOGGER, CA=DEFAULT_CA):
|
||||
# helper function base64 encode for jose spec
|
||||
def _b64(b):
|
||||
|
|
@ -26,7 +39,7 @@ def get_crt(account_key, csr, acme_dir, log=LOGGER, CA=DEFAULT_CA):
|
|||
raise IOError("OpenSSL Error: {0}".format(err))
|
||||
pub_hex, pub_exp = re.search(
|
||||
r"modulus:\n\s+00:([a-f0-9\:\s]+?)\npublicExponent: ([0-9]+)",
|
||||
out.decode('utf8'), re.MULTILINE|re.DOTALL).groups()
|
||||
out.decode('utf8'), re.MULTILINE | re.DOTALL).groups()
|
||||
pub_exp = "{0:x}".format(int(pub_exp))
|
||||
pub_exp = "0{0}".format(pub_exp) if len(pub_exp) % 2 else pub_exp
|
||||
header = {
|
||||
|
|
@ -72,7 +85,7 @@ def get_crt(account_key, csr, acme_dir, log=LOGGER, CA=DEFAULT_CA):
|
|||
common_name = re.search(r"Subject:.*? CN=([^\s,;/]+)", out.decode('utf8'))
|
||||
if common_name is not None:
|
||||
domains.add(common_name.group(1))
|
||||
subject_alt_names = re.search(r"X509v3 Subject Alternative Name: \n +([^\n]+)\n", out.decode('utf8'), re.MULTILINE|re.DOTALL)
|
||||
subject_alt_names = re.search(r"X509v3 Subject Alternative Name: \n +([^\n]+)\n", out.decode('utf8'), re.MULTILINE | re.DOTALL)
|
||||
if subject_alt_names is not None:
|
||||
for san in subject_alt_names.group(1).split(", "):
|
||||
if san.startswith("DNS:"):
|
||||
|
|
@ -165,6 +178,7 @@ def get_crt(account_key, csr, acme_dir, log=LOGGER, CA=DEFAULT_CA):
|
|||
return """-----BEGIN CERTIFICATE-----\n{0}\n-----END CERTIFICATE-----\n""".format(
|
||||
"\n".join(textwrap.wrap(base64.b64encode(result).decode('utf8'), 64)))
|
||||
|
||||
|
||||
def main(argv):
|
||||
parser = argparse.ArgumentParser(
|
||||
formatter_class=argparse.RawDescriptionHelpFormatter,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue