From 54f1dbbf3c7a371dbd7893491ca8922e145e258d Mon Sep 17 00:00:00 2001
From: anima
Date: Sun, 27 Oct 2024 13:02:23 +0100
Subject: [PATCH] add option to load Caddyfile
---
CaddyAPI.py | 50 ++++++++++++++++++++++++++++++++++++--------------
1 file changed, 36 insertions(+), 14 deletions(-)
diff --git a/CaddyAPI.py b/CaddyAPI.py
index 9e6d1cf..8b61ad2 100644
--- a/CaddyAPI.py
+++ b/CaddyAPI.py
@@ -5,7 +5,7 @@ import json
class CaddyAPI:
"""API wrapper for Caddy"""
__AUTHOR__ = 'anima'
- __VERSION__ = '0.1.0'
+ __VERSION__ = '0.2.0'
_log = logging.getLogger(__name__)
__logFile = logging.FileHandler('CaddyAPI.log')
@@ -20,18 +20,28 @@ class CaddyAPI:
self.__baseurl = host
self.__port = port
- def __query(self, path: str, data: str = None) -> dict | bool:
+ def __query(self, path: str, data: str = None, contentType: str = 'json') -> dict | bool:
"""base query method
"""
url = f'http://{self.__baseurl}:{self.__port}/{path}'
- headers = {
- "Accept": "application/json"
- }
+ headers = {"Accept": "application/json"}
+ match contentType:
+ case 'json':
+ headers['Content-Type'] = 'text/caddyfile'
+ case 'caddyfile':
+ headers['Content-Type'] = 'text/caddyfile'
+ case _:
+ self._log.error(f'not a supported {contentType=}')
+ return False
+
if data is None:
response = requests.get(url, headers = headers)
else:
- response = requests.post(url, headers = headers, json = data)
+ if contentType == 'json':
+ response = requests.post(url, headers = headers, json = data)
+ else:
+ response = requests.post(url, headers = headers, data = data)
if response.status_code == 200:
content = response.content.decode()
@@ -43,21 +53,33 @@ class CaddyAPI:
return False
- def get_config(self, saveTo: str = None) -> dict:
- config = self.__query('config')
+ def get_config(self, saveTo: str = None, path: str = None) -> dict:
+ if path is None:
+ path = 'config'
+ config = self.__query(path)
if config and config is not None:
if saveTo is not None:
with open(saveTo, 'w') as f:
f.write(json.dumps(config))
return config
- def load_config(self, configFile: str):
+ def load_config(self, configFile: str, configAdaapter: str = 'json'):
if configFile is not None:
- with open(configFile, 'r') as f:
- config = json.load(f)
- return self.__query('load', config)
- return config
+ match configAdaapter:
+ case 'json':
+ with open(configFile, 'r') as f:
+ config = json.load(f)
+ return self.__query('load', config)
+ case 'caddyfile':
+ with open(configFile) as f:
+ config = f.read()
+ return self.__query('load', config, configAdaapter)
+ case _:
+ self._log.error(f'not supported {configAdaapter=}')
+ return False
+
else:
+ self._log.error(f'cant load config without configfile {configFile=}')
return False
@@ -65,5 +87,5 @@ if __name__ == '__main__':
caddy = CaddyAPI('localhost')
data = caddy.get_config('caddy.bak.json')
print(f'{data=}')
- load = caddy.load_config('caddy.json')
+ load = caddy.load_config('Caddyfile', 'caddyfile')
print(f'{load=}')
\ No newline at end of file