secure mongo

Arquisoft · Dec 20, 2024 · 912e674 · 912e674
1 parent da5a45a
commit 912e674
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 21 deletions.
diff --git a/.env b/.env
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -203,8 +203,10 @@ jobs:
           key: ${{ secrets.DEPLOY_KEY }}
           command: |
             docker system prune --all --volumes --force
+            echo "teamname='wiq_7'" > .env
+            echo "MONGO_INITDB_ROOT_USERNAME=${{ secrets.MONGO_INITDB_ROOT_USERNAME }}" >> .env
+            echo "MONGO_INITDB_ROOT_PASSWORD=${{ secrets.MONGO_INITDB_ROOT_PASSWORD }}" >> .env
             wget https://raw.githubusercontent.com/arquisoft/wiq_7/master/docker-compose.yml -O docker-compose.yml
-            wget https://raw.githubusercontent.com/arquisoft/wiq_7/master/.env -O .env
             mkdir -p errors
             wget https://raw.githubusercontent.com/arquisoft/wiq_7/master/errors/customErrors.js -O errors/customErrors.js
             mkdir -p middleware

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 node_modules
 coverage
-docs/build
+docs/build
+.env
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3'
 services:
   mongodb:
     container_name: mongodb-${teamname:-defaultASW}
@@ -10,6 +9,9 @@ services:
       - '27017:27017'
     networks:
       - mynetwork
+    environment:
+      MONGO_INITDB_ROOT_USERNAME: ${MONGO_INITDB_ROOT_USERNAME}
+      MONGO_INITDB_ROOT_PASSWORD: ${MONGO_INITDB_ROOT_PASSWORD}
 
   authservice:
     container_name: authservice-${teamname:-defaultASW}
@@ -27,7 +29,7 @@ services:
     networks:
       - mynetwork
     environment:
-      MONGODB_USER: mongodb://mongodb:27017/userdb
+      MONGODB_USER: mongodb://${MONGO_INITDB_ROOT_USERNAME}:${MONGO_INITDB_ROOT_PASSWORD}@mongodb:27017/userdb?authSource=admin
 
   userservice:
     container_name: userservice-${teamname:-defaultASW}
@@ -45,7 +47,7 @@ services:
     networks:
       - mynetwork
     environment:
-      MONGODB_USER: mongodb://mongodb:27017/userdb
+      MONGODB_USER: mongodb://${MONGO_INITDB_ROOT_USERNAME}:${MONGO_INITDB_ROOT_PASSWORD}@mongodb:27017/userdb?authSource=admin
 
   questionservice:
     container_name: questionservice-${teamname:-defaultASW}
@@ -63,7 +65,7 @@ services:
     networks:
       - mynetwork
     environment:
-      MONGODB_QUESTION: mongodb://mongodb:27017/questiondb
+      MONGODB_QUESTION: mongodb://${MONGO_INITDB_ROOT_USERNAME}:${MONGO_INITDB_ROOT_PASSWORD}@mongodb:27017/questiondb?authSource=admin
 
   statservice:
     container_name: statservice-${teamname:-defaultASW}
@@ -81,7 +83,7 @@ services:
     networks:
       - mynetwork
     environment:
-      MONGODB_STAT: mongodb://mongodb:27017/statdb
+      MONGODB_STAT: mongodb://${MONGO_INITDB_ROOT_USERNAME}:${MONGO_INITDB_ROOT_PASSWORD}@mongodb:27017/statdb?authSource=admin
 
   gatewayservice:
     container_name: gatewayservice-${teamname:-defaultASW}

diff --git a/questionservice/question-service.js b/questionservice/question-service.js
@@ -10,9 +10,15 @@ const port = 8003;
 app.use(express.json());
 
 // Connect to MongoDB
-const mongoUri =
-  process.env.MONGODB_QUESTION || 'mongodb://localhost:27017/questiondb';
-mongoose.connect(mongoUri);
+const mongoUri = process.env.MONGODB_QUESTION;
+mongoose
+  .connect(mongoUri)
+  .then(() => {
+    console.log('Conexión exitosa a questionDB');
+  })
+  .catch((err) => {
+    console.error('Error de conexión a questionDB:', err);
+  });
 
 app.use('/', questionRouter);
 

diff --git a/statservice/stat-service.js b/statservice/stat-service.js
@@ -9,8 +9,15 @@ const port = 8004;
 app.use(express.json());
 
 // Connect to MongoDB
-const mongoUri = process.env.MONGODB_STAT || 'mongodb://localhost:27017/statdb';
-mongoose.connect(mongoUri);
+const mongoUri = process.env.MONGODB_STAT;
+mongoose
+  .connect(mongoUri)
+  .then(() => {
+    console.log('Conexión exitosa a statDB');
+  })
+  .catch((err) => {
+    console.error('Error de conexión a statDB:', err);
+  });
 
 app.use('/', statRouter);
 

diff --git a/users/authservice/auth-service.js b/users/authservice/auth-service.js
@@ -9,12 +9,18 @@ const port = 8002;
 app.use(express.json());
 
 // Connect to MongoDB
-const mongoUri = process.env.MONGODB_USER || 'mongodb://localhost:27017/userdb';
-
-console.log('auth service');
-console.log(mongoUri);
-
-mongoose.connect(mongoUri);
+const mongoUri = process.env.MONGODB_USER;
+mongoose
+  .connect(mongoUri, {
+    useNewUrlParser: true,
+    useUnifiedTopology: true,
+  })
+  .then(() => {
+    console.log('Conexión exitosa a userDB');
+  })
+  .catch((err) => {
+    console.error('Error de conexión a userDB:', err);
+  });
 
 // Route for user login
 app.use('/', authRouter);

diff --git a/users/userservice/user-service.js b/users/userservice/user-service.js
@@ -10,8 +10,15 @@ const port = 8001;
 app.use(express.json());
 
 // Connect to MongoDB
-const mongoUri = process.env.MONGODB_USER || 'mongodb://localhost:27017/userdb';
-mongoose.connect(mongoUri);
+const mongoUri = process.env.MONGODB_USER;
+mongoose
+  .connect(mongoUri)
+  .then(() => {
+    console.log('Conexión exitosa a userDB');
+  })
+  .catch((err) => {
+    console.error('Error de conexión a userDB:', err);
+  });
 
 // userRouter
 app.use('/', userRouter);