2 files changed, 49 insertions, 4 deletions
diff --git a/src/services/api/rest/models.py b/src/services/api/rest/models.py
index dda50010f..47c7a65b3 100644
--- a/src/services/api/rest/models.py
+++ b/src/services/api/rest/models.py
@@ -134,13 +134,15 @@ class RetrieveModel(ApiModel):
 class ConfigFileModel(ApiModel):
     op: StrictStr
     file: StrictStr = None
+    string: StrictStr = None
 
     class Config:
         json_schema_extra = {
             'example': {
                 'key': 'id_key',
-                'op': 'save | load',
+                'op': 'save | load | merge',
                 'file': 'filename',
+                'string': 'config_string'
             }
         }
 
@@ -251,6 +253,20 @@ class RebootModel(ApiModel):
         }
 
 
+class RenewModel(ApiModel):
+    op: StrictStr
+    path: List[StrictStr]
+
+    class Config:
+        json_schema_extra = {
+            'example': {
+                'key': 'id_key',
+                'op': 'renew',
+                'path': ['op', 'mode', 'path'],
+            }
+        }
+
+
 class ResetModel(ApiModel):
     op: StrictStr
     path: List[StrictStr]
diff --git a/src/services/api/rest/routers.py b/src/services/api/rest/routers.py
index e52c77fda..4866ec5d8 100644
--- a/src/services/api/rest/routers.py
+++ b/src/services/api/rest/routers.py
@@ -66,6 +66,7 @@ from .models import GenerateModel
 from .models import ShowModel
 from .models import RebootModel
 from .models import ResetModel
+from .models import RenewModel
 from .models import ImportPkiModel
 from .models import PoweroffModel
 from .models import TracerouteModel
@@ -507,13 +508,21 @@ def config_file_op(data: ConfigFileModel, background_tasks: BackgroundTasks):
             else:
                 path = '/config/config.boot'
             msg = session.save_config(path)
-        elif op == 'load':
+        elif op in ('load', 'merge'):
             if data.file:
                 path = data.file
+            elif data.string:
+                path = '/tmp/config.file'
+                with open(path, 'w') as f:
+                    f.write(data.string)
             else:
-                return error(400, 'Missing required field "file"')
+                return error(400, 'Missing required field "file | string"')
 
-            session.migrate_and_load_config(path)
+            match op:
+                case 'load':
+                    session.migrate_and_load_config(path)
+                case 'merge':
+                    session.merge_config(path)
 
             config = Config(session_env=env)
             d = get_config_diff(config)
@@ -657,6 +666,26 @@ def reboot_op(data: RebootModel):
 
     return success(res)
 
+@router.post('/renew')
+def renew_op(data: RenewModel):
+    state = SessionState()
+    session = state.session
+
+    op = data.op
+    path = data.path
+
+    try:
+        if op == 'renew':
+            res = session.renew(path)
+        else:
+            return error(400, f"'{op}' is not a valid operation")
+    except ConfigSessionError as e:
+        return error(400, str(e))
+    except Exception:
+        LOG.critical(traceback.format_exc())
+        return error(500, 'An internal error occured. Check the logs for details.')
+
+    return success(res)
 
 @router.post('/reset')
 def reset_op(data: ResetModel):