fix: log crejsonldap stderr, do NOT parse it as JSON (GLPI UP1#168946)

UnivParis1 · Nov 25, 2024 · a0bf166 · a0bf166
1 parent 90e32c1
commit a0bf166
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/server/crejsonldap.ts b/server/crejsonldap.ts
@@ -74,7 +74,7 @@ export const call = (v: v, opts: options) => {
 }
 
 // exported for tests purpose
-export const callRaw = { fn: (param: string) => utils.popen(param, 'createCompte', []) };
+export const callRaw = { fn: (param: string) => utils.popen(param, 'createCompte', [], { log_stderr: true }) };
 
 export const throw_if_err = (resp: resp) => {
     const err = resp.err && resp.err[0];

diff --git a/server/utils.ts b/server/utils.ts
@@ -159,7 +159,7 @@ export const wait = (milliseconds: number) => (
 
 import { spawn } from 'child_process';
 
-export function popen(inText: string, cmd: string, params: string[]): Promise<string> {
+export function popen(inText: string, cmd: string, params: string[], opts?: { log_stderr?: true }): Promise<string> {
     let p = spawn(cmd, params);
     p.stdin.write(inText);
     p.stdin.end();
@@ -169,7 +169,7 @@ export function popen(inText: string, cmd: string, params: string[]): Promise<st
         let get_ouput = (data: any) => { output += data; };
 
         p.stdout.on('data', get_ouput);
-        p.stderr.on('data', get_ouput);
+        p.stderr.on('data', opts?.log_stderr ? data => console.error(`${cmd} stderr : ${data}`) : get_ouput);
         p.on('error', event => {
             reject(event);
         });