openvibers/openvibe.today Commits

Open Today messages in Dock Chats (#129)

OP OpenVibers committed 4 days ago · bc0d754527 · 5 files, +22 −1

* Give Today navbar a verified Dock token

* Keep Dock token reads outside sign-in rate limit

* Merge branch 'main' into auto/messages-dock-today-1109

Changes

ddiff --git a/deploy/nginx/openvibe.today.conf b/deploy/nginx/openvibe.today.conf
iindex dd85568..1f2d457 100644
---- a/deploy/nginx/openvibe.today.conf
++++ b/deploy/nginx/openvibe.today.conf
@@@ -80,6 +80,13 @@ server {
proxy_pass http://127.0.0.1:5100;
}
++ # Give the Dock token the session probe's rate-limit budget.
++ location = /auth/navbar-token {
++ limit_req zone=today_api burst=30 nodelay;
++ limit_req_status 429;
++ proxy_pass http://127.0.0.1:5100;
++ }
++
location /auth/ {
limit_req zone=today_auth burst=10 nodelay;
limit_req_status 429;
ddiff --git a/server/app.js b/server/app.js
iindex db044fb..3599cbd 100644
---- a/server/app.js
++++ b/server/app.js
@@@ -158,7 +158,7 @@ async function createApp(opts = {}) {
app.use(sso.middleware());
// ── Sign-in (OAuth2 + PKCE client of OpenVibe.Network) ──
-- app.use('/auth/', rateLimit({ windowMs: 15 * 60_000, limit: 60, 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: 'today', service: 'today', host: 'openvibe.today', name: 'OpenVibe.Today', profile: 'ugc' })); }
ddiff --git a/server/auth/sso.js b/server/auth/sso.js
iindex 2809949..4e2c0ca 100644
---- a/server/auth/sso.js
++++ b/server/auth/sso.js
@@@ -204,6 +204,14 @@ function createSso({ config, keys, fetchImpl = globalThis.fetch, now = () => Dat
return res.json({ user: meOf(claims) });
});
++ // 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 });
++ });
++
// Sign-out stays a same-site action: another site cannot sign a person out.
const sameOriginRequest = (req) => {
const site = String(req.get('sec-fetch-site') || '');
ddiff --git a/server/render/layout.js b/server/render/layout.js
iindex 5558afd..71165e9 100644
---- a/server/render/layout.js
++++ b/server/render/layout.js
@@@ -56,6 +56,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}',
logoutUrl: '/auth/logout?next={path}',
notificationsRealtime: true,
ddiff --git a/test/sso.test.js b/test/sso.test.js
iindex e588da7..fa4f527 100644
---- a/test/sso.test.js
++++ b/test/sso.test.js
@@@ -53,6 +53,11 @@ const cookieJar = (res) => res.headers.getSetCookie().map((c) => c.split(';')[0]
const me = await t.get('/auth/me', { cookie: `ov_token=${at}` });
assert.strictEqual(me.json().user.username, 'kim');
assert.ok(!me.text.includes(at), '/auth/me never returns the token');
++ const nav = await t.get('/auth/navbar-token', { cookie: `ov_token=${at}` });
++ assert.strictEqual(nav.status, 200);
++ assert.strictEqual(nav.json().token, at, 'the Dock receives the verified Network token');
++ assert.strictEqual(nav.headers.get('cache-control'), 'private, no-store');
++ assert.strictEqual((await t.get('/auth/navbar-token')).status, 401, 'a guest receives no token');
});
await check('the old cookie is still the session, so nobody is signed out by the move', async () => {