-
Notifications
You must be signed in to change notification settings - Fork 509
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into addTotalTimeout_backend
- Loading branch information
Showing
39 changed files
with
453 additions
and
140 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
72 changes: 72 additions & 0 deletions
72
common/src/main/java/com/netflix/conductor/common/constraints/ValidNameConstraint.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| /* | ||
| * Copyright 2020 Conductor Authors. | ||
| * <p> | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * <p> | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * <p> | ||
| * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on | ||
| * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations under the License. | ||
| */ | ||
| package com.netflix.conductor.common.constraints; | ||
|
|
||
| import java.lang.annotation.Documented; | ||
| import java.lang.annotation.Retention; | ||
| import java.lang.annotation.RetentionPolicy; | ||
| import java.lang.annotation.Target; | ||
|
|
||
| import org.springframework.beans.factory.annotation.Value; | ||
|
|
||
| import jakarta.validation.Constraint; | ||
| import jakarta.validation.ConstraintValidator; | ||
| import jakarta.validation.ConstraintValidatorContext; | ||
| import jakarta.validation.Payload; | ||
|
|
||
| import static java.lang.annotation.ElementType.FIELD; | ||
|
|
||
| /** | ||
| * This constraint class validates following things. | ||
| * | ||
| * <ul> | ||
| * <li>1. Name is valid or not | ||
| * </ul> | ||
| */ | ||
| @Documented | ||
| @Constraint(validatedBy = ValidNameConstraint.NameValidator.class) | ||
| @Target({FIELD}) | ||
| @Retention(RetentionPolicy.RUNTIME) | ||
| public @interface ValidNameConstraint { | ||
|
|
||
| String message() default ""; | ||
|
|
||
| Class<?>[] groups() default {}; | ||
|
|
||
| Class<? extends Payload>[] payload() default {}; | ||
|
|
||
| class NameValidator implements ConstraintValidator<ValidNameConstraint, String> { | ||
|
|
||
| private static final String NAME_PATTERN = "^[A-Za-z0-9_<>{}#\\s-]+$"; | ||
| public static final String INVALID_NAME_MESSAGE = | ||
| "Allowed characters are alphanumeric, underscores, spaces, hyphens, and special characters like <, >, {, }, #"; | ||
|
|
||
| @Value("${conductor.app.workflow.name-validation.enabled}") | ||
| private boolean nameValidationEnabled; | ||
|
|
||
| @Override | ||
| public void initialize(ValidNameConstraint constraintAnnotation) {} | ||
|
|
||
| @Override | ||
| public boolean isValid(String name, ConstraintValidatorContext context) { | ||
| boolean valid = name == null || !nameValidationEnabled || name.matches(NAME_PATTERN); | ||
| if (!valid) { | ||
| context.disableDefaultConstraintViolation(); | ||
| context.buildConstraintViolationWithTemplate( | ||
| "Invalid name '" + name + "'. " + INVALID_NAME_MESSAGE) | ||
| .addConstraintViolation(); | ||
| } | ||
| return valid; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,5 +14,6 @@ | |
|
|
||
| public enum IdempotencyStrategy { | ||
| FAIL, | ||
| RETURN_EXISTING | ||
| RETURN_EXISTING, | ||
| FAIL_ON_RUNNING | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.