Skip to content

mitigations #139

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

Merged
dlamoris merged 5 commits into from
Feb 5, 2021
Merged

mitigations #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d94421e
mitigate cases where doc isn't found
Feb 4, 2021
2a2f911
ordering
Feb 4, 2021
2e08cf5
add logs, attempt to find element if commit is given
Feb 4, 2021
258c9fa
add in creator/created if previous not found on update
Feb 4, 2021
e7e3781
add try catch on get all ref
Feb 5, 2021
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
10 changes: 8 additions & 2 deletions crud/src/main/java/org/openmbee/mms/crud/controllers/branches/BranchesController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,14 @@ public RefsResponse getAllRefs(
if (!permissionService.isProjectPublic(projectId)) {
List<RefJson> filtered = new ArrayList<>();
for (RefJson ref: res.getRefs()) {
if (mss.hasBranchPrivilege(auth, projectId, ref.getId(), Privileges.BRANCH_READ.name(), false)) {
filtered.add(ref);
try {
if (mss.hasBranchPrivilege(auth, projectId, ref.getId(),
Privileges.BRANCH_READ.name(), false)) {
filtered.add(ref);
}
} catch (MMSException e) {
logger.warn("error in getting branch permissions: projectId=" +
projectId + ", refId=" + ref.getId(), e);
}
}
res.setRefs(filtered);
Expand Down
5 changes: 5 additions & 0 deletions crud/src/main/java/org/openmbee/mms/crud/services/NodeDeleteHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ public NodeChangeInfo processDeleteJson(List<ElementJson> elements, CommitJson c
info.addRejection(nodeId, new Rejection(indexElement, 304, "Already deleted"));
continue;
}
if (indexElement == null) {
logger.warn("node db and index mismatch on element delete: nodeId: " + nodeId +
", docId not found: " + info.getExistingNodeMap().get(nodeId).getDocId());
indexElement = Map.of("id", nodeId);
}
ElementJson request = info.getReqElementMap().get(nodeId);
request.putAll(indexElement);
processElementDeleted(request, node, info);
Expand Down
25 changes: 24 additions & 1 deletion crud/src/main/java/org/openmbee/mms/crud/services/NodeGetHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,13 @@ private NodeGetInfo processLatest(NodeGetInfo info, NodeService service) {
}
ElementJson indexElement = info.getExistingElementMap().get(nodeId);
if (info.getExistingNodeMap().get(nodeId).isDeleted()) {
rejectDeleted(info, nodeId, indexElement);
rejectDeleted(info, nodeId, indexElement == null ? new ElementJson().setId(nodeId) : indexElement);
continue;
}
if (indexElement == null) {
logger.warn("node db and index mismatch on element get: nodeId: " + nodeId +
", docId not found: " + info.getExistingNodeMap().get(nodeId).getDocId());
rejectNotFound(info, nodeId);
continue;
}
if (service != null) {
Expand Down Expand Up @@ -75,6 +81,23 @@ private NodeGetInfo processCommit(NodeGetInfo info, String commitId, NodeService
continue;
}
ElementJson indexElement = info.getExistingElementMap().get(nodeId);
if (indexElement == null) {
Node n = info.getExistingNodeMap().get(nodeId);
logger.warn("node db and index mismatch on element commit get: nodeId: " + nodeId +
", docId not found: " + n.getDocId());
Optional<Commit> last = commitRepository.findByCommitId(n.getLastCommit());
Optional<Commit> first = commitRepository.findByCommitId(n.getInitialCommit());
if (!last.isPresent() || !first.isPresent()) {
rejectNotFound(info, nodeId);
continue;
}
indexElement = new ElementJson().setId(nodeId).setDocId(n.getDocId());
indexElement.setModified(formatter.format(last.get().getTimestamp()));
indexElement.setModifier(last.get().getCreator());
indexElement.setCommitId(last.get().getCommitId());
indexElement.setCreator(first.get().getCreator());
indexElement.setCreated(formatter.format(first.get().getTimestamp()));
}
Instant modified = Instant.from(formatter.parse(indexElement.getModified()));
Instant created = Instant.from(formatter.parse(indexElement.getCreated()));

Expand Down
14 changes: 11 additions & 3 deletions crud/src/main/java/org/openmbee/mms/crud/services/NodePostHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@
import java.util.List;
import java.util.Map;

import java.util.Optional;
import java.util.UUID;
import org.openmbee.mms.core.config.Formats;
import org.openmbee.mms.core.objects.Rejection;
import org.openmbee.mms.core.services.NodeChangeInfo;
import org.openmbee.mms.core.services.NodeService;
import org.openmbee.mms.data.domains.scoped.Commit;
import org.openmbee.mms.json.BaseJson;
import org.openmbee.mms.json.CommitJson;
import org.openmbee.mms.json.ElementJson;
Expand All @@ -34,7 +36,7 @@ public boolean diffUpdateJson(BaseJson element, Map<String, Object> existing,

String jsonModified = element.getModified();
Object existingModified = existing.get(BaseJson.MODIFIED);
if (jsonModified != null && !jsonModified.isEmpty()) {
if (jsonModified != null && !jsonModified.isEmpty() && existingModified != null) {
try {
Date jsonModDate = Formats.SDF.parse(jsonModified);
Date existingModDate = Formats.SDF.parse(existingModified.toString());
Expand Down Expand Up @@ -72,8 +74,14 @@ public NodeChangeInfo processPostJson(List<ElementJson> elements, boolean overwr
added = true;
} else if (indexElement == null) {
logger.warn("node db and index mismatch on element update: nodeId: " + n.getNodeId() + ", docId not found: " + n.getDocId());
info.addRejection(element.getId(), new Rejection(element, 500, "Update failed: previous element not found"));
continue;
//info.addRejection(element.getId(), new Rejection(element, 500, "Update failed: previous element not found"));
//continue;
indexElement = new ElementJson().setId(n.getNodeId()).setDocId(n.getDocId());
Optional<Commit> init = commitRepository.findByCommitId(n.getInitialCommit());
if (init.isPresent()) {
indexElement.setCreator(init.get().getCreator());
indexElement.setCreated(formatter.format(init.get().getTimestamp()));
}
}

if (!added) {
Expand Down