mirror of
https://github.com/google/nomulus.git
synced 2025-05-19 10:49:35 +02:00
Check registrar existence prior to verifying access
This way the error messages are more sensible when a registrar doesn't exist (which realistically shouldn't happen in the typical case anyway). ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=240376239
This commit is contained in:
parent
bb09f259b3
commit
4240be268a
3 changed files with 6 additions and 8 deletions
|
@ -220,16 +220,13 @@ public class AuthenticatedRegistrarAccessor {
|
|||
* @param clientId ID of the registrar we request
|
||||
*/
|
||||
public Registrar getRegistrar(String clientId) throws RegistrarAccessDeniedException {
|
||||
// Verify access before checking if the registrar exists, in order to not leak information
|
||||
// about objects in the system the user doesn't have permissions on.
|
||||
verifyAccess(clientId);
|
||||
|
||||
Registrar registrar =
|
||||
Registrar.loadByClientId(clientId)
|
||||
.orElseThrow(
|
||||
() ->
|
||||
new RegistrarAccessDeniedException(
|
||||
String.format("Registrar %s not found", clientId)));
|
||||
String.format("Registrar %s does not exist", clientId)));
|
||||
verifyAccess(clientId);
|
||||
|
||||
if (!clientId.equals(registrar.getClientId())) {
|
||||
logger.atSevere().log(
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue