refactor actor validation to reduce code duplication
This commit is contained in:
parent
3dde7f25a6
commit
af967fe6be
6 changed files with 243 additions and 110 deletions
|
|
@ -16,6 +16,7 @@ import { HttpRequestService } from '@/core/HttpRequestService.js';
|
|||
import { LoggerService } from '@/core/LoggerService.js';
|
||||
import { UtilityService } from '@/core/UtilityService.js';
|
||||
import { IdService } from '@/core/IdService.js';
|
||||
import { EnvService } from '@/core/EnvService.js';
|
||||
import { DI } from '@/di-symbols.js';
|
||||
|
||||
function mockRedis() {
|
||||
|
|
@ -46,6 +47,7 @@ describe('FetchInstanceMetadataService', () => {
|
|||
LoggerService,
|
||||
UtilityService,
|
||||
IdService,
|
||||
EnvService,
|
||||
],
|
||||
})
|
||||
.useMocker((token) => {
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@ import type { IObject } from '@/core/activitypub/type.js';
|
|||
import type { EnvService } from '@/core/EnvService.js';
|
||||
import type { MiMeta } from '@/models/Meta.js';
|
||||
import type { Config } from '@/config.js';
|
||||
import type { LoggerService } from '@/core/LoggerService.js';
|
||||
import Logger from '@/logger.js';
|
||||
import { ApUtilityService } from '@/core/activitypub/ApUtilityService.js';
|
||||
import { UtilityService } from '@/core/UtilityService.js';
|
||||
|
||||
|
|
@ -36,7 +38,17 @@ describe(ApUtilityService, () => {
|
|||
|
||||
const utilityService = new UtilityService(config, meta, envService);
|
||||
|
||||
serviceUnderTest = new ApUtilityService(utilityService);
|
||||
const loggerService = {
|
||||
getLogger(domain: string) {
|
||||
const logger = new Logger(domain);
|
||||
Object.defineProperty(logger, 'log', {
|
||||
value: () => {},
|
||||
});
|
||||
return logger;
|
||||
},
|
||||
} as unknown as LoggerService;
|
||||
|
||||
serviceUnderTest = new ApUtilityService(utilityService, loggerService);
|
||||
});
|
||||
|
||||
describe('assertIdMatchesUrlAuthority', () => {
|
||||
|
|
@ -361,4 +373,102 @@ describe(ApUtilityService, () => {
|
|||
expect(result).toBe('http://example.com/1');
|
||||
});
|
||||
});
|
||||
|
||||
describe('sanitizeInlineObject', () => {
|
||||
it('should exclude nested arrays', () => {
|
||||
const input = {
|
||||
test: [[]] as unknown as string[],
|
||||
};
|
||||
|
||||
const result = serviceUnderTest.sanitizeInlineObject(input, 'test', 'https://example.com/actor', 'example.com');
|
||||
|
||||
expect(result).toBe(false);
|
||||
});
|
||||
|
||||
it('should exclude incorrect type', () => {
|
||||
const input = {
|
||||
test: 0 as unknown as string,
|
||||
};
|
||||
|
||||
const result = serviceUnderTest.sanitizeInlineObject(input, 'test', 'https://example.com/actor', 'example.com');
|
||||
|
||||
expect(result).toBe(false);
|
||||
});
|
||||
|
||||
it('should exclude missing ID', () => {
|
||||
const input = {
|
||||
test: {
|
||||
id: undefined,
|
||||
},
|
||||
};
|
||||
|
||||
const result = serviceUnderTest.sanitizeInlineObject(input, 'test', 'https://example.com/actor', 'example.com');
|
||||
|
||||
expect(result).toBe(false);
|
||||
});
|
||||
|
||||
it('should exclude wrong host', () => {
|
||||
const input = {
|
||||
test: 'https://wrong.com/object',
|
||||
};
|
||||
|
||||
const result = serviceUnderTest.sanitizeInlineObject(input, 'test', 'https://example.com/actor', 'example.com');
|
||||
|
||||
expect(result).toBe(false);
|
||||
});
|
||||
|
||||
it('should exclude invalid URLs', () => {
|
||||
const input = {
|
||||
test: 'https://user@example.com/object',
|
||||
};
|
||||
|
||||
const result = serviceUnderTest.sanitizeInlineObject(input, 'test', 'https://example.com/actor', 'example.com');
|
||||
|
||||
expect(result).toBe(false);
|
||||
});
|
||||
|
||||
it('should accept string', () => {
|
||||
const input = {
|
||||
test: 'https://example.com/object',
|
||||
};
|
||||
|
||||
const result = serviceUnderTest.sanitizeInlineObject(input, 'test', 'https://example.com/actor', 'example.com');
|
||||
|
||||
expect(result).toBe(true);
|
||||
});
|
||||
|
||||
it('should accept array of string', () => {
|
||||
const input = {
|
||||
test: ['https://example.com/object'],
|
||||
};
|
||||
|
||||
const result = serviceUnderTest.sanitizeInlineObject(input, 'test', 'https://example.com/actor', 'example.com');
|
||||
|
||||
expect(result).toBe(true);
|
||||
});
|
||||
|
||||
it('should accept object', () => {
|
||||
const input = {
|
||||
test: {
|
||||
id: 'https://example.com/object',
|
||||
},
|
||||
};
|
||||
|
||||
const result = serviceUnderTest.sanitizeInlineObject(input, 'test', 'https://example.com/actor', 'example.com');
|
||||
|
||||
expect(result).toBe(true);
|
||||
});
|
||||
|
||||
it('should accept array of object', () => {
|
||||
const input = {
|
||||
test: [{
|
||||
id: 'https://example.com/object',
|
||||
}],
|
||||
};
|
||||
|
||||
const result = serviceUnderTest.sanitizeInlineObject(input, 'test', 'https://example.com/actor', 'example.com');
|
||||
|
||||
expect(result).toBe(true);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue