Merge pull request #173 from Arquisoft/develop

Trying to deploy using https

.github/workflows/lomap_es2c.yml

@@ -37,12 +37,6 @@ jobs:
             - uses: actions/setup-node@v3
               with:
                 node-version: 18
-            - name: Create env
-              run: |
-                cd restapi
-                touch .env
-                echo DATABASE_URL=${{ secrets.DATABASE_URL }} >> .env
-                cat .env
             - run: npm --prefix webapp install
             - run: npm --prefix restapi install
             - run: npm --prefix webapp run build
@@ -56,7 +50,7 @@ jobs:
             - name: Publish to Registry
               uses: elgohr/Publish-Docker-Github-Action@v5
               env:
-                API_URI: http://${{ secrets.DEPLOY_HOST }}:5000/api
+                API_URI: https://${{ secrets.DEPLOY_HOST }}:5000/api
               with:
                 name: arquisoft/lomap_es2c/webapp
                 username: ${{ github.actor }}
@@ -67,7 +61,8 @@ jobs:
     docker-push-restapi:
         name: Push restapi Docker Image to GitHub Packages
         env:
-            DATABASE_USER: ${{ secrets.DATABASE_URL }}
+            SSL_CERT: ${{ secrets.SSL_CERT }}
+            SSL_PRIVKEY: ${{ secrets.SSL_PRIVKEY }}
         runs-on: ubuntu-latest
         needs: [e2e-tests]
         steps:
@@ -80,7 +75,7 @@ jobs:
                 password: ${{ secrets.DOCKER_PUSH_TOKEN }}
                 registry: ghcr.io
                 workdir: restapi
-                buildargs: DATABASE_URL
+                buildargs: SSL_CERT,SSL_PRIVKEY
     deploy:
         name: Deploy over SSH
         runs-on: ubuntu-latest

.gitignore

@@ -27,8 +27,4 @@ yarn-error.log*
 .vscode
 
 #documentation build does not go into master
-docs/build
-
-restapi/.env
-webapp/lomapes2c.eastus.cloudapp.azure.com.key
-webapp/lomapes2c.eastus.cloudapp.azure.com.crt
+docs/build

docker-compose-deploy.yml

@@ -3,7 +3,7 @@ services:
   restapi:
     image: ghcr.io/arquisoft/lomap_es2c/restapi:latest
     ports:
-      - "5000:5000"
+      - "5001:5001"
   webapp:
     image: ghcr.io/arquisoft/lomap_es2c/webapp:latest
     ports:

docker-compose.yml

@@ -6,7 +6,7 @@ services:
   restapi:
     build: ./restapi
     ports:
-      - "5000:5000"
+      - "5001:5001"
   webapp:
     build: ./webapp
     ports:

docs/11_technical_risks.adoc

@@ -29,6 +29,8 @@ List of risks and/or technical debts, probably including suggested measures to m
 
 === Technical Debts
 
-Al comienzo del proyecto es difícil especificar alguna duda técnica. No conocemos de antemano cuál será el resultado y final y que herramientas o tecnologías vamos a utilizar finalmente. Guiados por la intención de desarrollar el proyecto con las utilidades ya mencionadas la única duda en este punto es la dependencia de nuestra aplicación con servicios externos a nosotros (APIs) y de imposible control por nuestra parte. 
+ * La principal duda técnica es la dependencia de Inrupt. Durante el desarrollo del trabajo hemos detectado mucha inestabilidad en sus servicios. En ocasiones tiene tiempos de respuesta muy altosmás, es una API en desarrollo por lo que no podemos asegurar que sea perfectamente fucnional o que vaya a cambiar significativamente en el futuro y nuestra aplicación deje de funcionar.
+ * La interoperabilidad nos genera muchas dudas debido a que ni si quiera se ha alcanzado un acuerdo firme. Se han tomado decisiones sin meditación a su respecto y puede generar problemas. Consideramos que el estandar de LoMap no ha tenido suficiente tiempo de desarrollo como para ser óptimo.
+ * Nos ha sido imposible hacer una comprobación exhaustiva de bugs o la inclusión de funcionalidad extra debido al poco tiempo existente para el desarrollo del proyecto en comparación con la problemática percibida en general al usar las tecnologías impuestas por el profesorado.
 
 

restapi/fullchain.pem

@@ -0,0 +1,89 @@
+-----BEGIN CERTIFICATE-----
+MIIEgzCCA2ugAwIBAgISBE4hDhC+ihW1iYLnGmkgXdY1MA0GCSqGSIb3DQEBCwUA
+MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD
+EwJSMzAeFw0yMzA0MzAyMTU0MzZaFw0yMzA3MjkyMTU0MzVaMC4xLDAqBgNVBAMT
+I2xvbWFwZXMyYy5lYXN0dXMuY2xvdWRhcHAuYXp1cmUuY29tMFkwEwYHKoZIzj0C
+AQYIKoZIzj0DAQcDQgAEZLnjyEwOIqnCiHvShOI4TNpY1XAdS1Hjyr1c9GkYl0Tn
+nayNEewl7dKfxavBR6kceiNL9Yg8WvbWZfkFFdSAbKOCAmAwggJcMA4GA1UdDwEB
+/wQEAwIHgDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/
+BAIwADAdBgNVHQ4EFgQUT/8bZ73yuXZJbwa5/UkaHI7kvqYwHwYDVR0jBBgwFoAU
+FC6zF7dYVsuuUAlA5h+vnYsUwsYwVQYIKwYBBQUHAQEESTBHMCEGCCsGAQUFBzAB
+hhVodHRwOi8vcjMuby5sZW5jci5vcmcwIgYIKwYBBQUHMAKGFmh0dHA6Ly9yMy5p
+LmxlbmNyLm9yZy8wLgYDVR0RBCcwJYIjbG9tYXBlczJjLmVhc3R1cy5jbG91ZGFw
+cC5henVyZS5jb20wTAYDVR0gBEUwQzAIBgZngQwBAgEwNwYLKwYBBAGC3xMBAQEw
+KDAmBggrBgEFBQcCARYaaHR0cDovL2Nwcy5sZXRzZW5jcnlwdC5vcmcwggEGBgor
+BgEEAdZ5AgQCBIH3BIH0APIAdwC3Pvsk35xNunXyOcW6WPRsXfxCz3qfNcSeHQmB
+Je20mQAAAYfUYAmqAAAEAwBIMEYCIQDuKJRuS6mAcYhGHm2xTWf4A9x6eIydnYDT
+4StyWLd9CAIhAM/JDqurzPr107AWT/abRwgkrMNvmKQAt+QBmFxu7ZjQAHcArfe+
++nz/EMiLnT2cHj4YarRnKV3PsQwkyoWGNOvcgooAAAGH1GAJlwAABAMASDBGAiEA
+qwMa+Wc+MewFhTDfkajorYNfswoubsbcyPfmHpAcAq8CIQDsZupisAowzv0vhsK2
+9wEf6jCoAMUVbVk3FSm0s+EvcTANBgkqhkiG9w0BAQsFAAOCAQEAtpc8CKRjvc3Q
+VjawtJOs3EE98oozKBnjlPqzc3E2QQQBEqFdXRcg+bDSjGulEnHcOY6LGV6dhDVN
+29R0ACaRB3EKsaip9PXF+W2WBolMxRwyTomMT5FlB2U+3H/vM9c4U3HOQSuA7qV/
+t+vrzcVhseUelHbq+/mcfySj5E0DEn+b9MveTuBArup15W3cS8qdQFxh4NSIktAw
+F7XoxaEvJtoOF10AMoK1KrAohJapeN3LNRGYSyKBoxhl8hILTBwonWha1WJdcLbW
+nF6GL2J972jto8fzWSoxVVlD8c5Zn1joE29EHdtJQzyzj4yD28+eaoF7SnLZMaOL
+HjNsUaqhiA==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw
+TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
+cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjAwOTA0MDAwMDAw
+WhcNMjUwOTE1MTYwMDAwWjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg
+RW5jcnlwdDELMAkGA1UEAxMCUjMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQC7AhUozPaglNMPEuyNVZLD+ILxmaZ6QoinXSaqtSu5xUyxr45r+XXIo9cP
+R5QUVTVXjJ6oojkZ9YI8QqlObvU7wy7bjcCwXPNZOOftz2nwWgsbvsCUJCWH+jdx
+sxPnHKzhm+/b5DtFUkWWqcFTzjTIUu61ru2P3mBw4qVUq7ZtDpelQDRrK9O8Zutm
+NHz6a4uPVymZ+DAXXbpyb/uBxa3Shlg9F8fnCbvxK/eG3MHacV3URuPMrSXBiLxg
+Z3Vms/EY96Jc5lP/Ooi2R6X/ExjqmAl3P51T+c8B5fWmcBcUr2Ok/5mzk53cU6cG
+/kiFHaFpriV1uxPMUgP17VGhi9sVAgMBAAGjggEIMIIBBDAOBgNVHQ8BAf8EBAMC
+AYYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMBIGA1UdEwEB/wQIMAYB
+Af8CAQAwHQYDVR0OBBYEFBQusxe3WFbLrlAJQOYfr52LFMLGMB8GA1UdIwQYMBaA
+FHm0WeZ7tuXkAXOACIjIGlj26ZtuMDIGCCsGAQUFBwEBBCYwJDAiBggrBgEFBQcw
+AoYWaHR0cDovL3gxLmkubGVuY3Iub3JnLzAnBgNVHR8EIDAeMBygGqAYhhZodHRw
+Oi8veDEuYy5sZW5jci5vcmcvMCIGA1UdIAQbMBkwCAYGZ4EMAQIBMA0GCysGAQQB
+gt8TAQEBMA0GCSqGSIb3DQEBCwUAA4ICAQCFyk5HPqP3hUSFvNVneLKYY611TR6W
+PTNlclQtgaDqw+34IL9fzLdwALduO/ZelN7kIJ+m74uyA+eitRY8kc607TkC53wl
+ikfmZW4/RvTZ8M6UK+5UzhK8jCdLuMGYL6KvzXGRSgi3yLgjewQtCPkIVz6D2QQz
+CkcheAmCJ8MqyJu5zlzyZMjAvnnAT45tRAxekrsu94sQ4egdRCnbWSDtY7kh+BIm
+lJNXoB1lBMEKIq4QDUOXoRgffuDghje1WrG9ML+Hbisq/yFOGwXD9RiX8F6sw6W4
+avAuvDszue5L3sz85K+EC4Y/wFVDNvZo4TYXao6Z0f+lQKc0t8DQYzk1OXVu8rp2
+yJMC6alLbBfODALZvYH7n7do1AZls4I9d1P4jnkDrQoxB3UqQ9hVl3LEKQ73xF1O
+yK5GhDDX8oVfGKF5u+decIsH4YaTw7mP3GFxJSqv3+0lUFJoi5Lc5da149p90Ids
+hCExroL1+7mryIkXPeFM5TgO9r0rvZaBFOvV2z0gp35Z0+L4WPlbuEjN/lxPFin+
+HlUjr8gRsI3qfJOQFy/9rKIJR0Y/8Omwt/8oTWgy1mdeHmmjk7j1nYsvC9JSQ6Zv
+MldlTTKB3zhThV1+XWYp6rjd5JW1zbVWEkLNxE7GJThEUG3szgBVGP7pSWTUTsqX
+nLRbwHOoq7hHwg==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFYDCCBEigAwIBAgIQQAF3ITfU6UK47naqPGQKtzANBgkqhkiG9w0BAQsFADA/
+MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
+DkRTVCBSb290IENBIFgzMB4XDTIxMDEyMDE5MTQwM1oXDTI0MDkzMDE4MTQwM1ow
+TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
+cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwggIiMA0GCSqGSIb3DQEB
+AQUAA4ICDwAwggIKAoICAQCt6CRz9BQ385ueK1coHIe+3LffOJCMbjzmV6B493XC
+ov71am72AE8o295ohmxEk7axY/0UEmu/H9LqMZshftEzPLpI9d1537O4/xLxIZpL
+wYqGcWlKZmZsj348cL+tKSIG8+TA5oCu4kuPt5l+lAOf00eXfJlII1PoOK5PCm+D
+LtFJV4yAdLbaL9A4jXsDcCEbdfIwPPqPrt3aY6vrFk/CjhFLfs8L6P+1dy70sntK
+4EwSJQxwjQMpoOFTJOwT2e4ZvxCzSow/iaNhUd6shweU9GNx7C7ib1uYgeGJXDR5
+bHbvO5BieebbpJovJsXQEOEO3tkQjhb7t/eo98flAgeYjzYIlefiN5YNNnWe+w5y
+sR2bvAP5SQXYgd0FtCrWQemsAXaVCg/Y39W9Eh81LygXbNKYwagJZHduRze6zqxZ
+Xmidf3LWicUGQSk+WT7dJvUkyRGnWqNMQB9GoZm1pzpRboY7nn1ypxIFeFntPlF4
+FQsDj43QLwWyPntKHEtzBRL8xurgUBN8Q5N0s8p0544fAQjQMNRbcTa0B7rBMDBc
+SLeCO5imfWCKoqMpgsy6vYMEG6KDA0Gh1gXxG8K28Kh8hjtGqEgqiNx2mna/H2ql
+PRmP6zjzZN7IKw0KKP/32+IVQtQi0Cdd4Xn+GOdwiK1O5tmLOsbdJ1Fu/7xk9TND
+TwIDAQABo4IBRjCCAUIwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw
+SwYIKwYBBQUHAQEEPzA9MDsGCCsGAQUFBzAChi9odHRwOi8vYXBwcy5pZGVudHJ1
+c3QuY29tL3Jvb3RzL2RzdHJvb3RjYXgzLnA3YzAfBgNVHSMEGDAWgBTEp7Gkeyxx
++tvhS5B1/8QVYIWJEDBUBgNVHSAETTBLMAgGBmeBDAECATA/BgsrBgEEAYLfEwEB
+ATAwMC4GCCsGAQUFBwIBFiJodHRwOi8vY3BzLnJvb3QteDEubGV0c2VuY3J5cHQu
+b3JnMDwGA1UdHwQ1MDMwMaAvoC2GK2h0dHA6Ly9jcmwuaWRlbnRydXN0LmNvbS9E
+U1RST09UQ0FYM0NSTC5jcmwwHQYDVR0OBBYEFHm0WeZ7tuXkAXOACIjIGlj26Ztu
+MA0GCSqGSIb3DQEBCwUAA4IBAQAKcwBslm7/DlLQrt2M51oGrS+o44+/yQoDFVDC
+5WxCu2+b9LRPwkSICHXM6webFGJueN7sJ7o5XPWioW5WlHAQU7G75K/QosMrAdSW
+9MUgNTP52GE24HGNtLi1qoJFlcDyqSMo59ahy2cI2qBDLKobkx/J3vWraV0T9VuG
+WCLKTVXkcGdtwlfFRjlBz4pYg1htmf5X6DYO8A4jqv2Il9DjXA6USbW1FzXSLr9O
+he8Y4IWS6wY7bCkjCWDcRQJMEhg76fsO3txE+FiYruq9RUWhiF1myv4Q6W+CyBFC
+Dfvp7OOGAN6dEOM4+qR9sdjoSYKEBpsr6GtPAQw4dy753ec5
+-----END CERTIFICATE-----
+

restapi/privkey.pem

@@ -0,0 +1,6 @@
+-----BEGIN PRIVATE KEY-----
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg35MWkZkaf3h6UVzc
+pqkTrCYBEmcEHPfDwbhCYD3mHDehRANCAARkuePITA4iqcKIe9KE4jhM2ljVcB1L
+UePKvVz0aRiXROedrI0R7CXt0p/Fq8FHqRx6I0v1iDxa9tZl+QUV1IBs
+-----END PRIVATE KEY-----
+

restapi/server.ts

@@ -3,13 +3,14 @@ import cors from 'cors';
 import bp from 'body-parser';
 import promBundle from 'express-prom-bundle';
 import api from "./api";
-import dotenv from 'dotenv';
-dotenv.config();
 const mongoose = require('mongoose');
+const https = require('https');
+const fs = require('fs');
 
 
 const app: Application = express();
-const port: number = Number.parseInt(`${process.env.PORT}`) || 5000;
+const httpPort = 5000;
+const httpsPort = 5001;
 
 const metricsMiddleware: RequestHandler = promBundle({ includeMethod: true });
 app.use(metricsMiddleware);
@@ -29,15 +30,32 @@ app.use(bp.json());
 
 app.use("/api", api)
 
-app.use(cors({
-    origin: ['http://localhost:3000', 'http://20.169.248.119:3000'],
-    credentials:true
-}));
+app.use(cors());
+
+const options = {
+  key: fs.readFileSync("./privkey.pem"),
+  cert: fs.readFileSync("./fullchain.pem")
+};
+
+app.use((req, res, next) => {
+  if (req.secure) {
+    next();
+  } else {
+    res.redirect(`https://${req.headers.host}${req.url}`);
+  }
+});
 
-app.listen(port, (): void => {
-    console.log('Restapi listening on ' + port);
+https.createServer(options, app).listen(httpsPort, () => {
+    console.log(`Restapi server started on port ${httpsPort}`);
+  }).on("error", (error: Error) => {
+      console.error("Error occured: " + error.message);
+    });
+
+app.listen(httpPort, (): void => {
+    console.log('Restapi listening on ' + httpPort);
 }).on("error", (error: Error) => {
     console.error('Error occured: ' + error.message);
 });
 
+
 export default app;

sonar-project.properties

@@ -9,5 +9,5 @@ sonar.projectVersion=1.0.4
 sonar.coverage.exclusions=**/*.test.tsx,**/*.test.ts
 sonar.sources=webapp/src/components,restapi
 sonar.sourceEncoding=UTF-8
-sonar.exclusions=node_modules/**
+sonar.exclusions=node_modules/**,restapi/server.ts
 sonar.typescript.lcov.reportPaths=**/coverage/lcov.info

webapp/e2e/steps/login-form.steps.ts

@@ -2,7 +2,7 @@ import { defineFeature, loadFeature } from 'jest-cucumber';
 import puppeteer from "puppeteer";
 
 const feature = loadFeature('./e2e/features/login-form.feature');
-const apiEndPoint= process.env.REACT_APP_URI|| 'http://localhost:3000'
+const apiEndPoint= 'http://localhost:3000'
 
 let page: puppeteer.Page;
 let browser: puppeteer.Browser;

webapp/e2e/steps/register-form.steps.ts

@@ -2,7 +2,7 @@ import { defineFeature, loadFeature } from 'jest-cucumber';
 import puppeteer from "puppeteer";
 
 const feature = loadFeature('./e2e/features/register-form.feature');
-const apiEndPoint= process.env.REACT_APP_URI|| 'http://localhost:3000'
+const apiEndPoint= 'http://localhost:3000'
 
 let page: puppeteer.Page;
 let browser: puppeteer.Browser;