fix #557: guide permission-driven VPD flow
This commit is contained in:
@@ -6,6 +6,7 @@ import com.cloudhandson.vpdbackoffice.service.BearerTokenService;
|
||||
import com.cloudhandson.vpdbackoffice.service.OrdsProbeService;
|
||||
import com.cloudhandson.vpdbackoffice.service.ProtectedObjectService;
|
||||
import com.cloudhandson.vpdbackoffice.service.VpdPolicyService;
|
||||
import com.cloudhandson.vpdbackoffice.mapper.UserMapper;
|
||||
import java.util.Comparator;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.List;
|
||||
@@ -23,17 +24,20 @@ public class ProbeController {
|
||||
private final ProtectedObjectService protectedObjectService;
|
||||
private final BearerTokenService tokenService;
|
||||
private final VpdPolicyService vpdPolicyService;
|
||||
private final UserMapper userMapper;
|
||||
|
||||
public ProbeController(
|
||||
OrdsProbeService probeService,
|
||||
ProtectedObjectService protectedObjectService,
|
||||
BearerTokenService tokenService,
|
||||
VpdPolicyService vpdPolicyService
|
||||
VpdPolicyService vpdPolicyService,
|
||||
UserMapper userMapper
|
||||
) {
|
||||
this.probeService = probeService;
|
||||
this.protectedObjectService = protectedObjectService;
|
||||
this.tokenService = tokenService;
|
||||
this.vpdPolicyService = vpdPolicyService;
|
||||
this.userMapper = userMapper;
|
||||
}
|
||||
|
||||
@GetMapping("/probe")
|
||||
@@ -48,19 +52,35 @@ public class ProbeController {
|
||||
.toList();
|
||||
model.addAttribute("objects", objects);
|
||||
model.addAttribute("defaultObjectKeys", defaultObjectKeys);
|
||||
model.addAttribute("users", userMapper.findAll());
|
||||
return "probe";
|
||||
}
|
||||
|
||||
@PostMapping("/probe")
|
||||
public String run(
|
||||
@RequestParam long objectId,
|
||||
@RequestParam String bearerToken,
|
||||
@RequestParam(defaultValue = "") String bearerToken,
|
||||
@RequestParam(required = false) Long tempUserId,
|
||||
@RequestParam(defaultValue = "50") int limit,
|
||||
@RequestParam(required = false) String requestBody,
|
||||
Model model
|
||||
) {
|
||||
String normalizedToken = bearerToken == null ? "" : bearerToken.trim();
|
||||
model.addAttribute("result", probeService.runProbe(new ProbeCommand(null, objectId, normalizedToken, limit)));
|
||||
model.addAttribute("tokenContext", tokenService.findTokenContextByPlainToken(normalizedToken));
|
||||
Long temporaryKeyId = null;
|
||||
if (tempUserId != null) {
|
||||
var issued = tokenService.issueTemporaryToken(tempUserId, "ORDS 검증 임시 실행");
|
||||
normalizedToken = issued.plainToken();
|
||||
temporaryKeyId = issued.keyId();
|
||||
}
|
||||
try {
|
||||
model.addAttribute("result", probeService.runProbe(
|
||||
new ProbeCommand(temporaryKeyId, objectId, normalizedToken, limit, requestBody)));
|
||||
model.addAttribute("tokenContext", tokenService.findTokenContextByPlainToken(normalizedToken));
|
||||
} finally {
|
||||
if (temporaryKeyId != null) {
|
||||
tokenService.revokeToken(temporaryKeyId, "temporary probe completed");
|
||||
}
|
||||
}
|
||||
model.addAttribute("selectedObject", protectedObjectService.findEnabled().stream()
|
||||
.filter(object -> object.objectId() == objectId)
|
||||
.findFirst()
|
||||
|
||||
Reference in New Issue
Block a user