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

fix merge

Browse source
This commit is contained in:
Renan Bernordi 2025-11-17 00:52:58 -03:00
parent 6fc1ef8510
commit 9edb279c53
3 changed files with 93 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
app/client/components/create-repository-form.tsx
View file

@ -128,6 +128,7 @@ export const CreateRepositoryForm = ({
<SelectItem value="r2">Cloudflare R2</SelectItem> <SelectItem value="r2">Cloudflare R2</SelectItem>
<SelectItem value="gcs">Google Cloud Storage</SelectItem> <SelectItem value="gcs">Google Cloud Storage</SelectItem>
<SelectItem value="azure">Azure Blob Storage</SelectItem> <SelectItem value="azure">Azure Blob Storage</SelectItem>
<SelectItem value="sftp">SFTP</SelectItem>
<Tooltip> <Tooltip>
<TooltipTrigger> <TooltipTrigger>
<SelectItem disabled={!capabilities.rclone} value="rclone"> <SelectItem disabled={!capabilities.rclone} value="rclone">
@ -548,6 +549,81 @@ export const CreateRepositoryForm = ({
</> </>
))} ))}
{watchedBackend === "sftp" && (
<>
<FormField
control={form.control}
name="server"
render={({ field }) => (
<FormItem>
<FormLabel>Server</FormLabel>
<FormControl>
<Input placeholder="sftp.example.com" {...field} />
</FormControl>
<FormDescription>SFTP/SSH server hostname or IP address.</FormDescription>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name="port"
render={({ field }) => (
<FormItem>
<FormLabel>Port</FormLabel>
<FormControl>
<Input type="number" placeholder="22" {...field} />
</FormControl>
<FormDescription>SSH server port (default: 22).</FormDescription>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name="username"
render={({ field }) => (
<FormItem>
<FormLabel>Username</FormLabel>
<FormControl>
<Input placeholder="sftpuser" {...field} />
</FormControl>
<FormDescription>SSH account username.</FormDescription>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name="password"
render={({ field }) => (
<FormItem>
<FormLabel>Password</FormLabel>
<FormControl>
<Input type="password" placeholder="••••••••" {...field} />
</FormControl>
<FormDescription>SSH account password.</FormDescription>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name="path"
render={({ field }) => (
<FormItem>
<FormLabel>Path</FormLabel>
<FormControl>
<Input placeholder="/home/user/backups/repository" {...field} />
</FormControl>
<FormDescription>Remote path on the SFTP server where backups will be stored.</FormDescription>
<FormMessage />
</FormItem>
)}
/>
</>
)}
{mode === "update" && ( {mode === "update" && (
<Button type="submit" className="w-full" loading={loading}> <Button type="submit" className="w-full" loading={loading}>
Save Changes Save Changes

11
app/schemas/restic.ts
View file

@ -8,6 +8,7 @@ export const REPOSITORY_BACKENDS = {
azure: "azure", azure: "azure",
rclone: "rclone", rclone: "rclone",
rest: "rest", rest: "rest",
sftp: "sftp",
} as const; } as const;
export type RepositoryBackend = keyof typeof REPOSITORY_BACKENDS; export type RepositoryBackend = keyof typeof REPOSITORY_BACKENDS;
@ -68,12 +69,22 @@ export const restRepositoryConfigSchema = type({
path: "string?", path: "string?",
}).and(baseRepositoryConfigSchema); }).and(baseRepositoryConfigSchema);
export const sftpRepositoryConfigSchema = type({
backend: "'sftp'",
server: "string",
port: type("string.integer").or(type("number")).to("1 <= number <= 65536").default(22),
username: "string",
password: "string",
path: "string",
}).and(baseRepositoryConfigSchema);
export const repositoryConfigSchema = s3RepositoryConfigSchema export const repositoryConfigSchema = s3RepositoryConfigSchema
.or(r2RepositoryConfigSchema) .or(r2RepositoryConfigSchema)
.or(localRepositoryConfigSchema) .or(localRepositoryConfigSchema)
.or(gcsRepositoryConfigSchema) .or(gcsRepositoryConfigSchema)
.or(azureRepositoryConfigSchema) .or(azureRepositoryConfigSchema)
.or(rcloneRepositoryConfigSchema) .or(rcloneRepositoryConfigSchema)
.or(sftpRepositoryConfigSchema)
.or(restRepositoryConfigSchema); .or(restRepositoryConfigSchema);
export type RepositoryConfig = typeof repositoryConfigSchema.infer; export type RepositoryConfig = typeof repositoryConfigSchema.infer;

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

@ -139,11 +139,6 @@ const buildEnv = async (config: RepositoryConfig) => {
} }
break; break;
} }
case "sftp": {
const decryptedPassword = await cryptoUtils.decrypt(config.password);
const passwordFilePath = path.join("/tmp", `ironmount-sftp-pass-${crypto.randomBytes(8).toString("hex")}.txt`);
await fs.writeFile(passwordFilePath, decryptedPassword, { mode: 0o600 });
env.RESTIC_SFTP_PASSWORD_FILE = passwordFilePath;
case "rest": { case "rest": {
if (config.username) { if (config.username) {
env.RESTIC_REST_USERNAME = await cryptoUtils.decrypt(config.username); env.RESTIC_REST_USERNAME = await cryptoUtils.decrypt(config.username);
@ -151,6 +146,12 @@ const buildEnv = async (config: RepositoryConfig) => {
if (config.password) { if (config.password) {
env.RESTIC_REST_PASSWORD = await cryptoUtils.decrypt(config.password); env.RESTIC_REST_PASSWORD = await cryptoUtils.decrypt(config.password);
} }
}
case "sftp": {
const decryptedPassword = await cryptoUtils.decrypt(config.password);
const passwordFilePath = path.join("/tmp", `ironmount-sftp-pass-${crypto.randomBytes(8).toString("hex")}.txt`);
await fs.writeFile(passwordFilePath, decryptedPassword, { mode: 0o600 });
env.RESTIC_SFTP_PASSWORD_FILE = passwordFilePath;
break; break;
} }
} }