diff --git a/src/blobs.js b/src/blobs.js index ae40e936b..1152e6f45 100644 --- a/src/blobs.js +++ b/src/blobs.js @@ -13,8 +13,8 @@ exports = module.exports = { ACME_ACCOUNT_KEY: 'acme_account_key', ADDON_TURN_SECRET: 'addon_turn_secret', - SFTP_PUBLIC_KEY: 'sftp_public_key', - SFTP_PRIVATE_KEY: 'sftp_private_key', + SFTP_RSA_PUBLIC_KEY: 'sftp_public_key', + SFTP_RSA_PRIVATE_KEY: 'sftp_private_key', PROXY_AUTH_TOKEN_SECRET: 'proxy_auth_token_secret', CERT_PREFIX: 'cert', diff --git a/src/paths.js b/src/paths.js index 65de71b27..00c09eaba 100644 --- a/src/paths.js +++ b/src/paths.js @@ -47,8 +47,8 @@ exports = module.exports = { CIFS_CREDENTIALS_DIR: path.join(baseDir(), 'platformdata/cifs'), SSHFS_KEYS_DIR: path.join(baseDir(), 'platformdata/sshfs'), SFTP_KEYS_DIR: path.join(baseDir(), 'platformdata/sftp/ssh'), - SFTP_PUBLIC_KEY_FILE: path.join(baseDir(), 'platformdata/sftp/ssh/ssh_host_rsa_key.pub'), - SFTP_PRIVATE_KEY_FILE: path.join(baseDir(), 'platformdata/sftp/ssh/ssh_host_rsa_key'), + SFTP_RSA_PUBLIC_KEY_FILE: path.join(baseDir(), 'platformdata/sftp/ssh/ssh_host_rsa_key.pub'), + SFTP_RSA_PRIVATE_KEY_FILE: path.join(baseDir(), 'platformdata/sftp/ssh/ssh_host_rsa_key'), FIREWALL_BLOCKLIST_FILE: path.join(baseDir(), 'platformdata/firewall/blocklist.txt'), LDAP_ALLOWLIST_FILE: path.join(baseDir(), 'platformdata/firewall/ldap_allowlist.txt'), REVERSE_PROXY_REBUILD_FILE: path.join(baseDir(), 'platformdata/nginx/rebuild-needed'), diff --git a/src/sftp.js b/src/sftp.js index e4e94abb3..7f10ffa84 100644 --- a/src/sftp.js +++ b/src/sftp.js @@ -24,19 +24,19 @@ const apps = require('./apps.js'), volumes = require('./volumes.js'); async function ensureKeys() { - const sftpPrivateKey = await blobs.get(blobs.SFTP_PRIVATE_KEY); - const sftpPublicKey = await blobs.get(blobs.SFTP_PUBLIC_KEY); + const sftpRsaPrivateKey = await blobs.get(blobs.SFTP_RSA_PRIVATE_KEY); + const sftpRsaPublicKey = await blobs.get(blobs.SFTP_RSA_PUBLIC_KEY); - if (!sftpPrivateKey || !sftpPublicKey) { + if (!sftpRsaPrivateKey || !sftpRsaPublicKey) { debug('ensureSecrets: generating new sftp keys'); if (!safe.child_process.execSync(`ssh-keygen -m PEM -t rsa -f "${paths.SFTP_KEYS_DIR}/ssh_host_rsa_key" -q -N ""`)) throw new BoxError(BoxError.OPENSSL_ERROR, `Could not generate sftp ssh keys: ${safe.error.message}`); - const newSftpPublicKey = safe.fs.readFileSync(paths.SFTP_PUBLIC_KEY_FILE); - await blobs.set(blobs.SFTP_PUBLIC_KEY, newSftpPublicKey); - const newSftpPrivateKey = safe.fs.readFileSync(paths.SFTP_PRIVATE_KEY_FILE); - await blobs.set(blobs.SFTP_PRIVATE_KEY, newSftpPrivateKey); + const newSftpPublicKey = safe.fs.readFileSync(paths.SFTP_RSA_PUBLIC_KEY_FILE); + await blobs.set(blobs.SFTP_RSA_PUBLIC_KEY, newSftpPublicKey); + const newSftpPrivateKey = safe.fs.readFileSync(paths.SFTP_RSA_PRIVATE_KEY_FILE); + await blobs.set(blobs.SFTP_RSA_PRIVATE_KEY, newSftpPrivateKey); } else { - if (!safe.fs.writeFileSync(paths.SFTP_PUBLIC_KEY_FILE, sftpPublicKey)) throw new BoxError(BoxError.FS_ERROR, `Could not save sftp public key: ${safe.error.message}`); - if (!safe.fs.writeFileSync(paths.SFTP_PRIVATE_KEY_FILE, sftpPrivateKey, { mode: 0o600 })) throw new BoxError(BoxError.FS_ERROR, `Could not save sftp private key: ${safe.error.message}`); + if (!safe.fs.writeFileSync(paths.SFTP_RSA_PUBLIC_KEY_FILE, sftpRsaPublicKey)) throw new BoxError(BoxError.FS_ERROR, `Could not save sftp public key: ${safe.error.message}`); + if (!safe.fs.writeFileSync(paths.SFTP_RSA_PRIVATE_KEY_FILE, sftpRsaPrivateKey, { mode: 0o600 })) throw new BoxError(BoxError.FS_ERROR, `Could not save sftp private key: ${safe.error.message}`); } }