diff --git a/CHANGELOG.md b/CHANGELOG.md index 68ee4fd..dc58580 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ ## v0.08 (dev) -* ??? +* Added SECRET to register page as a simple security measure. ## v0.07 (Dec 8th 2023) * View container logs. diff --git a/README.md b/README.md index 39fe57a..a0eaab1 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ Pre-Pre-Pre-Pre-Pre Alpha v0.08 ( :fire: Experimental. Don't install on any serv ## Setup -* Docker Compose: +Docker Compose: ``` version: "3.9" services: @@ -44,10 +44,13 @@ services: dweebui: container_name: dweebui image: lllllllillllllillll/dweebui:v0.08-dev + # build: + # context: . environment: NODE_ENV: production PORT: 8000 - # Proxy_Manager: enabled + SECRET: MrWiskers + #Proxy_Manager: enabled restart: unless-stopped ports: - 8000:8000 @@ -55,6 +58,8 @@ services: - dweebui:/app - caddyfiles:/app/caddyfiles - /var/run/docker.sock:/var/run/docker.sock + #- ./custom-templates.json:/app/custom-templates.json + #- ./composefiles:/app/composefiles networks: - dweeb_network @@ -69,14 +74,14 @@ networks: driver: bridge ``` -* Compose setup: +Compose setup: -Paste the above content into a file named ```docker-compose.yml``` then place it in a folder named ```dweebui```. -Open a terminal in the ```dweebui``` folder, then enter ```docker compose up -d```. -You may need to use ```docker-compose up -d``` or execute the command as root with either ```sudo docker compose up -d``` or ```sudo docker-compose up -d```. +* Paste the above content into a file named ```docker-compose.yml``` then place it in a folder named ```dweebui```. +* Open a terminal in the ```dweebui``` folder, then enter ```docker compose up -d```. +* You may need to use ```docker-compose up -d``` or execute the command as root with either ```sudo docker compose up -d``` or ```sudo docker-compose up -d```. -* Using setup.sh: +Using setup.sh: ``` Extract DweebUI.zip and navigate to /DweebUI cd DweebUI diff --git a/controllers/auth.js b/controllers/auth.js index b4c176a..f83cca3 100644 --- a/controllers/auth.js +++ b/controllers/auth.js @@ -86,11 +86,11 @@ exports.Register = function(req,res){ exports.processRegister = async function(req,res){ // Get the data. - let { first_name, last_name, username, email, password, avatar, tos } = req.body; + let { first_name, last_name, username, email, password, avatar, tos, secret } = req.body; let role = "user"; // Check the data. - if(first_name && last_name && email && password && username && tos){ + if((first_name && last_name && email && password && username && tos) && (secret == process.env.SECRET)){ // Check if there is an existing user with that username. let existingUser = await User.findOne({ where: {username:username}}); diff --git a/docker-compose.yaml b/docker-compose.yaml index 0f16e6d..7d5bc02 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -4,10 +4,13 @@ services: dweebui: container_name: dweebui image: lllllllillllllillll/dweebui:v0.08-dev + # build: + # context: . environment: NODE_ENV: production PORT: 8000 - # Proxy_Manager: enabled + SECRET: MrWiskers + #Proxy_Manager: enabled restart: unless-stopped ports: - 8000:8000 @@ -15,6 +18,8 @@ services: - dweebui:/app - caddyfiles:/app/caddyfiles - /var/run/docker.sock:/var/run/docker.sock + #- ./custom-templates.json:/app/custom-templates.json + #- ./composefiles:/app/composefiles networks: - dweeb_network diff --git a/views/pages/apps.ejs b/views/pages/apps.ejs index 63e9cdc..7e8a2f6 100644 --- a/views/pages/apps.ejs +++ b/views/pages/apps.ejs @@ -51,7 +51,7 @@ -
+
Default Template Compose Files Custom Template diff --git a/views/pages/register.ejs b/views/pages/register.ejs index 97829da..22730c6 100644 --- a/views/pages/register.ejs +++ b/views/pages/register.ejs @@ -79,6 +79,11 @@
+
+ + +
+
diff --git a/views/partials/footer.ejs b/views/partials/footer.ejs index e0c7cbc..2ae8f80 100644 --- a/views/partials/footer.ejs +++ b/views/partials/footer.ejs @@ -24,7 +24,7 @@
  • - v0.07 + v0.08