SYNC: Merge branch 'feature/firestore'

This commit is contained in:
SPRINX0\prochazka
2025-07-25 07:52:30 +02:00
committed by Diflow
parent b12587626d
commit ca145967dc
7 changed files with 91 additions and 40 deletions

View File

@@ -25,3 +25,4 @@ DEVWEB=1
# LOGIN_PASSWORD_test=test
# LOGIN_PERMISSIONS_test=~*, widgets/database
# WORKSPACE_DIR=/home/jena/dbgate-data-2
DBGATE_LICENSE=eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJlbWFpbCI6InNhbGVzQGRiZ2F0ZS5ldSIsIm5hbWUiOiJEYkdhdGUgdGVzdCIsImxpY2Vuc2VJZCI6Ijk2ODJhODhiLTkwOWYtNDhiMS1hZGJmLWMwMzYyMjg4NDQyMSIsImNyZWF0ZWQiOiIyMDI1LTA2LTEyVDE1OjQ0OjAwLjY0NloiLCJlbmQiOjE3ODEyNzkwNDEsImV4cCI6MTc4MTg4Mzg0MSwiaWF0IjoxNzQ5NzQzMDQwfQ.h-pYymeb8ivJMo695PLo-tKxqfr3ZBiyZA4GllnAZbLDwBtxKY54BKfI2j70AtckuohAhn4i6VZn7UG_MIQSZVE7z8pwZyP4Jj8NUt9fYpCOFUfJMl_3iP6WOQ0eb9cyHfNsbKkXbi9wEuXoblLDCi2ve76ODqByPwA7FfCuY97zrxe9Zzth09Z4M0KjfeX7L50tQzMBVqW2rQAH1yc48fsaRbX8IABUqpvIjmhQBAgKlNltZlQrUfd1Egyi8TBSqvXhgqDz-gnJW_oe5eb2-emWZln38p7QwQy4smvvtOVZuUozv0boLS3wfzp9JaDZ4SXjWpBx-la7vm8L6wQYBQ

View File

@@ -101,24 +101,26 @@ function decryptObjectPasswordField(obj, field, encryptor = null) {
return obj;
}
const fieldsToEncrypt = ['password', 'sshPassword', 'sshKeyfilePassword', 'connectionDefinition'];
function encryptConnection(connection, encryptor = null) {
if (connection.passwordMode != 'saveRaw') {
connection = encryptObjectPasswordField(connection, 'password', encryptor);
connection = encryptObjectPasswordField(connection, 'sshPassword', encryptor);
connection = encryptObjectPasswordField(connection, 'sshKeyfilePassword', encryptor);
for (const field of fieldsToEncrypt) {
connection = encryptObjectPasswordField(connection, field, encryptor);
}
}
return connection;
}
function maskConnection(connection) {
if (!connection) return connection;
return _.omit(connection, ['password', 'sshPassword', 'sshKeyfilePassword']);
return _.omit(connection, fieldsToEncrypt);
}
function decryptConnection(connection, encryptor = null) {
connection = decryptObjectPasswordField(connection, 'password', encryptor);
connection = decryptObjectPasswordField(connection, 'sshPassword', encryptor);
connection = decryptObjectPasswordField(connection, 'sshKeyfilePassword', encryptor);
function decryptConnection(connection) {
for (const field of fieldsToEncrypt) {
connection = decryptObjectPasswordField(connection, field);
}
return connection;
}
@@ -188,9 +190,9 @@ function recryptObjectPasswordFieldInPlace(obj, field, decryptEncryptor, encrypt
}
function recryptConnection(connection, decryptEncryptor, encryptEncryptor) {
connection = recryptObjectPasswordField(connection, 'password', decryptEncryptor, encryptEncryptor);
connection = recryptObjectPasswordField(connection, 'sshPassword', decryptEncryptor, encryptEncryptor);
connection = recryptObjectPasswordField(connection, 'sshKeyfilePassword', decryptEncryptor, encryptEncryptor);
for (const field of fieldsToEncrypt) {
connection = recryptObjectPasswordField(connection, field, decryptEncryptor, encryptEncryptor);
}
return connection;
}