Deprecate enviornment variables for setting passwords and use secrets (#639)

* deprecate environment variables and use secrets

* Address review comments

Author: RamSubbarao

Dockerfile-server

@@ -156,10 +156,9 @@ ENTRYPOINT ["runmqserver"]
 # Use the Go toolset image, which already includes gcc and the MQ SDK
 FROM builder as cbuilder
 USER 0
-# Install the Apache Portable Runtime code (used for htpasswd hash checking)
-RUN yum --assumeyes --disableplugin=subscription-manager install apr-devel apr-util-openssl apr-util-devel
+# Install the Apache Portable Runtime code (used for simpleauth hash checking)
 COPY authservice/ /opt/app-root/src/authservice/
-WORKDIR /opt/app-root/src/authservice/mqhtpass
+WORKDIR /opt/app-root/src/authservice/mqsimpleauth
 RUN make all
 
 ###############################################################################
@@ -181,12 +180,8 @@ LABEL summary="IBM MQ Advanced for Developers Server" \
   base-image=$BASE_IMAGE \
   base-image-release=$BASE_TAG
 USER 0
-COPY --from=cbuilder /opt/app-root/src/authservice/mqhtpass/build/mqhtpass.so /opt/mqm/lib64/
+COPY --from=cbuilder /opt/app-root/src/authservice/mqsimpleauth/build/mqsimpleauth.so /opt/mqm/lib64/
 COPY etc/mqm/qm-service-component.ini.default /etc/mqm/
-COPY incubating/mqadvanced-server-dev/install-extra-packages.sh /usr/local/bin/
-RUN chmod u+x /usr/local/bin/install-extra-packages.sh \
-  && sleep 1 \
-  && install-extra-packages.sh
 COPY --from=builder $GO_WORKDIR/runmqdevserver /usr/local/bin/
 # Copy template files
 COPY incubating/mqadvanced-server-dev/*.tpl /etc/mqm/

authservice/mqhtpass/src/htpass.c

@@ -16,7 +16,6 @@
 # - gcc
 # - ldd
 # - MQ SDK (mqm_r library, plus header files)
-# - Apache Portable Runtime (apr-1 and aprutil-1 libraries, plus header files)
 
 SRC_DIR = src
 BUILD_DIR = ./build
@@ -30,10 +29,9 @@ CFLAGS.s390x := -m64
 CFLAGS.arm64 :=
 CFLAGS += -std=gnu11 -fPIC -Wall ${CFLAGS.${ARCH}}
 
-LIB_APR = -L/usr/lib64 -lapr-1 -laprutil-1
 LIB_MQ = -L/opt/mqm/lib64 -lmqm_r
 
-all: $(BUILD_DIR)/mqhtpass.so $(BUILD_DIR)/htpass_test $(BUILD_DIR)/log_test
+all: $(BUILD_DIR)/mqsimpleauth.so $(BUILD_DIR)/simpleauth_test $(BUILD_DIR)/log_test
 
 $(BUILD_DIR)/log.o : $(SRC_DIR)/log.c $(SRC_DIR)/log.h
 	mkdir -p ${dir $@}
@@ -42,21 +40,20 @@ $(BUILD_DIR)/log.o : $(SRC_DIR)/log.c $(SRC_DIR)/log.h
 $(BUILD_DIR)/log_test : $(BUILD_DIR)/log.o
 	mkdir -p ${dir $@}
 	gcc $(CFLAGS) $(SRC_DIR)/log_test.c $^ -o $@
-# Run Logging tests, and print log if they fail	
+# Run Logging tests, and print log if they fail
 	$@ || (cat log_test*.log && exit 1)
 
-$(BUILD_DIR)/htpass.o : $(SRC_DIR)/htpass.c $(SRC_DIR)/htpass.h
+$(BUILD_DIR)/simpleauth.o : $(SRC_DIR)/simpleauth.c $(SRC_DIR)/simpleauth.h
 	mkdir -p ${dir $@}
-	gcc $(CFLAGS) -c $(SRC_DIR)/htpass.c -I /usr/include/apr-1 -o $@
+	gcc $(CFLAGS) -c $(SRC_DIR)/simpleauth.c -o $@
 
-$(BUILD_DIR)/htpass_test : $(BUILD_DIR)/htpass.o $(BUILD_DIR)/log.o
+$(BUILD_DIR)/simpleauth_test : $(BUILD_DIR)/simpleauth.o $(BUILD_DIR)/log.o
 	mkdir -p ${dir $@}
-	gcc $(CFLAGS) $(LIB_APR) -lpthread $(SRC_DIR)/htpass_test.c $^ -o $@
-# Run HTPasswd tests, and print log if they fail	
-	$@ || (cat htpass_test*.log && exit 1)
+	gcc $(CFLAGS) -lpthread $(SRC_DIR)/simpleauth_test.c $^ -o $@
+# Run SimpleAuth tests, and print log if they fail
+	$@ || (cat simpleauth_test*.log && exit 1)
 
-$(BUILD_DIR)/mqhtpass.so : $(BUILD_DIR)/log.o $(BUILD_DIR)/htpass.o
+$(BUILD_DIR)/mqsimpleauth.so : $(BUILD_DIR)/log.o $(BUILD_DIR)/simpleauth.o
 	mkdir -p ${dir $@}
-	# NOTE: rpath for libapr will be different on Ubuntu
-	gcc $(CFLAGS) -I/opt/mqm/inc -D_REENTRANT $(LIB_APR) $(LIB_MQ) -Wl,-rpath,/opt/mqm/lib64 -Wl,-rpath,/usr/lib64 -shared $(SRC_DIR)/mqhtpass.c $^ -o $@
+	gcc $(CFLAGS) -I/opt/mqm/inc -D_REENTRANT $(LIB_MQ) -Wl,-rpath,/opt/mqm/lib64 -Wl,-rpath,/usr/lib64 -shared $(SRC_DIR)/mqsimpleauth.c $^ -o $@
 	ldd $@

authservice/mqhtpass/src/htpass_test.htpasswd

@@ -134,7 +134,7 @@ void log_printf(const char *source_file, int source_line, const char *level, con
     if (strncmp(level, "DEBUG", 5) == 0)
     {
       // Add a prefix on any debug messages
-      cur += snprintf(cur, end-cur, "mqhtpass: ");
+      cur += snprintf(cur, end-cur, "mqsimpleauth: ");
     }
 
     // Print log message, using varargs

authservice/mqhtpass/src/htpass_test_invalid.htpasswd

@@ -0,0 +1 @@
+fred:$2y$05$3Fp9