Passwords
@@ -1618,15 +1621,15 @@
File Preview
- ![Image preview]()
+ ![Image preview]()
- info
- File truncated - showing first of
+ info
+ File truncated - showing first of
diff --git a/templates/security.html b/templates/security.html
index 442d4187..f1093d26 100644
--- a/templates/security.html
+++ b/templates/security.html
@@ -423,6 +423,17 @@ Settings scope {% if admin_panel_enabled and is_admin %}Personal + administration{% else %}Personal{% endif %}
+ {% if support_links_enabled %}
+
+ Support WebSSH
+
+ {% endif %}
{% endif %}
diff --git a/tests/e2e/account-menu.spec.js b/tests/e2e/account-menu.spec.js
index d27a0762..8b2d4662 100644
--- a/tests/e2e/account-menu.spec.js
+++ b/tests/e2e/account-menu.spec.js
@@ -126,6 +126,11 @@ test('account menu and settings stay inside a mobile viewport', async ({ page })
await version.scrollIntoViewIfNeeded();
await expect(version).toBeVisible();
await expect(version).toHaveText(/^\d+\.\d+\.\d+( \([0-9a-f]{7}\))?$/);
+ const support = page.locator('#accountSupportLink');
+ await expect(support).toBeVisible();
+ await expect(support).toHaveAttribute('href', 'https://github.com/bifrost0x/webssh?sponsor=1');
+ await expect(support).toHaveAttribute('target', '_blank');
+ await expect(support).toHaveAttribute('rel', 'noopener noreferrer');
const versionBounds = await version.boundingBox();
expect(versionBounds.x + versionBounds.width).toBeLessThanOrEqual(390);
@@ -141,3 +146,62 @@ test('account menu and settings stay inside a mobile viewport', async ({ page })
}));
expect(layout.document).toBeLessThanOrEqual(layout.viewport);
});
+
+test('settings side panel lists the support links below the account facts', async ({ page }) => {
+ await page.setViewportSize({ width: 1600, height: 1000 });
+ await login(page, 'e2e_user', { workspace: false });
+ await page.goto('/settings');
+
+ const rail = page.locator('.settings-context-rail');
+ const support = rail.locator('.settings-support-card');
+ await expect(support).toBeVisible();
+ const links = support.getByRole('link');
+ await expect(links).toHaveCount(3);
+ for (const [index, name] of ['GitHub Sponsors', 'Patreon', 'Buy Me a Coffee'].entries()) {
+ await expect(links.nth(index)).toHaveAccessibleName(name);
+ }
+ const accountBounds = await rail.locator('.settings-account-card').boundingBox();
+ const supportBounds = await support.boundingBox();
+ expect(supportBounds.y).toBeGreaterThan(accountBounds.y + accountBounds.height);
+
+ // Answer the new tab locally; the test must not reach the real site.
+ await page.context().route('https://github.com/**', route => route.fulfill({ body: 'sponsors' }));
+ const opened = page.context().waitForEvent('page');
+ await support.getByRole('link', { name: 'GitHub Sponsors' }).click();
+ const popup = await opened;
+ expect(popup.url()).toBe('https://github.com/sponsors/bifrost0x');
+ expect(await popup.evaluate(() => window.opener)).toBeNull();
+ await popup.close();
+ await expect(page).toHaveURL(/\/settings/);
+});
+
+test('administrators can hide the support links for all users', async ({ page }) => {
+ async function setSupportLinks(enabled) {
+ await page.goto('/settings#integrations');
+ const toggle = page.locator('#settingSupportLinks');
+ await expect(toggle).toBeEnabled();
+ if ((await toggle.isChecked()) === enabled) return;
+ await toggle.setChecked(enabled);
+ await expect(page.locator('#stepUpModal')).toHaveClass(/show/);
+ await page.locator('#stepUpPassword').fill('browser-password');
+ await page.locator('#stepUpSubmit').click();
+ await expect(toggle).toBeEnabled();
+ await expect(toggle).toBeChecked({ checked: enabled });
+ }
+
+ await page.setViewportSize({ width: 1600, height: 1000 });
+ await login(page);
+ await expect(page.locator('#settingSupportLinks')).toHaveCount(0);
+ try {
+ await setSupportLinks(false);
+ await page.reload();
+ await expect(page.locator('#settingSupportLinks')).not.toBeChecked();
+ await expect(page.locator('.settings-support-card')).toHaveCount(0);
+ await page.goto('/');
+ await expect(page.locator('#accountSupportLink')).toHaveCount(0);
+ } finally {
+ await setSupportLinks(true);
+ }
+ await page.reload();
+ await expect(page.locator('.settings-support-card')).toBeVisible();
+});
diff --git a/tests/test_admin_routes.py b/tests/test_admin_routes.py
index cde89ae5..c54b4406 100644
--- a/tests/test_admin_routes.py
+++ b/tests/test_admin_routes.py
@@ -420,6 +420,40 @@ def test_invalid_gateway_setting_does_not_change_registration(app, client):
assert app_settings.is_ssh_gateway_enabled() is False
+def test_support_links_setting_requires_step_up_and_hides_the_links(app, client):
+ from app import app_settings
+ _prepare_role(app, client, 'admin')
+ sponsor = b'href="https://github.com/bifrost0x/webssh?sponsor=1"'
+ assert client.get('/admin/api/settings').get_json()['support_links_enabled'] is True
+ assert sponsor in client.get('/').data
+ assert b'settings-support-card' in client.get('/settings').data
+
+ response = client.post('/admin/api/settings', json={'support_links_enabled': False})
+ assert response.status_code == 403
+ assert app_settings.is_support_links_enabled() is True
+
+ for enabled in (False, True):
+ response = client.post('/admin/api/settings', json={'support_links_enabled': enabled},
+ headers=password_step_up_headers(client, 'settings.update', 'global')[0])
+ assert response.status_code == 200
+ assert response.get_json()['support_links_enabled'] is enabled
+ assert app_settings.is_support_links_enabled() is enabled
+ assert (sponsor in client.get('/').data) is enabled
+ assert (b'settings-support-card' in client.get('/settings').data) is enabled
+
+
+def test_invalid_support_links_setting_is_rejected(app, client):
+ from app import app_settings
+ _prepare_role(app, client, 'admin')
+ response = client.post('/admin/api/settings',
+ json={'support_links_enabled': 'false', 'ssh_gateway_enabled': True},
+ headers=password_step_up_headers(client, 'settings.update', 'global')[0])
+ assert response.status_code == 400
+ assert app_settings.is_support_links_enabled() is True
+ assert app_settings.is_ssh_gateway_enabled() is False
+ assert app_settings.set_support_links_enabled('false') is False
+
+
def test_security_feature_status_exposes_all_supported_gates(app, client):
_prepare_role(app, client, 'admin')
diff --git a/tests/test_security_ui.py b/tests/test_security_ui.py
index 527dc687..3476f8e8 100644
--- a/tests/test_security_ui.py
+++ b/tests/test_security_ui.py
@@ -476,3 +476,54 @@ def test_start_page_persists_without_changing_other_preferences(app, client):
assert b'data-saved="workspaces"' in client.get('/settings').data
assert client.post('/api/account/preferences', json={'start_page': 'overview'}).status_code == 200
assert b'name="start-page" content="overview"' in client.get('/').data
+
+
+def test_settings_rail_links_to_the_funding_profiles(app, client):
+ import re
+
+ _create_user(app, "settings_supporter")
+ _login(client, "settings_supporter")
+
+ page = client.get("/settings").data.decode()
+
+ assert 'data-i18n="settings.supportProject"' in page
+ funding = (ROOT / ".github/FUNDING.yml").read_text(encoding="utf-8")
+ profiles = dict(re.findall(r"^(\w+):\s*(\S+)$", funding, re.MULTILINE))
+ expected = {
+ "github": "https://github.com/sponsors/{}",
+ "patreon": "https://www.patreon.com/{}",
+ "buy_me_a_coffee": "https://buymeacoffee.com/{}",
+ }
+ assert set(profiles) == set(expected)
+ for platform, url in expected.items():
+ href = url.format(profiles[platform])
+ link = re.search(r']*href="' + re.escape(href) + r'"[^>]*>', page)
+ assert link, href
+ # External links must not get a handle on the WebSSH window.
+ assert 'target="_blank"' in link.group(0)
+ assert 'rel="noopener noreferrer"' in link.group(0)
+
+
+def test_workspace_strings_follow_the_selected_language():
+ template = (ROOT / "templates/index.html").read_text(encoding="utf-8")
+ assert 'data-i18n="preview.truncatedPrefix"' in template
+ assert 'data-i18n="preview.truncatedOf"' in template
+ assert 'data-i18n-alt="preview.imageAlt"' in template
+ assert 'data-i18n-aria-label="workspace.directorySync.commandLabel"' in template
+ import re
+ navs = re.findall(r'SSH host trust
WebSSH is free and open source. Support ongoing development:
+ +