greybel-mock-environment 2.4.32 → 2.4.34

package/dist/environment.d.ts

@@ -5,6 +5,7 @@ import NetworkGenerator from './generators/network';
 import UserGenerator from './generators/user';
 import VulnerabilityGenerator from './generators/vulnerability';
 import { Computer, Device, EMail, LibraryManager, Location, Port, Router, Session, Switch } from './types';
+import { PasswordManager, PasswordObject } from './types/password-object';
 export interface RouterLocation {
     distance: number;
     percentage: number;
@@ -12,7 +13,7 @@ export interface RouterLocation {
 }
 export declare type InitalUserCredentials = {
     username: string;
-    password: string;
+    password: PasswordObject;
 };
 export interface MockEnvironmentOptions {
     seed?: string;
@@ -21,6 +22,7 @@ export interface MockEnvironmentOptions {
 }
 export default class MockEnvironment {
     readonly WIFI_MAX_DISTANCE: number;
+    passwordManager: PasswordManager;
     seed: string;
     basicGenerator: BasicGenerator;
     emailGenerator: EmailGenerator;

package/dist/environment.js

@@ -37,15 +37,17 @@ var network_1 = __importDefault(require("./generators/network"));
 var user_1 = __importDefault(require("./generators/user"));
 var vulnerability_1 = __importDefault(require("./generators/vulnerability"));
 var types_1 = require("./types");
+var password_object_1 = require("./types/password-object");
 var utils_1 = require("./utils");
 var MockEnvironment = /** @class */ (function () {
     function MockEnvironment(options) {
         this.WIFI_MAX_DISTANCE = 10;
+        this.passwordManager = password_object_1.PasswordManager.singleton;
         var me = this;
         var seed = options.seed || 'test';
         var initalUser = options.localUser || {
             username: 'test',
-            password: 'test'
+            password: password_object_1.PasswordManager.create('test')
         };
         me.libraryManager = new types_1.LibraryManager();
         me.seed = seed;
@@ -107,7 +109,7 @@ var MockEnvironment = /** @class */ (function () {
         var username = _a.username, password = _a.password;
         var me = this;
         var user = me.userGenerator.generate(username, password);
-        var computer = me.networkGenerator.generateLocalComputer([user], 'test');
+        var computer = me.networkGenerator.generateLocalComputer([user], password_object_1.PasswordManager.create('test'));
         var currentPath = computer.getHome(user);
         var programPath = new types_1.File({
             name: 'myprogram',
@@ -237,7 +239,7 @@ var MockEnvironment = /** @class */ (function () {
     MockEnvironment.prototype.getEmailViaLogin = function (email, password) {
         var me = this;
         var emails = me.emailGenerator.emails;
-        return emails.find(function (v) { return v.email === email && v.password === password; });
+        return emails.find(function (v) { return v.email === email && v.password.value === password; });
     };
     MockEnvironment.prototype.getEmail = function (email) {
         var me = this;

package/dist/fs.js

@@ -111,8 +111,8 @@ function getEtcFiles(options) {
         permissions: 'rw-r-----',
         owner: 'root',
         content: options.users
-            .map(function (v) { return "".concat(v.username, ":").concat(v.passwordHashed); })
-            .join('\n'),
+            .map(function (v) { return "".concat(v.username, ":").concat(v.password.hashed); })
+            .join('\n') + '\n',
         type: file_system_1.FileType.Source
     }, options.parent), new file_system_1.File({
         name: 'xorg.conf',

package/dist/generators/basic.d.ts

@@ -1,5 +1,6 @@
 import { RandomSeed } from 'random-seed';
 import { Location } from '../types/location';
+import { PasswordObject } from '../types/password-object';
 import { WordGenerator } from './word-generator';
 export interface BasicGeneratorOptions {
     seed: string;
@@ -22,7 +23,7 @@ export default class BasicGenerator {
     constructor({ seed }: BasicGeneratorOptions);
     generateDomain(): string;
     generateUsername(): string;
-    generatePassword(): string;
+    generatePassword(): PasswordObject;
     generateName(): string;
     generateBankNumber(): string;
     generateMAC(): string;

package/dist/generators/basic.js

@@ -36,6 +36,7 @@ var passwords_1 = __importDefault(require("../data/passwords"));
 var surname_1 = __importDefault(require("../data/surname"));
 var usernames_1 = __importDefault(require("../data/usernames"));
 var location_1 = require("../types/location");
+var password_object_1 = require("../types/password-object");
 var utils_1 = require("../utils");
 var word_generator_1 = require("./word-generator");
 var BasicGenerator = /** @class */ (function () {
@@ -65,8 +66,8 @@ var BasicGenerator = /** @class */ (function () {
         return username.toLowerCase();
     };
     BasicGenerator.prototype.generatePassword = function () {
-        var password = this.passwordWordGenerator.next();
-        return password;
+        var value = this.passwordWordGenerator.next();
+        return password_object_1.PasswordManager.create(value);
     };
     BasicGenerator.prototype.generateName = function () {
         var me = this;

package/dist/generators/email.d.ts

@@ -1,4 +1,5 @@
 import { EMail } from '../types';
+import { PasswordObject } from '../types/password-object';
 import BasicGenerator from './basic';
 export interface EmailGeneratorOptions {
     seed: string;
@@ -7,11 +8,11 @@ export interface EmailGeneratorOptions {
 export interface EmailGenerateOptions {
     name?: string;
     domain?: string;
-    password?: string;
+    password?: PasswordObject;
 }
 export interface EmailGenerateByEmailOptions {
     email: string;
-    password?: string;
+    password?: PasswordObject;
 }
 export default class EmailGenerator {
     basicGenerator: BasicGenerator;

package/dist/generators/network.d.ts

@@ -1,6 +1,7 @@
 import { RandomSeed } from 'random-seed';
 import { Computer, MetaOwnerLevel, NetworkDevice, Port, Router, Switch, User } from '../types';
 import { LibraryManager } from '../types/library-manager';
+import { PasswordObject } from '../types/password-object';
 import { RouterOptions } from '../types/router';
 import { SwitchOptions } from '../types/switch';
 import BasicGenerator from './basic';
@@ -26,8 +27,8 @@ export declare class ServerMapGenerator {
     constructor({ router, networkRng, portRng, basicGenerator, userGenerator, networkGenerator, libraryManager }: ServerMapGeneratorOptions);
     generateLocalIp(router: Router): string;
     generateSwitch(options?: Partial<SwitchOptions>): Switch;
-    generateComputer(router: Router, users: User[], rootPassword?: string): Computer;
-    generateLocalComputer(users: User[], rootPassword?: string): Computer;
+    generateComputer(router: Router, users: User[], rootPassword?: PasswordObject): Computer;
+    generateLocalComputer(users: User[], rootPassword?: PasswordObject): Computer;
     generatePorts(): Map<number, Port>;
 }
 export interface NetworkGeneratorOptions {
@@ -48,7 +49,7 @@ export default class NetworkGenerator {
     constructor({ seed, basicGenerator, userGenerator, emailGenerator, libraryManager }: NetworkGeneratorOptions);
     generateIp(): string;
     generateDifficulty(): MetaOwnerLevel;
-    generateLocalComputer(users: User[], rootPassword?: string): Computer;
+    generateLocalComputer(users: User[], rootPassword?: PasswordObject): Computer;
     generateRouter(options?: Partial<RouterOptions>): Router;
     generateNetworkDevice(): NetworkDevice;
 }

package/dist/generators/user.d.ts

@@ -1,4 +1,5 @@
 import { User } from '../types';
+import { PasswordObject } from '../types/password-object';
 import BankGenerator from './bank';
 import BasicGenerator from './basic';
 import EmailGenerator from './email';
@@ -14,5 +15,5 @@ export default class UserGenerator {
     bankGenerator: BankGenerator;
     users: User[];
     constructor({ basicGenerator, emailGenerator, bankGenerator }: UserGeneratorOptions);
-    generate(username: string, password: string): User;
+    generate(username: string, password: PasswordObject): User;
 }

package/dist/types/bank.d.ts

@@ -1,10 +1,10 @@
+import { PasswordObject } from './password-object';
 export interface BankAccountOptions {
     id: string;
-    password: string;
+    password: PasswordObject;
 }
 export declare class BankAccount {
     id: string;
-    password: string;
-    passwordHashed: string;
+    password: PasswordObject;
     constructor(options: BankAccountOptions);
 }

package/dist/types/bank.js

@@ -1,15 +1,10 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BankAccount = void 0;
-var blueimp_md5_1 = __importDefault(require("blueimp-md5"));
 var BankAccount = /** @class */ (function () {
     function BankAccount(options) {
         this.id = options.id;
         this.password = options.password;
-        this.passwordHashed = (0, blueimp_md5_1.default)(this.password);
     }
     return BankAccount;
 }());

package/dist/types/device.d.ts

@@ -5,6 +5,7 @@ import { Location } from './location';
 import { MetaDeviceType, MetaInfo } from './meta-info';
 import { NetCard } from './net-card';
 import { NetworkDevice } from './network-device';
+import { PasswordObject } from './password-object';
 import { Port } from './port';
 import { Process, ProcessOptions } from './process';
 import { Service, ServiceType } from './service';
@@ -48,7 +49,7 @@ export declare class Device {
     unforward(port: number): boolean;
     getNetworkDeviceMap(): Map<string, NetworkDevice>;
     findNetworkDevicesByNetCard(netCard: NetCard): NetworkDevice[];
-    addUser(userName: string, password: string): boolean;
+    addUser(userName: string, password: PasswordObject): boolean;
     removeUser(userName: string): boolean;
     updatePasswd(): boolean;
     createUserFolder(userName: string): boolean;

package/dist/types/device.js

@@ -34,6 +34,7 @@ var file_system_1 = require("./file-system");
 var library_1 = require("./library");
 var meta_info_1 = require("./meta-info");
 var net_card_1 = require("./net-card");
+var password_object_1 = require("./password-object");
 var port_1 = require("./port");
 var process_1 = require("./process");
 var service_1 = require("./service");
@@ -187,8 +188,8 @@ var Device = /** @class */ (function () {
                 permissions: 'rw-r-----',
                 owner: 'root',
                 content: Array.from(this.users.values())
-                    .map(function (v) { return "".concat(v.username, ":").concat(v.passwordHashed); })
-                    .join('\n'),
+                    .map(function (v) { return "".concat(v.username, ":").concat(v.password.hashed); })
+                    .join('\n') + '\n',
                 type: file_system_1.FileType.Source
             });
             etcFolder.putEntity(file);
@@ -346,7 +347,7 @@ var Device = /** @class */ (function () {
         }
         return new user_1.User({
             username: 'guest',
-            password: ''
+            password: password_object_1.PasswordManager.create('')
         });
     };
     Device.prototype.findPortByService = function (serviceType) {
@@ -396,7 +397,7 @@ var Device = /** @class */ (function () {
                 name: 'Bank.txt',
                 permissions: 'rw-r--r--',
                 owner: user.username,
-                content: "".concat(user.bankAccount.id, ":").concat(user.bankAccount.passwordHashed),
+                content: "".concat(user.bankAccount.id, ":").concat(user.bankAccount.password.hashed),
                 type: file_system_1.FileType.Source
             });
             configFolder.putEntity(bankFile);
@@ -415,7 +416,7 @@ var Device = /** @class */ (function () {
                 name: 'Mail.txt',
                 permissions: 'rw-r--r--',
                 owner: user.username,
-                content: "".concat(user.email.email, ":").concat(user.email.passwordHashed),
+                content: "".concat(user.email.email, ":").concat(user.email.password.hashed),
                 type: file_system_1.FileType.Source
             });
             configFolder.putEntity(emailFile);

package/dist/types/email.d.ts

@@ -1,3 +1,4 @@
+import { PasswordObject } from './password-object';
 export declare class EMailMessage {
     from: string;
     subject: string;
@@ -6,13 +7,12 @@ export declare class EMailMessage {
 }
 export interface EMailOptions {
     email: string;
-    password: string;
+    password: PasswordObject;
     messages?: Map<string, EMailMessage>;
 }
 export declare class EMail {
     email: string;
-    password: string;
-    passwordHashed: string;
+    password: PasswordObject;
     messages: Map<string, EMailMessage>;
     constructor(options: EMailOptions);
 }

package/dist/types/email.js

@@ -1,10 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EMail = exports.EMailMessage = void 0;
-var blueimp_md5_1 = __importDefault(require("blueimp-md5"));
 var EMailMessage = /** @class */ (function () {
     function EMailMessage(from, subject, messages) {
         this.from = from;
@@ -18,7 +14,6 @@ var EMail = /** @class */ (function () {
     function EMail(options) {
         this.email = options.email;
         this.password = options.password;
-        this.passwordHashed = (0, blueimp_md5_1.default)(options.password);
         this.messages = options.messages || new Map();
     }
     return EMail;

package/dist/types/password-object.d.ts

@@ -0,0 +1,13 @@
+export interface PasswordObject {
+    value: string;
+    hashed: string;
+}
+export declare class PasswordManager {
+    private passwordsByValue;
+    private passwordsByHash;
+    static singleton: PasswordManager;
+    static create(password: string): PasswordObject;
+    create(password: string): PasswordObject;
+    getByValue(password: string): PasswordObject;
+    getByHashed(hashed: string): PasswordObject;
+}

package/dist/types/password-object.js

@@ -0,0 +1,38 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PasswordManager = void 0;
+var blueimp_md5_1 = __importDefault(require("blueimp-md5"));
+var PasswordManager = /** @class */ (function () {
+    function PasswordManager() {
+        this.passwordsByValue = {};
+        this.passwordsByHash = {};
+    }
+    PasswordManager.create = function (password) {
+        return PasswordManager.singleton.create(password);
+    };
+    PasswordManager.prototype.create = function (password) {
+        var existingPasswordObj = this.passwordsByValue[password];
+        if (existingPasswordObj) {
+            return existingPasswordObj;
+        }
+        var obj = {
+            value: password,
+            hashed: (0, blueimp_md5_1.default)(password)
+        };
+        this.passwordsByValue[password] = obj;
+        this.passwordsByHash[obj.hashed] = obj;
+        return obj;
+    };
+    PasswordManager.prototype.getByValue = function (password) {
+        return this.passwordsByValue[password];
+    };
+    PasswordManager.prototype.getByHashed = function (hashed) {
+        return this.passwordsByHash[hashed];
+    };
+    PasswordManager.singleton = new PasswordManager();
+    return PasswordManager;
+}());
+exports.PasswordManager = PasswordManager;

package/dist/types/user.d.ts

@@ -1,15 +1,15 @@
 import { BankAccount } from './bank';
 import { EMail } from './email';
+import { PasswordObject } from './password-object';
 export interface UserOptions {
     username: string;
-    password: string;
+    password: PasswordObject;
     email?: EMail;
     bankAccount?: BankAccount;
 }
 export declare class User {
     username: string;
-    password: string;
-    passwordHashed: string;
+    password: PasswordObject;
     email: EMail;
     bankAccount: BankAccount;
     constructor(options: UserOptions);

package/dist/types/user.js

@@ -1,21 +1,16 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.User = void 0;
-var blueimp_md5_1 = __importDefault(require("blueimp-md5"));
+var password_object_1 = require("./password-object");
 var User = /** @class */ (function () {
     function User(options) {
         this.username = options.username;
         this.password = options.password;
-        this.passwordHashed = (0, blueimp_md5_1.default)(options.password);
         this.email = options.email;
         this.bankAccount = options.bankAccount;
     }
     User.prototype.changePassword = function (password) {
-        this.password = password;
-        this.passwordHashed = (0, blueimp_md5_1.default)(password);
+        this.password = password_object_1.PasswordManager.create(password);
     };
     return User;
 }());

package/dist/types/version.js

@@ -35,9 +35,7 @@ exports.VersionOptions = VersionOptions;
 var Version = /** @class */ (function () {
     function Version(options) {
         if (options === void 0) { options = {}; }
-        this.version = options.version
-            ? Version.parse(options.version)
-            : [1, 0, 0];
+        this.version = options.version ? Version.parse(options.version) : [1, 0, 0];
     }
     Version.parse = function (version) {
         if (/^([0-9]+\.){2}[0-9]+$/.test(version)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "greybel-mock-environment",
-  "version": "2.4.32",
+  "version": "2.4.34",
   "description": "Mock environment",
   "main": "dist/index",
   "typings": "dist/index",
@@ -49,7 +49,7 @@
   "dependencies": {
     "@types/random-seed": "^0.3.3",
     "blueimp-md5": "^2.19.0",
-    "greyscript-core": "~2.5.1",
+    "greyscript-core": "~2.5.2",
     "random-seed": "^0.3.0",
     "random-username-generator": "^1.0.4"
   }