narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

Fixing trailing characters treated as part of URI error (#3938).

Browse source
This commit is contained in:
Millesimus 2021-09-04 15:56:37 +02:00 committed by Daniel Gultsch
parent 96f0a09a5d
commit 8d45cc5827
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/eu/siacs/conversations/utils/Patterns.java
View file

@ -304,9 +304,15 @@ public class Patterns {
+ "\\,\\;\\?\\&\\=]|(?:\\%[a-fA-F0-9]{2})){1,64}(?:\\:(?:[a-zA-Z0-9\\$\\-\\_" + "\\,\\;\\?\\&\\=]|(?:\\%[a-fA-F0-9]{2})){1,64}(?:\\:(?:[a-zA-Z0-9\\$\\-\\_"
+ "\\.\\+\\!\\*\\'\\(\\)\\,\\;\\?\\&\\=]|(?:\\%[a-fA-F0-9]{2})){1,25})?\\@"; + "\\.\\+\\!\\*\\'\\(\\)\\,\\;\\?\\&\\=]|(?:\\%[a-fA-F0-9]{2})){1,25})?\\@";
private static final String PORT_NUMBER = "\\:\\d{1,5}"; private static final String PORT_NUMBER = "\\:\\d{1,5}";
private static final String PATH_AND_QUERY_CHARS_WITHOUT_SLASH =
"\\;\\?\\:\\@\\&\\=\\#\\~" // plus optional query params
+ "\\-\\.\\+\\!\\*\\'\\(\\)\\,\\_";
private static final String PATH_AND_QUERY = "\\/(?:(?:[" + LABEL_CHAR private static final String PATH_AND_QUERY = "\\/(?:(?:[" + LABEL_CHAR
+ "\\;\\/\\?\\:\\@\\&\\=\\#\\~" // plus optional query params + PATH_AND_QUERY_CHARS_WITHOUT_SLASH
+ "\\-\\.\\+\\!\\*\\'\\(\\)\\,\\_])|(?:\\%[a-fA-F0-9]{2}))*"; + "]+[^" + PATH_AND_QUERY_CHARS_WITHOUT_SLASH + "\\s]" // path and query chars must not be trailing
+ "|\\/" // trailing slashes are fine
+ ")|(?:\\%[a-fA-F0-9]{2}))*";
/** /**
* Regular expression pattern to match most part of RFC 3987 * Regular expression pattern to match most part of RFC 3987
* Internationalized URLs, aka IRIs. * Internationalized URLs, aka IRIs.