@smythos/sre 1.6.8 → 1.6.10

package/src/subsystems/Security/Account.service/connectors/JSONFileAccount.class.ts

@@ -1,170 +1,170 @@
-import { Connector } from '@sre/Core/Connector.class';
-import { ACL } from '@sre/Security/AccessControl/ACL.class';
-import { AccessCandidate } from '@sre/Security/AccessControl/AccessCandidate.class';
-import { AccessRequest } from '@sre/Security/AccessControl/AccessRequest.class';
-import { SecureConnector } from '@sre/Security/SecureConnector.class';
-import { DEFAULT_TEAM_ID, IAccessCandidate, IACL, TAccessRole } from '@sre/types/ACL.types';
-import { StorageData, StorageMetadata } from '@sre/types/Storage.types';
-import { AccountConnector } from '../AccountConnector';
-import { KeyValueObject } from '@sre/types/Common.types';
-import * as fs from 'fs';
-import * as path from 'path';
-
-/*
-JSONAccount format 
-
-{
-    "team1": {
-        users: {
-            "user1": {
-                "settings": {
-                    "setting1": "value1",
-                    "setting2": "value2"
-                }
-            }
-        },
-        "agents": {
-            "agent1": {
-                "settings": {
-                    "setting1": "value1",
-                    "setting2": "value2"
-                }
-            }
-        },
-        "settings": {
-            "setting1": "value1",
-            "setting2": "value2"
-        }
-    }
-}
-
-*/
-
-export type TJSONFileAccountSettings = {
-    file: string;
-};
-
-export class JSONFileAccount extends AccountConnector {
-    public name = 'JSONFileAccount';
-    private data: any = {};
-    private file: string;
-
-    constructor(protected _settings: TJSONFileAccountSettings) {
-        super(_settings);
-        this.file = _settings.file;
-        this.loadData();
-    }
-
-    private loadData() {
-        try {
-            const fileContent = fs.readFileSync(this.file, 'utf-8');
-            this.data = JSON.parse(fileContent);
-        } catch (error) {
-            console.error('Error loading JSON account data:', error);
-            this.data = {};
-        }
-    }
-
-    private saveData() {
-        try {
-            fs.writeFileSync(this.file, JSON.stringify(this.data, null, 2));
-        } catch (error) {
-            console.error('Error saving JSON account data:', error);
-        }
-    }
-
-    public async isTeamMember(team: string, candidate: IAccessCandidate): Promise<boolean> {
-        if (team === DEFAULT_TEAM_ID) {
-            //non existing user
-            if (candidate.role === TAccessRole.User && !this.data[team].users?.[candidate.id]) return false;
-
-            return true; //everyone is a member of the default team
-        }
-
-        if (!this.data[team]) return false;
-
-        if (candidate.role === TAccessRole.Team && team === candidate.id) {
-            return true;
-        }
-
-        if (candidate.role === TAccessRole.User) {
-            return !!this.data[team].users?.[candidate.id];
-        } else if (candidate.role === TAccessRole.Agent) {
-            return !!this.data[team].agents?.[candidate.id];
-        }
-
-        return false;
-    }
-
-    public async getCandidateTeam(candidate: IAccessCandidate): Promise<string | undefined> {
-        if (candidate.role === TAccessRole.Team) {
-            return candidate.id;
-        }
-
-        // Search through all teams to find where the candidate belongs
-        for (const [teamId, teamData] of Object.entries(this.data)) {
-            const typedTeamData = teamData as { users?: Record<string, any>; agents?: Record<string, any> };
-            if (candidate.role === TAccessRole.User && typedTeamData.users?.[candidate.id]) {
-                return teamId;
-            }
-            if (candidate.role === TAccessRole.Agent && typedTeamData.agents?.[candidate.id]) {
-                return teamId;
-            }
-        }
-
-        return DEFAULT_TEAM_ID;
-    }
-
-    public async getResourceACL(resourceId: string, candidate: IAccessCandidate): Promise<ACL> {
-        throw new Error('getResourceACL Method not implemented.');
-    }
-
-    public async getAllTeamSettings(acRequest: AccessRequest, teamId: string): Promise<KeyValueObject[]> {
-        if (!this.data[teamId]?.settings) return [];
-
-        return Object.entries(this.data[teamId].settings).map(([key, value]) => ({
-            key,
-            value: value as string,
-        }));
-    }
-
-    public async getAllUserSettings(acRequest: AccessRequest, accountId: string): Promise<KeyValueObject[]> {
-        // Search through all teams to find user settings
-        for (const teamData of Object.values(this.data)) {
-            const typedTeamData = teamData as { users?: Record<string, { settings?: Record<string, any> }> };
-            if (typedTeamData.users?.[accountId]?.settings) {
-                return Object.entries(typedTeamData.users[accountId].settings).map(([key, value]) => ({
-                    key,
-                    value: value as string,
-                }));
-            }
-        }
-        return [];
-    }
-
-    public async getTeamSetting(acRequest: AccessRequest, teamId: string, settingKey: string): Promise<string> {
-        return this.data[teamId]?.settings?.[settingKey] || '';
-    }
-
-    public async getUserSetting(acRequest: AccessRequest, accountId: string, settingKey: string): Promise<string> {
-        // Search through all teams to find user setting
-        for (const teamData of Object.values(this.data)) {
-            const typedTeamData = teamData as { users?: Record<string, { settings?: Record<string, any> }> };
-            if (typedTeamData.users?.[accountId]?.settings?.[settingKey]) {
-                return typedTeamData.users[accountId].settings[settingKey];
-            }
-        }
-        return '';
-    }
-
-    public async getAgentSetting(acRequest: AccessRequest, agentId: string, settingKey: string): Promise<string> {
-        // Search through all teams to find agent setting
-        for (const teamData of Object.values(this.data)) {
-            const typedTeamData = teamData as { agents?: Record<string, { settings?: Record<string, any> }> };
-            if (typedTeamData.agents?.[agentId]?.settings?.[settingKey]) {
-                return typedTeamData.agents[agentId].settings[settingKey];
-            }
-        }
-        return '';
-    }
-}
+import { Connector } from '@sre/Core/Connector.class';
+import { ACL } from '@sre/Security/AccessControl/ACL.class';
+import { AccessCandidate } from '@sre/Security/AccessControl/AccessCandidate.class';
+import { AccessRequest } from '@sre/Security/AccessControl/AccessRequest.class';
+import { SecureConnector } from '@sre/Security/SecureConnector.class';
+import { DEFAULT_TEAM_ID, IAccessCandidate, IACL, TAccessRole } from '@sre/types/ACL.types';
+import { StorageData, StorageMetadata } from '@sre/types/Storage.types';
+import { AccountConnector } from '../AccountConnector';
+import { KeyValueObject } from '@sre/types/Common.types';
+import * as fs from 'fs';
+import * as path from 'path';
+
+/*
+JSONAccount format 
+
+{
+    "team1": {
+        users: {
+            "user1": {
+                "settings": {
+                    "setting1": "value1",
+                    "setting2": "value2"
+                }
+            }
+        },
+        "agents": {
+            "agent1": {
+                "settings": {
+                    "setting1": "value1",
+                    "setting2": "value2"
+                }
+            }
+        },
+        "settings": {
+            "setting1": "value1",
+            "setting2": "value2"
+        }
+    }
+}
+
+*/
+
+export type TJSONFileAccountSettings = {
+    file: string;
+};
+
+export class JSONFileAccount extends AccountConnector {
+    public name = 'JSONFileAccount';
+    private data: any = {};
+    private file: string;
+
+    constructor(protected _settings: TJSONFileAccountSettings) {
+        super(_settings);
+        this.file = _settings.file;
+        this.loadData();
+    }
+
+    private loadData() {
+        try {
+            const fileContent = fs.readFileSync(this.file, 'utf-8');
+            this.data = JSON.parse(fileContent);
+        } catch (error) {
+            console.error('Error loading JSON account data:', error);
+            this.data = {};
+        }
+    }
+
+    private saveData() {
+        try {
+            fs.writeFileSync(this.file, JSON.stringify(this.data, null, 2));
+        } catch (error) {
+            console.error('Error saving JSON account data:', error);
+        }
+    }
+
+    public async isTeamMember(team: string, candidate: IAccessCandidate): Promise<boolean> {
+        if (team === DEFAULT_TEAM_ID) {
+            //non existing user
+            if (candidate.role === TAccessRole.User && !this.data[team].users?.[candidate.id]) return false;
+
+            return true; //everyone is a member of the default team
+        }
+
+        if (!this.data[team]) return false;
+
+        if (candidate.role === TAccessRole.Team && team === candidate.id) {
+            return true;
+        }
+
+        if (candidate.role === TAccessRole.User) {
+            return !!this.data[team].users?.[candidate.id];
+        } else if (candidate.role === TAccessRole.Agent) {
+            return !!this.data[team].agents?.[candidate.id];
+        }
+
+        return false;
+    }
+
+    public async getCandidateTeam(candidate: IAccessCandidate): Promise<string | undefined> {
+        if (candidate.role === TAccessRole.Team) {
+            return candidate.id;
+        }
+
+        // Search through all teams to find where the candidate belongs
+        for (const [teamId, teamData] of Object.entries(this.data)) {
+            const typedTeamData = teamData as { users?: Record<string, any>; agents?: Record<string, any> };
+            if (candidate.role === TAccessRole.User && typedTeamData.users?.[candidate.id]) {
+                return teamId;
+            }
+            if (candidate.role === TAccessRole.Agent && typedTeamData.agents?.[candidate.id]) {
+                return teamId;
+            }
+        }
+
+        return DEFAULT_TEAM_ID;
+    }
+
+    public async getResourceACL(resourceId: string, candidate: IAccessCandidate): Promise<ACL> {
+        throw new Error('getResourceACL Method not implemented.');
+    }
+
+    public async getAllTeamSettings(acRequest: AccessRequest, teamId: string): Promise<KeyValueObject[]> {
+        if (!this.data[teamId]?.settings) return [];
+
+        return Object.entries(this.data[teamId].settings).map(([key, value]) => ({
+            key,
+            value: value as string,
+        }));
+    }
+
+    public async getAllUserSettings(acRequest: AccessRequest, accountId: string): Promise<KeyValueObject[]> {
+        // Search through all teams to find user settings
+        for (const teamData of Object.values(this.data)) {
+            const typedTeamData = teamData as { users?: Record<string, { settings?: Record<string, any> }> };
+            if (typedTeamData.users?.[accountId]?.settings) {
+                return Object.entries(typedTeamData.users[accountId].settings).map(([key, value]) => ({
+                    key,
+                    value: value as string,
+                }));
+            }
+        }
+        return [];
+    }
+
+    public async getTeamSetting(acRequest: AccessRequest, teamId: string, settingKey: string): Promise<string> {
+        return this.data[teamId]?.settings?.[settingKey] || '';
+    }
+
+    public async getUserSetting(acRequest: AccessRequest, accountId: string, settingKey: string): Promise<string> {
+        // Search through all teams to find user setting
+        for (const teamData of Object.values(this.data)) {
+            const typedTeamData = teamData as { users?: Record<string, { settings?: Record<string, any> }> };
+            if (typedTeamData.users?.[accountId]?.settings?.[settingKey]) {
+                return typedTeamData.users[accountId].settings[settingKey];
+            }
+        }
+        return '';
+    }
+
+    public async getAgentSetting(acRequest: AccessRequest, agentId: string, settingKey: string): Promise<string> {
+        // Search through all teams to find agent setting
+        for (const teamData of Object.values(this.data)) {
+            const typedTeamData = teamData as { agents?: Record<string, { settings?: Record<string, any> }> };
+            if (typedTeamData.agents?.[agentId]?.settings?.[settingKey]) {
+                return typedTeamData.agents[agentId].settings[settingKey];
+            }
+        }
+        return '';
+    }
+}

package/src/subsystems/Security/Account.service/connectors/MySQLAccount.class.ts

@@ -1,76 +1,76 @@
-import mysql from 'mysql2/promise';
-import { ACL } from '@sre/Security/AccessControl/ACL.class';
-import { AccessRequest } from '@sre/Security/AccessControl/AccessRequest.class';
-import { DEFAULT_TEAM_ID, IAccessCandidate, IACL, TAccessRole } from '@sre/types/ACL.types';
-import { AccountConnector } from '../AccountConnector';
-import { KeyValueObject } from '@sre/types/Common.types';
-//FIXME : this implementation is experimental and incomplete
-export class MySQLAccount extends AccountConnector {
-    public name = 'MySQLAccount';
-
-    private pool: mysql.Pool;
-
-    constructor(protected _settings: any) {
-        super(_settings);
-
-        this.pool = mysql.createPool({
-            host: _settings.host,
-            database: _settings.database || 'app',
-            user: _settings.user || 'app',
-            password: _settings.password,
-            connectionLimit: 10,
-        });
-    }
-
-    public isTeamMember(team: string, candidate: IAccessCandidate): Promise<boolean> {
-        return Promise.resolve(true);
-    }
-
-    public getCandidateTeam(candidate: IAccessCandidate): Promise<string | undefined> {
-        if (candidate.role === TAccessRole.Team) {
-            return Promise.resolve(candidate.id);
-        }
-
-        return Promise.resolve(DEFAULT_TEAM_ID);
-    }
-
-    public async getAllTeamSettings(acRequest: AccessRequest, teamId: string): Promise<KeyValueObject[]> {
-        try {
-            const [rows] = await this.pool.execute('SELECT `key`, `value` FROM TeamSettings');
-            const settings: KeyValueObject[] = [];
-            if (Array.isArray(rows) && rows.length > 0) {
-                settings.push(...rows.map((row) => ({ key: row.key, value: row.value })));
-            }
-            return settings;
-        } catch (error) {
-            console.error('Error in getTeamSetting:', error);
-            return [] as KeyValueObject[];
-        }
-    }
-
-    public async getTeamSetting(acRequest: AccessRequest, teamId: string, settingKey: string): Promise<string> {
-        try {
-            const [rows] = await this.pool.execute('SELECT `value` FROM TeamSettings WHERE `key` = ? LIMIT 1', [settingKey]);
-            if (Array.isArray(rows) && rows.length > 0 && 'value' in rows[0]) return rows[0].value;
-            return '';
-        } catch (error) {
-            console.error('Error in getTeamSetting:', error);
-            return '';
-        }
-    }
-
-    // TODO: Implement this
-    public getResourceACL(resourceId: string, candidate: IAccessCandidate): Promise<ACL> {
-        throw new Error('getResourceACL Method not implemented.');
-    }
-    public getAllUserSettings(acRequest: AccessRequest, accountId: string): Promise<KeyValueObject[]> {
-        throw new Error('getAllUserSettings Method not implemented.');
-    }
-    public getUserSetting(acRequest: AccessRequest, accountId: string, settingKey: string): Promise<string> {
-        throw new Error('getUserSetting Method not implemented.');
-    }
-
-    public getAgentSetting(acRequest: AccessRequest, agentId: string, settingKey: string): Promise<string> {
-        throw new Error('getAgentSetting Method not implemented.');
-    }
-}
+import mysql from 'mysql2/promise';
+import { ACL } from '@sre/Security/AccessControl/ACL.class';
+import { AccessRequest } from '@sre/Security/AccessControl/AccessRequest.class';
+import { DEFAULT_TEAM_ID, IAccessCandidate, IACL, TAccessRole } from '@sre/types/ACL.types';
+import { AccountConnector } from '../AccountConnector';
+import { KeyValueObject } from '@sre/types/Common.types';
+//FIXME : this implementation is experimental and incomplete
+export class MySQLAccount extends AccountConnector {
+    public name = 'MySQLAccount';
+
+    private pool: mysql.Pool;
+
+    constructor(protected _settings: any) {
+        super(_settings);
+
+        this.pool = mysql.createPool({
+            host: _settings.host,
+            database: _settings.database || 'app',
+            user: _settings.user || 'app',
+            password: _settings.password,
+            connectionLimit: 10,
+        });
+    }
+
+    public isTeamMember(team: string, candidate: IAccessCandidate): Promise<boolean> {
+        return Promise.resolve(true);
+    }
+
+    public getCandidateTeam(candidate: IAccessCandidate): Promise<string | undefined> {
+        if (candidate.role === TAccessRole.Team) {
+            return Promise.resolve(candidate.id);
+        }
+
+        return Promise.resolve(DEFAULT_TEAM_ID);
+    }
+
+    public async getAllTeamSettings(acRequest: AccessRequest, teamId: string): Promise<KeyValueObject[]> {
+        try {
+            const [rows] = await this.pool.execute('SELECT `key`, `value` FROM TeamSettings');
+            const settings: KeyValueObject[] = [];
+            if (Array.isArray(rows) && rows.length > 0) {
+                settings.push(...rows.map((row) => ({ key: row.key, value: row.value })));
+            }
+            return settings;
+        } catch (error) {
+            console.error('Error in getTeamSetting:', error);
+            return [] as KeyValueObject[];
+        }
+    }
+
+    public async getTeamSetting(acRequest: AccessRequest, teamId: string, settingKey: string): Promise<string> {
+        try {
+            const [rows] = await this.pool.execute('SELECT `value` FROM TeamSettings WHERE `key` = ? LIMIT 1', [settingKey]);
+            if (Array.isArray(rows) && rows.length > 0 && 'value' in rows[0]) return rows[0].value;
+            return '';
+        } catch (error) {
+            console.error('Error in getTeamSetting:', error);
+            return '';
+        }
+    }
+
+    // TODO: Implement this
+    public getResourceACL(resourceId: string, candidate: IAccessCandidate): Promise<ACL> {
+        throw new Error('getResourceACL Method not implemented.');
+    }
+    public getAllUserSettings(acRequest: AccessRequest, accountId: string): Promise<KeyValueObject[]> {
+        throw new Error('getAllUserSettings Method not implemented.');
+    }
+    public getUserSetting(acRequest: AccessRequest, accountId: string, settingKey: string): Promise<string> {
+        throw new Error('getUserSetting Method not implemented.');
+    }
+
+    public getAgentSetting(acRequest: AccessRequest, agentId: string, settingKey: string): Promise<string> {
+        throw new Error('getAgentSetting Method not implemented.');
+    }
+}

package/src/subsystems/Security/Account.service/index.ts

@@ -1,14 +1,14 @@
-//==[ SRE: LLM ]======================
-
-import { ConnectorService, ConnectorServiceProvider } from '@sre/Core/ConnectorsService';
-import { TConnectorService } from '@sre/types/SRE.types';
-import { DummyAccount } from './connectors/DummyAccount.class';
-import { MySQLAccount } from './connectors/MySQLAccount.class';
-import { JSONFileAccount } from './connectors/JSONFileAccount.class';
-export class AccountService extends ConnectorServiceProvider {
-    public register() {
-        ConnectorService.register(TConnectorService.Account, 'MySQLAccount', MySQLAccount);
-        ConnectorService.register(TConnectorService.Account, 'DummyAccount', DummyAccount);
-        ConnectorService.register(TConnectorService.Account, 'JSONFileAccount', JSONFileAccount);
-    }
-}
+//==[ SRE: LLM ]======================
+
+import { ConnectorService, ConnectorServiceProvider } from '@sre/Core/ConnectorsService';
+import { TConnectorService } from '@sre/types/SRE.types';
+import { DummyAccount } from './connectors/DummyAccount.class';
+import { MySQLAccount } from './connectors/MySQLAccount.class';
+import { JSONFileAccount } from './connectors/JSONFileAccount.class';
+export class AccountService extends ConnectorServiceProvider {
+    public register() {
+        ConnectorService.register(TConnectorService.Account, 'MySQLAccount', MySQLAccount);
+        ConnectorService.register(TConnectorService.Account, 'DummyAccount', DummyAccount);
+        ConnectorService.register(TConnectorService.Account, 'JSONFileAccount', JSONFileAccount);
+    }
+}

package/src/subsystems/Security/Credentials.helper.ts

@@ -1,62 +1,62 @@
-import { AccessCandidate } from '../..';
-import { ConnectorService } from '../../Core/ConnectorsService';
-
-export type TCredentialsRequest = {
-    vaultProvider?: string;
-    keyName: string;
-    mapping?: {
-        [key: string]: string;
-    };
-};
-
-/**
- * Get credentials from a vault
- *
- * @param candidate - The candidate requesting the credentials
- * @param credentialsRequest - The credentials request
- * @returns The credentials
- */
-export async function getCredentials(
-    candidate: AccessCandidate,
-    credentialsRequest: TCredentialsRequest | string
-): Promise<string | Record<string, any>> {
-    if (typeof credentialsRequest === 'string') {
-        credentialsRequest = {
-            vaultProvider: '', //default vault provider
-            keyName: credentialsRequest, //default key name
-        };
-    }
-
-    const vaultConnector = ConnectorService.getVaultConnector(credentialsRequest.vaultProvider || '');
-    const vaultRequester = vaultConnector.requester(candidate);
-    const credentials = await vaultRequester.get(credentialsRequest.keyName);
-
-    if (!credentialsRequest.mapping) return credentials;
-
-    const mappedCredentials = {};
-    for (const [key, value] of Object.entries(credentialsRequest.mapping)) {
-        mappedCredentials[key] = JSONExpression(credentials, value);
-    }
-
-    return mappedCredentials;
-}
-
-/**
- * @param obj - The object to extract the property from
- * @param propertyString - The property to extract from the object
- * @returns The property value
- */
-function JSONExpression(obj, propertyString) {
-    const properties = propertyString.split(/\.|\[|\]\.|\]\[|\]/).filter(Boolean);
-    let currentProperty = obj;
-
-    for (let property of properties) {
-        if (currentProperty === undefined || currentProperty === null) {
-            return undefined;
-        }
-
-        currentProperty = currentProperty[property];
-    }
-
-    return currentProperty;
-}
+import { AccessCandidate } from '../..';
+import { ConnectorService } from '../../Core/ConnectorsService';
+
+export type TCredentialsRequest = {
+    vaultProvider?: string;
+    keyName: string;
+    mapping?: {
+        [key: string]: string;
+    };
+};
+
+/**
+ * Get credentials from a vault
+ *
+ * @param candidate - The candidate requesting the credentials
+ * @param credentialsRequest - The credentials request
+ * @returns The credentials
+ */
+export async function getCredentials(
+    candidate: AccessCandidate,
+    credentialsRequest: TCredentialsRequest | string
+): Promise<string | Record<string, any>> {
+    if (typeof credentialsRequest === 'string') {
+        credentialsRequest = {
+            vaultProvider: '', //default vault provider
+            keyName: credentialsRequest, //default key name
+        };
+    }
+
+    const vaultConnector = ConnectorService.getVaultConnector(credentialsRequest.vaultProvider || '');
+    const vaultRequester = vaultConnector.requester(candidate);
+    const credentials = await vaultRequester.get(credentialsRequest.keyName);
+
+    if (!credentialsRequest.mapping) return credentials;
+
+    const mappedCredentials = {};
+    for (const [key, value] of Object.entries(credentialsRequest.mapping)) {
+        mappedCredentials[key] = JSONExpression(credentials, value);
+    }
+
+    return mappedCredentials;
+}
+
+/**
+ * @param obj - The object to extract the property from
+ * @param propertyString - The property to extract from the object
+ * @returns The property value
+ */
+function JSONExpression(obj, propertyString) {
+    const properties = propertyString.split(/\.|\[|\]\.|\]\[|\]/).filter(Boolean);
+    let currentProperty = obj;
+
+    for (let property of properties) {
+        if (currentProperty === undefined || currentProperty === null) {
+            return undefined;
+        }
+
+        currentProperty = currentProperty[property];
+    }
+
+    return currentProperty;
+}