Merge pull request #943 from Bischoff/iucv-trim-newlines

Trim newlines and other hidden characters from userid

Author: mfriesenegger

doc/source/makeimage.rst

@@ -106,7 +106,7 @@ Feilong manages the deployed VM via IUCV channel. IUCV service
 should be configured on zLinux before capture it to make image. Following the below
 steps to install and configure IUCV service.
 
-1. Logon your BYOL(Bring Your Own Linux, which will be used to represent the Linux
+1. Logon your BYOL (Bring Your Own Linux, which will be used to represent the Linux
    on which the Feilong will be run), and copy the following files
    to target VM
 

zthin-parts/zthin/src/IUCV/iucvserver.c

@@ -76,8 +76,11 @@ int check_client_authorization(int newsockfd, char *req_userid)
             syslog(LOG_ERR, "ERROR: Fail to close authorized file after reading: %s\n",strerror(errno));
         }
         fp = NULL;
+        /* trim invisible characters from the userid */
+        len = strcspn(client_userid, "\r\n ");
+        client_userid[len] = '\0';
         /* if the userid is not authorized, send error message back*/
-        if (strcasecmp(req_userid,client_userid))
+        if (strcasecmp(req_userid, client_userid))
         {
             sprintf(err_msg, "UNAUTHORIZED_ERROR: Userid %s is not authorized, IUCV agent only can communicate with specified open cloud user!#0", req_userid);
             syslog(LOG_ERR, err_msg);