Dockery/Picsur
1
0
Fork 0
mirror of https://github.com/CaramelFur/Picsur.git synced 2025-11-15 16:05:49 +01: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
backend/src/routes/image/imageid.validator.ts
View File

@@ -4,13 +4,13 @@ import {
Injectable, Injectable,
PipeTransform PipeTransform
} from '@nestjs/common'; } from '@nestjs/common';
import { SHA256 } from 'picsur-shared/dist/util/common-regex'; import { SHA256Regex } from 'picsur-shared/dist/util/common-regex';
@Injectable() @Injectable()
export class ImageIdValidator implements PipeTransform<string, string> { export class ImageIdValidator implements PipeTransform<string, string> {
transform(value: string, metadata: ArgumentMetadata): string { transform(value: string, metadata: ArgumentMetadata): string {
// Check regex for sha256 // Check regex for sha256
if (SHA256.test(value)) return value; if (SHA256Regex.test(value)) return value;
throw new BadRequestException('Invalid image id'); throw new BadRequestException('Invalid image id');
} }
} }

4
frontend/src/app/routes/view/view.component.ts
View File

@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router'; import { ActivatedRoute, Router } from '@angular/router';
import { ImageLinks } from 'picsur-shared/dist/dto/imagelinks.dto'; import { ImageLinks } from 'picsur-shared/dist/dto/imagelinks.dto';
import { HasFailed } from 'picsur-shared/dist/types'; import { HasFailed } from 'picsur-shared/dist/types';
import { SHA256 } from 'picsur-shared/dist/util/common-regex'; import { SHA256Regex } from 'picsur-shared/dist/util/common-regex';
import { ImageService } from 'src/app/services/api/image.service'; import { ImageService } from 'src/app/services/api/image.service';
import { UtilService } from 'src/app/util/util.service'; import { UtilService } from 'src/app/util/util.service';
@@ -23,7 +23,7 @@ export class ViewComponent implements OnInit {
async ngOnInit() { async ngOnInit() {
const params = this.route.snapshot.paramMap; const params = this.route.snapshot.paramMap;
const hash = params.get('hash') ?? ''; const hash = params.get('hash') ?? '';
if (!SHA256.test(hash)) { if (!SHA256Regex.test(hash)) {
return this.utilService.quitError('Invalid image link'); return this.utilService.quitError('Invalid image link');
} }

4
frontend/src/app/services/api/info.service.ts
View File

@@ -4,7 +4,7 @@ import {
AsyncFailable, AsyncFailable,
Fail, HasFailed Fail, HasFailed
} from 'picsur-shared/dist/types'; } from 'picsur-shared/dist/types';
import { SemVer } from 'picsur-shared/dist/util/common-regex'; import { SemVerRegex } from 'picsur-shared/dist/util/common-regex';
import { BehaviorSubject } from 'rxjs'; import { BehaviorSubject } from 'rxjs';
import { SnackBarType } from 'src/app/models/dto/snack-bar-type.dto'; import { SnackBarType } from 'src/app/models/dto/snack-bar-type.dto';
import { UtilService } from 'src/app/util/util.service'; import { UtilService } from 'src/app/util/util.service';
@@ -50,7 +50,7 @@ export class InfoService {
const serverVersion = info.version; const serverVersion = info.version;
const clientVersion = this.getFrontendVersion(); const clientVersion = this.getFrontendVersion();
if (!SemVer.test(serverVersion) || !SemVer.test(clientVersion)) { if (!SemVerRegex.test(serverVersion) || !SemVerRegex.test(clientVersion)) {
return Fail(`Not a valid semver: ${serverVersion} or ${clientVersion}`); return Fail(`Not a valid semver: ${serverVersion} or ${clientVersion}`);
} }

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

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

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

@@ -1,10 +1,10 @@
import { z } from 'zod'; import { z } from 'zod';
import { SHA256 } from '../util/common-regex'; import { SHA256Regex } from '../util/common-regex';
import { IsEntityID } from '../validators/entity-id.validator'; import { IsEntityID } from '../validators/entity-id.validator';
export const EImageSchema = z.object({ export const EImageSchema = z.object({
id: IsEntityID().optional(), id: IsEntityID().optional(),
hash: z.string().regex(SHA256), hash: z.string().regex(SHA256Regex),
data: z.undefined(), data: z.undefined(),
mime: z.string(), 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 AlphaNumericRegex = /^[a-zA-Z0-9]+$/;
export const SHA256 = /^[a-f0-9A-F]{64}$/; export const SHA256Regex = /^[a-f0-9A-F]{64}$/;
export const SemVer = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)$/; export const SemVerRegex = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)$/;
export const URLRegex = export const URLRegex =
/((([A-Za-z]{3,9}:(?:\/\/)?)(?:[\-;:&=\+\$,\w]+@)?[A-Za-z0-9\.\-]+|(?:www\.|[\-;:&=\+\$,\w]+@)[A-Za-z0-9\.\-]+)((?:\/[\+~%\/\.\w\-_]*)?\??(?:[\-\+=&;%@\.\w_]*)#?(?:[\.\!\/\\\w]*))?)/; /((([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 { 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 { z } from 'zod';
import { AlphaNumeric } from '../util/common-regex'; import { AlphaNumericRegex } from '../util/common-regex';
// Match this with user validators in frontend // Match this with user validators in frontend
// (Frontend is not security focused, but it tells the user what is wrong) // (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); export const IsPlainTextPwd = () => z.string().min(4).max(1024);