summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorOla Aunrønning <olaa@verizonmedia.com>2022-02-09 20:06:42 +0100
committerOla Aunrønning <olaa@verizonmedia.com>2022-02-09 20:06:42 +0100
commit8789e0b449fc7b32f3924da7c8a3f86e734f2289 (patch)
tree220300d80d6993407ba882bda1c04ab109e31496 /controller-server
parentf99a9a1005f35117e90f0df0d6f9c2bb36357d07 (diff)
Request, list, and approve ssh access
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java54
1 files changed, 54 insertions, 0 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
index 32381e6a123..71b5984c7cd 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
@@ -235,6 +235,7 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
if (path.matches("/application/v4/")) return root(request);
if (path.matches("/application/v4/tenant")) return tenants(request);
if (path.matches("/application/v4/tenant/{tenant}")) return tenant(path.get("tenant"), request);
+ if (path.matches("/application/v4/tenant/{tenant}/access/ssh/request")) return accessRequests(path.get("tenant"), request);
if (path.matches("/application/v4/tenant/{tenant}/info")) return tenantInfo(path.get("tenant"), request);
if (path.matches("/application/v4/tenant/{tenant}/notifications")) return notifications(path.get("tenant"), request);
if (path.matches("/application/v4/tenant/{tenant}/secret-store/{name}/validate")) return validateSecretStore(path.get("tenant"), path.get("name"), request);
@@ -286,6 +287,8 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
private HttpResponse handlePUT(Path path, HttpRequest request) {
if (path.matches("/application/v4/tenant/{tenant}")) return updateTenant(path.get("tenant"), request);
+ if (path.matches("/application/v4/tenant/{tenant}/access/ssh/request")) return requestSshAccess(path.get("tenant"), request);
+ if (path.matches("/application/v4/tenant/{tenant}/access/ssh/approve")) return approveAccessRequest(path.get("tenant"), request);
if (path.matches("/application/v4/tenant/{tenant}/info")) return updateTenantInfo(path.get("tenant"), request);
if (path.matches("/application/v4/tenant/{tenant}/archive-access")) return allowArchiveAccess(path.get("tenant"), request);
if (path.matches("/application/v4/tenant/{tenant}/secret-store/{name}")) return addSecretStore(path.get("tenant"), path.get("name"), request);
@@ -402,6 +405,47 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
return new SlimeJsonResponse(slime);
}
+ private HttpResponse accessRequests(String tenantName, HttpRequest request) {
+ if (controller.tenants().require(TenantName.from(tenantName)).type() != Tenant.Type.cloud)
+ return ErrorResponse.badRequest("Can only see access requests for cloud tenants");
+
+ var pendingRequests = controller.serviceRegistry().accessControlService().hasPendingAccessRequests(TenantName.from(tenantName));
+ var slime = new Slime();
+ slime.setObject().setBool("hasPendingRequests", pendingRequests);
+ return new SlimeJsonResponse(slime);
+ }
+
+ private HttpResponse requestSshAccess(String tenantName, HttpRequest request) {
+ if (!isOperator(request)) {
+ return ErrorResponse.forbidden("Only operators are allowed to request ssh access");
+ }
+
+ if (controller.tenants().require(TenantName.from(tenantName)).type() != Tenant.Type.cloud)
+ return ErrorResponse.badRequest("Can only request access for cloud tenants");
+
+ controller.serviceRegistry().accessControlService().requestSshAccess(TenantName.from(tenantName));
+ return new MessageResponse("OK");
+
+ }
+
+ private HttpResponse approveAccessRequest(String tenantName, HttpRequest request) {
+ var tenant = TenantName.from(tenantName);
+
+ if (controller.tenants().require(tenant).type() != Tenant.Type.cloud)
+ return ErrorResponse.badRequest("Can only see access requests for cloud tenants");
+
+ if (!isTenantAdmin(tenant, request)) {
+ return ErrorResponse.forbidden("Only tenant admins are allowed to approve access requests");
+ }
+ var inspector = toSlime(request.getData()).get();
+ var expiry = inspector.field("expiry").valid() ?
+ Instant.ofEpochMilli(inspector.field("expiry").asLong()) :
+ Instant.now().plus(1, ChronoUnit.DAYS);
+
+ controller.serviceRegistry().accessControlService().approveSshAccess(tenant, expiry);
+ return new MessageResponse("OK");
+ }
+
private HttpResponse tenantInfo(String tenantName, HttpRequest request) {
return controller.tenants().get(TenantName.from(tenantName))
.filter(tenant -> tenant.type() == Tenant.Type.cloud)
@@ -2738,6 +2782,16 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
.anyMatch(definition -> definition == RoleDefinition.hostedOperator);
}
+ private static boolean isTenantAdmin(TenantName tenant, HttpRequest request) {
+ return Optional.ofNullable(request.getJDiscRequest().context().get(SecurityContext.ATTRIBUTE_NAME))
+ .filter(SecurityContext.class::isInstance)
+ .map(SecurityContext.class::cast)
+ .map(SecurityContext::roles)
+ .orElseThrow(() -> new IllegalArgumentException("Attribute '" + SecurityContext.ATTRIBUTE_NAME + "' was not set on request"))
+ .stream()
+ .anyMatch(role -> role.equals(Role.administrator(tenant)));
+ }
+
private void ensureApplicationExists(TenantAndApplicationId id, HttpRequest request) {
if (controller.applications().getApplication(id).isEmpty()) {
log.fine("Application does not exist in public, creating: " + id);