Merge pull request #3479 from zowe/bugfix/v2/dirLen

Zowe-yaml-schema: validate unix path by def in server-common
zowe · Aug 29, 2023 · 560bb97 · 560bb97
2 parents ccf74fc + 8a68c2b
commit 560bb97
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,7 +5,8 @@ All notable changes to the Zowe Installer will be documented in this file.
 
 ## `2.11.0`
 
-### Minor enhancements/defect fixes
+#### Minor enhancements/defect fixes
+- `zowe-yaml-schema.json` validates unix directory path as `server-common#zowePath`
 - Bugfix: Fixed that Zowe would allow newer Java versions to generate PKCS12 keystores that was not compatible with some components. Newer versions of Java by default create PKCS12 keystores that aren't compatible with GSK / SystemSSL which components such as ZSS use, but include flags to restore a compatibility mode, which Zowe now uses. (#3507)
 
 ## `2.10.0`

diff --git a/schemas/server-common.json b/schemas/server-common.json
@@ -56,14 +56,12 @@
     "path": {
       "$anchor": "zowePath",
       "type": "string",
-      "pattern": "^([^\0]){1,1024}$",
       "minLength": 1,
       "maxLength": 1024
     },
     "file": {
       "$anchor": "zoweFile",
       "type": "string",
-      "pattern": "^([^\\\0]){1,256}$",
       "minLength": 1,
       "maxLength": 256
     },

diff --git a/schemas/zowe-yaml-schema.json b/schemas/zowe-yaml-schema.json
@@ -49,7 +49,7 @@
                 },
                 "loadlib": {
                   "type": "string",
-                  "description": "States the path where Zowe executable utilities are located",
+                  "description": "States the dataset where Zowe executable utilities are located",
                   "default": "<hlq>.SZWELOAD"
                 },
                 "authLoadlib": {
@@ -190,7 +190,7 @@
                   "description": "PKCS#12 keystore settings",
                   "properties": {
                     "directory": {
-                      "type": "string",
+                      "$ref": "/schemas/v2/server-common#zowePath",
                       "description": "Keystore directory"
                     },
                     "name": {
@@ -388,19 +388,19 @@
           }
         },
         "runtimeDirectory": {
-          "type": "string",
+          "$ref": "/schemas/v2/server-common#zowePath",
           "description": "Path to where you installed Zowe."
         },
         "logDirectory": {
-          "type": "string",
+          "$ref": "/schemas/v2/server-common#zowePath",
           "description": "Path to where you want to store Zowe log files."
         },
         "workspaceDirectory": {
-          "type": "string",
+          "$ref": "/schemas/v2/server-common#zowePath",
           "description": "Path to where you want to store Zowe workspace files. Zowe workspace are used by Zowe component runtime to store temporary files."
         },
         "extensionDirectory": {
-          "type": "string",
+          "$ref": "/schemas/v2/server-common#zowePath",
           "description": "Path to where you want to store Zowe extensions. \"zwe components install\" will install new extensions into this directory."
         },
         "job": {
@@ -557,7 +557,7 @@
       "type": "object",
       "properties": {
         "home": {
-          "type": "string",
+          "$ref": "/schemas/v2/server-common#zowePath",
           "description": "Path to Java home directory."
         }
       }
@@ -566,7 +566,7 @@
       "type": "object",
       "properties": {
         "home": {
-          "type": "string",
+          "$ref": "/schemas/v2/server-common#zowePath",
           "description": "Path to node.js home directory."
         }
       }
@@ -655,7 +655,7 @@
               "const": "PKCS12"
             },
             "file": {
-              "type": "string",
+              "$ref": "/schemas/v2/server-common#zowePath",
               "description": "Path to your PKCS#12 keystore."
             },
             "password": {
@@ -680,7 +680,7 @@
               "const": "PKCS12"
             },
             "file": {
-              "type": "string",
+              "$ref": "/schemas/v2/server-common#zowePath",
               "description": "Path to your PKCS#12 keystore."
             },
             "password": {
@@ -696,24 +696,24 @@
           "required": ["key", "certificate"],
           "properties": {
             "key": {
-              "type": "string",
+              "$ref": "/schemas/v2/server-common#zowePath",
               "description": "Path to the certificate private key stored in PEM format."
             },
             "certificate": {
-              "type": "string",
+              "$ref": "/schemas/v2/server-common#zowePath",
               "description": "Path to the certificate stored in PEM format."
             },
             "certificateAuthorities": {
               "description": "List of paths to the certificate authorities stored in PEM format.",
               "oneOf": [{
-                  "type": "string",
+                  "$ref": "/schemas/v2/server-common#zowePath",
                   "description": "Paths to the certificate authorities stored in PEM format. You can separate multiple certificate authorities by comma."
                 },
                 {
                   "type": "array",
                   "description": "Path to the certificate authority stored in PEM format.",
                   "items": {
-                    "type": "string"
+                    "$ref": "/schemas/v2/server-common#zowePath"
                   }
                 }
               ]
@@ -784,24 +784,24 @@
           "required": ["key", "certificate"],
           "properties": {
             "key": {
-              "type": "string",
+              "$ref": "/schemas/v2/server-common#zowePath",
               "description": "Path to the certificate private key stored in PEM format."
             },
             "certificate": {
-              "type": "string",
+              "$ref": "/schemas/v2/server-common#zowePath",
               "description": "Path to the certificate stored in PEM format."
             },
             "certificateAuthorities": {
               "description": "List of paths to the certificate authorities stored in PEM format.",
               "oneOf": [{
-                  "type": "string",
+                  "$ref": "/schemas/v2/server-common#zowePath",
                   "description": "Paths to the certificate authorities stored in PEM format. You can separate multiple certificate authorities by comma."
                 },
                 {
                   "type": "array",
                   "description": "Path to the certificate authority stored in PEM format.",
                   "items": {
-                    "type": "string"
+                    "$ref": "/schemas/v2/server-common#zowePath"
                   }
                 }
               ]
@@ -860,7 +860,7 @@
           "description": "The location of the default registry for this handler. It could be a URL, path, dataset, whatever this handler supports"
         },
         "path": {
-          "type": "string",
+          "$ref": "/schemas/v2/server-common#zowePath",
           "description": "Unix file path to the configmgr-compatible JS file which implements the handler API"
         }
       }