openvibers/openvibe.inventory Commits

Open Inventory messages in Dock Chats (#220)

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

* Give Inventory navbar a verified Dock token

* Keep Dock token reads outside sign-in rate limit

Changes

ddiff --git a/deploy/nginx/inventory.openvibe.network.conf b/deploy/nginx/inventory.openvibe.network.conf
iindex 3b810cd..4d3f3fd 100644
---- a/deploy/nginx/inventory.openvibe.network.conf
++++ b/deploy/nginx/inventory.openvibe.network.conf
@@@ -67,6 +67,13 @@ server {
proxy_pass http://127.0.0.1:5030;
}
++ # Give the Dock token the session probe's rate-limit budget.
++ location = /auth/navbar-token {
++ limit_req zone=inventory_api burst=30 nodelay;
++ limit_req_status 429;
++ proxy_pass http://127.0.0.1:5030;
++ }
++
location /auth/ {
limit_req zone=inventory_auth burst=10 nodelay;
limit_req_status 429;
ddiff --git a/server/app.js b/server/app.js
iindex f6b780c..cd79564 100644
---- a/server/app.js
++++ b/server/app.js
@@@ -211,7 +211,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');
ddiff --git a/server/auth/sso.js b/server/auth/sso.js
iindex e349f89..d53524f 100644
---- a/server/auth/sso.js
++++ b/server/auth/sso.js
@@@ -181,6 +181,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 } });
});
++ // 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 d08ff31..92016f4 100644
---- a/server/render/layout.js
++++ b/server/render/layout.js
@@@ -70,6 +70,7 @@ function renderPage(o) {
history: { type: 'page', title: o.title || SITE_NAME },
silentLogin: urls(o.config).prefix ? null : absolute('/auth/login') + '?silent=1&next={url}',
sessionUrl: url('/auth/me'),
++ tokenUrl: url('/auth/navbar-token'),
fedcmLogin: url('/auth/fedcm'),
loginUrl: url('/auth/login?next={path}'), // filled from the current page (boost moves between pages)
logoutUrl: url('/auth/logout?next={path}'), // Sign out in the shared navbar ends this site's session too
ddiff --git a/test/security-session.test.js b/test/security-session.test.js
iindex 22f0196..1301331 100644
---- a/test/security-session.test.js
++++ b/test/security-session.test.js
@@@ -56,6 +56,14 @@ const { signJwt } = require('./helpers/mocks');
assert.strictEqual(JSON.parse(me.text).user.username, staff.username);
});
++ 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');