Skip to content
This repository has been archived by the owner on Nov 22, 2023. It is now read-only.

Commit

Permalink
Use read-only ACL DAO in secret resource
Browse files Browse the repository at this point in the history
  • Loading branch information
@csstaub
csstaub committed Mar 9, 2017
1 parent 7b49329 commit 69093ad
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions server/src/main/java/keywhiz/service/resources/admin/SecretsResource.java
View file
Expand Up @@ -85,26 +85,26 @@ public class SecretsResource {
private static final Logger logger = LoggerFactory.getLogger(SecretsResource.class); private static final Logger logger = LoggerFactory.getLogger(SecretsResource.class);


private final SecretController secretController; private final SecretController secretController;
private final AclDAO aclDAO; private final AclDAO aclDAOReadOnly;
private final SecretDAO secretDAOReadWrite; private final SecretDAO secretDAOReadWrite;
private final SecretDAO secretDAOReadOnly; private final SecretDAO secretDAOReadOnly;
private final AuditLog auditLog; private final AuditLog auditLog;


@SuppressWarnings("unused") @SuppressWarnings("unused")
@Inject public SecretsResource(SecretController secretController, AclDAOFactory aclDAOFactory, @Inject public SecretsResource(SecretController secretController, AclDAOFactory aclDAOFactory,
SecretDAOFactory secretDAOFactory, AuditLog auditLog) { SecretDAOFactory secretDAOFactory, AuditLog auditLog) {
this.secretController = secretController; this.secretController = secretController;
this.aclDAO = aclDAOFactory.readwrite(); this.aclDAOReadOnly = aclDAOFactory.readonly();
this.secretDAOReadWrite = secretDAOFactory.readwrite(); this.secretDAOReadWrite = secretDAOFactory.readwrite();
this.secretDAOReadOnly = secretDAOFactory.readonly(); this.secretDAOReadOnly = secretDAOFactory.readonly();
this.auditLog = auditLog; this.auditLog = auditLog;
} }


/** Constructor for testing */ /** Constructor for testing */
@VisibleForTesting SecretsResource(SecretController secretController, AclDAO aclDAO, @VisibleForTesting SecretsResource(SecretController secretController, AclDAO aclDAOReadOnly,
SecretDAO secretDAOReadWrite, AuditLog auditLog) { SecretDAO secretDAOReadWrite, AuditLog auditLog) {
this.secretController = secretController; this.secretController = secretController;
this.aclDAO = aclDAO; this.aclDAOReadOnly = aclDAOReadOnly;
this.secretDAOReadWrite = secretDAOReadWrite; this.secretDAOReadWrite = secretDAOReadWrite;
this.secretDAOReadOnly = secretDAOReadWrite; this.secretDAOReadOnly = secretDAOReadWrite;
this.auditLog = auditLog; this.auditLog = auditLog;
Expand Down Expand Up @@ -443,7 +443,7 @@ public Response deleteSecret(@Auth User user, @PathParam("secretId") LongParam s
logger.info("User '{}' deleting secret id={}, name='{}'", user, secretId, secret.get().getName()); logger.info("User '{}' deleting secret id={}, name='{}'", user, secretId, secret.get().getName());


// Get the groups for this secret, so they can be restored manually if necessary // Get the groups for this secret, so they can be restored manually if necessary
Set<String> groups = aclDAO.getGroupsFor(secret.get()).stream().map(Group::getName).collect(toSet()); Set<String> groups = aclDAOReadOnly.getGroupsFor(secret.get()).stream().map(Group::getName).collect(toSet());


secretDAOReadWrite.deleteSecretsByName(secret.get().getName()); secretDAOReadWrite.deleteSecretsByName(secret.get().getName());


Expand All @@ -461,8 +461,8 @@ private SecretDetailResponse secretDetailResponseFromId(long secretId) {
throw new NotFoundException("Secret not found."); throw new NotFoundException("Secret not found.");
} }


ImmutableList<Group> groups = ImmutableList.copyOf(aclDAO.getGroupsFor(secrets.get())); ImmutableList<Group> groups = ImmutableList.copyOf(aclDAOReadOnly.getGroupsFor(secrets.get()));
ImmutableList<Client> clients = ImmutableList.copyOf(aclDAO.getClientsFor(secrets.get())); ImmutableList<Client> clients = ImmutableList.copyOf(aclDAOReadOnly.getClientsFor(secrets.get()));
return SecretDetailResponse.fromSecret(secrets.get(), groups, clients); return SecretDetailResponse.fromSecret(secrets.get(), groups, clients);
} }


Expand All @@ -472,8 +472,8 @@ private SecretDetailResponse secretDetailResponseFromName(String secretName) {
throw new NotFoundException("Secret not found."); throw new NotFoundException("Secret not found.");
} }


ImmutableList<Group> groups = ImmutableList.copyOf(aclDAO.getGroupsFor(secrets.get())); ImmutableList<Group> groups = ImmutableList.copyOf(aclDAOReadOnly.getGroupsFor(secrets.get()));
ImmutableList<Client> clients = ImmutableList.copyOf(aclDAO.getClientsFor(secrets.get())); ImmutableList<Client> clients = ImmutableList.copyOf(aclDAOReadOnly.getClientsFor(secrets.get()));
return SecretDetailResponse.fromSecret(secrets.get(), groups, clients); return SecretDetailResponse.fromSecret(secrets.get(), groups, clients);
} }


Expand Down

0 comments on commit 69093ad

Please sign in to comment.