admin/FACULTATE-LICENTA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v2.9

Browse Source
This commit is contained in:
andrei-mihnea-cerbu
2024-04-25 00:29:16 +03:00
parent e47a991d72
commit 5ebdc1b69a
15 changed files with 327 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CEO/src/main/main.js
+61 -33
View File
@@ -1,4 +1,4 @@
const {app, BrowserWindow, screen, ipcMain, dialog} = require('electron');
const {app, BrowserWindow, screen, ipcMain, dialog, shell} = require('electron');
const fs = require('fs');
const path = require('path');
const crypto = require('crypto');
@@ -6,6 +6,7 @@ const {fork} = require('child_process');
const {encryptFileInPlace, decryptFileInPlace} = require('./aes_encrypt');
const {lockFile, unlockFile} = require("../../helpers/lock_mechanism");
const exec = require("nodemon/lib/config/exec");
const isMac = process.platform === 'darwin';
let html_page = undefined;
@@ -31,32 +32,11 @@ const createInitialKeys = () => {
console.log(`IV saved to ${ivPath}`);
}
const deleteMainComponentsAtErrorStart = () => {
const ipConfigPath = path.join(__dirname, '..', '..', 'ipConfig.json');
const loginDataPath = path.join(__dirname, '..', '..', 'loginData.json');
fs.unlink(ipConfigPath, (err) => {
if (err) {
console.error('Error deleting file:', err);
return;
}
console.log('File deleted successfully: ' + 'ipConfig.json');
});
fs.unlink(loginDataPath, (err) => {
if (err) {
console.error('Error deleting file:', err);
return;
}
console.log('File deleted successfully: ' + 'loginData.json');
});
}
const checkForServerConnection = async () => {
const pathToIpConfig = path.join(__dirname, '..', '..', 'ipConfig.json');
try {
console.log('Checking for server connection');
await fs.promises.access(pathToIpConfig);
await lockFile(pathToIpConfig);
@@ -71,17 +51,35 @@ const checkForServerConnection = async () => {
return response.ok;
} catch (error) {
console.error("Error:", error);
return false;
} finally{
try{
fs.unlinkSync(pathToIpConfig);
}
catch{
}
return false;
}
};
async function runStartupChecks() {
try {
await fs.promises.access(path.join(__dirname, '..', '..', 'secret.key'), fs.constants.F_OK);
await fs.promises.access(path.join(__dirname, '..', '..', 'iv.key'), fs.constants.F_OK);
} catch (err) {
console.error("Startup error detected:", err);
// Run the npm clean script
await exec('npm run clean', { cwd: path.join(__dirname, '..', '..') }, (error, stdout, stderr) => {
if (error) {
console.error('Error occurred while running npm run clean:', stderr);
return;
}
console.log('npm run clean output:', stdout);
createInitialKeys();
});
}
}
const createMainWindow = (async (title, width, height) => {
mainWindow = new BrowserWindow({
title: title,
@@ -94,14 +92,7 @@ const createMainWindow = (async (title, width, height) => {
}
});
try {
await fs.promises.access(path.join(__dirname, '..', '..', 'secret.key'), fs.constants.F_OK);
await fs.promises.access(path.join(__dirname, '..', '..', 'iv.key'), fs.constants.F_OK);
} catch (err) {
createInitialKeys();
deleteMainComponentsAtErrorStart();
}
await runStartupChecks();
html_page = await checkForServerConnection() ? 'login.html' : 'ip_submit.html';
//mainWindow.setMenu(null);
@@ -392,3 +383,40 @@ ipcMain.handle('decrypt-backup-files', async(event, destPath) => {
});
}
})
// Handle showing a file in the system file explorer
ipcMain.handle('show-file-in-explorer', async (event, filePath) => {
try {
// Ensure the file exists before attempting to show it
await fs.promises.access(filePath, fs.constants.F_OK);
shell.showItemInFolder(filePath); // Opens the file explorer and highlights the file
return true;
} catch (error) {
console.error('File does not exist:', error);
return false
}
});
// Handle removing a path from 'filesReceived.json'
ipcMain.handle('remove-path-from-received-files', async (event, filePath) => {
try {
const jsonFilePath = path.join(__dirname, '..', '..', 'filesReceived.json');
await lockFile(jsonFilePath);
await decryptFileInPlace(jsonFilePath);
const data = await fs.promises.readFile(jsonFilePath, 'utf8');
const jsonData = JSON.parse(data);
// Filter out the specified file path
jsonData.receivedFiles = jsonData.receivedFiles.filter(file => file !== filePath);
await fs.promises.writeFile(jsonFilePath, JSON.stringify(jsonData, null, 2), 'utf8');
await encryptFileInPlace(jsonFilePath);
await unlockFile(jsonFilePath);
return true;
} catch (error) {
console.error('Error updating filesReceived.json:', error);
throw new Error('Failed to update received files list.');
}
});
CEO/src/main/preload.js
+4 -1
View File
@@ -14,5 +14,8 @@ contextBridge.exposeInMainWorld('electronAPI', {
startMainProcesses: async (args) => ipcRenderer.invoke('start-main-processes', args),
killBeforeLogout: async() => ipcRenderer.invoke('kill-before-logout'),
decryptFiles: async(destPath) => ipcRenderer.invoke('decrypt-backup-files', destPath)
decryptFiles: async(destPath) => ipcRenderer.invoke('decrypt-backup-files', destPath),
showFileInExplorer: (filePath) => ipcRenderer.invoke('show-file-in-explorer', filePath),
removePathFromReceivedFiles: (filePath) => ipcRenderer.invoke('remove-path-from-received-files', filePath)
});
CEO/src/renderer/js/login.js
-1
View File
@@ -18,7 +18,6 @@ document.addEventListener('DOMContentLoaded', async function () {
await window.electronAPI.readFile('loginData.json')
.then(async result => {
const loginData = JSON.parse(result.content);
console.log(loginData);
const {email, password} = loginData;
await fetch(`http://${ip}/ceo/login`, {
CEO/src/renderer/js/main_menu.js
+49 -1
View File
@@ -1,5 +1,6 @@
document.addEventListener('DOMContentLoaded', async function () {
await insertUsername();
setInterval(loadReceivedFiles, 3000); // Call loadReceivedFiles every 5000 ms (5 seconds)
const backupButton = document.getElementById('backup');
const shareButton = document.getElementById('share_dir');
@@ -11,6 +12,53 @@ document.addEventListener('DOMContentLoaded', async function () {
const decryptButton = document.getElementById('decrypt');
const logoutButton = document.getElementById('logout');
async function loadReceivedFiles() {
const checkFileReceived = await window.electronAPI.checkFileExists('filesReceived.json');
if (!checkFileReceived) {
return;
}
try {
const fileData = await window.electronAPI.readFile('filesReceived.json');
const filesJson = JSON.parse(fileData.content);
const receivedFiles = filesJson.receivedFiles;
const notificationsDiv = document.getElementById('notifications');
const existingButtons = Array.from(notificationsDiv.children).map(button => button.getAttribute('data-filepath'));
receivedFiles.forEach(filePath => {
// Check if the button for this file path already exists
if (!existingButtons.includes(filePath)) {
const button = document.createElement('button');
button.setAttribute('data-filepath', filePath); // Set a custom attribute to track the file path
button.name = 'notification';
button.textContent = 'You received a file';
button.addEventListener('click', () => handleFileReceivedButtonPressed(filePath, button));
notificationsDiv.appendChild(button);
}
});
} catch (error) {
console.error('Error loading received files:', error);
}
}
async function handleFileReceivedButtonPressed(filePath, button) {
console.log('Notification button clicked!');
// Open file in file explorer
await window.electronAPI.showFileInExplorer(filePath)
.then(() => console.log('File explorer opened'))
.catch(error => console.error('Error opening file explorer:', error));
// Remove the button
button.remove();
// Call to remove the path from the JSON file
await window.electronAPI.removePathFromReceivedFiles(filePath)
.then(() => console.log('Path removed from received files'))
.catch(error => console.error('Error removing path:', error));
}
checkDirBackupFileExists()
.then(() => console.log('verificare backupDir facuta'));
@@ -134,7 +182,7 @@ document.addEventListener('DOMContentLoaded', async function () {
.then(() => console.log('Alert window opened'))
.catch(error => console.error('Error showing alert:', error)));
const button = document.getElementById('backup_alert');
const button = document.getElementById('share_alert');
button.remove();
}