KevinMidboe/immich
1
0
Fork 0
mirror of https://github.com/KevinMidboe/immich.git synced 2025-10-29 17:40:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(server): handle invalid coordinates (#2648)

Browse Source
This commit is contained in:
Michel Heusschen
2023-06-02 18:29:12 +02:00
committed by GitHub
parent 9807f76aff
commit 1b301984dd
4 changed files with 76 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
server/apps/microservices/src/processors/metadata-extraction.processor.ts
View File

@@ -22,6 +22,7 @@ import fs from 'node:fs';
import sharp from 'sharp';
import { Repository } from 'typeorm/repository/Repository';
import { promisify } from 'util';
import { parseLatitude, parseLongitude } from '../utils/coordinates';
const ffprobe = promisify<string, FfprobeData>(ffmpeg.ffprobe);
@@ -174,8 +175,8 @@ export class MetadataExtractionProcessor {
// files MAY return an array of numbers instead.
const iso = getExifProperty('ISO');
newExif.iso = Array.isArray(iso) ? iso[0] : iso || null;
newExif.latitude = getExifProperty('GPSLatitude');
newExif.longitude = getExifProperty('GPSLongitude');
newExif.latitude = parseLatitude(getExifProperty('GPSLatitude'));
newExif.longitude = parseLongitude(getExifProperty('GPSLongitude'));
newExif.livePhotoCID = getExifProperty('MediaGroupUUID');
if (newExif.livePhotoCID && !asset.livePhotoVideoId) {
@@ -274,8 +275,8 @@ export class MetadataExtractionProcessor {
const match = location.match(locationRegex);
if (match?.length === 3) {
newExif.latitude = parseFloat(match[1]);
newExif.longitude = parseFloat(match[2]);
newExif.latitude = parseLatitude(match[1]);
newExif.longitude = parseLongitude(match[2]);
}
} else if (videoTags && videoTags['com.apple.quicktime.location.ISO6709']) {
const location = videoTags['com.apple.quicktime.location.ISO6709'] as string;
@@ -283,8 +284,8 @@ export class MetadataExtractionProcessor {
const match = location.match(locationRegex);
if (match?.length === 4) {
newExif.latitude = parseFloat(match[1]);
newExif.longitude = parseFloat(match[2]);
newExif.latitude = parseLatitude(match[1]);
newExif.longitude = parseLongitude(match[2]);
}
}

46
server/apps/microservices/src/utils/coordinates.spec.ts Normal file
View File

@@ -0,0 +1,46 @@
import { describe, it, expect } from '@jest/globals';
import { parseLatitude, parseLongitude } from './coordinates';
describe('parsing latitude from string input', () => {
it('returns null for invalid inputs', () => {
expect(parseLatitude('')).toBeNull();
expect(parseLatitude('NaN')).toBeNull();
expect(parseLatitude('Infinity')).toBeNull();
expect(parseLatitude('-Infinity')).toBeNull();
expect(parseLatitude('90.001')).toBeNull();
expect(parseLatitude('-90.000001')).toBeNull();
expect(parseLatitude('1000')).toBeNull();
expect(parseLatitude('-1000')).toBeNull();
});
it('returns the numeric coordinate for valid inputs', () => {
expect(parseLatitude('90')).toBeCloseTo(90);
expect(parseLatitude('-90')).toBeCloseTo(-90);
expect(parseLatitude('89.999999')).toBeCloseTo(89.999999);
expect(parseLatitude('-89.9')).toBeCloseTo(-89.9);
expect(parseLatitude('0')).toBeCloseTo(0);
expect(parseLatitude('-0.0')).toBeCloseTo(-0.0);
});
});
describe('parsing longitude from string input', () => {
it('returns null for invalid inputs', () => {
expect(parseLongitude('')).toBeNull();
expect(parseLongitude('NaN')).toBeNull();
expect(parseLongitude('Infinity')).toBeNull();
expect(parseLongitude('-Infinity')).toBeNull();
expect(parseLongitude('180.001')).toBeNull();
expect(parseLongitude('-180.000001')).toBeNull();
expect(parseLongitude('1000')).toBeNull();
expect(parseLongitude('-1000')).toBeNull();
});
it('returns the numeric coordinate for valid inputs', () => {
expect(parseLongitude('180')).toBeCloseTo(180);
expect(parseLongitude('-180')).toBeCloseTo(-180);
expect(parseLongitude('179.999999')).toBeCloseTo(179.999999);
expect(parseLongitude('-179.9')).toBeCloseTo(-179.9);
expect(parseLongitude('0')).toBeCloseTo(0);
expect(parseLongitude('-0.0')).toBeCloseTo(-0.0);
});
});

17
server/apps/microservices/src/utils/coordinates.ts Normal file
View File

@@ -0,0 +1,17 @@
export function parseLatitude(input: string): number | null {
const latitude = Number.parseFloat(input);
if (latitude < -90 || latitude > 90 || Number.isNaN(latitude)) {
return null;
}
return latitude;
}
export function parseLongitude(input: string): number | null {
const longitude = Number.parseFloat(input);
if (longitude < -180 || longitude > 180 || Number.isNaN(longitude)) {
return null;
}
return longitude;
}