Dockery/Picsur
1
0
Fork 0
mirror of https://github.com/CaramelFur/Picsur.git synced 2026-05-07 03:27:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

change regex names

Browse Source
This commit is contained in:
rubikscraft
2022-04-16 17:09:01 +02:00
parent 9dd199a4e3
commit ff07ee94c6
8 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
shared/src/dto/api/info.dto.ts
View File

@@ -1,12 +1,12 @@
import { string, z } from 'zod';
import { SemVer } from '../../util/common-regex';
import { SemVerRegex } from '../../util/common-regex';
import { createZodDto } from '../../util/create-zod-dto';
import { IsStringList } from '../../validators/string-list.validator';
export const InfoResponseSchema = z.object({
production: z.boolean(),
demo: z.boolean(),
version: string().regex(SemVer),
version: string().regex(SemVerRegex),
});
export class InfoResponse extends createZodDto(InfoResponseSchema) {}

4
shared/src/entities/image.entity.ts
View File

@@ -1,10 +1,10 @@
import { z } from 'zod';
import { SHA256 } from '../util/common-regex';
import { SHA256Regex } from '../util/common-regex';
import { IsEntityID } from '../validators/entity-id.validator';
export const EImageSchema = z.object({
id: IsEntityID().optional(),
hash: z.string().regex(SHA256),
hash: z.string().regex(SHA256Regex),
data: z.undefined(),
mime: z.string(),
});

7
shared/src/util/common-regex.ts
View File

@@ -1,5 +1,6 @@
export const AlphaNumeric = /^[a-zA-Z0-9]+$/;
export const SHA256 = /^[a-f0-9A-F]{64}$/;
export const SemVer = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)$/;
export const AlphaNumericRegex = /^[a-zA-Z0-9]+$/;
export const SHA256Regex = /^[a-f0-9A-F]{64}$/;
export const SemVerRegex = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)$/;
export const URLRegex =
/((([A-Za-z]{3,9}:(?:\/\/)?)(?:[\-;:&=\+\$,\w]+@)?[A-Za-z0-9\.\-]+|(?:www\.|[\-;:&=\+\$,\w]+@)[A-Za-z0-9\.\-]+)((?:\/[\+~%\/\.\w\-_]*)?\??(?:[\-\+=&;%@\.\w_]*)#?(?:[\.\!\/\\\w]*))?)/;
export const UUIDRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;

4
shared/src/validators/role.validators.ts
View File

@@ -1,4 +1,4 @@
import { z } from 'zod';
import { AlphaNumeric } from '../util/common-regex';
import { AlphaNumericRegex } from '../util/common-regex';
export const IsRoleName = () => z.string().min(4).max(32).regex(AlphaNumeric);
export const IsRoleName = () => z.string().min(4).max(32).regex(AlphaNumericRegex);

4
shared/src/validators/user.validators.ts
View File

@@ -1,9 +1,9 @@
import { z } from 'zod';
import { AlphaNumeric } from '../util/common-regex';
import { AlphaNumericRegex } from '../util/common-regex';
// Match this with user validators in frontend
// (Frontend is not security focused, but it tells the user what is wrong)
export const IsUsername = () => z.string().min(4).max(32).regex(AlphaNumeric);
export const IsUsername = () => z.string().min(4).max(32).regex(AlphaNumericRegex);
export const IsPlainTextPwd = () => z.string().min(4).max(1024);