@@ -4870,13 +4862,6 @@ function renderSettings() {
document.getElementById('chooseLogFilePathBtn')?.addEventListener('click', chooseLogFilePath);
document.getElementById('openLogFolderBtn')?.addEventListener('click', () => window.api.openLogFolder());
document.getElementById('manualUpdateCheckBtn')?.addEventListener('click', requestUpdateCheck);
- window.api.getSecretStoreStatus().then(result => {
- const badge = document.getElementById('secretStoreStatus');
- if (!badge) return;
- const available = result?.status === 'available';
- badge.textContent = available ? 'Sicher verfügbar' : 'Nicht verfügbar';
- badge.classList.toggle('active', available);
- }).catch(() => {});
_syncHeaderUpdateState();
container.querySelectorAll('.settings-autosave').forEach((input) => {
const eventName = input.type === 'checkbox' || input.tagName === 'SELECT' ? 'change' : 'input';
@@ -4894,15 +4879,6 @@ function renderSettings() {
});
if (!confirmed) input.checked = false;
}
- if (input.id === 'allowPlaintextCredentialStorageInput' && input.checked) {
- const confirmed = await showAppConfirm({
- title: 'Zugangsdaten unverschlüsselt speichern?',
- message: 'Passwörter und API-Keys werden dann im Klartext auf diesem PC gespeichert. Andere Benutzer oder Programme mit Dateizugriff können sie lesen.',
- confirmText: 'Klartext-Speicherung erlauben',
- danger: true
- });
- if (!confirmed) input.checked = false;
- }
markSettingsDirty();
});
});
@@ -5028,7 +5004,6 @@ async function performSaveSettings(options = {}) {
})(),
resumeQueueOnLaunch: elChk('resumeQueueOnLaunchInput', cur.resumeQueueOnLaunch !== false),
autoStartRestoredQueue: elChk('autoStartRestoredQueueInput', !!cur.autoStartRestoredQueue),
- allowPlaintextCredentialStorage: elChk('allowPlaintextCredentialStorageInput', !!cur.allowPlaintextCredentialStorage),
parallelUploadCount: elInt('parallelUploadCountInput', cur.parallelUploadCount ?? 0, 0, 0, 100),
scaleParallelUploads: elChk('scaleParallelUploadsInput', !!cur.scaleParallelUploads),
removeFromQueueOnDone: elChk('removeFromQueueOnDoneInput', !!cur.removeFromQueueOnDone),
diff --git a/renderer/i18n.js b/renderer/i18n.js
index 66f4a4e..cdc0d4e 100644
--- a/renderer/i18n.js
+++ b/renderer/i18n.js
@@ -474,13 +474,6 @@
['Zugangsdaten konnten nicht sicher verschlüsselt werden', 'Credentials could not be encrypted securely'],
['Gespeicherte Zugangsdaten konnten nicht entschlüsselt werden', 'Stored credentials could not be decrypted'],
['Zugangsdaten gesperrt', 'Credentials locked'],
- ['Unsichere Klartext-Speicherung erlauben', 'Allow insecure plaintext storage'],
- ['Nur verwenden, wenn der sichere Betriebssystem-Speicher dauerhaft nicht verfügbar ist. Passwörter und API-Keys liegen dann lesbar in der Konfigurationsdatei.', 'Use only when secure operating system storage is permanently unavailable. Passwords and API keys will then be readable in the configuration file.'],
- ['Sicher verfügbar', 'Securely available'],
- ['Nicht verfügbar', 'Unavailable'],
- ['Zugangsdaten unverschlüsselt speichern?', 'Store credentials without encryption?'],
- ['Passwörter und API-Keys werden dann im Klartext auf diesem PC gespeichert. Andere Benutzer oder Programme mit Dateizugriff können sie lesen.', 'Passwords and API keys will then be stored as plaintext on this PC. Other users or programs with file access can read them.'],
- ['Klartext-Speicherung erlauben', 'Allow plaintext storage'],
['Die Verlaufsdatei ist beschädigt und wurde nicht verändert', 'The history file is damaged and was not changed'],
['Verlauf und Aufbewahrung konnten nicht konsistent gespeichert werden', 'History and retention could not be saved consistently'],
['Kein Ordnerpfad angegeben', 'No folder path was provided'],
diff --git a/renderer/styles.css b/renderer/styles.css
index 21066e3..d1f45dd 100644
--- a/renderer/styles.css
+++ b/renderer/styles.css
@@ -3318,16 +3318,6 @@ input[type="checkbox"] {
border-color: var(--danger);
}
-.settings-option.credential-fallback-option {
- margin-top: 12px;
- border-color: color-mix(in srgb, var(--danger) 72%, var(--border));
- box-shadow: inset 0 0 0 1px color-mix(in srgb, var(--danger) 10%, transparent);
-}
-
-.settings-option.credential-fallback-option:focus-within {
- border-color: var(--danger);
-}
-
.settings-option-description,
.hint {
color: var(--text-dim);
diff --git a/tests/config-store.test.js b/tests/config-store.test.js
index 0db1f42..0f4c97d 100644
--- a/tests/config-store.test.js
+++ b/tests/config-store.test.js
@@ -3,7 +3,20 @@ const assert = require('node:assert/strict');
const fs = require('fs');
const path = require('path');
const os = require('os');
+const Module = require('node:module');
+const originalLoad = Module._load;
+const safeStorage = {
+ isEncryptionAvailable: () => true,
+ encryptString: value => Buffer.from(`test-protected:${value}`),
+ decryptString: value => value.toString().replace(/^test-protected:/, '')
+};
+Module._load = function load(request, parent, isMain) {
+ if (request === 'electron') return { safeStorage };
+ return originalLoad.call(this, request, parent, isMain);
+};
const ConfigStore = require('../lib/config-store');
+require('../lib/secret-store').encryptField('test-initialization');
+Module._load = originalLoad;
let tmpDir;
let store;
@@ -15,7 +28,7 @@ function createStore() {
};
// ConfigStore uses path.join(__dirname, '..') for non-packaged
// We override by setting filePath directly
- store = new ConfigStore(fakeApp, { allowPlaintextCredentialStorage: true });
+ store = new ConfigStore(fakeApp);
store.filePath = path.join(tmpDir, 'electron-config.json');
store.historyPath = path.join(tmpDir, 'electron-history.json');
return store;
@@ -46,7 +59,7 @@ describe('ConfigStore', () => {
if (name === 'exe') return path.join(isolatedDir, 'Multi-Hoster-Upload.exe');
throw new Error(`Unexpected app path: ${name}`);
}
- }, { allowPlaintextCredentialStorage: true });
+ });
try {
assert.equal(explicitStore.filePath, path.join(isolatedDir, 'electron-config.json'));
@@ -76,6 +89,7 @@ describe('ConfigStore', () => {
assert.equal(config.globalSettings.shutdownAfterFinish, 'nothing');
assert.equal(config.globalSettings.logFilePath, '');
assert.equal(config.globalSettings.resumeQueueOnLaunch, true);
+ assert.equal(Object.hasOwn(config.globalSettings, 'allowPlaintextCredentialStorage'), false);
assert.equal(config.globalSettings.parallelUploadCount, 0);
assert.equal(config.globalSettings.scaleParallelUploads, false);
assert.equal(config.globalSettings.lastBrowseDirectory, '');
@@ -83,6 +97,28 @@ describe('ConfigStore', () => {
assert.deepEqual(config.history, []);
});
+ it('drops the retired plaintext credential setting from legacy configurations', () => {
+ fs.writeFileSync(store.filePath, JSON.stringify({
+ hosters: {},
+ hosterSettings: {},
+ globalSettings: { allowPlaintextCredentialStorage: true }
+ }), 'utf-8');
+
+ const config = store.load();
+
+ assert.equal(Object.hasOwn(config.globalSettings, 'allowPlaintextCredentialStorage'), false);
+ });
+
+ it('never writes the retired plaintext credential setting back to disk', async () => {
+ await store.save({
+ globalSettings: { allowPlaintextCredentialStorage: true }
+ });
+
+ const saved = JSON.parse(fs.readFileSync(store.filePath, 'utf-8'));
+
+ assert.equal(Object.hasOwn(saved.globalSettings, 'allowPlaintextCredentialStorage'), false);
+ });
+
it('keeps permanent source deletion disabled by default', () => {
const config = store.load();
assert.equal(config.globalSettings.deleteSourceAfterSuccessfulUpload, false);
@@ -579,7 +615,7 @@ describe('ConfigStore history split (electron-history.json)', () => {
let s;
function makeStore() {
- const st = new ConfigStore({ isPackaged: false, getPath: () => dir }, { allowPlaintextCredentialStorage: true });
+ const st = new ConfigStore({ isPackaged: false, getPath: () => dir });
st.filePath = path.join(dir, 'electron-config.json');
st.historyPath = path.join(dir, 'electron-history.json');
return st;
diff --git a/tests/remote-config.test.js b/tests/remote-config.test.js
index efaabf9..e626a8f 100644
--- a/tests/remote-config.test.js
+++ b/tests/remote-config.test.js
@@ -3,6 +3,25 @@ const assert = require('node:assert');
const path = require('path');
const fs = require('fs');
const os = require('os');
+const Module = require('node:module');
+
+const originalLoad = Module._load;
+Module._load = function load(request, parent, isMain) {
+ if (request === 'electron') {
+ return {
+ safeStorage: {
+ isEncryptionAvailable: () => true,
+ encryptString: value => Buffer.from(`test-protected:${value}`),
+ decryptString: value => value.toString().replace(/^test-protected:/, '')
+ }
+ };
+ }
+ return originalLoad.call(this, request, parent, isMain);
+};
+
+const ConfigStore = require('../lib/config-store');
+require('../lib/secret-store').encryptField('test-initialization');
+Module._load = originalLoad;
// Minimal app mock for ConfigStore
function createTestConfigStore() {
@@ -12,8 +31,7 @@ function createTestConfigStore() {
getPath: (name) => tmpDir,
getPath: () => tmpDir
};
- const ConfigStore = require('../lib/config-store');
- const store = new ConfigStore(mockApp, { allowPlaintextCredentialStorage: true });
+ const store = new ConfigStore(mockApp);
store.filePath = path.join(tmpDir, 'test-config.json');
return { store, tmpDir };
}
diff --git a/tests/secret-store.test.js b/tests/secret-store.test.js
index 3749bc8..5bf802b 100644
--- a/tests/secret-store.test.js
+++ b/tests/secret-store.test.js
@@ -28,15 +28,6 @@ function availableSafeStorage(overrides = {}) {
};
}
-test('reports whether secure credential storage is available', () => {
- withSecretStore(availableSafeStorage(), secretStore => {
- assert.equal(secretStore.getAvailabilityStatus(), 'available');
- });
- withSecretStore(null, secretStore => {
- assert.equal(secretStore.getAvailabilityStatus(), 'unavailable');
- });
-});
-
test('encrypts and decrypts fields when secure storage is available', () => {
withSecretStore(availableSafeStorage(), secretStore => {
const encrypted = secretStore.encryptField('secret');
@@ -55,13 +46,18 @@ test('refuses plaintext storage by default when secure storage is unavailable',
});
});
-test('allows plaintext storage only through an explicit opt-in', () => {
+test('never allows plaintext storage when secure storage is unavailable', () => {
withSecretStore(null, secretStore => {
- assert.equal(secretStore.encryptField('secret', { allowPlaintext: true }), 'secret');
+ assert.throws(
+ () => secretStore.encryptField('secret', { allowPlaintext: true }),
+ error => error instanceof secretStore.SecretStoreError
+ && error.code === 'SECRET_STORE_UNAVAILABLE'
+ );
const config = { hosters: { example: [{ password: 'secret' }] } };
- assert.equal(
- secretStore.encryptCredentials(config, { allowPlaintext: true }).hosters.example[0].password,
- 'secret'
+ assert.throws(
+ () => secretStore.encryptCredentials(config, { allowPlaintext: true }),
+ error => error instanceof secretStore.SecretStoreError
+ && error.code === 'SECRET_STORE_UNAVAILABLE'
);
});
});
@@ -75,7 +71,12 @@ test('refuses plaintext storage by default when encryption fails', () => {
&& error.code === 'SECRET_STORE_ENCRYPT_FAILED'
&& error.cause === failure
);
- assert.equal(secretStore.encryptField('secret', { allowPlaintext: true }), 'secret');
+ assert.throws(
+ () => secretStore.encryptField('secret', { allowPlaintext: true }),
+ error => error instanceof secretStore.SecretStoreError
+ && error.code === 'SECRET_STORE_ENCRYPT_FAILED'
+ && error.cause === failure
+ );
});
});
diff --git a/tests/ui-smoke.js b/tests/ui-smoke.js
index 613d4c7..9c83c9c 100644
--- a/tests/ui-smoke.js
+++ b/tests/ui-smoke.js
@@ -1031,6 +1031,8 @@ setTimeout(async () => {
await wc.executeJavaScript('document.querySelector("[data-settings-page=\\'uploads\\']")?.click()');
const uploadSettingsState = await wc.executeJavaScript('(() => { const activePage = document.querySelector(".settings-subpage.active"); return [activePage?.dataset.subpage, activePage?.querySelector("h3")?.textContent.trim(), document.querySelector("label[for=removeFromQueueOnDoneInput]")?.textContent.trim(), document.getElementById("removeFromQueueOnDoneInput")?.closest(".settings-option")?.querySelector(".settings-option-description")?.textContent.trim()].join("|"); })()');
check('Upload completion behavior is immediately findable', uploadSettingsState === 'uploads|Upload-Verhalten|Nach Abschluss aus der Liste entfernen|Erfolgreich hochgeladene Dateien verschwinden automatisch aus der Upload-Liste.');
+ const plaintextCredentialOverride = await wc.executeJavaScript('(() => ({ control: document.getElementById("allowPlaintextCredentialStorageInput"), copy: document.body.textContent.includes("Unsichere Klartext-Speicherung"), bridge: typeof window.api.getSecretStoreStatus }))()');
+ check('Settings expose no plaintext credential storage override', plaintextCredentialOverride.control === null && plaintextCredentialOverride.copy === false && plaintextCredentialOverride.bridge === 'undefined');
const settingsTypography = await wc.executeJavaScript('(() => { const size = selector => parseFloat(getComputedStyle(document.querySelector(selector)).fontSize); return { heading: size(".settings-subpage.active .settings-page-header h3"), intro: size(".settings-subpage.active .settings-page-header p"), section: size(".settings-subpage.active .settings-section-label"), rowLabel: size(".settings-subpage.active .settings-row > label"), hint: size(".settings-subpage.active .hint"), optionLabel: size(".settings-subpage.active .settings-option-copy label"), optionDescription: size(".settings-subpage.active .settings-option-description"), navigation: size(".settings-nav-button"), search: size("#settingsSearchInput") }; })()');
check('Settings use the enlarged readable typography scale', settingsTypography.heading >= 22 && settingsTypography.intro >= 14 && settingsTypography.section >= 12 && settingsTypography.rowLabel >= 14 && settingsTypography.hint >= 12 && settingsTypography.optionLabel >= 14 && settingsTypography.optionDescription >= 12 && settingsTypography.navigation >= 13 && settingsTypography.search >= 13);
const settingsSelection = await wc.executeJavaScript('(() => ({ heading: getComputedStyle(document.querySelector(".settings-subpage.active .settings-page-header h3")).userSelect, hint: getComputedStyle(document.querySelector(".settings-subpage.active .hint")).userSelect, input: getComputedStyle(document.getElementById("globalMaxSpeedMbsInput")).userSelect }))()');