Feature / Improve socket handling

client/src/layouts/default/Default.vue

@@ -23,7 +23,7 @@ import { useCookies } from "vue3-cookies";
 import { useSocketIO } from '../../socket.io';
 
 const { cookies } = useCookies();
-const token = cookies.get("kubero.websocketToken");
+const token = cookies.get("kubero.JWT_TOKEN");
 //console.log("COOKIE token", token);
 const { socket } = useSocketIO(token);
 

client/src/layouts/default/Popup.vue

@@ -15,7 +15,7 @@ import { useCookies } from "vue3-cookies";
 import { useSocketIO } from '../../socket.io';
 
 const { cookies } = useCookies();
-const token = cookies.get("kubero.websocketToken");
+const token = cookies.get("kubero.JWT_TOKEN");
 //console.log("COOKIE token", token);
 const { socket } = useSocketIO(token);
 

server/src/audit/audit.module.ts

@@ -1,10 +1,11 @@
 import { Module, Global } from '@nestjs/common';
 import { AuditService } from './audit.service';
 import { AuditController } from './audit.controller';
+import { PrismaClient } from '@prisma/client';
 
 @Global()
 @Module({
-  providers: [AuditService],
+  providers: [AuditService, PrismaClient],
   controllers: [AuditController],
   exports: [AuditService],
 })

server/src/auth/auth.module.ts

@@ -1,4 +1,4 @@
-import { Module } from '@nestjs/common';
+import { Module, Provider } from '@nestjs/common';
 import { AuthService } from './auth.service';
 import { UsersModule } from '../users/users.module';
 import { KubernetesModule } from '../kubernetes/kubernetes.module';
@@ -10,11 +10,12 @@ import { AuthController } from './auth.controller';
 import { AuditModule } from '../audit/audit.module';
 import { JwtModule } from '@nestjs/jwt';
 import { ConfigService } from '../config/config.service';
+import { ConfigModule } from '../config/config.module';
 import * as dotenv from 'dotenv';
-import { RolesService } from 'src/roles/roles.service';
+import { RolesService } from '../roles/roles.service';
 dotenv.config();
 
-const providers = [AuthService, JwtStrategy, KubernetesModule, AuditModule, RolesService];
+const providers: Provider[] = [AuthService, JwtStrategy, RolesService];
 if (ConfigService.getOauth2Enabled()) {
   providers.push(Oauth2Strategy);
 }
@@ -26,6 +27,9 @@ if (ConfigService.getGithubEnabled()) {
   imports: [
     UsersModule,
     PassportModule,
+    AuditModule,
+    KubernetesModule,
+    ConfigModule,
     JwtModule.register({
       secret:
         process.env.JWT_SECRET ||
@@ -37,6 +41,6 @@ if (ConfigService.getGithubEnabled()) {
   ],
   providers: providers,
   controllers: [AuthController],
-  exports: [AuthService],
+  exports: [AuthService, JwtModule, UsersModule],
 })
 export class AuthModule {}

server/src/auth/strategies/github.strategy.ts

@@ -3,7 +3,7 @@ import { PassportStrategy } from '@nestjs/passport';
 import { Injectable } from '@nestjs/common';
 import { Request } from 'express';
 import { AuthenticateOptions } from 'passport';
-import { ConfigService } from 'src/config/config.service';
+import { ConfigService } from '../../config/config.service';
 import * as dotenv from 'dotenv';
 dotenv.config();
 

server/src/auth/strategies/ws-jwt.guard.ts

@@ -0,0 +1,60 @@
+import { CanActivate, Injectable, Logger } from '@nestjs/common';
+import { JwtService } from '@nestjs/jwt';
+import { Observable } from 'rxjs';
+import { UsersService } from '../../users/users.service';
+
+@Injectable()
+export class WsJwtGuard implements CanActivate {
+  private logger = new Logger(WsJwtGuard.name);
+
+  constructor(
+    private jwtService: JwtService,
+    private usersService: UsersService,
+  ) {}
+
+  canActivate(
+    context: any,
+  ): boolean | any | Promise<boolean | any> | Observable<boolean | any> {
+    const client = context.switchToWs().getClient();
+    const token = this.extractToken(client);
+
+    if (!token) {
+      this.logger.debug('No token provided, disconnecting client');
+      client.disconnect();
+      return false;
+    }
+
+    try {
+      const decoded = this.jwtService.verify(token);
+      if (!decoded || !decoded.username) {
+        this.logger.debug('Token verification failed, disconnecting client');
+        client.disconnect();
+        return false;
+      }
+      return new Promise((resolve, reject) => {
+        return this.usersService.findOne(decoded.username).then((user) => {
+          if (user) {
+            context.switchToWs().getClient().user = user;
+            resolve(true);
+          } else {
+            this.logger.debug('User not found, disconnecting client');
+            client.disconnect();
+            reject(false);
+          }
+        });
+      });
+    } catch (ex) {
+      this.logger.error('Token validation error', ex.message);
+      client.disconnect();
+      return false;
+    }
+  }
+
+  private extractToken(client: any): string | null {
+    const authHeader = client.handshake.headers.authorization;
+    if (authHeader && authHeader.startsWith('Bearer ')) {
+      return authHeader.split(' ')[1];
+    }
+    return client.handshake.auth?.token || null;
+  }
+}

server/src/config/config.module.ts

@@ -2,11 +2,13 @@ import { Global, Module } from '@nestjs/common';
 import { ConfigController } from './config.controller';
 import { ConfigService } from './config.service';
 import { KubernetesModule } from '../kubernetes/kubernetes.module';
+import { NotificationsModule } from '../notifications/notifications.module';
 
 @Global()
 @Module({
+  imports: [KubernetesModule, NotificationsModule],
   controllers: [ConfigController],
-  providers: [ConfigService, KubernetesModule],
+  providers: [ConfigService],
   exports: [ConfigService],
 })
 export class ConfigModule {}

server/src/events/events.gateway.ts

@@ -7,12 +7,15 @@ import {
   WsResponse,
 } from '@nestjs/websockets';
 import { Server, Socket } from 'socket.io';
+import { UseGuards } from '@nestjs/common';
+import { WsJwtGuard } from '../auth/strategies/ws-jwt.guard';
 
 @WebSocketGateway({
   cors: {
     origin: '*',
   },
 })
+@UseGuards(WsJwtGuard)
 export class EventsGateway {
   @WebSocketServer()
   server: Server;

server/src/events/events.module.ts

@@ -1,8 +1,10 @@
 import { Module, Global } from '@nestjs/common';
 import { EventsGateway } from './events.gateway';
+import { AuthModule } from '../auth/auth.module';
 
 @Global()
 @Module({
+  imports: [AuthModule],
   providers: [EventsGateway],
   exports: [EventsGateway],
 })