From 0c3674e445ef1da36f7bace5aa4b7b62bdc76d34 Mon Sep 17 00:00:00 2001 From: jkpe <16779171+jkpe@users.noreply.github.com> Date: Wed, 31 Jul 2024 09:02:52 +0100 Subject: [PATCH 1/7] chore: Update backend URL configuration --- client/src/backendUrl.ts | 4 ++-- server/ormconfig.js | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/client/src/backendUrl.ts b/client/src/backendUrl.ts index 0e7d8aa..2ff1a14 100644 --- a/client/src/backendUrl.ts +++ b/client/src/backendUrl.ts @@ -1,3 +1,3 @@ -const backendUrl = 'https://bugtracker-ad.herokuapp.com'; +const backendUrl = process.env.REACT_APP_BACKEND_URL || 'https://default-backend-url.com'; -export default backendUrl; +export default backendUrl; \ No newline at end of file diff --git a/server/ormconfig.js b/server/ormconfig.js index 751b7be..2cb14d4 100644 --- a/server/ormconfig.js +++ b/server/ormconfig.js @@ -10,6 +10,9 @@ module.exports = { url: process.env.DATABASE_URL || `${type}://${username}:${password}@${host}:${port}/${database}`, + ssl: { + rejectUnauthorized: false, + }, entities: [ process.env.NODE_ENV === 'test' ? 'src/entity/**/*.ts' @@ -28,4 +31,4 @@ module.exports = { }, synchronize: false, logging: false, -}; +}; \ No newline at end of file From 7878504ea56c938d2dc6ff1f83bcd93e30f565e3 Mon Sep 17 00:00:00 2001 From: jkpe <16779171+jkpe@users.noreply.github.com> Date: Wed, 31 Jul 2024 09:07:28 +0100 Subject: [PATCH 2/7] refactor: Update SSL configuration for database connection --- server/ormconfig.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/server/ormconfig.js b/server/ormconfig.js index 2cb14d4..8335318 100644 --- a/server/ormconfig.js +++ b/server/ormconfig.js @@ -4,15 +4,14 @@ const password = process.env.TYPEORM_PASSWORD || '9592'; const host = process.env.TYPEORM_HOST || 'localhost'; const port = parseInt(process.env.TYPEORM_PORT, 10) || 5432; const database = process.env.TYPEORM_DATABASE || 'bug_tracker'; +const sslCaCert = process.env.TYPEORM_SSL_CA_CERT || ''; module.exports = { type, url: process.env.DATABASE_URL || `${type}://${username}:${password}@${host}:${port}/${database}`, - ssl: { - rejectUnauthorized: false, - }, + ssl: sslCaCert ? { ca: sslCaCert } : false, // Add SSL configuration entities: [ process.env.NODE_ENV === 'test' ? 'src/entity/**/*.ts' From d0eec08310d354b4a2523c617d18cb726478c8d5 Mon Sep 17 00:00:00 2001 From: jkpe <16779171+jkpe@users.noreply.github.com> Date: Wed, 31 Jul 2024 09:17:17 +0100 Subject: [PATCH 3/7] chore: Update SSL configuration for database connection --- server/ormconfig.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/server/ormconfig.js b/server/ormconfig.js index 8335318..41c2ed9 100644 --- a/server/ormconfig.js +++ b/server/ormconfig.js @@ -4,14 +4,12 @@ const password = process.env.TYPEORM_PASSWORD || '9592'; const host = process.env.TYPEORM_HOST || 'localhost'; const port = parseInt(process.env.TYPEORM_PORT, 10) || 5432; const database = process.env.TYPEORM_DATABASE || 'bug_tracker'; -const sslCaCert = process.env.TYPEORM_SSL_CA_CERT || ''; module.exports = { type, url: process.env.DATABASE_URL || `${type}://${username}:${password}@${host}:${port}/${database}`, - ssl: sslCaCert ? { ca: sslCaCert } : false, // Add SSL configuration entities: [ process.env.NODE_ENV === 'test' ? 'src/entity/**/*.ts' @@ -30,4 +28,9 @@ module.exports = { }, synchronize: false, logging: false, + extra: { + ssl: { + rejectUnauthorized: false, // This disables SSL cert validation + }, + }, }; \ No newline at end of file From 88c46e76c8c59a6c28209c0d469f8939d617246c Mon Sep 17 00:00:00 2001 From: jkpe <16779171+jkpe@users.noreply.github.com> Date: Wed, 31 Jul 2024 09:19:12 +0100 Subject: [PATCH 4/7] chore: Update SSL configuration for database connection --- server/ormconfig.js | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/server/ormconfig.js b/server/ormconfig.js index 41c2ed9..04596d5 100644 --- a/server/ormconfig.js +++ b/server/ormconfig.js @@ -1,3 +1,5 @@ +const fs = require('fs'); + const type = process.env.TYPEORM_TYPE || 'postgres'; const username = process.env.TYPEORM_USERNAME || 'postgres'; const password = process.env.TYPEORM_PASSWORD || '9592'; @@ -5,6 +7,19 @@ const host = process.env.TYPEORM_HOST || 'localhost'; const port = parseInt(process.env.TYPEORM_PORT, 10) || 5432; const database = process.env.TYPEORM_DATABASE || 'bug_tracker'; +// Read CA cert from environment variable +const caCertPath = process.env.db.CA_CERT; +let caCert; + +if (caCertPath) { + try { + caCert = fs.readFileSync(caCertPath).toString(); + } catch (err) { + console.error(`Failed to read CA certificate at ${caCertPath}:`, err); + // Handle error appropriately (e.g., exit or fallback) + } +} + module.exports = { type, url: @@ -30,7 +45,8 @@ module.exports = { logging: false, extra: { ssl: { - rejectUnauthorized: false, // This disables SSL cert validation + rejectUnauthorized: false, // Disables SSL cert validation + ca: caCert, // Use CA cert from environment variable if available }, }, }; \ No newline at end of file From bdfdfeca3d67ab89433aa5013c35e42b32c0bc1c Mon Sep 17 00:00:00 2001 From: jkpe <16779171+jkpe@users.noreply.github.com> Date: Wed, 31 Jul 2024 09:21:08 +0100 Subject: [PATCH 5/7] chore: Update environment variable name for CA certificate path --- server/ormconfig.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/ormconfig.js b/server/ormconfig.js index 04596d5..717d61b 100644 --- a/server/ormconfig.js +++ b/server/ormconfig.js @@ -8,7 +8,7 @@ const port = parseInt(process.env.TYPEORM_PORT, 10) || 5432; const database = process.env.TYPEORM_DATABASE || 'bug_tracker'; // Read CA cert from environment variable -const caCertPath = process.env.db.CA_CERT; +const caCertPath = process.env.DB_CA_CERT; let caCert; if (caCertPath) { From e43d7a77b571f441cc4e3c5d8b04d2f307475e7c Mon Sep 17 00:00:00 2001 From: jkpe <16779171+jkpe@users.noreply.github.com> Date: Wed, 31 Jul 2024 09:22:34 +0100 Subject: [PATCH 6/7] chore: Refactor SSL configuration for database connection and update CA certificate path variable name --- server/ormconfig.js | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/server/ormconfig.js b/server/ormconfig.js index 717d61b..2722ff1 100644 --- a/server/ormconfig.js +++ b/server/ormconfig.js @@ -1,5 +1,3 @@ -const fs = require('fs'); - const type = process.env.TYPEORM_TYPE || 'postgres'; const username = process.env.TYPEORM_USERNAME || 'postgres'; const password = process.env.TYPEORM_PASSWORD || '9592'; @@ -7,19 +5,6 @@ const host = process.env.TYPEORM_HOST || 'localhost'; const port = parseInt(process.env.TYPEORM_PORT, 10) || 5432; const database = process.env.TYPEORM_DATABASE || 'bug_tracker'; -// Read CA cert from environment variable -const caCertPath = process.env.DB_CA_CERT; -let caCert; - -if (caCertPath) { - try { - caCert = fs.readFileSync(caCertPath).toString(); - } catch (err) { - console.error(`Failed to read CA certificate at ${caCertPath}:`, err); - // Handle error appropriately (e.g., exit or fallback) - } -} - module.exports = { type, url: @@ -46,7 +31,7 @@ module.exports = { extra: { ssl: { rejectUnauthorized: false, // Disables SSL cert validation - ca: caCert, // Use CA cert from environment variable if available + ca: process.env.DB_CA_CERT, // Read CA cert from environment variable }, }, }; \ No newline at end of file From 313ed1695f73062d78598ca7f55173152e86b72b Mon Sep 17 00:00:00 2001 From: jkpe <16779171+jkpe@users.noreply.github.com> Date: Wed, 31 Jul 2024 09:24:07 +0100 Subject: [PATCH 7/7] chore: Update server.ts to use HTTPS for database connection --- server/src/server.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/server.ts b/server/src/server.ts index a6e96c2..978b74c 100644 --- a/server/src/server.ts +++ b/server/src/server.ts @@ -1,5 +1,5 @@ import app from './app'; -import http from 'http'; +import http from 'https'; import { PORT } from './utils/config'; import { connectToDB } from './db';