Merge pull request #84 from oracle/release-2.4.16

Release 2.4.16

Author: mriccell

.gitignore

@@ -49,6 +49,7 @@ frontend/electron-test/newWDTModelTokenFile.yml
 client.log.*
 bin/*
 weblogic-bean-info-harvester/build-*
+sample-security-providers/buildout
 run/work
 fortify-output/**
 owasp-output/**

assembly/pom.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2020, 2024, Oracle and/or its affiliates.
+<!-- Copyright 2020, 2025, Oracle and/or its affiliates.
      Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -9,7 +9,7 @@
   <parent>
     <artifactId>console-backend</artifactId>
     <groupId>com.oracle.weblogic</groupId>
-    <version>2.4.15</version>
+    <version>2.4.16</version>
   </parent>
 
   <packaging>pom</packaging>

build-console-with-docker.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2021, 2024, Oracle Corporation and/or its affiliates.  All rights reserved.
+# Copyright 2021, 2025, Oracle Corporation and/or its affiliates.  All rights reserved.
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 
 set -e
@@ -24,6 +24,7 @@ then
 fi
 docker cp $DOCKER_ID:/build/installer/target/. installer/target
 docker cp $DOCKER_ID:/build/frontend/web/. frontend/web
+docker cp $DOCKER_ID:/build/sample-security-providers/target sample-security-providers || true
 docker cp $DOCKER_ID:/build/on-weblogic/target on-weblogic || true
 docker cp $DOCKER_ID:/build/console-rest-ext/target console-rest-ext || true
 docker cp $DOCKER_ID:/build/wls-remote-console-helper-war/war/target wls-remote-console-helper-war/war || true

build-tools/pom.xml

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2020, 2024, Oracle Corporation and/or its affiliates.  All rights reserved.
+<!-- Copyright 2020, 2025, Oracle Corporation and/or its affiliates.  All rights reserved.
      Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.  -->
 <project>
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>com.oracle.weblogic.console-backend</groupId>
   <artifactId>build-tools</artifactId>
-  <version>2.4.15</version>
+  <version>2.4.16</version>
   <name>Build Tools</name>
 
   <parent>
       <groupId>com.oracle.weblogic</groupId>
       <artifactId>console-backend</artifactId>
-      <version>2.4.15</version>
+      <version>2.4.16</version>
   </parent>
 
   <properties>

electron/app/js/auto-update-utils.js

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright (c) 2023, Oracle and/or its affiliates.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates.
  * Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
  * @ignore
  */
@@ -18,6 +18,7 @@ let failed;
 let _updateInfo;
 let _window;
 let downloadingDialogAbortController;
+let pastStartup = false;
 
 autoUpdater.on('error', error => {
   failed = true;
@@ -29,8 +30,11 @@ autoUpdater.on('error', error => {
     // dialog is started.
     setTimeout(() => showError(error), 100);
   }
-  else
-    showError(error);
+  else {
+    if (pastStartup) {
+      showError(error);
+    }
+  }
 });
 
 (() => {
@@ -101,7 +105,12 @@ autoUpdater.on('update-available', (info) => {
 });
 
 
+async function checkForUpdatesAtStart() {
+  return Promise.resolve(autoUpdater.checkForUpdates());
+}
+
 async function checkForUpdates() {
+  pastStartup = true;
   return Promise.resolve(autoUpdater.checkForUpdates());
 }
 
@@ -110,6 +119,7 @@ function getVersion() {
 }
 
 async function doUpdate(window) {
+  pastStartup = true;
   _window = window;
   downloadingDialogAbortController = new AbortController();
   dialog.showMessageBox(
@@ -138,5 +148,6 @@ module.exports = {
   doUpdate,
   getVersion,
   setFeedURL,
-  checkForUpdates
+  checkForUpdates,
+  checkForUpdatesAtStart
 };

electron/app/js/console-logger.js

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates.
  * Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
  */
 
@@ -20,38 +20,52 @@ const LoggingLevels = [
 let _logFilename;
 let _loggingLevel;
 let _isHeadlessMode;
+let _isStdoutErrorEpipe;
 
 (function () {
   _loggingLevel = 'info';
   _isHeadlessMode = false;
+  _isStdoutErrorEpipe = false;
   const _error = console.error;
   const _warning = console.warning;
   const _debug = console.debug;
   const _trace = console.trace;
 
   console.error = function (line) {
     fs.appendFileSync(_logFilename, line + os.EOL);
-    if (!_isHeadlessMode) _error.apply(console, arguments);
+    if (_useConsoleLogging()) _error.apply(console, arguments);
   };
 
   console.warning = function (line) {
     fs.appendFileSync(_logFilename, line + os.EOL);
-    if (!_isHeadlessMode) _warning.apply(console, arguments);
+    if (_useConsoleLogging()) _warning.apply(console, arguments);
   };
 
   console.debug = function (line) {
     fs.appendFileSync(_logFilename, line + os.EOL);
-    if (!_isHeadlessMode) _debug.apply(console, arguments);
+    if (_useConsoleLogging()) _debug.apply(console, arguments);
   };
 
   console.trace = function (line) {
     fs.appendFileSync(_logFilename, line + os.EOL);
-    if (!_isHeadlessMode) _trace.apply(console, arguments);
+    if (_useConsoleLogging()) _trace.apply(console, arguments);
   };
+
+  // Handle error on stdout and also prevent a dialog box when using console logging functions...
+  process.stdout.on('error', function (error) {
+    if (error.code == 'EPIPE') _isStdoutErrorEpipe = true;
+    const caller = _getCaller((new Error('StackLog')));
+    const line = `${getLogEntryDateTime()} ${getLogEntryLevel('error')} ${caller} ${error}`;
+    fs.appendFileSync(_logFilename, line + os.EOL);
+  });
 })();
 
+function _useConsoleLogging() {
+  return (!_isHeadlessMode && !_isStdoutErrorEpipe);
+}
+
 function initializeLog(options) {
-  _logFilename = _rotateLogfile(options.appPaths.userData, options.baseFilename);
+  _logFilename = _getLogFileName(options.appPaths.userData, options.baseFilename);
   if (options.loggingLevel) _loggingLevel = options.loggingLevel;
   if (options.isHeadlessMode) _isHeadlessMode = options.isHeadlessMode;
 }
@@ -82,27 +96,28 @@ function getLogEntryLevel(level = 'info') {
   return levelSwitch(level);
 }
 
+function _getCaller(stacklog) {
+  let caller = '';
+  const stackParts = stacklog.stack.split('\n');
+  if (stackParts.length > 2) {
+    const matched = stackParts[2].match(/([^/]+\.js)/);
+    caller = (matched ? matched[0] : stackParts[2]);
+  }
+  return caller;
+}
+
 /**
  *
  * @param {string} [level='info']
  * @param {string} message
  */
-function log(level = 'info', message) {
+function log(level = 'info', message, infoUseTimeStamp = true) {
   function isLoggableLevel(level) {
     return (LoggingLevels.indexOf(level) <= LoggingLevels.indexOf(_loggingLevel));
   }
 
-  function getCaller(stacklog) {
-    let caller = '';
-    const stackParts = stacklog.stack.split('\n');
-    if (stackParts.length > 2) {
-      caller = stackParts[2].match(/([^/]+\.js)/)[0];
-    }
-    return caller;
-  }
-
   if (isLoggableLevel(level)) {
-    const caller = getCaller((new Error('StackLog')));
+    const caller = _getCaller((new Error('StackLog')));
     switch (level) {
       case 'error':
         ((line) => {
@@ -125,10 +140,14 @@ function log(level = 'info', message) {
         })(`${getLogEntryDateTime()} ${getLogEntryLevel(level)} ${caller} ${message}`);
         break;
       default:
-        if (!_isHeadlessMode) {
-          ((line) => { console.log(line); })(message);
+        let msg = message;
+        if (infoUseTimeStamp) {
+          msg = `${getLogEntryDateTime()} ${getLogEntryLevel('info')} ${caller} ${message}`;
         }
-        ((line) => { fs.appendFileSync(_logFilename, line + os.EOL); })(message);
+        if (_useConsoleLogging()) {
+          ((line) => { console.log(line); })(msg);
+        }
+        ((line) => { fs.appendFileSync(_logFilename, line + os.EOL); })(msg);
     }
   }
 }
@@ -160,6 +179,17 @@ function setOptions(options) {
   }
 }
 
+function rotateLog(options) {
+  _logFilename = _rotateLogfile(options.appPaths.userData, options.baseFilename);
+  if (options.loggingLevel) _loggingLevel = options.loggingLevel;
+  if (options.isHeadlessMode) _isHeadlessMode = options.isHeadlessMode;
+}
+
+function _getLogFileName(userDataPath, baseFilename) {
+  const filename = `${baseFilename}.log`;
+  return `${userDataPath}/${filename}`;
+}
+
 function _rotateLogfile(userDataPath, baseFilename) {
   function appendLogEntries(file, rotateFilename) {
     const w = fs.createWriteStream(rotateFilename, {flags: 'a'});
@@ -174,8 +204,7 @@ function _rotateLogfile(userDataPath, baseFilename) {
     });
   }
 
-  const filename = `${baseFilename}.log`;
-  const file = `${userDataPath}/${filename}`;
+  const file = _getLogFileName(userDataPath, baseFilename);
 
   const logDate = (new Date()).toISOString().slice(0, 10);
   const rotateFilename = `${userDataPath}/${baseFilename}-${logDate}.log`;
@@ -196,5 +225,6 @@ module.exports = {
   getLogLevels,
   setLoggingLevel,
   getLoggingLevel,
-  setOptions
+  setOptions,
+  rotateLog
 };