mirror of
https://github.com/google/nomulus.git
synced 2025-04-29 19:47:51 +02:00
Make RDE SSH key identity injectable
------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=133883090
This commit is contained in:
parent
28eeda189d
commit
2d46c7c27c
3 changed files with 16 additions and 1 deletions
|
@ -406,6 +406,18 @@ public final class ConfigModule {
|
|||
return Duration.standardHours(2);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the identity (an email address) used for the SSH keys used in RDE SFTP uploads.
|
||||
*
|
||||
* @see google.registry.keyring.api.Keyring#getRdeSshClientPublicKey()
|
||||
* @see google.registry.keyring.api.Keyring#getRdeSshClientPrivateKey()
|
||||
*/
|
||||
@Provides
|
||||
@Config("rdeSshIdentity")
|
||||
public static String provideSshIdentity() {
|
||||
return "rde@charlestonroadregistry.com";
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns SFTP URL containing a username, hostname, port (optional), and directory (optional) to
|
||||
* which cloud storage files are uploaded. The password should not be included, as it's better to
|
||||
|
|
|
@ -21,6 +21,7 @@ import com.jcraft.jsch.JSch;
|
|||
import com.jcraft.jsch.JSchException;
|
||||
import dagger.Module;
|
||||
import dagger.Provides;
|
||||
import google.registry.config.ConfigModule.Config;
|
||||
import google.registry.keyring.api.KeyModule.Key;
|
||||
|
||||
/** Dagger module for {@link JSch} which provides SSH/SFTP connectivity. */
|
||||
|
@ -29,13 +30,14 @@ public final class JSchModule {
|
|||
|
||||
@Provides
|
||||
static JSch provideJSch(
|
||||
@Config("rdeSshIdentity") String identity,
|
||||
@Key("rdeSshClientPrivateKey") String privateKey,
|
||||
@Key("rdeSshClientPublicKey") String publicKey) {
|
||||
applyAppEngineKludge();
|
||||
JSch jsch = new JSch();
|
||||
try {
|
||||
jsch.addIdentity(
|
||||
"rde@charlestonroadregistry.com",
|
||||
identity,
|
||||
privateKey.getBytes(UTF_8),
|
||||
publicKey.getBytes(UTF_8),
|
||||
null);
|
||||
|
|
|
@ -181,6 +181,7 @@ public class RdeUploadActionTest {
|
|||
action.ghostryde = new Ghostryde(BUFFER_SIZE);
|
||||
action.jsch =
|
||||
JSchModule.provideJSch(
|
||||
"user@ignored",
|
||||
keyring.getRdeSshClientPrivateKey(), keyring.getRdeSshClientPublicKey());
|
||||
action.jschSshSessionFactory = new JSchSshSessionFactory(standardSeconds(3));
|
||||
action.response = response;
|
||||
|
|
Loading…
Add table
Reference in a new issue