Write pfsense user <bcrypt-hash> and <md5-hash> fields to opnsene…

… user `<password>` (#8)

* write pfsense user <bcrypt-hash> and <md5-hash> fields to opnsene user <password>

* remove log

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pf2open",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",

src/app/mappings/opnsense.interface.ts

@@ -136,6 +136,23 @@ export interface System {
   domain?: string;
   timezone?: string;
   language?: string;
+  user?: User;
+}
+
+export interface User {
+  [x: string]: any;
+  name?: string;
+  descr?: string;
+  scope?: string;
+  groupname?: string;
+  password?: string;
+  uid?: number;
+  priv?: string;
+  'md5-hash'?: string;
+  expires?: string;
+  authorizedkeys?: string;
+  ipsecpsk?: string;
+  'bcrypt-hash'?: string;
 }
 
 export interface Configapply {

src/app/mappings/pfsense-complex.interface.ts

@@ -1050,6 +1050,7 @@ export interface User {
   expires?: string;
   authorizedkeys?: string;
   ipsecpsk?: string;
+  'bcrypt-hash'?: string;
 }
 
 export interface Group {

src/app/services/converter.service.ts

@@ -9,6 +9,7 @@ import {
   Rule as opnRule, 
   Opnsense, 
   System as opnSystem,
+  User,
 } from '../mappings/opnsense.interface';
 import { v1 as uuidv1 } from 'uuid'
 import { XMLParser, XMLBuilder } from 'fast-xml-parser';
@@ -126,16 +127,34 @@ export class ConverterService {
       system.hostname = pfSystem.hostname;
       system.domain = pfSystem.domain;
       system.timezone = pfSystem.timezone;
+
+      system.user = {
+        ...pfSystem.user
+      }
+
+      // Map bcrypt-hash or md5-hash to password
+      if (pfSystem.user?.['bcrypt-hash']) { 
+        system.user.password = pfSystem.user['bcrypt-hash'];
+        delete system.user['bcrypt-hash'];
+
+      }
+      if (pfSystem.user?.['md5-hash']) {
+        system.user.password = pfSystem.user['md5-hash'];
+        delete system.user['md5-hash'];
+      }
+
+      // dedupe pfSense.system.user
+      delete input.pfsense.system?.user;
     }
 
-    //@ts-ignore
+    // @ts-ignore
     const opnsense: Opnsense = {
       version: 1,
       'config-apply': {
         uuid: uuidv1(),
       },
-      system,
       ...input.pfsense,
+      system,
     }
 
     const opnsenseJson: opnRoot = {