mirror of
https://github.com/google/nomulus.git
synced 2025-05-05 14:37:52 +02:00
70273fa791
RegistrarSettingsAction is a JSON in / JSON out endpoint, meaning the reply is consumed as JSON. The current state is that if an error occurs, there are two possible replies: - a JSON error reply is sent out, or - a 402 HTML reply is sent out with the exception.getMessage() The difference is only - do we actively catch the exception to translate it to JSON or not. This fix catches ALL exceptions and translates them to JSON format. Note that there's no security change by giving the getMessage in the JSON reply since we were returning that anyway (in the HTML). In addition - changed the "gaeUserId" to "user.getEmail" as the identifier, since it's clearer to the users who see that error - and I do want to transition to a more "email identifier" way of checking access (since that's what users put in the registrar contact info) This too isn't leaking new information because - the initial HTML page load already gives the user's email, and - the logs already log the user's email for every request ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=215213807
67 lines
2.4 KiB
Java
67 lines
2.4 KiB
Java
// Copyright 2017 The Nomulus Authors. All Rights Reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package google.registry.request.auth;
|
|
|
|
import static com.google.common.base.Preconditions.checkNotNull;
|
|
|
|
import com.google.auto.value.AutoValue;
|
|
import java.util.Optional;
|
|
import javax.annotation.Nullable;
|
|
|
|
/**
|
|
* Results of authentication for a given HTTP request, as emitted by an
|
|
* {@link AuthenticationMechanism}.
|
|
*/
|
|
@AutoValue
|
|
public abstract class AuthResult {
|
|
|
|
public abstract AuthLevel authLevel();
|
|
|
|
/** Information about the authenticated user, if there is one. */
|
|
public abstract Optional<UserAuthInfo> userAuthInfo();
|
|
|
|
public boolean isAuthenticated() {
|
|
return authLevel() != AuthLevel.NONE;
|
|
}
|
|
|
|
public String userIdForLogging() {
|
|
return userAuthInfo()
|
|
.map(userAuthInfo -> userAuthInfo.user().getEmail())
|
|
.orElse("<logged-out user>");
|
|
}
|
|
|
|
public static AuthResult create(AuthLevel authLevel) {
|
|
return new AutoValue_AuthResult(authLevel, Optional.empty());
|
|
}
|
|
|
|
public static AuthResult create(AuthLevel authLevel, @Nullable UserAuthInfo userAuthInfo) {
|
|
if (authLevel == AuthLevel.USER) {
|
|
checkNotNull(userAuthInfo);
|
|
}
|
|
return new AutoValue_AuthResult(authLevel, Optional.ofNullable(userAuthInfo));
|
|
}
|
|
|
|
/**
|
|
* No authentication was made.
|
|
*
|
|
* <p>In the authentication step, this means that none of the configured authentication methods
|
|
* were able to authenticate the user. But the authorization settings may be such that it's
|
|
* perfectly fine not to be authenticated. The {@link RequestAuthenticator#authorize} method
|
|
* returns NOT_AUTHENTICATED in this case, as opposed to absent() if authentication failed and was
|
|
* required. So as a return from an authorization check, this can be treated as a success.
|
|
*/
|
|
public static final AuthResult NOT_AUTHENTICATED =
|
|
AuthResult.create(AuthLevel.NONE);
|
|
}
|