Merge pull request #59 from nanaya/session-prefix

Support session name prefix
ppy · Aug 20, 2024 · 23ff176 · 23ff176
2 parents a038d06 + f51e652
commit 23ff176
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/src/config.ts b/src/config.ts
@@ -18,6 +18,7 @@ interface Config {
   oauthPublicKey: Buffer;
   redis: RedisConfigs;
   server: ServerConfig;
+  sessionPrefix: string;
 }
 
 interface DbNames {
@@ -80,6 +81,7 @@ const config: Config = {
     host: process.env.NOTIFICATION_SERVER_LISTEN_HOST || '127.0.0.1',
     port: +(process.env.NOTIFICATION_SERVER_LISTEN_PORT || 2345),
   },
+  sessionPrefix: process.env.SESSION_PREFIX ?? '',
 };
 
 export default config;
diff --git a/src/index.ts b/src/index.ts
@@ -59,7 +59,11 @@ const db = mysql.createPool(config.db);
 const dogstatsd = new StatsD({ prefix: 'osu.notification.' });
 const redisSubscriber = new RedisSubscriber({ dogstatsd, redisConfig: config.redis.notification });
 const oAuthVerifier = new OAuthVerifier({ db, publicKey: config.oauthPublicKey });
-const laravelSession = new LaravelSession({ appKey: config.appKey, redisConfig: config.redis.app });
+const laravelSession = new LaravelSession({
+  appKey: config.appKey,
+  redisConfig: config.redis.app,
+  sessionPrefix: config.sessionPrefix,
+});
 
 // initialise server
 const wss = new WebSocket.Server(config.server);

diff --git a/src/laravel-session.ts b/src/laravel-session.ts
@@ -11,6 +11,7 @@ import { unserialize } from 'php-serialize';
 interface Params {
   appKey: string;
   redisConfig: RedisOptions;
+  sessionPrefix: string;
 }
 
 interface EncryptedSession {
@@ -46,8 +47,6 @@ function isEncryptedSession(arg: unknown): arg is EncryptedSession {
     typeof arg.mac === 'string';
 }
 
-const sessionCookieName = 'osu_session';
-
 const getCookie = (req: http.IncomingMessage, key: string) => {
   if (req.headers.cookie != null) {
     return cookie.parse(req.headers.cookie)[key];
@@ -57,17 +56,20 @@ const getCookie = (req: http.IncomingMessage, key: string) => {
 export default class LaravelSession {
   private key: Buffer;
   private redis;
+  private sessionCookieName;
   private sessionCookieNameHmac: Buffer;
 
   constructor(params: Params) {
     this.redis = new Redis(params.redisConfig);
     this.key = Buffer.from(params.appKey.slice('base64:'.length), 'base64');
+    this.sessionCookieName = `${params.sessionPrefix}osu_session`;
+
     // https://github.com/laravel/framework/blob/208c3976f186dcdfa0a434f4092bae7d32928465/src/Illuminate/Cookie/CookieValuePrefix.php
-    this.sessionCookieNameHmac = crypto.createHmac('sha1', this.key).update(`${sessionCookieName}v2`).digest();
+    this.sessionCookieNameHmac = crypto.createHmac('sha1', this.key).update(`${this.sessionCookieName}v2`).digest();
   }
 
   async getSessionDataFromRequest(req: http.IncomingMessage): Promise<Session | null> {
-    const key = this.keyFromSession(getCookie(req, sessionCookieName));
+    const key = this.keyFromSession(getCookie(req, this.sessionCookieName));
 
     if (key == null) {
       return null;