nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-09-19 04:59:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

actions/letsencrypt: Drop use of managed_paths and use LE component

Browse Source 
Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
This commit is contained in:
Sunil Mohan Adapa 2021-11-17 12:56:55 -08:00 committed by James Valleroy
parent 40830f73f1
commit 5327f65db0
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
1 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
actions/letsencrypt
View File

@ -8,6 +8,7 @@ import argparse
import filecmp import filecmp
import glob import glob
import importlib import importlib
import inspect
import json import json
import os import os
import pathlib import pathlib
@ -18,8 +19,11 @@ import sys
import configobj import configobj
from plinth import action_utils, cfg from plinth import action_utils
from plinth import app as app_module
from plinth import cfg
from plinth.modules import letsencrypt as le from plinth.modules import letsencrypt as le
from plinth.modules.letsencrypt.components import LetsEncrypt
TEST_MODE = False TEST_MODE = False
LE_DIRECTORY = '/etc/letsencrypt/' LE_DIRECTORY = '/etc/letsencrypt/'
@ -372,6 +376,14 @@ def _assert_source_directory(path):
or str(path).startswith(ETC_SSL_DIRECTORY)) or str(path).startswith(ETC_SSL_DIRECTORY))
def _get_managed_path(path):
"""Return the managed path given a certificate path."""
if '{domain}' in path:
return pathlib.Path(path.partition('{domain}')[0])
return pathlib.Path(path).parent
def _assert_managed_path(module, path): def _assert_managed_path(module, path):
"""Check that path is in fact managed by module.""" """Check that path is in fact managed by module."""
cfg.read() cfg.read()
@ -379,7 +391,24 @@ def _assert_managed_path(module, path):
module_path = module_file.read_text().strip() module_path = module_file.read_text().strip()
module = importlib.import_module(module_path) module = importlib.import_module(module_path)
assert set(path.parents).intersection(set(module.managed_paths)) module_classes = inspect.getmembers(module, inspect.isclass)
app_classes = [
cls[1] for cls in module_classes if issubclass(cls[1], app_module.App)
]
managed_paths = []
for cls in app_classes:
app = cls()
components = app.get_components_of_type(LetsEncrypt)
for component in components:
if component.private_key_path:
managed_paths.append(
_get_managed_path(component.private_key_path))
if component.certificate_path:
managed_paths.append(
_get_managed_path(component.certificate_path))
assert set(path.parents).intersection(set(managed_paths))
def subcommand_run_pre_hooks(_): def subcommand_run_pre_hooks(_):