mirrors/nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus synced 2026-05-23 00:01:58 +00:00
Code Issues Releases Wiki Activity

Migrate to Flogger (green)

Browse Source 
This is a 'green' Flogger migration CL. Green CLs are intended to be as
safe as possible and should be easy to review and submit.

No changes should be necessary to the code itself prior to submission,
but small changes to BUILD files may be required.

Changes within files are completely independent of each other, so this CL
can be safely split up for review using tools such as Rosie.

For more information, see []
Base CL: 197826149

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=198560170
This commit is contained in:
jianglai
2018-05-30 07:58:51 -07:00
parent 0d2fb3a8f0
commit 70b13596e4
178 changed files with 984 additions and 988 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
java/google/registry/security/XsrfTokenManager.java
View File

@@ -22,8 +22,8 @@ import static org.joda.time.DateTimeZone.UTC;
import com.google.appengine.api.users.UserService;
import com.google.common.base.Joiner;
import com.google.common.base.Splitter;
import com.google.common.flogger.FluentLogger;
import com.google.common.hash.Hashing;
import com.google.common.logging.FormattingLogger;
import google.registry.model.server.ServerSecret;
import google.registry.util.Clock;
import java.util.List;
@@ -43,7 +43,7 @@ public final class XsrfTokenManager {
/** Token version identifier for version 1. */
private static final String VERSION_1 = "1";
private static final FormattingLogger logger = FormattingLogger.getLoggerForCallerClass();
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
private final Clock clock;
private final UserService userService;
@@ -82,11 +82,11 @@ public final class XsrfTokenManager {
checkArgumentNotNull(token);
List<String> tokenParts = Splitter.on(':').splitToList(token);
if (tokenParts.size() != 3) {
logger.warningfmt("Malformed XSRF token: %s", token);
logger.atWarning().log("Malformed XSRF token: %s", token);
return false;
}
if (!tokenParts.get(0).equals(VERSION_1)) {
logger.warningfmt("Unrecognized version in XSRF token: %s", token);
logger.atWarning().log("Unrecognized version in XSRF token: %s", token);
return false;
}
String timePart = tokenParts.get(1);
@@ -94,11 +94,11 @@ public final class XsrfTokenManager {
try {
timestampMillis = Long.parseLong(timePart);
} catch (NumberFormatException e) {
logger.warningfmt("Bad timestamp in XSRF token: %s", token);
logger.atWarning().log("Bad timestamp in XSRF token: %s", token);
return false;
}
if (new DateTime(timestampMillis, UTC).plus(XSRF_VALIDITY).isBefore(clock.nowUtc())) {
logger.infofmt("Expired timestamp in XSRF token: %s", token);
logger.atInfo().log("Expired timestamp in XSRF token: %s", token);
return false;
}
String currentUserEmail =
@@ -108,7 +108,7 @@ public final class XsrfTokenManager {
String reconstructedToken =
encodeToken(ServerSecret.get().asBytes(), currentUserEmail, timestampMillis);
if (!token.equals(reconstructedToken)) {
logger.warningfmt(
logger.atWarning().log(
"Reconstructed XSRF mismatch (got != expected): %s != %s", token, reconstructedToken);
return false;
}