From 954be34bc938acc9e14d9fb3b32c8f96cd999959 Mon Sep 17 00:00:00 2001
From: John Estabrook <jestabro@vyos.io>
Date: Wed, 25 Sep 2024 14:02:52 -0500
Subject: http-api: T6736: remove routes on config delete

Avoid duplicate entries in the list of routes when adding/deleting
endpoints.
---
 src/services/api/graphql/routers.py | 10 ++++++++++
 src/services/api/rest/routers.py    |  8 ++++++++
 src/services/vyos-http-api-server   | 10 ++++++++++
 3 files changed, 28 insertions(+)

(limited to 'src')

diff --git a/src/services/api/graphql/routers.py b/src/services/api/graphql/routers.py
index d04375a49..f02380cdc 100644
--- a/src/services/api/graphql/routers.py
+++ b/src/services/api/graphql/routers.py
@@ -38,6 +38,10 @@ def graphql_init(app: "FastAPI"):
 
     in_spec = state.introspection
 
+    # remove route and reinstall below, for any changes; alternatively, test
+    # for config_diff before proceeding
+    graphql_clear(app)
+
     if state.origins:
         origins = state.origins
         app.add_route('/graphql', CORSMiddleware(GraphQL(schema,
@@ -52,3 +56,9 @@ def graphql_init(app: "FastAPI"):
                                           context_value=get_user_context,
                                           debug=True,
                                           introspection=in_spec))
+
+
+def graphql_clear(app: "FastAPI"):
+    for r in app.routes:
+        if r.path == '/graphql':
+            app.routes.remove(r)
diff --git a/src/services/api/rest/routers.py b/src/services/api/rest/routers.py
index 1568f7d0c..38b10ef7d 100644
--- a/src/services/api/rest/routers.py
+++ b/src/services/api/rest/routers.py
@@ -682,4 +682,12 @@ def poweroff_op(data: PoweroffModel):
 
 
 def rest_init(app: "FastAPI"):
+    if all(r in app.routes for r in router.routes):
+        return
     app.include_router(router)
+
+
+def rest_clear(app: "FastAPI"):
+    for r in router.routes:
+        if r in app.routes:
+            app.routes.remove(r)
diff --git a/src/services/vyos-http-api-server b/src/services/vyos-http-api-server
index 456ea3d17..6bfc2c435 100755
--- a/src/services/vyos-http-api-server
+++ b/src/services/vyos-http-api-server
@@ -159,11 +159,21 @@ def initialization(session: SessionState, app: FastAPI = app):
     if session.rest:
         from api.rest.routers import rest_init
         rest_init(app)
+    else:
+        from api.rest.routers import rest_clear
+        rest_clear(app)
 
     # add GraphQL route
     if session.graphql:
         from api.graphql.routers import graphql_init
         graphql_init(app)
+    else:
+        from api.graphql.routers import graphql_clear
+        graphql_clear(app)
+
+    LOG.debug('Active routes are:')
+    for r in app.routes:
+        LOG.debug(f'{r.path}')
 
     config = ApiServerConfig(app, uds="/run/api.sock", proxy_headers=True)
     server = ApiServer(config)
-- 
cgit v1.2.3