Zowe Suite v1.5.0 RC1

bin/zis-plugin-install.sh

@@ -1,4 +1,11 @@
 #!/bin/sh
+# This program and the accompanying materials are
+# made available under the terms of the Eclipse Public License v2.0 which accompanies
+# this distribution, and is available at https://www.eclipse.org/legal/epl-v20.html
+# 
+# SPDX-License-Identifier: EPL-2.0
+# 
+# Copyright Contributors to the Zowe Project.
 
 ZIS_PREFIX=${ZIS_PREFIX:-$USER.DEV}
 ZIS_PARMLIB=${ZIS_PARMLIB:-$ZIS_PREFIX.PARMLIB}
@@ -85,3 +92,11 @@ PLUGINID=$2
 LMODNAME=`basename $LMODFILE |tr a-z A-Z`
 
 add-plugin-to-libs
+
+# This program and the accompanying materials are
+# made available under the terms of the Eclipse Public License v2.0 which accompanies
+# this distribution, and is available at https://www.eclipse.org/legal/epl-v20.html
+# 
+# SPDX-License-Identifier: EPL-2.0
+# 
+# Copyright Contributors to the Zowe Project.

bin/zss-import-jwt-key.sh

@@ -0,0 +1,66 @@
+#!/bin/sh
+# This program and the accompanying materials are
+# made available under the terms of the Eclipse Public License v2.0 which accompanies
+# this distribution, and is available at https://www.eclipse.org/legal/epl-v20.html
+# 
+# SPDX-License-Identifier: EPL-2.0
+# 
+# Copyright Contributors to the Zowe Project.
+
+mktemp1()
+{
+  FILE=/tmp/zss-$$-$RANDOM
+  while [ -e $FILE ]
+  do
+    FILE=/tmp/zss-$$-$RANDOM
+  done
+  echo $FILE
+}
+
+if [ "$#" -ne 2 ]
+then
+   >&2  cat <<EOF
+Usage: $0 <keystore file> <PKCS#11 token name>
+EOF
+  exit 1
+fi
+
+SRC_KEYSTORE=$1
+TOKEN=$2
+
+>&2 echo "Will import keypair 'jwtsecret' from $SRC_KEYSTORE into $TOKEN"
+trap '>&2 echo Failure; exit 1' ERR
+
+>&2 echo "Checking if $TOKEN exists and its contents..."
+if ! /bin/tsocmd "RACDCERT LISTTOKEN('$TOKEN')"
+then
+  /bin/tsocmd "RACDCERT ADDTOKEN('$TOKEN')"
+fi
+
+SRC_KEYSTORE_PASSWORD="${SRC_KEYSTORE_PASSWORD:-password}"
+TMP_KEYSTORE_PASSWORD=$SRC_KEYSTORE_PASSWORD
+
+TMP_KEYSTORE=`mktemp1`
+trap 'rm $TMP_KEYSTORE' exit
+
+>&2 echo "Extracting 'jwtsecret' from $SRC_KEYSTORE..."
+keytool -importkeystore \
+  -srckeystore $SRC_KEYSTORE -srcstoretype PKCS12 \
+  -destkeystore $TMP_KEYSTORE -deststoretype PKCS12 \
+  -srcalias jwtsecret -srcstorepass $SRC_KEYSTORE_PASSWORD \
+	-deststorepass $TMP_KEYSTORE_PASSWORD
+
+chmod go-rwx $TMP_KEYSTORE
+
+>&2 echo "Adding 'jwtsecret' to $TOKEN..."
+echo $TMP_KEYSTORE_PASSWORD |gskkyman -i -t $TOKEN -l jwtsecret -p $TMP_KEYSTORE
+
+>&2 echo "Done"
+
+# This program and the accompanying materials are
+# made available under the terms of the Eclipse Public License v2.0 which accompanies
+# this distribution, and is available at https://www.eclipse.org/legal/epl-v20.html
+# 
+# SPDX-License-Identifier: EPL-2.0
+# 
+# Copyright Contributors to the Zowe Project.

build/zis.xml

@@ -58,6 +58,9 @@
       <arg value="${ZSS}/c/zis/services/nwm.c"/>
       <arg value="${ZSS}/c/zis/services/secmgmt.c"/>
       <arg value="${ZSS}/c/zis/services/snarfer.c"/>
+      <arg value="${ZSS}/c/zis/services/tssparsing.c"/>
+      <arg value="${ZSS}/c/zis/services/secmgmttss.c"/>
+      <arg value="${ZSS}/c/zis/services/secmgmtUtils.c"/>
     </exec> 
 
     <antcall target="assemble"><param name="file" value="alloc"/></antcall>
@@ -96,6 +99,9 @@
     <antcall target="assemble"><param name="file" value="nwm"/></antcall>
     <antcall target="assemble"><param name="file" value="secmgmt"/></antcall>
     <antcall target="assemble"><param name="file" value="snarfer"/></antcall>
+    <antcall target="assemble"><param name="file" value="tssparsing"/></antcall>
+    <antcall target="assemble"><param name="file" value="secmgmttss"/></antcall>
+    <antcall target="assemble"><param name="file" value="secmgmtUtils"/></antcall>
 
 
     <exec executable="ld" dir="${TMPDIR}" failonerror="true" output="${TMPDIR}/ZWESIS01.link">
@@ -132,6 +138,9 @@
       <arg value="nwm.o"/>
       <arg value="secmgmt.o"/>
       <arg value="snarfer.o"/>
+      <arg value="tssparsing.o"/>
+      <arg value="secmgmttss.o"/>
+      <arg value="secmgmtUtils.o"/>
     </exec>
 
  </target>

build/zss.xml

@@ -53,6 +53,8 @@
       <arg value="-Wc,dll,expo,langlvl(extc99),gonum,goff,hgpr,roconst,ASM,asmlib('CEE.SCEEMAC','SYS1.MACLIB','SYS1.MODGEN')"/>
       <arg value="-Wl,ac=1"/>
       <arg line="-I ${COMMON}/h"/>
+      <arg line="-I ${COMMON}/jwt/jwt"/>
+      <arg line="-I ${COMMON}/jwt/rscrypto"/>
       <arg line="-I ${ZSS}/h"/>
       <arg line="-o ${ZSS}/bin/zssServer"/>
       <arg value="${COMMON}/c/alloc.c"/>
@@ -75,6 +77,7 @@
       <arg value="${COMMON}/c/impersonation.c"/>
       <arg value="${COMMON}/c/jcsi.c"/>
       <arg value="${COMMON}/c/json.c"/>
+      <arg value="${COMMON}/jwt/jwt/jwt.c"/>
       <arg value="${COMMON}/c/le.c"/>
       <arg value="${COMMON}/c/logging.c"/>
       <arg value="${COMMON}/c/nametoken.c"/>
@@ -85,6 +88,8 @@
       <arg value="${COMMON}/c/radmin.c"/>
       <arg value="${COMMON}/c/rawfd.c"/>
       <arg value="${COMMON}/c/recovery.c"/>
+      <arg value="${COMMON}/jwt/rscrypto/rs_icsfp11.c"/>
+      <arg value="${COMMON}/jwt/rscrypto/rs_rsclibc.c"/>
       <arg value="${COMMON}/c/scheduling.c"/>
       <arg value="${COMMON}/c/signalcontrol.c"/>
       <arg value="${COMMON}/c/socketmgmt.c"/>

c/authService.c

@@ -12,6 +12,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <strings.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <sys/stat.h>

c/datasetService.c

@@ -23,6 +23,7 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <strings.h>
 #endif
 

c/serviceUtils.c

@@ -26,6 +26,7 @@
 #include <strings.h>
 #include <stdarg.h>  
 #include <pthread.h>
+#include <string.h>
 #endif
 
 #include "zowetypes.h"

c/unixFileService.c

@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
+#include <stdlib.h>
 #include "pthread.h"
 
 #include "zowetypes.h"

c/zis/client.c

@@ -237,6 +237,7 @@ const char *ZIS_UPRFSRV_SERVICE_RC_DESCRIPTION[] = {
   [RC_ZIS_UPRFSRV_IMPERSONATION_MISSING] = "Impersonation is required",
   [RC_ZIS_UPRFSRV_INTERNAL_SERVICE_FAILED] = "R_admin service failed",
   [RC_ZIS_UPRFSRV_ALLOC_FAILED] = "Alloc function failed",
+  [RC_ZIS_UPRFSRV_UNSUPPORTED_ESM] = "ESM not supported"
 };
 
 const char *ZIS_UPRFSRV_WRAPPER_RC_DESCRIPTION[] = {
@@ -316,7 +317,8 @@ const char *ZIS_GRPRFSRV_SERVICE_RC_DESCRIPTION[] = {
   [RC_ZIS_GRPRFSRV_IMPERSONATION_MISSING] = "Impersonation is required",
   [RC_ZIS_GRPRFSRV_INTERNAL_SERVICE_FAILED] = "R_admin failed",
   [RC_ZIS_GRPRFSRV_ALLOC_FAILED] = "Alloc function failed",
-  [RC_ZIS_GRPRFSRV_USER_CLASS_NOT_READ] = CMS_PROD_ID" class is not read"
+  [RC_ZIS_GRPRFSRV_USER_CLASS_NOT_READ] = CMS_PROD_ID" class is not read",
+  [RC_ZIS_GRPRFSRV_UNSUPPORTED_ESM] = "ESM not supported"
 };
 
 const char *ZIS_GRPRFSRV_WRAPPER_RC_DESCRIPTION[] = {
@@ -407,7 +409,8 @@ const char *ZIS_ACSLSRV_SERVICE_RC_DESCRIPTION[] = {
   [RC_ZIS_ACSLSRV_ALLOC_FAILED] = "Alloc function failed",
   [RC_ZIS_ACSLSRV_INTERNAL_SERVICE_FAILED] = "R_admin failed",
   [RC_ZIS_ACSLSRV_INSUFFICIENT_SPACE] = "Provided buffer is too small",
-  [RC_ZIS_ACSLSRV_USER_CLASS_NOT_READ] = CMS_PROD_ID" class is not read"
+  [RC_ZIS_ACSLSRV_USER_CLASS_NOT_READ] = CMS_PROD_ID" class is not read",
+  [RC_ZIS_ACSLSRV_UNSUPPORTED_ESM] = "ESM not supported"
 };
 
 const char *ZIS_ACSLSRV_WRAPPER_RC_DESCRIPTION[] = {
@@ -508,7 +511,8 @@ const char *ZIS_GSADMNSRV_SERVICE_RC_DESCRIPTION[] = {
   [RC_ZIS_GSADMNSRV_USER_CLASS_TOO_LONG] = CMS_PROD_ID" class is too long",
   [RC_ZIS_GSADMNSRV_USER_CLASS_NOT_READ] = CMS_PROD_ID" class read failed",
   [RC_ZIS_GSADMNSRV_AUTOREFRESH_NOT_READ] = "Auto refresh option read failed",
-  [RC_ZIS_GSADMNSRV_OWNER_TOO_LONG] = "Owner name is too long"
+  [RC_ZIS_GSADMNSRV_OWNER_TOO_LONG] = "Owner name is too long",
+  [RC_ZIS_GSADMNSRV_UNSUPPORTED_ESM] = "ESM not supported"
 };
 
 const char *ZIS_GSADMNSRV_WRAPPER_RC_DESCRIPTION[] = {
@@ -730,7 +734,8 @@ const char *ZIS_GPPRFSRV_SERVICE_RC_DESCRIPTION[] = {
   [RC_ZIS_GPPRFSRV_PROFILE_COUNT_NULL] = "Profile count is null",
   [RC_ZIS_GPPRFSRV_IMPERSONATION_MISSING] = "Impersonation is required",
   [RC_ZIS_GPPRFSRV_INTERNAL_SERVICE_FAILED] = "R_admin failed",
-  [RC_ZIS_GPPRFSRV_ALLOC_FAILED] = "Alloc function failed"
+  [RC_ZIS_GPPRFSRV_ALLOC_FAILED] = "Alloc function failed",
+  [RC_ZIS_GPPRFSRV_UNSUPPORTED_ESM] = "ESM not supported"
 };
 
 const char *ZIS_GPPRFSRV_WRAPPER_RC_DESCRIPTION[] = {
@@ -809,7 +814,8 @@ const char *ZIS_GRPALSRV_SERVICE_RC_DESCRIPTION[] = {
   [RC_ZIS_GRPALSRV_IMPERSONATION_MISSING] = "Impersonation is required",
   [RC_ZIS_GRPALSRV_ALLOC_FAILED] = "Alloc function failed",
   [RC_ZIS_GRPALSRV_INTERNAL_SERVICE_FAILED] = "R_admin failed",
-  [RC_ZIS_GRPALSRV_INSUFFICIENT_SPACE] = "Provided buffer is too small"
+  [RC_ZIS_GRPALSRV_INSUFFICIENT_SPACE] = "Provided buffer is too small",
+  [RC_ZIS_GRPALSRV_UNSUPPORTED_ESM] = "ESM not supported"
 };
 
 const char *ZIS_GRPALSRV_WRAPPER_RC_DESCRIPTION[] = {
@@ -898,7 +904,8 @@ const char *ZIS_GRPASRV_SERVICE_RC_DESCRIPTION[] = {
   [RC_ZIS_GRPASRV_PARM_INTERNAL_ERROR] = "Parm list creation failed",
   [RC_ZIS_GRPASRV_USER_CLASS_TOO_LONG] = CMS_PROD_ID" class is too long",
   [RC_ZIS_GRPASRV_USER_CLASS_NOT_READ] = CMS_PROD_ID" class read failed",
-  [RC_ZIS_GRPASRV_AUTOREFRESH_NOT_READ] = "Auto refresh option read failed"
+  [RC_ZIS_GRPASRV_AUTOREFRESH_NOT_READ] = "Auto refresh option read failed",
+  [RC_ZIS_GRPASRV_UNSUPPORTED_ESM] = "ESM not supported"
 };
 
 const char *ZIS_GRPASRV_WRAPPER_RC_DESCRIPTION[] = {