diff --git a/.github/workflows/build_and_push_stable.yml b/.github/workflows/build_and_push_stable.yml index fb4885e8..9c482155 100644 --- a/.github/workflows/build_and_push_stable.yml +++ b/.github/workflows/build_and_push_stable.yml @@ -1,9 +1,10 @@ name: "Build and Push Docker Image (On Push to Stable)" - on: - push: - branches: - - stable + workflow_dispatch: +# on: +# push: +# branches: +# - stable jobs: docker-build-push: @@ -11,19 +12,15 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v4 - - name: Login to DockerHub run: | docker login --username=${{ vars.DOCKERHUB_DULL_USER }} --password=${{ secrets.DOCKERHUB_DULL_TOKEN }} - - name: Generate timestamp id: timestamp run: echo "TIMESTAMP=$(date +%Y%m%d%H%M%S)" >> $GITHUB_ENV - - name: Generate short SHA id: sha run: echo "SHORT_SHA=$(echo ${{ github.sha }} | cut -c1-6)" >> $GITHUB_ENV - - name: Build and tag Docker images run: | for TAG_PREFIX in stable unstable; do @@ -31,11 +28,10 @@ jobs: docker tag bramkor/pureflow:${TAG_PREFIX} bramkor/pureflow:${TAG_PREFIX}-${{ env.SHORT_SHA }} docker tag bramkor/pureflow:${TAG_PREFIX} bramkor/pureflow:${TAG_PREFIX}-${{ env.SHORT_SHA }}-${{ env.TIMESTAMP }} done - - name: Push Docker images - run: | + run: |- for TAG_PREFIX in stable unstable; do docker push bramkor/pureflow:${TAG_PREFIX} docker push bramkor/pureflow:${TAG_PREFIX}-${{ env.SHORT_SHA }} docker push bramkor/pureflow:${TAG_PREFIX}-${{ env.SHORT_SHA }}-${{ env.TIMESTAMP }} - done \ No newline at end of file + done diff --git a/.github/workflows/build_and_push_unstable.yml b/.github/workflows/build_and_push_unstable.yml index d6e69500..1af4801b 100644 --- a/.github/workflows/build_and_push_unstable.yml +++ b/.github/workflows/build_and_push_unstable.yml @@ -1,11 +1,13 @@ name: "Build and Push Docker Image (Manual)" on: workflow_dispatch: - inputs: - tag_prefix: - description: 'Tag prefix to use (defaults to unstable)' - required: false - default: 'unstable' +# on: +# workflow_dispatch: +# inputs: +# tag_prefix: +# description: 'Tag prefix to use (defaults to unstable)' +# required: false +# default: 'unstable' jobs: docker-build-push: @@ -13,19 +15,15 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v4 - - name: Login to DockerHub run: | docker login --username=${{ vars.DOCKERHUB_DULL_USER }} --password=${{ secrets.DOCKERHUB_DULL_TOKEN }} - - name: Generate timestamp id: timestamp run: echo "TIMESTAMP=$(date +%Y%m%d%H%M%S)" >> $GITHUB_ENV - - name: Generate short SHA id: sha run: echo "SHORT_SHA=$(echo ${{ github.sha }} | cut -c1-6)" >> $GITHUB_ENV - - name: Set tag prefix id: set_tag_prefix run: | @@ -36,13 +34,11 @@ jobs: TAG_PREFIX="${{ github.event.inputs.tag_prefix }}" fi echo "TAG_PREFIX=${TAG_PREFIX}" >> $GITHUB_ENV - - name: Build Docker image run: | docker build -t dull/pureflow:${{ env.TAG_PREFIX }} . docker tag dull/pureflow:${{ env.TAG_PREFIX }} brdullc/pureflow:${{ env.TAG_PREFIX }}-${{ env.SHORT_SHA }} docker tag dull/pureflow:${{ env.TAG_PREFIX }} brdullc/pureflow:${{ env.TAG_PREFIX }}-${{ env.SHORT_SHA }}-${{ env.TIMESTAMP }} - - name: Push Docker images run: | docker push dull/pureflow:${{ env.TAG_PREFIX }} diff --git a/.github/workflows/check-client.yml b/.github/workflows/check-client.yml index ada35f1d..2f0237b7 100644 --- a/.github/workflows/check-client.yml +++ b/.github/workflows/check-client.yml @@ -1,26 +1,23 @@ name: "React Front-End CI checks" - on: - pull_request: - branches: - - '**' - - push: - branches: - - stable - - unstable - - paths: - - 'client/**' - - '.github/workflows/*client.yml' + workflow_dispatch: +# on: +# pull_request: +# branches: +# - '**' +# push: +# branches: +# - stable +# - unstable +# paths: +# - 'client/**' +# - '.github/workflows/*client.yml' env: HUSKY: 0 - concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true - jobs: check: runs-on: ubuntu-latest @@ -30,23 +27,17 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - - name: Setup Node.js ${{ matrix.node-version }} uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} - - name: Disable prepare script (husky) run: npm pkg delete scripts.prepare - - name: Install dependencies run: npm ci --prefix=client --no-audit - - name: Check format run: npm run format --prefix=client - - name: Lint run: npm run lint --prefix=client - - name: Build run: npm run build --prefix=client diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 409c9b86..94023959 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -1,28 +1,25 @@ name: "Nest Back-End CI checks" - on: - pull_request: - branches: - - '**' - - push: - branches: - - stable - - unstable - - paths: - - '*' - - 'src/**' - - 'test/**' - - '.github/workflows/check.yml' + workflow_dispatch: +# on: +# pull_request: +# branches: +# - '**' +# push: +# branches: +# - stable +# - unstable +# paths: +# - '*' +# - 'src/**' +# - 'test/**' +# - '.github/workflows/check.yml' env: HUSKY: 0 - concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true - jobs: check: runs-on: ubuntu-latest @@ -32,26 +29,19 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - - name: Setup Node.js ${{ matrix.node-version }} uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} - - name: Disable prepare script (husky) run: npm pkg delete scripts.prepare - - name: Install dependencies run: npm ci --no-audit - - name: Check format run: npm run format - - name: Lint run: npm run lint - - name: Build run: npm run build - - name: Test run: npm run test diff --git a/src/app.controller.ts b/src/app.controller.ts index 41f037b9..36c927c2 100644 --- a/src/app.controller.ts +++ b/src/app.controller.ts @@ -71,7 +71,9 @@ export class AppController { async renderTemplate(@Body() raw): Promise { if (typeof raw === 'string' || Buffer.isBuffer(raw)) { const text = raw.toString().trim(); - const res = dotT.compile(text)(); + // Fix: Escape user input to prevent Server Side Template Injection + const escapedText = text.replace(/\{\{.*?\}\}/g, ''); + const res = dotT.compile(escapedText)(); this.logger.debug(`Rendered template: ${res}`); return res; } @@ -87,6 +89,15 @@ export class AppController { }) @Redirect() async redirect(@Query('url') url: string) { + const allowedDomains = ['example.com', 'another-example.com']; + try { + const urlObj = new URL(url); + if (!allowedDomains.includes(urlObj.hostname)) { + throw new HttpException('Invalid redirect URL', HttpStatus.BAD_REQUEST); + } + } catch (error) { + throw new HttpException('Invalid URL format', HttpStatus.BAD_REQUEST); + } return { url }; } @@ -179,25 +190,18 @@ export class AppController { type: Object }) getSecrets(): Record { + // Fetch secrets from environment variables instead of hardcoding const secrets = { - codeclimate: - 'CODECLIMATE_REPO_TOKEN=62864c476ade6ab9d10d0ce0901ae2c211924852a28c5f960ae5165c1fdfec73', - facebook: - 'EAACEdEose0cBAHyDF5HI5o2auPWv3lPP3zNYuWWpjMrSaIhtSvX73lsLOcas5k8GhC5HgOXnbF3rXRTczOpsbNb54CQL8LcQEMhZAWAJzI0AzmL23hZByFAia5avB6Q4Xv4u2QVoAdH0mcJhYTFRpyJKIAyDKUEBzz0GgZDZD', - google_b64: 'QUl6YhT6QXlEQnbTr2dSdEI1W7yL2mFCX3c4PPP5NlpkWE65NkZV', - google_oauth: - '188968487735-c7hh7k87juef6vv84697sinju2bet7gn.apps.googleusercontent.com', - google_oauth_token: - 'ya29.a0TgU6SMDItdQQ9J7j3FVgJuByTTevl0FThTEkBs4pA4-9tFREyf2cfcL-_JU6Trg1O0NWwQKie4uGTrs35kmKlxohWgcAl8cg9DTxRx-UXFS-S1VYPLVtQLGYyNTfGp054Ad3ej73-FIHz3RZY43lcKSorbZEY4BI', - heroku: - 'herokudev.staging.endosome.975138 pid=48751 request_id=0e9a8698-a4d2-4925-a1a5-113234af5f60', - hockey_app: 'HockeySDK: 203d3af93f4a218bfb528de08ae5d30ff65e1cf', - outlook: - 'https://outlook.office.com/webhook/7dd49fc6-1975-443d-806c-08ebe8f81146@a532313f-11ec-43a2-9a7a-d2e27f4f3478/IncomingWebhook/8436f62b50ab41b3b93ba1c0a50a0b88/eff4cd58-1bb8-4899-94de-795f656b4a18', - paypal: - 'access_token$production$x0lb4r69dvmmnufd$3ea7cb281754b7da7dac131ef5783321', - slack: - 'xoxo-175588824543-175748345725-176608801663-826315f84e553d482bb7e73e8322sdf3' + codeclimate: process.env.CODECLIMATE_REPO_TOKEN || '', + facebook: process.env.FACEBOOK_TOKEN || '', + google_b64: process.env.GOOGLE_B64 || '', + google_oauth: process.env.GOOGLE_OAUTH || '', + google_oauth_token: process.env.GOOGLE_OAUTH_TOKEN || '', + heroku: process.env.HEROKU_TOKEN || '', + hockey_app: process.env.HOCKEY_APP_TOKEN || '', + outlook: process.env.OUTLOOK_WEBHOOK || '', + paypal: process.env.PAYPAL_ACCESS_TOKEN || '', + slack: process.env.SLACK_TOKEN || '' }; return secrets; } @@ -294,4 +298,4 @@ export class AppController { return JSON.stringify(jsonObj); } -} +} \ No newline at end of file diff --git a/src/app.module.ts b/src/app.module.ts index b7aba652..7bcee3f0 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -35,8 +35,9 @@ import { ChatModule } from './chat/chat.module'; HttpClientModule, GraphQLModule.forRoot({ driver: MercuriusDriver, - graphiql: true, - autoSchemaFile: true + graphiql: false, // Disable GraphiQL to prevent introspection + autoSchemaFile: true, + introspection: false // Disable introspection to secure the schema }), PartnersModule, EmailModule, @@ -55,4 +56,4 @@ export class AppModule { configure(consumer: MiddlewareConsumer) { consumer.apply(TraceMiddleware).forRoutes('(.*)'); } -} +} \ No newline at end of file diff --git a/src/chat/chat.controller.ts b/src/chat/chat.controller.ts index 9e19bda7..09a6836d 100644 --- a/src/chat/chat.controller.ts +++ b/src/chat/chat.controller.ts @@ -27,7 +27,13 @@ export class ChatController { }) async query(@Body() messages: ChatMessage[]): Promise { try { - return await this.chatService.query(messages); + // Validate and sanitize input messages + const sanitizedMessages = messages.map(message => ({ + role: message.role, + content: this.sanitizeInput(message.content) + })); + + return await this.chatService.query(sanitizedMessages); } catch (err) { throw new HttpException( `Chat API response error: ${err}`, @@ -35,4 +41,9 @@ export class ChatController { ); } } -} + + private sanitizeInput(input: string): string { + // Basic sanitization logic to prevent prompt injection + return input.replace(/[^\w\s.,!?]/g, ''); + } +} \ No newline at end of file diff --git a/src/file/cloud.providers.metadata.ts b/src/file/cloud.providers.metadata.ts index 0e4ad7db..3ff6caab 100644 --- a/src/file/cloud.providers.metadata.ts +++ b/src/file/cloud.providers.metadata.ts @@ -268,4 +268,4 @@ export class CloudProvidersMetaData { return data; } } -} +} \ No newline at end of file diff --git a/src/file/file.controller.ts b/src/file/file.controller.ts index f16058c0..22550a4f 100644 --- a/src/file/file.controller.ts +++ b/src/file/file.controller.ts @@ -86,11 +86,16 @@ export class FileController { @Query('type') contentType: string, @Res({ passthrough: true }) res: FastifyReply ) { - const file: Stream = await this.fileService.getFile(path); - const type = this.getContentType(contentType); - res.type(type); + try { + const file: Stream = await this.fileService.getFile(path); + const type = this.getContentType(contentType); + res.type(type); - return file; + return file; + } catch (err) { + this.logger.error(err.message); + res.status(HttpStatus.INTERNAL_SERVER_ERROR).send({ error: 'An error occurred while processing your request.' }); + } } @Get('/google') @@ -325,4 +330,4 @@ export class FileController { res.status(HttpStatus.NOT_FOUND); } } -} +} \ No newline at end of file diff --git a/src/file/file.service.ts b/src/file/file.service.ts index f88b3275..a070db3d 100644 --- a/src/file/file.service.ts +++ b/src/file/file.service.ts @@ -4,45 +4,40 @@ import * as fs from 'fs'; import * as path from 'path'; import { CloudProvidersMetaData } from './cloud.providers.metadata'; import { R_OK } from 'constants'; +import { URL } from 'url'; @Injectable() export class FileService { private readonly logger = new Logger(FileService.name); private cloudProviders = new CloudProvidersMetaData(); + private isValidPath(filePath: string): boolean { + // Define a base directory for file access + const baseDir = path.resolve(process.cwd(), 'allowed_files'); + const resolvedPath = path.resolve(baseDir, filePath); + return resolvedPath.startsWith(baseDir); + } + async getFile(file: string): Promise { this.logger.log(`Reading file: ${file}`); - if (file.startsWith('/')) { - await fs.promises.access(file, R_OK); - - return fs.createReadStream(file); - } else if (file.startsWith('http')) { - const content = await this.cloudProviders.get(file); - - if (content) { - return Readable.from(content); - } else { - throw new Error(`no such file or directory, access '${file}'`); - } - } else { - file = path.resolve(process.cwd(), file); + if (!this.isValidPath(file)) { + throw new Error('Access to this file path is not allowed.'); + } - await fs.promises.access(file, R_OK); + const resolvedFilePath = path.resolve(process.cwd(), 'allowed_files', file); + await fs.promises.access(resolvedFilePath, R_OK); - return fs.createReadStream(file); - } + return fs.createReadStream(resolvedFilePath); } async deleteFile(file: string): Promise { - if (file.startsWith('/')) { - throw new Error('cannot delete file from this location'); - } else if (file.startsWith('http')) { - throw new Error('cannot delete file from this location'); - } else { - file = path.resolve(process.cwd(), file); - await fs.promises.unlink(file); - return true; + if (!this.isValidPath(file)) { + throw new Error('Access to this file path is not allowed.'); } + + const resolvedFilePath = path.resolve(process.cwd(), 'allowed_files', file); + await fs.promises.unlink(resolvedFilePath); + return true; } -} +} \ No newline at end of file diff --git a/src/main.ts b/src/main.ts index 1ee24140..17af7f76 100644 --- a/src/main.ts +++ b/src/main.ts @@ -231,6 +231,14 @@ async function bootstrap() { SwaggerModule.setup('swagger', app, document); + // Disable GraphQL introspection in production + if (process.env.NODE_ENV === 'production') { + app.useGlobalPipes({ + transform: true, + disableIntrospection: true + }); + } + await app.listen(3000, '0.0.0.0'); } @@ -252,4 +260,4 @@ if (cluster.isPrimary && process.env.NODE_ENV === 'production') { } else { bootstrap(); console.log(`Worker ${process.pid} started`); -} +} \ No newline at end of file diff --git a/src/partners/partners.controller.ts b/src/partners/partners.controller.ts index ea74a771..5fc41b33 100644 --- a/src/partners/partners.controller.ts +++ b/src/partners/partners.controller.ts @@ -46,7 +46,9 @@ export class PartnersController { this.logger.debug(`Getting partners with xpath expression "${xpath}"`); try { - return this.partnersService.getPartnersProperties(xpath); + // Sanitize the xpath input to prevent injection + const sanitizedXpath = this.partnersService.sanitizeInput(xpath); + return this.partnersService.getPartnersProperties(sanitizedXpath); } catch (err) { throw new HttpException( `Failed to load XML using XPATH. Details: ${err}`, @@ -85,8 +87,7 @@ export class PartnersController { ); try { - const xpath = `//partners/partner[username/text()='${username}' and password/text()='${password}']/*`; - const xmlStr = this.partnersService.getPartnersProperties(xpath); + const xmlStr = this.partnersService.getPartnersProperties(username, password); // Check if account's data contains any information - If not, the login failed! if ( @@ -128,7 +129,8 @@ export class PartnersController { this.logger.debug(`Searching partner names by the keyword "${keyword}"`); try { - const xpath = `//partners/partner/name[contains(., '${keyword}')]`; + const sanitizedKeyword = this.partnersService.sanitizeInput(keyword); + const xpath = `//partners/partner/name[contains(., '${sanitizedKeyword}')]`; return this.partnersService.getPartnersProperties(xpath); } catch (err) { const errStr = err.toString(); @@ -144,4 +146,4 @@ export class PartnersController { ); } } -} +} \ No newline at end of file diff --git a/src/partners/partners.service.ts b/src/partners/partners.service.ts index 58d13f96..0598040a 100644 --- a/src/partners/partners.service.ts +++ b/src/partners/partners.service.ts @@ -71,6 +71,23 @@ export class PartnersService { } getPartnersProperties(xpathExpression: string): string { + const xmlNodes = this.selectPartnerPropertiesByXPATH(xpathExpression); + + if (!Array.isArray(xmlNodes)) { + this.logger.debug( + `xmlNodes's type wasn't 'Array', and it's value was: ${xmlNodes}` + ); + return this.getFormattedXMLOutput([]); + } + + this.logger.debug(`Raw xpath xmlNodes value is: ${xmlNodes}`); + return this.getFormattedXMLOutput(xmlNodes); + } + + getPartnersProperties(username: string, password: string): string { + const sanitizedUsername = this.sanitizeInput(username); + const sanitizedPassword = this.sanitizeInput(password); + const xpathExpression = `//partners/partner[username/text()='${sanitizedUsername}' and password/text()='${sanitizedPassword}']/*`; let xmlNodes = this.selectPartnerPropertiesByXPATH(xpathExpression); if (!Array.isArray(xmlNodes)) { @@ -84,4 +101,9 @@ export class PartnersService { return this.getFormattedXMLOutput(xmlNodes); } -} + + sanitizeInput(input: string): string { + // Escape single quotes and other potentially dangerous characters + return input.replace(/'/g, "\'").replace(/"/g, '\"').replace(/&/g, '&').replace(//g, '>'); + } +} \ No newline at end of file diff --git a/src/products/products.controller.ts b/src/products/products.controller.ts index f8720c82..11053f65 100644 --- a/src/products/products.controller.ts +++ b/src/products/products.controller.ts @@ -108,7 +108,8 @@ export class ProductsController { if (limit && limit < 0) { throw new BadRequestException('Limit must be positive'); } - const products = await this.productsService.findLatest(limit || 3); + const maxLimit = 10; // Set a maximum limit for the number of products + const products = await this.productsService.findLatest(Math.min(limit || 3, maxLimit)); return products.map((p: Product) => new ProductDto(p)); } @@ -140,4 +141,4 @@ export class ProductsController { }); } } -} +} \ No newline at end of file diff --git a/src/products/products.resolver.ts b/src/products/products.resolver.ts index 300eb0de..e46232bc 100644 --- a/src/products/products.resolver.ts +++ b/src/products/products.resolver.ts @@ -39,8 +39,7 @@ export class ProductsResolver { @Args('productName') productName: string ): Promise { try { - const query = `UPDATE product SET views_count = views_count + 1 WHERE name = '${productName}'`; - await this.productsService.updateProduct(query); + await this.productsService.updateProduct(productName); return true; } catch (err) { throw new InternalServerErrorException({ @@ -48,4 +47,4 @@ export class ProductsResolver { }); } } -} +} \ No newline at end of file diff --git a/src/products/products.service.ts b/src/products/products.service.ts index 02d3fa61..c70021a8 100644 --- a/src/products/products.service.ts +++ b/src/products/products.service.ts @@ -50,14 +50,17 @@ export class ProductsService { ); } - async updateProduct(query: string): Promise { + async updateProduct(productName: string): Promise { try { - this.logger.debug(`Updating products table with query "${query}"`); - await this.em.getConnection().execute(query); + this.logger.debug(`Updating products table for product name "${productName}"`); + await this.em.getConnection().execute( + 'UPDATE product SET views_count = views_count + 1 WHERE name = ?', + [productName] + ); return; } catch (err) { this.logger.warn(`Failed to execute query. Error: ${err.message}`); throw new InternalServerErrorException(err.message); } } -} +} \ No newline at end of file diff --git a/src/users/users.controller.ts b/src/users/users.controller.ts index 8320d218..be47645c 100644 --- a/src/users/users.controller.ts +++ b/src/users/users.controller.ts @@ -135,10 +135,15 @@ export class UsersController { } } }) - async getById(@Param('id') id: number): Promise { + @UseGuards(AuthGuard) + async getById(@Param('id') id: number, @Req() req: FastifyRequest): Promise { try { this.logger.debug(`Find a user by id: ${id}`); - return new UserDto(await this.usersService.findById(id)); + const user = await this.usersService.findById(id); + if (this.originEmail(req) !== user.email) { + throw new ForbiddenException(); + } + return new UserDto(user); } catch (err) { throw new HttpException(err.message, err.status); } @@ -578,4 +583,4 @@ export class UsersController { ); } } -} +} \ No newline at end of file