danvics/zerobyte
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

refactor: make default value for skip host key check to false

Browse source
This commit is contained in:
Nicolas Meienberger 2025-12-28 13:31:17 +01:00
parent 8c243a0280
commit 2bee6c0751
6 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/client/modules/repositories/components/create-repository-form.tsx
View file

@ -58,7 +58,7 @@ const defaultValuesForType = {
azure: { backend: "azure" as const, compressionMode: "auto" as const }, azure: { backend: "azure" as const, compressionMode: "auto" as const },
rclone: { backend: "rclone" as const, compressionMode: "auto" as const }, rclone: { backend: "rclone" as const, compressionMode: "auto" as const },
rest: { backend: "rest" as const, compressionMode: "auto" as const }, rest: { backend: "rest" as const, compressionMode: "auto" as const },
sftp: { backend: "sftp" as const, compressionMode: "auto" as const, port: 22, skipHostKeyCheck: true }, sftp: { backend: "sftp" as const, compressionMode: "auto" as const, port: 22, skipHostKeyCheck: false },
}; };
export const CreateRepositoryForm = ({ export const CreateRepositoryForm = ({

1
app/client/modules/repositories/components/repository-forms/sftp-repository-form.tsx
View file

@ -100,7 +100,6 @@ export const SftpRepositoryForm = ({ form }: Props) => {
<FormField <FormField
control={form.control} control={form.control}
name="skipHostKeyCheck" name="skipHostKeyCheck"
defaultValue={true}
render={({ field }) => ( render={({ field }) => (
<FormItem className="flex flex-row items-center justify-between rounded-lg border p-3 shadow-sm"> <FormItem className="flex flex-row items-center justify-between rounded-lg border p-3 shadow-sm">
<div className="space-y-0.5"> <div className="space-y-0.5">

2
app/client/modules/volumes/components/create-volume-form.tsx
View file

@ -46,7 +46,7 @@ const defaultValuesForType = {
smb: { backend: "smb" as const, port: 445, vers: "3.0" as const }, smb: { backend: "smb" as const, port: 445, vers: "3.0" as const },
webdav: { backend: "webdav" as const, port: 80, ssl: false, path: "/webdav" }, webdav: { backend: "webdav" as const, port: 80, ssl: false, path: "/webdav" },
rclone: { backend: "rclone" as const, path: "/" }, rclone: { backend: "rclone" as const, path: "/" },
sftp: { backend: "sftp" as const, port: 22, path: "/", skipHostKeyCheck: true }, sftp: { backend: "sftp" as const, port: 22, path: "/", skipHostKeyCheck: false },
}; };
export const CreateVolumeForm = ({ onSubmit, mode = "create", initialValues, formId, loading, className }: Props) => { export const CreateVolumeForm = ({ onSubmit, mode = "create", initialValues, formId, loading, className }: Props) => {

1
app/client/modules/volumes/components/volume-forms/sftp-form.tsx
View file

@ -118,7 +118,6 @@ export const SFTPForm = ({ form }: Props) => {
<FormField <FormField
control={form.control} control={form.control}
name="skipHostKeyCheck" name="skipHostKeyCheck"
defaultValue={true}
render={({ field }) => ( render={({ field }) => (
<FormItem className="flex flex-row items-center justify-between rounded-lg border p-3 shadow-sm"> <FormItem className="flex flex-row items-center justify-between rounded-lg border p-3 shadow-sm">
<div className="space-y-0.5"> <div className="space-y-0.5">

2
app/server/modules/backends/sftp/sftp-backend.ts
View file

@ -60,7 +60,7 @@ const mount = async (config: BackendConfig, mountPath: string) => {
"gid=1000", "gid=1000",
]; ];
if (config.skipHostKeyCheck) { if (config.skipHostKeyCheck || !config.knownHosts) {
options.push("StrictHostKeyChecking=no", "UserKnownHostsFile=/dev/null"); options.push("StrictHostKeyChecking=no", "UserKnownHostsFile=/dev/null");
} else if (config.knownHosts) { } else if (config.knownHosts) {
const knownHostsPath = getKnownHostsPath(mountPath); const knownHostsPath = getKnownHostsPath(mountPath);

2
app/server/utils/restic.ts
View file

@ -186,7 +186,7 @@ export const buildEnv = async (config: RepositoryConfig) => {
keyPath, keyPath,
]; ];
if (config.skipHostKeyCheck) { if (config.skipHostKeyCheck || !config.knownHosts) {
sshArgs.push("-o", "StrictHostKeyChecking=no", "-o", "UserKnownHostsFile=/dev/null"); sshArgs.push("-o", "StrictHostKeyChecking=no", "-o", "UserKnownHostsFile=/dev/null");
} else if (config.knownHosts) { } else if (config.knownHosts) {
const knownHostsPath = path.join("/tmp", `zerobyte-known-hosts-${crypto.randomBytes(8).toString("hex")}`); const knownHostsPath = path.join("/tmp", `zerobyte-known-hosts-${crypto.randomBytes(8).toString("hex")}`);