openvibers/openvibe.services Commits

Open Services messages in Dock Chats (#250)

OP OpenVibers committed 4 days ago · 6133299de2 · 5 files, +25 −1

* Give Services navbar a verified Dock token

* Keep Dock token reads outside sign-in rate limit

Changes

ddiff --git a/deploy/nginx/openvibe.services.conf b/deploy/nginx/openvibe.services.conf
iindex 51c5877..e4f0485 100644
---- a/deploy/nginx/openvibe.services.conf
++++ b/deploy/nginx/openvibe.services.conf
@@@ -90,6 +90,13 @@ server {
proxy_pass http://127.0.0.1:4930;
}
++ # Give the Dock token the session probe's rate-limit budget.
++ location = /auth/navbar-token {
++ limit_req zone=ovservices_api burst=30 nodelay;
++ limit_req_status 429;
++ proxy_pass http://127.0.0.1:4930;
++ }
++
location /auth/ {
limit_req zone=ovservices_auth burst=10 nodelay;
limit_req_status 429;
ddiff --git a/server/app.js b/server/app.js
iindex 89fa623..e11ecd4 100644
---- a/server/app.js
++++ b/server/app.js
@@@ -213,7 +213,7 @@ async function createApp(opts = {}) {
// ── Sign-in (OAuth2 + PKCE client of OpenVibe.Network) ──
// /auth/me is the navbar's who-is-signed-in read on every page, so it is not counted with sign-ins: 60 page views in 15 minutes made a signed-in visitor look signed out.
-- app.use('/auth/', rateLimit({ windowMs: 15 * 60_000, limit: 60, skip: (req) => req.path === '/me', standardHeaders: true, legacyHeaders: false }));
++ app.use('/auth/', rateLimit({ windowMs: 15 * 60_000, limit: 60, skip: (req) => req.path === '/me' || req.path === '/navbar-token', standardHeaders: true, legacyHeaders: false }));
app.use('/auth', sso.routes());
{ const legal = require('openvibe-shared/legal'); app.get(legal.PATHS, legal.handler({ id: 'services', service: 'services', host: 'openvibe.services', name: 'OpenVibe.Services', profile: 'ugc' })); }
ddiff --git a/server/auth/sso.js b/server/auth/sso.js
iindex f06ad11..9b142dd 100644
---- a/server/auth/sso.js
++++ b/server/auth/sso.js
@@@ -208,6 +208,14 @@ function createSso({ config, keys, fetchImpl = globalThis.fetch, now = () => Dat
return res.json({ user: { username: v.username, display_name: v.displayName, subject_id: v.subject, role: v.role, avatar_url: v.avatarUrl || null, profile_color: v.profileColor || null } });
});
++ // The shared Dock needs a verified Network access token from this HTTP-only session.
++ r.get('/navbar-token', (req, res) => {
++ res.set('Cache-Control', cache.htmlHeaders({ private: true }));
++ const viewer = req.viewer;
++ if (!viewer || viewer.kind !== 'user' || !viewer.token) return res.status(401).json({ error: 'Not signed in' });
++ return res.json({ token: viewer.token });
++ });
++
r.get('/logout', (req, res, next) => {
if (sameOriginRequest(req)) return next();
res.set('Cache-Control', cache.htmlHeaders({ private: true }));
ddiff --git a/server/render/layout.js b/server/render/layout.js
iindex f9e496f..8f3eb18 100644
---- a/server/render/layout.js
++++ b/server/render/layout.js
@@@ -68,6 +68,7 @@ function renderPage(o) {
history: { type: 'page', title: o.title || SITE_NAME },
silentLogin: `${o.config.baseUrl}/auth/login?silent=1&next={url}`,
sessionUrl: '/auth/me',
++ tokenUrl: '/auth/navbar-token',
loginUrl: '/auth/login?next={path}', // filled from the current page (boost moves between pages)
logoutUrl: '/auth/logout?next={path}', // Sign out in the shared navbar ends this site's session too
notificationsRealtime: true, // the bell hears new notifications over OpenVibe.Events (Shared 1.22.0)
ddiff --git a/test/security-session.test.js b/test/security-session.test.js
iindex 4238360..78f0da0 100644
---- a/test/security-session.test.js
++++ b/test/security-session.test.js
@@@ -60,6 +60,14 @@ const { signJwt } = require('./helpers/mocks');
assert.strictEqual((await s.ctx.trust.get(APP)).tier, 'reviewed');
});
++ await check('the navbar receives a verified, uncached Network token only for a signed-in person', async () => {
++ const nav = await s.get('/auth/navbar-token', { as: staff });
++ assert.strictEqual(nav.status, 200);
++ assert.match(JSON.parse(nav.text).token, /^[^.]+\.[^.]+\.[^.]+$/);
++ assert.strictEqual(nav.headers.get('cache-control'), 'private, no-store');
++ assert.strictEqual((await s.get('/auth/navbar-token')).status, 401);
++ });
++
await check('another site cannot sign a person out; this site can', async () => {
const cross = await s.get('/auth/logout', { as: staff, headers: { 'sec-fetch-site': 'cross-site' } });
assert.strictEqual(cross.status, 200, 'a confirm page, not a sign-out');