ssl/tls update

Makefile

@@ -1,14 +1,17 @@
 #TODO:
 
-re:	docker_clean build up
+re:	 docker_clean build up
+
+delete_db:
+	-rm -rf ./srcs/app-django/trantran
 
 all: build up
 
 build:
 	docker-compose -f ./srcs/docker-compose.yml build
 
 up:
-	docker-compose -f ./srcs/docker-compose.yml up
+	docker-compose -f ./srcs/docker-compose.yml up -d
 
 down:
 	docker-compose -f ./srcs/docker-compose.yml down
@@ -17,7 +20,7 @@ docker_runpostgres:
 	-docker build -t postgres ./postgreSQL/.
 	-docker run --name postgres -d --env-file .env -p 5432:5432 postgres 
 
-docker_clean: docker_stop docker_rmcont docker_rmimg docker_rmvolume
+docker_clean: delete_db docker_stop docker_rmcont docker_rmimg docker_rmvolume
 	-@docker system prune -af
 
 docker_stop:
@@ -32,10 +35,6 @@ docker_rmcont:
 docker_rmvolume:
 	-docker volume rm $$(docker volume ls -q)
 
-lean:
-# docker-compose -f ./srcs/docker-compose.yml down --volumes --remove-orphans
-	@echo "All containers are stopped."
-
 fclean: clean
 	-@docker system prune -af
 #	@-sudo docker rm $$(sudo docker volume ls -q)

server-cert.pem

@@ -0,0 +1,23 @@
+-----BEGIN CERTIFICATE-----
+MIIDwzCCAqugAwIBAgIUL1ZIu+ZrDEGUdrGZXFzFlD6d9KQwDQYJKoZIhvcNAQEL
+BQAwcTELMAkGA1UEBhMCRlIxDDAKBgNVBAgMA0lERjEOMAwGA1UEBwwFUGFyaXMx
+CzAJBgNVBAoMAjQyMQswCQYDVQQLDAI0MjEQMA4GA1UEAwwHMC4wLjAuMDEYMBYG
+CgmSJomT8ixkAQEMCGxib3VndWV0MB4XDTI0MDgyODA5NDYzNloXDTI1MDgyODA5
+NDYzNlowcTELMAkGA1UEBhMCRlIxDDAKBgNVBAgMA0lERjEOMAwGA1UEBwwFUGFy
+aXMxCzAJBgNVBAoMAjQyMQswCQYDVQQLDAI0MjEQMA4GA1UEAwwHMC4wLjAuMDEY
+MBYGCgmSJomT8ixkAQEMCGxib3VndWV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAySZARZupt35xMz3bMUVT+JdiqJ2u5VBsZt9B8/wqJBZSyscVJs0J
+iAMJ8ZYeDsrckdGFcrofcqEifUKHiSAz5j0swhtUjj2RO+PueAafQGASN989lyGF
+KgziX+t9EtVEMT+b+SfYJFJM6GCAlVFGQGQs1CZUNqrcGTuBULxnbho/0kVLAkHu
+I29nMBPFcDaOSc24c2wR6JDQ+wYtqseiD72jUPNhN0Epoai3BV1pDblBcGpNJPOr
+VUQu+0852Fzdy2RR1eLJLeqQfOSPB1qRTINWvbiIAedUXAhGeTLeCdJxP5qV/9xS
+dbPFtfUk9PO2YdQUuU+8wl5tvsz+8beTOwIDAQABo1MwUTAdBgNVHQ4EFgQUEU7n
+p4N8grTmG3vD4y/UdTc2cJwwHwYDVR0jBBgwFoAUEU7np4N8grTmG3vD4y/UdTc2
+cJwwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAPHMDhCLRxb70
+dLypIqUCgba59w/HAI2nzLRTD3LPXyY5HMYdkPFp448fq+Ci/Jtv7VE8PLko9um5
+T2JC8gaTgHBGOAJm91+rbUz/+FuBCm4gPvr1zyJmi0eWQ9Fk0Hb6G6LB+6l5cEeu
+KxLixh/D5F1AoTme3WPcX5jiqdLMBMytxQw8/R64ujFB4cBP3jhVP8+cpQeefTVi
+ykJRJbaWDevQLOnCx9lsoFV/hCuQ2JJRzOvPh6hdMEPz0V1zXLEjtdvdaTAID+DQ
+g2cKmTF8pERRcx+lLqwG1gV8bHgYBDs//PLL6SNt7MSHLzgvBFjJXyvLu6NQlR+g
+vhntXL/IJw==
+-----END CERTIFICATE-----

srcs/app_django/Dockerfile

@@ -4,7 +4,6 @@ WORKDIR /usr/src/django-app
 
 COPY ./ .
 
-# RUN mkdir -p /etc/ssl/certs /etc/ssl/private
 # COPY ./secrets/server/server-cert.pem /etc/ssl/certs/cert.pem
 # COPY ./secrets/server/server-key.pem /etc/ssl/private/key.pem
 

srcs/app_django/django_project/settings.py

@@ -114,12 +114,12 @@
         #Update database
         #python manage.py makemigrations
         #python manage.py migrate
-        'ENGINE':   'django.db.backends.sqlite3',
+        'ENGINE':   'django.db.backends.postgresql',
         'NAME':     'trantran',
-        # 'USER':     'admin',
-        # 'PASSWORD': os.getenv('POSTGRES_PASSWORD', 'default_password'),
-        # 'HOST':     'postgres',
-        # 'PORT':     '5432',
+        'USER':     'admin',
+        'PASSWORD': os.getenv('POSTGRES_PASSWORD', 'default_password'),
+        'HOST':     'postgres',
+        'PORT':     '5432',
     }
 
 }

srcs/app_django/notification/routing.py

@@ -1,6 +1,6 @@
-from django.urls import re_path
+from django.urls import path
 from .consumers import NotificationConsumer
 
 websocket_urlpatterns = [
-    re_path(r'ws/notifications/$', NotificationConsumer.as_asgi()),
+    path('wss/notifications/$', NotificationConsumer.as_asgi()),
 ]

srcs/app_django/pages/static/pages/js/gameSession_old.js

@@ -212,7 +212,7 @@ async function connectToTournament() {
     }
 
     // Connect to the WebSocket
-    connectWebSocket('ws://' + window.location.host + '/ws/tournament/' + tournamentId + '/')
+    connectWebSocket('wss://' + window.location.host + '/wss/tournament/' + tournamentId + '/')
         .then(socket => {
             setUpSocketTournament(socket);
         });
@@ -223,7 +223,7 @@ function connectToGame(mode = "pvp") {
     const gameId = window.location.pathname.split('/')[2]
     console.log('Connecting to tournament:', gameId);
 
-    connectWebSocket(`ws://${window.location.host}/ws/pong/${gameId}/${mode}/`)
+    connectWebSocket(`wss://${window.location.host}/wss/pong/${gameId}/${mode}/`)
         .then(socket => {
             setUpSocket(socket);
         });

srcs/app_django/pages/static/pages/js/handleFriends.js

@@ -116,8 +116,9 @@ async function displayResultBox(inputValue)
 		else
 		{
 			console.log("	friend box generated");
+			console.log("HERE MFF:", user_data);
 			resultBox.visibility ='visible';
-			resultUsername.textContent = user_data.get_avatar_name;
+			resultUsername.textContent = user_data.username;
 			var tmpSrc = baseSrc + user_data.avatar;
 			resultAvatar.src = tmpSrc;
 			addButton.style.visibility = 'hidden';
@@ -259,7 +260,7 @@ function friendSendChallenge(friend_username){
 	console.log(friend_username);
 	if (friend_username === 'null')
 	{
-		friend_username = resultUsername.textContent;	
+		friend_username = resultUsername.textContent;
 	}
 	console.log(friend_username);
 	var formData = {

srcs/app_django/pages/static/pages/js/setupNotificationSocket.js

@@ -1,7 +1,7 @@
 
     document.addEventListener('DOMContentLoaded', function() {
         var ws_scheme = window.location.protocol == "https:" ? "wss" : "ws";
-        var ws_path = ws_scheme + '://' + window.location.host + '/ws/notifications/';
+        var ws_path = ws_scheme + '://' + window.location.host + '/wss/notifications/';
         var websocket = new WebSocket(ws_path);
 
         websocket.onopen = function(event) {

srcs/app_django/pages/static/pages/js/setupSocket.js

@@ -1,7 +1,7 @@
 
     document.addEventListener('DOMContentLoaded', function() {
         var ws_scheme = window.location.protocol == "https:" ? "wss" : "ws";
-        var ws_path = ws_scheme + '://' + window.location.host + '/ws/notifications/';
+        var ws_path = ws_scheme + '://' + window.location.host + '/wss/notifications/';
         var websocket = new WebSocket(ws_path);
 
         websocket.onopen = function(event) {

srcs/app_django/runserver-ssl.py

@@ -0,0 +1,11 @@
+import uvicorn
+
+if __name__ == "__main__":
+    uvicorn.run(
+        "django_project.asgi:application",
+        host="0.0.0.0",
+        port=8001,
+        log_level="info",
+        ssl_keyfile="/etc/ssl-nginx/server-key.pem",
+        ssl_certfile="/etc/ssl-nginx/server-cert.pem"
+    )