Zowe Suite v1.24.0

zowe · Sep 2, 2021 · b45990d · b45990d
2 parents 49b42e3 + 6f66ddb
commit b45990d
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to the ZSS package will be documented in this file.
 
 ## Recent Changes
 
+## `1.24.0`
+
+- Bugfix: Fix `zis-plugin-install.sh` script to properly exit on error with extended-install
+
 ## `1.23.0`
 
 - Bugfix: `relativeTo` parsing may have failed depending upon path length and contents, leading to skipped plugin loading.

diff --git a/bin/zis-plugin-install.sh b/bin/zis-plugin-install.sh
@@ -164,24 +164,23 @@ handle-simple-install() {
 # Returns:
 #   0 on success, 8 on error.
 #################################################
-handle-extended-intall() {(
+handle-extended-install() {(
 
   loadlib_dir=$1
   samplib_dir=$2
 
   deploy-loadlib $loadlib_dir
   loadlib_rc=$?
   if [ $loadlib_rc -ne 0 ]; then
-    return $loadlib_rc
+    exit $loadlib_rc
   fi
 
   deploy-samplib $samplib_dir
   samplib_rc=$?
   if [ $samplib_rc -ne 0 ]; then
-    return $samplib_rc
+    exit $samplib_rc
   fi
-
-  return 0
+  exit 0
 )}
 
 print-usage() {
@@ -226,7 +225,7 @@ elif [ $1 = "extended-install" ]; then
     exit 1
   fi
 
-  handle-extended-intall $2 $3
+  handle-extended-install $2 $3
   exit $?
 
 else

diff --git a/c/zis/services/auth.c b/c/zis/services/auth.c
@@ -102,16 +102,19 @@ static int handleEntityCheck(AuthServiceParmList *parmList,
   int rcvRC = 0;
   int rc = RC_ZIS_AUTHSRV_OK;
 
-  AuthClass class = {0};
+  AuthClass defaultClass = {0};
+  int getClassRC = getDefaultClassValue(globalArea, &defaultClass);
+  if (getClassRC != RC_ZIS_AUTHSRV_OK) {
+    return getClassRC;
+  }
+
   size_t classLength = strlen(parmList->classNullTerm);
-  if (classLength == 0) {
-    int getClassRC = getDefaultClassValue(globalArea, &class);
-    if (getClassRC != RC_ZIS_AUTHSRV_OK) {
-      return getClassRC;
+  if (classLength != 0) {
+    if (strcmp(parmList->classNullTerm, defaultClass.valueNullTerm) != 0) {
+      return RC_ZIS_AUTHSRV_CUSTOM_CLASS_NOT_ALLOWED;
     }
-  } else {
-    memcpy(class.valueNullTerm, parmList->classNullTerm, classLength);
   }
+  AuthClass class = defaultClass;
 
   CMS_DEBUG(globalArea, "handleEntityCheck(): user = %s, entity = %s, class = %s,"
       " access = %x\n", parmList->userIDNullTerm, parmList->entityNullTerm,
@@ -257,15 +260,13 @@ static int handleAccessRetrieval(AuthServiceParmList *parmList,
     return getClassRC;
   }
 
-  AuthClass class = {0};
   size_t classLength = strlen(parmList->classNullTerm);
   if (classLength != 0) {
-    if (strcmp(class.valueNullTerm, defaultClass.valueNullTerm) != 0) {
+    if (strcmp(parmList->classNullTerm, defaultClass.valueNullTerm) != 0) {
       return RC_ZIS_AUTHSRV_CUSTOM_CLASS_NOT_ALLOWED;
     }
-  } else {
-    class = defaultClass;
   }
+  AuthClass class = defaultClass;
 
   CMS_DEBUG2(globalArea, traceLevel,
              "handleAccessRetrieval(): user=\'%s\', entity=\'%s\', "

diff --git a/c/zss.c b/c/zss.c
@@ -1047,7 +1047,13 @@ static bool readAgentHttpsSettings(ShortLivedHeap *slh,
   if (!address) {
     address = "127.0.0.1";
   }
-  bool isHttpsConfigured = port && settings->keyring;
+
+  const char *useTlsParam = getenv("ZOWE_ZSS_SERVER_TLS");
+  zowelog(NULL, LOG_COMP_ID_MVD_SERVER, ZOWE_LOG_DEBUG, "Environment variable ZOWE_ZSS_SERVER_TLS is %s\n",
+          useTlsParam ? useTlsParam : "not set");
+
+  bool forceHttp = useTlsParam && (0 == strcmp(useTlsParam, "false"));
+  bool isHttpsConfigured = !forceHttp && port && settings->keyring;
   if (settings->keyring) {
       zowelog(NULL, LOG_COMP_ID_MVD_SERVER, ZOWE_LOG_INFO, ZSS_LOG_TLS_SETTINGS_MSG,
               settings->keyring,

diff --git a/deps/zowe-common-c b/deps/zowe-common-c
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-1.23.0
+1.24.0