Merge branch 'main' of github.com:immich-app/immich into workflow-ui

server/src/services/backup.service.spec.ts

@@ -153,6 +153,37 @@ describe(BackupService.name, () => {
       mocks.storage.createWriteStream.mockReturnValue(new PassThrough());
     });
 
+    it('should sanitize DB_URL (remove uselibpqcompat) before calling pg_dumpall', async () => {
+      // create a service instance with a URL connection that includes libpqcompat
+      const dbUrl = 'postgresql://postgres:pwd@host:5432/immich?sslmode=require&uselibpqcompat=true';
+      const configMock = {
+        getEnv: () => ({ database: { config: { connectionType: 'url', url: dbUrl }, skipMigrations: false } }),
+        getWorker: () => ImmichWorker.Api,
+        isDev: () => false,
+      } as unknown as any;
+
+      ({ sut, mocks } = newTestService(BackupService, { config: configMock }));
+
+      mocks.storage.readdir.mockResolvedValue([]);
+      mocks.process.spawn.mockReturnValue(mockSpawn(0, 'data', ''));
+      mocks.storage.rename.mockResolvedValue();
+      mocks.storage.unlink.mockResolvedValue();
+      mocks.systemMetadata.get.mockResolvedValue(systemConfigStub.backupEnabled);
+      mocks.storage.createWriteStream.mockReturnValue(new PassThrough());
+      mocks.database.getPostgresVersion.mockResolvedValue('14.10');
+
+      await sut.handleBackupDatabase();
+
+      expect(mocks.process.spawn).toHaveBeenCalled();
+      const call = mocks.process.spawn.mock.calls[0];
+      const args = call[1] as string[];
+      // ['--dbname', '<url>', '--clean', '--if-exists']
+      expect(args[0]).toBe('--dbname');
+      const passedUrl = args[1];
+      expect(passedUrl).not.toContain('uselibpqcompat');
+      expect(passedUrl).toContain('sslmode=require');
+    });
+
     it('should run a database backup successfully', async () => {
       const result = await sut.handleBackupDatabase();
       expect(result).toBe(JobStatus.Success);

server/src/services/backup.service.ts

@@ -81,8 +81,16 @@ export class BackupService extends BaseService {
 
     const isUrlConnection = config.connectionType === 'url';
 
+    let connectionUrl: string = isUrlConnection ? config.url : '';
+    if (URL.canParse(connectionUrl)) {
+      // remove known bad url parameters for pg_dumpall
+      const url = new URL(connectionUrl);
+      url.searchParams.delete('uselibpqcompat');
+      connectionUrl = url.toString();
+    }
+
     const databaseParams = isUrlConnection
-      ? ['--dbname', config.url]
+      ? ['--dbname', connectionUrl]
       : [
           '--username',
           config.username,
@@ -118,7 +126,7 @@ export class BackupService extends BaseService {
           {
             env: {
               PATH: process.env.PATH,
-              PGPASSWORD: isUrlConnection ? new URL(config.url).password : config.password,
+              PGPASSWORD: isUrlConnection ? new URL(connectionUrl).password : config.password,
             },
           },
         );