5701a-r14485.diff

Galya B, 01/31/2023 04:44 AM

     ** Module   : ClientCore.java
     ** Abstract : core client loop which handles init and connects to server
     **
     ** Copyright (c) 2005-2022, Golden Code Development Corporation.
     ** Copyright (c) 2005-2023, Golden Code Development Corporation.
     **
     ** -#- -I- --Date-- ----------------------------------Description---------------------------------
     ** 001 GES 20110928 Moved core logic here from ClientDriver so that the same
-...
     **     CA  20220918 Added socket trust store filename and password to the ClientParameters.
     **     GBB 20221209 Path to debug log file to be read from client bootstrap configs.
     **                  Passing arg to spawner for path to stderr log file for background processes.
     **     GBB 20230127 Fixing pid in outputToFile name by replacing it in Java code.
     */
     /*
     ** This program is free software: you can redistribute it and/or modify
-...
     package com.goldencode.p2j.main;
     import java.io.*;
     import java.util.*;
     import java.util.function.*;
     import java.util.logging.*;
-...
        public static void start(BootstrapConfig config, boolean file, boolean single, Supplier<String> diag)
        throws Exception
+       {
           // Load native library
           loadNativeLibrary();
           setOutputToFile(config);
           String  uuid     = config.getString("server", "spawner", "uuid", null);
           boolean dbg      = config.getBoolean("logging", "debug", "enable", false);
           String  referrer = config.getString("web", "referrer", "url", null);
-...
           // iterations of the core loop
           ScreenDriver<?> driver = (uuid == null) ? null : processTemporaryClient(uuid, config);
           // Load native library
           loadNativeLibrary();
           while (running)
+          {
              Object          context = null;
-...
           return isStop;
+       }
        private static void setOutputToFile(BootstrapConfig config)
+       {
           String outputToFile = config.getString("server", "clientConfig", "outputToFile", null);
           if (outputToFile == null)
+          {
              return;
+          }
           try
+          {
              outputToFile = outputToFile.replace("%pid%", String.valueOf(getPid()));
              System.setOut(new PrintStream(new FileOutputStream(outputToFile), true));
+          }
           catch (Throwable t)
+          {
              System.err.println("ClientCore: Unable to redirect stdout to outputToFile " + outputToFile);
+          }
+       }
        /**
         * Loads native library and performs required initial steps for P2J library to working.
         */

     ** Module   : ProcessClientBuilder.java
     ** Abstract : build and start a platform process for P2J process.
     **
     ** Copyright (c) 2014-2017, Golden Code Development Corporation.
     ** Copyright (c) 2014-2023, Golden Code Development Corporation.
     **
     ** -#- -I- --Date-- ---------------------------------Description----------------------------------
     ** 001 CA  20140206 First version.
-...
     ** 003 MAG 20140722 Implemented the remote launcher.
     ** 004 GES 20160219 Moved code to the parent class allowing reuse of the native secure connection
     **                  setup processing.
     **     GBB 20230127 Fixing pid in outputToFile name by passing it as config to spawned client.
     */
     /*
     ** This program is free software: you can redistribute it and/or modify
-...
           if (outputToFile != null)
+          {
              cmd.add("-O");
              cmd.add(outputToFile);
              cmd.add("server:clientConfig:outputToFile=" + outputToFile);
+          }
           return cmd;
+       }
+    }
+    }

     ** Module   : spawn.c
     ** Abstract : a simple tool able to spawn a process on an existing user account.
     **
     ** Copyright (c) 2013-2021, Golden Code Development Corporation.
     ** Copyright (c) 2013-2023, Golden Code Development Corporation.
     **
     ** -#- -I- --Date-- --------------------------------Description---------------------------------
     ** 001 MAG 20131127 First version.
-...
     **     IAS 20210325 Added addional parameters for command
     **     EVL 20210519 Fix for segmentation fault in strcmp() library call.  Added new error codes to inform
     **                  the caller about system errors.
     **     GBB 20230131 outputToFile passed in as arg to create client process command.
     **                  stdout redirect in Java.
     */
     /*
     ** This program is free software: you can redistribute it and/or modify
-...
        #define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO)/* 07777 */
     #endif
     /* prototypes */
     void stdout_redirect();
     /* Global data */
     struct passwd *pw;
     int extra_logging = 0;
-...
     /* Output file name */
     char output_file_name[MAX_FILENAME];
     int output_to_file_opt_found = 0;
     /**
      * Use syslog to audit the execution of child processes.
-...
                 logMessage(message_buffer);
                 exit(audit(ERR_SPAWN_CHDIR_WD, "chdir(workdir)"));
+             }
              /* Redirect STDOUT if required */
              if (output_file_name[0] != 0)
+             {
                 stdout_redirect();
+             }
              /* Execute command */
              exit(execvp(command, argv));
-...
        /* make it 1-based, so it follows the structure of the command line arguments
           (0 is program name); also, one more position is needed for execvp, which requires for the
           arguments to be null-terminated. */
        char **arguments = (char**) malloc((length + 2) * sizeof(char*));
        char **arguments = (char**) malloc((length + 2 + output_to_file_opt_found) * sizeof(char*));
        arguments[0] = NULL;
        arguments[length + 1] = NULL;
        arguments[length + 1 + output_to_file_opt_found] = NULL;
        if (output_to_file_opt_found == 1)
+       {
           int len = strlen(output_file_name) + 1;
           arguments[length + 1] = (char*) malloc(len * sizeof(char));
           memset(arguments[length + 1], '\0', len);
           strcpy(arguments[length + 1], output_file_name);
+       }
        int i;
        for (i = 0; i < (int) length; i++)
-...
+    }
     /**
      * Redirect STDOUT to an output file.
      */
     void stdout_redirect()
+    {
        int output_fd;
        char pid[32];
        /* convert pid to string */
        sprintf(pid, "%u", getpid());
        /* replace %pid% placeholder */
        char* filename = replace_str(output_file_name, "%pid%", pid);
        // Open file
        output_fd = open(filename, O_WRONLY | O_CREAT | O_APPEND, 0644);
        if (output_fd == -1)
+       {
           fprintf(stderr, "Cannot open file %s\n", filename);
+       }
        else
+       {
           /* Redirect STDOUT to file */
           if (dup2(output_fd, STDOUT_FILENO) == -1)
+          {
              close(output_fd);
              fprintf(stderr, "Cannot redirect STDOUT to file %s\n", filename);
+          }
+       }
+    }
     /**
      * Main function which allows both password and P2J server-style authentication.
      * <p>
      * For P2J server-style authentiation, the following files need to exist in current directory:
-...
              if ((strcmp("-O", argv[i]) == 0) && (++i < argc))
+             {
                 strcpy(output_file_name, argv[i]);
                 output_to_file_opt_found = 1;
+             }
+          }

     ** Module   : winspawn.c
     ** Abstract : a simple tool able to spawn a process on an existing user account.
     **
     ** Copyright (c) 2013-2022, Golden Code Development Corporation.
     ** Copyright (c) 2013-2023, Golden Code Development Corporation.
     **
     ** -#- -I- --Date-- --------------------------------Description---------------------------------
     ** 001 MAG 20131130 First version.
-...
     **                  to CreateProcessWithToken.
     **     EVL 20220413 Fixed the issues with processes starting on behalf of different users.  Some additional
     **                  improvements for common desktop name.
     ** 010 GBB 20221209 Fix for stdout file name, incorrect calculation of the prefix length
     **     GBB 20221209 Fix for stdout file name, incorrect calculation of the prefix length
     **                  when %pid% placeholder replaced.
     **     GBB 20230131 outputToFile passed in as arg to create client process command.
     **                  stdout redirect in Java.
     */
     /*
     ** This program is free software: you can redistribute it and/or modify
-...
     unsigned char key1[KEY_SIZE + 1], key2[KEY_SIZE + 1], key3[KEY_SIZE + 1];
     /* STDOUT redirection flag. Default NO redirection */
     int stdoutRedirect = 0;
     WCHAR szOutputFile[MAX_SIZE] = L"";
     int outputToFileOption = 0;
     char szOutputFile[MAX_SIZE];
     WCHAR szUserProfile[MAX_SIZE] = L"";
     WCHAR szCommandLine[MAX_SIZE] = L"";
-...
+    }
     /**
     * Redirect STDOUT to an output file.
+    *
     * @param   szWorkingDir
     *          Working directory.
     * @param   szOutputFile
     *          The name of the file where the STDOUT is redirected.
     */
     void stdout_redirect(LPWSTR szWorkingDir, LPWSTR szOutputFile)
+    {
        HANDLE hFile;
        WCHAR pid[32];
        /* Goto working directory */
        if (!SetCurrentDirectoryW(szWorkingDir))
+       {
           DisplayError(L"SetCurrentDirectoryW");
+       }
        /* convert pid to string */
        swprintf(pid, sizeof(pid), L"%lu", GetCurrentProcessId());
        /* replace %pid% placeholder */
        LPWSTR szFileName = replace_str(szOutputFile, L"%pid%", pid);
        SECURITY_ATTRIBUTES sa;
        sa.nLength = sizeof(sa);
        sa.lpSecurityDescriptor = NULL;
        sa.bInheritHandle = TRUE;
        /* create file */
        hFile = CreateFileW(szFileName,                         // file name
                            FILE_APPEND_DATA,                   // open for writing
                            FILE_SHARE_WRITE | FILE_SHARE_READ, // allow multiple readers
                            &sa,                                // security
                            OPEN_ALWAYS,                        // open or create
                            FILE_ATTRIBUTE_NORMAL,              // normal file
                            NULL);                              // no template
        /* check for errors */
        if (hFile == INVALID_HANDLE_VALUE)
+       {
           DisplayError(L"CreateFileW");
+       }
        else
+       {
           /* redirect */
           si.hStdOutput = hFile;
           si.dwFlags |= STARTF_USESTDHANDLES;
+       }
+    }
     /**
     * Spawn a child process on the current logon account.
+    *
     * @param   szWorkingDir
-...
        si.wShowWindow = SW_HIDE;
        // since Windows Vista we have to specify desktop session explicitly here
        si.lpDesktop = desktopDefault;
        /* Redirect STDOUT if required */
        if (stdoutRedirect)
+       {
           stdout_redirect(szWorkingDir, szOutputFile);
+       }
        if (!CreateProcessW(NULL,             // application name
                            szCommand,        // command line
-...
+          }
           szWorkingDir = szUserProfile;
+       }
        /* Redirect STDOUT if required */
        if (stdoutRedirect)
+       {
           stdout_redirect(szWorkingDir, szOutputFile);
+       }
        if (extra_logging > 0)
+       {
-...
        /* make it 1-based, so it follows the structure of the command line arguments
           (0 is program name); also, one more position is needed for execvp, which requires for the
           arguments to be null-terminated. */
        char **arguments = (char**) malloc((length + 2) * sizeof(char*));
        char **arguments = (char**) malloc((length + 2 + outputToFileOption) * sizeof(char*));
        arguments[0] = NULL;
        arguments[length + 1] = NULL;
        arguments[length + 1 + outputToFileOption] = NULL;
        if (outputToFileOption == 1)
+       {
           int len = strlen(szOutputFile) + 1;
           arguments[length + 1] = (char*) malloc(len * sizeof(char));
           memset(arguments[length + 1], '\0', len);
           strcpy(arguments[length + 1], szOutputFile);
+       }
        int debug_option = 0;
        char *dbg_level = NULL;
-...
        AnsiToUnicode(arguments[MIN_ARGS_COMMAND - 1 + debug_option], szWorkingDir);
        /* Command line */
        LPWSTR szCommand = CommandLineFromAnsi(MIN_ARGS_COMMAND + debug_option, length + 1, arguments);
        LPWSTR szCommand = CommandLineFromAnsi(MIN_ARGS_COMMAND + debug_option, length + 1 + outputToFileOption, arguments);
        /* User name */
        AnsiToUnicode(arguments[1], szUserName);
-...
              /* -O <outputToFile> */
              if ((wcscmp(L"-O", argv[i]) == 0) && (++i < argc))
+             {
                 wcscpy(szOutputFile, argv[i]);
                 stdoutRedirect = 1; // restored redirection mode
                 wcstombs(szOutputFile, argv[i], MAX_SIZE);
                 outputToFileOption = 1;
+             }
+          }

Project

General

Profile

FWD » Core Development » Runtime Infrastructure

5701a-r14485.diff