Skip to content

Commit 6b00aa4

Browse files
author
Dzianis Lisiankou
committed
Merge branch 'feature/IJMP-2067' into 'release/v2.0.2'
IJMP-2067: fix URL regular expression See merge request ijmp/for-mainframe!630
2 parents 82b4af4 + 19f179b commit 6b00aa4

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/main/kotlin/eu/ibagroup/formainframe/utils/validationFunctions.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import javax.swing.JComponent
3232
import javax.swing.JPasswordField
3333
import javax.swing.JTextField
3434

35-
private val urlRegex = Regex("^https?:\\/\\/((([a-zA-Z0-9\\-_]+\\.)+[a-zA-Z]{2,})|(\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}))(:\\d+)?((\\/[a-zA-Z0-9\\-_\\.~]+)?)*\\/?\$")
35+
private val urlRegex = Regex("^https?:\\/\\/((([a-zA-Z0-9\\-_]+\\.)+[a-zA-Z]{2,})|(\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}))(:\\d+)?(\\/[a-zA-Z0-9\\-_\\.~]+)*\\/?$")
3636
private val maskRegex = Regex("^[A-Za-z\\$\\*%@#][A-Za-z0-9\\-\\$\\*%@#]{0,7}")
3737
private val ussPathRegex = Regex("^/$|^(/[^/]+)+$")
3838
private val forbiddenSymbol = "/"

0 commit comments

Comments
 (0)