zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-15 17:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Log a warning when MarksDB password isn't configured

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=231287550
This commit is contained in:
mcilwain 2019-01-28 14:17:10 -08:00 • committed by Michael Muller
parent 44e822ed86
commit 88aa13d1a4
3 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
java/google/registry/tmch/LordnRequestInitializer.java
View file

@ -18,6 +18,7 @@ import static com.google.common.base.Verify.verifyNotNull;
import static google.registry.util.UrlFetchUtils.setAuthorizationHeader; import static google.registry.util.UrlFetchUtils.setAuthorizationHeader;
import com.google.appengine.api.urlfetch.HTTPRequest; import com.google.appengine.api.urlfetch.HTTPRequest;
import com.google.common.flogger.FluentLogger;
import google.registry.keyring.api.KeyModule.Key; import google.registry.keyring.api.KeyModule.Key;
import google.registry.model.registry.Registry; import google.registry.model.registry.Registry;
import java.util.Optional; import java.util.Optional;
@ -26,8 +27,14 @@ import javax.inject.Inject;
/** Helper class for setting the authorization header on a MarksDB LORDN request. */ /** Helper class for setting the authorization header on a MarksDB LORDN request. */
final class LordnRequestInitializer { final class LordnRequestInitializer {
@Inject @Key("marksdbLordnPassword") Optional<String> marksdbLordnPassword; private static final FluentLogger logger = FluentLogger.forEnclosingClass();
@Inject LordnRequestInitializer() {}
private final Optional<String> marksdbLordnPassword;
@Inject
LordnRequestInitializer(@Key("marksdbLordnPassword") Optional<String> marksdbLordnPassword) {
this.marksdbLordnPassword = marksdbLordnPassword;
}
/** Initializes a URL fetch request for talking to the MarksDB server. */ /** Initializes a URL fetch request for talking to the MarksDB server. */
void initialize(HTTPRequest request, String tld) { void initialize(HTTPRequest request, String tld) {
@ -41,6 +48,8 @@ final class LordnRequestInitializer {
"lordnUsername is not set for %s.", Registry.get(tld).getTld()); "lordnUsername is not set for %s.", Registry.get(tld).getTld());
return Optional.of(String.format("%s:%s", lordnUsername, marksdbLordnPassword.get())); return Optional.of(String.format("%s:%s", lordnUsername, marksdbLordnPassword.get()));
} else { } else {
logger.atWarning().log(
"Cannot set credentials for LORDN request because password isn't configured.");
return Optional.empty(); return Optional.empty();
} }
} }

6
javatests/google/registry/tmch/NordnUploadActionTest.java
View file

@ -104,7 +104,8 @@ public class NordnUploadActionTest {
@Captor private ArgumentCaptor<HTTPRequest> httpRequestCaptor; @Captor private ArgumentCaptor<HTTPRequest> httpRequestCaptor;
private final FakeClock clock = new FakeClock(DateTime.parse("2010-05-01T10:11:12Z")); private final FakeClock clock = new FakeClock(DateTime.parse("2010-05-01T10:11:12Z"));
private final LordnRequestInitializer lordnRequestInitializer = new LordnRequestInitializer(); private final LordnRequestInitializer lordnRequestInitializer =
new LordnRequestInitializer(Optional.of("attack"));
private final NordnUploadAction action = new NordnUploadAction(); private final NordnUploadAction action = new NordnUploadAction();
@Before @Before
@ -117,7 +118,6 @@ public class NordnUploadActionTest {
persistResource(loadRegistrar("TheRegistrar").asBuilder().setIanaIdentifier(99999L).build()); persistResource(loadRegistrar("TheRegistrar").asBuilder().setIanaIdentifier(99999L).build());
createTld("tld"); createTld("tld");
persistResource(Registry.get("tld").asBuilder().setLordnUsername("lolcat").build()); persistResource(Registry.get("tld").asBuilder().setLordnUsername("lolcat").build());
lordnRequestInitializer.marksdbLordnPassword = Optional.of("attack");
action.clock = clock; action.clock = clock;
action.fetchService = fetchService; action.fetchService = fetchService;
action.lordnRequestInitializer = lordnRequestInitializer; action.lordnRequestInitializer = lordnRequestInitializer;
@ -210,7 +210,7 @@ public class NordnUploadActionTest {
@Test @Test
public void testRun_noPassword_doesntSendAuthorizationHeader() throws Exception { public void testRun_noPassword_doesntSendAuthorizationHeader() throws Exception {
lordnRequestInitializer.marksdbLordnPassword = Optional.empty(); action.lordnRequestInitializer = new LordnRequestInitializer(Optional.empty());
persistClaimsModeDomain(); persistClaimsModeDomain();
action.run(); action.run();
assertThat(getHeaderFirst(getCapturedHttpRequest(), AUTHORIZATION)).isEmpty(); assertThat(getHeaderFirst(getCapturedHttpRequest(), AUTHORIZATION)).isEmpty();

6
javatests/google/registry/tmch/NordnVerifyActionTest.java
View file

@ -87,7 +87,8 @@ public class NordnVerifyActionTest {
@Captor private ArgumentCaptor<HTTPRequest> httpRequestCaptor; @Captor private ArgumentCaptor<HTTPRequest> httpRequestCaptor;
private final FakeResponse response = new FakeResponse(); private final FakeResponse response = new FakeResponse();
private final LordnRequestInitializer lordnRequestInitializer = new LordnRequestInitializer(); private final LordnRequestInitializer lordnRequestInitializer =
new LordnRequestInitializer(Optional.of("attack"));
private final NordnVerifyAction action = new NordnVerifyAction(); private final NordnVerifyAction action = new NordnVerifyAction();
@Before @Before
@ -97,7 +98,6 @@ public class NordnVerifyActionTest {
when(fetchService.fetch(any(HTTPRequest.class))).thenReturn(httpResponse); when(fetchService.fetch(any(HTTPRequest.class))).thenReturn(httpResponse);
createTld("gtld"); createTld("gtld");
persistResource(Registry.get("gtld").asBuilder().setLordnUsername("lolcat").build()); persistResource(Registry.get("gtld").asBuilder().setLordnUsername("lolcat").build());
lordnRequestInitializer.marksdbLordnPassword = Optional.of("attack");
action.tld = "gtld"; action.tld = "gtld";
action.fetchService = fetchService; action.fetchService = fetchService;
action.lordnRequestInitializer = lordnRequestInitializer; action.lordnRequestInitializer = lordnRequestInitializer;
@ -125,7 +125,7 @@ public class NordnVerifyActionTest {
@Test @Test
public void testSuccess_noLordnPassword_doesntSetAuthorizationHeader() throws Exception { public void testSuccess_noLordnPassword_doesntSetAuthorizationHeader() throws Exception {
lordnRequestInitializer.marksdbLordnPassword = Optional.empty(); action.lordnRequestInitializer = new LordnRequestInitializer(Optional.empty());
action.run(); action.run();
assertThat(getHeaderFirst(getCapturedHttpRequest(), AUTHORIZATION)).isEmpty(); assertThat(getHeaderFirst(getCapturedHttpRequest(), AUTHORIZATION)).isEmpty();
} }