Skip to content
GitLab
Commit 2c70d272 authored by Sai Sathvik's avatar Sai Sathvik
Browse files

wiring up with the controller

parent a11abc03
main attestation consent-api create_attach_entity_role_to_user doc immunization internal-entity json-template-type-conv keycloak-updates open-saber-rc-2 pr-external-context pr-template-url spring-bean-issues sunbirdrc.dev test-fix uat-deploy upsmfac-main v0.0.12 v0.0.13 v0.0.12 v0.0.11 v0.0.10 v0.0.9 v0.0.8 v0.0.7 v0.0.6 v0.0.5 v0.0.4 v0.0.3 v0.0.2 v0.0.1
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 94 additions and 122 deletions
+94 -122
java/registry/src/main/java/io/opensaber/registry/controller/RegistryController.java
+ 16
− 110
View file @ 2c70d272
package io.opensaber.registry.controller;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
import com.fasterxml.jackson.databind.node.BooleanNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import io.opensaber.pojos.*;
import io.opensaber.pojos.attestation.AttestationPolicy;
import io.opensaber.pojos.dto.ClaimDTO;
import io.opensaber.registry.dao.NotFoundException;
import io.opensaber.registry.helper.EntityStateHelper;
import io.opensaber.registry.helper.RegistryHelper;
import io.opensaber.registry.middleware.MiddlewareHaltException;
import io.opensaber.registry.middleware.service.ConditionResolverService;
......@@ -66,7 +66,6 @@ public class RegistryController {
private ShardManager shardManager;
@Autowired
ClaimRequestClient claimRequestClient;
@Autowired
private ViewTemplateManager viewTemplateManager;
@Autowired
......@@ -345,23 +344,11 @@ public class RegistryController {
@PathVariable String entityName,
@PathVariable String entityId,
@RequestHeader HttpHeaders header,
@RequestBody JsonNode rootNode
) throws JsonProcessingException {
@RequestBody JsonNode rootNode) {
logger.info("Updating entityType {} request body {}", entityName, rootNode);
ResponseParams responseParams = new ResponseParams();
Response response = new Response(Response.API_ID.UPDATE, "OK", responseParams);
if (rootNode == null) {
logger.error("Bad request body {}", rootNode);
return badRequestException(responseParams, response, "Request body is empty");
}
if (rootNode.has(uuidPropertyName)) {
if (!rootNode.get(uuidPropertyName).asText().equals(entityId)) {
logger.error("Bad request body {}", rootNode);
return badRequestException(responseParams, response, "ID passed in params doesn't match with the Request body ID");
}
} else {
((ObjectNode) rootNode).put(uuidPropertyName, entityId);
}
((ObjectNode) rootNode).put(uuidPropertyName, entityId);
ObjectNode newRootNode = objectMapper.createObjectNode();
newRootNode.set(entityName, rootNode);
......@@ -386,28 +373,19 @@ public class RegistryController {
public ResponseEntity<Object> postEntity(
@PathVariable String entityName,
@RequestHeader HttpHeaders header,
@RequestBody JsonNode rootNode,
String userId
@RequestBody JsonNode rootNode
) {
logger.info("Adding entity {}", rootNode);
ResponseParams responseParams = new ResponseParams();
Response response = new Response(Response.API_ID.CREATE, "OK", responseParams);
Map<String, Object> result = new HashMap<>();
if (rootNode == null) {
logger.info("Bad request body {}", rootNode);
return badRequestException(responseParams, response, "Request body is empty");
}
ObjectNode newRootNode = objectMapper.createObjectNode();
newRootNode.set(entityName, rootNode);
try {
if (userId == null) {
userId = "";
}
String label = registryHelper.addEntity(newRootNode, userId); //todo add user id from auth scope.
String label = registryHelper.addEntity(newRootNode, ""); //todo add user id from auth scope.
Map resultMap = new HashMap();
resultMap.put(dbConnectionInfoMgr.getUuidPropertyName(), label);
result.put(entityName, resultMap);
response.setResult(result);
responseParams.setStatus(Response.Status.SUCCESSFUL);
......@@ -438,32 +416,20 @@ public class RegistryController {
@PathVariable String property,
@PathVariable String propertyId,
@RequestHeader HttpHeaders header,
@RequestBody JsonNode requestBody
@RequestBody BooleanNode requestBody
) throws IOException {
// TODO: fetch user details from JWT
String userId = "";
String role = "bo";
try {
JsonNode existingNode = registryHelper
.readEntity(userId, property, propertyId, false, null, false)
.get(property);
StateContext stateContext = new StateContext(existingNode, requestBody, role);
if (stateContext.getRequestBodyVal("action").equals("GRANTED")) {
stateContext.setOSProperty("_osAttestedData", requestBody.get("attestedData").asText());
}
ruleEngineService.doTransition(stateContext);
ObjectNode objectNode = objectMapper.createObjectNode();
objectNode.set(property, stateContext.getResult());
registryHelper.updateEntity(objectNode, propertyId);
registryHelper.updateEntityInEs(entityName, entityId);
registryHelper.attest(entityName, entityId, property+"/"+propertyId, requestBody.asBoolean());
return new ResponseEntity<>(HttpStatus.OK);
} catch (Exception e) {
e.printStackTrace();
return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
}
return new ResponseEntity<>(HttpStatus.OK);
}
@RequestMapping(value = "/api/v1/{entityName}/{entityId}/{property}/{propertyId}", method = RequestMethod.PUT)
public ResponseEntity<Object> addNewPropertyToTheEntity(
public ResponseEntity<Object> updatePropertyOfTheEntity(
@PathVariable String entityName,
@PathVariable String entityId,
@PathVariable String property,
......@@ -474,23 +440,9 @@ public class RegistryController {
ResponseParams responseParams = new ResponseParams();
Response response = new Response(Response.API_ID.UPDATE, "OK", responseParams);
try {
String userId = "";
JsonNode existingNode = registryHelper
.readEntity(userId, property, propertyId, false, null, false)
.get(property);
StateContext stateContext = new StateContext(existingNode, requestBody, "student");
ruleEngineService.doTransition(stateContext);
if (stateContext.isAttestationRequested()) {
HashMap<String, Object> claimResponse = createClaimHelper(entityName, entityId, property, propertyId, stateContext);
stateContext.setOSProperty("_osClaimId", claimResponse.get("id").toString());
}
ObjectNode newRootNode = objectMapper.createObjectNode();
newRootNode.set(property, stateContext.getResult());
String tag = "RegistryController.update " + entityName;
watch.start(tag);
registryHelper.updateEntity(newRootNode, userId);
registryHelper.updateEntityInEs(entityName, entityId);
registryHelper.updateEntityProperty(entityName, entityId, property, propertyId, requestBody);
responseParams.setErrmsg("");
responseParams.setStatus(Response.Status.SUCCESSFUL);
watch.stop(tag);
......@@ -502,21 +454,6 @@ public class RegistryController {
}
}
private HashMap<String, Object> createClaimHelper(String entityName, String entityId, String property, String propertyId, StateContext stateContext) {
OSSchemaConfiguration osSchemaConfiguration = definitionsManager.getDefinition(entityName).getOsSchemaConfiguration();
String conditions = osSchemaConfiguration.getConditions(property);
String attestorEntity = osSchemaConfiguration.getAttestorEntity(property);
String resolvedConditions = conditionResolverService.resolve(stateContext.getResult(), "REQUESTER", conditions, Collections.emptyList());
ClaimDTO claimDTO = new ClaimDTO();
claimDTO.setEntity(entityName);
claimDTO.setEntityId(entityId);
claimDTO.setProperty(property);
claimDTO.setPropertyId(propertyId);
claimDTO.setConditions(resolvedConditions);
claimDTO.setAttestorEntity(attestorEntity);
return claimRequestClient.riseClaimRequest(claimDTO);
}
@Deprecated
@RequestMapping(value = "/api/v1/{entityName}/{entityId}/{property}/{propertyId}/send", method = RequestMethod.POST)
public ResponseEntity<Object> sendForVerification(
......@@ -530,22 +467,9 @@ public class RegistryController {
ResponseParams responseParams = new ResponseParams();
Response response = new Response(Response.API_ID.UPDATE, "OK", responseParams);
try {
String userId = "";
String currentRole = "student";
JsonNode existingNode = registryHelper
.readEntity(userId, property, propertyId, false, null, false)
.get(property);
StateContext stateContext = new StateContext(existingNode, currentRole);
ruleEngineService.doTransition(stateContext);
HashMap<String, Object> claimResponse = createClaimHelper(entityName, entityId, property, propertyId, stateContext);
stateContext.setOSProperty("_osClaimId", claimResponse.get("id").toString());
ObjectNode newRootNode = objectMapper.createObjectNode();
newRootNode.set(property, stateContext.getResult());
String tag = "RegistryController.update " + entityName;
String tag = "RegistryController.sendForVerification " + entityName;
watch.start(tag);
registryHelper.updateEntity(newRootNode, userId);
registryHelper.updateEntityInEs(entityName, entityId);
responseParams.setErrmsg(userId);
registryHelper.sendForAttestation(entityName, entityId, property+"/"+propertyId);
responseParams.setStatus(Response.Status.SUCCESSFUL);
watch.stop(tag);
return new ResponseEntity<>(response, HttpStatus.OK);
......@@ -570,29 +494,11 @@ public class RegistryController {
ResponseParams responseParams = new ResponseParams();
Response response = new Response(Response.API_ID.UPDATE, "OK", responseParams);
try {
ObjectNode propertyNode = objectMapper.createObjectNode();
StateContext state = new StateContext("student", requestBody);
ruleEngineService.doTransition(state);
JsonNode existingProperties = registryHelper
.readEntity("", entityName, entityId, false, null, false)
.get(entityName)
.get(property);
if (existingProperties != null) {
propertyNode.set(property, ((ArrayNode) existingProperties).add(state.getResult()));
propertyNode.put(uuidPropertyName, entityId);
} else {
propertyNode.set(property, JsonNodeFactory.instance.arrayNode().add(state.getResult()));
propertyNode.put(uuidPropertyName, entityId);
}
ObjectNode newRootNode = objectMapper.createObjectNode();
newRootNode.set(entityName, propertyNode);
String tag = "RegistryController.update " + entityName;
String tag = "RegistryController.addNewPropertyToTheEntity " + entityName;
watch.start(tag);
registryHelper.updateEntity(newRootNode, "");
registryHelper.addEntityProperty(entityName, entityId, property, requestBody);
responseParams.setErrmsg("");
responseParams.setStatus(Response.Status.SUCCESSFUL);
registryHelper.updateEntityInEs(entityName, entityId);
watch.stop(tag);
return new ResponseEntity<>(response, HttpStatus.OK);
} catch (Exception e) {
......
java/registry/src/main/java/io/opensaber/registry/helper/RegistryHelper.java
+ 78
− 12
View file @ 2c70d272
......@@ -10,14 +10,11 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
import com.flipkart.zjsonpatch.JsonPatch;
import io.opensaber.pojos.OpenSaberInstrumentation;
import io.opensaber.registry.controller.RegistryController;
import io.opensaber.registry.middleware.MiddlewareHaltException;
import io.opensaber.registry.middleware.util.JSONUtil;
import io.opensaber.registry.middleware.util.OSSystemFields;
import io.opensaber.registry.model.DBConnectionInfoMgr;
import io.opensaber.registry.service.DecryptionHelper;
import io.opensaber.registry.service.IReadService;
import io.opensaber.registry.service.ISearchService;
import io.opensaber.registry.service.RegistryService;
import io.opensaber.registry.service.*;
import io.opensaber.registry.sink.shard.Shard;
import io.opensaber.registry.sink.shard.ShardManager;
import io.opensaber.registry.util.*;
......@@ -33,6 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import javax.servlet.http.HttpServletRequest;
import java.util.*;
......@@ -62,6 +60,9 @@ public class RegistryHelper {
@Autowired
private ViewTemplateManager viewTemplateManager;
@Autowired
EntityStateHelper entityStateHelper;
@Autowired
private KeycloakAdminUtil keycloakAdminUtil;
......@@ -103,6 +104,9 @@ public class RegistryHelper {
public String addEntity(JsonNode inputJson, String userId) throws Exception {
String entityType = inputJson.fields().next().getKey();
validationService.validate(entityType, objectMapper.writeValueAsString(inputJson));
ObjectNode existingNode = objectMapper.createObjectNode();
existingNode.set(entityType, objectMapper.createObjectNode());
entityStateHelper.changeStateAfterUpdate(existingNode, inputJson);
return addEntity(inputJson, userId, entityType);
}
......@@ -244,7 +248,7 @@ public class RegistryHelper {
* @return
* @throws Exception
*/
public String updateEntity(JsonNode inputJson, String userId) throws Exception {
private String updateEntityNoStateChange(JsonNode inputJson, String userId) throws Exception {
logger.debug("updateEntity starts");
String entityType = inputJson.fields().next().getKey();
String jsonString = objectMapper.writeValueAsString(inputJson);
......@@ -258,17 +262,79 @@ public class RegistryHelper {
return "SUCCESS";
}
/* It will be used to update the sub section of the entity in the es
*/
public void updateEntityInEs(String entityName, String entityId) throws Exception {
JsonNode jsonNode = readEntity("", entityName, entityId, false, null, false);
registryService.callESActors(jsonNode, "UPDATE", entityName, entityId, null);
public String updateEntity(JsonNode inputJson, String userId) throws Exception {
JsonNode existingNode = readEntity(inputJson, userId);
return updateEntityAndState(existingNode, inputJson, userId);
}
private String updateEntityAndState(JsonNode existingNode, JsonNode updatedNode, String userId) throws Exception {
entityStateHelper.changeStateAfterUpdate(existingNode, updatedNode);
return updateEntityNoStateChange(updatedNode, userId);
}
public void addEntityProperty(String entityName, String entityId, String propertyName, JsonNode inputJson) throws Exception {
String userId = "";
JsonNode existingNode = readEntity("", entityName, entityId, false, null, false);
JsonNode updateNode = existingNode.deepCopy();
JsonNode propertyNode = updateNode.get(entityName).get(propertyName);
if (propertyNode != null && !propertyNode.isMissingNode()) {
if (propertyNode.isArray()){
((ArrayNode)propertyNode).add(inputJson);
} else {
((ObjectNode)updateNode).set(propertyName, inputJson);
}
} else {
// if array property
JsonNode newPropertyNode = objectMapper.createArrayNode();
((ArrayNode)newPropertyNode).add(inputJson);
((ObjectNode)updateNode.get(entityName)).set(propertyName, newPropertyNode);
try {
validationService.validate(entityName, objectMapper.writeValueAsString(updateNode));
} catch (MiddlewareHaltException me) {
// try a field node since array validation failed
newPropertyNode = objectMapper.createObjectNode();
((ObjectNode) updateNode).set(propertyName, newPropertyNode);
}
}
updateEntityAndState(existingNode, updateNode, "");
}
public void updateEntityProperty(String entityName, String entityId, String propertyName, String propertyId, JsonNode inputJson) throws Exception {
String userId = "";
JsonNode existingNode = readEntity("", entityName, entityId, false, null, false);
JsonNode updateNode = existingNode.deepCopy();
ArrayNode propertyArrayNode = (ArrayNode) updateNode.get(entityName).get(propertyName);
boolean found = false;
for (JsonNode propertyNode : propertyArrayNode) {
if (propertyNode.get(uuidPropertyName).asText().equals(propertyId)) {
found = true;
inputJson.fields().forEachRemaining(f -> {
((ObjectNode)propertyNode).set(f.getKey(), f.getValue());
});
break;
}
}
if (!found) throw new Exception("No property with given id");
updateEntityAndState(existingNode, updateNode, "");
}
public void attestEntity(String entityName, JsonNode node, String[] jsonPaths, String userId) throws Exception {
String patch = String.format("[{\"op\":\"add\", \"path\": \"attested\", \"value\": {\"attestation\":{\"id\":\"%s\"}, \"path\": \"%s\"}}]", userId, jsonPaths[0]);
JsonPatch.applyInPlace(objectMapper.readTree(patch), node.get(entityName));
updateEntity(node, userId);
updateEntityNoStateChange(node, userId);
}
public void sendForAttestation(String entityName, String entityId, String uuidPath) throws Exception {
JsonNode entityNode = readEntity("", entityName, entityId, false, null, false);
JsonNode updatedNode = entityStateHelper.sendForAttestation(entityNode, uuidPath);
updateEntityNoStateChange(updatedNode, "");
}
public void attest(String entityName, String entityId, String uuidPath, boolean isGranted) throws Exception {
JsonNode entityNode = readEntity("", entityName, entityId, false, null, false);
JsonNode updatedNode = entityStateHelper.attestClaim(entityNode, uuidPath);
updateEntityNoStateChange(updatedNode, "");
}
/**
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment