From 19e9d68e9487bd42fabeefd3508aca5b41d1f692 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml Date: Fri, 30 Jun 2023 13:21:44 +0200 Subject: [PATCH 1/3] Zowe-yaml-schema: validate unix path by def in server-common Signed-off-by: Martin Zeithaml --- CHANGELOG.md | 4 ++++ schemas/zowe-yaml-schema.json | 38 +++++++++++++++++------------------ 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 60a5e3c4b7..9c3e578c66 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to the Zowe Installer will be documented in this file. +## `2.10.0` +#### Minor enhancements/defect fixes +- `zowe-yaml-schema.json` validates unix directory path as `server-common#zowePath` + ## `2.9.0` ### New features and enhancements diff --git a/schemas/zowe-yaml-schema.json b/schemas/zowe-yaml-schema.json index 52b6dcb0df..c92c20e464 100644 --- 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": ".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": { @@ -552,7 +552,7 @@ "type": "object", "properties": { "home": { - "type": "string", + "$ref": "/schemas/v2/server-common#zowePath", "description": "Path to Java home directory." } } @@ -561,7 +561,7 @@ "type": "object", "properties": { "home": { - "type": "string", + "$ref": "/schemas/v2/server-common#zowePath", "description": "Path to node.js home directory." } } @@ -650,7 +650,7 @@ "const": "PKCS12" }, "file": { - "type": "string", + "$ref": "/schemas/v2/server-common#zowePath", "description": "Path to your PKCS#12 keystore." }, "password": { @@ -675,7 +675,7 @@ "const": "PKCS12" }, "file": { - "type": "string", + "$ref": "/schemas/v2/server-common#zowePath", "description": "Path to your PKCS#12 keystore." }, "password": { @@ -691,24 +691,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" } } ] @@ -779,24 +779,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" } } ] @@ -855,7 +855,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" } } From 2d1dc783b542989e2823ba1ded1f85d1c9e68063 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml Date: Mon, 3 Jul 2023 11:04:00 +0200 Subject: [PATCH 2/3] Regex removed Signed-off-by: Martin Zeithaml --- schemas/server-common.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/schemas/server-common.json b/schemas/server-common.json index 2285acb4a0..4eaa81feb1 100644 --- 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 }, From eee59f941d20f8f0f786d1ff9a9c6fbb717fc69a Mon Sep 17 00:00:00 2001 From: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> Date: Mon, 14 Aug 2023 14:08:07 +0200 Subject: [PATCH 3/3] Update CHANGELOG.md Signed-off-by: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c3e578c66..5240362e2c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ All notable changes to the Zowe Installer will be documented in this file. -## `2.10.0` +## `2.11.0` #### Minor enhancements/defect fixes - `zowe-yaml-schema.json` validates unix directory path as `server-common#zowePath`