diff --git a/.gitignore b/.gitignore index 498ca048a..85bb7260c 100644 --- a/.gitignore +++ b/.gitignore @@ -69,5 +69,4 @@ instance/ .DS_Store .AppleDouble .LSOverride -certs/cert.pem -certs/privkey.pem +certs/ diff --git a/app/deployments/routes.py b/app/deployments/routes.py index 53823b8ee..dd756e571 100644 --- a/app/deployments/routes.py +++ b/app/deployments/routes.py @@ -18,7 +18,7 @@ import random import string import uuid as uuid_generator -from re import search +from re import match, search from urllib.parse import urlparse import openstack @@ -205,7 +205,9 @@ def preprocess_outputs(outputs, stoutputs, inputs): if not eval(value.get("condition")) and key in outputs: del outputs[key] except InputValidationError as ex: - app.logger.warning("Error evaluating condition for output {}: {}".format(key, ex)) + app.logger.warning( + "Error evaluating condition for output {}: {}".format(key, ex) + ) @deployments_bp.route("//details") @@ -219,7 +221,10 @@ def depoutput(depid=None): Returns: - rendered template with deployment details, inputs, outputs, and structured outputs """ - if session["userrole"].lower() != "admin" and depid not in session["deployments_uuid_array"]: + if ( + session["userrole"].lower() != "admin" + and depid not in session["deployments_uuid_array"] + ): flash("You are not allowed to browse this page!", "danger") return redirect(url_for(SHOW_DEPLOYMENTS_ROUTE)) @@ -363,7 +368,9 @@ def depinfradetails(depid=None): # PORTS MANAGEMENT def get_openstack_connection(endpoint, provider): - service = app.cmdb.get_service_by_endpoint(iam.token["access_token"], endpoint, provider, False) + service = app.cmdb.get_service_by_endpoint( + iam.token["access_token"], endpoint, provider, False + ) prj, idp = app.cmdb.get_service_project( iam.token["access_token"], @@ -406,7 +413,9 @@ def get_vm_info(depid): def find_node_with_pubip(resources): for resource in resources: if "VirtualMachineInfo" in resource["metadata"]: - vm_info = json.loads(resource["metadata"]["VirtualMachineInfo"])["vmProperties"] + vm_info = json.loads(resource["metadata"]["VirtualMachineInfo"])[ + "vmProperties" + ] networks = [i for i in vm_info if i.get("class") == "network"] vmi = next(i for i in vm_info if i.get("class") == "system") @@ -437,7 +446,9 @@ def get_sec_groups(conn, server_id, public=True): if public: return_sec_group_list = [ - sec_group for sec_group in return_sec_group_list if search(substring, sec_group["name"]) + sec_group + for sec_group in return_sec_group_list + if search(substring, sec_group["name"]) ] return return_sec_group_list @@ -488,7 +499,11 @@ def manage_rules(depid=None, sec_group_id=None): rules = [] return render_template( - "depgrouprules.html", depid=depid, provider=provider, sec_group_id=sec_group_id, rules=rules + "depgrouprules.html", + depid=depid, + provider=provider, + sec_group_id=sec_group_id, + rules=rules, ) @@ -523,7 +538,12 @@ def create_rule(depid=None, sec_group_id=None): flash("Error: \n" + str(e), "danger") return redirect( - url_for(MANAGE_RULES_ROUTE, depid=depid, provider=provider, sec_group_id=sec_group_id) + url_for( + MANAGE_RULES_ROUTE, + depid=depid, + provider=provider, + sec_group_id=sec_group_id, + ) ) @@ -540,7 +560,12 @@ def delete_rule(depid=None, sec_group_id=None, rule_id=None): flash("Error: \n" + str(e), "danger") return redirect( - url_for(MANAGE_RULES_ROUTE, depid=depid, provider=provider, sec_group_id=sec_group_id) + url_for( + MANAGE_RULES_ROUTE, + depid=depid, + provider=provider, + sec_group_id=sec_group_id, + ) ) @@ -560,7 +585,9 @@ def depaction(depid): ) flash("Action successfully triggered.", "success") except Exception as e: - app.logger.error("Action on deployment {} failed: {}".format(dep.uuid, str(e))) + app.logger.error( + "Action on deployment {} failed: {}".format(dep.uuid, str(e)) + ) flash(str(e), "warning") return redirect(url_for("deployments_bp.depinfradetails", depid=depid)) @@ -574,14 +601,18 @@ def delnode(depid): if dep is not None and dep.physicalId is not None: try: vm_id = request.args["vmid"] - app.logger.debug(f"Requested deletion of node {vm_id} on deployment {dep.uuid}") + app.logger.debug( + f"Requested deletion of node {vm_id} on deployment {dep.uuid}" + ) resource = app.orchestrator.get_resource(access_token, depid, vm_id) resources = app.orchestrator.get_resources(access_token, depid) node = next((res for res in resources if res.get("uuid") == vm_id), None) node_name = node.get("toscaNodeName") # current count -1 --> remove one node - count = sum(1 for res in resources if res.get("toscaNodeName") == node_name) - 1 + count = ( + sum(1 for res in resources if res.get("toscaNodeName") == node_name) - 1 + ) app.logger.debug(f"Resource details: {resource}") app.logger.debug(f"Count = {count}") @@ -594,7 +625,9 @@ def delnode(depid): template_dict, node_name, [vm_id], count ) - template_text = yaml.dump(new_template, default_flow_style=False, sort_keys=False) + template_text = yaml.dump( + new_template, default_flow_style=False, sort_keys=False + ) app.logger.debug(f"{template_text}") app.orchestrator.update( @@ -728,7 +761,9 @@ def addnodes(depid): template_dict = yaml.full_load(io.StringIO(template)) - template_text = yaml.dump(template_dict, default_flow_style=False, sort_keys=False) + template_text = yaml.dump( + template_dict, default_flow_style=False, sort_keys=False + ) new_inputs = extract_inputs(form_data) @@ -738,7 +773,9 @@ def addnodes(depid): if not form_data.get("extra_opts.force_update") and all( old_inputs.get(k) == v for k, v in new_inputs.items() ): - message = f"Node addition Aborted for Deployment {dep.uuid}: No changes detected" + message = ( + f"Node addition Aborted for Deployment {dep.uuid}: No changes detected" + ) app.logger.error(message) flash(message, "warning") return redirect(url_for(SHOW_DEPLOYMENTS_ROUTE)) @@ -795,7 +832,11 @@ def updatedep(): for (k, v) in form_data.items() if not k.startswith("extra_opts.") and k != "_depid" - and (k in stinputs and "updatable" in stinputs[k] and stinputs[k]["updatable"] is True) + and ( + k in stinputs + and "updatable" in stinputs[k] + and stinputs[k]["updatable"] is True + ) } app.logger.debug("Parameters: " + json.dumps(inputs)) @@ -805,8 +846,12 @@ def updatedep(): app.logger.debug("[Deployment Update] inputs: {}".format(json.dumps(inputs))) app.logger.debug("[Deployment Update] Template: {}".format(template_text)) - keep_last_attempt = 1 if "extra_opts.keepLastAttempt" in form_data else dep.keep_last_attempt - feedback_required = 1 if "extra_opts.sendEmailFeedback" in form_data else dep.feedback_required + keep_last_attempt = ( + 1 if "extra_opts.keepLastAttempt" in form_data else dep.keep_last_attempt + ) + feedback_required = ( + 1 if "extra_opts.sendEmailFeedback" in form_data else dep.feedback_required + ) provider_timeout_mins = ( form_data["extra_opts.providerTimeout"] if "extra_opts.providerTimeoutSet" in form_data @@ -889,7 +934,10 @@ def prepare_configure_form(selected_tosca, tosca_info, steps): template = copy.deepcopy(tosca_info[selected_tosca]) # Manage eventual overrides for k, v in list(template["inputs"].items()): - if "group_overrides" in v and session["active_usergroup"] in v["group_overrides"]: + if ( + "group_overrides" in v + and session["active_usergroup"] in v["group_overrides"] + ): overrides = v["group_overrides"][session["active_usergroup"]] template["inputs"][k] = {**v, **overrides} del template["inputs"][k]["group_overrides"] @@ -905,7 +953,10 @@ def prepare_configure_form(selected_tosca, tosca_info, steps): ssh_pub_key = dbhelpers.get_ssh_pub_key(session["userid"]) - if not ssh_pub_key and app.config.get("FEATURE_REQUIRE_USER_SSH_PUBKEY") == "yes": + if ( + not ssh_pub_key + and app.config.get("FEATURE_REQUIRE_USER_SSH_PUBKEY") == "yes" + ): flash( "Warning! You will not be able to deploy your service \ as no Public SSH key has been uploaded.", @@ -993,7 +1044,10 @@ def process_security_groups(key: str, inputs: dict, stinputs: dict, form_data: d if not value or value["type"] != "map": return - port_types = ["tosca.datatypes.network.PortSpec", "tosca.datatypes.indigo.network.PortSpec"] + port_types = [ + "tosca.datatypes.network.PortSpec", + "tosca.datatypes.indigo.network.PortSpec", + ] if not any(value["entry_schema"]["type"] == t for t in port_types): return @@ -1058,7 +1112,9 @@ def process_ssh_user(key: str, inputs: dict, stinputs: dict): { "os_user_name": session["preferred_username"], "os_user_add_to_sudoers": True, - "os_user_ssh_public_key": dbhelpers.get_ssh_pub_key(session["userid"]), + "os_user_ssh_public_key": dbhelpers.get_ssh_pub_key( + session["userid"] + ), } ] else: @@ -1083,8 +1139,16 @@ def process_uuidgen(key: str, inputs: dict, stinputs: dict, uuidgen_deployment: prefix = "" suffix = "" if "extra_specs" in value: - prefix = value["extra_specs"]["prefix"] if "prefix" in value["extra_specs"] else "" - suffix = value["extra_specs"]["suffix"] if "suffix" in value["extra_specs"] else "" + prefix = ( + value["extra_specs"]["prefix"] + if "prefix" in value["extra_specs"] + else "" + ) + suffix = ( + value["extra_specs"]["suffix"] + if "suffix" in value["extra_specs"] + else "" + ) inputs[key] = prefix + uuidgen_deployment + suffix @@ -1097,7 +1161,9 @@ def process_openstack_ec2credentials(key: str, inputs: dict, stinputs: dict): del inputs[key] s3_url = value["url"] - service = app.cmdb.get_service_by_endpoint(iam.token["access_token"], s3_url) + service = app.cmdb.get_service_by_endpoint( + iam.token["access_token"], s3_url + ) prj, idp = app.cmdb.get_service_project( iam.token["access_token"], session["iss"], @@ -1129,7 +1195,9 @@ def process_openstack_ec2credentials(key: str, inputs: dict, stinputs: dict): app.config.get("VAULT_BOUND_AUDIENCE"), ) - vaultclient = vaultservice.connect(jwt_token, app.config.get("VAULT_ROLE")) + vaultclient = vaultservice.connect( + jwt_token, app.config.get("VAULT_ROLE") + ) secret_path = ( session["userid"] @@ -1140,17 +1208,25 @@ def process_openstack_ec2credentials(key: str, inputs: dict, stinputs: dict): ) vaultclient.write_secret_dict( - None, secret_path, {"aws_access_key": access, "aws_secret_key": secret} + None, + secret_path, + {"aws_access_key": access, "aws_secret_key": secret}, ) app.logger.debug(f"EC2 Credentials saved to Vault path {secret_path}") test_backet_name = "".join(random.choices(string.ascii_lowercase, k=8)) s3.create_bucket( - s3_url=s3_url, access_key=access, secret_key=secret, bucket=test_backet_name + s3_url=s3_url, + access_key=access, + secret_key=secret, + bucket=test_backet_name, ) s3.delete_bucket( - s3_url=s3_url, access_key=access, secret_key=secret, bucket=test_backet_name + s3_url=s3_url, + access_key=access, + secret_key=secret, + bucket=test_backet_name, ) app.logger.debug( @@ -1256,7 +1332,10 @@ def process_inputs(source_template, inputs, form_data, uuidgen_deployment): stinputs = copy.deepcopy(source_template["inputs"]) for k, v in list(stinputs.items()): - if "group_overrides" in v and session["active_usergroup"] in v["group_overrides"]: + if ( + "group_overrides" in v + and session["active_usergroup"] in v["group_overrides"] + ): overrides = v["group_overrides"][session["active_usergroup"]] stinputs[k] = {**v, **overrides} del stinputs[k]["group_overrides"] @@ -1351,7 +1430,9 @@ def create_deployment( deployment = dbhelpers.get_deployment(uuid) if deployment is None: vphid = rs_json["physicalId"] if "physicalId" in rs_json else "" - providername = rs_json["cloudProviderName"] if "cloudProviderName" in rs_json else "" + providername = ( + rs_json["cloudProviderName"] if "cloudProviderName" in rs_json else "" + ) deployment = Deployment( uuid=uuid, @@ -1400,7 +1481,6 @@ def create_deployment( @auth.authorized_with_valid_token def createdep(): tosca_info, _, _ = tosca.get() - access_token = iam.token["access_token"] # validate input request_template = request.args.get("template") if request_template not in tosca_info.keys(): @@ -1420,17 +1500,141 @@ def createdep(): else: remove_sla_from_template(template) + create_dep_method( + source_template, + selected_template, + additionaldescription, + inputs, + form_data, + template, + template_text, + ) + + return redirect(url_for(SHOW_DEPLOYMENTS_ROUTE)) + + +@deployments_bp.route("//retry") +@auth.authorized_with_valid_token +def retrydep(depid=None): + """ + A function to retry a failed deployment. + Parameters: + - depid: str, the ID of the deployment + """ + tosca_info, _, _ = tosca.get() + access_token = iam.token["access_token"] + + # retrieve deployment from DB + dep = dbhelpers.get_deployment(depid) + + if dep is None or dep.selected_template == "": + flash( + "The selected deployment is invalid. Try creating it from scratch.", + "danger", + ) + return redirect(url_for(SHOW_DEPLOYMENTS_ROUTE)) + + inputs = process_deployment_data(dep)[0] + + # Get the max num retry for the new name + max_num_retry = 0 + str_retry = " retry_" + tmp_name = dep.description.split(str_retry)[0] + + group = None + if "active_usergroup" in session and session["active_usergroup"] is not None: + group = session["active_usergroup"] + + deployments = [] + try: + deployments = app.orchestrator.get_deployments( + access_token, created_by="me", user_group=group + ) + except Exception as e: + flash("Error retrieving deployment list: \n" + str(e), "warning") + + if deployments: + result = dbhelpers.updatedeploymentsstatus(deployments, session["userid"]) + deployments = result["deployments"] + app.logger.debug("Deployments: " + str(deployments)) + + deployments_uuid_array = result["iids"] + session["deployments_uuid_array"] = deployments_uuid_array + + for tmp_dep in deployments: + if ( + tmp_name + str_retry in tmp_dep.description + and "DELETE_COMPLETE" not in tmp_dep.status + ): + num_retry = int(tmp_dep.description.split(str_retry)[1]) + + if num_retry > max_num_retry: + max_num_retry = num_retry + + additionaldescription = tmp_name + str_retry + str(max_num_retry + 1) + + source_template = tosca_info.get(dep.selected_template, None) + if source_template is None: + flash( + "The selected deployment is invalid. Try creating it from scratch.", + "danger", + ) + return redirect(url_for(SHOW_DEPLOYMENTS_ROUTE)) + + form_data = inputs + + template, template_text = load_template(dep.selected_template) + + create_dep_method( + source_template, + dep.selected_template, + additionaldescription, + inputs, + form_data, + template, + template_text, + ) + + flash( + f"Retry action for deployment {dep.description} <{depid}> successfully triggered!", + "success", + ) + + return redirect(url_for(SHOW_DEPLOYMENTS_ROUTE)) + + +def create_dep_method( + source_template, + selected_template, + additionaldescription, + inputs, + form_data, + template, + template_text, +): + access_token = iam.token["access_token"] + uuidgen_deployment = str(uuid_generator.uuid1()) doprocess, inputs, stinputs = process_inputs( source_template, inputs, form_data, uuidgen_deployment ) + # If input is a bucket_name check for validity + for name in inputs: + if search("bucket_name", name): + errors = check_s3_bucket_name(uuidgen_deployment + "-" + inputs[name]) + + if errors: + for error in errors: + flash(error, "danger") + return redirect(url_for(SHOW_DEPLOYMENTS_ROUTE)) + app.logger.debug(f"Calling orchestrator with inputs: {inputs}") if doprocess: - storage_encryption, vault_secret_uuid, vault_secret_key = add_storage_encryption( - access_token, inputs + storage_encryption, vault_secret_uuid, vault_secret_key = ( + add_storage_encryption(access_token, inputs) ) params = {} # is it needed?? create_deployment( @@ -1448,14 +1652,68 @@ def createdep(): vault_secret_key, ) - return redirect(url_for(SHOW_DEPLOYMENTS_ROUTE)) + +def check_s3_bucket_name(name): + """ + Validates an S3 bucket name based on the given rules. + + :param name: The bucket name to validate. + :return: A tuple (bool, list) where the bool indicates if the name is valid, + and the list contains validation error messages (if any). + """ + errors = [] + + # Rule 1: Length between 3 and 63 characters + if not (3 <= len(name) <= 63): + errors.append("Bucket names must be between 3 and 63 characters long.") + + # Rule 2: Allowed characters + if not match(r"^[a-z0-9.-]+$", name): + errors.append( + "Bucket names can only contain lowercase letters, numbers, dots (.), and hyphens (-)." + ) + + # Rule 3: Begin and end with a letter or number + if not match(r"^[a-z0-9].*[a-z0-9]$", name): + errors.append("Bucket names must begin and end with a letter or number.") + + # Rule 4: Must not contain two adjacent periods + if ".." in name: + errors.append("Bucket names must not contain two adjacent periods.") + + # Rule 5: Must not be formatted as an IP address + if match(r"^\d+\.\d+\.\d+\.\d+$", name): + errors.append( + "Bucket names must not be formatted as an IP address (e.g., 192.168.5.4)." + ) + + # Rule 6: Must not start with prohibited prefixes + prohibited_prefixes = ["xn--", "sthree-", "sthree-configurator", "amzn-s3-demo-"] + if any(name.startswith(prefix) for prefix in prohibited_prefixes): + errors.append( + f"Bucket names must not start with the prefixes: {', '.join(prohibited_prefixes)}." + ) + + # Rule 7: Must not end with prohibited suffixes + prohibited_suffixes = ["-s3alias", "--ol-s3", ".mrap", "--x-s3"] + if any(name.endswith(suffix) for suffix in prohibited_suffixes): + errors.append( + f"Bucket names must not end with the suffixes: {', '.join(prohibited_suffixes)}." + ) + + # Rule 8: Bucket names must be unique across AWS accounts + # This rule cannot be validated here; it's enforced by AWS. + + return errors def delete_secret_from_vault(access_token, secret_path): vault_bound_audience = app.config.get("VAULT_BOUND_AUDIENCE") vault_delete_policy = app.config.get("DELETE_POLICY") vault_delete_token_time_duration = app.config.get("DELETE_TOKEN_TIME_DURATION") - vault_delete_token_renewal_time_duration = app.config.get("DELETE_TOKEN_RENEWAL_TIME_DURATION") + vault_delete_token_renewal_time_duration = app.config.get( + "DELETE_TOKEN_RENEWAL_TIME_DURATION" + ) vault_role = app.config.get("VAULT_ROLE") jwt_token = auth.exchange_token_with_audience( @@ -1484,12 +1742,17 @@ def add_storage_encryption(access_token, inputs): vault_wrapping_token_time_duration = app.config.get("WRAPPING_TOKEN_TIME_DURATION") vault_write_policy = app.config.get("WRITE_POLICY") vault_write_token_time_duration = app.config.get("WRITE_TOKEN_TIME_DURATION") - vault_write_token_renewal_time_duration = app.config.get("WRITE_TOKEN_RENEWAL_TIME_DURATION") + vault_write_token_renewal_time_duration = app.config.get( + "WRITE_TOKEN_RENEWAL_TIME_DURATION" + ) storage_encryption = 0 vault_secret_uuid = "" vault_secret_key = "" - if "storage_encryption" in inputs and inputs["storage_encryption"].lower() == "true": + if ( + "storage_encryption" in inputs + and inputs["storage_encryption"].lower() == "true" + ): storage_encryption = 1 vault_secret_key = "secret" diff --git a/app/deployments/templates/createdep.html b/app/deployments/templates/createdep.html index c580f33d2..1c1e724b6 100644 --- a/app/deployments/templates/createdep.html +++ b/app/deployments/templates/createdep.html @@ -183,7 +183,10 @@ }); $('#continue_btn').on('click', () => { - if($('#depSubmit')[0].checkValidity()) { + const formValid = $('#depSubmit')[0].checkValidity(); + const formChecked = checkForm(); + + if(formValid && formChecked) { $('#depSubmit').hide(); $('#checkSubmit').show(); @@ -382,9 +385,6 @@ $(select).parent().children('span.select2').children().children().css('cssText', 'border-color: #80808056!important'); } }); - $('#continue_btn').on("click", () => { - checkForm() - }); }); function checkForm() { @@ -394,13 +394,30 @@ } $('input').each(function(){ - if ( (this.disabled == false) && this.required && (this.value == '')){ - this.style.borderColor = 'red'; - valid = false; - } - else { - this.style.borderColor = '#ccc'; + if (!this.disabled) { + // Check if 'incorrect' attribute exists + if (this.attributes.incorrect) { + // If 'incorrect' attribute is true, set border red + if (this.attributes.incorrect.value.toString() == 'true') { + this.style.borderColor = 'red'; + valid = false; + } + // If 'incorrect' attribute is false, set border #ccc + else if (this.attributes.incorrect.value.toString() == 'false') { + this.style.borderColor = '#ccc'; + } + } + // If 'incorrect' attribute is undefined, check other requirements + else { + if (this.required && this.value == '') { + this.style.borderColor = 'red'; + valid = false; + } else { + this.style.borderColor = '#ccc'; + } + } } + }); $('select').each(function(){ diff --git a/app/deployments/templates/deployments.html b/app/deployments/templates/deployments.html index bd30c5f0d..822bf5e1a 100644 --- a/app/deployments/templates/deployments.html +++ b/app/deployments/templates/deployments.html @@ -94,6 +94,11 @@ Toggle Dropdown
+ {% if 'CREATE_FAILED' in deployment.status %} + + Retry + + {% endif %} Edit Show template diff --git a/app/deployments/templates/input_types.html b/app/deployments/templates/input_types.html index ec14e1443..03a747883 100644 --- a/app/deployments/templates/input_types.html +++ b/app/deployments/templates/input_types.html @@ -222,12 +222,37 @@
Storage encryption alert
{% endfor %} {% else %} - - + + {% endif %} {% endif %} - {{value.description}} + + {{value.description}} + {% if 'bucket_name' in key %} +
+ + Naming rules + + + +
    +
  • Bucket names must be between 1 and 27 characters long.
    • +
  • Bucket names can consist only of lowercase letters, numbers, dots (.), and hyphens (-).
    • +
  • Bucket names must end with a letter or number.
    • +
  • Bucket names must not contain two adjacent periods.
    • +
  • Bucket names must not be formatted as an IP address (for example, 192.168.5.4).
    • + +
  • Bucket names must not end with the suffix "-s3alias", "--ol-s3", ".mrap" or "--x-s3".
    • +
+
+ {% endif %} + {% endif %} {% if value.info_box %} @@ -256,6 +281,90 @@
Storage encryption alert
}); }); +function check_s3_bucket_name(elem_id) { + name = $('#'+ elem_id).val() + + const errors = []; + + // Rule 1: Bucket names must be between 3 and 63 characters long (Here 27 becouse 36 is token from UUID) + if (name.length <= 0 || name.length > 27) { + errors.push(1); + } + + // Rule 2: Bucket names can consist only of lowercase letters, numbers, dots (.), and hyphens (-) + if (!/^[a-z0-9.-]+$/.test(name)) { + errors.push(2); + } + + // Rule 3: Bucket names must end with a letter or number + if (!/[a-z0-9]$/i.test(name)) { + errors.push(3); + } + + // Rule 4: Bucket names must not contain two adjacent periods + if (name.includes("..")) { + errors.push(4); + } + + // Rule 5: Bucket names must not be formatted as an IP address + if (/^\d{1,3}(\.\d{1,3}){3}$/.test(name)) { + errors.push(5); + } + + // Rule 6: Bucket names must not start with specific prefixes + /* const forbiddenPrefixes = ["xn--", "sthree-", "sthree-configurator", "amzn-s3-demo-"]; + if (forbiddenPrefixes.some(prefix => name.startsWith(prefix))) { + errors.push(6); + } */ + + // Rule 7: Bucket names must not end with specific suffixes + const forbiddenSuffixes = ["-s3alias", "--ol-s3", ".mrap", "--x-s3"]; + if (forbiddenSuffixes.some(suffix => name.endsWith(suffix))) { + errors.push(7); + } + + // Change colors if errors + if(errors.length == 0) { + $("#"+ elem_id).css({ + borderColor: "#ccc" + }).attr("incorrect", false); + + $("#rule_title_"+ elem_id).css({ + color: "green" + }).html("Naming rules") + + $("#icon_correct_"+ elem_id).show() + $("#icon_error_"+ elem_id).hide() + } else { + $("#"+ elem_id).css({ + borderColor: "red" + }).attr("incorrect", true); + + $("#rule_title_"+ elem_id).css({ + color: "red" + }).html("Naming rules ("+ errors.length +")") + + $("#icon_correct_"+ elem_id).hide() + $("#icon_error_"+ elem_id).show() + + for(let i in errors) { + let error_num = errors[i]; + + $("#rule_"+ error_num +"_"+ elem_id).css({ + color: "red" + }) + } + } + + for(let i = 1; i <= 7; i++) { + if(!errors.includes(i)) { + $("#rule_"+ i +"_"+ elem_id).css({ + color: "green" + }) + } + } +} + \ No newline at end of file diff --git a/app/home/static/js/script-v2.js b/app/home/static/js/script-v2.js index 8e32a248f..d15c218f9 100644 --- a/app/home/static/js/script-v2.js +++ b/app/home/static/js/script-v2.js @@ -317,22 +317,27 @@ function alert_message(type = 'success', message = 'Success!', icon = '', time = */ function add_max_length_counter() { - let inputGroup = $("[maxlength]").parent() + let inputGroup = $("[maxlength]").parent(); + + for (const element of inputGroup) { + let label = $($(element).children()[0]); + let input = $($(element).children()[1]); - for(let i = 0; i < inputGroup.length; i++) { - let label = $($(inputGroup[i]).children()[0]); - let input = $($(inputGroup[i]).children()[1]); let maxlength = input.attr('maxlength'); let chars = input.val().length; let text = label.text(); - - label.text(text +' ('+ chars +'/'+ maxlength +')'); - input.on('keyup', () => { + label.text(text + ' (' + chars + '/' + maxlength + ')'); + + input.on('input change summernote.change', (e, content) => { chars = input.val().length; - - label.text(text +' ('+ chars +'/'+ maxlength +')'); - }) + + if (e.type == 'summernote') { + chars = $('
').html(content).text().length + } + + label.text(text + ' (' + chars + '/' + maxlength + ')'); + }); } } diff --git a/app/lib/dbhelpers.py b/app/lib/dbhelpers.py index 8c24f49ec..c28850c05 100644 --- a/app/lib/dbhelpers.py +++ b/app/lib/dbhelpers.py @@ -178,8 +178,8 @@ def updatedeploymentsstatus(deployments, userid): template_parameters="", template_metadata="", selected_template="", - inputs="", - stinputs="", + inputs=json.dumps(dep_json.get("inputs", "")), + stinputs=json.dumps(dep_json.get("stinputs", "")), params="", deployment_type=getdeploymenttype(dep_json), provider_name=providername, diff --git a/config/default.py b/config/default.py index d48244fc9..3874bda65 100644 --- a/config/default.py +++ b/config/default.py @@ -12,7 +12,7 @@ SETTINGS_DIR = "/opt/dashboard-configuration" ### DB SETTINGS -SQLALCHEMY_DATABASE_URI = "mysql+pymysql://dashboard:dashboard@localhost/orchestrator_dashboard", +SQLALCHEMY_DATABASE_URI = "mysql+pymysql://dashboard:dashboard@localhost/orchestrator_dashboard" SQLALCHEMY_TRACK_MODIFICATIONS = "False" SQLALCHEMY_VERSION_HEAD = "88bc3c2c02a6"