Merge branch 'revert-522645a3' into 'main'

Revert "Merge branch 'wrc-label-fix' into 'main'"

See merge request weblogic-cloud/weblogic-toolkit-ui!305

Author: robertpatrick

THIRD_PARTY_LICENSES.txt

@@ -1,5 +1,5 @@
 +++
-title = "Release 1.6.0"
+title = "Release Notes 1.6.0"
 date = 2022-11-03T12:48:00-05:00
 weight = 90
 pre = "<b> </b>"

documentation/1.7/content/release/release-1.6.0.md

@@ -1,7 +1,7 @@
 +++
 title = "Release 1.6.3"
 date = 2022-11-03T12:48:00-05:00
-weight = 87
+weight = 88
 pre = "<b> </b>"
 +++
 

documentation/1.7/content/release/release-1.6.3.md

@@ -0,0 +1,31 @@
+{
+    "env": {
+        "browser": true,
+        "commonjs": true,
+        "es2021": true
+    },
+    "extends": "eslint:recommended",
+    "parserOptions": {
+        "ecmaVersion": 2022
+    },
+    "rules": {
+        "indent": [
+            "error",
+            2,
+            {
+                "SwitchCase": 1
+            }
+        ],
+        "quotes": [
+            "error",
+            "single"
+        ],
+        "semi": [
+            "error",
+            "always"
+        ],
+        "no-unused-vars": [
+            "warn"
+        ]
+    }
+}

electron/.eslintrc.json

@@ -9,5 +9,4 @@
 /Library
 /.env
 /app/webui.json
-/app/locales/en/*.missing.json
 /coverage

electron/.gitignore

@@ -3,12 +3,7 @@
  * Copyright (c) 2021, Oracle and/or its affiliates.
  * Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
  */
-const {
-  createCipheriv,
-  createDecipheriv,
-  pbkdf2Sync,
-  randomBytes
-} = require('node:crypto');
+const crypto = require('crypto');
 const zlib = require('zlib');
 
 const _ivLength = 16;
@@ -25,11 +20,11 @@ class CredentialEncryptor {
   }
 
   getEncryptedText(clearText) {
-    const salt = randomBytes(_saltLength);
+    const salt = crypto.randomBytes(_saltLength);
     const derivedKey = this._getDerivedKey(salt);
 
-    const iv = randomBytes(_ivLength);
-    const cipher = createCipheriv(_encryptionAlgorithm, derivedKey, iv);
+    const iv = crypto.randomBytes(_ivLength);
+    const cipher = crypto.createCipheriv(_encryptionAlgorithm, derivedKey, iv);
     const encrypted = Buffer.concat([ cipher.update(clearText, 'utf8'), cipher.final() ]);
     let authTag = cipher.getAuthTag();
 
@@ -44,7 +39,7 @@ class CredentialEncryptor {
     const salt = Buffer.from(data.salt, 'base64');
     const derivedKey = this._getDerivedKey(salt);
 
-    const decipher = createDecipheriv(_encryptionAlgorithm, derivedKey, iv);
+    const decipher = crypto.createDecipheriv(_encryptionAlgorithm, derivedKey, iv);
     decipher.setAuthTag(authTag);
     const decrypted = Buffer.concat([decipher.update(encrypted), decipher.final()]);
     return decrypted.toString('utf8');
@@ -53,7 +48,7 @@ class CredentialEncryptor {
   _getDerivedKey(salt) {
     // derive key with password and salt
     // keylength adheres to the "ECRYPT-CSA Recommendations" on "www.keylength.com"
-    return pbkdf2Sync(this.passphrase, salt, _iterations, _keyLength, _digestAlgorithm);
+    return crypto.pbkdf2Sync(this.passphrase, salt, _iterations, _keyLength, _digestAlgorithm);
   }
 
   _packCipherData(authTag, content, iv, salt) {

electron/app/js/credentialEncryptor.js

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates.
+ * Copyright (c) 2021, 2023, Oracle and/or its affiliates.
  * Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
  */
 const CredentialEncryptor = require('./credentialEncryptor');
@@ -9,6 +9,7 @@ const { getLogger } = require('./wktLogging');
 
 const DECRYPTION_FAILED_STRING = 'Unsupported state or unable to authenticate data';
 
+/* global Buffer */
 class CredentialManager {
   constructor(credentialStorePolicy) {
     this.credentialStorePolicy = credentialStorePolicy;
@@ -56,17 +57,63 @@ class CredentialManager {
           refObj.reference = { };
         }
         const cipherText = refObj.reference[refObj.field];
-        if (cipherText) {
-          refObj.reference[refObj.field] = await this.manager.loadCredential(jsonPath, cipherText);
-        } else {
-          logger.debug('Failed to load credential from %s so skipping it', jsonPath);
-        }
+        refObj.reference[refObj.field] = await this.manager.loadCredential(jsonPath, cipherText);
       }
     }
     return Promise.resolve(loadedProject);
   }
 }
 
+class CredentialStoreManager extends CredentialManager {
+  constructor(projectGuid) {
+    super('native');
+    const CredentialStore = require('./credentialStore');
+
+    this.projectGuid = projectGuid;
+    this.credentialStore = new CredentialStore();
+    super.credentialManager = this;
+  }
+
+  get credentialStoreType() {
+    return super.credentialStoreType;
+  }
+
+  async storeCredentials(project) {
+    return super.storeCredentials(project);
+  }
+
+  async loadCredentials(project) {
+    return super.loadCredentials(project);
+  }
+
+  async storeCredential(jsonPath, clearText) {
+    return new Promise((resolve, reject) => {
+      if (clearText) {
+        this.credentialStore.storeCredential(this._getCredentialName(jsonPath), clearText)
+          .then(() => resolve())
+          .catch(err => reject(new Error(`Failed to save credential for ${jsonPath}: ${err}`)));
+      } else {
+        this.credentialStore.deleteCredential(this._getCredentialName(jsonPath))
+          .then(() => resolve())
+          .catch(err => reject(new Error(`Failed to delete empty credential for ${jsonPath}: ${err}`)));
+      }
+    });
+  }
+
+  // eslint-disable-next-line no-unused-vars
+  async loadCredential(jsonPath, cipherText) {
+    return new Promise((resolve, reject) => {
+      this.credentialStore.getCredential(this._getCredentialName(jsonPath))
+        .then(clearText => resolve(clearText))
+        .catch(err => reject(new Error(`Failed to load credential for ${jsonPath}: ${err}`)));
+    });
+  }
+
+  _getCredentialName(jsonPath) {
+    return Buffer.from(`${this.projectGuid}:${jsonPath}`, 'utf8').toString('base64');
+  }
+}
+
 class EncryptedCredentialManager extends CredentialManager {
   static BAD_PASSPHRASE_KEY = 'Incorrect passphrase';
 
@@ -152,5 +199,6 @@ class CredentialNoStoreManager extends CredentialManager {
 
 module.exports = {
   CredentialNoStoreManager,
+  CredentialStoreManager,
   EncryptedCredentialManager
 };

electron/app/js/credentialManager.js

@@ -3,7 +3,6 @@
  * Copyright (c) 2021, Oracle and/or its affiliates.
  * Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
  */
-// eslint-disable-next-line no-redeclare
 const { name } = require('../../package.json');
 const { getLogger } = require('./wktLogging');
 

electron/app/js/credentialStore.js

@@ -209,12 +209,12 @@ function getExecutableFilePath(exeName, mode) {
   let resolvedPath;
   try {
     resolvedPath = which.sync(exeName);
-  } catch {
+  } catch (err) {
     // not found...
     if (osUtils.isMac() && mode === 'exe') {
       try {
         resolvedPath = which.sync(exeName, { path: '/usr/local/bin' });
-      } catch {
+      } catch (nestedErr) {
         // still not found...
       }
     }

electron/app/js/fsUtils.js

@@ -6,11 +6,6 @@
 'use strict';
 
 const { HttpsProxyAgent } = require('https-proxy-agent');
-
-// Node.js now has a built-in fetch implementation but it does not appear to
-// support proxies so let's stick with node-fetch for now...
-//
-// eslint-disable-next-line no-redeclare
 const fetch = require('node-fetch');
 
 // WARNING: This file contains functions that are called by build scripts