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

Rename DNL and SMDRL "login" to "loginAndPassword"

Browse Source 
They are passed around in the format username:password, whereas just saying
"login" implies it's just a username and not necessarily also a secret
password. Putting password in the variable name makes it obvious what this is
and reduces the likelihood of anyone ever logging it or otherwise using it
inappropriately.

Note that this does not require data migrations as the actual key used to store
the data in KMS remains unchanged.

This is a follow-up to []

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=231253964
This commit is contained in:
mcilwain
2019-01-28 11:13:15 -08:00
committed by Ben McIlwain
parent 0130f91830
commit f0c677b18b
17 changed files with 65 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
java/google/registry/keyring/api/InMemoryKeyring.java
View File

@@ -35,9 +35,9 @@ public final class InMemoryKeyring implements Keyring {
private final String rdeSshClientPrivateKey;
private final String icannReportingPassword;
private final String safeBrowsingAPIKey;
private final String marksdbDnlLogin;
private final String marksdbDnlLoginAndPassword;
private final String marksdbLordnPassword;
private final String marksdbSmdrlLogin;
private final String marksdbSmdrlLoginAndPassword;
private final String jsonCredential;
public InMemoryKeyring(
@@ -50,9 +50,9 @@ public final class InMemoryKeyring implements Keyring {
String rdeSshClientPrivateKey,
String icannReportingPassword,
String safeBrowsingAPIKey,
String marksdbDnlLogin,
String marksdbDnlLoginAndPassword,
String marksdbLordnPassword,
String marksdbSmdrlLogin,
String marksdbSmdrlLoginAndPassword,
String jsonCredential) {
checkArgument(PgpHelper.isSigningKey(rdeSigningKey.getPublicKey()),
"RDE signing key must support signing: %s", rdeSigningKey.getKeyID());
@@ -73,9 +73,11 @@ public final class InMemoryKeyring implements Keyring {
this.rdeSshClientPrivateKey = checkNotNull(rdeSshClientPrivateKey, "rdeSshClientPrivateKey");
this.icannReportingPassword = checkNotNull(icannReportingPassword, "icannReportingPassword");
this.safeBrowsingAPIKey = checkNotNull(safeBrowsingAPIKey, "safeBrowsingAPIKey");
this.marksdbDnlLogin = checkNotNull(marksdbDnlLogin, "marksdbDnlLogin");
this.marksdbDnlLoginAndPassword =
checkNotNull(marksdbDnlLoginAndPassword, "marksdbDnlLoginAndPassword");
this.marksdbLordnPassword = checkNotNull(marksdbLordnPassword, "marksdbLordnPassword");
this.marksdbSmdrlLogin = checkNotNull(marksdbSmdrlLogin, "marksdbSmdrlLogin");
this.marksdbSmdrlLoginAndPassword =
checkNotNull(marksdbSmdrlLoginAndPassword, "marksdbSmdrlLoginAndPassword");
this.jsonCredential = checkNotNull(jsonCredential, "jsonCredential");
}
@@ -130,8 +132,8 @@ public final class InMemoryKeyring implements Keyring {
}
@Override
public String getMarksdbDnlLogin() {
return marksdbDnlLogin;
public String getMarksdbDnlLoginAndPassword() {
return marksdbDnlLoginAndPassword;
}
@Override
@@ -140,8 +142,8 @@ public final class InMemoryKeyring implements Keyring {
}
@Override
public String getMarksdbSmdrlLogin() {
return marksdbSmdrlLogin;
public String getMarksdbSmdrlLoginAndPassword() {
return marksdbSmdrlLoginAndPassword;
}
@Override