@@ -37,12 +42,11 @@ Docker Compose:
```
version: "3.9"
services:
-
dweebui:
container_name: dweebui
- image: lllllllillllllillll/dweebui:v0.09-dev
- # build:
- # context: .
+ # image: lllllllillllllillll/dweebui:v0.20
+ build:
+ context: .
environment:
NODE_ENV: production
PORT: 8000
@@ -52,21 +56,15 @@ services:
- 8000:8000
volumes:
- 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
-
+ - dweebui_net
volumes:
dweebui:
- caddyfiles:
-
networks:
- dweeb_network:
+ dweebui_net:
driver: bridge
```
@@ -77,14 +75,6 @@ Compose setup:
* 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:
-```
-Extract DweebUI.zip and navigate to /DweebUI
-cd DweebUI
-chmod +x setup.sh
-sudo ./setup.sh
-```
-
## Credits
diff --git a/app.js b/app.js
index 658c4dd..69383a0 100644
--- a/app.js
+++ b/app.js
@@ -1,23 +1,43 @@
-// Express
-const express = require("express");
-const app = express();
-const session = require("express-session");
-const compression = require('compression');
-const helmet = require('helmet');
-const PORT = process.env.PORT || 8000;
+import express from 'express';
+import session from 'express-session';
+import compression from 'compression';
+import helmet from 'helmet';
+import Docker from 'dockerode';
+import cors from 'cors';
+import { Readable } from 'stream';
+import { instrument } from '@socket.io/admin-ui'
+import { router } from './router/index.js';
+import { createServer } from 'node:http';
+import { Server } from 'socket.io';
+import { sequelize, Container } from './database/models.js';
+import { currentLoad, mem, networkStats, fsSize, dockerContainerStats, dockerImages, networkInterfaces } from 'systeminformation';
+import { containerCard } from './components/containerCard.js';
-// Router
-const routes = require("./routes");
+export const app = express();
+const server = createServer(app);
+const port = process.env.PORT || 8000;
+export var docker = new Docker();
+let [cpu, ram, tx, rx, disk] = [0, 0, 0, 0, 0];
+let [hidden, clicked, dockerEvents] = ['', false, ''];
+let metricsInterval, cardsInterval, graphsInterval;
+let cardList = '';
+const statsArray = {};
-// Functions and variables
-const { serverStats, containerList, containerStats, containerAction, containerLogs, hiddenContainers, dockerImages, dockerVolumes, dockerNetworks } = require('./functions/system');
-let sentList, clicked;
-app.locals.site_list = '';
+// socket.io admin ui
+export const io = new Server(server, {
+ connectionStateRecovery: {},
+ cors: {
+ origin: ['http://localhost:8000', 'https://admin.socket.io'],
+ methods: ['GET', 'POST'],
+ credentials: true
+ }
+});
+instrument(io, {
+ auth: false,
+ readonly: true
+});
-const Containers = require('./database/ContainerModel');
-
-
-// Configure Session
+// Session middleware
const sessionMiddleware = session({
secret: "keyboard cat",
resave: false,
@@ -26,137 +46,280 @@ const sessionMiddleware = session({
secure:false, // Only set to true if you are using HTTPS.
httpOnly:false, // Only set to true if you are using HTTPS.
maxAge:3600000 * 8 // Session max age in milliseconds. 3600000 = 1 hour.
- }
-})
+ }
+});
+io.engine.use(sessionMiddleware);
-// Middleware
+// Express middleware
app.set('view engine', 'ejs');
app.use([
compression(),
+ cors(),
helmet({contentSecurityPolicy: false}),
express.static("public"),
express.json(),
express.urlencoded({ extended: true }),
sessionMiddleware,
- routes
+ router
]);
-// Start Express server
-const server = app.listen(PORT, async () => {
- console.log(`App listening on port ${PORT}`);
+// Initialize server
+server.listen(port, () => {
+ async function init() {
+ try {
+ await sequelize.authenticate();
+ console.log('[Connected to DB]');
+ } catch (error) {
+ console.log('[Could not connect to DB]', error);
+ }
+ try {
+ await sequelize.sync();
+ console.log('[Models Synced]');
+ hidden = await Container.findAll({ where: {visibility:false}});
+ containerCards();
+ } catch (error) {
+ console.log('[Could not Sync Models]', error);
+ }
+ console.log(`\nServer listening on http://localhost:${port}`);
+ }
+ init();
});
-// Start Socket.io
-const io = require('socket.io')(server);
-io.engine.use(sessionMiddleware);
+// Server metrics
+let serverMetrics = async () => {
+ currentLoad().then(data => {
+ cpu = Math.round(data.currentLoad);
+ });
+ mem().then(data => {
+ ram = Math.round((data.active / data.total) * 100);
+ });
+ networkStats().then(data => {
+ tx = data[0].tx_bytes / (1024 * 1024);
+ rx = data[0].rx_bytes / (1024 * 1024);
+ });
+ fsSize().then(data => {
+ disk = data[0].use;
+ });
+}
-io.on('connection', (socket) => {
+// List docker containers
+let containerCards = async () => {
+ let list = '';
+ const allContainers = await docker.listContainers({ all: true });
+ for (const container of allContainers) {
+ if (!hidden.includes(container.Names[0].slice(1))) {
- // Set user session
- const user_session = socket.request.session;
- console.log(`${user_session.user} connected from ${socket.handshake.headers.host} ${socket.handshake.address}`);
+ let imageVersion = container.Image.split('/');
+ let service = imageVersion[imageVersion.length - 1].split(':')[0];
+ let containerId = docker.getContainer(container.Id);
+ let containerInfo = await containerId.inspect();
+ let ports_list = [];
+ try {
+ for (const [key, value] of Object.entries(containerInfo.HostConfig.PortBindings)) {
+ let ports = {
+ check: 'checked',
+ external: value[0].HostPort,
+ internal: key.split('/')[0],
+ protocol: key.split('/')[1]
+ }
+ ports_list.push(ports);
+ }
+ } catch {}
- // Check if a list of containers or an install card needs to be sent
- if (sentList != null) { socket.emit('cards', sentList); }
- if((app.locals.install != '') && (app.locals.install != null)){ socket.emit('install', app.locals.install); }
+ let external_port = ports_list[0]?.external || 0;
+ let internal_port = ports_list[0]?.internal || 0;
-
- async function dockerStuff(){
- let i = await dockerImages();
- let v = await dockerVolumes();
- let n = await dockerNetworks();
-
- // console.log(i, v, n);
+ let container_info = {
+ name: container.Names[0].slice(1),
+ service: service,
+ id: container.Id,
+ state: container.State,
+ image: container.Image,
+ external_port: external_port,
+ internal_port: internal_port,
+ ports: ports_list,
+ link: 'localhost',
+ }
+ let card = containerCard(container_info);
+ list += card;
+ }
}
+ cardList = list;
+}
- dockerStuff();
+// Container metrics
+let containerStats = async () => {
+ const data = await docker.listContainers({ all: true });
+ for (const container of data) {
+ if (!hidden.includes(container.Names[0].slice(1))) {
+ const stats = await dockerContainerStats(container.Id);
+ const name = container.Names[0].slice(1);
- // Send server metrics
- let ServerStats = setInterval(async () => {
- socket.emit('metrics', await serverStats());
- }, 1000);
+ if (!statsArray[name]) {
+ statsArray[name] = {
+ cpuArray: Array(15).fill(0),
+ ramArray: Array(15).fill(0)
+ };
+ }
+ statsArray[name].cpuArray.push(Math.round(stats[0].cpuPercent));
+ statsArray[name].ramArray.push(Math.round(stats[0].memPercent));
- // Send list of containers
- let ContainerList = setInterval(async () => {
- let cardList = await containerList();
- if (sentList !== cardList) {
- sentList = cardList;
- app.locals.install = '';
- socket.emit('cards', cardList);
+ statsArray[name].cpuArray = statsArray[name].cpuArray.slice(-15);
+ statsArray[name].ramArray = statsArray[name].ramArray.slice(-15);
}
- }, 1000);
+ }
+}
- // Send container metrics
- let ContainerStats = setInterval(async () => {
- let stats = await containerStats();
- for (let i = 0; i < stats.length; i++) {
- socket.emit('containerStats', stats[i]);
- }
- }, 1000);
-
- // Container controls
- socket.on('clicked', (data) => {
- if (clicked == true) { return; } clicked = true;
- let buttonPress = {
- user: socket.request.session.user,
- role: socket.request.session.role,
- action: data.action,
- container: data.container,
- state: data.state
- }
- containerAction(buttonPress);
- clicked = false;
+// Store docker events
+docker.getEvents((err, stream) => {
+ if (err) throw err;
+ stream.on('data', (chunk) => {
+ dockerEvents += chunk.toString('utf8');
});
+});
-
- socket.on('hide', async (data) => {
- console.log(`Hide ${data.container}`);
+// Check for docker events
+setInterval( () => {
+ if (dockerEvents != '') {
+ getHidden();
+ containerCards();
+ dockerEvents = '';
+ }
+}, 1000);
- let containerExists = await Containers.findOne({ where: {name:data.container}});
+// Get hidden containers
+async function getHidden() {
+ hidden = await Container.findAll({ where: {visibility:false}});
+}
- if(!containerExists){
- const container = await Containers.create({
- name: data.container,
- visibility: false,
- });
- hiddenContainers();
- console.log(`[Created] Container ${data.container} hidden`)
-
- let containerData = await Containers.findOne({ where: {name:data.container}});
- console.log(containerData);
-
- } else {
- containerExists.update({ visibility: false });
- console.log(`[Updated] Container ${data.container} hidden`)
- hiddenContainers();
+// Socket.io
+io.on('connection', (socket) => {
+ let sessionData = socket.request.session;
+ let sent = '';
+ if (sessionData.user != undefined) {
+ console.log(`${sessionData.user} connected from ${socket.handshake.headers.host}`);
+
+ // Start intervals if not already started
+ if (!metricsInterval) {
+ metricsInterval = setInterval(serverMetrics, 1000);
+ console.log('Metrics interval started');
+ }
+ if (!cardsInterval) {
+ cardsInterval = setInterval(containerCards, 1000);
+ console.log('Cards interval started');
+ }
+ if (!graphsInterval) {
+ graphsInterval = setInterval(containerStats, 1000);
+ console.log('Graphs interval started');
}
- });
- socket.on('reset', (data) => {
- // set visibility to true for all containers
- Containers.update({ visibility: true }, { where: {} });
- console.log('All containers visible');
- hiddenContainers();
- });
+ setInterval(() => {
+ socket.emit('metrics', [cpu, ram, tx, rx, disk]);
+ if (sent != cardList) {
+ sent = cardList;
+ socket.emit('containers', cardList);
+ }
+ socket.emit('containerStats', statsArray);
+ }, 1000);
- // Container logs
- socket.on('logs', (data) => {
- containerLogs(data.container)
- .then(logs => {
- console.log(`Refreshed logs for ${data.container}`)
- socket.emit('logString', logs);
- })
- .catch(err => {
- console.error(err);
+
+
+ socket.on('clicked', (data) => {
+ if (clicked == true) { return; } clicked = true;
+ let { name, id, value } = data;
+ console.log(`${sessionData.user} clicked: ${id} ${value} ${name}`);
+
+
+ if (id == 'logs'){
+ function containerLogs (data) {
+ return new Promise((resolve, reject) => {
+ let logString = '';
+
+ var options = {
+ follow: false,
+ stdout: true,
+ stderr: false,
+ timestamps: false
+ };
+
+ var containerName = docker.getContainer(data);
+
+ containerName.logs(options, function (err, stream) {
+ if (err) {
+ reject(err);
+ return;
+ }
+
+ const readableStream = Readable.from(stream);
+
+ readableStream.on('data', function (chunk) {
+ logString += chunk.toString('utf8');
+ });
+
+ readableStream.on('end', function () {
+ resolve(logString);
+ });
+ });
+ });
+ };
+ containerLogs(name).then((data) => {
+ socket.emit('logs', data);
+ }).catch((err) => {
+ console.log(err);
+ });
+
+ }
+
+
+ if (id == 'start' || id == 'stop' || id == 'pause' || id == 'restart'){
+ var containerName = docker.getContainer(name);
+
+ if ((id == 'start') && (value == 'stopped')) {
+ containerName.start();
+ } else if ((id == 'start') && (value == 'paused')) {
+ containerName.unpause();
+ } else if ((id == 'stop') && (value != 'stopped')) {
+ containerName.stop();
+ } else if ((id == 'pause') && (value == 'running')) {
+ containerName.pause();
+ } else if ((id == 'pause') && (value == 'paused')) {
+ containerName.unpause();
+ } else if (id == 'restart') {
+ containerName.restart();
+ }
+ }
+ clicked = false;
});
- });
- // On disconnect
- socket.on('disconnect', () => {
- clearInterval(ServerStats);
- clearInterval(ContainerList);
- clearInterval(ContainerStats);
- });
+ socket.on('disconnect', () => {
+ console.log(`${sessionData.user} disconnected`);
+ socket.disconnect();
+ // clear intervals if no users are connected
+ if (io.engine.clientsCount == 0) {
+ clearInterval(metricsInterval);
+ clearInterval(cardsInterval);
+ clearInterval(graphsInterval);
+ metricsInterval = null;
+ cardsInterval = null;
+ graphsInterval = null;
+ console.log('All intervals cleared');
+ }
+ });
+ } else {
+ console.log('Missing session data');
+ }
+});
+
+
+
+
+
+
+
+
+// let link = '';
+// networkInterfaces().then(data => {
+// link = data[0].ip4;
+// });
-});
\ No newline at end of file
diff --git a/caddyfiles/Caddyfile b/caddyfiles/Caddyfile
deleted file mode 100644
index 7f8f696..0000000
--- a/caddyfiles/Caddyfile
+++ /dev/null
@@ -1 +0,0 @@
-import ./sites/*
\ No newline at end of file
diff --git a/components/appCard.js b/components/appCard.js
index c8b2e3b..cc7377b 100644
--- a/components/appCard.js
+++ b/components/appCard.js
@@ -1,4 +1,4 @@
-function appCard(data) {
+export const appCard = (data) => {
// make data.title lowercase
let app_name = data.name || data.title.toLowerCase();
@@ -227,11 +227,11 @@ function appCard(data) {
`;
-}
-
-module.exports = { appCard };
+}
\ No newline at end of file
diff --git a/components/containerCard.js b/components/containerCard.js
new file mode 100644
index 0000000..590c5cb
--- /dev/null
+++ b/components/containerCard.js
@@ -0,0 +1,118 @@
+// export for app.js
+export const containerCard = (data) => {
+
+ let { name, service, state, external_port, internal_port, ports, link } = data;
+ let wrapped = name;
+ let chart = name;
+
+ if (name.length > 13) {
+ wrapped = name.slice(0, 10) + '...';
+ }
+
+ //disable controls for a docker container depending on its name
+ let actions = "";
+ if (name.startsWith('dweebui')) {
+ actions = 'disabled=""';
+ }
+
+ if ( external_port == undefined ) { external_port = 0; }
+ if ( internal_port == undefined ) { internal_port = 0; }
+
+
+ let state_indicator = 'green';
+ if (state == 'exited') {
+ state = 'stopped';
+ state_indicator = 'red';
+ } else if (state == 'paused') {
+ state_indicator = 'orange';
+ }
+
+ let ports_data = [];
+ if (ports) {
+ ports_data = ports;
+ } else {
+ for (let i = 0; i < 12; i++) {
+
+ let port_check = "checked";
+ let external = i;
+ let internal = i;
+ let protocol = "tcp";
+
+ ports_data.push({
+ check: port_check,
+ external: external,
+ internal: internal,
+ protocol: protocol
+ });
+ }
+ }
+
+
+ return `
+ 
+
- 
`
- });
-
- let newUser = await User.findOne({ where: {email:email}});
-
- let match = await bcrypt.compare(password,newUser.password);
- if(match){
- console.log(`User session created for ${newUser.username}`)
- req.session.user = newUser.username;
- req.session.UUID = newUser.UUID;
- req.session.role = newUser.role;
- req.session.avatar = newUser.avatar;
- }
-
- // Redirect to the home page.
- res.redirect("/");
- }
- catch (err) {
- // return an error.
- res.render("pages/register",{
- "error":"Something went wrong when creating account.",
- isLoggedIn:false
- });
- }
-
- }else{
- // return an error.
- res.render("pages/register",{
- "error":"User with that username already exists.",
- isLoggedIn:false
- });
- }
- }else{
- // Redirect to the signup page.
- res.render("pages/register",{
- "error":"Please fill in all the fields and accept TOS.",
- isLoggedIn:false
- });
- }
-}
\ No newline at end of file
diff --git a/controllers/dashboard.js b/controllers/dashboard.js
index 5f9647c..6ba90d6 100644
--- a/controllers/dashboard.js
+++ b/controllers/dashboard.js
@@ -1,215 +1,24 @@
-const { readFileSync, writeFileSync, appendFileSync, readdirSync } = require('fs');
-const { execSync } = require("child_process");
-const { siteCard } = require('../components/siteCard');
-const { containerExec } = require('../functions/system')
+
+export const Dashboard = (req, res) => {
-exports.Dashboard = async function (req, res) {
-
- let caddy = 'd-none';
-
- if (process.env.Proxy_Manager == 'enabled') {
- caddy = '';
- }
-
- // Render the home page
- res.render("pages/dashboard", {
+ res.render("dashboard", {
name: req.session.user,
role: req.session.role,
avatar: req.session.avatar,
- isLoggedIn: true,
- site_list: req.app.locals.site_list,
- caddy: caddy
});
}
+export const searchDashboard = (req, res) => {
+ console.log(req.params);
-exports.AddSite = async function (req, res) {
-
- let { domain, type, host, port } = req.body;
-
- if ( domain && type && host && port) {
-
-
- let { domain, type, host, port } = req.body;
-
- // build caddyfile
- let caddyfile = `${domain} {`
- caddyfile += `\n\t${type} ${host}:${port}`
- caddyfile += `\n\theader {`
- caddyfile += `\n\t\tStrict-Transport-Security "max-age=31536000; includeSubDomains; preload"`
- caddyfile += `\n\t}`
- caddyfile += `\n}`
-
-
- // save caddyfile
- writeFileSync(`./caddyfiles/sites/${domain}.Caddyfile`, caddyfile, function (err) { console.log(err) });
-
-
- // format caddyfile
- let format = {
- container: 'DweebProxy',
- command: `caddy fmt --overwrite /etc/caddy/sites/${domain}.Caddyfile`
- }
- await containerExec(format, function(err, data) {
- if (err) {
- console.error(err);
- return;
- }
- console.log(`Formatted ${domain}.Caddyfile`);
- });
-
- ///////////////// convert caddyfile to json
- let convert = {
- container: 'DweebProxy',
- command: `caddy adapt --config /etc/caddy/sites/${domain}.Caddyfile --pretty >> /etc/caddy/sites/${domain}.json`
- }
- await containerExec(convert, function(err, data) {
- if (err) {
- console.error(err);
- return;
- }
- console.log(`Converted ${domain}.Caddyfile to JSON`);
- });
-
- ////////////// reload caddy
- let reload = {
- container: 'DweebProxy',
- command: `caddy reload --config /etc/caddy/Caddyfile`
- }
- await containerExec(reload, function(err, data) {
- if (err) {
- console.error(err);
- return;
- }
- console.log(`Reloaded Caddy Config`);
- });
-
- let site = siteCard(type, domain, host, port, 0);
-
- req.app.locals.site_list += site;
-
-
- res.redirect("/");
- } else {
- // Redirect
- console.log('missing info')
- res.redirect("/");
- }
-}
-
-
-exports.RemoveSite = async function (req, res) {
-
- for (const [key, value] of Object.entries(req.body)) {
-
- execSync(`rm ./caddyfiles/sites/${value}.Caddyfile`, (err, stdout, stderr) => {
- if (err) { console.error(`error: ${err.message}`); return; }
- if (stderr) { console.error(`stderr: ${stderr}`); return; }
- console.log(`removed ${value}.Caddyfile`);
- });
-
- }
-
- let reload = {
- container: 'DweebProxy',
- command: `caddy reload --config /etc/caddy/Caddyfile`
- }
- await containerExec(reload);
-
-
- console.log('Removed Site(s)')
-
- res.redirect("/refreshsites");
-
-
-}
-
-
-exports.RefreshSites = async function (req, res) {
-
- let domain, type, host, port;
- let id = 1;
-
- // Clear site_list.ejs
- req.app.locals.site_list = "";
-
-
- // check if ./caddyfiles/sites contains any .json files, then delete them
- try {
- let files = readdirSync('./caddyfiles/sites/');
- files.forEach(file => {
- if (file.includes(".json")) {
- execSync(`rm ./caddyfiles/sites/${file}`, (err, stdout, stderr) => {
- if (err) { console.error(`error: ${err.message}`); return; }
- if (stderr) { console.error(`stderr: ${stderr}`); return; }
- console.log(`removed ${file}`);
- });
- }
- });
- } catch (error) { console.log("No .json files to delete") }
-
- // get list of Caddyfiles
- let sites = readdirSync('./caddyfiles/sites/');
-
-
- sites.forEach(site_name => {
- // convert the caddyfile of each site to json
- let convert = {
- container: 'DweebProxy',
- command: `caddy adapt --config ./caddyfiles/sites/${site_name} --pretty >> ./caddyfiles/sites/${site_name}.json`
- }
- containerExec(convert);
-
- try {
- // read the json file
- let site_file = readFileSync(`./caddyfiles/sites/${site_name}.json`, 'utf8');
- // fix whitespace and parse the json file
- site_file = site_file.replace(/ /g, " ");
- site_file = JSON.parse(site_file);
- } catch (error) { console.log("No .json file to read") }
-
-
- // get the domain, type, host, and port from the json file
- try { domain = site_file.apps.http.servers.srv0.routes[0].match[0].host[0] } catch (error) { console.log("No Domain") }
- try { type = site_file.apps.http.servers.srv0.routes[0].handle[0].routes[0].handle[1].handler } catch (error) { console.log("No Type") }
- try { host = site_file.apps.http.servers.srv0.routes[0].handle[0].routes[0].handle[1].upstreams[0].dial.split(":")[0] } catch (error) { console.log("Not Localhost") }
- try { port = site_file.apps.http.servers.srv0.routes[0].handle[0].routes[0].handle[1].upstreams[0].dial.split(":")[1] } catch (error) { console.log("No Port") }
-
- // build the site card
- let site = siteCard(type, domain, host, port, id);
-
- // append the site card to site_list
- req.app.locals.site_list += site;
-
- id++;
+ res.render("dashboard", {
+ name: req.session.user,
+ role: req.session.role,
+ avatar: req.session.avatar,
});
-
-
- res.redirect("/");
-
-}
-
-
-
-exports.DisableSite = async function (req, res) {
-
- console.log(req.body)
- console.log('Disable Site')
-
- res.redirect("/");
-
-}
-
-
-exports.EnableSite = async function (req, res) {
-
- console.log(req.body)
- console.log('Enable Site')
-
- res.redirect("/");
}
\ No newline at end of file
diff --git a/controllers/images.js b/controllers/images.js
index 78c282e..8b6c242 100644
--- a/controllers/images.js
+++ b/controllers/images.js
@@ -1,14 +1,18 @@
+import { docker } from '../app.js';
+export const Images = async function(req, res) {
-exports.Images = async function(req, res) {
+ const allImages = await docker.listImages({ all: true });
+
+ for (let i = 0; i < allImages.length; i++) {
+ console.log(`Image ${i}:`)
+ console.log(`repoTags: ${allImages[i].repoTags}`)
+ }
-
- // Render the home page
- res.render("pages/images", {
+ res.render("images", {
name: req.session.user,
role: req.session.role,
avatar: req.session.avatar,
- isLoggedIn: true,
});
}
\ No newline at end of file
diff --git a/controllers/login.js b/controllers/login.js
new file mode 100644
index 0000000..c6eb8f8
--- /dev/null
+++ b/controllers/login.js
@@ -0,0 +1,72 @@
+import { User } from '../database/models.js';
+import { Syslog } from '../database/models.js';
+import bcrypt from 'bcrypt';
+
+export const Login = function(req,res){
+ if(req.session.user){
+ res.redirect("/logout");
+ }else{
+ res.render("login",{
+ "error":"",
+ });
+ }
+}
+
+export const submitLogin = async function(req,res){
+
+ let { email, password } = req.body;
+
+ if(email && password){
+
+ let existingUser = await User.findOne({ where: {email:email}});
+ if(existingUser){
+
+ let match = await bcrypt.compare(password,existingUser.password);
+
+ if(match){
+
+ let currentDate = new Date();
+ let newLogin = currentDate.toLocaleString();
+ await User.update({lastLogin: newLogin}, {where: {UUID:existingUser.UUID}});
+
+ req.session.user = existingUser.username;
+ req.session.UUID = existingUser.UUID;
+ req.session.role = existingUser.role;
+ req.session.avatar = existingUser.avatar;
+
+ const syslog = await Syslog.create({
+ user: req.session.user,
+ email: email,
+ event: "Successful Login",
+ message: "User logged in successfully",
+ ip: req.socket.remoteAddress
+ });
+
+
+ res.redirect("/");
+ }else{
+
+ const syslog = await Syslog.create({
+ user: null,
+ email: email,
+ event: "Bad Login",
+ message: "Invalid password",
+ ip: req.socket.remoteAddress
+ });
+
+ res.render("login",{
+ "error":"Invalid password",
+ });
+ }
+ }else{
+ res.render("login",{
+ "error":"User with that email does not exist.",
+ });
+ }
+ }else{
+ res.status(400);
+ res.render("login",{
+ "error":"Please fill in all the fields.",
+ });
+ }
+}
\ No newline at end of file
diff --git a/controllers/networks.js b/controllers/networks.js
index af6f43c..3d64242 100644
--- a/controllers/networks.js
+++ b/controllers/networks.js
@@ -1,14 +1,13 @@
-const User = require('../database/UserModel');
+import { docker } from '../app.js';
-exports.Networks = async function(req, res) {
-
- // Render the home page
- res.render("pages/users", {
+export const Networks = async function(req, res) {
+
+
+ res.render("networks", {
name: req.session.user,
role: req.session.role,
avatar: req.session.avatar,
- isLoggedIn: true,
});
}
\ No newline at end of file
diff --git a/controllers/register.js b/controllers/register.js
new file mode 100644
index 0000000..c350eb6
--- /dev/null
+++ b/controllers/register.js
@@ -0,0 +1,96 @@
+import { User, Syslog } from '../database/models.js';
+import bcrypt from 'bcrypt';
+
+let SECRET = process.env.SECRET || "MrWiskers"
+
+export const Register = function(req,res){
+ if(req.session.user){
+ res.redirect("/logout");
+ } else {
+ res.render("register",{
+ "error":"",
+ });
+ }
+}
+
+
+
+export const submitRegister = async function(req,res){
+
+ let { name, username, email, password, confirmPassword, avatar, tos, secret } = req.body;
+
+
+ if (secret != SECRET) {
+ const syslog = await Syslog.create({
+ user: username,
+ email: email,
+ event: "Failed Registration",
+ message: "Invalid secret",
+ ip: req.socket.remoteAddress
+ });
+ }
+
+ if((name && email && password && confirmPassword && username && tos) && (secret == SECRET) && (password == confirmPassword)){
+
+ async function userRole () {
+ let userCount = await User.count();
+ if(userCount == 0){
+ return "admin";
+ }else{
+ return "user";
+ }
+ }
+
+ let existingUser = await User.findOne({ where: {email:email}});
+ if(!existingUser){
+
+ try {
+ const user = await User.create({
+ name: name,
+ username: username,
+ email: email,
+ password: bcrypt.hashSync(password,10),
+ role: await userRole(),
+ group: 'all',
+ avatar: `
`
+ });
+
+ // make sure the user was created and get the UUID.
+ let newUser = await User.findOne({ where: {email:email}});
+ let match = await bcrypt.compare(password,newUser.password);
+
+ if(match){
+ req.session.user = newUser.username;
+ req.session.UUID = newUser.UUID;
+ req.session.role = newUser.role;
+ req.session.avatar = newUser.avatar;
+
+ const syslog = await Syslog.create({
+ user: req.session.user,
+ email: email,
+ event: "Successful Registration",
+ message: "User registered successfully",
+ ip: req.socket.remoteAddress
+ });
+
+ res.redirect("/");
+ }
+ } catch(err) {
+ res.render("register",{
+ "error":"Something went wrong when creating account.",
+ });
+ }
+
+ } else {
+ // return an error.
+ res.render("register",{
+ "error":"User with that email already exists.",
+ });
+ }
+ } else {
+ // Redirect to the signup page.
+ res.render("register",{
+ "error":"Please fill in all the fields and accept TOS.",
+ });
+ }
+}
\ No newline at end of file
diff --git a/controllers/settings.js b/controllers/settings.js
index 16a199a..a3196f6 100644
--- a/controllers/settings.js
+++ b/controllers/settings.js
@@ -1,14 +1,9 @@
-const User = require('../database/UserModel.js');
-const Server = require('../database/ServerModel.js');
-exports.Settings = async function(req, res) {
+export const Settings = (req, res) => {
- // Render the home page
- res.render("pages/settings", {
+ res.render("settings", {
name: req.session.user,
role: req.session.role,
avatar: req.session.avatar,
- isLoggedIn: true
});
-
}
\ No newline at end of file
diff --git a/controllers/syslogs.js b/controllers/syslogs.js
new file mode 100644
index 0000000..aa2d94a
--- /dev/null
+++ b/controllers/syslogs.js
@@ -0,0 +1,36 @@
+import { Syslog } from '../database/models.js';
+
+export const Syslogs = async function(req, res) {
+
+ let logs = '';
+
+ const syslogs = await Syslog.findAll({
+ order: [
+ ['id', 'DESC']
+ ]
+ });
+
+ for (const log of syslogs) {
+ let date = (log.createdAt).toDateString();
+ let time = (log.createdAt).toLocaleTimeString();
+ let datetime = `${time} ${date}`;
+
+ logs += `
',
+ logs: logs
+ });
+
+}
\ No newline at end of file
diff --git a/controllers/users.js b/controllers/users.js
index 9ddae52..1968c47 100644
--- a/controllers/users.js
+++ b/controllers/users.js
@@ -1,6 +1,6 @@
-const User = require('../database/UserModel');
+import { User } from '../database/models.js';
-exports.Users = async function(req, res) {
+export const Users = async (req, res) => {
let user_list = `
${data}`;
+// Container cards
+socket.on('containers', (data) => {
+ let deleteMeElements = document.querySelectorAll('.deleteme');
+ deleteMeElements.forEach((element) => {
+ element.parentNode.removeChild(element);
+ });
+ dockerCards.insertAdjacentHTML("afterend", data);
});
+function drawCharts(name, cpuArray, ramArray) {
+ let element = document.querySelector(`${name}`);
-socket.on('cards', (data) => {
-
- console.log('cards deleted');
- let deleteMeElements = document.querySelectorAll('.deleteme');
- deleteMeElements.forEach((element) => {
- element.parentNode.removeChild(element);
- });
-
- dockerCards.insertAdjacentHTML("afterend", data);
-
- // check localStorage for items ending with _cpu and redraw the charts
- for (let i = 0; i < localStorage.length; i++) {
- if (localStorage.key(i).endsWith('_cpu')) {
- let name = localStorage.key(i).split('_')[0];
- let cpu_array = JSON.parse(localStorage.getItem(`${name}_cpu`));
- let ram_array = JSON.parse(localStorage.getItem(`${name}_ram`));
- drawCharts(`#${name}_chart`, cpu_array, ram_array);
+ let chart = new ApexCharts(element, {
+ chart: {
+ type: "line",
+ height: 40.0,
+ sparkline: {
+ enabled: true
+ },
+ animations: {
+ enabled: false
+ }
+ },
+ fill: {
+ opacity: 1
+ },
+ stroke: {
+ width: [2, 1],
+ dashArray: [0, 3],
+ lineCap: "round",
+ curve: "smooth"
+ },
+ series: [{
+ name: "CPU",
+ data: cpuArray
+ }, {
+ name: "RAM",
+ data: ramArray
+ }],
+ tooltip: {
+ enabled: false
+ },
+ grid: {
+ strokeDashArray: 4
+ },
+ xaxis: {
+ labels: {
+ padding: 0
+ },
+ tooltip: {
+ enabled: false
+ }
+ },
+ yaxis: {
+ labels: {
+ padding: 4
+ }
+ },
+ colors: [tabler.getColor("primary"), tabler.getColor("gray-600")],
+ legend: {
+ show: false
}
- }
-
-
-});
+ })
+ chart.render();
+}
+
+// Buttons functions
+function clicked(button) {
+ socket.emit('clicked', {name: button.name, id: button.id, value: button.value});
+}
socket.on('containerStats', (data) => {
-
- let {name, cpu, ram} = data;
-
- console.log(`drawing chart for ${name}`)
-
- var cpu_array = JSON.parse(localStorage.getItem(`${name}_cpu`));
- var ram_array = JSON.parse(localStorage.getItem(`${name}_ram`));
-
- if (cpu_array == null) { cpu_array = Array(30).fill(0); }
- if (ram_array == null) { ram_array = Array(30).fill(0); }
-
- cpu_array.push(cpu);
- ram_array.push(ram);
+ let containerStats = data;
- cpu_array = cpu_array.slice(-30);
- ram_array = ram_array.slice(-30);
+ for (const [name, statsArray] of Object.entries(containerStats)) {
- localStorage.setItem(`${name}_cpu`, JSON.stringify(cpu_array));
- localStorage.setItem(`${name}_ram`, JSON.stringify(ram_array));
+ let cpuArray = statsArray.cpuArray;
+ let ramArray = statsArray.ramArray;
- // replace the old chart with the new one
- let chart = document.getElementById(`${name}_chart`);
- if (chart) {
- let newChart = document.createElement('div');
- newChart.id = `${name}_chart`;
- chart.parentNode.replaceChild(newChart, chart);
- drawCharts(`#${name}_chart`, cpu_array, ram_array);
- } else {
- console.log(`Chart element with id ${name}_chart not found in the DOM`);
+ let chart = document.getElementById(`${name}_chart`);
+ if (chart) {
+ chart.innerHTML = '';
+ drawCharts(`#${name}_chart`, cpuArray, ramArray);
+ } else {
+ console.log(`Chart element with id ${name}_chart not found in the DOM`);
+ }
}
+
});
-socket.on('install', (data) => {
-
- console.log('added install card');
- dockerCards.insertAdjacentHTML("afterend", data);
+
+
+// socket.on('install', (data) => {
+// dockerCards.insertAdjacentHTML("afterend", data);
+// });
+
+// let containerLogs;
+
+// function viewLogs(button) {
+// if (button.name != 'refresh') {
+// containerLogs = button.name;
+// }
+// socket.emit('logs', {container: containerLogs});
+// }
+
+socket.on('logs', (data) => {
+ logViewer.innerHTML = `${data}`;
});
diff --git a/public/static/logo-dark.svg b/public/static/logo-dark.svg
new file mode 100644
index 0000000..02d81dc
--- /dev/null
+++ b/public/static/logo-dark.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/static/logo-sm-black.svg b/public/static/logo-sm-black.svg
new file mode 100644
index 0000000..4664975
--- /dev/null
+++ b/public/static/logo-sm-black.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/static/logo-sm-white.svg b/public/static/logo-sm-white.svg
new file mode 100644
index 0000000..0a44230
--- /dev/null
+++ b/public/static/logo-sm-white.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/static/logo-small-white.svg b/public/static/logo-small-white.svg
deleted file mode 100644
index 4d436ef..0000000
--- a/public/static/logo-small-white.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/public/static/logo-small.svg b/public/static/logo-small.svg
deleted file mode 100644
index 4b14f51..0000000
--- a/public/static/logo-small.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/public/static/logo-white.svg b/public/static/logo-white.svg
deleted file mode 100644
index 3d6af9a..0000000
--- a/public/static/logo-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/public/static/logo.svg b/public/static/logo.svg
index 5d395f4..6dfb8a9 100644
--- a/public/static/logo.svg
+++ b/public/static/logo.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/router/index.js b/router/index.js
new file mode 100644
index 0000000..c00fbaf
--- /dev/null
+++ b/router/index.js
@@ -0,0 +1,60 @@
+import express from "express";
+import { io } from "../app.js";
+
+import { Login, submitLogin } from "../controllers/login.js";
+import { Register, submitRegister } from "../controllers/register.js";
+import { Dashboard, searchDashboard } from "../controllers/dashboard.js";
+import { Apps } from "../controllers/apps.js";
+import { Users } from "../controllers/users.js";
+import { Images } from "../controllers/images.js";
+import { Account } from "../controllers/account.js";
+import { Settings } from "../controllers/settings.js";
+import { Networks } from "../controllers/networks.js";
+import { Volumes } from "../controllers/volumes.js";
+import { Syslogs } from "../controllers/syslogs.js";
+
+export const router = express.Router();
+
+const auth = (req, res, next) => {
+ if (req.session.role == "admin") {
+ next();
+ } else {
+ res.redirect("/login");
+ }
+};
+
+
+router.get("/login", Login);
+router.post("/login", submitLogin);
+
+router.get("/register", Register);
+router.post("/register", submitRegister);
+
+router.get("/", auth, Dashboard);
+router.post("/", auth, searchDashboard);
+router.post("/:search", auth, searchDashboard);
+
+router.get("/apps", auth, Apps);
+router.get("/apps/:page", auth, Apps);
+
+router.get("/users", auth, Users);
+
+router.get("/images", auth, Images);
+
+router.get("/networks", auth, Networks);
+
+router.get("/volumes", auth, Volumes);
+
+router.get("/syslogs", auth, Syslogs);
+
+router.get("/account", Account);
+
+router.get("/settings", auth, Settings);
+
+router.get("/logout", (req, res) => {
+ const sessionId = req.session.id;
+ req.session.destroy(() => {
+ io.to(sessionId).disconnectSockets();
+ res.redirect("/login");
+ });
+});
\ No newline at end of file
diff --git a/routes/index.js b/routes/index.js
deleted file mode 100644
index 79d8411..0000000
--- a/routes/index.js
+++ /dev/null
@@ -1,59 +0,0 @@
-const express = require("express");
-const router = express.Router();
-
-const { Dashboard, AddSite, RemoveSite, RefreshSites, DisableSite, EnableSite } = require("../controllers/dashboard");
-const { Login, processLogin, Logout, Register, processRegister } = require("../controllers/auth");
-const { Apps, searchApps, Install, Uninstall } = require("../controllers/apps");
-
-const { Images } = require("../controllers/images");
-const { Volumes } = require("../controllers/volumes");
-const { Networks } = require("../controllers/networks");
-
-const { Users } = require("../controllers/users");
-const { Account } = require("../controllers/account");
-const { Settings } = require("../controllers/settings");
-
-// Authentication middleware
-const authenticate = (req, res, next) => {
- if (req.session && req.session.role == "admin") {
- console.log(`User ${req.session.user} [${req.session.role}] accessed ${req.originalUrl}`)
- next();
- } else {
- console.log('Not admin')
- res.redirect("/login");
- }
-};
-
-// Dashboard
-router.get("/", authenticate, Dashboard);
-router.post("/addsite", authenticate, AddSite);
-router.post("/removesite", authenticate, RemoveSite);
-router.get("/refreshsites", authenticate, RefreshSites);
-router.post("/disablesite", authenticate, DisableSite);
-router.post("/enablesite", authenticate, EnableSite);
-
-router.get("/images", authenticate, Images);
-
-// Auth
-router.get("/login", Login);
-router.post("/login", processLogin);
-router.get("/register", Register);
-router.post("/register", processRegister);
-router.get("/logout", Logout);
-
-// Apps page
-router.get("/apps", authenticate, Apps);
-router.get("/apps/:page", authenticate, Apps);
-router.get("/apps/:template/:page", authenticate, Apps);
-router.post("/apps", authenticate, searchApps);
-
-// Settings page
-router.get("/settings", authenticate, Settings);
-router.get("/account", authenticate, Account);
-
-router.post("/install", authenticate, Install);
-router.post("/uninstall", authenticate, Uninstall);
-
-router.get("/users", authenticate, Users);
-
-module.exports = router;
\ No newline at end of file
diff --git a/screenshots/account.png b/screenshots/account.png
deleted file mode 100644
index 0f2d996..0000000
Binary files a/screenshots/account.png and /dev/null differ
diff --git a/screenshots/apps.png b/screenshots/apps.png
deleted file mode 100644
index ce86c91..0000000
Binary files a/screenshots/apps.png and /dev/null differ
diff --git a/screenshots/dashboard.png b/screenshots/dashboard.png
deleted file mode 100644
index 16d8450..0000000
Binary files a/screenshots/dashboard.png and /dev/null differ
diff --git a/screenshots/logs.png b/screenshots/logs.png
deleted file mode 100644
index 0a9cff3..0000000
Binary files a/screenshots/logs.png and /dev/null differ
diff --git a/screenshots/register.png b/screenshots/register.png
deleted file mode 100644
index a72e51a..0000000
Binary files a/screenshots/register.png and /dev/null differ
diff --git a/setup.sh b/setup.sh
deleted file mode 100644
index 7264ca7..0000000
--- a/setup.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/bash
-
-# To demo DweebUI, run this script on a fresh Debian 12.2 install. This script will open port 443/tcp for Reverse Proxy and 22/tcp for SSH.
-
-# Manual Install:
-# cd DweebUI
-# chmod +x setup.sh
-# sudo ./setup.sh
-
-# Install dependencies
-apt-get install -y curl unzip ufw gnupg ca-certificates lsb-release gpg
-
-# Enable firewall
-ufw allow ssh && ufw --force enable
-
-# Opens port 443/tcp for Reverse Proxy
-ufw allow https
-
-# Install Docker
-install -m 0755 -d /etc/apt/keyrings
-curl -fsSL https://download.docker.com/linux/debian/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
-chmod a+r /etc/apt/keyrings/docker.gpg
-
-echo \
- "deb [arch="$(dpkg --print-architecture)" signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian \
- "$(. /etc/os-release && echo "$VERSION_CODENAME")" stable" | \
- sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
-sudo apt-get update -y
-sudo apt-get install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
-
-# Create docker network
-docker network create -d bridge AppBridge
-
-# Create a redis docker container with persistent storage and a password
-docker run -d --name DweebCache --restart unless-stopped -v /home/docker/redis:/data -p 6379:6379 redis redis-server --requirepass "somesupersecretpassword"
-
-
-# Install redis
-# curl -fsSL https://packages.redis.io/gpg | sudo gpg --dearmor -o /usr/share/keyrings/redis-archive-keyring.gpg
-# echo "deb [signed-by=/usr/share/keyrings/redis-archive-keyring.gpg] https://packages.redis.io/deb $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/redis.list
-# apt-get update -y
-# apt-get install -y redis
-# systemctl enable --now redis-server
-
-# Install nodejs
-mkdir -p /etc/apt/keyrings
-curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
-NODE_MAJOR=20
-echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list
-sudo apt-get update
-sudo apt-get install nodejs -y
-
-npm i
-
-# Prep for caddy
-mkdir -p /home/docker/caddy/sites
-echo "import sites/*" > /home/docker/caddy/Caddyfile.tmp
-mv /home/docker/caddy/Caddyfile.tmp /home/docker/caddy/Caddyfile
-
-
-# Install pm2 and start DweebUI
-npm install pm2 -g
-pm2 start app.js --name "dweebui"
-pm2 log
-
-
-# Creates a 'docker-compose' alias, since the command changed to 'docker compose' in Debian 11.
-echo '#!/bin/sh
-docker compose "$@"' > /usr/local/bin/docker-compose
-chmod +x /usr/local/bin/docker-compose
diff --git a/views/pages/account.ejs b/views/account.ejs
similarity index 85%
rename from views/pages/account.ejs
rename to views/account.ejs
index 4274200..2831f17 100644
--- a/views/pages/account.ejs
+++ b/views/account.ejs
@@ -4,25 +4,25 @@
-