roadrecon 1.4.0__py3-none-any.whl → 1.5.0__py3-none-any.whl

roadtools/roadrecon/plugins/policies.py

@@ -587,7 +587,7 @@ class AccessPoliciesPlugin():
                 loc['name'] = escape(detail.get("NetworkName"))
                 loc['trusted'] = ("trusted" in detail.get("Categories","") if detail.get("Categories") else False)
                 loc['appliestounknowncountry'] = escape(str(detail.get("ApplyToUnknownCountry"))) if detail.get("ApplyToUnknownCountry") is not None else False
-                loc['ipranges'] = "\n<br />".join(detail.get('CidrIpRanges'))
+                loc['ipranges'] = "\n<br />".join(detail.get('CidrIpRanges')) if detail.get("CidrIpRanges") else ""
                 loc['categories'] = escape(", ".join(detail.get("Categories"))) if detail.get("Categories") is not None else ""
                 loc['associated_policies'] = "\n<br />".join(self._parse_associated_polcies(detail.get('NetworkId'),loc['trusted'],condition_policy_list))
                 loc['country_codes'] =  escape(", ".join(detail.get("CountryIsoCodes"))) if detail.get("CountryIsoCodes") else None

roadtools/roadrecon/server.py

@@ -157,6 +157,10 @@ class TenantDetailSchema(RTModelSchema):
     class Meta(RTModelSchema.Meta):
         model = TenantDetail
 
+class DirectorySettingSchema(RTModelSchema):
+    class Meta(RTModelSchema.Meta):
+        model = DirectorySetting
+
 class AuthorizationPolicySchema(RTModelSchema):
     class Meta(RTModelSchema.Meta):
         model = AuthorizationPolicy
@@ -167,6 +171,7 @@ device_schema = DeviceSchema()
 group_schema = GroupSchema()
 application_schema = ApplicationSchema()
 td_schema = TenantDetailSchema()
+ds_schema = DirectorySettingSchema()
 serviceprincipal_schema = ServicePrincipalSchema()
 administrativeunit_schema = AdministrativeUnitSchema()
 authorizationpolicy_schema = AuthorizationPolicySchema(many=True)
@@ -529,6 +534,11 @@ def get_tenantdetails():
     drs = db.session.query(TenantDetail).first()
     return td_schema.jsonify(drs)
 
+@app.route("/api/directorysettings", methods=["GET"])
+def get_directorysettings():
+    drs = db.session.query(DirectorySetting).first()
+    return ds_schema.jsonify(drs)
+
 @app.route("/api/authorizationpolicies", methods=["GET"])
 def get_authpolicies():
     drs = db.session.query(AuthorizationPolicy).all()