basketballcantho/Teedy_custom
1
0
Fork 0
mirror of https://git.victorphan.net/basketballcantho/Teedy_custom.git synced 2026-08-05 14:03:10 +07:00
Code Issues Packages Projects Releases Wiki Activity

Closes #237: prevent tag circular reference

Browse Source
This commit is contained in:
Benjamin Gamard
2018-10-19 17:04:49 +02:00
parent 8fff672d2f
commit 7baf5e44fd
4 changed files with 39 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs-web/src/main/java/com/sismics/docs/rest/resource/TagResource.java
+13 -3
View File
@@ -192,7 +192,7 @@ public class TagResource extends BaseResource {
throw new ClientException("ParentNotFound", MessageFormat.format("Parent not found: {0}", parentId));
}
}
// Create the tag
TagDao tagDao = new TagDao();
Tag tag = new Tag();
@@ -239,6 +239,7 @@ public class TagResource extends BaseResource {
* @apiError (client) ValidationError Validation error
* @apiError (client) SpacesNotAllowed Spaces are not allowed in tag name
* @apiError (client) ParentNotFound Parent not found
* @apiError (client) CircularReference Circular reference in parent tag
* @apiError (client) NotFound Tag not found
* @apiPermission user
* @apiVersion 1.5.0
@@ -275,16 +276,25 @@ public class TagResource extends BaseResource {
}
// Check the parent
TagDao tagDao = new TagDao();
if (StringUtils.isEmpty(parentId)) {
parentId = null;
} else {
if (!aclDao.checkPermission(parentId, PermType.READ, getTargetIdList(null))) {
throw new ClientException("ParentNotFound", MessageFormat.format("Parent not found: {0}", parentId));
}
String parentTagId = parentId;
do {
Tag parentTag = tagDao.getById(parentTagId);
parentTagId = parentTag.getParentId();
if (parentTag.getId().equals(id)) {
throw new ClientException("CircularReference", "Circular reference in parent tag");
}
} while (parentTagId != null);
}
// Update the tag
TagDao tagDao = new TagDao();
Tag tag = tagDao.getById(id);
if (!StringUtils.isEmpty(name)) {
tag.setName(name);