From 88217297ec6bae4fb4c876631e521c52a5c07419 Mon Sep 17 00:00:00 2001 From: Tim Purschke Date: Mon, 5 Feb 2024 17:55:59 +0100 Subject: [PATCH 01/84] nsx importer start --- documentation/revision-history-develop.md | 3 + inventory/group_vars/all.yml | 2 +- .../files/sql/creation/fworch-fill-stm.sql | 5 + roles/database/files/upgrade/7.3.7.sql | 4 + .../files/importer/vmwareNSX/__init__.py | 0 .../importer/vmwareNSX/discovery_logging.conf | 41 ++++ .../files/importer/vmwareNSX/fwcommon.py | 101 ++++++++++ .../importer/vmwareNSX/nsx_application.py | 37 ++++ .../files/importer/vmwareNSX/nsx_base.py | 2 + .../files/importer/vmwareNSX/nsx_getter.py | 92 +++++++++ .../files/importer/vmwareNSX/nsx_network.py | 175 ++++++++++++++++++ .../files/importer/vmwareNSX/nsx_rule.py | 144 ++++++++++++++ .../files/importer/vmwareNSX/nsx_service.py | 134 ++++++++++++++ .../files/importer/vmwareNSX/nsx_zone.py | 15 ++ .../Pages/Settings/SettingsGateways.razor | 3 +- 15 files changed, 756 insertions(+), 2 deletions(-) create mode 100644 roles/database/files/upgrade/7.3.7.sql create mode 100644 roles/importer/files/importer/vmwareNSX/__init__.py create mode 100644 roles/importer/files/importer/vmwareNSX/discovery_logging.conf create mode 100644 roles/importer/files/importer/vmwareNSX/fwcommon.py create mode 100644 roles/importer/files/importer/vmwareNSX/nsx_application.py create mode 100644 roles/importer/files/importer/vmwareNSX/nsx_base.py create mode 100644 roles/importer/files/importer/vmwareNSX/nsx_getter.py create mode 100644 roles/importer/files/importer/vmwareNSX/nsx_network.py create mode 100644 roles/importer/files/importer/vmwareNSX/nsx_rule.py create mode 100644 roles/importer/files/importer/vmwareNSX/nsx_service.py create mode 100644 roles/importer/files/importer/vmwareNSX/nsx_zone.py diff --git a/documentation/revision-history-develop.md b/documentation/revision-history-develop.md index 3280dfb4d..9bf05abae 100644 --- a/documentation/revision-history-develop.md +++ b/documentation/revision-history-develop.md @@ -175,3 +175,6 @@ bugfix release: - common service handling - fixes credentials when installing without demo data - fix error with pdf creation on debian testing + +# 7.3.7 - 29.02.2024 DEVELOP +- adding firewall importer support for NSX diff --git a/inventory/group_vars/all.yml b/inventory/group_vars/all.yml index 1c87fdf27..d2e2b81f5 100644 --- a/inventory/group_vars/all.yml +++ b/inventory/group_vars/all.yml @@ -1,5 +1,5 @@ ### general settings -product_version: "7.3.6" +product_version: "7.3.7" ansible_user: "{{ lookup('env', 'USER') }}" ansible_become_method: sudo ansible_python_interpreter: /usr/bin/python3 diff --git a/roles/database/files/sql/creation/fworch-fill-stm.sql b/roles/database/files/sql/creation/fworch-fill-stm.sql index 062deaeb2..3f0620453 100644 --- a/roles/database/files/sql/creation/fworch-fill-stm.sql +++ b/roles/database/files/sql/creation/fworch-fill-stm.sql @@ -338,6 +338,11 @@ insert into stm_dev_typ (dev_typ_id,dev_typ_name,dev_typ_version,dev_typ_manufac VALUES (24,'FortiOS Management','REST','Fortinet','',false,true,false) ON CONFLICT DO NOTHING; insert into stm_dev_typ (dev_typ_id,dev_typ_name,dev_typ_version,dev_typ_manufacturer,dev_typ_predef_svc,dev_typ_is_multi_mgmt,dev_typ_is_mgmt,is_pure_routing_device) VALUES (25,'Fortinet FortiOS Gateway','REST','Fortinet','',false,false,false) ON CONFLICT DO NOTHING; +insert into stm_dev_typ (dev_typ_id,dev_typ_name,dev_typ_version,dev_typ_manufacturer,dev_typ_predef_svc,dev_typ_is_multi_mgmt,dev_typ_is_mgmt,is_pure_routing_device) + VALUES (26,'NSX','REST','VMWare','',false,true,false) ON CONFLICT DO NOTHING; +insert into stm_dev_typ (dev_typ_id,dev_typ_name,dev_typ_version,dev_typ_manufacturer,dev_typ_predef_svc,dev_typ_is_multi_mgmt,dev_typ_is_mgmt,is_pure_routing_device) + VALUES (27,'NSX DFW Gateway','REST','VMWare','',false,false,false) ON CONFLICT DO NOTHING; + update stm_dev_typ set dev_typ_predef_svc= 'ANY;0;0;65535;1;other;simple diff --git a/roles/database/files/upgrade/7.3.7.sql b/roles/database/files/upgrade/7.3.7.sql new file mode 100644 index 000000000..d85bfaac2 --- /dev/null +++ b/roles/database/files/upgrade/7.3.7.sql @@ -0,0 +1,4 @@ +insert into stm_dev_typ (dev_typ_id,dev_typ_name,dev_typ_version,dev_typ_manufacturer,dev_typ_predef_svc,dev_typ_is_multi_mgmt,dev_typ_is_mgmt,is_pure_routing_device) + VALUES (26,'NSX','4ff','VMWare','',false,true,false) ON CONFLICT DO NOTHING; +insert into stm_dev_typ (dev_typ_id,dev_typ_name,dev_typ_version,dev_typ_manufacturer,dev_typ_predef_svc,dev_typ_is_multi_mgmt,dev_typ_is_mgmt,is_pure_routing_device) + VALUES (27,'NSX DFW Gateway','4ff','VMWare','',false,false,false) ON CONFLICT DO NOTHING; diff --git a/roles/importer/files/importer/vmwareNSX/__init__.py b/roles/importer/files/importer/vmwareNSX/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/roles/importer/files/importer/vmwareNSX/discovery_logging.conf b/roles/importer/files/importer/vmwareNSX/discovery_logging.conf new file mode 100644 index 000000000..139c55a9c --- /dev/null +++ b/roles/importer/files/importer/vmwareNSX/discovery_logging.conf @@ -0,0 +1,41 @@ +[loggers] +keys=root,discoveryDebugLogger +#keys=root,__main__ + +[handlers] +keys=consoleHandler,debugFileHandler + +[formatters] +keys=defaultFormatter,debugFileFormatter + +[logger_root] +level=DEBUG +handlers=consoleHandler + +[logger_discoveryDebugLogger] +#[logger___main__] +level=DEBUG +handlers=debugFileHandler +qualname=discoveryDebugLogger +#qualname=__main__ +propagate=0 + +[handler_consoleHandler] +class=StreamHandler +level=DEBUG +formatter=defaultFormatter +args=(sys.stderr,) + +[handler_debugFileHandler] +class=FileHandler +level=DEBUG +formatter=debugFileFormatter +args=('/tmp/fworch_discovery.log',) +# args=('/var/log/fworch/discovery.log',) + +[formatter_defaultFormatter] +format=%(levelname)s:%(name)s:%(message)s + +[formatter_debugFileFormatter] +format=%(asctime)s - %(name)s - %(levelname)s - %(message)s + diff --git a/roles/importer/files/importer/vmwareNSX/fwcommon.py b/roles/importer/files/importer/vmwareNSX/fwcommon.py new file mode 100644 index 000000000..87de87449 --- /dev/null +++ b/roles/importer/files/importer/vmwareNSX/fwcommon.py @@ -0,0 +1,101 @@ +import sys +from common import importer_base_dir +sys.path.append(importer_base_dir + "/paloaltomanagement2023ff") +from palo_service import normalize_svcobjects +from palo_application import normalize_application_objects +from palo_rule import normalize_access_rules +from palo_network import normalize_nwobjects +from palo_zone import normalize_zones +from palo_getter import login, update_config_with_palofw_api_call +from fwo_log import getFwoLogger +from palo_base import api_version_str + +def has_config_changed(full_config, mgm_details, force=False): + # dummy - may be filled with real check later on + return True + + +def get_config(config2import, full_config, current_import_id, mgm_details, limit=1000, force=False, jwt=''): + logger = getFwoLogger() + if full_config == {}: # no native config was passed in, so getting it from Azzure + parsing_config_only = False + else: + parsing_config_only = True + + if not parsing_config_only: # no native config was passed in, so getting it from Palo Firewall + apipwd = mgm_details["import_credential"]['secret'] + apiuser = mgm_details["import_credential"]['user'] + apihost = mgm_details["hostname"] + + vsys_objects = ["/Network/Zones", "/Objects/Addresses", "/Objects/Services", "/Objects/AddressGroups", "/Objects/ServiceGroups", "/Objects/Tags"] + predef_objects = ["/Objects/Applications"] + rulebase_names = ["/Policies/SecurityRules", "/Policies/NATRules"] + + for obj_path in vsys_objects: + full_config[obj_path] = [] + + for obj_path in predef_objects: + full_config[obj_path] = [] + + # login + key = login(apiuser, apipwd, apihost) + if key == None or key == "": + logger.error('Did not succeed in logging in to Palo API, no key returned.') + return 1 + + ## get objects: + base_url = "https://{apihost}/restapi/v{api_version_str}".format(apihost=apihost, api_version_str=api_version_str) + + vsys_name = "vsys1" # TODO - automate this hard-coded name + location = "vsys" # alternative: panorama-pushed + + for obj_path in vsys_objects: + update_config_with_palofw_api_call(key, base_url, full_config, obj_path + "?location={location}&vsys={vsys_name}".format(location=location, vsys_name=vsys_name), obj_type=obj_path) + + for obj_path in predef_objects: + update_config_with_palofw_api_call(key, base_url, full_config, obj_path + "?location={location}".format(location="predefined"), obj_type=obj_path) + + # users + + # get rules + full_config.update({'devices': {}}) + for device in mgm_details["devices"]: + dev_id = device['id'] + dev_name = device['local_rulebase_name'] + full_config['devices'].update({ dev_id: {} }) + + for obj_path in rulebase_names: + update_config_with_palofw_api_call( + key, base_url, full_config['devices'][device['id']], + obj_path + "?location={location}&vsys={vsys_name}".format(location="vsys", vsys_name=dev_name), + obj_type=obj_path) + + ################## + # now we normalize relevant parts of the raw config and write the results to config2import dict + + normalize_nwobjects(full_config, config2import, current_import_id, jwt=jwt, mgm_id=mgm_details['id']) + normalize_svcobjects(full_config, config2import, current_import_id) + normalize_application_objects(full_config, config2import, current_import_id) + # normalize_users(full_config, config2import, current_import_id, user_scope) + + # adding default any and predefined objects + any_nw_svc = {"svc_uid": "any_svc_placeholder", "svc_name": "any", "svc_comment": "Placeholder service.", + "svc_typ": "simple", "ip_proto": -1, "svc_port": 0, "svc_port_end": 65535, "control_id": current_import_id} + http_svc = {"svc_uid": "http_predefined_svc", "svc_name": "service-http", "svc_comment": "Predefined service", + "svc_typ": "simple", "ip_proto": 6, "svc_port": 80, "control_id": current_import_id} + https_svc = {"svc_uid": "https_predefined_svc", "svc_name": "service-https", "svc_comment": "Predefined service", + "svc_typ": "simple", "ip_proto": 6, "svc_port": 443, "control_id": current_import_id} + + config2import["service_objects"].append(any_nw_svc) + config2import["service_objects"].append(http_svc) + config2import["service_objects"].append(https_svc) + + any_nw_object = {"obj_uid": "any_obj_placeholder", "obj_name": "any", "obj_comment": "Placeholder object.", + "obj_typ": "network", "obj_ip": "0.0.0.0/0", "control_id": current_import_id} + config2import["network_objects"].append(any_nw_object) + + normalize_zones(full_config, config2import, current_import_id) + normalize_access_rules(full_config, config2import, current_import_id, mgm_details=mgm_details) + # normalize_nat_rules(full_config, config2import, current_import_id, jwt=jwt) + + return 0 diff --git a/roles/importer/files/importer/vmwareNSX/nsx_application.py b/roles/importer/files/importer/vmwareNSX/nsx_application.py new file mode 100644 index 000000000..4652fa0c6 --- /dev/null +++ b/roles/importer/files/importer/vmwareNSX/nsx_application.py @@ -0,0 +1,37 @@ +from fwo_const import list_delimiter +from fwo_log import getFwoLogger + + +def normalize_application_objects(full_config, config2import, import_id): + app_objects = [] + for app_orig in full_config["/Objects/Applications"]: + app_objects.append(parse_app(app_orig, import_id,config2import)) + config2import['service_objects'] += app_objects + + +def extract_base_app_infos(app_orig, import_id): + app = {} + if "@name" in app_orig: + app["svc_uid"] = app_orig["@name"] + app["svc_name"] = app_orig["@name"] + if "comment" in app_orig: + app["svc_comment"] = app_orig["comment"] + app["control_id"] = import_id + app["svc_typ"] = 'simple' + return app + + +def parse_app(app_orig, import_id,config2import): + svc = extract_base_app_infos(app_orig, import_id) + app_comment = '' + if 'category' in app_orig: + app_comment = "category: " + app_orig['category'] + if 'subcategory' in app_orig: + app_comment += ", " + "subcategory: " + app_orig['subcategory'] + if 'technology' in app_orig: + app_comment += ", " + "technology: " + app_orig['technology'] + if 'svc_comment' in svc: + svc['svc_comment'] += "; " + app_comment + else: + svc['svc_comment'] = app_comment + return svc diff --git a/roles/importer/files/importer/vmwareNSX/nsx_base.py b/roles/importer/files/importer/vmwareNSX/nsx_base.py new file mode 100644 index 000000000..e4a69e545 --- /dev/null +++ b/roles/importer/files/importer/vmwareNSX/nsx_base.py @@ -0,0 +1,2 @@ + +api_version_str="9.1" diff --git a/roles/importer/files/importer/vmwareNSX/nsx_getter.py b/roles/importer/files/importer/vmwareNSX/nsx_getter.py new file mode 100644 index 000000000..ae2c94b33 --- /dev/null +++ b/roles/importer/files/importer/vmwareNSX/nsx_getter.py @@ -0,0 +1,92 @@ +# library for API get functions +import base64 +from typing import Dict +from fwo_log import getFwoLogger +import requests.packages +import requests +import xmltodict, json +import fwo_globals +from fwo_exception import FwLoginFailed + + +def api_call(url, params = {}, headers = {}, data = {}, credentials = '', show_progress=False, method='get'): + logger = getFwoLogger() + result_type='xml' + request_headers = {'Content-Type': 'application/json'} + for header_key in headers: + request_headers[header_key] = headers[header_key] + if key != '': + request_headers["Authorization"] = 'Basic ' + '{credentials}'.format(key=key) + result_type='json' + + if method == "post": + response = requests.post(url, params=params, data=data, headers=request_headers, verify=fwo_globals.verify_certs) + elif method == "get": + response = requests.get(url, params=params, headers=request_headers, verify=fwo_globals.verify_certs) + else: + raise Exception("unknown HTTP method found in palo_getter") + + # error handling: + exception_text = '' + if response is None: + if 'password' in json.dumps(data): + exception_text = "error while sending api_call containing credential information to url '" + \ + str(url) + else: + exception_text = "error while sending api_call to url '" + str(url) + "' with payload '" + json.dumps( + data, indent=2) + "' and headers: '" + json.dumps(request_headers, indent=2) + if not response.ok: + exception_text = 'error code: {error_code}, error={error}'.format(error_code=response.status_code, error=response.content) + #logger.error(response.content) + if (len(response.content) == 0): + exception_text = 'empty response content' + + if exception_text != '': + raise Exception(exception_text) + + # no errors found + if result_type=='xml': + r = xmltodict.parse(response.content) + body_json = json.loads(json.dumps(r)) + elif result_type=='json': + body_json = json.loads(response.content) + if 'result' in body_json: + body_json = body_json['result'] + + else: + body_json = None + + return body_json + + +def login(apiuser, apipwd, apihost): + base_url = "https://{apihost}/api/?type=keygen&user={apiuser}&password={apipwd}".format(apihost=apihost, apiuser=apiuser, apipwd=apipwd) + try: + body = api_call(base_url, method="get", headers={}, data={}) + except Exception as e: + raise FwLoginFailed("Palo FW login to firewall=" + str(apihost) + " failed; Message: " + str(e)) from None + + if 'response' in body and 'result' in body['response'] and 'key' in body['response']['result'] and not body['response']['result']['key'] == None: + key = body['response']['result']['key'] + else: + raise FwLoginFailed("Palo FW login to firewall=" + str(apihost) + " failed") from None + + if fwo_globals.debug_level > 2: + logger = getFwoLogger() + logger.debug("Login successful. Received key: " + key) + + return key + + +def update_config_with_palofw_api_call(key, api_base_url, config, api_path, obj_type='generic', parameters={}, payload={}, show_progress=False, limit: int=1000, method="get"): + returned_new_data = True + + full_result = [] + result = api_call(api_base_url + api_path,key=key, params=parameters, data=payload, show_progress=show_progress, method=method) + if "entry" in result: + returned_new_data = len(result['entry'])>0 + else: + returned_new_data = False + if returned_new_data: + full_result.extend(result["entry"]) + config.update({obj_type: full_result}) diff --git a/roles/importer/files/importer/vmwareNSX/nsx_network.py b/roles/importer/files/importer/vmwareNSX/nsx_network.py new file mode 100644 index 000000000..252ba38cf --- /dev/null +++ b/roles/importer/files/importer/vmwareNSX/nsx_network.py @@ -0,0 +1,175 @@ +from asyncio.log import logger +from fwo_log import getFwoLogger +from fwo_const import list_delimiter +import ipaddress + + +def normalize_nwobjects(full_config, config2import, import_id, jwt=None, mgm_id=None): + logger = getFwoLogger() + nw_objects = [] + nw_tagged_groups = {} + for obj_orig in full_config["/Objects/Addresses"]: + nw_objects.append(parse_object(obj_orig, import_id, config2import, nw_objects)) + if 'tag' in obj_orig and 'member' in obj_orig['tag']: + logger.info("found simple network object with tags: " + obj_orig['@name']) + for t in obj_orig['tag']['member']: + collect_tag_information(nw_tagged_groups, "#"+t, obj_orig['@name']) + + for tag in nw_tagged_groups: + logger.info("handling nw_tagged_group: " + tag + " with members: " + list_delimiter.join(nw_tagged_groups[tag])) + obj = {} + obj["obj_name"] = tag + obj["obj_uid"] = tag + obj["obj_comment"] = 'dynamic group defined by tagging' + obj['control_id'] = import_id + obj['obj_typ'] = 'group' + members = nw_tagged_groups[tag] # parse_dynamic_object_group(obj_grp_orig, nw_tagged_groups) + obj['obj_members'] = list_delimiter.join(members) + obj['obj_member_refs'] = list_delimiter.join(members) + nw_objects.append(obj) + + for obj_grp_orig in full_config["/Objects/AddressGroups"]: + logger.info("found network group: " + obj_grp_orig['@name']) + obj_grp = extract_base_object_infos(obj_grp_orig, import_id, config2import, nw_objects) + obj_grp["obj_typ"] = "group" + if 'static' in obj_grp_orig and 'filter' in obj_grp_orig['static']: + obj_grp["obj_member_refs"], obj_grp["obj_member_names"] = parse_static_obj_group(obj_grp_orig, import_id, nw_objects, config2import) + if 'dynamic' in obj_grp_orig and 'filter' in obj_grp_orig['dynamic']: + members = parse_dynamic_object_group(obj_grp_orig, nw_tagged_groups) + obj_grp["obj_member_refs"] = list_delimiter.join(members) + obj_grp["obj_member_names"] = list_delimiter.join(members) + nw_objects.append(obj_grp) + if 'tag' in obj_grp_orig and 'member' in obj_grp_orig['tag']: + logger.info("found network group with tags: " + obj_grp_orig['@name']) + for t in obj_grp_orig['tag']['member']: + logger.info(" found tag " + t) + collect_tag_information(nw_tagged_groups, "#"+t, obj_grp_orig['@name']) + + config2import['network_objects'] = nw_objects + + +def parse_object(obj_orig, import_id, config2import, nw_objects): + obj = extract_base_object_infos(obj_orig, import_id, config2import, nw_objects) + obj['obj_ip'] = obj_orig['ip-netmask'] + if '/' in obj['obj_ip'] and not '/32' in obj['obj_ip']: + obj['obj_typ'] = 'network' + else: + obj['obj_typ'] = 'host' + return obj + + +def extract_base_object_infos(obj_orig, import_id, config2import, nw_objects): + obj = {} + obj["obj_name"] = obj_orig["@name"] + obj["obj_uid"] = obj_orig["@name"] + if 'description' in obj_orig: + obj["obj_comment"] = obj_orig["description"] + if 'tag' in obj_orig: + tag_list = ",".join(obj_orig["tag"]['member']) + if 'obj_comment' in obj: + obj["obj_comment"] += ("; tags: " + tag_list) + else: + obj["obj_comment"] = tag_list + obj['control_id'] = import_id + return obj + + +def parse_dynamic_object_group(orig_grp, nw_tagged_groups): + if "dynamic" in orig_grp: + if 'filter' in orig_grp['dynamic']: + if ' ' not in orig_grp['dynamic']['filter']: + # just a single tag + # add all nw objects with the tag to this group + tag = "#" + orig_grp['dynamic']['filter'][1:-1] + if tag in nw_tagged_groups: + return nw_tagged_groups[tag] + else: + # later: deal with more complex tagging (and/or) + return [] + return [] + + +def parse_static_obj_group(orig_grp, import_id, nw_objects, config2import, id = None): + refs = [] + names = [] + + if "static" in orig_grp and "member" in orig_grp["static"]: + for m in orig_grp['static']['member']: + names.append(m) + refs.append(m) + return list_delimiter.join(refs), list_delimiter.join(names) + + +def parse_obj_list(nw_obj_list, import_id, obj_list, id, type='network'): + refs = [] + names = [] + for obj_name in nw_obj_list: + names.append(obj_name) + refs.append(lookup_obj_uid(obj_name, obj_list, import_id, type=type)) + return list_delimiter.join(refs), list_delimiter.join(names) + + +def lookup_obj_uid(obj_name, obj_list, import_id, type='network'): + for o in obj_list: + if type=='network' and 'obj_name' in o: + if o['obj_name']==obj_name: + return o['obj_uid'] + elif type=='service' and 'svc_name' in o: + if o['svc_name']==obj_name: + return o['svc_uid'] + else: + logger.warning("could not find object name in object " + str(o)) + + # could not find existing obj in obj list, so creating new one + if type=='network': + refs, names = add_ip_obj([obj_name], obj_list, import_id) + return refs ## assuming only one object here + elif type=='service': + logger.warning("could not find service object " + str(obj_name)) + else: + logger.warning("unknown object type '" + type + "' for object " + str(obj_name)) + return None + + +def add_ip_obj(ip_list, obj_list, import_id): + refs = [] + names = [] + for ip in ip_list: + # TODO: lookup ip in network_objects and re-use + ip_obj = {} + ip_obj['obj_name'] = ip + ip_obj['obj_uid'] = ip_obj['obj_name'] + try: + ipaddress.ip_network(ip) + # valid ip + ip_obj['obj_ip'] = ip + except: + # no valid ip - asusming Tag + ip_obj['obj_ip'] = '0.0.0.0/0' + ip = '0.0.0.0/0' + ip_obj['obj_name'] = "#"+ip_obj['obj_name'] + ip_obj['obj_uid'] = ip_obj['obj_name'] + ip_obj['obj_type'] = 'simple' + ip_obj['obj_typ'] = 'host' + if "/" in ip: + ip_obj['obj_typ'] = 'network' + + if "-" in ip: # ip range + ip_obj['obj_typ'] = 'ip_range' + ip_range = ip.split("-") + ip_obj['obj_ip'] = ip_range[0] + ip_obj['obj_ip_end'] = ip_range[1] + + ip_obj['control_id'] = import_id + + obj_list.append(ip_obj) + refs.append(ip_obj['obj_uid']) + names.append(ip_obj['obj_name']) + return list_delimiter.join(refs), list_delimiter.join(names) + + +def collect_tag_information(tagged_groups, tag, obj_name): + if tag in tagged_groups.keys(): + tagged_groups[tag].append(obj_name) + else: + tagged_groups.update({tag: [obj_name]}) diff --git a/roles/importer/files/importer/vmwareNSX/nsx_rule.py b/roles/importer/files/importer/vmwareNSX/nsx_rule.py new file mode 100644 index 000000000..6071f5ef2 --- /dev/null +++ b/roles/importer/files/importer/vmwareNSX/nsx_rule.py @@ -0,0 +1,144 @@ +from palo_service import parse_svc_list +from palo_network import parse_obj_list +from fwo_log import getFwoLogger +from fwo_const import list_delimiter +import hashlib +import base64 + + +def make_hash_sha256(o): + hasher = hashlib.sha256() + hasher.update(repr(make_hashable(o)).encode()) + return base64.b64encode(hasher.digest()).decode() + + +def make_hashable(o): + if isinstance(o, (tuple, list)): + return tuple((make_hashable(e) for e in o)) + + if isinstance(o, dict): + return tuple(sorted((k,make_hashable(v)) for k,v in o.items())) + + if isinstance(o, (set, frozenset)): + return tuple(sorted(make_hashable(e) for e in o)) + + return o + + +def normalize_access_rules(full_config, config2import, import_id, mgm_details={}): + rules = [] + logger = getFwoLogger() + + nw_obj_names = [] + for o in config2import['network_objects']: + nw_obj_names.append(o["obj_name"]) + + for device in full_config["devices"]: + rule_number = 0 + for dev_id in full_config['devices'].keys(): + for rulebase in list(full_config['devices'][dev_id].keys()): + for rule_orig in full_config['devices'][dev_id][rulebase]: + rule = {'rule_src': 'any', 'rule_dst': 'any', 'rule_svc': 'any', + 'rule_src_refs': 'any_obj_placeholder', 'rule_dst_refs': 'any_obj_placeholder', + 'rule_src_neg': False, 'rule_dst_neg': False, + 'rule_svc_refs': 'any_svc_placeholder'} + if 'negate-source' in rule_orig and rule_orig['negate-source']=='yes': + rule["rule_src_neg"] = True + if 'negate-destination' in rule_orig and rule_orig['negate-destination']=='yes': + rule["rule_dst_neg"] = True + rule.update({ + "rule_svc_neg": False, # not possible to negate the svc field on Palo + "rulebase_name": rule_orig['@vsys'], + "rule_name": rule_orig['@name'], + 'rule_type': 'access', + 'rule_num': rule_number, + 'rule_installon': rule_orig['@vsys'], + 'parent_rule_id': None, + 'rule_time': None, + 'rule_implied': False, + 'rule_comment': None, + 'rule_track': 'None', + 'rule_uid': rule_orig['@uuid'], + 'rule_disabled': False, + 'control_id': import_id + }) + + if "action" in rule_orig: + if rule_orig['action']=='allow': + rule['rule_action'] = 'accept' + elif rule_orig['action']=='drop': + rule['rule_action'] = 'drop' + elif rule_orig['action']=='deny': + rule['rule_action'] = 'deny' + elif rule_orig['action']=='reset-client': + rule['rule_action'] = 'reject' + else: + logger.warning("found undefined action:" + str(rule_orig)) + else: # NAT rules + rule['rule_action'] = "accept" + rule['rule_type'] = 'nat' + + # TODO: should either duplicate the rule for each zone to zone pair + # or much better allow for n:m rule:zone mappings --> change of DB necessary + # instead we are just picking the last one!!! + for z in rule_orig['from']['member']: + rule.update({'rule_from_zone': z}) + for z in rule_orig['to']['member']: + rule.update({'rule_to_zone': z}) + + if 'disabled' in rule_orig and rule_orig['disabled']=='yes': + rule['rule_disabled'] = True + if 'log-start' in rule_orig: + if rule_orig['log-start']=='yes': + rule['rule_track'] = 'all start' + elif rule_orig['log-start']=='no': + rule['rule_track'] = 'None' + else: + logger.warning ("found undefined track:" + str(rule_orig)) + rule['rule_track'] = 'None' + else: + rule['rule_track'] = 'None' + + if "source" in rule_orig: + if 'member' in rule_orig["source"]: + source_objects = rule_orig["source"]["member"] + else: + source_objects = [rule_orig["service"]] + rule['rule_src_refs'], rule["rule_src"] = parse_obj_list(source_objects, import_id, config2import['network_objects'], rule["rule_uid"]) + else: + logger.warning("found undefined source in rule: " + str(rule_orig)) + + if "destination" in rule_orig: + if 'member' in rule_orig["destination"]: + destination_objects = rule_orig["destination"]["member"] + else: + destination_objects = [rule_orig["destination"]] + rule['rule_dst_refs'], rule["rule_dst"] = parse_obj_list(destination_objects, import_id, config2import['network_objects'], rule["rule_uid"]) + else: + logger.warning("found undefined destination in rule: " + str(rule_orig)) + + services = [] + if "service" in rule_orig: + if 'member' in rule_orig['service']: + services = rule_orig["service"]["member"] + else: + services = [rule_orig["service"]] + if services[0] == 'application-default' or services[0] == 'any': + services = [] + apps = [] + if 'application' in rule_orig: + # no services given but applications - parse apps + if 'member' in rule_orig['application']: + # apps = ['any'] ## TEMP before app parsing + apps = rule_orig["application"]["member"] + else: + apps = [rule_orig["application"]] + if apps[0] == 'any': + apps = [] + + rule['rule_svc_refs'], rule["rule_svc"] = parse_svc_list(apps + services, import_id, config2import['service_objects'], rule["rule_uid"], type='service') + + rule_number += 1 + rules.append(rule) + + config2import['rules'] += rules diff --git a/roles/importer/files/importer/vmwareNSX/nsx_service.py b/roles/importer/files/importer/vmwareNSX/nsx_service.py new file mode 100644 index 000000000..c8d932f7b --- /dev/null +++ b/roles/importer/files/importer/vmwareNSX/nsx_service.py @@ -0,0 +1,134 @@ +from fwo_const import list_delimiter +from fwo_log import getFwoLogger + + +def normalize_svcobjects(full_config, config2import, import_id): + svc_objects = [] + for svc_orig in full_config["/Objects/Services"]: + svc_objects.append(parse_svc(svc_orig, import_id,config2import)) + for svc_grp_orig in full_config["/Objects/ServiceGroups"]: + svc_grp = extract_base_svc_infos(svc_grp_orig, import_id) + svc_grp["svc_typ"] = "group" + svc_grp["svc_member_refs"] , svc_grp["svc_member_names"] = parse_svc_group(svc_grp_orig,config2import) + svc_objects.append(svc_grp) + config2import['service_objects'] += svc_objects + + +def parse_svc_group(orig_grp,config2import): + refs = [] + names = [] + if "dynamic" in orig_grp: + pass + if "static" in orig_grp and "member" in orig_grp["static"]: + for m in orig_grp['static']['member']: + names.append(m) + refs.append(m) + return list_delimiter.join(refs), list_delimiter.join(names) + + +def extract_base_svc_infos(svc_orig, import_id): + svc = {} + if "@name" in svc_orig: + svc["svc_uid"] = svc_orig["@name"] + svc["svc_name"] = svc_orig["@name"] + if "comment" in svc_orig: + svc["svc_comment"] = svc_orig["comment"] + svc["svc_timeout"] = None + svc["svc_color"] = None + svc["control_id"] = import_id + svc["svc_typ"] = 'simple' + return svc + + +def parse_svc(svc_orig, import_id,config2import): + svc = extract_base_svc_infos(svc_orig, import_id) + if 'protocol' in svc_orig: + proto_string = 'undefined' + if 'tcp' in svc_orig['protocol']: + svc["ip_proto"] = 6 + proto_string = 'tcp' + svc["svc_port"] = svc_orig['protocol']['tcp']['port'] + elif 'udp' in svc_orig['protocol']: + svc["ip_proto"] = 17 + proto_string = 'udp' + + if proto_string=='undefined': + svc["svc_name"] += " [Protocol \"" + str(svc_orig["protocol"]) + "\" not supported]" + else: + port_string = svc_orig['protocol'][proto_string]['port'] + if ',' in port_string: + svc["svc_typ"] = "group" + svc["svc_port"] = None + members = [] + for p in port_string.split(","): + hlp_svc = create_helper_service(p, proto_string, svc["svc_name"], import_id) + add_service(hlp_svc, config2import) + members.append(hlp_svc['svc_uid']) + svc["svc_members"] = list_delimiter.join(members) + svc["svc_member_refs"] = list_delimiter.join(members) + else: # just a single port (range) + extract_port_for_service(port_string, svc) + return svc + + +def add_service(svc, config2import): + config2import['service_objects'].append(svc) + + +def extract_port_for_service(port_string, svc): + if '-' in port_string: + port_range = port_string.split("-") + if len(port_range)==2: + svc["svc_port"] = port_range[0] + svc["svc_port_end"] = port_range[1] + else: + logger = getFwoLogger() + logger.warning("found strange port range with more than one hyphen: " + str(port_string)) + else: + svc["svc_port"] = port_string + + +def create_helper_service(ports, proto_string, parent_svc_name, import_id): + svc = { + "svc_name": parent_svc_name + "_" + proto_string + "_" + ports, + "svc_uid": parent_svc_name + "_" + proto_string + "_" + ports, + "svc_comment": "helper service for Palo Alto multiple port range object: " + parent_svc_name, + "control_id": import_id, + "svc_typ": 'simple' + } + + extract_port_for_service(ports, svc) + return svc + + +def parse_svc_list(nw_obj_list, import_id, obj_list, id, type='network'): + refs = [] + names = [] + for obj_name in nw_obj_list: + names.append(obj_name) + refs.append(lookup_svc_obj_uid(obj_name, obj_list, import_id, type=type)) + return list_delimiter.join(refs), list_delimiter.join(names) + + +def lookup_svc_obj_uid(obj_name, obj_list, import_id, type='network'): + logger = getFwoLogger() + for o in obj_list: + if type=='service' and 'svc_name' in o: + if o['svc_name']==obj_name: + return o['svc_uid'] + else: + logger.warning("could not find object name in object " + str(o)) + + # could not find existing obj in obj list, so creating new one + return add_svc_obj(obj_name, obj_list, import_id) + + +def add_svc_obj(svc_in, svc_list, import_id): + svc_obj = {} + svc_obj['svc_name'] = "#" + svc_in + svc_obj['svc_uid'] = "#" + svc_in + svc_obj['control_id'] = import_id + svc_obj['svc_typ'] = 'simple' + + svc_list.append(svc_obj) + return svc_obj['svc_name'] diff --git a/roles/importer/files/importer/vmwareNSX/nsx_zone.py b/roles/importer/files/importer/vmwareNSX/nsx_zone.py new file mode 100644 index 000000000..a55f86dc9 --- /dev/null +++ b/roles/importer/files/importer/vmwareNSX/nsx_zone.py @@ -0,0 +1,15 @@ +from asyncio.log import logger +from fwo_log import getFwoLogger +from fwo_const import list_delimiter + + +def normalize_zones(full_config, config2import, import_id): + zones = [] + for zone_orig in full_config["/Network/Zones"]: + zones.append({ + "zone_name": zone_orig["@name"], + "zone_uid": zone_orig["@name"], + "control_id": import_id + }) + + config2import['zone_objects'] = zones diff --git a/roles/ui/files/FWO.UI/Pages/Settings/SettingsGateways.razor b/roles/ui/files/FWO.UI/Pages/Settings/SettingsGateways.razor index 0c3ae32a2..91a1a512c 100644 --- a/roles/ui/files/FWO.UI/Pages/Settings/SettingsGateways.razor +++ b/roles/ui/files/FWO.UI/Pages/Settings/SettingsGateways.razor @@ -104,7 +104,8 @@ actDevice.DeviceType.Manufacturer == "Fortinet" || actDevice.DeviceType.Manufacturer == "Cisco" || actDevice.DeviceType.Manufacturer == "Palo Alto" || - actDevice.DeviceType.Manufacturer == "Microsoft") + actDevice.DeviceType.Manufacturer == "Microsoft" || + actDevice.DeviceType.Manufacturer == "VMWare") { @if (actDevice.DeviceType.Manufacturer == "Fortinet" && actDevice.Management.DeviceType.IsLegacyDevType()) { From 34c55a94420213e61b41c85957d79e0620babbb6 Mon Sep 17 00:00:00 2001 From: abarz722 Date: Tue, 20 Feb 2024 14:35:12 +0100 Subject: [PATCH 02/84] iconify modelling --- .../files/sql/creation/fworch-fill-stm.sql | 18 ++++ .../files/sql/idempotent/fworch-texts.sql | 39 +++++++-- roles/database/files/upgrade/8.0.1.sql | 17 ++++ .../files/FWO.Config.Api/Data/ConfigData.cs | 3 + .../files/FWO.Config.Api/GlobalConstants.cs | 10 +++ .../Pages/Help/HelpSettingsModelling.cshtml | 3 +- .../Help/HelpSettingsModellingPers.cshtml | 22 +++++ .../Pages/Help/HelpSettingsSidebar.cshtml | 3 + roles/ui/files/FWO.UI/Pages/Help/Index.cshtml | 3 + .../NetworkModelling/ConnectionTable.razor | 6 +- .../EditAppRoleLeftSide.razor | 2 +- .../Pages/NetworkModelling/EditConn.razor | 2 +- .../NetworkModelling/EditConnLeftSide.razor | 54 ++++++++---- .../EditServiceGroupLeftSide.razor | 8 +- .../NetworkModelling/ManualAppServer.razor | 21 +++-- .../NetworkModelling/NetworkModelling.razor | 8 +- .../FWO.UI/Pages/Settings/SearchUser.razor | 2 +- .../Pages/Settings/SettingsModelling.razor | 16 ++-- .../Settings/SettingsModellingPers.razor | 85 +++++++++++++++++++ .../FWO.UI/Services/ModellingHandlerBase.cs | 8 ++ .../files/FWO.UI/Shared/SettingsLayout.razor | 7 ++ 21 files changed, 284 insertions(+), 53 deletions(-) create mode 100644 roles/database/files/upgrade/8.0.1.sql create mode 100644 roles/ui/files/FWO.UI/Pages/Help/HelpSettingsModellingPers.cshtml create mode 100644 roles/ui/files/FWO.UI/Pages/Settings/SettingsModellingPers.razor diff --git a/roles/database/files/sql/creation/fworch-fill-stm.sql b/roles/database/files/sql/creation/fworch-fill-stm.sql index 062deaeb2..eb47e43a4 100644 --- a/roles/database/files/sql/creation/fworch-fill-stm.sql +++ b/roles/database/files/sql/creation/fworch-fill-stm.sql @@ -32,6 +32,7 @@ insert into config (config_key, config_value, config_user) VALUES ('recCheckActi insert into config (config_key, config_value, config_user) VALUES ('recCheckEmailSubject', 'Upcoming rule recertifications', 0); insert into config (config_key, config_value, config_user) VALUES ('recCheckEmailUpcomingText', 'The following rules are upcoming to be recertified:', 0); insert into config (config_key, config_value, config_user) VALUES ('recCheckEmailOverdueText', 'The following rules are overdue to be recertified:', 0); +insert into config (config_key, config_value, config_user) VALUES ('recCheckParams', '{"check_interval":2,"check_offset":1,"check_weekday":null,"check_dayofmonth":null}', 0); insert into config (config_key, config_value, config_user) VALUES ('recRefreshStartup', 'False', 0); insert into config (config_key, config_value, config_user) VALUES ('recRefreshDaily', 'False', 0); insert into config (config_key, config_value, config_user) VALUES ('messageViewTime', '7', 0); @@ -80,6 +81,23 @@ insert into config (config_key, config_value, config_user) VALUES ('importSubnet insert into config (config_key, config_value, config_user) VALUES ('importAppDataPath', '[]', 0); insert into config (config_key, config_value, config_user) VALUES ('importSubnetDataPath', '', 0); insert into config (config_key, config_value, config_user) VALUES ('modNamingConvention', '{"networkAreaRequired":false,"fixedPartLength":0,"freePartLength":0,"networkAreaPattern":"","appRolePattern":""}', 0); +insert into config (config_key, config_value, config_user) VALUES ('modIconify', 'True', 0); +insert into config (config_key, config_value, config_user) VALUES ('reducedProtocolSet', 'True', 0); +insert into config (config_key, config_value, config_user) VALUES ('overviewDisplayLines', '3', 0); +insert into config (config_key, config_value, config_user) VALUES ('emailServerAddress', '', 0); +insert into config (config_key, config_value, config_user) VALUES ('emailPort', '0', 0); +insert into config (config_key, config_value, config_user) VALUES ('emailTls', 'None', 0); +insert into config (config_key, config_value, config_user) VALUES ('emailUser', '', 0); +insert into config (config_key, config_value, config_user) VALUES ('emailPassword', '', 0); +insert into config (config_key, config_value, config_user) VALUES ('emailSenderAddress', '', 0); +insert into config (config_key, config_value, config_user) VALUES ('impChangeNotifyRecipients', '', 0); +insert into config (config_key, config_value, config_user) VALUES ('impChangeNotifySubject', '', 0); +insert into config (config_key, config_value, config_user) VALUES ('impChangeNotifyBody', '', 0); +insert into config (config_key, config_value, config_user) VALUES ('impChangeNotifyActive', 'False', 0); +insert into config (config_key, config_value, config_user) VALUES ('impChangeNotifyType', '0', 0); +insert into config (config_key, config_value, config_user) VALUES ('impChangeNotifySleepTime', '0', 0); +insert into config (config_key, config_value, config_user) VALUES ('impChangeNotifyStartAt', '00:00:00', 0); + INSERT INTO "report_format" ("report_format_name") VALUES ('json'); INSERT INTO "report_format" ("report_format_name") VALUES ('pdf'); diff --git a/roles/database/files/sql/idempotent/fworch-texts.sql b/roles/database/files/sql/idempotent/fworch-texts.sql index 8ecfd3980..3f634659d 100644 --- a/roles/database/files/sql/idempotent/fworch-texts.sql +++ b/roles/database/files/sql/idempotent/fworch-texts.sql @@ -530,6 +530,8 @@ INSERT INTO txt VALUES ('no_rules_gtw', 'German', 'Anzahl Regeln pro Gatew INSERT INTO txt VALUES ('no_rules_gtw', 'English', 'Number of Rules per Gateway'); INSERT INTO txt VALUES ('negated', 'German', 'nicht'); INSERT INTO txt VALUES ('negated', 'English', 'not'); +INSERT INTO txt VALUES ('network_object', 'German', 'Netzwerkobjekt'); +INSERT INTO txt VALUES ('network_object', 'English', 'Network Object'); INSERT INTO txt VALUES ('network_objects', 'German', 'Netzwerkobjekte'); INSERT INTO txt VALUES ('network_objects', 'English', 'Network Objects'); INSERT INTO txt VALUES ('network_services', 'German', 'Netzwerkdienste'); @@ -1770,6 +1772,10 @@ INSERT INTO txt VALUES ('appRolePattern', 'German', 'Muster App Rolle'); INSERT INTO txt VALUES ('appRolePattern', 'English', 'App Role Pattern'); INSERT INTO txt VALUES ('import_source', 'German', 'Importquelle'); INSERT INTO txt VALUES ('import_source', 'English', 'Import Source'); +INSERT INTO txt VALUES ('modelling_settings', 'German', 'Modellierungseinstellungen'); +INSERT INTO txt VALUES ('modelling_settings', 'English', 'Modelling Settings'); +INSERT INTO txt VALUES ('modIconify', 'German', 'Nutzung von Piktogrammen'); +INSERT INTO txt VALUES ('modIconify', 'English', 'Prefer use of Icons'); -- monitoring INSERT INTO txt VALUES ('open_alerts', 'German', 'Offene Alarme'); @@ -2167,6 +2173,8 @@ INSERT INTO txt VALUES ('U5413', 'German', 'Anpassung der persönlichen Rep INSERT INTO txt VALUES ('U5413', 'English', 'Adapt your personal reporting settings'); INSERT INTO txt VALUES ('U5414', 'German', 'Anpassung der persönlichen Rezertifizierungseinstellungen'); INSERT INTO txt VALUES ('U5414', 'English', 'Adapt your personal recertification settings'); +INSERT INTO txt VALUES ('U5415', 'German', 'Anpassung der persönlichen Modellierungseinstellungen'); +INSERT INTO txt VALUES ('U5415', 'English', 'Adapt your personal modelling settings'); INSERT INTO txt VALUES ('U5501', 'German', 'Sind sie sicher, dass sie folgenden Status löschen wollen: '); INSERT INTO txt VALUES ('U5501', 'English', 'Are you sure you want to delete state: '); @@ -3398,16 +3406,18 @@ INSERT INTO txt VALUES ('H5013', 'German', 'Im Kapitel "Voreinstellungen" kann Allgemeinen Rezertifizierungs- und Modellierungseinstellungen. '); INSERT INTO txt VALUES ('H5013', 'English', 'In the "Defaults" chapter the administrator can define Default Values applicable to all users - and define email-, importer- and Password Policy settings. + and define email-, importer- and Password Policy settings. Additionally there are the module specific General Recertification and Modelling Settings. '); INSERT INTO txt VALUES ('H5014', 'German', 'Das Kapitel "Persönlich" ist für alle Nutzer zugänglich. Hier können das individuelle Password, die bevorzugte Sprache und Reporting-Einstellungen gesetzt werden. Nutzer mit Rezertifizierer-Rolle können auch ihre Rezertifizierungseinstellungen anpassen. + Das gleiche gilt für Modellierer in den Modellierungseinstellungen. '); INSERT INTO txt VALUES ('H5014', 'English', 'The "Personal" chapter is accessible by all users, where they can set their individual Password, Language and Reporting preferences. Users with recertifier role have also the possibility to adjust their Recertification Setting. + Same for modellers in the Modelling Settings. '); INSERT INTO txt VALUES ('H5015', 'German', 'Das Kapitel "Workflow" dient dem Administrator, einen Workflow aufzusetzen. Dazu gehört die Definition der angebotenen Aktionen, der verwendeten Stati und den Statusübergängen in den zentralen Status-Matrizen. @@ -4310,8 +4320,12 @@ INSERT INTO txt VALUES ('H5603', 'German', 'Server in Verbindung erlauben: Steu INSERT INTO txt VALUES ('H5603', 'English', 'Allow Servers in Connection: Controls, if App Servers are offered in the Library besides the App Roles for direct use in the connections.'); INSERT INTO txt VALUES ('H5604', 'German', 'Einfache Dienste in Verbindung erlauben: Steuert, ob in der Bibliothek neben den Servicegruppen auch einfache Services zur direkten Verwendung in den Verbindungen angeboten werden.'); INSERT INTO txt VALUES ('H5604', 'English', 'Allow Simple Services in Connection: Controls, if simple Services are offered in the Library besides the Service Groups for direct use in the connections.'); -INSERT INTO txt VALUES ('H5605', 'German', 'Max. Anzahl Zeilen in Übersicht: Definiert die Zeilenzahl innerhalb eines Eintrags in der Übersichtstabelle der Verbindungen, ab der die Elemente eingeklappt dargestellt werden.'); -INSERT INTO txt VALUES ('H5605', 'English', 'Max. Number of Rows in Overview: Defines the number of rows inside an entry of the connections overview table, from which the elements are displayed retracted.'); +INSERT INTO txt VALUES ('H5605', 'German', 'Max. Anzahl Zeilen in Übersicht: Definiert die Zeilenzahl innerhalb eines Eintrags in der Übersichtstabelle der Verbindungen, ab der die Elemente eingeklappt dargestellt werden. + Wird vom Administrator allgemein vorausgewählt, kann aber vom Nutzer in den persönlichen Einstellungen überschrieben werden. +'); +INSERT INTO txt VALUES ('H5605', 'English', 'Max. Number of Rows in Overview: Defines the number of rows inside an entry of the connections overview table, from which the elements are displayed retracted. + Generally set by the administrator but can be overwritten in the personal settings of the user. +'); INSERT INTO txt VALUES ('H5606', 'German', 'Netzwerkarea vorgeschrieben: Wenn dieses Flag gesetzt ist, müssen die auszuwählenden App Server einer festen Area zugeordnet sein. Es werden dann beim Zusammenstellen einer App Rolle in der Bibliothek nur die der aktuell ausgewählten Area zugehörigen App Server angeboten. Für die Namensgebung der App Rolle wird dann die in den folgenden Punkten definierte Namenskonvention angewendet. @@ -4373,6 +4387,15 @@ INSERT INTO txt VALUES ('H5616', 'German', 'Import Subnetzdaten-Start: Legt ein INSERT INTO txt VALUES ('H5616', 'English', 'Import Subnet data start at: Import App data start at: Defines a referential time from which the Subnte data import intervals are calculated.'); INSERT INTO txt VALUES ('H5617', 'German', 'Reduzierten Protokollset darstellen: Nur eine begrenzte Zahl von Protokollen wird zur Auswahl angeboten (TCP, UDP, ICMP).'); INSERT INTO txt VALUES ('H5617', 'English', 'Display reduced Protocol set: Offer only a reduced number of protocols for selection (TCP, UDP, ICMP).'); +INSERT INTO txt VALUES ('H5618', 'German', 'Nutzung von Piktogrammen: Vorzugsweise Nutzung von Piktogrammen wo sinnvoll. Wird vom Administrator allgemein vorausgewählt, kann aber vom Nutzer in den persönlichen Einstellungen überschrieben werden.'); +INSERT INTO txt VALUES ('H5618', 'English', 'Prefer use of Icons: Use icons where reasonnable. Generally set by the administrator but can be overwritten in the personal settings of the user.'); +INSERT INTO txt VALUES ('H5621', 'German', 'Ein Modellierer kann einige persönliche Voreinstellungen für die Darstellung der Modellierung überschreiben. + Ausgangswert ist der vom Admin in den Modellierungseinstellungen gesetzte Wert. +'); +INSERT INTO txt VALUES ('H5621', 'English', 'A modeller can overwrite some personal settings for the modelling layout. + The default value is set by the admin in the Modelling Settings. +'); + INSERT INTO txt VALUES ('H5701', 'German', 'Die in der Datenbank hinterlegten sprachabhängigen Texte können individuell überschrieben werden. Dabei werden die vom System vorgegebenen Texte nicht geändert, sondern nur durch die hier definierten Texte - falls vorhanden - überblendet. Die hier gemachten Änderungen werden in der UI beim nächsten Login sichtbar, bei Hilfetexten erst nach dem nächsten Restart. @@ -4489,7 +4512,7 @@ INSERT INTO txt VALUES ('H6906', 'German', 'Anmelden zur Generierung eines g&uu INSERT INTO txt VALUES ('H6906', 'English', 'Login to get a JWT for the steps further below'); INSERT INTO txt VALUES ('H6907', 'German', 'Auflisten bereits vorhandener Reports im Archiv (hier der letzte generierte zum Schedule)'); INSERT INTO txt VALUES ('H6907', 'English', 'List generated reports in archive (here we get the last one generated for the respective schedule)'); -INSERT INTO txt VALUES ('H6921', 'German', 'Der Import von Applikationsdaten wird aus einer oder mehreren .json-Dateien mit den in den Modellierungs-Einstellungen definierten Pfaden und Namen gespeist. +INSERT INTO txt VALUES ('H6921', 'German', 'Der Import von Applikationsdaten wird aus einer oder mehreren .json-Dateien mit den in den Modellierungseinstellungen definierten Pfaden und Namen gespeist. Dort kann auch jeweils ein gleichnamiges Python-Skript (mit der Endung .py) zur Erzeugung eben dieser Dateien hinterlegt werden. Die .json-Datei hat die folgende Struktur: '); INSERT INTO txt VALUES ('H6921', 'English', 'The import of application data is fed from one or several .json files with paths and names defined in the Modelling Settings. @@ -4531,7 +4554,7 @@ INSERT INTO txt VALUES ('H6922', 'English', 'These fields have the following mea '); -INSERT INTO txt VALUES ('H6931', 'German', 'Der Import von Subnetzdaten wird aus einer .json-Datei mit dem in den Modellierungs-Einstellungen definierten Pfad und Namen gespeist. +INSERT INTO txt VALUES ('H6931', 'German', 'Der Import von Subnetzdaten wird aus einer .json-Datei mit dem in den Modellierungseinstellungen definierten Pfad und Namen gespeist. Dort kann auch ein gleichnamiges Python-Skript (mit der Endung .py) zur Erzeugung eben dieser Datei hinterlegt werden. Die .json-Datei hat die folgende Struktur: '); INSERT INTO txt VALUES ('H6931', 'English', 'The import of subnet data is fed from a .json file with path and name defined in the Modelling Settings. @@ -5422,7 +5445,7 @@ INSERT INTO txt VALUES ('H9001', 'German', 'Insbesondere in grösseren Netz und ihre Elemente nach vorgegebenen Kriterien zu verknüpfen. Dadurch wird ein Kommunikationsprofil erzeugt, bestehend aus einem Satz von Verbindungen und Schnittstellen.
Zur Definition der Schnittstellen und Verbindungen wird auf der linken Seite eine Bibliothek bereitgestellt, in der zunächst die zur Applikation zugeordneten (in der Regel aus Fremdsystemen importierten) Host-Adressen (App-Server) angeboten werden. Diese können im ersten Schritt zu App-Rollen gebündelt werden (sh. Netzwerkobjekte). - Die App-Rollen (und je nach Modellierungs-Einstellungen auch die App-Server selbst) können dann als Quelle oder Ziel in die zu erstellende Verbindung übertragen werden. + Die App-Rollen (und je nach Modellierungseinstellungen auch die App-Server selbst) können dann als Quelle oder Ziel in die zu erstellende Verbindung übertragen werden. Hinzu können noch weitere Objekte (z. B. Netzwerke) kommen, und es können (interne und externe) Schnittstellen eingebunden werden.
Desweiteren werden in der Bibliothek vordefinierte (vom Administrator eingestellte) Dienste angeboten. Diese können durch selbst definierte Dienste ergänzt, als Dienstgruppen gebündelt und dann in den zu definierenden Verbindungen verwendet werden. @@ -5502,7 +5525,7 @@ INSERT INTO txt VALUES ('H9032', 'English', 'App Server: Elementary components ( (Import Settings, Import Interface), but can also be created manually by the administrator. Depending on the settings (according to company requirements) App Servers can be used directly in the connections or have to be bundled in App Roles first. '); -INSERT INTO txt VALUES ('H9033', 'German', 'App-Rollen: Dienen der Bündelung von App-Servern. Falls in den Modellierungs-Einstellungen so vorgesehen, +INSERT INTO txt VALUES ('H9033', 'German', 'App-Rollen: Dienen der Bündelung von App-Servern. Falls in den Modellierungseinstellungen so vorgesehen, müssen sie einer Netzwerkarea zugehören. Beim Erstellen der App-Rolle muss dann zunächst eine Area ausgewählt werden, nur von dieser werden dann die App-Server in der Bibliothek angeboten. Die Namen der App-Rollen müssen dann einer ebenfalls in den Einstellungen vorgegebenen Namenskonvention folgen. '); @@ -5516,7 +5539,7 @@ INSERT INTO txt VALUES ('H9034', 'German', 'Netzwerkareas: Werden über die INSERT INTO txt VALUES ('H9034', 'English', 'Network Areas: Are imported via the Subnet Data Import Interface (Import Settings, Import Interface). They can be searched an selected from the library and then used for source and destination of the connections. '); -INSERT INTO txt VALUES ('H9041', 'German', 'Es wird zwischen einfachen Diensten und Dienstgruppen unterschieden. In den Modellierungs-Einstellungen +INSERT INTO txt VALUES ('H9041', 'German', 'Es wird zwischen einfachen Diensten und Dienstgruppen unterschieden. In den Modellierungseinstellungen kann festgelegt werden, dass nur Dienstgruppen in der Definition von Verbindungen genutzt werden können, ansonsten sind auch einfache Dienste zugelassen. '); INSERT INTO txt VALUES ('H9041', 'English', 'There is a differentiation between simple services and Service Groups. It can be defined in the Modelling Settings, diff --git a/roles/database/files/upgrade/8.0.1.sql b/roles/database/files/upgrade/8.0.1.sql new file mode 100644 index 000000000..d21147e47 --- /dev/null +++ b/roles/database/files/upgrade/8.0.1.sql @@ -0,0 +1,17 @@ +insert into config (config_key, config_value, config_user) VALUES ('modIconify', 'True', 0) ON CONFLICT DO NOTHING; +insert into config (config_key, config_value, config_user) VALUES ('reducedProtocolSet', 'True', 0) ON CONFLICT DO NOTHING; +insert into config (config_key, config_value, config_user) VALUES ('overviewDisplayLines', '3', 0) ON CONFLICT DO NOTHING; +insert into config (config_key, config_value, config_user) VALUES ('emailServerAddress', '', 0) ON CONFLICT DO NOTHING; +insert into config (config_key, config_value, config_user) VALUES ('emailPort', '0', 0) ON CONFLICT DO NOTHING; +insert into config (config_key, config_value, config_user) VALUES ('emailTls', 'None', 0) ON CONFLICT DO NOTHING; +insert into config (config_key, config_value, config_user) VALUES ('emailUser', '', 0) ON CONFLICT DO NOTHING; +insert into config (config_key, config_value, config_user) VALUES ('emailPassword', '', 0) ON CONFLICT DO NOTHING; +insert into config (config_key, config_value, config_user) VALUES ('emailSenderAddress', '', 0) ON CONFLICT DO NOTHING; +insert into config (config_key, config_value, config_user) VALUES ('impChangeNotifyRecipients', '', 0) ON CONFLICT DO NOTHING; +insert into config (config_key, config_value, config_user) VALUES ('impChangeNotifySubject', '', 0) ON CONFLICT DO NOTHING; +insert into config (config_key, config_value, config_user) VALUES ('impChangeNotifyBody', '', 0) ON CONFLICT DO NOTHING; +insert into config (config_key, config_value, config_user) VALUES ('impChangeNotifyActive', 'False', 0) ON CONFLICT DO NOTHING; +insert into config (config_key, config_value, config_user) VALUES ('impChangeNotifyType', '0', 0) ON CONFLICT DO NOTHING; +insert into config (config_key, config_value, config_user) VALUES ('impChangeNotifySleepTime', '0', 0) ON CONFLICT DO NOTHING; +insert into config (config_key, config_value, config_user) VALUES ('impChangeNotifyStartAt', '00:00:00', 0) ON CONFLICT DO NOTHING; +insert into config (config_key, config_value, config_user) VALUES ('recCheckParams', '{"check_interval":2,"check_offset":1,"check_weekday":null,"check_dayofmonth":null}', 0) ON CONFLICT DO NOTHING; diff --git a/roles/lib/files/FWO.Config.Api/Data/ConfigData.cs b/roles/lib/files/FWO.Config.Api/Data/ConfigData.cs index cb9b3fde3..004020017 100644 --- a/roles/lib/files/FWO.Config.Api/Data/ConfigData.cs +++ b/roles/lib/files/FWO.Config.Api/Data/ConfigData.cs @@ -243,6 +243,9 @@ public class ConfigData : ICloneable [JsonProperty("modNamingConvention"), JsonPropertyName("modNamingConvention")] public string ModNamingConvention { get; set; } = ""; + [JsonProperty("modIconify"), JsonPropertyName("modIconify")] + public bool ModIconify { get; set; } = true; + public ConfigData(bool editable = false) { diff --git a/roles/lib/files/FWO.Config.Api/GlobalConstants.cs b/roles/lib/files/FWO.Config.Api/GlobalConstants.cs index d47e7fcd7..117a17e6d 100644 --- a/roles/lib/files/FWO.Config.Api/GlobalConstants.cs +++ b/roles/lib/files/FWO.Config.Api/GlobalConstants.cs @@ -39,4 +39,14 @@ public struct GlobalConst public const string kImplementer = "implementer"; public const string kReviewer = "reviewer"; } + + public struct Icons + { + public const string Add = "oi-plus"; + public const string Edit = "oi-wrench"; + public const string Delete = "oi-trash"; + public const string Search = "oi-magnifying-glass"; + public const string Use = "oi-arrow-thick-right"; + public const string Unuse = "oi-arrow-thick-left"; + } } diff --git a/roles/ui/files/FWO.UI/Pages/Help/HelpSettingsModelling.cshtml b/roles/ui/files/FWO.UI/Pages/Help/HelpSettingsModelling.cshtml index 2e8702bb6..b945455d8 100644 --- a/roles/ui/files/FWO.UI/Pages/Help/HelpSettingsModelling.cshtml +++ b/roles/ui/files/FWO.UI/Pages/Help/HelpSettingsModelling.cshtml @@ -12,7 +12,7 @@ @inject UserConfig userConfig
-

@(userConfig.GetText("modelling"))

+

@(userConfig.GetText("modelling_settings"))

@(Html.Raw(userConfig.GetText("H5601")))

@(Html.Raw(userConfig.GetText("general"))) @@ -21,6 +21,7 @@
  • @(Html.Raw(userConfig.GetText("H5603")))
  • @(Html.Raw(userConfig.GetText("H5604")))
  • @(Html.Raw(userConfig.GetText("H5605")))
    • +
  • @(Html.Raw(userConfig.GetText("H5618")))
  • @(Html.Raw(userConfig.GetText("H5617")))
    • @(Html.Raw(userConfig.GetText("naming_convention"))) diff --git a/roles/ui/files/FWO.UI/Pages/Help/HelpSettingsModellingPers.cshtml b/roles/ui/files/FWO.UI/Pages/Help/HelpSettingsModellingPers.cshtml new file mode 100644 index 000000000..05b87a3d7 --- /dev/null +++ b/roles/ui/files/FWO.UI/Pages/Help/HelpSettingsModellingPers.cshtml @@ -0,0 +1,22 @@ +@page "/help/settings/modellingpersonal" +@model FWO.Ui.Pages.Help.MainModel +@{ + Layout = "HelpLayout"; +} +@section sidebar{ + @{ + await Html.RenderPartialAsync("HelpSettingsSidebar.cshtml"); + } +} +@using FWO.Config.Api +@inject UserConfig userConfig + +
    +

    @(userConfig.GetText("modelling_settings"))

    + @(Html.Raw(userConfig.GetText("H5621"))) +

    +
      +
    • @(Html.Raw(userConfig.GetText("H5605")))
      • +
    • @(Html.Raw(userConfig.GetText("H5618")))
      • +
    +
    diff --git a/roles/ui/files/FWO.UI/Pages/Help/HelpSettingsSidebar.cshtml b/roles/ui/files/FWO.UI/Pages/Help/HelpSettingsSidebar.cshtml index 72db3d069..a5b788f14 100644 --- a/roles/ui/files/FWO.UI/Pages/Help/HelpSettingsSidebar.cshtml +++ b/roles/ui/files/FWO.UI/Pages/Help/HelpSettingsSidebar.cshtml @@ -87,6 +87,9 @@ @(userConfig.GetText("recertification")) + + @(userConfig.GetText("modelling")) +
    diff --git a/roles/ui/files/FWO.UI/Pages/Help/Index.cshtml b/roles/ui/files/FWO.UI/Pages/Help/Index.cshtml index d0336c036..d780971f8 100644 --- a/roles/ui/files/FWO.UI/Pages/Help/Index.cshtml +++ b/roles/ui/files/FWO.UI/Pages/Help/Index.cshtml @@ -201,6 +201,9 @@
  • @userConfig.GetText("recert_settings")
    • +
  • + @userConfig.GetText("modelling_settings") +
  • @userConfig.GetText("api") diff --git a/roles/ui/files/FWO.UI/Pages/NetworkModelling/ConnectionTable.razor b/roles/ui/files/FWO.UI/Pages/NetworkModelling/ConnectionTable.razor index 47ffb003a..9a7c2de32 100644 --- a/roles/ui/files/FWO.UI/Pages/NetworkModelling/ConnectionTable.razor +++ b/roles/ui/files/FWO.UI/Pages/NetworkModelling/ConnectionTable.razor @@ -12,13 +12,13 @@ diff --git a/roles/ui/files/FWO.UI/Pages/NetworkModelling/EditAppRoleLeftSide.razor b/roles/ui/files/FWO.UI/Pages/NetworkModelling/EditAppRoleLeftSide.razor index 466384ab6..0c31a0529 100644 --- a/roles/ui/files/FWO.UI/Pages/NetworkModelling/EditAppRoleLeftSide.razor +++ b/roles/ui/files/FWO.UI/Pages/NetworkModelling/EditAppRoleLeftSide.razor @@ -19,7 +19,7 @@
    + AppRoleHandlerChanged.InvokeAsync(AppRoleHandler);}">@(AppRoleHandler.DisplayButton("to_app_role", Icons.Use))
    } diff --git a/roles/ui/files/FWO.UI/Pages/NetworkModelling/EditConn.razor b/roles/ui/files/FWO.UI/Pages/NetworkModelling/EditConn.razor index 780530d03..f8412facb 100644 --- a/roles/ui/files/FWO.UI/Pages/NetworkModelling/EditConn.razor +++ b/roles/ui/files/FWO.UI/Pages/NetworkModelling/EditConn.razor @@ -181,7 +181,7 @@ { @if(ConnHandler.ActConn.UsedInterfaceId != null) { - + } } diff --git a/roles/ui/files/FWO.UI/Pages/NetworkModelling/EditConnLeftSide.razor b/roles/ui/files/FWO.UI/Pages/NetworkModelling/EditConnLeftSide.razor index dbc496f45..6abc9f8f7 100644 --- a/roles/ui/files/FWO.UI/Pages/NetworkModelling/EditConnLeftSide.razor +++ b/roles/ui/files/FWO.UI/Pages/NetworkModelling/EditConnLeftSide.razor @@ -21,20 +21,22 @@ @if(!ConnHandler.SrcDropForbidden() && selectedNwElems.Count > 0) { + {NetworkElemsToConn(true); ConnHandlerChanged.InvokeAsync(ConnHandler);}"> + @(ConnHandler.DisplayButton("to_source", Icons.Use, "source")) } @if(!ConnHandler.DstDropForbidden() && selectedNwElems.Count > 0) { + {NetworkElemsToConn(false); ConnHandlerChanged.InvokeAsync(ConnHandler);}"> + @(ConnHandler.DisplayButton("to_dest", Icons.Use, "destination")) }
    - - + + @if(selectedNwElems.Count == 1) { @if(selectedNwElems[0].Key == (int)ModellingTypes.ObjectType.AppRole) @@ -43,10 +45,11 @@ { + ConnHandlerChanged.InvokeAsync(ConnHandler);}">@(ConnHandler.DisplayButton("edit", Icons.Edit)) + selectedNwElems = new(); await ConnHandlerChanged.InvokeAsync(ConnHandler);}"> + @(ConnHandler.DisplayButton("delete", Icons.Delete)) } } else if(selectedNwElems[0].Key == (int)ModellingTypes.ObjectType.AppServer) @@ -59,7 +62,8 @@ { + selectedNwElems = new(); ConnHandlerChanged.InvokeAsync(ConnHandler);}"> + @(ConnHandler.DisplayButton("remove", Icons.Delete)) } } @@ -78,12 +82,14 @@ @if(selectedSvcElems.Count > 0) { + {ServiceElemsToConn(); ConnHandlerChanged.InvokeAsync(ConnHandler);}"> + @(ConnHandler.DisplayButton("to_service", Icons.Use)) }
    - + @if(selectedSvcElems.Count == 1) { @if(selectedSvcElems[0].Key == (int)ModellingTypes.ObjectType.ServiceGroup) @@ -92,10 +98,12 @@ { + ConnHandlerChanged.InvokeAsync(ConnHandler);}"> + @(ConnHandler.DisplayButton("edit_service_group", Icons.Edit)) + selectedSvcElems = new(); await ConnHandlerChanged.InvokeAsync(ConnHandler);}"> + @(ConnHandler.DisplayButton("delete", Icons.Delete)) } } else @@ -104,10 +112,12 @@ { + ConnHandlerChanged.InvokeAsync(ConnHandler);}"> + @(ConnHandler.DisplayButton("edit_service", Icons.Edit)) + selectedSvcElems = new(); await ConnHandlerChanged.InvokeAsync(ConnHandler);}"> + @(ConnHandler.DisplayButton("delete", Icons.Delete)) } } } @@ -126,17 +136,20 @@ @if(selectedInterfaces.Count > 0) { + {ConnHandler.InterfaceToConn(selectedInterfaces[0]); ConnHandlerChanged.InvokeAsync(ConnHandler);}"> + @(ConnHandler.DisplayButton("use", Icons.Use)) }
    - + @if(selectedInterfaces.Count == 1) { + selectedInterfaces = new(); ConnHandlerChanged.InvokeAsync(ConnHandler);}"> + @(ConnHandler.DisplayButton("remove", Icons.Delete)) }

    @@ -192,6 +205,11 @@ private bool SearchNwObjectMode = false; private int sidebarLeftWidth { get { return Width; } set { Width = value; WidthChanged.InvokeAsync(Width);}} + + @* private MarkupString DisplayButton(string text, string icon, string iconText = "") + { + return (MarkupString)(userConfig.ModIconify ? icon + (iconText != "" ? " " + userConfig.GetText(iconText) : "") : userConfig.GetText(text)); + } *@ private bool InterfaceToConn(ModellingConnection interf) { diff --git a/roles/ui/files/FWO.UI/Pages/NetworkModelling/EditServiceGroupLeftSide.razor b/roles/ui/files/FWO.UI/Pages/NetworkModelling/EditServiceGroupLeftSide.razor index c3f55cfbd..7a13ba262 100644 --- a/roles/ui/files/FWO.UI/Pages/NetworkModelling/EditServiceGroupLeftSide.razor +++ b/roles/ui/files/FWO.UI/Pages/NetworkModelling/EditServiceGroupLeftSide.razor @@ -19,20 +19,20 @@
    + SvcGroupHandlerChanged.InvokeAsync(SvcGroupHandler);}">@(SvcGroupHandler.DisplayButton("to_services_group", Icons.Use))
    }
    + {SvcGroupHandler.CreateService(); SvcGroupHandlerChanged.InvokeAsync(SvcGroupHandler);}">@(SvcGroupHandler.DisplayButton("add_service", Icons.Add, "service")) @if(selectedServices.Count == 1) { + {SvcGroupHandler.EditService(selectedServices.First()); SvcGroupHandlerChanged.InvokeAsync(SvcGroupHandler);}">@(SvcGroupHandler.DisplayButton("edit_service", Icons.Edit)) + await SvcGroupHandlerChanged.InvokeAsync(SvcGroupHandler);}">@(SvcGroupHandler.DisplayButton("delete", Icons.Delete)) }
    diff --git a/roles/ui/files/FWO.UI/Pages/NetworkModelling/ManualAppServer.razor b/roles/ui/files/FWO.UI/Pages/NetworkModelling/ManualAppServer.razor index 703b57e13..176437887 100644 --- a/roles/ui/files/FWO.UI/Pages/NetworkModelling/ManualAppServer.razor +++ b/roles/ui/files/FWO.UI/Pages/NetworkModelling/ManualAppServer.razor @@ -11,20 +11,25 @@ @if (Display) { - +
    - +
    @@ -51,8 +56,10 @@ - - + + diff --git a/roles/ui/files/FWO.UI/Pages/NetworkModelling/NetworkModelling.razor b/roles/ui/files/FWO.UI/Pages/NetworkModelling/NetworkModelling.razor index e8e5d53f3..82da52e5c 100644 --- a/roles/ui/files/FWO.UI/Pages/NetworkModelling/NetworkModelling.razor +++ b/roles/ui/files/FWO.UI/Pages/NetworkModelling/NetworkModelling.razor @@ -50,7 +50,7 @@
    - +
    @@ -60,18 +60,18 @@
    - + @if(selectedApp.CommSvcPossible) { - + } - + diff --git a/roles/ui/files/FWO.UI/Pages/Settings/SearchUser.razor b/roles/ui/files/FWO.UI/Pages/Settings/SearchUser.razor index 8eadaf18d..bfcc2b6c2 100644 --- a/roles/ui/files/FWO.UI/Pages/Settings/SearchUser.razor +++ b/roles/ui/files/FWO.UI/Pages/Settings/SearchUser.razor @@ -139,7 +139,7 @@ connectedLdaps = await apiConnection.SendQueryAsync>(FWO.Api.Client.Queries.AuthQueries.getLdapConnections); if(connectedLdaps.Count > 0) { - selectedLdap = connectedLdaps.FirstOrDefault(x => x.IsInternal()) ?? connectedLdaps.First(); + selectedLdap = connectedLdaps.First(); } uiUsers = await apiConnection.SendQueryAsync>(FWO.Api.Client.Queries.AuthQueries.getUsers); uiUsers = uiUsers.FindAll(x => x.DbId != 0); diff --git a/roles/ui/files/FWO.UI/Pages/Settings/SettingsModelling.razor b/roles/ui/files/FWO.UI/Pages/Settings/SettingsModelling.razor index 39a27b88e..9ed113ecd 100644 --- a/roles/ui/files/FWO.UI/Pages/Settings/SettingsModelling.razor +++ b/roles/ui/files/FWO.UI/Pages/Settings/SettingsModelling.razor @@ -12,7 +12,7 @@ @inject UserConfig userConfig
    -

    @(userConfig.GetText("network_modelling"))

    +

    @(userConfig.GetText("modelling_settings"))

    @(userConfig.GetText("U5322")) @@ -40,9 +40,15 @@
    - +
    +
    + +
    + +
    +
    @@ -126,7 +132,7 @@

    - @*

    @(userConfig.GetText("U5303"))

    *@ +

    @(userConfig.GetText("U5303"))

    } else { @@ -199,7 +205,7 @@ else await globalConfig.WriteToDatabase(configData, apiConnection); PathsToDelete = new(); PathsToAdd = new(); - DisplayMessageInUi(null, userConfig.GetText("change_default"), userConfig.GetText("U5301"), false); + DisplayMessageInUi(null, userConfig.GetText("modelling_settings"), userConfig.GetText("U5301"), false); } else { @@ -208,7 +214,7 @@ else } catch (Exception exception) { - DisplayMessageInUi(exception, userConfig.GetText("change_default"), "", true); + DisplayMessageInUi(exception, userConfig.GetText("modelling_settings"), "", true); } } } diff --git a/roles/ui/files/FWO.UI/Pages/Settings/SettingsModellingPers.razor b/roles/ui/files/FWO.UI/Pages/Settings/SettingsModellingPers.razor new file mode 100644 index 000000000..4bde46286 --- /dev/null +++ b/roles/ui/files/FWO.UI/Pages/Settings/SettingsModellingPers.razor @@ -0,0 +1,85 @@ +@using FWO.Api.Client +@using FWO.Config.Api +@using FWO.Config.Api.Data +@using System.Text.Json +@using FWO.Ui.Pages.NetworkModelling + +@page "/settings/modellingpersonal" +@attribute [Authorize(Roles = $"{GlobalConst.kAdmin}, {GlobalConst.kAuditor}, {GlobalConst.kModeller}")] + +@inject ApiConnection apiConnection +@inject UserConfig userConfig + +
    +

    @(userConfig.GetText("modelling_settings"))

    + +
    +@(userConfig.GetText("U5415")) +
    + +@if (configData != null) +{ +
    +
    +
    + + +
    +
    + +
    + +
    +
    +
    + +
    + +} +else +{ + +} + + +@code +{ + [CascadingParameter] + Action DisplayMessageInUi { get; set; } = DefaultInit.DoNothing; + + private ConfigData? configData; + + + protected override async Task OnInitializedAsync() + { + try + { + configData = await userConfig.GetEditableConfig(); + } + catch (Exception exception) + { + DisplayMessageInUi(exception, userConfig.GetText("read_config"), userConfig.GetText("E5301"), false); + } + } + private async Task Save() + { + try + { + if (configData != null) + { + await userConfig.WriteToDatabase(configData, apiConnection); + DisplayMessageInUi(null, userConfig.GetText("modelling_settings"), userConfig.GetText("U5301"), false); + } + else + { + throw new Exception("Data saved before loaded. This should be impossible."); + } + } + catch (Exception exception) + { + DisplayMessageInUi(exception, userConfig.GetText("modelling_settings"), "", true); + } + } +} diff --git a/roles/ui/files/FWO.UI/Services/ModellingHandlerBase.cs b/roles/ui/files/FWO.UI/Services/ModellingHandlerBase.cs index 3c47f0039..1f4006124 100644 --- a/roles/ui/files/FWO.UI/Services/ModellingHandlerBase.cs +++ b/roles/ui/files/FWO.UI/Services/ModellingHandlerBase.cs @@ -2,6 +2,7 @@ using FWO.Api.Data; using FWO.Api.Client; using FWO.Api.Client.Queries; +using Microsoft.AspNetCore.Components; namespace FWO.Ui.Services @@ -31,6 +32,13 @@ public ModellingHandlerBase(ApiConnection apiConnection, UserConfig userConfig, IsOwner = isOwner; } + public MarkupString DisplayButton(string text, string icon, string iconText = "") + { + string tooltip = userConfig.ModIconify ? $"data-toggle=\"tooltip\" title=\"{@userConfig.PureLine(text)}\"" : ""; + string iconToDisplay = $""; + return (MarkupString)(userConfig.ModIconify ? iconToDisplay + (iconText != "" ? " " + userConfig.GetText(iconText) : "") : userConfig.GetText(text)); + } + protected async Task LogChange(ModellingTypes.ChangeType changeType, ModellingTypes.ObjectType objectType, long objId, string text, int? applicationId) { try diff --git a/roles/ui/files/FWO.UI/Shared/SettingsLayout.razor b/roles/ui/files/FWO.UI/Shared/SettingsLayout.razor index 9df37498a..3a4bcbd99 100644 --- a/roles/ui/files/FWO.UI/Shared/SettingsLayout.razor +++ b/roles/ui/files/FWO.UI/Shared/SettingsLayout.razor @@ -160,6 +160,13 @@ + +
  • + + @(userConfig.GetText("modelling")) + +
    • +
    From e9cb603666d893ac4b35ac10d49b981f9f9fb54a Mon Sep 17 00:00:00 2001 From: abarz722 Date: Tue, 20 Feb 2024 14:41:11 +0100 Subject: [PATCH 03/84] update revision --- documentation/revision-history-develop.md | 4 ++++ inventory/group_vars/all.yml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/documentation/revision-history-develop.md b/documentation/revision-history-develop.md index 3280dfb4d..807bdaae8 100644 --- a/documentation/revision-history-develop.md +++ b/documentation/revision-history-develop.md @@ -175,3 +175,7 @@ bugfix release: - common service handling - fixes credentials when installing without demo data - fix error with pdf creation on debian testing + +# 8.0.1 - 20.02.2024 DEVELOP +- iconify modelling +- add missing config values diff --git a/inventory/group_vars/all.yml b/inventory/group_vars/all.yml index f636da984..f92156cf5 100644 --- a/inventory/group_vars/all.yml +++ b/inventory/group_vars/all.yml @@ -1,5 +1,5 @@ ### general settings -product_version: "8.0" +product_version: "8.0.1" ansible_user: "{{ lookup('env', 'USER') }}" ansible_become_method: sudo ansible_python_interpreter: /usr/bin/python3 From be80fedc5bf5ff3452918c7c1176fba454a37bd5 Mon Sep 17 00:00:00 2001 From: abarz722 Date: Tue, 20 Feb 2024 16:42:11 +0100 Subject: [PATCH 04/84] customize texts case sensitivity --- roles/database/files/sql/idempotent/fworch-texts.sql | 6 ++++-- .../files/FWO.UI/Pages/Settings/SettingsCustomTexts.razor | 7 ++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/roles/database/files/sql/idempotent/fworch-texts.sql b/roles/database/files/sql/idempotent/fworch-texts.sql index c227178cc..c2bebac6b 100644 --- a/roles/database/files/sql/idempotent/fworch-texts.sql +++ b/roles/database/files/sql/idempotent/fworch-texts.sql @@ -1736,6 +1736,8 @@ INSERT INTO txt VALUES ('customize_texts', 'German', 'Texte anpassen'); INSERT INTO txt VALUES ('customize_texts', 'English', 'Customize Texts'); INSERT INTO txt VALUES ('ignore_helptexts', 'German', 'Hilfetexte ignorieren'); INSERT INTO txt VALUES ('ignore_helptexts', 'English', 'Ignore help texts'); +INSERT INTO txt VALUES ('case_sensitive', 'German', ''); +INSERT INTO txt VALUES ('case_sensitive', 'English', 'Schreibungsabhängig'); INSERT INTO txt VALUES ('key', 'German', 'Schlüssel'); INSERT INTO txt VALUES ('key', 'English', 'Key'); INSERT INTO txt VALUES ('text', 'German', 'Text'); @@ -4409,11 +4411,11 @@ INSERT INTO txt VALUES ('H5701', 'English', 'The language dependent texts stored INSERT INTO txt VALUES ('H5702', 'German', 'Im ersten Schritt muss die betroffene Sprache ausgewählt werden. Dann erscheint die Zeile zur eigentlichen Textsuche.'); INSERT INTO txt VALUES ('H5702', 'English', 'In the first step the language to be handled has to be selected. Then the row for the text search appears.'); INSERT INTO txt VALUES ('H5703', 'German', 'Bei Eingabe eines Suchstrings erscheinen alle hinterlegten Texte, welche diesen beinhalten. - Wird das Feld leer gelassen, erscheinen alle verfügbaren Texte der gewählten Sprache. + Wird das Feld leer gelassen, erscheinen alle verfügbaren Texte der gewählten Sprache. Die Suche kann wahlweise auch schreibungsabhängig durchgeführt werden. Durch das Setzen des "Hilfetexte ignorieren"-Flags werden die Hilfetexte (Schlüssel beginnend mit "H"), bei der Suche nicht berücksichtigt. '); INSERT INTO txt VALUES ('H5703', 'English', 'When entering a search string, all texts containing this are displayed. If left empty, all texts of the selected language are displayed. - By setting the "Ignore Help Texts" flag all Help texts (Key beginning with "H") are disregarded. + Optionally the search can be case-sensitive. By setting the "Ignore Help Texts" flag all Help texts (Key beginning with "H") are disregarded. '); INSERT INTO txt VALUES ('H5704', 'German', 'In der Tabelle der Suchergebnisse können pro Schlüssel neue Texte definiert, bereits vorhandene durch Setzen des "Löschen"-Flags zum Löschen vorgemerkt werden. Wird nur der Text entfernt, wird der Systemtext mit Leertext überschrieben! diff --git a/roles/ui/files/FWO.UI/Pages/Settings/SettingsCustomTexts.razor b/roles/ui/files/FWO.UI/Pages/Settings/SettingsCustomTexts.razor index 9b29ae255..a097618c5 100644 --- a/roles/ui/files/FWO.UI/Pages/Settings/SettingsCustomTexts.razor +++ b/roles/ui/files/FWO.UI/Pages/Settings/SettingsCustomTexts.razor @@ -39,6 +39,10 @@
    +
    + + +
    @@ -98,6 +102,7 @@ private List results = new(); private bool displayResults = false; private bool ignoreHelpTexts = true; + private bool caseSensitive = false; protected override void OnInitialized() { @@ -128,7 +133,7 @@ results = new(); foreach(var entry in actDict) { - if (!(ignoreHelpTexts && entry.Key.StartsWith("H")) && entry.Value.Contains(searchString)) + if (!(ignoreHelpTexts && entry.Key.StartsWith("H")) && (caseSensitive ? entry.Value.Contains(searchString) : entry.Value.ToLower().Contains(searchString.ToLower()))) { results.Add(new TextEntry(){ Key = entry.Key, Text = entry.Value, CustomText = actCustomDict.ContainsKey(entry.Key) ? actCustomDict[entry.Key] : ""}); } From 775f8923367501ad969dde59377ba84ddb714be5 Mon Sep 17 00:00:00 2001 From: Tim Purschke Date: Wed, 21 Feb 2024 19:13:34 +0100 Subject: [PATCH 05/84] first fry rules --- .vscode/launch.json | 2 +- inventory/group_vars/all.yml | 2 +- .../files/upgrade/{7.3.7.sql => 8.0.2.sql} | 0 .../{vmwareNSX => nsx4ff}/__init__.py | 0 .../discovery_logging.conf | 0 .../{vmwareNSX => nsx4ff}/fwcommon.py | 49 +++--- .../{vmwareNSX => nsx4ff}/nsx_application.py | 0 .../{vmwareNSX => nsx4ff}/nsx_base.py | 0 .../{vmwareNSX => nsx4ff}/nsx_getter.py | 52 +++---- .../{vmwareNSX => nsx4ff}/nsx_network.py | 0 .../files/importer/nsx4ff/nsx_rule.py | 130 ++++++++++++++++ .../{vmwareNSX => nsx4ff}/nsx_service.py | 0 .../{vmwareNSX => nsx4ff}/nsx_zone.py | 0 .../paloaltomanagement2023ff/palo_rule.py | 2 +- .../files/importer/vmwareNSX/nsx_rule.py | 144 ------------------ 15 files changed, 183 insertions(+), 198 deletions(-) rename roles/database/files/upgrade/{7.3.7.sql => 8.0.2.sql} (100%) rename roles/importer/files/importer/{vmwareNSX => nsx4ff}/__init__.py (100%) rename roles/importer/files/importer/{vmwareNSX => nsx4ff}/discovery_logging.conf (100%) rename roles/importer/files/importer/{vmwareNSX => nsx4ff}/fwcommon.py (65%) rename roles/importer/files/importer/{vmwareNSX => nsx4ff}/nsx_application.py (100%) rename roles/importer/files/importer/{vmwareNSX => nsx4ff}/nsx_base.py (100%) rename roles/importer/files/importer/{vmwareNSX => nsx4ff}/nsx_getter.py (56%) rename roles/importer/files/importer/{vmwareNSX => nsx4ff}/nsx_network.py (100%) create mode 100644 roles/importer/files/importer/nsx4ff/nsx_rule.py rename roles/importer/files/importer/{vmwareNSX => nsx4ff}/nsx_service.py (100%) rename roles/importer/files/importer/{vmwareNSX => nsx4ff}/nsx_zone.py (100%) delete mode 100644 roles/importer/files/importer/vmwareNSX/nsx_rule.py diff --git a/.vscode/launch.json b/.vscode/launch.json index 3adab9410..f2e0be8f7 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -82,7 +82,7 @@ "PYTHONPATH": "${PYTHONPATH}:${workspaceRoot}" }, "args": [ - "-m7", + "-m24", "-d1", "-f", "-s", diff --git a/inventory/group_vars/all.yml b/inventory/group_vars/all.yml index f636da984..a99ebfb35 100644 --- a/inventory/group_vars/all.yml +++ b/inventory/group_vars/all.yml @@ -1,5 +1,5 @@ ### general settings -product_version: "8.0" +product_version: "8.0.2" ansible_user: "{{ lookup('env', 'USER') }}" ansible_become_method: sudo ansible_python_interpreter: /usr/bin/python3 diff --git a/roles/database/files/upgrade/7.3.7.sql b/roles/database/files/upgrade/8.0.2.sql similarity index 100% rename from roles/database/files/upgrade/7.3.7.sql rename to roles/database/files/upgrade/8.0.2.sql diff --git a/roles/importer/files/importer/vmwareNSX/__init__.py b/roles/importer/files/importer/nsx4ff/__init__.py similarity index 100% rename from roles/importer/files/importer/vmwareNSX/__init__.py rename to roles/importer/files/importer/nsx4ff/__init__.py diff --git a/roles/importer/files/importer/vmwareNSX/discovery_logging.conf b/roles/importer/files/importer/nsx4ff/discovery_logging.conf similarity index 100% rename from roles/importer/files/importer/vmwareNSX/discovery_logging.conf rename to roles/importer/files/importer/nsx4ff/discovery_logging.conf diff --git a/roles/importer/files/importer/vmwareNSX/fwcommon.py b/roles/importer/files/importer/nsx4ff/fwcommon.py similarity index 65% rename from roles/importer/files/importer/vmwareNSX/fwcommon.py rename to roles/importer/files/importer/nsx4ff/fwcommon.py index 87de87449..c68fe1b32 100644 --- a/roles/importer/files/importer/vmwareNSX/fwcommon.py +++ b/roles/importer/files/importer/nsx4ff/fwcommon.py @@ -1,14 +1,15 @@ import sys +import base64 from common import importer_base_dir -sys.path.append(importer_base_dir + "/paloaltomanagement2023ff") -from palo_service import normalize_svcobjects -from palo_application import normalize_application_objects -from palo_rule import normalize_access_rules -from palo_network import normalize_nwobjects -from palo_zone import normalize_zones -from palo_getter import login, update_config_with_palofw_api_call +sys.path.append(importer_base_dir + "/nsx4ff") +from nsx_service import normalize_svcobjects +from nsx_application import normalize_application_objects +from nsx_rule import normalize_access_rules +from nsx_network import normalize_nwobjects +from nsx_zone import normalize_zones +from nsx_getter import update_config_with_nsxdcfw_api_call from fwo_log import getFwoLogger -from palo_base import api_version_str +from nsx_base import api_version_str def has_config_changed(full_config, mgm_details, force=False): # dummy - may be filled with real check later on @@ -26,10 +27,11 @@ def get_config(config2import, full_config, current_import_id, mgm_details, limit apipwd = mgm_details["import_credential"]['secret'] apiuser = mgm_details["import_credential"]['user'] apihost = mgm_details["hostname"] + domain = mgm_details["configPath"] vsys_objects = ["/Network/Zones", "/Objects/Addresses", "/Objects/Services", "/Objects/AddressGroups", "/Objects/ServiceGroups", "/Objects/Tags"] predef_objects = ["/Objects/Applications"] - rulebase_names = ["/Policies/SecurityRules", "/Policies/NATRules"] + rulebase_names = ["security-policies"] # , "/Policies/NATRules"] for obj_path in vsys_objects: full_config[obj_path] = [] @@ -37,23 +39,19 @@ def get_config(config2import, full_config, current_import_id, mgm_details, limit for obj_path in predef_objects: full_config[obj_path] = [] - # login - key = login(apiuser, apipwd, apihost) - if key == None or key == "": - logger.error('Did not succeed in logging in to Palo API, no key returned.') - return 1 + credentials = base64.b64encode((apiuser + ":" + apipwd).encode()) ## get objects: - base_url = "https://{apihost}/restapi/v{api_version_str}".format(apihost=apihost, api_version_str=api_version_str) + # base_url = "https://{apihost}/policy/api/v1/infra/domains/{domain}/security-policies/[policy name]".format(apihost=apihost, api_version_str=api_version_str) - vsys_name = "vsys1" # TODO - automate this hard-coded name - location = "vsys" # alternative: panorama-pushed + # vsys_name = "vsys1" # TODO - automate this hard-coded name + # location = "vsys" # alternative: panorama-pushed - for obj_path in vsys_objects: - update_config_with_palofw_api_call(key, base_url, full_config, obj_path + "?location={location}&vsys={vsys_name}".format(location=location, vsys_name=vsys_name), obj_type=obj_path) + # for obj_path in vsys_objects: + # update_config_with_nsxdcfw_api_call(key, base_url, full_config, obj_path + "?location={location}&vsys={vsys_name}".format(location=location, vsys_name=vsys_name), obj_type=obj_path) - for obj_path in predef_objects: - update_config_with_palofw_api_call(key, base_url, full_config, obj_path + "?location={location}".format(location="predefined"), obj_type=obj_path) + # for obj_path in predef_objects: + # update_config_with_nsxdcfw_api_call(key, base_url, full_config, obj_path + "?location={location}".format(location="predefined"), obj_type=obj_path) # users @@ -65,10 +63,11 @@ def get_config(config2import, full_config, current_import_id, mgm_details, limit full_config['devices'].update({ dev_id: {} }) for obj_path in rulebase_names: - update_config_with_palofw_api_call( - key, base_url, full_config['devices'][device['id']], - obj_path + "?location={location}&vsys={vsys_name}".format(location="vsys", vsys_name=dev_name), - obj_type=obj_path) + base_url = "https://{apihost}/policy/api/v1/infra/domains/{domain}/{rulebase_name}/{policy_name}".format(apihost=apihost, domain=domain, policy_name=dev_name, rulebase_name=obj_path) + update_config_with_nsxdcfw_api_call( + base_url, full_config['devices'][device['id']], + obj_path, + obj_type=obj_path, credentials=credentials) ################## # now we normalize relevant parts of the raw config and write the results to config2import dict diff --git a/roles/importer/files/importer/vmwareNSX/nsx_application.py b/roles/importer/files/importer/nsx4ff/nsx_application.py similarity index 100% rename from roles/importer/files/importer/vmwareNSX/nsx_application.py rename to roles/importer/files/importer/nsx4ff/nsx_application.py diff --git a/roles/importer/files/importer/vmwareNSX/nsx_base.py b/roles/importer/files/importer/nsx4ff/nsx_base.py similarity index 100% rename from roles/importer/files/importer/vmwareNSX/nsx_base.py rename to roles/importer/files/importer/nsx4ff/nsx_base.py diff --git a/roles/importer/files/importer/vmwareNSX/nsx_getter.py b/roles/importer/files/importer/nsx4ff/nsx_getter.py similarity index 56% rename from roles/importer/files/importer/vmwareNSX/nsx_getter.py rename to roles/importer/files/importer/nsx4ff/nsx_getter.py index ae2c94b33..390d778fd 100644 --- a/roles/importer/files/importer/vmwareNSX/nsx_getter.py +++ b/roles/importer/files/importer/nsx4ff/nsx_getter.py @@ -11,12 +11,12 @@ def api_call(url, params = {}, headers = {}, data = {}, credentials = '', show_progress=False, method='get'): logger = getFwoLogger() - result_type='xml' + result_type='json' request_headers = {'Content-Type': 'application/json'} for header_key in headers: request_headers[header_key] = headers[header_key] - if key != '': - request_headers["Authorization"] = 'Basic ' + '{credentials}'.format(key=key) + if credentials != '': + request_headers["Authorization"] = 'Basic {credentials}'.format(credentials=credentials.decode("utf-8")) result_type='json' if method == "post": @@ -24,7 +24,7 @@ def api_call(url, params = {}, headers = {}, data = {}, credentials = '', show_p elif method == "get": response = requests.get(url, params=params, headers=request_headers, verify=fwo_globals.verify_certs) else: - raise Exception("unknown HTTP method found in palo_getter") + raise Exception("unknown HTTP method found in nsx_getter") # error handling: exception_text = '' @@ -59,34 +59,34 @@ def api_call(url, params = {}, headers = {}, data = {}, credentials = '', show_p return body_json -def login(apiuser, apipwd, apihost): - base_url = "https://{apihost}/api/?type=keygen&user={apiuser}&password={apipwd}".format(apihost=apihost, apiuser=apiuser, apipwd=apipwd) - try: - body = api_call(base_url, method="get", headers={}, data={}) - except Exception as e: - raise FwLoginFailed("Palo FW login to firewall=" + str(apihost) + " failed; Message: " + str(e)) from None +# def login(apiuser, apipwd, apihost): +# base_url = "https://{apihost}/api/?type=keygen&user={apiuser}&password={apipwd}".format(apihost=apihost, apiuser=apiuser, apipwd=apipwd) +# try: +# body = api_call(base_url, method="get", headers={}, data={}) +# except Exception as e: +# raise FwLoginFailed("Palo FW login to firewall=" + str(apihost) + " failed; Message: " + str(e)) from None - if 'response' in body and 'result' in body['response'] and 'key' in body['response']['result'] and not body['response']['result']['key'] == None: - key = body['response']['result']['key'] - else: - raise FwLoginFailed("Palo FW login to firewall=" + str(apihost) + " failed") from None +# if 'response' in body and 'result' in body['response'] and 'key' in body['response']['result'] and not body['response']['result']['key'] == None: +# key = body['response']['result']['key'] +# else: +# raise FwLoginFailed("Palo FW login to firewall=" + str(apihost) + " failed") from None - if fwo_globals.debug_level > 2: - logger = getFwoLogger() - logger.debug("Login successful. Received key: " + key) +# if fwo_globals.debug_level > 2: +# logger = getFwoLogger() +# logger.debug("Login successful. Received key: " + key) - return key +# return key -def update_config_with_palofw_api_call(key, api_base_url, config, api_path, obj_type='generic', parameters={}, payload={}, show_progress=False, limit: int=1000, method="get"): +def update_config_with_nsxdcfw_api_call(api_base_url, config, api_path, credentials='', obj_type='generic', parameters={}, payload={}, show_progress=False, limit: int=1000, method="get"): returned_new_data = True full_result = [] - result = api_call(api_base_url + api_path,key=key, params=parameters, data=payload, show_progress=show_progress, method=method) - if "entry" in result: - returned_new_data = len(result['entry'])>0 - else: - returned_new_data = False + result = api_call(api_base_url, credentials=credentials, params=parameters, data=payload, show_progress=show_progress, method=method) + # if "entry" in result: + # returned_new_data = len(result['entry'])>0 + # else: + # returned_new_data = False if returned_new_data: - full_result.extend(result["entry"]) - config.update({obj_type: full_result}) + # full_result.extend(result) + config.update({obj_type: result}) diff --git a/roles/importer/files/importer/vmwareNSX/nsx_network.py b/roles/importer/files/importer/nsx4ff/nsx_network.py similarity index 100% rename from roles/importer/files/importer/vmwareNSX/nsx_network.py rename to roles/importer/files/importer/nsx4ff/nsx_network.py diff --git a/roles/importer/files/importer/nsx4ff/nsx_rule.py b/roles/importer/files/importer/nsx4ff/nsx_rule.py new file mode 100644 index 000000000..239fd91d4 --- /dev/null +++ b/roles/importer/files/importer/nsx4ff/nsx_rule.py @@ -0,0 +1,130 @@ +from nsx_service import parse_svc_list +from nsx_network import parse_obj_list +from fwo_log import getFwoLogger +from fwo_const import list_delimiter +import hashlib +import base64 +import os.path + + +def make_hash_sha256(o): + hasher = hashlib.sha256() + hasher.update(repr(make_hashable(o)).encode()) + return base64.b64encode(hasher.digest()).decode() + + +def make_hashable(o): + if isinstance(o, (tuple, list)): + return tuple((make_hashable(e) for e in o)) + + if isinstance(o, dict): + return tuple(sorted((k,make_hashable(v)) for k,v in o.items())) + + if isinstance(o, (set, frozenset)): + return tuple(sorted(make_hashable(e) for e in o)) + + return o + + +def normalize_access_rules(full_config, config2import, import_id, mgm_details={}): + rules = [] + logger = getFwoLogger() + + nw_obj_names = [] + for o in config2import['network_objects']: + nw_obj_names.append(o["obj_name"]) + + for device in full_config["devices"]: + rule_number = 0 + for dev_id in full_config['devices'].keys(): + for rulebase in list(full_config['devices'][dev_id].keys()): + for rule_orig in full_config['devices'][dev_id][rulebase]['rules']: + rule = {'rule_src': 'any', 'rule_dst': 'any', 'rule_svc': 'any', + 'rule_src_refs': 'any_obj_placeholder', 'rule_dst_refs': 'any_obj_placeholder', + 'rule_src_neg': False, 'rule_dst_neg': False, + 'rule_svc_refs': 'any_svc_placeholder'} + + if 'sources_excluded' in rule_orig and rule_orig['sources_excluded']: + rule["rule_src_neg"] = True + if 'destinations_excluded' in rule_orig and rule_orig['destinations_excluded']: + rule["rule_dst_neg"] = True + rule.update({ + "rule_svc_neg": False, # not possible to negate the svc field on Palo + "rulebase_name": os.path.basename(rule_orig['parent_path']), + "rule_name": rule_orig['relative_path'], + 'rule_type': 'access', + 'rule_num': rule_number, + #'rule_installon': rule_orig['@vsys'], + 'parent_rule_id': None, + 'rule_time': None, + 'rule_implied': False, + 'rule_comment': None, + 'rule_track': 'None', + 'rule_uid': rule_orig['unique_id'], + 'rule_disabled': rule_orig['disabled'], + 'control_id': import_id + }) + + if "action" in rule_orig: + if rule_orig['action']=='ALLOW': + rule['rule_action'] = 'accept' + elif rule_orig['action']=='drop': + rule['rule_action'] = 'drop' + elif rule_orig['action']=='deny': + rule['rule_action'] = 'deny' + elif rule_orig['action']=='REJECT': + rule['rule_action'] = 'reject' + else: + logger.warning("found undefined action:" + str(rule_orig)) + else: # NAT rules + rule['rule_action'] = "accept" + rule['rule_type'] = 'nat' + + # TODO: should either duplicate the rule for each zone to zone pair + # or much better allow for n:m rule:zone mappings --> change of DB necessary + # # instead we are just picking the last one!!! + # for z in rule_orig['from']['member']: + # rule.update({'rule_from_zone': z}) + # for z in rule_orig['to']['member']: + # rule.update({'rule_to_zone': z}) + + if 'logged' in rule_orig and rule_orig['logged']: + rule['rule_track'] = 'log' + else: + rule['rule_track'] = 'none' + + if "source_groups" in rule_orig: + rule['rule_src_refs'] = ','.join(rule_orig["source_groups"]) + # rule['rule_src_refs'], rule["rule_src"] = parse_obj_list(source_objects, import_id, config2import['network_objects'], rule["rule_uid"]) + else: + logger.warning("found undefined source in rule: " + str(rule_orig)) + + if "destination_groups" in rule_orig: + rule['rule_dst_refs'] = ','.join(rule_orig["destination_groups"]) + # rule['rule_dst_refs'], rule["rule_dst"] = parse_obj_list(destination_objects, import_id, config2import['network_objects'], rule["rule_uid"]) + else: + logger.warning("found undefined destination in rule: " + str(rule_orig)) + + services = [] + if "services" in rule_orig: + services = rule_orig["services"] + # if services[0] == 'application-default' or services[0] == 'any': + # services = [] + # apps = [] + # if 'application' in rule_orig: + # # no services given but applications - parse apps + # if 'member' in rule_orig['application']: + # # apps = ['any'] ## TEMP before app parsing + # apps = rule_orig["application"]["member"] + # else: + # apps = [rule_orig["application"]] + # if apps[0] == 'any': + # apps = [] + + # rule['rule_svc_refs'], rule["rule_svc"] = parse_svc_list(apps + services, import_id, config2import['service_objects'], rule["rule_uid"], type='service') + rule['rule_svc_refs'], rule["rule_svc"] = parse_svc_list(services, import_id, config2import['service_objects'], rule["rule_uid"], type='service') + + rule_number += 1 + rules.append(rule) + + config2import['rules'] += rules diff --git a/roles/importer/files/importer/vmwareNSX/nsx_service.py b/roles/importer/files/importer/nsx4ff/nsx_service.py similarity index 100% rename from roles/importer/files/importer/vmwareNSX/nsx_service.py rename to roles/importer/files/importer/nsx4ff/nsx_service.py diff --git a/roles/importer/files/importer/vmwareNSX/nsx_zone.py b/roles/importer/files/importer/nsx4ff/nsx_zone.py similarity index 100% rename from roles/importer/files/importer/vmwareNSX/nsx_zone.py rename to roles/importer/files/importer/nsx4ff/nsx_zone.py diff --git a/roles/importer/files/importer/paloaltomanagement2023ff/palo_rule.py b/roles/importer/files/importer/paloaltomanagement2023ff/palo_rule.py index 6071f5ef2..504a99a5e 100644 --- a/roles/importer/files/importer/paloaltomanagement2023ff/palo_rule.py +++ b/roles/importer/files/importer/paloaltomanagement2023ff/palo_rule.py @@ -103,7 +103,7 @@ def normalize_access_rules(full_config, config2import, import_id, mgm_details={} if 'member' in rule_orig["source"]: source_objects = rule_orig["source"]["member"] else: - source_objects = [rule_orig["service"]] + source_objects = [rule_orig["source"]] rule['rule_src_refs'], rule["rule_src"] = parse_obj_list(source_objects, import_id, config2import['network_objects'], rule["rule_uid"]) else: logger.warning("found undefined source in rule: " + str(rule_orig)) diff --git a/roles/importer/files/importer/vmwareNSX/nsx_rule.py b/roles/importer/files/importer/vmwareNSX/nsx_rule.py deleted file mode 100644 index 6071f5ef2..000000000 --- a/roles/importer/files/importer/vmwareNSX/nsx_rule.py +++ /dev/null @@ -1,144 +0,0 @@ -from palo_service import parse_svc_list -from palo_network import parse_obj_list -from fwo_log import getFwoLogger -from fwo_const import list_delimiter -import hashlib -import base64 - - -def make_hash_sha256(o): - hasher = hashlib.sha256() - hasher.update(repr(make_hashable(o)).encode()) - return base64.b64encode(hasher.digest()).decode() - - -def make_hashable(o): - if isinstance(o, (tuple, list)): - return tuple((make_hashable(e) for e in o)) - - if isinstance(o, dict): - return tuple(sorted((k,make_hashable(v)) for k,v in o.items())) - - if isinstance(o, (set, frozenset)): - return tuple(sorted(make_hashable(e) for e in o)) - - return o - - -def normalize_access_rules(full_config, config2import, import_id, mgm_details={}): - rules = [] - logger = getFwoLogger() - - nw_obj_names = [] - for o in config2import['network_objects']: - nw_obj_names.append(o["obj_name"]) - - for device in full_config["devices"]: - rule_number = 0 - for dev_id in full_config['devices'].keys(): - for rulebase in list(full_config['devices'][dev_id].keys()): - for rule_orig in full_config['devices'][dev_id][rulebase]: - rule = {'rule_src': 'any', 'rule_dst': 'any', 'rule_svc': 'any', - 'rule_src_refs': 'any_obj_placeholder', 'rule_dst_refs': 'any_obj_placeholder', - 'rule_src_neg': False, 'rule_dst_neg': False, - 'rule_svc_refs': 'any_svc_placeholder'} - if 'negate-source' in rule_orig and rule_orig['negate-source']=='yes': - rule["rule_src_neg"] = True - if 'negate-destination' in rule_orig and rule_orig['negate-destination']=='yes': - rule["rule_dst_neg"] = True - rule.update({ - "rule_svc_neg": False, # not possible to negate the svc field on Palo - "rulebase_name": rule_orig['@vsys'], - "rule_name": rule_orig['@name'], - 'rule_type': 'access', - 'rule_num': rule_number, - 'rule_installon': rule_orig['@vsys'], - 'parent_rule_id': None, - 'rule_time': None, - 'rule_implied': False, - 'rule_comment': None, - 'rule_track': 'None', - 'rule_uid': rule_orig['@uuid'], - 'rule_disabled': False, - 'control_id': import_id - }) - - if "action" in rule_orig: - if rule_orig['action']=='allow': - rule['rule_action'] = 'accept' - elif rule_orig['action']=='drop': - rule['rule_action'] = 'drop' - elif rule_orig['action']=='deny': - rule['rule_action'] = 'deny' - elif rule_orig['action']=='reset-client': - rule['rule_action'] = 'reject' - else: - logger.warning("found undefined action:" + str(rule_orig)) - else: # NAT rules - rule['rule_action'] = "accept" - rule['rule_type'] = 'nat' - - # TODO: should either duplicate the rule for each zone to zone pair - # or much better allow for n:m rule:zone mappings --> change of DB necessary - # instead we are just picking the last one!!! - for z in rule_orig['from']['member']: - rule.update({'rule_from_zone': z}) - for z in rule_orig['to']['member']: - rule.update({'rule_to_zone': z}) - - if 'disabled' in rule_orig and rule_orig['disabled']=='yes': - rule['rule_disabled'] = True - if 'log-start' in rule_orig: - if rule_orig['log-start']=='yes': - rule['rule_track'] = 'all start' - elif rule_orig['log-start']=='no': - rule['rule_track'] = 'None' - else: - logger.warning ("found undefined track:" + str(rule_orig)) - rule['rule_track'] = 'None' - else: - rule['rule_track'] = 'None' - - if "source" in rule_orig: - if 'member' in rule_orig["source"]: - source_objects = rule_orig["source"]["member"] - else: - source_objects = [rule_orig["service"]] - rule['rule_src_refs'], rule["rule_src"] = parse_obj_list(source_objects, import_id, config2import['network_objects'], rule["rule_uid"]) - else: - logger.warning("found undefined source in rule: " + str(rule_orig)) - - if "destination" in rule_orig: - if 'member' in rule_orig["destination"]: - destination_objects = rule_orig["destination"]["member"] - else: - destination_objects = [rule_orig["destination"]] - rule['rule_dst_refs'], rule["rule_dst"] = parse_obj_list(destination_objects, import_id, config2import['network_objects'], rule["rule_uid"]) - else: - logger.warning("found undefined destination in rule: " + str(rule_orig)) - - services = [] - if "service" in rule_orig: - if 'member' in rule_orig['service']: - services = rule_orig["service"]["member"] - else: - services = [rule_orig["service"]] - if services[0] == 'application-default' or services[0] == 'any': - services = [] - apps = [] - if 'application' in rule_orig: - # no services given but applications - parse apps - if 'member' in rule_orig['application']: - # apps = ['any'] ## TEMP before app parsing - apps = rule_orig["application"]["member"] - else: - apps = [rule_orig["application"]] - if apps[0] == 'any': - apps = [] - - rule['rule_svc_refs'], rule["rule_svc"] = parse_svc_list(apps + services, import_id, config2import['service_objects'], rule["rule_uid"], type='service') - - rule_number += 1 - rules.append(rule) - - config2import['rules'] += rules From 3043898dc04694d8f62110530738da0e36b629b9 Mon Sep 17 00:00:00 2001 From: abarz722 Date: Thu, 22 Feb 2024 17:21:41 +0100 Subject: [PATCH 06/84] rework naming convention handling --- .../files/sql/creation/fworch-fill-stm.sql | 2 +- .../files/sql/idempotent/fworch-texts.sql | 14 +- .../Data/ModellingManagedIdString.cs | 171 ++++++++++++++++++ .../Data/ModellingNamingConvention.cs | 3 + .../FWO.Api.Client/Data/ModellingNwGroup.cs | 51 +----- .../files/FWO.Test/ManagedIdStringTest.cs | 143 +++++++++++++++ .../files/FWO.Test/ModellingHandlerTest.cs | 6 - .../Pages/Help/HelpSettingsModelling.cshtml | 5 +- .../Pages/NetworkModelling/EditAppRole.razor | 16 +- .../Pages/Settings/SettingsModelling.razor | 26 ++- .../Services/ModellingAppRoleHandler.cs | 74 ++++---- 11 files changed, 396 insertions(+), 115 deletions(-) create mode 100644 roles/lib/files/FWO.Api.Client/Data/ModellingManagedIdString.cs create mode 100644 roles/test/files/FWO.Test/ManagedIdStringTest.cs diff --git a/roles/database/files/sql/creation/fworch-fill-stm.sql b/roles/database/files/sql/creation/fworch-fill-stm.sql index eb47e43a4..b357610fc 100644 --- a/roles/database/files/sql/creation/fworch-fill-stm.sql +++ b/roles/database/files/sql/creation/fworch-fill-stm.sql @@ -80,7 +80,7 @@ insert into config (config_key, config_value, config_user) VALUES ('importSubnet insert into config (config_key, config_value, config_user) VALUES ('importSubnetDataSleepTime', '0', 0); insert into config (config_key, config_value, config_user) VALUES ('importAppDataPath', '[]', 0); insert into config (config_key, config_value, config_user) VALUES ('importSubnetDataPath', '', 0); -insert into config (config_key, config_value, config_user) VALUES ('modNamingConvention', '{"networkAreaRequired":false,"fixedPartLength":0,"freePartLength":0,"networkAreaPattern":"","appRolePattern":""}', 0); +insert into config (config_key, config_value, config_user) VALUES ('modNamingConvention', '{"networkAreaRequired":false,"useAppPart":false,"fixedPartLength":0,"freePartLength":0,"networkAreaPattern":"","appRolePattern":""}', 0); insert into config (config_key, config_value, config_user) VALUES ('modIconify', 'True', 0); insert into config (config_key, config_value, config_user) VALUES ('reducedProtocolSet', 'True', 0); insert into config (config_key, config_value, config_user) VALUES ('overviewDisplayLines', '3', 0); diff --git a/roles/database/files/sql/idempotent/fworch-texts.sql b/roles/database/files/sql/idempotent/fworch-texts.sql index c2bebac6b..c9fa79372 100644 --- a/roles/database/files/sql/idempotent/fworch-texts.sql +++ b/roles/database/files/sql/idempotent/fworch-texts.sql @@ -1770,6 +1770,8 @@ INSERT INTO txt VALUES ('fixedPartLength', 'German', 'Länge fixer Te INSERT INTO txt VALUES ('fixedPartLength', 'English', 'Fixed Part Length'); INSERT INTO txt VALUES ('freePartLength', 'German', 'Länge freier Teil'); INSERT INTO txt VALUES ('freePartLength', 'English', 'Free Part Length'); +INSERT INTO txt VALUES ('useAppPart', 'German', 'Eigentümernamen verwenden'); +INSERT INTO txt VALUES ('useAppPart', 'English', 'Use Owner Name'); INSERT INTO txt VALUES ('networkAreaPattern', 'German', 'Muster Netzwerkarea'); INSERT INTO txt VALUES ('networkAreaPattern', 'English', 'Network Area Pattern'); INSERT INTO txt VALUES ('appRolePattern', 'German', 'Muster App Rolle'); @@ -4338,17 +4340,19 @@ INSERT INTO txt VALUES ('H5606', 'English', 'Network Area Required: If this flag When defining an App Role, only the App Servers belonging to the selected area are displayed in the library. Naming of the App Role is then restricted to the naming convention defined in the following settings. '); -INSERT INTO txt VALUES ('H5607', 'German', 'Länge fixer Teil: Länge des vorgebenen Teils des Namensmusters einer App Rolle.'); -INSERT INTO txt VALUES ('H5607', 'English', 'Fixed Part Length: Length of the predefined part of the name pattern of an App Role.'); -INSERT INTO txt VALUES ('H5608', 'German', 'Länge freier Teil: Länge des frei zu vergebenden Teils des Namens einer App Rolle.'); -INSERT INTO txt VALUES ('H5608', 'English', 'Free Part Length: Length of the free part of the name pattern of an App Role.'); +INSERT INTO txt VALUES ('H5607', 'German', 'Länge fixer Teil: Länge des vorgebenen Teils des Namensmusters einer App Rolle (ohne den ggf. vorhandenen Eigentümerteil variabler Länge).'); +INSERT INTO txt VALUES ('H5607', 'English', 'Fixed Part Length: Length of the predefined part of the name pattern of an App Role (without the owner part of variable length if activated).'); +INSERT INTO txt VALUES ('H5608', 'German', 'Länge freier Teil: Länge des frei zu vergebenden Teils des Namens einer App Rolle (nur für den Namensvorschlag beim Neuanlegen relevant).'); +INSERT INTO txt VALUES ('H5608', 'English', 'Free Part Length: Length of the free part of the name pattern of an App Role (only relevant for name proposal during creation).'); INSERT INTO txt VALUES ('H5609', 'German', 'Muster Netzwerkarea: Definiert, wie der Name einer Netzwerkarea beginnt (z.B "NA").'); INSERT INTO txt VALUES ('H5609', 'English', 'Network Area Pattern: Defines the beginning of a network area name (e.g. "NA").'); INSERT INTO txt VALUES ('H5610', 'German', 'Muster App Rolle: Definiert, wie der Name einer App Rolle beginnt (z.B. "AR"). Zu einer Netzwerkarea (z.B. "NAxx") wird dann ein Name der App Rolle (z.B. "ARxx") mit der oben definierten Länge des fixen Teils vorgegeben. + Ist die Länge des Musters grösser als die Länge des fixen Teils, wird der überschüssige Teil nicht berücksichtigt. '); INSERT INTO txt VALUES ('H5610', 'English', 'App Role Pattern: Defines the beginning of an App Role name (e.g. "AR"). According to an network area name (e.g. "NAxx"), an App Role name (e.g. "ARxx") is preset in the length of the fixed part defined above. + If the length of the pattern is greater than the fixed part length, the surplus part is ignored. '); INSERT INTO txt VALUES ('H5611', 'German', 'Pfad und Name von Appdaten-Import (ohne Endung): Hier werden die vollständigen Pfade für eventuell vorhandene Importskripte und -dateien eingegeben. Der Importprozess prüft für jede der eingegebenen Datenquellen zunächst, ob ein Skript dieses Namens mit der Endung .py vorhanden ist, und führt dieses ggf. aus. @@ -4393,6 +4397,8 @@ INSERT INTO txt VALUES ('H5617', 'German', 'Reduzierten Protokollset darstellen INSERT INTO txt VALUES ('H5617', 'English', 'Display reduced Protocol set: Offer only a reduced number of protocols for selection (TCP, UDP, ICMP).'); INSERT INTO txt VALUES ('H5618', 'German', 'Nutzung von Piktogrammen: Vorzugsweise Nutzung von Piktogrammen wo sinnvoll. Wird vom Administrator allgemein vorausgewählt, kann aber vom Nutzer in den persönlichen Einstellungen überschrieben werden.'); INSERT INTO txt VALUES ('H5618', 'English', 'Prefer use of Icons: Use icons where reasonnable. Generally set by the administrator but can be overwritten in the personal settings of the user.'); +INSERT INTO txt VALUES ('H5619', 'German', 'Eigentümernamen verwenden: Der Name des Eigentümers fliesst in den mittleren Teil der Namenskonvention für App-Rollen ein.'); +INSERT INTO txt VALUES ('H5619', 'English', 'Use Owner Name: The name of the owner is used in the middle part of the naming convention for App Roles.'); INSERT INTO txt VALUES ('H5621', 'German', 'Ein Modellierer kann einige persönliche Voreinstellungen für die Darstellung der Modellierung überschreiben. Ausgangswert ist der vom Admin in den Modellierungseinstellungen gesetzte Wert. '); diff --git a/roles/lib/files/FWO.Api.Client/Data/ModellingManagedIdString.cs b/roles/lib/files/FWO.Api.Client/Data/ModellingManagedIdString.cs new file mode 100644 index 000000000..cea36bc14 --- /dev/null +++ b/roles/lib/files/FWO.Api.Client/Data/ModellingManagedIdString.cs @@ -0,0 +1,171 @@ +namespace FWO.Api.Data +{ + public class ModellingManagedIdString + { + private string IdString = ""; + private const string separator = "-"; + + public ModellingNamingConvention NamingConvention { get; set; } = new(); + + + public ModellingManagedIdString() + {} + + public ModellingManagedIdString(string idstring) + { + IdString = idstring; + NamingConvention = new(); + } + + public ModellingManagedIdString(ModellingManagedIdString managedIdstring) + { + IdString = managedIdstring.IdString; + NamingConvention = managedIdstring.NamingConvention; + } + + public string Whole + { + get + { + return IdString; + } + set + { + IdString = value; + } + } + + public string FixedPart + { + get + { + return IdString.Length >= NamingConvention.FixedPartLength ? IdString.Substring(0, NamingConvention.FixedPartLength) : IdString; + } + set + { + string valueToInsert = value.Length > NamingConvention.FixedPartLength ? value.Substring(0, NamingConvention.FixedPartLength) : value; + valueToInsert = FillFixedIfNecessary(valueToInsert, "?"); + if (IdString.Length >= NamingConvention.FixedPartLength) + { + IdString = valueToInsert + IdString.Substring(NamingConvention.FixedPartLength); + } + else + { + IdString = valueToInsert; + } + } + } + + public string AppPart + { + get + { + return NamingConvention.UseAppPart ? (AppPartExisting() ? IdString.Substring(NamingConvention.FixedPartLength, AppPartEnd() - NamingConvention.FixedPartLength + 1): "") : ""; + } + set + { + if(NamingConvention.UseAppPart) + { + IdString = FillFixedIfNecessary(IdString); + IdString = IdString.Substring(0, NamingConvention.FixedPartLength) + value + FreePart; + } + } + } + + public string CombinedFixPart + { + get + { + return FixedPart + (AppPart.EndsWith(separator) ? AppPart.Substring(0, AppPart.Length - 1) : AppPart); + } + set + { + IdString = value + FreePart; + } + } + + public string Separator + { + get + { + return NamingConvention.UseAppPart && AppPart.EndsWith(separator) ? separator : ""; + } + set + { + if(NamingConvention.UseAppPart) + { + AppPart += value; + } + } + } + + public string FreePart + { + get + { + return NamingConvention.UseAppPart && AppPartExisting() ? IdString.Substring(AppPartEnd() + 1) : IdString.Substring(NamingConvention.FixedPartLength); + } + set + { + IdString = FillFixedIfNecessary(IdString); + IdString = IdString.Substring(0, AppPartExisting() ? AppPartEnd() + 1 : NamingConvention.FixedPartLength) + value; + } + } + + public void SetAppPartFromExtId(string extAppId) + { + string zoneType = extAppId.StartsWith("APP") ? "0" : (extAppId.StartsWith("COM") ? "1" : "?"); + int idx = extAppId.IndexOf(separator); + string appNumber = idx > 0 ? extAppId.Substring(idx + 1, extAppId.Length - idx - 1) : ""; + AppPart = zoneType + appNumber + separator; + } + + public void ConvertAreaToAppRoleFixedPart (string areaIdString) + { + FixedPart = ConvertAreaToAppRole(areaIdString, NamingConvention); + } + + public static string ConvertAreaToAppRole (string areaIdString, ModellingNamingConvention namingConvention) + { + if(areaIdString.Length >= namingConvention.FixedPartLength) + { + return areaIdString.Substring(0, namingConvention.FixedPartLength).Remove(0, namingConvention.NetworkAreaPattern.Length).Insert(0, namingConvention.AppRolePattern); + } + return areaIdString; + } + + public static string ConvertAppRoleToArea (string appRoleIdString, ModellingNamingConvention namingConvention) + { + int convLength = namingConvention.AppRolePattern.Length > namingConvention.FixedPartLength ? namingConvention.FixedPartLength : namingConvention.AppRolePattern.Length; + if(appRoleIdString.Length >= namingConvention.FixedPartLength) + { + return appRoleIdString.Substring(0, namingConvention.FixedPartLength).Remove(0, convLength).Insert(0, namingConvention.NetworkAreaPattern); + } + return ""; + } + + + private int AppPartEnd() + { + return IdString.IndexOf(separator); + } + + private bool AppPartExisting() + { + return AppPartEnd() > NamingConvention.FixedPartLength && IdString.Length >= AppPartEnd(); + } + + private string FillFixedIfNecessary(string idString, string filler = " ") + { + if (idString.Length < NamingConvention.FixedPartLength) + { + int positionsToFill = NamingConvention.FixedPartLength - idString.Length; + for (int i = 0; i < positionsToFill; i++) + { + idString += filler; + } + } + return idString; + } + } +} diff --git a/roles/lib/files/FWO.Api.Client/Data/ModellingNamingConvention.cs b/roles/lib/files/FWO.Api.Client/Data/ModellingNamingConvention.cs index ca117f732..c6f86c3bf 100644 --- a/roles/lib/files/FWO.Api.Client/Data/ModellingNamingConvention.cs +++ b/roles/lib/files/FWO.Api.Client/Data/ModellingNamingConvention.cs @@ -8,6 +8,9 @@ public class ModellingNamingConvention [JsonProperty("networkAreaRequired"), JsonPropertyName("networkAreaRequired")] public bool NetworkAreaRequired { get; set; } = false; + [JsonProperty("useAppPart"), JsonPropertyName("useAppPart")] + public bool UseAppPart { get; set; } = false; + [JsonProperty("fixedPartLength"), JsonPropertyName("fixedPartLength")] public int FixedPartLength { get; set; } diff --git a/roles/lib/files/FWO.Api.Client/Data/ModellingNwGroup.cs b/roles/lib/files/FWO.Api.Client/Data/ModellingNwGroup.cs index 1082a3b91..eda16f192 100644 --- a/roles/lib/files/FWO.Api.Client/Data/ModellingNwGroup.cs +++ b/roles/lib/files/FWO.Api.Client/Data/ModellingNwGroup.cs @@ -9,54 +9,13 @@ public class ModellingNwGroup : ModellingNwObject public int GroupType { get; set; } [JsonProperty("id_string"), JsonPropertyName("id_string")] - public string IdString { get; set; } = ""; - public string IdStringFixedPart - { - get - { - return IdString.Length >= FixedPartLength ? IdString.Substring(0, FixedPartLength) : IdString; - } - set - { - if(IdString.Length >= FixedPartLength) - { - IdString = value + IdString.Substring(FixedPartLength); - } - else - { - IdString = value; - } - } - } - public string IdStringFreePart + public string IdString { - get - { - return IdString.Length >= FixedPartLength ? IdString.Substring(FixedPartLength) : ""; - } - set - { - if(IdString.Length >= FixedPartLength) - { - IdString = IdString.Substring(0, FixedPartLength) + value; - } - else - { - for (int i = 0; i < FixedPartLength - IdString.Length; i++) - { - IdString += " "; - } - IdString += value; - } - } + get { return ManagedIdString.Whole; } + set { ManagedIdString = new (value); } } + public ModellingManagedIdString ManagedIdString { get; set; } = new (); - public int FixedPartLength; - - public void SetFixedPartLength(int fixedPartLength) - { - FixedPartLength = fixedPartLength; - } public override string Display() { @@ -76,7 +35,7 @@ public override string DisplayWithIcon() public override bool Sanitize() { bool shortened = base.Sanitize(); - IdString = Sanitizer.SanitizeMand(IdString, ref shortened); + ManagedIdString.FreePart = Sanitizer.SanitizeMand(ManagedIdString.FreePart, ref shortened); return shortened; } diff --git a/roles/test/files/FWO.Test/ManagedIdStringTest.cs b/roles/test/files/FWO.Test/ManagedIdStringTest.cs new file mode 100644 index 000000000..8ae4692b4 --- /dev/null +++ b/roles/test/files/FWO.Test/ManagedIdStringTest.cs @@ -0,0 +1,143 @@ +using NUnit.Framework; +using FWO.Api.Data; + +namespace FWO.Test +{ + [TestFixture] + [Parallelizable] + internal class ManagedIdStringTest + { + ModellingManagedIdString IdString1 = new(); + ModellingManagedIdString IdString2 = new("AR5001234-123"); + + static readonly ModellingNamingConvention NamingConvention1 = new() + { + NetworkAreaRequired = true, + UseAppPart = false, + FixedPartLength = 2, + FreePartLength = 5, + NetworkAreaPattern = "NA", + AppRolePattern = "AR" + }; + static readonly ModellingNamingConvention NamingConvention2 = new() + { + NetworkAreaRequired = true, + UseAppPart = true, + FixedPartLength = 4, + FreePartLength = 3, + NetworkAreaPattern = "NA", + AppRolePattern = "AR" + }; + + ModellingNamingConvention NamingConvention3 = new() + { + NetworkAreaRequired = true, + UseAppPart = true, + FixedPartLength = 4, + FreePartLength = 3, + NetworkAreaPattern = "", + AppRolePattern = "A" + }; + + + [Test] + public void TestManagedIdStringStartEmpty() + { + Assert.AreEqual("", IdString1.Whole); + Assert.AreEqual("", IdString1.FixedPart); + Assert.AreEqual("", IdString1.AppPart); + Assert.AreEqual("", IdString1.FreePart); + Assert.AreEqual("", IdString1.CombinedFixPart); + + IdString1.SetAppPartFromExtId("APP-0001"); + Assert.AreEqual("", IdString1.Whole); + Assert.AreEqual("", IdString1.FixedPart); + Assert.AreEqual("", IdString1.AppPart); + Assert.AreEqual("", IdString1.Separator); + Assert.AreEqual("", IdString1.FreePart); + Assert.AreEqual("", IdString1.CombinedFixPart); + + IdString1.NamingConvention = NamingConvention2; + IdString1.SetAppPartFromExtId("APP-0001"); + Assert.AreEqual(" 00001-", IdString1.Whole); + Assert.AreEqual(" ", IdString1.FixedPart); + Assert.AreEqual("00001-", IdString1.AppPart); + Assert.AreEqual("-", IdString1.Separator); + Assert.AreEqual("", IdString1.FreePart); + Assert.AreEqual(" 00001", IdString1.CombinedFixPart); + + IdString1.FixedPart = "x"; + Assert.AreEqual("x???00001-", IdString1.Whole); + Assert.AreEqual("x???", IdString1.FixedPart); + Assert.AreEqual("00001-", IdString1.AppPart); + Assert.AreEqual("-", IdString1.Separator); + Assert.AreEqual("", IdString1.FreePart); + Assert.AreEqual("x???00001", IdString1.CombinedFixPart); + + IdString1.FixedPart = "muchlonger"; + Assert.AreEqual("much00001-", IdString1.Whole); + Assert.AreEqual("much", IdString1.FixedPart); + Assert.AreEqual("00001-", IdString1.AppPart); + Assert.AreEqual("-", IdString1.Separator); + Assert.AreEqual("", IdString1.FreePart); + Assert.AreEqual("much00001", IdString1.CombinedFixPart); + } + + [Test] + public void TestManagedIdStringPrefilled() + { + Assert.AreEqual("AR5001234-123", IdString2.Whole); + Assert.AreEqual("", IdString2.FixedPart); + Assert.AreEqual("", IdString2.AppPart); + Assert.AreEqual("", IdString2.Separator); + Assert.AreEqual("AR5001234-123", IdString2.FreePart); + Assert.AreEqual("", IdString2.CombinedFixPart); + + IdString2.NamingConvention = NamingConvention1; + Assert.AreEqual("AR5001234-123", IdString2.Whole); + Assert.AreEqual("AR", IdString2.FixedPart); + Assert.AreEqual("", IdString2.AppPart); + Assert.AreEqual("", IdString2.Separator); + Assert.AreEqual("5001234-123", IdString2.FreePart); + Assert.AreEqual("AR", IdString2.CombinedFixPart); + + IdString2.NamingConvention = NamingConvention2; + Assert.AreEqual("AR5001234-123", IdString2.Whole); + Assert.AreEqual("AR50", IdString2.FixedPart); + Assert.AreEqual("01234-", IdString2.AppPart); + Assert.AreEqual("-", IdString2.Separator); + Assert.AreEqual("123", IdString2.FreePart); + Assert.AreEqual("AR5001234", IdString2.CombinedFixPart); + + IdString2.SetAppPartFromExtId("COM-99999"); + Assert.AreEqual("AR50199999-123", IdString2.Whole); + Assert.AreEqual("AR50", IdString2.FixedPart); + Assert.AreEqual("199999-", IdString2.AppPart); + Assert.AreEqual("-", IdString2.Separator); + Assert.AreEqual("123", IdString2.FreePart); + Assert.AreEqual("AR50199999", IdString2.CombinedFixPart); + + IdString2.NamingConvention = new(); + Assert.AreEqual("AR50199999-123", IdString2.Whole); + Assert.AreEqual("", IdString2.FixedPart); + Assert.AreEqual("", IdString2.AppPart); + Assert.AreEqual("", IdString2.Separator); + Assert.AreEqual("AR50199999-123", IdString2.FreePart); + Assert.AreEqual("", IdString2.CombinedFixPart); + } + + [Test] + public void TestReconstructAreaIdString() + { + Assert.AreEqual("NA", ModellingManagedIdString.ConvertAppRoleToArea("AR5000001", NamingConvention1)); + Assert.AreEqual("NA91", ModellingManagedIdString.ConvertAppRoleToArea("AR9104106-001", NamingConvention2)); + Assert.AreEqual("R91", ModellingManagedIdString.ConvertAppRoleToArea("AR9112345-001", NamingConvention3)); + NamingConvention3.NetworkAreaPattern = "XYZ"; + Assert.AreEqual("XYZR91", ModellingManagedIdString.ConvertAppRoleToArea("AR9112345-001", NamingConvention3)); + NamingConvention3.AppRolePattern = "AR91"; + Assert.AreEqual("XYZ", ModellingManagedIdString.ConvertAppRoleToArea("AR9112345-001", NamingConvention3)); + NamingConvention3.AppRolePattern = "AR91123"; + Assert.AreEqual("XYZ", ModellingManagedIdString.ConvertAppRoleToArea("AR9112345-001", NamingConvention3)); + } + } +} diff --git a/roles/test/files/FWO.Test/ModellingHandlerTest.cs b/roles/test/files/FWO.Test/ModellingHandlerTest.cs index b4e88a768..a3c04cd9a 100644 --- a/roles/test/files/FWO.Test/ModellingHandlerTest.cs +++ b/roles/test/files/FWO.Test/ModellingHandlerTest.cs @@ -140,11 +140,5 @@ public async Task TestProposeFreeAppRoleNumber() { Assert.AreEqual("00002", await AppRoleHandler.ProposeFreeAppRoleNumber(TestArea)); } - - [Test] - public void TestReconstructAreaIdString() - { - Assert.AreEqual("NA50", AppRoleHandler.ReconstructAreaIdString(new(){ Id = 1, IdString = "AR5000001" })); - } } } diff --git a/roles/ui/files/FWO.UI/Pages/Help/HelpSettingsModelling.cshtml b/roles/ui/files/FWO.UI/Pages/Help/HelpSettingsModelling.cshtml index b945455d8..a1beff12d 100644 --- a/roles/ui/files/FWO.UI/Pages/Help/HelpSettingsModelling.cshtml +++ b/roles/ui/files/FWO.UI/Pages/Help/HelpSettingsModelling.cshtml @@ -27,10 +27,11 @@ @(Html.Raw(userConfig.GetText("naming_convention")))
    • @(Html.Raw(userConfig.GetText("H5606")))
      • -
    • @(Html.Raw(userConfig.GetText("H5607")))
      • -
    • @(Html.Raw(userConfig.GetText("H5608")))
    • @(Html.Raw(userConfig.GetText("H5609")))
    • @(Html.Raw(userConfig.GetText("H5610")))
      • +
    • @(Html.Raw(userConfig.GetText("H5607")))
      • +
    • @(Html.Raw(userConfig.GetText("H5619")))
      • +
    • @(Html.Raw(userConfig.GetText("H5608")))
    @(Html.Raw(userConfig.GetText("import_app_data")))
      diff --git a/roles/ui/files/FWO.UI/Pages/NetworkModelling/EditAppRole.razor b/roles/ui/files/FWO.UI/Pages/NetworkModelling/EditAppRole.razor index 58051da78..65333a30d 100644 --- a/roles/ui/files/FWO.UI/Pages/NetworkModelling/EditAppRole.razor +++ b/roles/ui/files/FWO.UI/Pages/NetworkModelling/EditAppRole.razor @@ -40,8 +40,9 @@ @if(AppRoleHandler.NamingConvention.NetworkAreaRequired) { - - + + @AppRoleHandler.ActAppRole.ManagedIdString.Separator + } else { @@ -189,16 +190,7 @@ if(!workInProgress) { workInProgress = true; - AppRoleHandler.ActAppRole.Area = newArea; - if(newArea != null) - { - if(newArea.IdString.Length >= AppRoleHandler.NamingConvention.FixedPartLength && AddMode) - { - AppRoleHandler.ActAppRole.IdStringFixedPart = AppRoleHandler.GetFixedAppRolePart(newArea); - AppRoleHandler.ActAppRole.IdStringFreePart = await AppRoleHandler.ProposeFreeAppRoleNumber(newArea); - } - } - await AppRoleHandler.SelectAppServersFromArea(newArea); + await AppRoleHandler.InitAppRole(newArea); workInProgress = false; } } diff --git a/roles/ui/files/FWO.UI/Pages/Settings/SettingsModelling.razor b/roles/ui/files/FWO.UI/Pages/Settings/SettingsModelling.razor index 9ed113ecd..aa7728de9 100644 --- a/roles/ui/files/FWO.UI/Pages/Settings/SettingsModelling.razor +++ b/roles/ui/files/FWO.UI/Pages/Settings/SettingsModelling.razor @@ -64,25 +64,31 @@
    +
    + + +
    +
    + + +
    +
    +
    +
    + +
    + +
    +
    -
    -
    - - -
    -
    - - -
    -
    diff --git a/roles/ui/files/FWO.UI/Services/ModellingAppRoleHandler.cs b/roles/ui/files/FWO.UI/Services/ModellingAppRoleHandler.cs index 7376716f6..ef726e624 100644 --- a/roles/ui/files/FWO.UI/Services/ModellingAppRoleHandler.cs +++ b/roles/ui/files/FWO.UI/Services/ModellingAppRoleHandler.cs @@ -17,33 +17,56 @@ public class ModellingAppRoleHandler : ModellingHandlerBase public List AvailableAppServers { get; set; } = new(); public List AppServersInArea { get; set; } = new(); public List> AvailableNwElems { get; set; } = new(); - public List AppServerToAdd { get; set; } = new(); public List AppServerToDelete { get; set; } = new(); - private readonly string origId = ""; public ModellingNamingConvention NamingConvention = new(); + private ModellingManagedIdString OrigId = new(); + public ModellingAppRoleHandler(ApiConnection apiConnection, UserConfig userConfig, FwoOwner application, List appRoles, ModellingAppRole appRole, List availableAppServers, List> availableNwElems, bool addMode, Action displayMessageInUi, bool isOwner = true) : base (apiConnection, userConfig, application, addMode, displayMessageInUi, isOwner) { - NamingConvention = JsonSerializer.Deserialize(userConfig.ModNamingConvention) ?? new(); AppRoles = appRoles; - foreach(var aR in AppRoles) - { - aR.SetFixedPartLength(NamingConvention.FixedPartLength); - } AvailableAppServers = availableAppServers; AvailableNwElems = availableNwElems; ActAppRole = appRole; - ActAppRole.SetFixedPartLength(NamingConvention.FixedPartLength); - if(!AddMode) + ApplyNamingConvention(application.ExtAppId); + } + + private void ApplyNamingConvention(string extAppId) + { + NamingConvention = JsonSerializer.Deserialize(userConfig.ModNamingConvention) ?? new(); + foreach(var aR in AppRoles) + { + aR.ManagedIdString.NamingConvention = NamingConvention; + } + ActAppRole.ManagedIdString.NamingConvention = NamingConvention; + if(AddMode) + { + ActAppRole.ManagedIdString.SetAppPartFromExtId(extAppId); + } + else + { + ActAppRole.Area = new () { IdString = ModellingManagedIdString.ConvertAppRoleToArea(ActAppRole.IdString, NamingConvention) }; + } + } + + public async Task InitAppRole(ModellingNetworkArea? newArea) + { + ActAppRole.Area = newArea; + if(newArea != null) { - ActAppRole.Area = new () { IdString = ReconstructAreaIdString(appRole) }; + if(newArea.IdString.Length >= NamingConvention.FixedPartLength && AddMode) + { + ActAppRole.ManagedIdString.ConvertAreaToAppRoleFixedPart(newArea.IdString); + ActAppRole.ManagedIdString.FreePart = await ProposeFreeAppRoleNumber(newArea); + } } - origId = ActAppRole.IdString; + OrigId = new(ActAppRole.ManagedIdString); + await SelectAppServersFromArea(newArea); } public void AppServerToAppRole(List appServers) @@ -101,10 +124,11 @@ private async Task CheckAppRole() DisplayMessageInUi(null, userConfig.GetText("edit_app_role"), userConfig.GetText("E5102"), true); return false; } - if((AddMode || ActAppRole.IdString != origId) && await IdStringAlreadyUsed(ActAppRole.IdString)) + if((AddMode || ActAppRole.IdString != OrigId.Whole) && await IdStringAlreadyUsed(ActAppRole.IdString)) { // popup for correction? - DisplayMessageInUi(null, userConfig.GetText("edit_app_role"), userConfig.GetText("E9003"), true); + DisplayMessageInUi(null, userConfig.GetText("edit_app_role"), ActAppRole.IdString.ToString() + ": " + userConfig.GetText("E9003"), true); + ActAppRole.ManagedIdString = new(OrigId); return false; } return true; @@ -129,12 +153,12 @@ private async Task IdStringAlreadyUsed(string appRoleIdString) public async Task ProposeFreeAppRoleNumber(ModellingNetworkArea area) { double maxNumbers = Math.Pow(10, NamingConvention.FreePartLength) - 1; - string idFix = GetFixedAppRolePart(area); + string idFix = ModellingManagedIdString.ConvertAreaToAppRole(area.IdString, NamingConvention); List? newestARs = await apiConnection.SendQueryAsync>(ModellingQueries.getNewestAppRoles, new { pattern = idFix + "%" }); if(newestARs != null && newestARs.Count > 0) { - newestARs[0].SetFixedPartLength(NamingConvention.FixedPartLength); - if(int.TryParse(newestARs[0].IdStringFreePart, out int aRNumber)) + newestARs[0].ManagedIdString.NamingConvention = NamingConvention; + if(int.TryParse(newestARs[0].ManagedIdString.FreePart, out int aRNumber)) { aRNumber++; while(aRNumber <= maxNumbers) @@ -159,24 +183,6 @@ public async Task ProposeFreeAppRoleNumber(ModellingNetworkArea area) return 1.ToString($"D{NamingConvention.FreePartLength}"); } - public string GetFixedAppRolePart(ModellingNetworkArea area) - { - if(area.IdString.Length >= NamingConvention.FixedPartLength) - { - return area.IdString.Substring(0, NamingConvention.FixedPartLength).Remove(0, NamingConvention.NetworkAreaPattern.Length).Insert(0, NamingConvention.AppRolePattern); - } - return area.IdString; - } - - public string ReconstructAreaIdString(ModellingAppRole appRole) - { - if(appRole.IdString.Length >= NamingConvention.FixedPartLength) - { - return appRole.IdString.Substring(0, NamingConvention.FixedPartLength).Remove(0, NamingConvention.AppRolePattern.Length).Insert(0, NamingConvention.NetworkAreaPattern); - } - return ""; - } - private async Task AddAppRoleToDb() { try From 7ff1e1e7bdc1fd649cd21735eb12ec2ea76ea1b1 Mon Sep 17 00:00:00 2001 From: Tim Purschke Date: Fri, 23 Feb 2024 08:19:05 +0100 Subject: [PATCH 07/84] cleanup old code (commented out already) --- roles/importer/files/importer/checkpointR8x/cp_getter.py | 1 - roles/importer/files/importer/fwo_api.py | 1 - 2 files changed, 2 deletions(-) diff --git a/roles/importer/files/importer/checkpointR8x/cp_getter.py b/roles/importer/files/importer/checkpointR8x/cp_getter.py index 98071ddf4..90bdc188e 100644 --- a/roles/importer/files/importer/checkpointR8x/cp_getter.py +++ b/roles/importer/files/importer/checkpointR8x/cp_getter.py @@ -1,6 +1,5 @@ # library for API get functions from asyncio.log import logger -# from distutils.log import debug import json import re import requests, requests.packages diff --git a/roles/importer/files/importer/fwo_api.py b/roles/importer/files/importer/fwo_api.py index 97ea43210..f827accc5 100644 --- a/roles/importer/files/importer/fwo_api.py +++ b/roles/importer/files/importer/fwo_api.py @@ -1,6 +1,5 @@ # library for FWORCH API calls from asyncio.log import logger -# from distutils.log import debug import re import traceback from sqlite3 import Timestamp From ec5e45c4aa3ded3b835d08ecd55709093f767c8d Mon Sep 17 00:00:00 2001 From: abarz722 Date: Fri, 23 Feb 2024 12:58:02 +0100 Subject: [PATCH 08/84] tabs + tests --- .../files/sql/idempotent/fworch-texts.sql | 8 ++-- .../Data/ModellingConnection.cs | 2 +- .../files/FWO.Test/ManagedIdStringTest.cs | 22 ++------- .../files/FWO.Test/ModellingHandlerTest.cs | 23 ++++++++- .../FWO.Test/ModellingHandlerTestApiConn.cs | 21 +++++++-- .../NetworkModelling/NetworkModelling.razor | 12 ++--- .../FWO.UI/Services/ModellingAppHandler.cs | 8 ++-- .../Services/ModellingAppRoleHandler.cs | 47 ++++++++++--------- 8 files changed, 84 insertions(+), 59 deletions(-) diff --git a/roles/database/files/sql/idempotent/fworch-texts.sql b/roles/database/files/sql/idempotent/fworch-texts.sql index c9fa79372..2949e68a6 100644 --- a/roles/database/files/sql/idempotent/fworch-texts.sql +++ b/roles/database/files/sql/idempotent/fworch-texts.sql @@ -5511,19 +5511,19 @@ INSERT INTO txt VALUES ('H9022', 'English', 'Interfaces: They serve primarily th Besides the service either source or destination have to be defined in the application. The interfaces are offered to other applications to use them in the definition of own connections. '); -INSERT INTO txt VALUES ('H9023', 'German', 'Standard-Verbindungen: Zentrale Objekte zur Modellierung der Kommunikationsverbindungen. Dabei müssen Quelle, Dienst und Ziel aus den in der Bibliothek +INSERT INTO txt VALUES ('H9023', 'German', 'Standard: Zentrale Objekte zur Modellierung der Kommunikationsverbindungen. Dabei müssen Quelle, Dienst und Ziel aus den in der Bibliothek angebotenen Ntzwerkobjekten bzw. Services gewählt werden. Es können auch eigene oder externe Schnittstellen eingebunden werden. Dann müssen nur noch die "offenen Enden" (je nach Schnittstelle Quelle oder Ziel) aus der Bibliothek hinzugefügt werden. '); -INSERT INTO txt VALUES ('H9023', 'English', 'Regular Connections: Essential objects for modelling the communication. Source, Service and Destination have to be selected from the network resp. service objects +INSERT INTO txt VALUES ('H9023', 'English', 'Connections: Essential objects for modelling the communication. Source, Service and Destination have to be selected from the network resp. service objects offered in the library. Additionally own or external interfaces can be integrated. In this case only the "open ends" (source or destination, depending on the inetrface type) have to be added from the library. '); INSERT INTO txt VALUES ('H9024', 'German', 'Common Services: Können nur definiert werden, wenn die Applikation durch den Administrator in den Eigentümer-Einstellungen - dafür freigegeben wurde. Sie sind formal wie Standard-Verbindungen aufgebaut. + dafür freigegeben wurde. Sie sind formal wie normale Verbindungen aufgebaut, dürfen aber keine Schnittstellen verwenden. '); INSERT INTO txt VALUES ('H9024', 'English', 'Common Services: Can only be defined, if the application is marked as permitted in the Owner Settings by the administrator. - Formally they are structured as regular connections. + Formally they are structured as regular connections but are not allowed to use interfaces. '); INSERT INTO txt VALUES ('H9031', 'German', 'Netzwerkobjekte werden zur Definition von Quelle und Ziel der Verbindungen benötigt. Es wird zwischen verschiedenen Arten von Netzwerkobjekten unterschieden:'); INSERT INTO txt VALUES ('H9031', 'English', 'Network objects are used to define source and destination of the connections. There are different types of network objects:'); diff --git a/roles/lib/files/FWO.Api.Client/Data/ModellingConnection.cs b/roles/lib/files/FWO.Api.Client/Data/ModellingConnection.cs index f1209612f..3fbb62943 100644 --- a/roles/lib/files/FWO.Api.Client/Data/ModellingConnection.cs +++ b/roles/lib/files/FWO.Api.Client/Data/ModellingConnection.cs @@ -124,7 +124,7 @@ public string GetConnType() { return "common_service"; } - return "regular_connection"; + return "connection"; } public bool SourceFilled() diff --git a/roles/test/files/FWO.Test/ManagedIdStringTest.cs b/roles/test/files/FWO.Test/ManagedIdStringTest.cs index 8ae4692b4..5b498d81e 100644 --- a/roles/test/files/FWO.Test/ManagedIdStringTest.cs +++ b/roles/test/files/FWO.Test/ManagedIdStringTest.cs @@ -12,31 +12,15 @@ internal class ManagedIdStringTest static readonly ModellingNamingConvention NamingConvention1 = new() { - NetworkAreaRequired = true, - UseAppPart = false, - FixedPartLength = 2, - FreePartLength = 5, - NetworkAreaPattern = "NA", - AppRolePattern = "AR" + NetworkAreaRequired = true, UseAppPart = false, FixedPartLength = 2, FreePartLength = 5, NetworkAreaPattern = "NA", AppRolePattern = "AR" }; static readonly ModellingNamingConvention NamingConvention2 = new() { - NetworkAreaRequired = true, - UseAppPart = true, - FixedPartLength = 4, - FreePartLength = 3, - NetworkAreaPattern = "NA", - AppRolePattern = "AR" + NetworkAreaRequired = true, UseAppPart = true, FixedPartLength = 4, FreePartLength = 3, NetworkAreaPattern = "NA", AppRolePattern = "AR" }; - ModellingNamingConvention NamingConvention3 = new() { - NetworkAreaRequired = true, - UseAppPart = true, - FixedPartLength = 4, - FreePartLength = 3, - NetworkAreaPattern = "", - AppRolePattern = "A" + NetworkAreaRequired = true, UseAppPart = true, FixedPartLength = 4, FreePartLength = 3, NetworkAreaPattern = "", AppRolePattern = "A" }; diff --git a/roles/test/files/FWO.Test/ModellingHandlerTest.cs b/roles/test/files/FWO.Test/ModellingHandlerTest.cs index a3c04cd9a..3a9e290ef 100644 --- a/roles/test/files/FWO.Test/ModellingHandlerTest.cs +++ b/roles/test/files/FWO.Test/ModellingHandlerTest.cs @@ -42,6 +42,15 @@ internal class ModellingHandlerTest new(){ Content = new(){ Name = "Testsubnet2", Ip = "11.0.0.0/30", IpEnd = "11.0.0.0/30" }} }}; + static readonly ModellingNamingConvention NamingConvention1 = new() + { + NetworkAreaRequired = true, UseAppPart = false, FixedPartLength = 4, FreePartLength = 5, NetworkAreaPattern = "NA", AppRolePattern = "AR" + }; + static readonly ModellingNamingConvention NamingConvention2 = new() + { + NetworkAreaRequired = true, UseAppPart = true, FixedPartLength = 4, FreePartLength = 3, NetworkAreaPattern = "NA", AppRolePattern = "AR" + }; + ModellingAppRoleHandler? AppRoleHandler; ModellingAppHandler? AppHandler; @@ -138,7 +147,19 @@ public async Task TestSelectAppServersFromArea() [Test] public async Task TestProposeFreeAppRoleNumber() { - Assert.AreEqual("00002", await AppRoleHandler.ProposeFreeAppRoleNumber(TestArea)); + ModellingManagedIdString idFixString = new() { NamingConvention = NamingConvention1 }; + idFixString.ConvertAreaToAppRoleFixedPart(TestArea.IdString); + idFixString.SetAppPartFromExtId("APP-1234"); + Assert.AreEqual("00002", await AppRoleHandler.ProposeFreeAppRoleNumber(idFixString)); + + idFixString.NamingConvention = NamingConvention2; + idFixString.ConvertAreaToAppRoleFixedPart("NA91"); + idFixString.SetAppPartFromExtId("APP-1234"); + AppRoleHandler.NamingConvention = NamingConvention2; + Assert.AreEqual("003", await AppRoleHandler.ProposeFreeAppRoleNumber(idFixString)); + + idFixString.ConvertAreaToAppRoleFixedPart("NA99"); + Assert.AreEqual("001", await AppRoleHandler.ProposeFreeAppRoleNumber(idFixString)); } } } diff --git a/roles/test/files/FWO.Test/ModellingHandlerTestApiConn.cs b/roles/test/files/FWO.Test/ModellingHandlerTestApiConn.cs index 43e1105ae..356ee3aa6 100644 --- a/roles/test/files/FWO.Test/ModellingHandlerTestApiConn.cs +++ b/roles/test/files/FWO.Test/ModellingHandlerTestApiConn.cs @@ -7,7 +7,11 @@ namespace FWO.Test internal class ModellingHandlerTestApiConn : SimulatedApiConnection { const string AppRoleId1 = "AR5000001"; + const string AppRoleId2 = "AR9101234-002"; + const string AppRoleId3 = "AR9901234-999"; ModellingAppRole AppRole1 = new(){ Id = 1, IdString = AppRoleId1 }; + ModellingAppRole AppRole2 = new(){ Id = 2, IdString = AppRoleId2 }; + ModellingAppRole AppRole3 = new(){ Id = 3, IdString = AppRoleId3 }; public override async Task SendQueryAsync(string query, object? variables = null, string? operationName = null) @@ -18,10 +22,21 @@ public override async Task SendQueryAsync( List? appRoles = new(); if(query == ModellingQueries.getNewestAppRoles) { - string pattern = variables.GetType().GetProperties().First(o => o.Name == "pattern").GetValue(variables, null).ToString(); - if(variables != null && (pattern == AppRoleId1 || pattern == "AR50%")) + if(variables != null) { - appRoles = new(){ AppRole1 }; + string pattern = variables.GetType().GetProperties().First(o => o.Name == "pattern").GetValue(variables, null)?.ToString(); + if(pattern == AppRoleId1 || pattern == "AR50%") + { + appRoles = new(){ AppRole1 }; + } + else if(pattern == AppRoleId2 || pattern == "AR9101234%") + { + appRoles = new(){ AppRole2 }; + } + else if(pattern == AppRoleId3 || pattern == "AR9901234%") + { + appRoles = new(){ AppRole3 }; + } } } else diff --git a/roles/ui/files/FWO.UI/Pages/NetworkModelling/NetworkModelling.razor b/roles/ui/files/FWO.UI/Pages/NetworkModelling/NetworkModelling.razor index 82da52e5c..16566337c 100644 --- a/roles/ui/files/FWO.UI/Pages/NetworkModelling/NetworkModelling.razor +++ b/roles/ui/files/FWO.UI/Pages/NetworkModelling/NetworkModelling.razor @@ -59,21 +59,21 @@
    - + + + + + @if(selectedApp.CommSvcPossible) { - + } - - - -
    0) + if (GetInterfaces().Count > 0) { tab = 1; } - else if (GetRegularConnections().Count > 0) + else if (Application.CommSvcPossible && GetCommonServices().Count > 0) { - tab = Application.CommSvcPossible ? 2 : 1; + tab = 2; } } tabset.SetActiveTab(tab); diff --git a/roles/ui/files/FWO.UI/Services/ModellingAppRoleHandler.cs b/roles/ui/files/FWO.UI/Services/ModellingAppRoleHandler.cs index ef726e624..d6367052c 100644 --- a/roles/ui/files/FWO.UI/Services/ModellingAppRoleHandler.cs +++ b/roles/ui/files/FWO.UI/Services/ModellingAppRoleHandler.cs @@ -62,7 +62,7 @@ public async Task InitAppRole(ModellingNetworkArea? newArea) if(newArea.IdString.Length >= NamingConvention.FixedPartLength && AddMode) { ActAppRole.ManagedIdString.ConvertAreaToAppRoleFixedPart(newArea.IdString); - ActAppRole.ManagedIdString.FreePart = await ProposeFreeAppRoleNumber(newArea); + ActAppRole.ManagedIdString.FreePart = await ProposeFreeAppRoleNumber(ActAppRole.ManagedIdString); } } OrigId = new(ActAppRole.ManagedIdString); @@ -150,37 +150,42 @@ private async Task IdStringAlreadyUsed(string appRoleIdString) return false; } - public async Task ProposeFreeAppRoleNumber(ModellingNetworkArea area) + public async Task ProposeFreeAppRoleNumber(ModellingManagedIdString idFixString) { - double maxNumbers = Math.Pow(10, NamingConvention.FreePartLength) - 1; - string idFix = ModellingManagedIdString.ConvertAreaToAppRole(area.IdString, NamingConvention); - List? newestARs = await apiConnection.SendQueryAsync>(ModellingQueries.getNewestAppRoles, new { pattern = idFix + "%" }); + int proposedNumber = 1; + List? newestARs = await apiConnection.SendQueryAsync>(ModellingQueries.getNewestAppRoles, new { pattern = idFixString.CombinedFixPart + "%" }); if(newestARs != null && newestARs.Count > 0) { newestARs[0].ManagedIdString.NamingConvention = NamingConvention; - if(int.TryParse(newestARs[0].ManagedIdString.FreePart, out int aRNumber)) + if(int.TryParse(newestARs[0].ManagedIdString.FreePart, out int newestARNumber)) { - aRNumber++; - while(aRNumber <= maxNumbers) + proposedNumber = await SearchFrom(idFixString, newestARNumber + 1); + if(proposedNumber == 0) { - if(!await IdStringAlreadyUsed(idFix + aRNumber.ToString($"D{NamingConvention.FreePartLength}"))) - { - return aRNumber.ToString($"D{NamingConvention.FreePartLength}"); - } - aRNumber++; + proposedNumber = await SearchFrom(idFixString, 1); } } - aRNumber = 1; - while(aRNumber <= maxNumbers) + } + return ProposedString(proposedNumber); + } + + private async Task SearchFrom(ModellingManagedIdString idFixString, int aRNumber) + { + double maxNumbers = Math.Pow(10, NamingConvention.FreePartLength) - 1; + while(aRNumber <= maxNumbers) + { + if(!await IdStringAlreadyUsed(idFixString.CombinedFixPart + idFixString.Separator + ProposedString(aRNumber))) { - if(!await IdStringAlreadyUsed(idFix + aRNumber.ToString($"D{NamingConvention.FreePartLength}"))) - { - return aRNumber.ToString($"D{NamingConvention.FreePartLength}"); - } - aRNumber++; + return aRNumber; } + aRNumber++; } - return 1.ToString($"D{NamingConvention.FreePartLength}"); + return 0; + } + + private string ProposedString(int aRNumber) + { + return aRNumber.ToString($"D{NamingConvention.FreePartLength}"); } private async Task AddAppRoleToDb() From c44f66d7bd4036a790ed61731043cb30eaa221d0 Mon Sep 17 00:00:00 2001 From: abarz722 Date: Fri, 23 Feb 2024 16:57:03 +0100 Subject: [PATCH 09/84] modelling fixes --- .../NetworkModelling/EditConnLeftSide.razor | 16 ++++++++-------- .../EditServiceGroupLeftSide.razor | 2 +- .../Pages/NetworkModelling/ManualAppServer.razor | 2 +- .../NetworkModelling/NetworkModelling.razor | 6 +++--- .../Services/ModellingConnectionHandler.cs | 3 ++- .../FWO.UI/Services/ModellingHandlerBase.cs | 10 +++++++--- .../Services/ModellingServiceGroupHandler.cs | 3 ++- .../FWO.UI/Services/ModellingServiceHandler.cs | 5 ++++- 8 files changed, 28 insertions(+), 19 deletions(-) diff --git a/roles/ui/files/FWO.UI/Pages/NetworkModelling/EditConnLeftSide.razor b/roles/ui/files/FWO.UI/Pages/NetworkModelling/EditConnLeftSide.razor index 6abc9f8f7..2271b5ed8 100644 --- a/roles/ui/files/FWO.UI/Pages/NetworkModelling/EditConnLeftSide.razor +++ b/roles/ui/files/FWO.UI/Pages/NetworkModelling/EditConnLeftSide.razor @@ -34,9 +34,9 @@
    + @(ConnHandler.DisplayButton("search_nw_object", Icons.Search)) + @(ConnHandler.DisplayButton("add_app_role", Icons.Add)) @if(selectedNwElems.Count == 1) { @if(selectedNwElems[0].Key == (int)ModellingTypes.ObjectType.AppRole) @@ -90,6 +90,11 @@
    + @if(userConfig.AllowServiceInConn) + { + + } @if(selectedSvcElems.Count == 1) { @if(selectedSvcElems[0].Key == (int)ModellingTypes.ObjectType.ServiceGroup) @@ -123,7 +128,7 @@ }
    } - @if(!ConnHandler.ActConn.IsInterface && ConnHandler.ActConn.UsedInterfaceId == null) + @if(!ConnHandler.ActConn.IsInterface && !ConnHandler.ActConn.IsCommonService && ConnHandler.ActConn.UsedInterfaceId == null) {

    @(userConfig.GetText("interfaces"))
    @@ -206,11 +211,6 @@ private int sidebarLeftWidth { get { return Width; } set { Width = value; WidthChanged.InvokeAsync(Width);}} - @* private MarkupString DisplayButton(string text, string icon, string iconText = "") - { - return (MarkupString)(userConfig.ModIconify ? icon + (iconText != "" ? " " + userConfig.GetText(iconText) : "") : userConfig.GetText(text)); - } *@ - private bool InterfaceToConn(ModellingConnection interf) { ConnHandler.InterfaceToConn(interf); diff --git a/roles/ui/files/FWO.UI/Pages/NetworkModelling/EditServiceGroupLeftSide.razor b/roles/ui/files/FWO.UI/Pages/NetworkModelling/EditServiceGroupLeftSide.razor index 7a13ba262..60ef77cf5 100644 --- a/roles/ui/files/FWO.UI/Pages/NetworkModelling/EditServiceGroupLeftSide.razor +++ b/roles/ui/files/FWO.UI/Pages/NetworkModelling/EditServiceGroupLeftSide.razor @@ -25,7 +25,7 @@
    + {SvcGroupHandler.CreateService(); SvcGroupHandlerChanged.InvokeAsync(SvcGroupHandler);}">@(SvcGroupHandler.DisplayButton("add_service", Icons.Add)) @if(selectedServices.Count == 1) { + @(appServerListHandler.DisplayButton("add_app_server", Icons.Add))
    diff --git a/roles/ui/files/FWO.UI/Pages/NetworkModelling/NetworkModelling.razor b/roles/ui/files/FWO.UI/Pages/NetworkModelling/NetworkModelling.razor index 16566337c..903d3bb79 100644 --- a/roles/ui/files/FWO.UI/Pages/NetworkModelling/NetworkModelling.razor +++ b/roles/ui/files/FWO.UI/Pages/NetworkModelling/NetworkModelling.razor @@ -60,17 +60,17 @@
    - + - + @if(selectedApp.CommSvcPossible) { - + } diff --git a/roles/ui/files/FWO.UI/Services/ModellingConnectionHandler.cs b/roles/ui/files/FWO.UI/Services/ModellingConnectionHandler.cs index dc94fdfa8..88c3a3d3c 100644 --- a/roles/ui/files/FWO.UI/Services/ModellingConnectionHandler.cs +++ b/roles/ui/files/FWO.UI/Services/ModellingConnectionHandler.cs @@ -535,7 +535,8 @@ public void HandleService(ModellingService service) { try { - ServiceHandler = new ModellingServiceHandler(apiConnection, userConfig, Application, service, AvailableServices, AddServiceMode, DisplayMessageInUi, IsOwner); + ServiceHandler = new ModellingServiceHandler(apiConnection, userConfig, Application, service, + AvailableServices, AvailableSvcElems, AddServiceMode, DisplayMessageInUi, IsOwner); EditServiceMode = true; } catch (Exception exception) diff --git a/roles/ui/files/FWO.UI/Services/ModellingHandlerBase.cs b/roles/ui/files/FWO.UI/Services/ModellingHandlerBase.cs index 1f4006124..b911fba0c 100644 --- a/roles/ui/files/FWO.UI/Services/ModellingHandlerBase.cs +++ b/roles/ui/files/FWO.UI/Services/ModellingHandlerBase.cs @@ -32,11 +32,15 @@ public ModellingHandlerBase(ApiConnection apiConnection, UserConfig userConfig, IsOwner = isOwner; } - public MarkupString DisplayButton(string text, string icon, string iconText = "") + public MarkupString DisplayButton(string text, string icon, string iconText = "", string objIcon = "") { string tooltip = userConfig.ModIconify ? $"data-toggle=\"tooltip\" title=\"{@userConfig.PureLine(text)}\"" : ""; - string iconToDisplay = $""; - return (MarkupString)(userConfig.ModIconify ? iconToDisplay + (iconText != "" ? " " + userConfig.GetText(iconText) : "") : userConfig.GetText(text)); + string iconToDisplay = $""; + string objIconToDisplay = $""; + + return (MarkupString)(userConfig.ModIconify ? + iconToDisplay + (iconText != "" ? " " + userConfig.GetText(iconText) : "") + (objIcon != "" ? " " + objIconToDisplay : "") + : userConfig.GetText(text)); } protected async Task LogChange(ModellingTypes.ChangeType changeType, ModellingTypes.ObjectType objectType, long objId, string text, int? applicationId) diff --git a/roles/ui/files/FWO.UI/Services/ModellingServiceGroupHandler.cs b/roles/ui/files/FWO.UI/Services/ModellingServiceGroupHandler.cs index 6865dfbd6..a75fec3c9 100644 --- a/roles/ui/files/FWO.UI/Services/ModellingServiceGroupHandler.cs +++ b/roles/ui/files/FWO.UI/Services/ModellingServiceGroupHandler.cs @@ -60,7 +60,8 @@ public void HandleService(ModellingService service) try { service.IsGlobal = ActServiceGroup.IsGlobal; - ServiceHandler = new ModellingServiceHandler(apiConnection, userConfig, Application, service, AvailableServices, AddServiceMode, DisplayMessageInUi, IsOwner); + ServiceHandler = new ModellingServiceHandler(apiConnection, userConfig, Application, service, + AvailableServices, AvailableSvcElems, AddServiceMode, DisplayMessageInUi, IsOwner); EditServiceMode = true; } catch (Exception exception) diff --git a/roles/ui/files/FWO.UI/Services/ModellingServiceHandler.cs b/roles/ui/files/FWO.UI/Services/ModellingServiceHandler.cs index ddf178715..f85013578 100644 --- a/roles/ui/files/FWO.UI/Services/ModellingServiceHandler.cs +++ b/roles/ui/files/FWO.UI/Services/ModellingServiceHandler.cs @@ -10,15 +10,17 @@ public class ModellingServiceHandler : ModellingHandlerBase { public ModellingService ActService { get; set; } = new(); public List AvailableServices { get; set; } = new(); + public List> AvailableSvcElems { get; set; } = new(); private ModellingService ActServiceOrig { get; set; } = new(); public ModellingServiceHandler(ApiConnection apiConnection, UserConfig userConfig, FwoOwner application, - ModellingService service, List availableServices, bool addMode, Action displayMessageInUi, bool isOwner = true) + ModellingService service, List availableServices, List> availableSvcElems, bool addMode, Action displayMessageInUi, bool isOwner = true) : base (apiConnection, userConfig, application, addMode, displayMessageInUi, isOwner) { ActService = service; AvailableServices = availableServices; + AvailableSvcElems = availableSvcElems; ActServiceOrig = new ModellingService(ActService); } @@ -96,6 +98,7 @@ private async Task AddServiceToDb() await LogChange(ModellingTypes.ChangeType.Insert, ModellingTypes.ObjectType.Service, ActService.Id, $"New Service: {ActService.Display()}", Application.Id); AvailableServices.Add(ActService); + AvailableSvcElems.Add(new KeyValuePair((int)ModellingTypes.ObjectType.Service, ActService.Id)); } } catch (Exception exception) From 766364434a263a28e95b166991f1acdc2b8b2352 Mon Sep 17 00:00:00 2001 From: abarz722 Date: Fri, 23 Feb 2024 17:07:33 +0100 Subject: [PATCH 10/84] move global const, parametrize modelling icons --- .../Data}/GlobalConstants.cs | 21 ++++++++++++------- .../FWO.Api.Client/Data/ModellingAppRole.cs | 2 +- .../FWO.Api.Client/Data/ModellingAppServer.cs | 3 +-- .../FWO.Api.Client/Data/ModellingNwGroup.cs | 2 +- .../FWO.Api.Client/Data/ModellingObject.cs | 2 +- .../FWO.Api.Client/Data/ModellingService.cs | 2 +- .../Data/ModellingServiceGroup.cs | 2 +- .../Controllers/GroupController.cs | 2 +- .../Controllers/RoleController.cs | 2 +- .../files/FWO.Test/ModellingHandlerTest.cs | 14 ++++++------- .../NetworkModelling/EditConnLeftSide.razor | 4 ++-- .../FWO.UI/Services/ModellingHandlerBase.cs | 4 ++-- roles/ui/files/FWO.UI/Shared/Confirm.razor | 2 +- .../files/FWO.UI/Shared/ConfirmDelete.razor | 2 +- .../FWO.UI/Shared/MonitoringLayout.razor | 1 + .../files/FWO.UI/Shared/NavigationMenu.razor | 1 + .../files/FWO.UI/Shared/RequestLayout.razor | 1 + .../files/FWO.UI/Shared/SettingsLayout.razor | 1 + 18 files changed, 39 insertions(+), 29 deletions(-) rename roles/lib/files/{FWO.Config.Api => FWO.Api.Client/Data}/GlobalConstants.cs (72%) diff --git a/roles/lib/files/FWO.Config.Api/GlobalConstants.cs b/roles/lib/files/FWO.Api.Client/Data/GlobalConstants.cs similarity index 72% rename from roles/lib/files/FWO.Config.Api/GlobalConstants.cs rename to roles/lib/files/FWO.Api.Client/Data/GlobalConstants.cs index 117a17e6d..e6a1959ed 100644 --- a/roles/lib/files/FWO.Config.Api/GlobalConstants.cs +++ b/roles/lib/files/FWO.Api.Client/Data/GlobalConstants.cs @@ -1,4 +1,4 @@ -namespace FWO.Config.Api +namespace FWO.Api.Data { public struct GlobalConst { @@ -42,11 +42,18 @@ public struct GlobalConst public struct Icons { - public const string Add = "oi-plus"; - public const string Edit = "oi-wrench"; - public const string Delete = "oi-trash"; - public const string Search = "oi-magnifying-glass"; - public const string Use = "oi-arrow-thick-right"; - public const string Unuse = "oi-arrow-thick-left"; + public const string Add = "oi oi-plus"; + public const string Edit = "oi oi-wrench"; + public const string Delete = "oi oi-trash"; + public const string Search = "oi oi-magnifying-glass"; + public const string Use = "oi oi-arrow-thick-right"; + public const string Unuse = "oi oi-arrow-thick-left"; + + public const string ModObject = "oi oi-tag"; + public const string Service = "oi oi-wrench"; + public const string ServiceGroup = "oi oi-list-rich"; + public const string AppServer = "oi oi-laptop"; + public const string AppRole = "oi oi-list-rich"; + public const string NwGroup = "oi oi-folder"; } } diff --git a/roles/lib/files/FWO.Api.Client/Data/ModellingAppRole.cs b/roles/lib/files/FWO.Api.Client/Data/ModellingAppRole.cs index 04f16d7bc..a76ff30ae 100644 --- a/roles/lib/files/FWO.Api.Client/Data/ModellingAppRole.cs +++ b/roles/lib/files/FWO.Api.Client/Data/ModellingAppRole.cs @@ -35,7 +35,7 @@ public ModellingNwGroup ToBase() public override string DisplayWithIcon() { - return $" " + DisplayHtml(); + return $" " + DisplayHtml(); } public override bool Sanitize() diff --git a/roles/lib/files/FWO.Api.Client/Data/ModellingAppServer.cs b/roles/lib/files/FWO.Api.Client/Data/ModellingAppServer.cs index cd4652330..971629c47 100644 --- a/roles/lib/files/FWO.Api.Client/Data/ModellingAppServer.cs +++ b/roles/lib/files/FWO.Api.Client/Data/ModellingAppServer.cs @@ -27,8 +27,7 @@ public override string DisplayHtml() public override string DisplayWithIcon() { - return $" " + DisplayHtml(); - // return $" " + Display(); + return $" " + DisplayHtml(); } public override bool Sanitize() diff --git a/roles/lib/files/FWO.Api.Client/Data/ModellingNwGroup.cs b/roles/lib/files/FWO.Api.Client/Data/ModellingNwGroup.cs index eda16f192..b5ec0b270 100644 --- a/roles/lib/files/FWO.Api.Client/Data/ModellingNwGroup.cs +++ b/roles/lib/files/FWO.Api.Client/Data/ModellingNwGroup.cs @@ -29,7 +29,7 @@ public override string DisplayHtml() public override string DisplayWithIcon() { - return $" " + DisplayHtml(); + return $" " + DisplayHtml(); } public override bool Sanitize() diff --git a/roles/lib/files/FWO.Api.Client/Data/ModellingObject.cs b/roles/lib/files/FWO.Api.Client/Data/ModellingObject.cs index d4155c2d1..d95122b06 100644 --- a/roles/lib/files/FWO.Api.Client/Data/ModellingObject.cs +++ b/roles/lib/files/FWO.Api.Client/Data/ModellingObject.cs @@ -25,7 +25,7 @@ public virtual string DisplayHtml() public virtual string DisplayWithIcon() { - return $" " + DisplayHtml(); + return $" " + DisplayHtml(); } public virtual string DisplayWithIcon(bool displayGrey) diff --git a/roles/lib/files/FWO.Api.Client/Data/ModellingService.cs b/roles/lib/files/FWO.Api.Client/Data/ModellingService.cs index 6c75eba19..2582fc33d 100644 --- a/roles/lib/files/FWO.Api.Client/Data/ModellingService.cs +++ b/roles/lib/files/FWO.Api.Client/Data/ModellingService.cs @@ -40,7 +40,7 @@ public override string Display() public override string DisplayWithIcon() { - return $" " + DisplayHtml(); + return $" " + DisplayHtml(); } public static NetworkService ToNetworkService(ModellingService service) diff --git a/roles/lib/files/FWO.Api.Client/Data/ModellingServiceGroup.cs b/roles/lib/files/FWO.Api.Client/Data/ModellingServiceGroup.cs index d9fc53966..b4b769ed2 100644 --- a/roles/lib/files/FWO.Api.Client/Data/ModellingServiceGroup.cs +++ b/roles/lib/files/FWO.Api.Client/Data/ModellingServiceGroup.cs @@ -20,7 +20,7 @@ public class ModellingServiceGroup : ModellingSvcObject public override string DisplayWithIcon() { - return $" " + DisplayHtml(); + return $" " + DisplayHtml(); } public override bool Sanitize() diff --git a/roles/middleware/files/FWO.Middleware.Server/Controllers/GroupController.cs b/roles/middleware/files/FWO.Middleware.Server/Controllers/GroupController.cs index b290e359b..f8c0f2dcf 100644 --- a/roles/middleware/files/FWO.Middleware.Server/Controllers/GroupController.cs +++ b/roles/middleware/files/FWO.Middleware.Server/Controllers/GroupController.cs @@ -1,4 +1,4 @@ -using FWO.Config.Api; +using FWO.Api.Data; using FWO.Logging; using FWO.Middleware.RequestParameters; using FWO.Middleware.Server; diff --git a/roles/middleware/files/FWO.Middleware.Server/Controllers/RoleController.cs b/roles/middleware/files/FWO.Middleware.Server/Controllers/RoleController.cs index 48943c0e3..8de471647 100644 --- a/roles/middleware/files/FWO.Middleware.Server/Controllers/RoleController.cs +++ b/roles/middleware/files/FWO.Middleware.Server/Controllers/RoleController.cs @@ -1,4 +1,4 @@ -using FWO.Config.Api; +using FWO.Api.Data; using FWO.Logging; using FWO.Middleware.RequestParameters; using FWO.Middleware.Server; diff --git a/roles/test/files/FWO.Test/ModellingHandlerTest.cs b/roles/test/files/FWO.Test/ModellingHandlerTest.cs index 3a9e290ef..56b08fac1 100644 --- a/roles/test/files/FWO.Test/ModellingHandlerTest.cs +++ b/roles/test/files/FWO.Test/ModellingHandlerTest.cs @@ -117,13 +117,13 @@ public void TestGetSrcDstSvcNames() ServiceGroups = new(){ new(){ Content = new(){ Name = "SvcGroup1", IsGlobal = true}}}, Services = new(){ new(){ Content = new(){ Name = "Svc1", Port = 1111, Protocol = new(){ Name = "UDP"}} }} }; - List expectedSrc = new(){" Area1 (NA50)", - " !AppRole1 (AR5000001)", - " AppServerInside1 (10.0.0.0)", - " AppServerInside2 (10.0.0.5)"}; - List expectedDst = new(){" AppServerInside3 (11.0.0.1)"}; - List expectedSvc = new(){" SvcGroup1", - " Svc1 (1111/UDP)"}; + List expectedSrc = new(){$" Area1 (NA50)", + $" !AppRole1 (AR5000001)", + $" AppServerInside1 (10.0.0.0)", + $" AppServerInside2 (10.0.0.5)"}; + List expectedDst = new(){$" AppServerInside3 (11.0.0.1)"}; + List expectedSvc = new(){$" SvcGroup1", + $" Svc1 (1111/UDP)"}; Assert.AreEqual(expectedSrc, AppHandler.GetSrcNames(conn)); Assert.AreEqual(expectedDst, AppHandler.GetDstNames(conn)); Assert.AreEqual(expectedSvc, AppHandler.GetSvcNames(conn)); diff --git a/roles/ui/files/FWO.UI/Pages/NetworkModelling/EditConnLeftSide.razor b/roles/ui/files/FWO.UI/Pages/NetworkModelling/EditConnLeftSide.razor index 2271b5ed8..26695d8ea 100644 --- a/roles/ui/files/FWO.UI/Pages/NetworkModelling/EditConnLeftSide.razor +++ b/roles/ui/files/FWO.UI/Pages/NetworkModelling/EditConnLeftSide.razor @@ -89,11 +89,11 @@
    + @(ConnHandler.DisplayButton("add_service_group", Icons.Add, "", Icons.ServiceGroup)) @if(userConfig.AllowServiceInConn) { + @(ConnHandler.DisplayButton("add_service", Icons.Add, "", Icons.Service)) } @if(selectedSvcElems.Count == 1) { diff --git a/roles/ui/files/FWO.UI/Services/ModellingHandlerBase.cs b/roles/ui/files/FWO.UI/Services/ModellingHandlerBase.cs index b911fba0c..00f494c8d 100644 --- a/roles/ui/files/FWO.UI/Services/ModellingHandlerBase.cs +++ b/roles/ui/files/FWO.UI/Services/ModellingHandlerBase.cs @@ -35,8 +35,8 @@ public ModellingHandlerBase(ApiConnection apiConnection, UserConfig userConfig, public MarkupString DisplayButton(string text, string icon, string iconText = "", string objIcon = "") { string tooltip = userConfig.ModIconify ? $"data-toggle=\"tooltip\" title=\"{@userConfig.PureLine(text)}\"" : ""; - string iconToDisplay = $""; - string objIconToDisplay = $""; + string iconToDisplay = $""; + string objIconToDisplay = $""; return (MarkupString)(userConfig.ModIconify ? iconToDisplay + (iconText != "" ? " " + userConfig.GetText(iconText) : "") + (objIcon != "" ? " " + objIconToDisplay : "") diff --git a/roles/ui/files/FWO.UI/Shared/Confirm.razor b/roles/ui/files/FWO.UI/Shared/Confirm.razor index c4faa698e..50eb508e7 100644 --- a/roles/ui/files/FWO.UI/Shared/Confirm.razor +++ b/roles/ui/files/FWO.UI/Shared/Confirm.razor @@ -1,4 +1,4 @@ -@using FWO.Config.Api +@using FWO.Api.Data @attribute [Authorize(Roles = $"{GlobalConst.kAdmin}, {GlobalConst.kAuditor}")] diff --git a/roles/ui/files/FWO.UI/Shared/ConfirmDelete.razor b/roles/ui/files/FWO.UI/Shared/ConfirmDelete.razor index afee5f32c..211fcc1d9 100644 --- a/roles/ui/files/FWO.UI/Shared/ConfirmDelete.razor +++ b/roles/ui/files/FWO.UI/Shared/ConfirmDelete.razor @@ -1,4 +1,4 @@ -@using FWO.Config.Api +@using FWO.Api.Data @attribute [Authorize(Roles = $"{GlobalConst.kAdmin}, {GlobalConst.kAuditor}, {GlobalConst.kModeller}")] diff --git a/roles/ui/files/FWO.UI/Shared/MonitoringLayout.razor b/roles/ui/files/FWO.UI/Shared/MonitoringLayout.razor index 30775ebc6..6b35ca141 100644 --- a/roles/ui/files/FWO.UI/Shared/MonitoringLayout.razor +++ b/roles/ui/files/FWO.UI/Shared/MonitoringLayout.razor @@ -1,5 +1,6 @@ @using FWO.Config.Api @using FWO.Config.Api.Data +@using FWO.Api.Data @inherits LayoutComponentBase @layout MainLayout diff --git a/roles/ui/files/FWO.UI/Shared/NavigationMenu.razor b/roles/ui/files/FWO.UI/Shared/NavigationMenu.razor index 47a18027c..cffafffe6 100644 --- a/roles/ui/files/FWO.UI/Shared/NavigationMenu.razor +++ b/roles/ui/files/FWO.UI/Shared/NavigationMenu.razor @@ -1,5 +1,6 @@ @using FWO.Config.Api @using FWO.Config.Api.Data +@using FWO.Api.Data @inject GlobalConfig globalConfig @inject UserConfig userConfig diff --git a/roles/ui/files/FWO.UI/Shared/RequestLayout.razor b/roles/ui/files/FWO.UI/Shared/RequestLayout.razor index 746258647..72237a10a 100644 --- a/roles/ui/files/FWO.UI/Shared/RequestLayout.razor +++ b/roles/ui/files/FWO.UI/Shared/RequestLayout.razor @@ -2,6 +2,7 @@ @using FWO.Config.Api.Data @using FWO.Ui.Services @using FWO.Api.Client +@using FWO.Api.Data @inherits LayoutComponentBase @layout MainLayout diff --git a/roles/ui/files/FWO.UI/Shared/SettingsLayout.razor b/roles/ui/files/FWO.UI/Shared/SettingsLayout.razor index 3a4bcbd99..03ad8881e 100644 --- a/roles/ui/files/FWO.UI/Shared/SettingsLayout.razor +++ b/roles/ui/files/FWO.UI/Shared/SettingsLayout.razor @@ -1,5 +1,6 @@ @using FWO.Config.Api @using FWO.Config.Api.Data +@using FWO.Api.Data @inherits LayoutComponentBase @layout MainLayout From 95347765c520bd36d8122fb7ccc9eb2cff9b0019 Mon Sep 17 00:00:00 2001 From: abarz722 Date: Fri, 23 Feb 2024 17:51:22 +0100 Subject: [PATCH 11/84] rename role string constants --- .../FWO.Api.Client/Data/GlobalConstants.cs | 35 ++++++++++--------- .../AuthenticationServerController.cs | 10 +++--- .../AuthenticationTokenController.cs | 6 ++-- .../Controllers/GroupController.cs | 14 ++++---- .../Controllers/RoleController.cs | 6 ++-- .../Controllers/TenantController.cs | 8 ++--- .../Controllers/UserController.cs | 18 +++++----- .../files/FWO.Middleware.Server/JwtWriter.cs | 34 +++++++++--------- .../ui/files/FWO.UI/Auth/AuthStateProvider.cs | 2 +- .../ui/files/FWO.UI/Pages/Certification.razor | 10 +++--- .../Pages/Compliance/ComplianceLayout.razor | 2 +- .../FWO.UI/Pages/Compliance/ZoneTable.razor | 2 +- .../Pages/Compliance/ZonesConfiguration.razor | 6 ++-- .../FWO.UI/Pages/Compliance/ZonesMatrix.razor | 4 +-- .../Pages/Monitoring/MonitorAlerts.razor | 4 +-- .../FWO.UI/Pages/Monitoring/MonitorAll.razor | 2 +- .../Monitoring/MonitorAutodiscoveryLog.razor | 4 +-- .../Pages/Monitoring/MonitorDailyChecks.razor | 2 +- .../Pages/Monitoring/MonitorImportLog.razor | 2 +- .../Monitoring/MonitorImportStatus.razor | 2 +- .../Pages/Monitoring/MonitorUiLog.razor | 2 +- .../Pages/Monitoring/MonitoringMain.razor | 12 +++---- .../files/FWO.UI/Pages/NetworkAnalysis.razor | 2 +- .../EditAppRoleLeftSide.razor | 2 +- .../NetworkModelling/EditAppServer.razor | 4 +-- .../NetworkModelling/EditConnLeftSide.razor | 10 +++--- .../Pages/NetworkModelling/EditService.razor | 4 +-- .../NetworkModelling/EditServiceGroup.razor | 2 +- .../EditServiceGroupLeftSide.razor | 2 +- .../NetworkModelling/ManualAppServer.razor | 2 +- .../NetworkModelling/NetworkModelling.razor | 16 ++++----- .../NetworkModelling/PredefServices.razor | 6 ++-- .../NetworkModelling/SearchInterface.razor | 4 +-- .../NetworkModelling/SearchNwObject.razor | 4 +-- .../Pages/NetworkModelling/ShowHistory.razor | 4 +-- .../FWO.UI/Pages/Reporting/Archive.razor | 4 +-- .../files/FWO.UI/Pages/Reporting/Report.razor | 8 ++--- .../Pages/Reporting/ReportCreateTicket.razor | 6 ++-- .../Reporting/ReportTemplateComponent.razor | 4 +-- .../FWO.UI/Pages/Reporting/Schedule.razor | 4 +-- .../FWO.UI/Pages/Request/AssignObject.razor | 6 ++-- .../FWO.UI/Pages/Request/CommentObject.razor | 4 +-- .../FWO.UI/Pages/Request/DeleteObject.razor | 4 +-- .../Pages/Request/DisplayAccessElements.razor | 2 +- .../Pages/Request/DisplayApprovals.razor | 4 +-- .../Pages/Request/DisplayImplTaskTable.razor | 6 ++-- .../Request/DisplayImplementationTask.razor | 6 ++-- .../Pages/Request/DisplayPathAnalysis.razor | 2 +- .../Pages/Request/DisplayReqTaskTable.razor | 6 ++-- .../Pages/Request/DisplayRequestTask.razor | 8 ++--- .../FWO.UI/Pages/Request/DisplayRules.razor | 2 +- .../FWO.UI/Pages/Request/DisplayTicket.razor | 6 ++-- .../Pages/Request/DisplayTicketTable.razor | 2 +- .../FWO.UI/Pages/Request/PromoteObject.razor | 4 +-- .../Pages/Request/RequestApprovals.razor | 6 ++-- .../Request/RequestImplementations.razor | 6 ++-- .../Pages/Request/RequestPlannings.razor | 6 ++-- .../FWO.UI/Pages/Request/RequestReviews.razor | 6 ++-- .../FWO.UI/Pages/Request/RequestTickets.razor | 6 ++-- .../Request/RequestTicketsOverview.razor | 6 ++-- .../FWO.UI/Pages/Settings/RemoveUser.razor | 2 +- .../FWO.UI/Pages/Settings/SearchUser.razor | 4 +-- .../Pages/Settings/SelectFromLdap.razor | 4 +-- .../Pages/Settings/SettingsActions.razor | 6 ++-- .../Pages/Settings/SettingsCredentials.razor | 10 +++--- .../Pages/Settings/SettingsCustomTexts.razor | 4 +-- .../Pages/Settings/SettingsCustomizing.razor | 4 +-- .../Pages/Settings/SettingsDefaults.razor | 4 +-- .../FWO.UI/Pages/Settings/SettingsEmail.razor | 4 +-- .../Pages/Settings/SettingsGateways.razor | 8 ++--- .../Pages/Settings/SettingsGroups.razor | 8 ++--- .../Pages/Settings/SettingsImport.razor | 4 +-- .../Pages/Settings/SettingsLanguage.razor | 2 +- .../FWO.UI/Pages/Settings/SettingsLdap.razor | 4 +-- .../Pages/Settings/SettingsManagements.razor | 12 +++---- .../Pages/Settings/SettingsModelling.razor | 4 +-- .../Settings/SettingsModellingPers.razor | 2 +- .../FWO.UI/Pages/Settings/SettingsOwner.razor | 8 ++--- .../Pages/Settings/SettingsPassword.razor | 4 +-- .../Settings/SettingsPasswordPolicy.razor | 4 +-- .../Settings/SettingsRecertificationGen.razor | 6 ++-- .../SettingsRecertificationPers.razor | 2 +- .../Pages/Settings/SettingsReport.razor | 2 +- .../FWO.UI/Pages/Settings/SettingsRoles.razor | 6 ++-- .../Pages/Settings/SettingsStateMatrix.razor | 10 +++--- .../Pages/Settings/SettingsStates.razor | 6 ++-- .../Pages/Settings/SettingsTenants.razor | 4 +-- .../FWO.UI/Pages/Settings/SettingsUsers.razor | 12 +++---- roles/ui/files/FWO.UI/Pages/Start.razor | 2 +- .../Services/ModellingAppServerHandler.cs | 2 +- .../Services/ModellingAppServerListHandler.cs | 2 +- .../files/FWO.UI/Shared/AutoDiscovery.razor | 12 +++---- roles/ui/files/FWO.UI/Shared/Confirm.razor | 4 +-- .../files/FWO.UI/Shared/ConfirmDelete.razor | 4 +-- .../files/FWO.UI/Shared/ImportRollback.razor | 2 +- roles/ui/files/FWO.UI/Shared/MainLayout.razor | 2 +- .../FWO.UI/Shared/MonitoringLayout.razor | 4 +-- .../files/FWO.UI/Shared/NavigationMenu.razor | 26 +++++++------- .../files/FWO.UI/Shared/RequestLayout.razor | 12 +++---- .../files/FWO.UI/Shared/SettingsLayout.razor | 18 +++++----- 100 files changed, 308 insertions(+), 305 deletions(-) diff --git a/roles/lib/files/FWO.Api.Client/Data/GlobalConstants.cs b/roles/lib/files/FWO.Api.Client/Data/GlobalConstants.cs index e6a1959ed..c2f8bf881 100644 --- a/roles/lib/files/FWO.Api.Client/Data/GlobalConstants.cs +++ b/roles/lib/files/FWO.Api.Client/Data/GlobalConstants.cs @@ -22,22 +22,25 @@ public struct GlobalConst public const string kManual = "manual"; public const string kModellerGroup = "ModellerGroup_"; public const string kImportChangeNotify = "importChangeNotify"; - - public const string kAnonymous = "anonymous"; - public const string kAdmin = "admin"; - public const string kAuditor = "auditor"; - public const string kMiddlewareServer = "middleware-server"; - public const string kImporter = "importer"; - public const string kFwAdmin = "fw-admin"; - public const string kRecertifier = "recertifier"; - public const string kModeller = "modeller"; - public const string kReporter = "reporter"; - public const string kReporterViewAll = "reporter-viewall"; - public const string kRequester = "requester"; - public const string kApprover = "approver"; - public const string kPlanner = "planner"; - public const string kImplementer = "implementer"; - public const string kReviewer = "reviewer"; + } + + public struct Roles + { + public const string Anonymous = "anonymous"; + public const string Admin = "admin"; + public const string Auditor = "auditor"; + public const string MiddlewareServer = "middleware-server"; + public const string Importer = "importer"; + public const string FwAdmin = "fw-admin"; + public const string Recertifier = "recertifier"; + public const string Modeller = "modeller"; + public const string Reporter = "reporter"; + public const string ReporterViewAll = "reporter-viewall"; + public const string Requester = "requester"; + public const string Approver = "approver"; + public const string Planner = "planner"; + public const string Implementer = "implementer"; + public const string Reviewer = "reviewer"; } public struct Icons diff --git a/roles/middleware/files/FWO.Middleware.Server/Controllers/AuthenticationServerController.cs b/roles/middleware/files/FWO.Middleware.Server/Controllers/AuthenticationServerController.cs index 9419cc993..25fe49399 100644 --- a/roles/middleware/files/FWO.Middleware.Server/Controllers/AuthenticationServerController.cs +++ b/roles/middleware/files/FWO.Middleware.Server/Controllers/AuthenticationServerController.cs @@ -44,7 +44,7 @@ public AuthenticationServerController(ApiConnection apiConnection, List ld /// Ldap connection parameters /// [HttpGet("TestConnection")] - [Authorize(Roles = $"{GlobalConst.kAdmin}, {GlobalConst.kAuditor}")] + [Authorize(Roles = $"{Roles.Admin}, {Roles.Auditor}")] public ActionResult TestConnection([FromBody] LdapGetUpdateParameters parameters) { try @@ -65,7 +65,7 @@ public ActionResult TestConnection([FromBody] LdapGetUpdateParameters pa /// /// List of all connected Ldaps [HttpGet] - [Authorize(Roles = $"{GlobalConst.kAdmin}, {GlobalConst.kAuditor}")] + [Authorize(Roles = $"{Roles.Admin}, {Roles.Auditor}")] public async Task> Get() { UiLdapConnection[] ldapConnections = (await apiConnection.SendQueryAsync(AuthQueries.getAllLdapConnections)); @@ -103,7 +103,7 @@ public async Task> Get() /// LdapAddParameters /// Id of new ldap, 0 if no ldap could be added [HttpPost] - [Authorize(Roles = $"{GlobalConst.kAdmin}")] + [Authorize(Roles = $"{Roles.Admin}")] public async Task PostAsync([FromBody] LdapAddParameters ldapData)//, [FromHeader] string bearer) { // Add ldap to DB and to middleware ldap list @@ -147,7 +147,7 @@ public async Task PostAsync([FromBody] LdapAddParameters ldapData)//, [From /// LdapGetUpdateParameters /// Id of updated ldap [HttpPut] - [Authorize(Roles = $"{GlobalConst.kAdmin}")] + [Authorize(Roles = $"{Roles.Admin}")] public async Task Update([FromBody] LdapGetUpdateParameters ldapData) { // Update ldap in DB and in middleware ldap list @@ -172,7 +172,7 @@ public async Task Update([FromBody] LdapGetUpdateParameters ldapData) /// LdapDeleteParameters /// Id of deleted ldap connection [HttpDelete] - [Authorize(Roles = $"{GlobalConst.kAdmin}")] + [Authorize(Roles = $"{Roles.Admin}")] public async Task Delete([FromBody] LdapDeleteParameters ldapData) { // Delete ldap in DB and in middleware ldap list diff --git a/roles/middleware/files/FWO.Middleware.Server/Controllers/AuthenticationTokenController.cs b/roles/middleware/files/FWO.Middleware.Server/Controllers/AuthenticationTokenController.cs index 16063b85f..a5481cf38 100644 --- a/roles/middleware/files/FWO.Middleware.Server/Controllers/AuthenticationTokenController.cs +++ b/roles/middleware/files/FWO.Middleware.Server/Controllers/AuthenticationTokenController.cs @@ -100,7 +100,7 @@ public async Task> GetAsyncForUser([FromBody] Authenticatio try { await authManager.AuthorizeUserAsync(adminUser, validatePassword: true); - if (!adminUser.Roles.Contains(GlobalConst.kAdmin)) + if (!adminUser.Roles.Contains(Roles.Admin)) { throw new AuthenticationException("Provided credentials do not belong to a user with role admin."); } @@ -239,7 +239,7 @@ public async Task> GetGroups(LdapEntry ldapUser, Ldap ldap) if (currentLdapEntry != null) { // User was successfully authenticated via this LDAP - if(user.Name == GlobalConst.kImporter) + if(user.Name == Roles.Importer) { Log.WriteDebug("User Authentication", $"User {user.Name + " " + currentLdapEntry.Dn} found."); } @@ -320,7 +320,7 @@ public async Task> GetRoles(UiUser user) { // Use anonymous role Log.WriteWarning("Missing roles", $"No roles for user \"{user.Dn}\" could be found. Using anonymous role."); - userRoles.Add(GlobalConst.kAnonymous); + userRoles.Add(Roles.Anonymous); } return userRoles; diff --git a/roles/middleware/files/FWO.Middleware.Server/Controllers/GroupController.cs b/roles/middleware/files/FWO.Middleware.Server/Controllers/GroupController.cs index f8c0f2dcf..9ac8f479c 100644 --- a/roles/middleware/files/FWO.Middleware.Server/Controllers/GroupController.cs +++ b/roles/middleware/files/FWO.Middleware.Server/Controllers/GroupController.cs @@ -31,7 +31,7 @@ public GroupController(List ldaps) /// /// List of groups [HttpGet] - [Authorize(Roles = $"{GlobalConst.kAdmin}, {GlobalConst.kAuditor}, {GlobalConst.kRecertifier}")] + [Authorize(Roles = $"{Roles.Admin}, {Roles.Auditor}, {Roles.Recertifier}")] public async Task>> Get() { try @@ -74,7 +74,7 @@ public async Task>> Get() /// GroupAddDeleteParameters /// Dn of new group, empty string if no group could be created [HttpPost] - [Authorize(Roles = $"{GlobalConst.kAdmin}")] + [Authorize(Roles = $"{Roles.Admin}")] public async Task Create([FromBody] GroupAddDeleteParameters parameters) { string groupDn = ""; @@ -113,7 +113,7 @@ public async Task Create([FromBody] GroupAddDeleteParameters parameters) /// GroupAddDeleteParameters /// true if group deleted [HttpDelete] - [Authorize(Roles = $"{GlobalConst.kAdmin}")] + [Authorize(Roles = $"{Roles.Admin}")] public async Task Delete([FromBody] GroupAddDeleteParameters parameters) { bool groupDeleted = false; @@ -151,7 +151,7 @@ public async Task Delete([FromBody] GroupAddDeleteParameters parameters) /// GroupEditParameters /// Dn of updated group [HttpPut] - [Authorize(Roles = $"{GlobalConst.kAdmin}")] + [Authorize(Roles = $"{Roles.Admin}")] public async Task Edit([FromBody] GroupEditParameters parameters) { string groupUpdatedDn = ""; @@ -189,7 +189,7 @@ public async Task Edit([FromBody] GroupEditParameters parameters) /// GroupGetParameters /// List of groups [HttpPost("Get")] - [Authorize(Roles = $"{GlobalConst.kAdmin}, {GlobalConst.kAuditor}")] + [Authorize(Roles = $"{Roles.Admin}, {Roles.Auditor}")] public async Task> Get([FromBody] GroupGetParameters parameters) { List allGroups = new List(); @@ -221,7 +221,7 @@ await Task.Run(() => /// GroupAddDeleteUserParameters /// true if user could be added to group [HttpPost("User")] - [Authorize(Roles = $"{GlobalConst.kAdmin}")] + [Authorize(Roles = $"{Roles.Admin}")] public async Task AddUser([FromBody] GroupAddDeleteUserParameters parameters) { bool userAdded = false; @@ -259,7 +259,7 @@ public async Task AddUser([FromBody] GroupAddDeleteUserParameters paramete /// GroupAddDeleteUserParameters /// true if user could be removed from group [HttpDelete("User")] [HttpDelete("User")] - [Authorize(Roles = $"{GlobalConst.kAdmin}")] + [Authorize(Roles = $"{Roles.Admin}")] public async Task RemoveUser([FromBody] GroupAddDeleteUserParameters parameters) { bool userRemoved = false; diff --git a/roles/middleware/files/FWO.Middleware.Server/Controllers/RoleController.cs b/roles/middleware/files/FWO.Middleware.Server/Controllers/RoleController.cs index 8de471647..9b97404b1 100644 --- a/roles/middleware/files/FWO.Middleware.Server/Controllers/RoleController.cs +++ b/roles/middleware/files/FWO.Middleware.Server/Controllers/RoleController.cs @@ -32,7 +32,7 @@ public RoleController(List ldaps) /// /// List of roles [HttpGet] - [Authorize(Roles = $"{GlobalConst.kAdmin}, {GlobalConst.kAuditor}, {GlobalConst.kFwAdmin}, {GlobalConst.kRequester}, {GlobalConst.kApprover}, {GlobalConst.kPlanner}, {GlobalConst.kImplementer}, {GlobalConst.kReviewer}")] + [Authorize(Roles = $"{Roles.Admin}, {Roles.Auditor}, {Roles.FwAdmin}, {Roles.Requester}, {Roles.Approver}, {Roles.Planner}, {Roles.Implementer}, {Roles.Reviewer}")] public async Task> Get() { // No parameters @@ -69,7 +69,7 @@ public async Task> Get() /// RoleAddDeleteUserParameters /// true if user could be added to role [HttpPost("User")] - [Authorize(Roles = $"{GlobalConst.kAdmin}")] + [Authorize(Roles = $"{Roles.Admin}")] public async Task AddUser([FromBody] RoleAddDeleteUserParameters parameters) { bool userAdded = false; @@ -107,7 +107,7 @@ public async Task AddUser([FromBody] RoleAddDeleteUserParameters parameter /// RoleAddDeleteUserParameters /// true if user could be removed from role [HttpDelete("User")] - [Authorize(Roles = $"{GlobalConst.kAdmin}")] + [Authorize(Roles = $"{Roles.Admin}")] public async Task RemoveUser([FromBody] RoleAddDeleteUserParameters parameters) { bool userRemoved = false; diff --git a/roles/middleware/files/FWO.Middleware.Server/Controllers/TenantController.cs b/roles/middleware/files/FWO.Middleware.Server/Controllers/TenantController.cs index 8e18a6db5..105a26da4 100644 --- a/roles/middleware/files/FWO.Middleware.Server/Controllers/TenantController.cs +++ b/roles/middleware/files/FWO.Middleware.Server/Controllers/TenantController.cs @@ -36,7 +36,7 @@ public TenantController(List ldaps, ApiConnection apiConnection) /// /// List of tenants [HttpGet] - [Authorize(Roles = $"{GlobalConst.kAdmin}, {GlobalConst.kAuditor}, {GlobalConst.kFwAdmin}")] + [Authorize(Roles = $"{Roles.Admin}, {Roles.Auditor}, {Roles.FwAdmin}")] public async Task> Get() { Tenant[] tenants = await apiConnection.SendQueryAsync(FWO.Api.Client.Queries.AuthQueries.getTenants); @@ -61,7 +61,7 @@ public async Task> Get() /// TenantAddParameters /// Id of new tenant, 0 if no tenant could be created [HttpPost] - [Authorize(Roles = $"{GlobalConst.kAdmin}")] + [Authorize(Roles = $"{Roles.Admin}")] public async Task Post([FromBody] TenantAddParameters tenant) { bool tenantAdded = false; @@ -128,7 +128,7 @@ await Task.Run(() => /// TenantEditParameters /// true if updated [HttpPut] - [Authorize(Roles = $"{GlobalConst.kAdmin}, {GlobalConst.kFwAdmin}")] + [Authorize(Roles = $"{Roles.Admin}, {Roles.FwAdmin}")] public async Task Change([FromBody] TenantEditParameters parameters) { bool tenantUpdated = false; @@ -168,7 +168,7 @@ public async Task Change([FromBody] TenantEditParameters parameters) /// TenantDeleteParameters /// true if tenant deleted [HttpDelete] - [Authorize(Roles = $"{GlobalConst.kAdmin}")] + [Authorize(Roles = $"{Roles.Admin}")] public async Task Delete([FromBody] TenantDeleteParameters tenant) { bool tenantDeleted = false; diff --git a/roles/middleware/files/FWO.Middleware.Server/Controllers/UserController.cs b/roles/middleware/files/FWO.Middleware.Server/Controllers/UserController.cs index e713319b3..940bb7ccf 100644 --- a/roles/middleware/files/FWO.Middleware.Server/Controllers/UserController.cs +++ b/roles/middleware/files/FWO.Middleware.Server/Controllers/UserController.cs @@ -37,7 +37,7 @@ public UserController(List ldaps, ApiConnection apiConnection) /// /// List of all locally known users [HttpGet] - [Authorize(Roles = $"{GlobalConst.kAdmin}, {GlobalConst.kAuditor}")] + [Authorize(Roles = $"{Roles.Admin}, {Roles.Auditor}")] public async Task> Get() { List users = (await apiConnection.SendQueryAsync(FWO.Api.Client.Queries.AuthQueries.getUsers)).ToList(); @@ -63,7 +63,7 @@ public async Task> Get() /// LdapUserGetParameters /// List of users [HttpPost("Get")] - [Authorize(Roles = $"{GlobalConst.kAdmin}, {GlobalConst.kAuditor}")] + [Authorize(Roles = $"{Roles.Admin}, {Roles.Auditor}")] public async Task> Get([FromBody] LdapUserGetParameters parameters) { List allUsers = new List(); @@ -99,7 +99,7 @@ await Task.Run(() => /// UserAddParameters /// Id of new user, 0 if no user could be created [HttpPost] - [Authorize(Roles = $"{GlobalConst.kAdmin}")] + [Authorize(Roles = $"{Roles.Admin}")] public async Task Add([FromBody] UserAddParameters parameters) { string email = parameters.Email ?? ""; @@ -163,7 +163,7 @@ await Task.Run(() => /// UserEditParameters /// true, if user could be updated [HttpPut] - [Authorize(Roles = $"{GlobalConst.kAdmin}")] + [Authorize(Roles = $"{Roles.Admin}")] public async Task Change([FromBody] UserEditParameters parameters) { string email = parameters.Email ?? ""; @@ -222,7 +222,7 @@ await Task.Run(() => public async Task> ChangePassword([FromBody] UserChangePasswordParameters parameters) { // the demo user (currently auditor) can't change his password - if (User.IsInRole(GlobalConst.kAuditor)) + if (User.IsInRole(Roles.Auditor)) return Unauthorized(); UiUser user = await resolveUser(parameters.UserId) ?? throw new Exception("Wrong UserId"); @@ -263,7 +263,7 @@ await Task.Run(async () => /// UserResetPasswordParameters /// error message or Ok [HttpPatch("ResetPassword")] - [Authorize(Roles = $"{GlobalConst.kAdmin}")] + [Authorize(Roles = $"{Roles.Admin}")] public async Task> ResetPassword([FromBody] UserResetPasswordParameters parameters) { UiUser user = await resolveUser(parameters.UserId) ?? throw new Exception("Wrong UserId"); @@ -281,7 +281,7 @@ await Task.Run(async () => { List roles = currentLdap.GetRoles(new List() { user.Dn }).ToList(); // TODO: Group roles are not included // the demo user (currently auditor) can't be forced to change password as he is not allowed to do it. Everyone else has to change it though - bool passwordMustBeChanged = !roles.Contains(GlobalConst.kAuditor); + bool passwordMustBeChanged = !roles.Contains(Roles.Auditor); await UiUserHandler.UpdateUserPasswordChanged(apiConnection, user.Dn, passwordMustBeChanged); } }); @@ -302,7 +302,7 @@ await Task.Run(async () => /// UserDeleteAllEntriesParameters /// true if user removed from all entries [HttpDelete("AllGroupsAndRoles")] - [Authorize(Roles = $"{GlobalConst.kAdmin}")] + [Authorize(Roles = $"{Roles.Admin}")] public async Task DeleteAllGroupsAndRoles([FromBody] UserDeleteAllEntriesParameters parameters) { UiUser user = await resolveUser(parameters.UserId) ?? throw new Exception("Wrong UserId"); @@ -342,7 +342,7 @@ public async Task DeleteAllGroupsAndRoles([FromBody] UserDeleteAllEntriesP /// UserDeleteParameters /// true if user deleted [HttpDelete] - [Authorize(Roles = $"{GlobalConst.kAdmin}")] + [Authorize(Roles = $"{Roles.Admin}")] public async Task Delete([FromBody] UserDeleteParameters parameters) { UiUser user = await resolveUser(parameters.UserId) ?? throw new Exception("Wrong UserId"); diff --git a/roles/middleware/files/FWO.Middleware.Server/JwtWriter.cs b/roles/middleware/files/FWO.Middleware.Server/JwtWriter.cs index 4ce4c186b..fde56b004 100644 --- a/roles/middleware/files/FWO.Middleware.Server/JwtWriter.cs +++ b/roles/middleware/files/FWO.Middleware.Server/JwtWriter.cs @@ -45,7 +45,7 @@ public async Task CreateJWT(UiUser? user = null, TimeSpan? lifetime = nu if (user != null) subject = SetClaims(await uiUserHandler.HandleUiUserAtLogin(user)); else - subject = SetClaims(new UiUser() { Name = "", Password = "", Dn = GlobalConst.kAnonymous, Roles = new List { GlobalConst.kAnonymous } }); + subject = SetClaims(new UiUser() { Name = "", Password = "", Dn = Roles.Anonymous, Roles = new List { Roles.Anonymous } }); // adding uiuser.uiuser_id as x-hasura-user-id to JWT // Create JWToken @@ -76,7 +76,7 @@ public async Task CreateJWT(UiUser? user = null, TimeSpan? lifetime = nu /// JWT for middleware-server role. public string CreateJWTMiddlewareServer() { - return CreateJWTInternal(GlobalConst.kMiddlewareServer); + return CreateJWTInternal(Roles.MiddlewareServer); } /// @@ -86,7 +86,7 @@ public string CreateJWTMiddlewareServer() /// JWT for reporter-viewall role. public string CreateJWTReporterViewall() { - return CreateJWTInternal(GlobalConst.kReporterViewAll); + return CreateJWTInternal(Roles.ReporterViewAll); } private string CreateJWTInternal(string role) @@ -153,20 +153,20 @@ private static string GetDefaultRole(UiUser user, List hasuraRolesList) string defaultRole = ""; if (user.Roles.Count > 0) { - if (hasuraRolesList.Contains(GlobalConst.kAdmin)) - defaultRole = GlobalConst.kAdmin; - else if (hasuraRolesList.Contains(GlobalConst.kAuditor)) - defaultRole = GlobalConst.kAuditor; - else if (hasuraRolesList.Contains(GlobalConst.kFwAdmin)) - defaultRole = GlobalConst.kFwAdmin; - else if (hasuraRolesList.Contains(GlobalConst.kReporterViewAll)) - defaultRole = GlobalConst.kReporterViewAll; - else if (hasuraRolesList.Contains(GlobalConst.kReporter)) - defaultRole = GlobalConst.kReporter; - else if (hasuraRolesList.Contains(GlobalConst.kRecertifier)) - defaultRole = GlobalConst.kRecertifier; - else if (hasuraRolesList.Contains(GlobalConst.kModeller)) - defaultRole = GlobalConst.kModeller; + if (hasuraRolesList.Contains(Roles.Admin)) + defaultRole = Roles.Admin; + else if (hasuraRolesList.Contains(Roles.Auditor)) + defaultRole = Roles.Auditor; + else if (hasuraRolesList.Contains(Roles.FwAdmin)) + defaultRole = Roles.FwAdmin; + else if (hasuraRolesList.Contains(Roles.ReporterViewAll)) + defaultRole = Roles.ReporterViewAll; + else if (hasuraRolesList.Contains(Roles.Reporter)) + defaultRole = Roles.Reporter; + else if (hasuraRolesList.Contains(Roles.Recertifier)) + defaultRole = Roles.Recertifier; + else if (hasuraRolesList.Contains(Roles.Modeller)) + defaultRole = Roles.Modeller; else defaultRole = user.Roles[0]; // pick first role at random (todo: might need to be changed) } diff --git a/roles/ui/files/FWO.UI/Auth/AuthStateProvider.cs b/roles/ui/files/FWO.UI/Auth/AuthStateProvider.cs index ab3bae302..58c520143 100644 --- a/roles/ui/files/FWO.UI/Auth/AuthStateProvider.cs +++ b/roles/ui/files/FWO.UI/Auth/AuthStateProvider.cs @@ -54,7 +54,7 @@ public async Task Authenticate(string jwtString, ApiConnection apiConnection, Mi if (jwtReader.Validate()) { // importer is not allowed to login - if (jwtReader.ContainsRole(GlobalConst.kImporter)) + if (jwtReader.ContainsRole(Roles.Importer)) { throw new AuthenticationException("login_importer_error"); } diff --git a/roles/ui/files/FWO.UI/Pages/Certification.razor b/roles/ui/files/FWO.UI/Pages/Certification.razor index c8e26bf21..82b6b6e88 100644 --- a/roles/ui/files/FWO.UI/Pages/Certification.razor +++ b/roles/ui/files/FWO.UI/Pages/Certification.razor @@ -9,7 +9,7 @@ @using FWO.Middleware.Client @page "/certification" -@attribute [Authorize(Roles = $"{GlobalConst.kAdmin}, {GlobalConst.kRecertifier}, {GlobalConst.kAuditor}")] +@attribute [Authorize(Roles = $"{Roles.Admin}, {Roles.Recertifier}, {Roles.Auditor}")] @inject ApiConnection apiConnection @inject UserConfig userConfig @@ -34,7 +34,7 @@
    - +
    @(userConfig.GetText("owner")):
    @@ -70,7 +70,7 @@
    @if(!readonlyMode) { - + @if(rulesFound) { @@ -169,7 +169,7 @@ try { - apiConnection.SetProperRole(authenticationStateTask!.Result.User, new List { GlobalConst.kRecertifier, GlobalConst.kAdmin, GlobalConst.kAuditor }); + apiConnection.SetProperRole(authenticationStateTask!.Result.User, new List { Roles.Recertifier, Roles.Admin, Roles.Auditor }); rulesFound = false; ticketCreator = new TicketCreator(apiConnection, userConfig); @@ -231,7 +231,7 @@ private async Task GenerateRecertificationReport() { processing = true; - readonlyMode = !authenticationStateTask!.Result.User.IsInRole(GlobalConst.kRecertifier) || selectedOwner == null; + readonlyMode = !authenticationStateTask!.Result.User.IsInRole(Roles.Recertifier) || selectedOwner == null; selectedRules.Clear(); Management[] managementsOrig = managements; diff --git a/roles/ui/files/FWO.UI/Pages/Compliance/ComplianceLayout.razor b/roles/ui/files/FWO.UI/Pages/Compliance/ComplianceLayout.razor index 9c5d22de1..25e45905c 100644 --- a/roles/ui/files/FWO.UI/Pages/Compliance/ComplianceLayout.razor +++ b/roles/ui/files/FWO.UI/Pages/Compliance/ComplianceLayout.razor @@ -12,7 +12,7 @@
  • @(userConfig.GetText("network_zones"))
    • - +
  • @(userConfig.GetText("configuration")) diff --git a/roles/ui/files/FWO.UI/Pages/Compliance/ZoneTable.razor b/roles/ui/files/FWO.UI/Pages/Compliance/ZoneTable.razor index 055c3ea8e..ab90a9621 100644 --- a/roles/ui/files/FWO.UI/Pages/Compliance/ZoneTable.razor +++ b/roles/ui/files/FWO.UI/Pages/Compliance/ZoneTable.razor @@ -34,7 +34,7 @@ - +