Skip to content

Commit

Permalink
put auth token in cookies
Browse files Browse the repository at this point in the history 
fixes #1454
helps with #1456
  • Loading branch information
@dyc3
dyc3 committed Mar 6, 2024
1 parent 1137ce7 commit d642cd0
Show file tree
Hide file tree
Showing 5 changed files with 57 additions and 7 deletions.
1 change: 0 additions & 1 deletion common/models/types.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ export type AuthToken = string;
export type MySession = Session & {
username?: string;
passport?: { user?: number };
token?: AuthToken;
postLoginRedirect?: string;
};

Expand Down
5 changes: 5 additions & 0 deletions server/app.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ import { initExtractor } from "./infoextractor";
import session, { SessionOptions } from "express-session";
import RedisStore from "connect-redis";
import { setupPostgresMetricsCollection } from "./storage.metrics";
import cookieparser from "cookie-parser";
import lusca from "lusca";

const app = express();

Expand Down Expand Up @@ -77,6 +79,8 @@ export async function main() {
process.on("SIGTERM", shutdown);

app.use(metricsMiddleware);
app.use(cookieparser(conf.get("session_secret")));

const server = http.createServer(app);
async function checkRedis() {
if (performance) {
Expand Down Expand Up @@ -172,6 +176,7 @@ export async function main() {
passport.serializeUser(usermanager.serializeUser);
passport.deserializeUser(usermanager.deserializeUser);
app.use(passport.initialize());
app.use(lusca.csrf());
app.use(usermanager.passportErrorHandler);
usermanager.setup();
websockets.setup(server);
Expand Down
15 changes: 9 additions & 6 deletions server/auth/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ export async function authTokenMiddleware(
if (req.headers.authorization && req.headers.authorization.startsWith("Bearer")) {
const token: AuthToken = req.headers.authorization.split(" ")[1];
req.token = token;
} else if (req.cookies?.token) {
req.token = req.cookies.token;
}

if (!req.token || !(await tokens.validate(req.token))) {
Expand All @@ -66,8 +68,6 @@ export async function authTokenMiddleware(
return;
}

// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
(req.session as MySession).token = req.token;
req.ottsession = await tokens.getSessionInfo(req.token);
if (req.ottsession && req.ottsession.isLoggedIn) {
try {
Expand All @@ -87,7 +87,9 @@ router.get("/grant", async (req, res) => {
const token: AuthToken = req.headers.authorization.split(" ")[1];
if (await tokens.validate(token)) {
log.debug("token is already valid");
res.json({
res.cookie("token", token, {
httpOnly: true,
}).json({
token,
});
return;
Expand All @@ -101,7 +103,9 @@ router.get("/grant", async (req, res) => {
log.debug("minting new auth token...");
const token: AuthToken = await tokens.mint();
await tokens.setSessionInfo(token, createSession());
res.json({
res.cookie("token", token, {
httpOnly: true,
}).json({
token,
});
});
Expand Down Expand Up @@ -132,8 +136,7 @@ router.get(
});
return;
}
// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
const token = (req.session as MySession).token;
const token = req.cookies?.token;
if (!token) {
res.status(400).json({
success: false,
Expand Down
4 changes: 4 additions & 0 deletions server/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,12 @@
"axios": "1.6.7",
"connect-redis": "7.1.0",
"convict": "^6.2.4",
"cookie-parser": "^1.4.6",
"dayjs": "^1.10.4",
"express": "^4.17.1",
"express-session": "^1.17.0",
"lodash": "^4.17.21",
"lusca": "^1.7.0",
"m3u8-parser": "^6.2.0",
"nocache": "^3.0.0",
"node-abort-controller": "3.0.1",
Expand Down Expand Up @@ -58,9 +60,11 @@
},
"devDependencies": {
"@types/convict": "^6.1.1",
"@types/cookie-parser": "^1.4.7",
"@types/express": "^4.17.11",
"@types/express-session": "^1.17.3",
"@types/lodash": "^4.14.170",
"@types/lusca": "^1.7.4",
"@types/node": "^18.13.0",
"@types/passport": "1.0.12",
"@types/passport-http-bearer": "^1.0.36",
Expand Down
39 changes: 39 additions & 0 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3243,6 +3243,13 @@
dependencies:
"@types/node" "*"

"@types/cookie-parser@^1.4.7":
version "1.4.7"
resolved "https://registry.yarnpkg.com/@types/cookie-parser/-/cookie-parser-1.4.7.tgz#c874471f888c72423d78d2b3c32d1e8579cf3c8f"
integrity sha512-Fvuyi354Z+uayxzIGCwYTayFKocfV7TuDYZClCdIP9ckhvAu/ixDtCB6qx2TT0FKjPLf1f3P/J1rgf6lPs64mw==
dependencies:
"@types/express" "*"

"@types/cookiejar@*":
version "2.1.2"
resolved "https://registry.yarnpkg.com/@types/cookiejar/-/cookiejar-2.1.2.tgz#66ad9331f63fe8a3d3d9d8c6e3906dd10f6446e8"
Expand Down Expand Up @@ -3645,6 +3652,13 @@
resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.202.tgz#f09dbd2fb082d507178b2f2a5c7e74bd72ff98f8"
integrity sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ==

"@types/lusca@^1.7.4":
version "1.7.4"
resolved "https://registry.yarnpkg.com/@types/lusca/-/lusca-1.7.4.tgz#0dd64dd52fcf362cd8a9e3d98af7541588e8456e"
integrity sha512-fdLI0mxG5RFy/OegqGc82v+/Bqbu9Qr1MemWv4JjhaBhtrSdVeM6LX9+J1WSMR8BJF7kb+MALDCuh4fsIOA6zg==
dependencies:
"@types/express" "*"

"@types/mime@*":
version "3.0.1"
resolved "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.1.tgz#5f8f2bca0a5863cb69bc0b0acd88c96cb1d4ae10"
Expand Down Expand Up @@ -6111,11 +6125,24 @@ convict@^6.2.4:
lodash.clonedeep "^4.5.0"
yargs-parser "^20.2.7"

cookie-parser@^1.4.6:
version "1.4.6"
resolved "https://registry.yarnpkg.com/cookie-parser/-/cookie-parser-1.4.6.tgz#3ac3a7d35a7a03bbc7e365073a26074824214594"
integrity sha512-z3IzaNjdwUC2olLIB5/ITd0/setiaFMLYiZJle7xg5Fe9KWAceil7xszYfHHBtDFYLSgJduS2Ty0P1uJdPDJeA==
dependencies:
cookie "0.4.1"
cookie-signature "1.0.6"

[email protected]:
version "1.0.6"
resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==

[email protected]:
version "0.4.1"
resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1"
integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==

[email protected]:
version "0.4.2"
resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432"
Expand Down Expand Up @@ -10475,6 +10502,13 @@ lru-queue@^0.1.0:
dependencies:
es5-ext "~0.10.2"

lusca@^1.7.0:
version "1.7.0"
resolved "https://registry.yarnpkg.com/lusca/-/lusca-1.7.0.tgz#a5d979f1b51776e60d41e0ca98f886f1b8b95502"
integrity sha512-msnrplCfY7zaqlZBDEloCIKld+RUeMZVeWzSPaGUKeRXFlruNSdKg2XxCyR+zj6BqzcXhXlRnvcvx6rAGgsvMA==
dependencies:
tsscmp "^1.0.5"

lz-string@^1.5.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.5.0.tgz#c1ab50f77887b712621201ba9fd4e3a6ed099941"
Expand Down Expand Up @@ -14316,6 +14350,11 @@ tslib@^2.3.1, tslib@^2.4.0:
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==

tsscmp@^1.0.5:
version "1.0.6"
resolved "https://registry.yarnpkg.com/tsscmp/-/tsscmp-1.0.6.tgz#85b99583ac3589ec4bfef825b5000aa911d605eb"
integrity sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==

tsutils@^3.21.0:
version "3.21.0"
resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
Expand Down

0 comments on commit d642cd0

Please sign in to comment.