Bugfixes

Author: fabriziofiorucci

src/V3_CreateConfig.py

@@ -138,7 +138,7 @@ def createconfig(declaration: ConfigDeclaration, apiversion: str, runfromautosyn
                                              "content":
                                                  f"invalid rate_limit profile [{loc['rate_limit']['profile']}]"}}}
 
-    if d['declaration']['layer4'] is not None:
+    if 'layer4' in d['declaration']:
         # Check Layer4/stream upstreams validity
         all_upstreams = []
 
@@ -170,9 +170,9 @@ def createconfig(declaration: ConfigDeclaration, apiversion: str, runfromautosyn
                          trim_blocks=True, extensions=["jinja2_base64_filters.Base64Filters"])
 
     httpConf = j2_env.get_template(NcgConfig.config['templates']['httpconf']).render(
-        declaration=d['declaration']['http'], ncgconfig=NcgConfig.config)
+        declaration=d['declaration']['http'], ncgconfig=NcgConfig.config) if 'http' in d['declaration'] else ''
     streamConf = j2_env.get_template(NcgConfig.config['templates']['streamconf']).render(
-        declaration=d['declaration']['layer4'], ncgconfig=NcgConfig.config)
+        declaration=d['declaration']['layer4'], ncgconfig=NcgConfig.config) if 'layer' in d['declaration'] else ''
 
     b64HttpConf = str(base64.urlsafe_b64encode(httpConf.encode("utf-8")), "utf-8")
     b64StreamConf = str(base64.urlsafe_b64encode(streamConf.encode("utf-8")), "utf-8")

src/main.py

@@ -136,7 +136,7 @@ def delete_config(configuid: str = ""):
     )
 
 
-# Import OpenAPI schema
+# Import OpenAPI schema - beta
 @app.post("/v3/openapi", status_code=200, response_class=JSONResponse)
 def post_openapi_v3(request: Request):
     openAPISchema = request.json()

templates/v3/http.tmpl

@@ -82,46 +82,15 @@ server {
 {# --- Server section --- #}
 
 {% for s in declaration.servers %}
+server {
     {# --- Listen section start --- #}
     {%- if s.listen -%}
     {% if s.listen.address %}
 
-server {
     listen {{ s.listen.address }}{% if s.listen.tls and s.listen.tls.certificate %} ssl{% endif %};
     {% if s.listen.http2 and s.listen.http2 == True -%}http2 on;{% endif -%}
     {%- endif %}
 
-    {% if s.names -%}
-    server_name{% for svrname in s.names %} {{ svrname }}{% endfor -%};
-    status_zone {{ s.names[0] }};
-    proxy_set_header Host $host;
-    proxy_ssl_server_name on;
-    {% endif -%}
-
-    {% if s.resolver -%}
-    resolver {{ s.resolver }};
-    {% endif -%}
-
-    {# --- Server NGINX App Protect WAF section start --- #}
-
-    {% if s.app_protect -%}
-    {% if s.app_protect.enabled == True -%}
-    app_protect_enable on;
-    {% endif -%}
-    {% if s.app_protect.policy -%}
-    app_protect_policy_file {{ ncgconfig.nms.nap_policies_dir_pum }}/{{ s.app_protect.policy }}.tgz;
-    {% endif -%}
-    {% if s.app_protect.log -%}
-    {% if s.app_protect.log.enabled == True -%}
-    app_protect_security_log_enable on;
-    {% if s.app_protect.log.profile_name -%}
-    app_protect_security_log "{{ ncgconfig.nms.nap_logformats_dir_pum }}/{{ s.app_protect.log.profile_name }}.tgz" syslog:server={{ s.app_protect.log.destination }};
-    {% endif -%}
-    {% endif %}
-    {% endif %}
-    {% endif %}
-    {# --- Server NGINX App Protect WAF section end --- #}
-
     {# --- TLS section start --- #}
     {%- if s.listen.tls -%}
 
@@ -177,6 +146,37 @@ server {
     {%- endif %}
     {# --- Listen section end --- #}
 
+    {% if s.names -%}
+    server_name{% for svrname in s.names %} {{ svrname }}{% endfor -%};
+    status_zone {{ s.names[0] }};
+    proxy_set_header Host $host;
+    proxy_ssl_server_name on;
+    {% endif -%}
+
+    {% if s.resolver -%}
+    resolver {{ s.resolver }};
+    {% endif -%}
+
+    {# --- Server NGINX App Protect WAF section start --- #}
+
+    {% if s.app_protect -%}
+    {% if s.app_protect.enabled == True -%}
+    app_protect_enable on;
+    {% endif -%}
+    {% if s.app_protect.policy -%}
+    app_protect_policy_file {{ ncgconfig.nms.nap_policies_dir_pum }}/{{ s.app_protect.policy }}.tgz;
+    {% endif -%}
+    {% if s.app_protect.log -%}
+    {% if s.app_protect.log.enabled == True -%}
+    app_protect_security_log_enable on;
+    {% if s.app_protect.log.profile_name -%}
+    app_protect_security_log "{{ ncgconfig.nms.nap_logformats_dir_pum }}/{{ s.app_protect.log.profile_name }}.tgz" syslog:server={{ s.app_protect.log.destination }};
+    {% endif -%}
+    {% endif %}
+    {% endif %}
+    {% endif %}
+    {# --- Server NGINX App Protect WAF section end --- #}
+
     {% if s.log.access %}access_log {{ s.log.access }} main;{% endif %}
 
     {% if s.log.error %}error_log {{ s.log.error }};{% endif %}
@@ -239,8 +239,7 @@ server {
     }
     {% endfor %}
 
-{%- if s.listen.address %}
+{% if s.listen.address %}
+{%- endif -%}
 }
-{% endif %}
-
-{% endfor %}
+{%- endfor %}