From 4bb56e9f11b4720e9869ce787bfd4d8ad9d43eed Mon Sep 17 00:00:00 2001
From: Abhijna Raghavendra <a_raghavendra@ma.iitr.ac.in>
Date: Wed, 3 Apr 2024 22:44:47 +0530
Subject: [PATCH 01/10] feat: add admin panel support on backend

---
 src/backend/.env.sample |  3 ++-
 src/backend/db.ts       | 13 +++++++++----
 src/backend/main.ts     |  6 ++++--
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/backend/.env.sample b/src/backend/.env.sample
index 3070d10..547e5fa 100644
--- a/src/backend/.env.sample
+++ b/src/backend/.env.sample
@@ -5,4 +5,5 @@ GITLAB_OAUTH_CLIENT_SECRET=...
 MONGO_API_KEY=...
 MONGO_APP_ID=...
 SENTRY_DSN=...
-FRONTEND=...
\ No newline at end of file
+FRONTEND=...
+ADMIN_LIST=admin1|admin2
\ No newline at end of file
diff --git a/src/backend/db.ts b/src/backend/db.ts
index c5b4814..a50e02d 100644
--- a/src/backend/db.ts
+++ b/src/backend/db.ts
@@ -51,12 +51,13 @@ async function checkUser(accessToken: string, provider: string) {
 }
 
 // Get all content maps corresponding to user
-async function getMaps(author: string) {
+async function getMaps(author: string, ADMIN_LIST: string[]) {
+  const filter = ADMIN_LIST?.includes(author) ? {} : { "author": author };
   const query = {
     collection: "content_maps",
     database: DATABASE,
     dataSource: DATA_SOURCE,
-    filter: { "author": author },
+    filter: filter,
   };
   options.body = JSON.stringify(query);
   const resp = await fetch(MONGO_URLs.find.toString(), options);
@@ -96,12 +97,16 @@ async function addMaps(document: DfContentMap) {
 }
 
 // Delete content maps
-async function deleteMaps(document: DfContentMap) {
+async function deleteMaps(document: DfContentMap, ADMIN_LIST: string[]) {
+  const filter = JSON.parse(JSON.stringify(document));
+  if (ADMIN_LIST.includes(document.author)) {
+    delete filter.author;
+  }
   const query = {
     collection: "content_maps",
     database: DATABASE,
     dataSource: DATA_SOURCE,
-    filter: document,
+    filter: filter,
   };
   options.body = JSON.stringify(query);
 
diff --git a/src/backend/main.ts b/src/backend/main.ts
index 5dfc1ea..ca80438 100644
--- a/src/backend/main.ts
+++ b/src/backend/main.ts
@@ -3,6 +3,8 @@ import { addScript, deleteScript } from "./scripts.ts";
 import { checkJWT } from "./utils/jwt.ts";
 import { addMaps, deleteMaps, getMaps } from "./db.ts";
 
+const ADMIN_LIST = Deno.env.get("ADMIN_LIST")?.split("|");
+
 async function getSubdomains(ctx: Context) {
   const author = ctx.request.url.searchParams.get("user");
   const token = ctx.request.url.searchParams.get("token");
@@ -10,7 +12,7 @@ async function getSubdomains(ctx: Context) {
   if (author != await checkJWT(provider!, token!)) {
     ctx.throw(401);
   }
-  const data = await getMaps(author);
+  const data = await getMaps(author, ADMIN_LIST!);
   ctx.response.headers.set("Access-Control-Allow-Origin", "*");
   ctx.response.body = data.documents;
 }
@@ -80,7 +82,7 @@ async function deleteSubdomain(ctx: Context) {
   if (author != await checkJWT(provider, token)) {
     ctx.throw(401);
   }
-  const data = await deleteMaps(document);
+  const data = await deleteMaps(document, ADMIN_LIST!);
   if (data.deletedCount) {
     deleteScript(document);
     Sentry.captureMessage(

From ba5e2dccf9911f431494f717f96b25ac4bbc9d9f Mon Sep 17 00:00:00 2001
From: Abhijna Raghavendra <a_raghavendra@ma.iitr.ac.in>
Date: Wed, 3 Apr 2024 23:22:28 +0530
Subject: [PATCH 02/10] feat: add memory limit to container

---
 src/backend/.env.sample                |   3 +-
 src/backend/scripts.ts                 |   6 +-
 src/backend/shell_scripts/container.sh | 100 ++++++++-----------------
 3 files changed, 37 insertions(+), 72 deletions(-)

diff --git a/src/backend/.env.sample b/src/backend/.env.sample
index 547e5fa..012341a 100644
--- a/src/backend/.env.sample
+++ b/src/backend/.env.sample
@@ -6,4 +6,5 @@ MONGO_API_KEY=...
 MONGO_APP_ID=...
 SENTRY_DSN=...
 FRONTEND=...
-ADMIN_LIST=admin1|admin2
\ No newline at end of file
+ADMIN_LIST=admin1|admin2
+MEMORY_LIMIT=500m
\ No newline at end of file
diff --git a/src/backend/scripts.ts b/src/backend/scripts.ts
index 4bf4fdb..3687c46 100644
--- a/src/backend/scripts.ts
+++ b/src/backend/scripts.ts
@@ -2,6 +2,8 @@ import { exec } from "./dependencies.ts";
 import dockerize from "./utils/container.ts";
 import DfContentMap from "./types/maps_interface.ts";
 
+const MEMORY_LIMIT = Deno.env.get("MEMORY_LIMIT");
+
 async function addScript(
   document: DfContentMap,
   env_content: string,
@@ -21,14 +23,14 @@ async function addScript(
   } else if (document.resource_type === "GITHUB" && static_content == "Yes") {
     Deno.writeTextFile(`/hostpipe/.env`, env_content);
     await exec(
-      `bash -c "echo 'bash ../../src/backend/shell_scripts/container.sh -s ${document.subdomain} ${document.resource}' > /hostpipe/pipe"`,
+      `bash -c "echo 'bash ../../src/backend/shell_scripts/container.sh -s ${document.subdomain} ${document.resource} 80 ${MEMORY_LIMIT}' > /hostpipe/pipe"`,
     );
   } else if (document.resource_type === "GITHUB" && static_content == "No") {
     const dockerfile = dockerize(stack, port, build_cmds);
     Deno.writeTextFile(`/hostpipe/Dockerfile`, dockerfile);
     Deno.writeTextFile(`/hostpipe/.env`, env_content);
     await exec(
-      `bash -c "echo 'bash ../../src/backend/shell_scripts/container.sh -g ${document.subdomain} ${document.resource} ${port}' > /hostpipe/pipe"`,
+      `bash -c "echo 'bash ../../src/backend/shell_scripts/container.sh -g ${document.subdomain} ${document.resource} ${port} ${MEMORY_LIMIT}' > /hostpipe/pipe"`,
     );
   }
 }
diff --git a/src/backend/shell_scripts/container.sh b/src/backend/shell_scripts/container.sh
index 730460a..dc145b9 100644
--- a/src/backend/shell_scripts/container.sh
+++ b/src/backend/shell_scripts/container.sh
@@ -3,35 +3,9 @@ PORT_MAX=8099
 flag=$1
 name=$2
 resource=$3
-exp_port=$4 
-
-available_ports=()
-
-for ((port=PORT_MIN; port<=PORT_MAX; port++)); do
-    if ! ss -ln src :$port | grep -q "\<$port\>"; then
-        available_ports+=($port)
-    fi
-done
-
-echo "Available ports: ${available_ports[56]}"
-AVAILABLE=0
-if [ $flag = "-g" ]; then
-    echo "Creating subdomain $name"
-    git clone $resource $name
-    sudo cp Dockerfile $name/
-    sudo cp .env $name/
-    cd $name
-    sudo docker build -t $name .
-    echo ${available_ports[$AVAILABLE]};
-    sudo docker run --name=$name -d -p ${available_ports[$AVAILABLE]}:$exp_port $2
-    cd ..
-    sudo rm -rf $name
-    sudo rm Dockerfile
-    sudo rm .env
-
-    sudo touch /etc/nginx/sites-available/$2.conf
-    sudo chmod 666 /etc/nginx/sites-available/$2.conf
-    sudo echo "# Virtual Host configuration for example.com
+exp_port=$4
+max_mem=$5 
+server_block="# Virtual Host configuration for $2
     server {
     listen 80;
     listen [::]:80;
@@ -52,51 +26,39 @@ if [ $flag = "-g" ]; then
     ssl_certificate_key /etc/letsencrypt/live/df.mdgspace.org-0001/privkey.pem;
     include /etc/letsencrypt/options-ssl-nginx.conf;
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
-    }" > /etc/nginx/sites-available/$2.conf
-    sudo ln -s /etc/nginx/sites-available/$2.conf /etc/nginx/sites-enabled/$2.conf
-    sudo systemctl reload nginx
+    }"
+available_ports=()
+
+for ((port=PORT_MIN; port<=PORT_MAX; port++)); do
+    if ! ss -ln src :$port | grep -q "\<$port\>"; then
+        available_ports+=($port)
+    fi
+done
 
+echo "Available ports: ${available_ports[56]}"
+AVAILABLE=0
+echo "Creating subdomain $name"
+git clone $resource $name
+sudo cp .env $name/
+cd $name
+
+if [ $flag = "-g" ]; then
+    sudo cp ../Dockerfile ./
 else
-    echo "Creating subdomain $name"
-    git clone $resource $name
-    sudo cp .env $name/
-    cd $name
     sudo echo "
     FROM nginx:alpine
     COPY . /usr/share/nginx/html
     " > Dockerfile
-    sudo docker build -t $name .
-    sudo docker run --name=$name -d -p ${available_ports[$AVAILABLE]}:80 $name
-    cd ..
-    sudo rm .env
-    sudo rm -rf $name
-    sudo touch /etc/nginx/sites-available/$2.conf
-    sudo chmod 666 /etc/nginx/sites-available/$2.conf
-    sudo echo "# Virtual Host configuration for example.com
-  server {
-     listen 80;
-     listen [::]:80;
-     listen 443 ssl;
-     listen [::]:443 ssl;
-     server_name $2;
-     location / {
-        proxy_pass http://localhost:${available_ports[$AVAILABLE]};
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade \$http_upgrade;
-        proxy_set_header Connection 'upgrade';
-        proxy_set_header Host \$host;
-        proxy_cache_bypass \$http_upgrade;
-     }
-     charset utf-8;
-     client_max_body_size 20M;
-     ssl_certificate /etc/letsencrypt/live/df.mdgspace.org-0001/fullchain.pem;
-     ssl_certificate_key /etc/letsencrypt/live/df.mdgspace.org-0001/privkey.pem;
-     include /etc/letsencrypt/options-ssl-nginx.conf;
-     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
-     }" > /etc/nginx/sites-available/$2.conf;
-     sudo ln -s /etc/nginx/sites-available/$2.conf /etc/nginx/sites-enabled/$2.conf;
-     sudo systemctl reload nginx;
 fi
 
-
-
+sudo docker build -t $name .
+sudo docker run --memory=$max_mem --name=$name -d -p ${available_ports[$AVAILABLE]}:$exp_port $2
+cd ..
+sudo rm -rf $name
+sudo rm Dockerfile
+sudo rm .env
+sudo touch /etc/nginx/sites-available/$2.conf
+sudo chmod 666 /etc/nginx/sites-available/$2.conf
+sudo echo $server_block > /etc/nginx/sites-available/$2.conf
+sudo ln -s /etc/nginx/sites-available/$2.conf /etc/nginx/sites-enabled/$2.conf
+sudo systemctl reload nginx

From e21cacb65ab1c4330c8dce6d663f82030e54b40d Mon Sep 17 00:00:00 2001
From: Abhijna Raghavendra <a_raghavendra@ma.iitr.ac.in>
Date: Wed, 3 Apr 2024 23:39:27 +0530
Subject: [PATCH 03/10] rfac: fix server block indentation

---
 src/backend/shell_scripts/container.sh | 46 +++++++++++++-------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/backend/shell_scripts/container.sh b/src/backend/shell_scripts/container.sh
index dc145b9..b13a721 100644
--- a/src/backend/shell_scripts/container.sh
+++ b/src/backend/shell_scripts/container.sh
@@ -5,28 +5,7 @@ name=$2
 resource=$3
 exp_port=$4
 max_mem=$5 
-server_block="# Virtual Host configuration for $2
-    server {
-    listen 80;
-    listen [::]:80;
-    listen 443 ssl;
-    listen [::]:443 ssl;
-    server_name $2;
-    location / {
-        proxy_pass http://localhost:${available_ports[$AVAILABLE]};
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade \$http_upgrade;
-        proxy_set_header Connection 'upgrade';
-        proxy_set_header Host \$host;
-        proxy_cache_bypass \$http_upgrade;
-    }
-    charset utf-8;
-    client_max_body_size 20M;
-    ssl_certificate /etc/letsencrypt/live/df.mdgspace.org-0001/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/df.mdgspace.org-0001/privkey.pem;
-    include /etc/letsencrypt/options-ssl-nginx.conf;
-    ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
-    }"
+
 available_ports=()
 
 for ((port=PORT_MIN; port<=PORT_MAX; port++)); do
@@ -59,6 +38,27 @@ sudo rm Dockerfile
 sudo rm .env
 sudo touch /etc/nginx/sites-available/$2.conf
 sudo chmod 666 /etc/nginx/sites-available/$2.conf
-sudo echo $server_block > /etc/nginx/sites-available/$2.conf
+sudo echo "# Virtual Host configuration for $2
+    server {
+    listen 80;
+    listen [::]:80;
+    listen 443 ssl;
+    listen [::]:443 ssl;
+    server_name $2;
+    location / {
+        proxy_pass http://localhost:${available_ports[$AVAILABLE]};
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade \$http_upgrade;
+        proxy_set_header Connection 'upgrade';
+        proxy_set_header Host \$host;
+        proxy_cache_bypass \$http_upgrade;
+    }
+    charset utf-8;
+    client_max_body_size 20M;
+    ssl_certificate /etc/letsencrypt/live/df.mdgspace.org-0001/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/df.mdgspace.org-0001/privkey.pem;
+    include /etc/letsencrypt/options-ssl-nginx.conf;
+    ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
+    }" > /etc/nginx/sites-available/$2.conf
 sudo ln -s /etc/nginx/sites-available/$2.conf /etc/nginx/sites-enabled/$2.conf
 sudo systemctl reload nginx

From 8af6fcd141a7251977d1f03f1cd720d6c42725a5 Mon Sep 17 00:00:00 2001
From: Ubuntu <ubuntu@ip-10-0-102-153.ap-south-1.compute.internal>
Date: Fri, 5 Apr 2024 19:14:31 +0000
Subject: [PATCH 04/10] feat: dockerfile

---
 src/backend/main.ts                    |  3 +++
 src/backend/scripts.ts                 | 11 ++++++++++-
 src/backend/shell_scripts/container.sh |  4 ++--
 src/frontend/src/components/modal.vue  | 12 +++++++++++-
 src/frontend/src/utils/create.ts       |  2 ++
 5 files changed, 28 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 src/backend/shell_scripts/container.sh

diff --git a/src/backend/main.ts b/src/backend/main.ts
index ca80438..eca17ba 100644
--- a/src/backend/main.ts
+++ b/src/backend/main.ts
@@ -35,9 +35,11 @@ async function addSubdomain(ctx: Context) {
   delete document.provider;
   delete document.port;
   delete document.build_cmds;
+  delete document.dockerfile_present;
   delete document.stack;
   delete document.env_content;
   delete document.static_content;
+
   if (document.author != await checkJWT(provider, token)) {
     ctx.throw(401);
   }
@@ -49,6 +51,7 @@ async function addSubdomain(ctx: Context) {
       document,
       copy.env_content,
       copy.static_content,
+      copy.dockerfile_present,
       copy.stack,
       copy.port,
       copy.build_cmds,
diff --git a/src/backend/scripts.ts b/src/backend/scripts.ts
index 3687c46..fcdb711 100644
--- a/src/backend/scripts.ts
+++ b/src/backend/scripts.ts
@@ -8,6 +8,7 @@ async function addScript(
   document: DfContentMap,
   env_content: string,
   static_content: string,
+  dockerfile_present:string,
   stack: string,
   port: string,
   build_cmds: string,
@@ -26,12 +27,20 @@ async function addScript(
       `bash -c "echo 'bash ../../src/backend/shell_scripts/container.sh -s ${document.subdomain} ${document.resource} 80 ${MEMORY_LIMIT}' > /hostpipe/pipe"`,
     );
   } else if (document.resource_type === "GITHUB" && static_content == "No") {
-    const dockerfile = dockerize(stack, port, build_cmds);
+    if(dockerfile_present === 'No'){
+      const dockerfile = dockerize(stack, port, build_cmds);
     Deno.writeTextFile(`/hostpipe/Dockerfile`, dockerfile);
     Deno.writeTextFile(`/hostpipe/.env`, env_content);
     await exec(
       `bash -c "echo 'bash ../../src/backend/shell_scripts/container.sh -g ${document.subdomain} ${document.resource} ${port} ${MEMORY_LIMIT}' > /hostpipe/pipe"`,
     );
+    }else if(dockerfile_present === 'Yes'){
+      
+      await exec(
+        `bash -c "echo 'bash ../../src/backend/shell_scripts/container.sh -d ${document.subdomain} ${document.resource} ${port} ${MEMORY_LIMIT}' > /hostpipe/pipe"`,
+      );
+    }
+    
   }
 }
 
diff --git a/src/backend/shell_scripts/container.sh b/src/backend/shell_scripts/container.sh
old mode 100644
new mode 100755
index b13a721..f92dd11
--- a/src/backend/shell_scripts/container.sh
+++ b/src/backend/shell_scripts/container.sh
@@ -23,11 +23,11 @@ cd $name
 
 if [ $flag = "-g" ]; then
     sudo cp ../Dockerfile ./
-else
+elif [ $flag = "-s" ]; then
     sudo echo "
     FROM nginx:alpine
     COPY . /usr/share/nginx/html
-    " > Dockerfile
+    " > Dockerfile    
 fi
 
 sudo docker build -t $name .
diff --git a/src/frontend/src/components/modal.vue b/src/frontend/src/components/modal.vue
index e329174..b14052c 100644
--- a/src/frontend/src/components/modal.vue
+++ b/src/frontend/src/components/modal.vue
@@ -21,12 +21,21 @@
           <input name="radio" type="radio" value="No" v-model="static_content"> No
         </div>
         <div v-if="static_content === 'No'" class="stack-section">
+          <div class="docker-content">
+            <label for="dockerfile-content">Do you have dockerfile in your repo ?</label><br>
+            <input name="radio" type="radio" value="Yes" v-model="dockerfile_present"> Yes
+            <input name="radio" type="radio" value="No" v-model="dockerfile_present"> No
+          </div>
+          <div v-if="dockerfile_present === 'No'" class="dockerfile-section">
         <p>Stack:</p>
         <select class="dropdown" v-model="stack">
           <option v-for="option in stacks" :key="option">{{ option }}</option>
         </select>
+        </div>
         <p>Port:<br><input class="input-field" v-model="port" /></p>
+        <div v-if="dockerfile_present === 'No'" class="dockerfile-section">
         <p>Build Commands:<br><textarea class="textarea-field" cols="50" rows="10" v-model="build_cmds"></textarea></p>
+        </div>
       </div>
       </div>
       <div class="button-container">
@@ -48,6 +57,7 @@ export default {
       resource: '',
       env_content: 'key1 = value1', // Default prompt text
       static_content: 'No',
+      dockerfile_present :'No',
       port: '',
       stack: '',
       build_cmds: '',
@@ -58,7 +68,7 @@ export default {
   methods: {
     submitForm() {
       console.log(this.subdomain, this.resource_type, this.resource);
-      create(this.subdomain, this.resource_type, this.resource, this.env_content, this.static_content, this.port, this.stack, this.build_cmds)
+      create(this.subdomain, this.resource_type, this.resource, this.env_content, this.static_content,this.dockerfile_present,this.port, this.stack, this.build_cmds)
         .then((res) => {
           console.log(res);
           if (res === 'Submitted') {
diff --git a/src/frontend/src/utils/create.ts b/src/frontend/src/utils/create.ts
index 018b9d6..f6633bf 100644
--- a/src/frontend/src/utils/create.ts
+++ b/src/frontend/src/utils/create.ts
@@ -60,6 +60,7 @@ export async function create(
   resource: string,
   env_content: string,
   static_content: string,
+  dockerfile_present:string,
   port: string,
   stack: string,
   build_cmds: string,
@@ -85,6 +86,7 @@ export async function create(
     "resource": resource,
     "env_content": env_content,
     "static_content": static_content,
+    "dockerfile_present":dockerfile_present,
     "port": port,
     "build_cmds": build_cmds,
     "stack": stack,

From e6cf44637c15c9808cd3b5ad7e3200ba3a61d75b Mon Sep 17 00:00:00 2001
From: Abhijna Raghavendra <a_raghavendra@ma.iitr.ac.in>
Date: Tue, 9 Apr 2024 12:59:34 +0530
Subject: [PATCH 05/10] rfac: move domain name to env

---
 src/frontend/.env.sample              | 3 ++-
 src/frontend/src/components/modal.vue | 5 ++++-
 src/frontend/src/style.css            | 1 -
 src/frontend/src/utils/create.ts      | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/frontend/.env.sample b/src/frontend/.env.sample
index 5e4e420..7480e51 100644
--- a/src/frontend/.env.sample
+++ b/src/frontend/.env.sample
@@ -4,4 +4,5 @@ VITE_APP_GITHUB_OAUTH_REDIRECT_URL=.../login
 VITE_APP_GITLAB_OAUTH_CLIENT_ID=...
 VITE_APP_GITLAB_OAUTH_CLIENT_SECRET=...
 VITE_APP_GITLAB_OAUTH_REDIRECT_URL=.../login
-VITE_APP_BACKEND=...
\ No newline at end of file
+VITE_APP_BACKEND=...
+VITE_APP_DOMAIN=your-domain.com
\ No newline at end of file
diff --git a/src/frontend/src/components/modal.vue b/src/frontend/src/components/modal.vue
index b14052c..70f8f4f 100644
--- a/src/frontend/src/components/modal.vue
+++ b/src/frontend/src/components/modal.vue
@@ -1,3 +1,6 @@
+<script setup>
+const domain = import.meta.env.VITE_APP_DOMAIN
+</script>
 <template>
   <div class="modal-overlay">
     <div class="modal">
@@ -5,7 +8,7 @@
         <button class="close-button" @click="closeModal">X</button>
       </div>
       <h5>Enter the details for creating your subdomain:</h5>
-      <p>Subdomain:<br><input class="input-field" v-model="subdomain" />.df.mdgspace.org</p>
+      <p>Subdomain:<br><input class="input-field" v-model="subdomain" />.{{ domain }}</p>
       <p>Resource Type:<br>
         <select class="dropdown" v-model="resource_type">
           <option v-for="option in resourceTypes" :key="option">{{ option }}</option>
diff --git a/src/frontend/src/style.css b/src/frontend/src/style.css
index 3454b6d..75ca6d2 100644
--- a/src/frontend/src/style.css
+++ b/src/frontend/src/style.css
@@ -27,7 +27,6 @@ body {
 }
 
 #app {
-  max-width: 1280px;
   margin: 0 !important;
   padding: 0 !important;
   text-align: center;
diff --git a/src/frontend/src/utils/create.ts b/src/frontend/src/utils/create.ts
index f6633bf..f9b6d9a 100644
--- a/src/frontend/src/utils/create.ts
+++ b/src/frontend/src/utils/create.ts
@@ -79,9 +79,10 @@ export async function create(
     localStorage.getItem("provider")!,
   );
   const backend = import.meta.env.VITE_APP_BACKEND;
+  const domain = import.meta.env.VITE_APP_DOMAIN;
   const rootUrl = new URL(`${backend}/map`);
   const body = {
-    "subdomain": subdomain + ".df.mdgspace.org",
+    "subdomain": subdomain + "." + domain,
     "resource_type": resource_type,
     "resource": resource,
     "env_content": env_content,

From d8b7c75612ce32dad7245095da0a84a2a18be44d Mon Sep 17 00:00:00 2001
From: Abhijna Raghavendra <a_raghavendra@ma.iitr.ac.in>
Date: Tue, 16 Apr 2024 18:18:06 +0530
Subject: [PATCH 06/10] rfac: migrate to domains

---
 .github/workflows/github-actions-ec2.yaml |  2 +-
 docs/admin/README.md                      |  6 +++---
 src/backend/shell_scripts/automate.sh     | 14 +++++++++-----
 src/backend/shell_scripts/container.sh    |  4 ++--
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/github-actions-ec2.yaml b/.github/workflows/github-actions-ec2.yaml
index 1e97ba6..da6c6de 100644
--- a/.github/workflows/github-actions-ec2.yaml
+++ b/.github/workflows/github-actions-ec2.yaml
@@ -19,7 +19,7 @@ jobs:
           username: ${{ secrets.USERNAME }}
           key: ${{ secrets.EC2_SSH_KEY }}
           script: |
-            cd ~/project-domain-forge/domain-forge/docker
+            cd ~/domain-forge/docker
             docker compose down
             git pull origin master
             docker compose up -d --build            
diff --git a/docs/admin/README.md b/docs/admin/README.md
index 577eaae..046e45d 100644
--- a/docs/admin/README.md
+++ b/docs/admin/README.md
@@ -26,7 +26,7 @@ This step involves the configuration of three `.env` files:
     SENTRY_DSN=...
     ```
 - Frontend env:   
-      As suggested in the `.env.sample` present at the `src/frontend` directory, create a file named `.env` and copy the contents as shown, replacing *"..."* with the respective values for your registered github oauth application's **VITE_APP_GITHUB_OAUTH_CLIENT_ID** and **VITE_APP_GITHUB_OAUTH_CLIENT_SECRET**. For the **VITE_APP_GITHUB_OAUTH_REDIRECT_URL** enter the public url of the application's `/login` route. (Example: `http://df.mdgspace.org/login`). Also, add the port at which your backend is running in place of *"XXXX"*.
+      As suggested in the `.env.sample` present at the `src/frontend` directory, create a file named `.env` and copy the contents as shown, replacing *"..."* with the respective values for your registered github oauth application's **VITE_APP_GITHUB_OAUTH_CLIENT_ID** and **VITE_APP_GITHUB_OAUTH_CLIENT_SECRET**. For the **VITE_APP_GITHUB_OAUTH_REDIRECT_URL** enter the public url of the application's `/login` route. (Example: `https://domains.mdgspace.org/login`). Also, add the port at which your backend is running in place of *"XXXX"*.
     ```
     VITE_APP_GITHUB_OAUTH_CLIENT_ID=...
     VITE_APP_GITHUB_OAUTH_CLIENT_SECRET=...
@@ -61,6 +61,6 @@ Refer to [this](https://www.digitalocean.com/community/tutorials/how-to-set-up-n
 
 ### 6. Adding the DNS Records and Issue SSL Certificates
 
-Refer to [this](https://developers.cloudflare.com/dns/manage-dns-records/how-to/create-dns-records/) to add DNS records for *df.yourorgname.com* and also a wildcard DNS record for **.df.yourorgname.com*
+Refer to [this](https://developers.cloudflare.com/dns/manage-dns-records/how-to/create-dns-records/) to add DNS records for *domains.yourorgname.com* and also a wildcard DNS record for **.domains.yourorgname.com*
 
-You can use [letsencrypt](https://letsencrypt.org/) to issue SSL certificates for *df.yourorgname.com* and a wildcard SSL certificate for **.df.yourorgname.com*.
+You can use [letsencrypt](https://letsencrypt.org/) to issue SSL certificates for *domains.yourorgname.com* and a wildcard SSL certificate for **.domains.yourorgname.com*.
diff --git a/src/backend/shell_scripts/automate.sh b/src/backend/shell_scripts/automate.sh
index 9303d9c..48d9f14 100644
--- a/src/backend/shell_scripts/automate.sh
+++ b/src/backend/shell_scripts/automate.sh
@@ -2,6 +2,10 @@
 
 # This script takes in 3 command line arguments
 
+source "$parent_dir/..env"
+
+# Now you can use variables from your environment
+echo "Variable from parent directory: $SOME_VARIABLE"
 # Check if the number of arguments is correct
 id -u
 if [ "$#" -ne 3 ]; then
@@ -24,7 +28,7 @@ if [ "$arg1" = "-u" ]; then
       listen 80;
       listen [::]:80;
       listen 443 ssl;
-     listen [::]:443 ssl;
+      listen [::]:443 ssl;
       server_name $arg3;
      
       location / {
@@ -32,8 +36,8 @@ if [ "$arg1" = "-u" ]; then
       }
       charset utf-8;
       client_max_body_size 20M;
-      ssl_certificate /etc/letsencrypt/live/df.mdgspace.org-0001/fullchain.pem;
-      ssl_certificate_key /etc/letsencrypt/live/df.mdgspace.org-0001/privkey.pem;
+      ssl_certificate $FULLCHAIN_LOCATION;
+      ssl_certificate_key $PRIVKEY_LOCATION;
       include /etc/letsencrypt/options-ssl-nginx.conf;
       ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
    }" > /etc/nginx/sites-available/$arg3.conf;
@@ -62,8 +66,8 @@ elif [ "$arg1" = "-p" ]; then
      }
      charset utf-8;
      client_max_body_size 20M;
-     ssl_certificate /etc/letsencrypt/live/df.mdgspace.org-0001/fullchain.pem;
-     ssl_certificate_key /etc/letsencrypt/live/df.mdgspace.org-0001/privkey.pem;
+     ssl_certificate $FULLCHAIN_LOCATION;
+     ssl_certificate_key $PRIVKEY_LOCATION;
      include /etc/letsencrypt/options-ssl-nginx.conf;
      ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
      }" > /etc/nginx/sites-available/$arg3.conf;
diff --git a/src/backend/shell_scripts/container.sh b/src/backend/shell_scripts/container.sh
index f92dd11..bce5e89 100755
--- a/src/backend/shell_scripts/container.sh
+++ b/src/backend/shell_scripts/container.sh
@@ -55,8 +55,8 @@ sudo echo "# Virtual Host configuration for $2
     }
     charset utf-8;
     client_max_body_size 20M;
-    ssl_certificate /etc/letsencrypt/live/df.mdgspace.org-0001/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/df.mdgspace.org-0001/privkey.pem;
+    ssl_certificate $FULLCHAIN_LOCATION;
+    ssl_certificate_key $PRIVKEY_LOCATION;
     include /etc/letsencrypt/options-ssl-nginx.conf;
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
     }" > /etc/nginx/sites-available/$2.conf

From e336ad3be5c3631face4eb2309eeebd4af7997e0 Mon Sep 17 00:00:00 2001
From: Abhijna Raghavendra <a_raghavendra@ma.iitr.ac.in>
Date: Tue, 16 Apr 2024 18:45:11 +0530
Subject: [PATCH 07/10] fix: fix dockerfile bug

---
 src/backend/utils/container.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/backend/utils/container.ts b/src/backend/utils/container.ts
index f3b2d04..1e20d82 100644
--- a/src/backend/utils/container.ts
+++ b/src/backend/utils/container.ts
@@ -4,6 +4,7 @@ export default function dockerize(
   build_cmds: string,
 ) {
   let dockerfile = "";
+  build_cmds = build_cmds.replace(/\r?\n$/, '');
   const run_cmd = build_cmds.split("\n");
   const execute_cmd = "CMD " + JSON.stringify(run_cmd.pop()?.split(" "));
   const build_cmds_mapped = run_cmd.map((elem) => {
@@ -11,12 +12,12 @@ export default function dockerize(
   }).join("\n");
   if (stack == "Python") {
     dockerfile =
-      "FROM python:3.11 \nWORKDIR /app \nCOPY requirements.txt . \nRUN pip install --no-cache-dir -r requirements.txt \nCOPY . ." +
+      "FROM python:latest \nWORKDIR /app \nCOPY requirements.txt . \nRUN pip install --no-cache-dir -r requirements.txt \nCOPY . ." +
       build_cmds_mapped + `\nEXPOSE ${port}\n` + execute_cmd;
   } else if (stack == "NodeJS") {
     dockerfile =
-      "FROM node:latest \n WORKDIR /app \n COPY ./package*.json . \n RUN npm install \n COPY . ." +
-      build_cmds_mapped + `\n EXPOSE ${port} \n` + execute_cmd;
+      "FROM node:latest \nWORKDIR /app \nCOPY ./package*.json . \nRUN npm install \nCOPY . ." +
+      build_cmds_mapped + `\nEXPOSE ${port} \n` + execute_cmd;
   }
   return dockerfile.toString();
 }

From 03ea065e251408433998b9dbe88f9bb086f4bb7c Mon Sep 17 00:00:00 2001
From: Abhijna Raghavendra <a_raghavendra@ma.iitr.ac.in>
Date: Wed, 17 Apr 2024 12:13:40 +0530
Subject: [PATCH 08/10] fix: fix env issues

---
 src/backend/shell_scripts/automate.sh  | 5 ++---
 src/backend/shell_scripts/container.sh | 3 +++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/backend/shell_scripts/automate.sh b/src/backend/shell_scripts/automate.sh
index 48d9f14..cd66c0c 100644
--- a/src/backend/shell_scripts/automate.sh
+++ b/src/backend/shell_scripts/automate.sh
@@ -2,10 +2,9 @@
 
 # This script takes in 3 command line arguments
 
-source "$parent_dir/..env"
+FULLCHAIN_LOCATION=$(cat ../.env | grep FULLCHAIN_LOCATION= | cut -d '=' -f2)
+PRIVKEY_LOCATION=$(cat ../.env | grep PRIVKEY_LOCATION= | cut -d '=' -f2)
 
-# Now you can use variables from your environment
-echo "Variable from parent directory: $SOME_VARIABLE"
 # Check if the number of arguments is correct
 id -u
 if [ "$#" -ne 3 ]; then
diff --git a/src/backend/shell_scripts/container.sh b/src/backend/shell_scripts/container.sh
index bce5e89..6f3962f 100755
--- a/src/backend/shell_scripts/container.sh
+++ b/src/backend/shell_scripts/container.sh
@@ -6,6 +6,9 @@ resource=$3
 exp_port=$4
 max_mem=$5 
 
+FULLCHAIN_LOCATION=$(cat ../.env | grep FULLCHAIN_LOCATION= | cut -d '=' -f2)
+PRIVKEY_LOCATION=$(cat ../.env | grep PRIVKEY_LOCATION= | cut -d '=' -f2)
+
 available_ports=()
 
 for ((port=PORT_MIN; port<=PORT_MAX; port++)); do

From 35822748dd58503ba434510a81160f33d1ba4094 Mon Sep 17 00:00:00 2001
From: Abhijna Raghavendra <a_raghavendra@ma.iitr.ac.in>
Date: Wed, 17 Apr 2024 12:25:52 +0530
Subject: [PATCH 09/10] rfac: hardcode env

---
 src/backend/shell_scripts/automate.sh  | 7 ++-----
 src/backend/shell_scripts/container.sh | 7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/backend/shell_scripts/automate.sh b/src/backend/shell_scripts/automate.sh
index cd66c0c..1f68caf 100644
--- a/src/backend/shell_scripts/automate.sh
+++ b/src/backend/shell_scripts/automate.sh
@@ -2,9 +2,6 @@
 
 # This script takes in 3 command line arguments
 
-FULLCHAIN_LOCATION=$(cat ../.env | grep FULLCHAIN_LOCATION= | cut -d '=' -f2)
-PRIVKEY_LOCATION=$(cat ../.env | grep PRIVKEY_LOCATION= | cut -d '=' -f2)
-
 # Check if the number of arguments is correct
 id -u
 if [ "$#" -ne 3 ]; then
@@ -65,8 +62,8 @@ elif [ "$arg1" = "-p" ]; then
      }
      charset utf-8;
      client_max_body_size 20M;
-     ssl_certificate $FULLCHAIN_LOCATION;
-     ssl_certificate_key $PRIVKEY_LOCATION;
+     ssl_certificate /etc/letsencrypt/live/domains.mdgspace.org-0002/fullchain.pem;
+     ssl_certificate_key /etc/letsencrypt/live/domains.mdgspace.org-0002/privkey.pem;
      include /etc/letsencrypt/options-ssl-nginx.conf;
      ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
      }" > /etc/nginx/sites-available/$arg3.conf;
diff --git a/src/backend/shell_scripts/container.sh b/src/backend/shell_scripts/container.sh
index 6f3962f..68cdc73 100755
--- a/src/backend/shell_scripts/container.sh
+++ b/src/backend/shell_scripts/container.sh
@@ -6,9 +6,6 @@ resource=$3
 exp_port=$4
 max_mem=$5 
 
-FULLCHAIN_LOCATION=$(cat ../.env | grep FULLCHAIN_LOCATION= | cut -d '=' -f2)
-PRIVKEY_LOCATION=$(cat ../.env | grep PRIVKEY_LOCATION= | cut -d '=' -f2)
-
 available_ports=()
 
 for ((port=PORT_MIN; port<=PORT_MAX; port++)); do
@@ -58,8 +55,8 @@ sudo echo "# Virtual Host configuration for $2
     }
     charset utf-8;
     client_max_body_size 20M;
-    ssl_certificate $FULLCHAIN_LOCATION;
-    ssl_certificate_key $PRIVKEY_LOCATION;
+    ssl_certificate /etc/letsencrypt/live/domains.mdgspace.org-0002/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/domains.mdgspace.org-0002/privkey.pem;
     include /etc/letsencrypt/options-ssl-nginx.conf;
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
     }" > /etc/nginx/sites-available/$2.conf

From 86675a2c8bbda9ff112688b49b1ee9e7ba7ce230 Mon Sep 17 00:00:00 2001
From: Abhijna Raghavendra <a_raghavendra@ma.iitr.ac.in>
Date: Wed, 17 Apr 2024 12:30:02 +0530
Subject: [PATCH 10/10] fix: add hardcoding in url gen

---
 src/backend/shell_scripts/automate.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/backend/shell_scripts/automate.sh b/src/backend/shell_scripts/automate.sh
index 1f68caf..03c7bd2 100644
--- a/src/backend/shell_scripts/automate.sh
+++ b/src/backend/shell_scripts/automate.sh
@@ -32,8 +32,8 @@ if [ "$arg1" = "-u" ]; then
       }
       charset utf-8;
       client_max_body_size 20M;
-      ssl_certificate $FULLCHAIN_LOCATION;
-      ssl_certificate_key $PRIVKEY_LOCATION;
+      ssl_certificate /etc/letsencrypt/live/domains.mdgspace.org-0002/fullchain.pem;
+      ssl_certificate_key /etc/letsencrypt/live/domains.mdgspace.org-0002/privkey.pem;
       include /etc/letsencrypt/options-ssl-nginx.conf;
       ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
    }" > /etc/nginx/sites-available/$arg3.conf;