Skip to content
Snippets Groups Projects
Commit 8339cc20 authored by Nicola Fulvio Calabria's avatar Nicola Fulvio Calabria
Browse files

Fixed Task #6363 disappearance (likely due to local git client/IDE

bug). Commit from fresh cloned local copy.
parent d2500f43
No related branches found
No related tags found
No related merge requests found
...@@ -7,6 +7,7 @@ import org.springframework.web.bind.annotation.GetMapping; ...@@ -7,6 +7,7 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import net.ivoa.xml.vospace.v2.Node; import net.ivoa.xml.vospace.v2.Node;
import net.ivoa.xml.vospace.v2.ContainerNode;
import it.inaf.oats.vospace.persistence.NodeDAO; import it.inaf.oats.vospace.persistence.NodeDAO;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
...@@ -17,6 +18,8 @@ import it.inaf.ia2.aa.data.User; ...@@ -17,6 +18,8 @@ import it.inaf.ia2.aa.data.User;
import it.inaf.oats.vospace.datamodel.NodeUtils; import it.inaf.oats.vospace.datamodel.NodeUtils;
import java.util.Optional; import java.util.Optional;
import it.inaf.oats.vospace.exception.PermissionDeniedException; import it.inaf.oats.vospace.exception.PermissionDeniedException;
import java.util.stream.Collectors;
import java.util.List;
@RestController @RestController
public class ListNodeController extends BaseNodeController { public class ListNodeController extends BaseNodeController {
...@@ -43,6 +46,21 @@ public class ListNodeController extends BaseNodeController { ...@@ -43,6 +46,21 @@ public class ListNodeController extends BaseNodeController {
} }
} }
Node node = optNode.get();
if (node instanceof ContainerNode) {
ContainerNode cnd = (ContainerNode) node;
List<Node> children
= cnd.getNodes().stream().filter(
(n) -> NodeUtils.checkIfReadable(
n, principal.getName(),
principal.getGroups()))
.collect(Collectors.toList());
cnd.setNodes(children);
optNode = Optional.of(cnd);
}
return ResponseEntity.ok(optNode.get()); return ResponseEntity.ok(optNode.get());
} }
} }
...@@ -111,7 +111,7 @@ public class ListNodeControllerTest { ...@@ -111,7 +111,7 @@ public class ListNodeControllerTest {
.andExpect(status().is2xxSuccessful()); .andExpect(status().is2xxSuccessful());
} }
//@Test @Test
public void testListOnlyReadableChildren() throws Exception { public void testListOnlyReadableChildren() throws Exception {
ContainerNode node = new ContainerNode(); ContainerNode node = new ContainerNode();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment