Skip to content

Domain is passed as a REGEX pattern, not a literal string. #12937

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
daviftorres wants to merge 8 commits into
base: main
Choose a base branch
from
+2 −2
Open

Domain is passed as a REGEX pattern, not a literal string. #12937

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9755ba5
Merge pull request #1 from apache/main
daviftorres Oct 21, 2025
e476a68
Merge branch 'apache:main' into main
daviftorres Nov 4, 2025
de4adaa
Merge branch 'apache:main' into main
daviftorres Nov 18, 2025
efafe00
Merge branch 'apache:main' into main
daviftorres Mar 6, 2026
6e9af51
Merge branch 'apache:main' into main
daviftorres Mar 26, 2026
b6b5bfd
Merge branch 'apache:main' into main
daviftorres Mar 31, 2026
274c5f7
Domain is passed as a REGEX pattern, not a literal string.
daviftorres Mar 31, 2026
1a7c634
Refine regex pattern for domain path matching
daviftorres Mar 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions server/src/main/java/com/cloud/user/DomainManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -938,7 +938,7 @@ private void updateDomainChildren(DomainVO domain, String updatedDomainPrefix) {
List<DomainVO> domainChildren = _domainDao.findAllChildren(domain.getPath(), domain.getId());
// for each child, update the path
for (DomainVO dom : domainChildren) {
dom.setPath(dom.getPath().replaceFirst(domain.getPath(), updatedDomainPrefix));
dom.setPath(StringUtils.replaceOnce(dom.getPath(), domain.getPath(), updatedDomainPrefix));
_domainDao.update(dom.getId(), dom);
}
}
Expand Down Expand Up @@ -1074,7 +1074,7 @@ protected void validateNewParentDomainCanAccessResourcesOfDomainToBeMoved(String
for (Map.Entry<Long, List<String>> entry : idsOfDomainsWithResourcesUsedByDomainToBeMoved.entrySet()) {
DomainVO domainWithResourceUsedByDomainToBeMoved = _domainDao.findById(entry.getKey());

Pattern pattern = Pattern.compile(domainWithResourceUsedByDomainToBeMoved.getPath().replace("/", "\\/").concat(".*"));
Pattern pattern = Pattern.compile(domainWithResourceUsedByDomainToBeMoved.getPath().replace("/", "\\/").concat(".*")); // This only scaped one Regex metacharacter (/). The wildcard `.` is more common and dangerous in my opinion.
Copy link
Copy Markdown
Contributor Author

@daviftorres daviftorres Mar 31, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@DaanHoogland ,

I did not propose a fix because I need help for that.

Matcher matcher = pattern.matcher(newPathOfDomainToBeMoved);
if (!matcher.matches()) {
domainsOfResourcesInaccessibleToNewParentDomain.put(domainWithResourceUsedByDomainToBeMoved, entry.getValue());
Expand Down
Loading