set CipherSpec to ANY_TLS12 and refresh security (#362)

.gitignore

@@ -12,11 +12,3 @@ vendor/github.com/prometheus/client_model/.classpath
 vendor/github.com/prometheus/client_model/.project
 vendor/github.com/prometheus/client_model/.settings*
 gosec_results.json
-internal/qmgrauth/qmgroam/patch
-.tagcache
-
-# Nix
-*.nix
-.envrc
-.direnv
-result

.travis.yml

@@ -1,4 +1,4 @@
-# © Copyright IBM Corporation 2018, 2020
+# © Copyright IBM Corporation 2018, 2019
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,90 +12,66 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-dist: bionic
-group: beta
+dist: xenial
+
 sudo: required
 language: go
 
 go:
-  - "1.19.9"
+  - "1.10"
 
 services:
   - docker
 
-env:
-  global:
-    - MAIN_BRANCH=v9.3.0.x
-    - TAGCACHE_FILE=tagcache
-    - RELEASE=r3
-
 go_import_path: "github.com/ibm-messaging/mq-container"
 
-# cache:
-#   directories:
-#     - downloads
+cache:
+  directories:
+    - downloads
 
 jobs:
   include:
-    - stage: basic-build
-      if: branch != v9.3.0.x AND tag IS blank
-      name: "Basic AMD64 build"
-      os: linux
+    - stage: build and test
       env:
-        - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_930_ARCHIVE_REPOSITORY_DEV_AMD64
-      script: bash -e travis-build-scripts/run.sh
-
-    # CD Build
-
-    - stage: global-tag
-      if: branch = v9.3.0.x AND type != pull_request OR tag =~ ^release-candidate*
-      name: "Generate Global Tag"
-      os: linux
-      script: bash -e travis-build-scripts/global-tag.sh
-    - stage: build
-      if: branch = v9.3.0.x OR tag =~ ^release-candidate*
-      name: "Multi-Arch AMD64 build"
-      os: linux
-      env:
-        - BUILD_ALL=true
-        - MQ_ARCHIVE_REPOSITORY=$MQ_930_ARCHIVE_REPOSITORY_AMD64
-        - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_930_ARCHIVE_REPOSITORY_DEV_AMD64
-      script: bash -e travis-build-scripts/run.sh
-    - stage: build
-      if: branch = v9.3.0.x OR tag =~ ^release-candidate*
-      name: "Multi-Arch S390X build"
-      os: linux-s390
-      env:
-        - BUILD_ALL=true
-        - TEST_OPTS_DOCKER="-run TestGoldenPathWithMetrics"
-        - MQ_ARCHIVE_REPOSITORY=$MQ_930_ARCHIVE_REPOSITORY_S390X
-        - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_930_ARCHIVE_REPOSITORY_DEV_S390X
-      script: bash -e travis-build-scripts/run.sh
-    - stage: build
-      if: branch = v9.3.0.x OR tag =~ ^release-candidate*
-      name: "Multi-Arch PPC64LE build"
-      os: linux-ppc64le
-      env:
-        - BUILD_ALL=true
-        - TEST_OPTS_DOCKER="-run TestGoldenPathWithMetrics"
-        - MQ_ARCHIVE_REPOSITORY=$MQ_930_ARCHIVE_REPOSITORY_PPC64LE
-        - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_930_ARCHIVE_REPOSITORY_DEV_PPC64LE
-      script: bash -e travis-build-scripts/run.sh
-    - stage: push-manifest
-      if: branch = v9.3.0.x AND type != pull_request OR tag =~ ^release-candidate*
-      name: "Push Manifest-list to registry"
-      env:
-        - PUSH_MANIFEST_ONLY=true
-      script: bash -e travis-build-scripts/run.sh
+        - BASE_IMAGE=ubuntu:16.04
+        - DOCKER_DOWNGRADE="echo nothing to be done"
+    # TEMPORARY removal of Docker 1.12 test, due to errors from apt repository
+    # - if: type IN (pull_request) OR tag IS present
+    #   env: 
+    #     - BASE_IMAGE=ubuntu:16.04
+    #     - DOCKER_DOWNGRADE="docker save -o images.tar mqadvanced-server-dev mq-dev-jms-test &&
+    #       sudo apt-get autoremove -y docker-ce &&
+    #       curl -fsSL \"https://apt.dockerproject.org/gpg\" | sudo apt-key add - &&
+    #       sudo apt-add-repository \"deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main\" &&
+    #       sudo apt-get update &&
+    #       sudo apt-get install docker-engine=1.12.6-0~ubuntu-$(lsb_release -cs) &&
+    #       docker load -q -i images.tar &&
+    #       export DOCKER_API_VERSION=\"1.24\""
 
 before_install:
-  - make install-build-deps
-  - make install-credential-helper
+  - ./install-build-deps-ubuntu.sh
 
 install:
   - echo nothing
 
-before_script: echo nothing
+before_script:
+  - echo 'Downloading Go dependencies...' && echo -en 'travis_fold:start:deps\\r'
+  - make deps
+  - echo -en 'travis_fold:end:deps\\r'
+  - echo 'Building Developer image...' && echo -en 'travis_fold:start:build-devserver\\r'
+  - make build-devserver
+  - echo -en 'travis_fold:end:build-devserver\\r'
+  - echo 'Building Developer JMS test image...' && echo -en 'travis_fold:start:build-devjmstest\\r'
+  - make build-devjmstest
+  - echo -en 'travis_fold:end:build-devjmstest\\r'
+
+script:
+  - echo 'Downgrading Docker (if necessary)...' && echo -en 'travis_fold:start:docker-downgrade\\r'
+  - eval "$DOCKER_DOWNGRADE"
+  - echo -en 'travis_fold:end:docker-downgrade\\r'
+  - echo 'Testing Developer image...' && echo -en 'travis_fold:start:test-devserver\\r'
+  - make test-devserver
+  - echo -en 'travis_fold:end:test-devserver\\r'
 
 after_success:
   - make lint

.whitesource

@@ -1,6 +0,0 @@
-{
-  "settingsInheritedFrom": "whitesource-config/whitesource-config@master",
-  "scanSettings": {
-      "baseBranches": ["private-master", "v9.2.0.x-eus", "v9.2.5"]
-  }
-}

CHANGELOG.md

@@ -1,72 +1,5 @@
 # Change log
 
-## 9.3.0.5-LTS (2023-04)
-
-* Updated to MQ version 9.3.0.5
-
-## 9.3.0.4-LTS (2023-02)
-
-* Updated to MQ version 9.3.0.4
-
-## 9.3.0.3-LTS (2023-01)
-
-* Updated to MQ version 9.3.0.3
-
-## 9.3.0.1-LTS (2022-09)
-
-* Updated to MQ version 9.3.0.1
-
-## 9.3.0.0 (2022-06)
-
-* Updated to MQ version 9.3.0.0
-* Use `registry.access.redhat.com` instead of `registry.redhat.io`, so that you don't need to login with a Red Hat account.
-* Updated default developer config to use TLS cipher `ANY_TLS12_OR_HIGHER` instead of `ANY_TLS12`
-* Added default `jvm.options` file fix issue with missing preferences file causing an error in the web server log.
-* Updated to allow building image from Podman on macOS (requires Podman 4.1)
-* Container builds are now faster
-* Updated signal handling to use a buffer, as recommended by the Go 1.17 vetting tool
-
-## 9.2.5.0 (2022-03)
-
-* Updated to MQ version 9.2.5.0
-
-## 9.2.4.0 (2021-11)
-
-* Updated to MQ version 9.2.4.0
-
-## 9.2.3.0 (2021-07-22)
-
-* Updated to MQ version 9.2.3.0
-
-## 9.2.2.0 (2021-03-26)
-
-* Updated to MQ version 9.2.2.0
-
-## 9.2.1.0 (2020-02-18)
-
-* Updated to MQ version 9.2.1.0
-
-
-## 9.2.0.1-LTS (2020-12-04)
-
-* Added support for MQ Long Term Support (production licensed only) in the mq-container
-
-## 9.2.0.0 (2020-07-23)
-
-* Updated to [MQ version 9.2.0.0](https://www.ibm.com/support/knowledgecenter/SSFKSJ_9.2.0/com.ibm.mq.pro.doc/q113110_.htm)
-* Use `-ic` arguments with `crtmqm` to process MQSC files in `/etc/mqm`. Replaces previous use of "runmqsc" commands
-
-## 9.1.5.0 (2020-04-02)
-
-* Updated to MQ version 9.1.5.0
-* Can now run as a random user, instead of the "mqm" user, which has now been removed. This adds compatability for the [Red Hat OpenShift restricted SCC](https://docs.openshift.com/container-platform/4.3/authentication/managing-security-context-constraints.html#security-context-constraints-about_configuring-internal-oauth). The default image UID is `1001`.
-
-## 9.1.4.0 (2019-12-06)
-
-* Updated to MQ version 9.1.4.0
-* Updated to use UBI8 as base image
-* Added required security settings to self signed certificates to align with macOS Catalina requirements
-
 ## 9.1.3.0 (2019-07-19)
 
 * Updated to MQ version 9.1.3.0
@@ -87,7 +20,7 @@
 * Security fixes
 * Web console added to production image
 * Container built on RedHat host
-
+  
 ## 9.1.2.0 (2019-03-21)
 
 * Updated to MQ version 9.1.2.0

Dockerfile-server

@@ -1,4 +1,4 @@
-# © Copyright IBM Corporation 2015, 2022
+# © Copyright IBM Corporation 2015, 2019
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,166 +12,141 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG BASE_IMAGE=registry.access.redhat.com/ubi8/ubi-minimal
-ARG BASE_TAG=8.8-860
-ARG BUILDER_IMAGE=registry.access.redhat.com/ubi8/go-toolset
-ARG BUILDER_TAG=1.19.9-2
-ARG GO_WORKDIR=/opt/app-root/src/go/src/github.com/ibm-messaging/mq-container
-ARG MQ_URL="https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqadv/9.3.0.5-IBM-MQ-Advanced-for-Developers-Non-Install-LinuxX64.tar.gz"
+ARG BASE_IMAGE=registry.access.redhat.com/ubi7/ubi-minimal
+ARG BASE_TAG=7.7-98
 ###############################################################################
 # Build stage to build Go code
 ###############################################################################
-FROM $BUILDER_IMAGE:$BUILDER_TAG as builder
+FROM registry.access.redhat.com/devtools/go-toolset-7-rhel7 as builder
+# FROM docker.io/centos/go-toolset-7-centos7 as builder
 # The URL to download the MQ installer from in tar.gz format
-# This assumes an archive containing the MQ Non-Install packages
-ARG MQ_URL
+# This assumes an archive containing the MQ RPM install packages
+ARG MQ_URL="https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqadv/mqadv_dev912_linux_x86-64.tar.gz"
 ARG IMAGE_REVISION="Not specified"
 ARG IMAGE_SOURCE="Not specified"
 ARG IMAGE_TAG="Not specified"
-ARG GO_WORKDIR
+ARG MQM_UID=888
 USER 0
-WORKDIR /opt/mqm
-# Download and extract MQ files, to get the MQ client needed to compile.
-# Only extract certain MQ files to make the build quicker
-RUN curl --fail --location $MQ_URL | tar --extract --gunzip \
-  && chown -R 1001:root /opt/mqm/*
-WORKDIR $GO_WORKDIR/
-COPY go.mod go.sum ./
+COPY install-mq.sh /usr/local/bin/
+RUN chmod a+x /usr/local/bin/install-mq.sh \
+  && sleep 1 \
+  && MQ_PACKAGES="MQSeriesRuntime-*.rpm MQSeriesSDK-*.rpm MQSeriesSamples*.rpm" install-mq.sh $MQM_UID
+WORKDIR /opt/app-root/src/go/src/github.com/ibm-messaging/mq-container/
 COPY cmd/ ./cmd
 COPY internal/ ./internal
-COPY pkg/ ./pkg
 COPY vendor/ ./vendor
-ENV CGO_CFLAGS="-I/opt/mqm/inc/" \
-    CGO_LDFLAGS_ALLOW="-Wl,-rpath.*" \
-    PATH="${PATH}:/opt/mqm/bin"
-RUN go build -ldflags "-X \"main.ImageCreated=$(date --iso-8601=seconds)\" -X \"main.ImageRevision=$IMAGE_REVISION\" -X \"main.ImageSource=$IMAGE_SOURCE\" -X \"main.ImageTag=$IMAGE_TAG\"" ./cmd/runmqserver/ \
-  && go build ./cmd/chkmqready/ \
-  && go build ./cmd/chkmqhealthy/ \
-  && go build ./cmd/chkmqstarted/ \
-  && go build ./cmd/runmqdevserver/ \
-  && go test -v ./cmd/runmqdevserver/... \
-  && go test -v ./cmd/runmqserver/ \
-  && go test -v ./cmd/chkmqready/ \
-  && go test -v ./cmd/chkmqhealthy/ \
-  && go test -v ./cmd/chkmqstarted/ \
-  && go test -v ./pkg/... \
-  && go test -v ./internal/... \
-  && go vet ./cmd/... ./internal/...
+ENV PATH="${PATH}:/opt/rh/go-toolset-7/root/usr/bin" \
+    CGO_CFLAGS="-I/opt/mqm/inc/" \
+    CGO_LDFLAGS_ALLOW="-Wl,-rpath.*"
+RUN go build -ldflags "-X \"main.ImageCreated=$(date --iso-8601=seconds)\" -X \"main.ImageRevision=$IMAGE_REVISION\" -X \"main.ImageSource=$IMAGE_SOURCE\" -X \"main.ImageTag=$IMAGE_TAG\"" ./cmd/runmqserver/
+RUN go build ./cmd/chkmqready/
+RUN go build ./cmd/chkmqhealthy/
+RUN go build ./cmd/runmqdevserver/
+RUN go test -v ./cmd/runmqdevserver/...
+RUN go test -v ./cmd/runmqserver/
+RUN go test -v ./cmd/chkmqready/
+RUN go test -v ./cmd/chkmqhealthy/
+RUN go test -v ./internal/...
+RUN go vet ./cmd/... ./internal/...
 
 ###############################################################################
 # Main build stage, to build MQ image
 ###############################################################################
 FROM $BASE_IMAGE:$BASE_TAG AS mq-server
 # The MQ packages to install - see install-mq.sh for default value
-ARG MQ_URL
+ARG MQ_URL="https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqadv/mqadv_dev912_linux_x86-64.tar.gz"
+ARG MQ_PACKAGES="MQSeriesRuntime-*.rpm MQSeriesServer-*.rpm MQSeriesJava*.rpm MQSeriesJRE*.rpm MQSeriesGSKit*.rpm MQSeriesMsg*.rpm MQSeriesSamples*.rpm MQSeriesWeb*.rpm MQSeriesAMS-*.rpm"
+#ARG MQ_PACKAGES="ibmmq-server ibmmq-java ibmmq-jre ibmmq-gskit ibmmq-msg-.* ibmmq-samples ibmmq-web ibmmq-ams"
+ARG MQM_UID=888
 ARG BASE_IMAGE
 ARG BASE_TAG
-ARG GO_WORKDIR
-LABEL summary="IBM MQ Advanced Server" \
-      description="Simplify, accelerate and facilitate the reliable exchange of data with a security-rich messaging solution — trusted by the world’s most successful enterprises" \
-      vendor="IBM" \
-      maintainer="IBM" \
-      distribution-scope="private" \
-      authoritative-source-url="https://www.ibm.com/software/passportadvantage/" \
-      url="https://www.ibm.com/products/mq/advanced" \
-      io.openshift.tags="mq messaging" \
-      io.k8s.display-name="IBM MQ Advanced Server" \
-      io.k8s.description="Simplify, accelerate and facilitate the reliable exchange of data with a security-rich messaging solution — trusted by the world’s most successful enterprises" \
-      base-image=$BASE_IMAGE \
-      base-image-release=$BASE_TAG
+LABEL summary="IBM MQ Advanced Server"
+LABEL description="Simplify, accelerate and facilitate the reliable exchange of data with a security-rich messaging solution — trusted by the world’s most successful enterprises"
+LABEL vendor="IBM"
+LABEL distribution-scope="private"
+LABEL authoritative-source-url="https://www.ibm.com/software/passportadvantage/"
+LABEL url="https://www.ibm.com/products/mq/advanced"
+LABEL io.openshift.tags="mq messaging"
+LABEL io.k8s.display-name="IBM MQ Advanced Server"
+LABEL io.k8s.description="Simplify, accelerate and facilitate the reliable exchange of data with a security-rich messaging solution — trusted by the world’s most successful enterprises"
+LABEL base-image=$BASE_IMAGE
+LABEL base-image-release=$BASE_TAG
 COPY install-mq.sh /usr/local/bin/
 COPY install-mq-server-prereqs.sh /usr/local/bin/
 # Install MQ.  To avoid a "text file busy" error here, we sleep before installing.
-RUN env \
-  && mkdir /opt/mqm \
-  && chmod u+x /usr/local/bin/install-*.sh \
+RUN env && chmod u+x /usr/local/bin/install-*.sh \
   && sleep 1 \
-  && install-mq-server-prereqs.sh \
-  && install-mq.sh \
-  && /opt/mqm/bin/security/amqpamcf \
-  && chown -R 1001:root /opt/mqm/*
-COPY --from=builder $GO_WORKDIR/runmqserver /usr/local/bin/
-COPY --from=builder $GO_WORKDIR/chkmq* /usr/local/bin/
+  && install-mq-server-prereqs.sh $MQM_UID \
+  && install-mq.sh $MQM_UID
+# Create a directory for runtime data from runmqserver
+RUN mkdir -p /run/runmqserver \
+  && chown mqm:mqm /run/runmqserver
+COPY --from=builder /opt/app-root/src/go/src/github.com/ibm-messaging/mq-container/runmqserver /usr/local/bin/
+COPY --from=builder /opt/app-root/src/go/src/github.com/ibm-messaging/mq-container/chkmq* /usr/local/bin/
 COPY NOTICES.txt /opt/mqm/licenses/notices-container.txt
-COPY ha/native-ha.ini.tpl /etc/mqm/native-ha.ini.tpl
 # Copy web XML files
 COPY web /etc/mqm/web
 COPY etc/mqm/*.tpl /etc/mqm/
 RUN chmod ug+x /usr/local/bin/runmqserver \
-  && chown 1001:root /usr/local/bin/*mq* \
-  && chmod ug+x /usr/local/bin/chkmq* \
-  && chown -R 1001:root /etc/mqm/* \
-  && install --directory --mode 2775 --owner 1001 --group root /run/runmqserver \
+  && chown mqm:mqm /usr/local/bin/*mq* \
+  && chmod ug+xs /usr/local/bin/chkmq* \
+  && chown -R mqm:mqm /etc/mqm/* \
+  && install --directory --mode 0775 --owner mqm --group root /run/runmqserver \
   && touch /run/termination-log \
-  && chown 1001:root /run/termination-log \
-  && chmod 0660 /run/termination-log \
-  && chmod -R g+w /etc/mqm/web
+  && chown mqm:root /run/termination-log \
+  && chmod 0660 /run/termination-log
 # Always use port 1414 for MQ & 9157 for the metrics
 EXPOSE 1414 9157 9443
-ENV MQ_OVERRIDE_DATA_PATH=/mnt/mqm/data MQ_OVERRIDE_INSTALLATION_NAME=Installation1 MQ_USER_NAME="mqm" PATH="${PATH}:/opt/mqm/bin"
-ENV MQ_GRACE_PERIOD=30
 ENV LANG=en_US.UTF-8 AMQ_DIAGNOSTIC_MSG_SEVERITY=1 AMQ_ADDITIONAL_JSON_LOG=1 LOG_FORMAT=basic
-# We can run as any UID
-USER 1001
-ENV MQ_CONNAUTH_USE_HTP=false
+USER $MQM_UID
 ENTRYPOINT ["runmqserver"]
 
-###############################################################################
-# Build stage to build C code for custom authorization service (developer-only)
-###############################################################################
-# Use the Go toolset image, which already includes gcc and the MQ SDK
-FROM builder as cbuilder
-# The URL to download the MQ installer from in tar.gz format
-# This assumes an archive containing the MQ Non-Install packages
-ARG MQ_URL
-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
-COPY authservice/ /opt/app-root/src/authservice/
-WORKDIR /opt/app-root/src/authservice/mqhtpass
-RUN make all
-
 ###############################################################################
 # Add default developer config
 ###############################################################################
 FROM mq-server AS mq-dev-server
+ARG MQM_UID=888
 ARG BASE_IMAGE
 ARG BASE_TAG
-ARG GO_WORKDIR
-LABEL summary="IBM MQ Advanced for Developers Server" \
-      description="Simplify, accelerate and facilitate the reliable exchange of data with a security-rich messaging solution — trusted by the world’s most successful enterprises" \
-      vendor="IBM" \
-      distribution-scope="private" \
-      authoritative-source-url="https://www.ibm.com/software/passportadvantage/" \
-      url="https://www.ibm.com/products/mq/advanced" \
-      io.openshift.tags="mq messaging" \
-      io.k8s.display-name="IBM MQ Advanced for Developers Server" \
-      io.k8s.description="Simplify, accelerate and facilitate the reliable exchange of data with a security-rich messaging solution — trusted by the world’s most successful enterprises" \
-      base-image=$BASE_IMAGE \
-      base-image-release=$BASE_TAG
+# Enable MQ developer default configuration
+ENV MQ_DEV=true
+# Default administrator password
+ENV MQ_ADMIN_PASSWORD=passw0rd
+LABEL summary="IBM MQ Advanced for Developers Server"
+LABEL description="Simplify, accelerate and facilitate the reliable exchange of data with a security-rich messaging solution — trusted by the world’s most successful enterprises"
+LABEL vendor="IBM"
+LABEL distribution-scope="private"
+LABEL authoritative-source-url="https://www.ibm.com/software/passportadvantage/"
+LABEL url="https://www.ibm.com/products/mq/advanced"
+LABEL io.openshift.tags="mq messaging"
+LABEL io.k8s.display-name="IBM MQ Advanced for Developers Server"
+LABEL io.k8s.description="Simplify, accelerate and facilitate the reliable exchange of data with a security-rich messaging solution — trusted by the world’s most successful enterprises"
+LABEL base-image=$BASE_IMAGE
+LABEL base-image-release=$BASE_TAG
 USER 0
-COPY --from=cbuilder /opt/app-root/src/authservice/mqhtpass/build/mqhtpass.so /opt/mqm/lib64/
-COPY etc/mqm/*.ini /etc/mqm/
-COPY etc/mqm/mq.htpasswd /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/
+# WARNING: This is what allows the mqm user to change the password of any other user
+# It's used by runmqdevserver to change the admin/app passwords.
+RUN echo "mqm    ALL = NOPASSWD: /usr/sbin/chpasswd" > /etc/sudoers.d/mq-dev-config
+## Add admin and app users, and set a default password for admin
+RUN useradd admin -G mqm \
+  && groupadd mqclient \
+  && useradd app -G mqclient \
+  && echo admin:$MQ_ADMIN_PASSWORD | chpasswd
+# Create a directory for runtime data from runmqserver
+RUN mkdir -p /run/runmqdevserver \
+  && chown mqm:mqm /run/runmqdevserver
+COPY --from=builder /opt/app-root/src/go/src/github.com/ibm-messaging/mq-container/runmqdevserver /usr/local/bin/
 # Copy template files
 COPY incubating/mqadvanced-server-dev/*.tpl /etc/mqm/
 # Copy web XML files for default developer configuration
 COPY incubating/mqadvanced-server-dev/web /etc/mqm/web
-RUN chown -R 1001:root /etc/mqm/* \
-  && chmod -R g+w /etc/mqm/web \
+RUN chown -R mqm:mqm /etc/mqm/* \
   && chmod +x /usr/local/bin/runmq* \
-  && chmod 0660 /etc/mqm/mq.htpasswd \
-  && install --directory --mode 2775 --owner 1001 --group root /run/runmqdevserver
-ENV MQ_DEV=true \
-    MQ_ENABLE_EMBEDDED_WEB_SERVER=1 \
-    MQ_GENERATE_CERTIFICATE_HOSTNAME=localhost \
-    LD_LIBRARY_PATH=/opt/mqm/lib64 \
-    MQ_CONNAUTH_USE_HTP=true \
-    MQS_PERMIT_UNKNOWN_ID=true
-USER 1001
+  && install --directory --mode 0775 --owner mqm --group root /run/runmqdevserver
+ENV MQ_ENABLE_EMBEDDED_WEB_SERVER=1
+USER $MQM_UID
 ENTRYPOINT ["runmqdevserver"]

Makefile

@@ -1,4 +1,4 @@
-# © Copyright IBM Corporation 2017, 2023
+# © Copyright IBM Corporation 2017, 2019
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,72 +16,47 @@
 # Conditional variables - you can override the values of these variables from
 # the command line
 ###############################################################################
-
-include config.env
-include source-branch.env
-
+# MQ_VERSION is the fully qualified MQ version number to build
+MQ_VERSION ?= 9.1.3.0
 # RELEASE shows what release of the container code has been built
-RELEASE ?=
-# MQ_ARCHIVE_REPOSITORY is a remote repository from which to pull the MQ_ARCHIVE (if required)
-MQ_ARCHIVE_REPOSITORY ?=
-# MQ_ARCHIVE_REPOSITORY_DEV is a remote repository from which to pull the MQ_ARCHIVE_DEV (if required)
-MQ_ARCHIVE_REPOSITORY_DEV ?=
-# MQ_ARCHIVE_REPOSITORY_USER is the user for the remote repository (if required)
-MQ_ARCHIVE_REPOSITORY_USER ?=
-# MQ_ARCHIVE_REPOSITORY_CREDENTIAL is the password/API key for the remote repository (if required)
-MQ_ARCHIVE_REPOSITORY_CREDENTIAL ?=
+RELEASE ?= 2
 # MQ_ARCHIVE is the name of the file, under the downloads directory, from which MQ Advanced can
-# be installed. Does not apply to MQ Advanced for Developers
-MQ_ARCHIVE ?= IBM_MQ_$(MQ_VERSION_VRM)_$(MQ_ARCHIVE_TYPE)_$(MQ_ARCHIVE_ARCH)_NOINST.tar.gz
+# be installed. The default value is derived from MQ_VERSION, BASE_IMAGE and architecture
+# Does not apply to MQ Advanced for Developers.
+MQ_ARCHIVE ?= IBM_MQ_$(MQ_VERSION_VRM)_$(MQ_ARCHIVE_TYPE)_$(MQ_ARCHIVE_ARCH).tar.gz
 # MQ_ARCHIVE_DEV is the name of the file, under the downloads directory, from which MQ Advanced
 # for Developers can be installed
-MQ_ARCHIVE_DEV ?= $(MQ_VERSION)-IBM-MQ-Advanced-for-Developers-Non-Install-$(MQ_ARCHIVE_DEV_TYPE)$(MQ_ARCHIVE_DEV_ARCH).tar.gz
+MQ_ARCHIVE_DEV ?= $(MQ_ARCHIVE_DEV_$(MQ_VERSION))
 # MQ_SDK_ARCHIVE specifies the archive to use for building the golang programs.  Defaults vary on developer or advanced.
 MQ_SDK_ARCHIVE ?= $(MQ_ARCHIVE_DEV_$(MQ_VERSION))
 # Options to `go test` for the Docker tests
 TEST_OPTS_DOCKER ?=
-# Timeout for the Docker tests
-TEST_TIMEOUT_DOCKER ?= 30m
 # MQ_IMAGE_ADVANCEDSERVER is the name of the built MQ Advanced image
-MQ_IMAGE_ADVANCEDSERVER ?=ibm-mqadvanced-server
+MQ_IMAGE_ADVANCEDSERVER ?=mqadvanced-server
 # MQ_IMAGE_DEVSERVER is the name of the built MQ Advanced for Developers image
-MQ_IMAGE_DEVSERVER ?=ibm-mqadvanced-server-dev
-# MQ_MANIFEST_TAG is the tag to use for fat-manifest
-MQ_MANIFEST_TAG ?= $(MQ_VERSION)$(RELEASE_TAG)$(LTS_TAG)$(MQ_MANIFEST_TAG_SUFFIX)
+MQ_IMAGE_DEVSERVER ?=mqadvanced-server-dev
 # MQ_TAG is the tag of the built MQ Advanced image & MQ Advanced for Developers image
-MQ_TAG ?= $(MQ_MANIFEST_TAG)-$(ARCH)
+MQ_TAG ?=$(MQ_VERSION)-$(ARCH)
+# MQ_PACKAGES specifies the MQ packages (.deb or .rpm) to install.  Defaults vary on base image.
+MQ_PACKAGES ?=MQSeriesRuntime-*.rpm MQSeriesServer-*.rpm MQSeriesJava*.rpm MQSeriesJRE*.rpm MQSeriesGSKit*.rpm MQSeriesMsg*.rpm MQSeriesSamples*.rpm MQSeriesWeb*.rpm MQSeriesAMS-*.rpm
+# MQM_UID is the UID to use for the "mqm" user
+MQM_UID ?= 888
 # COMMAND is the container command to run.  "podman" or "docker"
 COMMAND ?=$(shell type -p podman 2>&1 >/dev/null && echo podman || echo docker)
-# MQ_DELIVERY_REGISTRY_HOSTNAME is a remote registry to push the MQ Image to (if required)
-MQ_DELIVERY_REGISTRY_HOSTNAME ?=
-# MQ_DELIVERY_REGISTRY_NAMESPACE is the namespace/path on the delivery registry (if required)
-MQ_DELIVERY_REGISTRY_NAMESPACE ?=
-# MQ_DELIVERY_REGISTRY_USER is the user for the remote registry (if required)
-MQ_DELIVERY_REGISTRY_USER ?=
-# MQ_DELIVERY_REGISTRY_CREDENTIAL is the password/API key for the remote registry (if required)
-MQ_DELIVERY_REGISTRY_CREDENTIAL ?=
-# ARCH is the platform architecture (e.g. amd64, ppc64le or s390x)
-ARCH ?= $(if $(findstring x86_64,$(shell uname -m)),amd64,$(shell uname -m))
-# LTS is a boolean value to enable/disable LTS container build
-LTS ?= false
-# VOLUME_MOUNT_OPTIONS is used when bind-mounting files from the "downloads" directory into the container.  By default, SELinux labels are automatically re-written, but this doesn't work on some filesystems with extended attributes (xattrs).  You can turn off the label re-writing by setting this variable to be blank.
-VOLUME_MOUNT_OPTIONS ?= :Z
 
 ###############################################################################
 # Other variables
 ###############################################################################
-# Lock Docker API version for compatibility with Podman and with the Docker version in Travis' Ubuntu Bionic
-DOCKER_API_VERSION=1.40
 GO_PKG_DIRS = ./cmd ./internal ./test
 MQ_ARCHIVE_TYPE=LINUX
-MQ_ARCHIVE_DEV_TYPE=Linux
+MQ_ARCHIVE_DEV_PLATFORM=linux
+# ARCH is the platform architecture (e.g. amd64, ppc64le or s390x)
+ARCH=$(if $(findstring x86_64,$(shell uname -m)),amd64,$(shell uname -m))
 # BUILD_SERVER_CONTAINER is the name of the web server container used at build time
 BUILD_SERVER_CONTAINER=build-server
-# BUILD_SERVER_NETWORK is the name of the network to use for the web server container used at build time
-BUILD_SERVER_NETWORK=build
 # NUM_CPU is the number of CPUs available to Docker.  Used to control how many
 # test run in parallel
-NUM_CPU ?= $(or $(shell $(COMMAND) info --format "{{ .NCPU }}"),2)
+NUM_CPU = $(or $(shell docker info --format "{{ .NCPU }}"),2)
 # BASE_IMAGE_TAG is a normalized version of BASE_IMAGE, suitable for use in a Docker tag
 BASE_IMAGE_TAG=$(lastword $(subst /, ,$(subst :,-,$(BASE_IMAGE))))
 #BASE_IMAGE_TAG=$(subst /,-,$(subst :,-,$(BASE_IMAGE)))
@@ -93,7 +68,7 @@ IMAGE_REVISION=$(shell git rev-parse HEAD)
 IMAGE_SOURCE=$(shell git config --get remote.origin.url)
 EMPTY:=
 SPACE:= $(EMPTY) $(EMPTY)
-# MQ_VERSION_VRM is MQ_VERSION with only the Version, Release and Modifier fields (no Fix field).  e.g. 9.2.0 instead of 9.2.0.0
+# MQ_VERSION_VRM is MQ_VERSION with only the Version, Release and Modifier fields (no Fix field).  e.g. 9.1.3 instead of 9.1.3.0
 MQ_VERSION_VRM=$(subst $(SPACE),.,$(wordlist 1,3,$(subst .,$(SPACE),$(MQ_VERSION))))
 
 ifneq (,$(findstring Microsoft,$(shell uname -r)))
@@ -107,90 +82,19 @@ endif
 # Try to figure out which archive to use from the architecture
 ifeq "$(ARCH)" "amd64"
 	MQ_ARCHIVE_ARCH=X86-64
-	MQ_ARCHIVE_DEV_ARCH=X64
+	MQ_DEV_ARCH=x86-64
 else ifeq "$(ARCH)" "ppc64le"
-	MQ_ARCHIVE_ARCH=PPC64LE
+	MQ_ARCHIVE_ARCH=LE_POWER
+	MQ_DEV_ARCH=ppcle
 else ifeq "$(ARCH)" "s390x"
-	MQ_ARCHIVE_ARCH=S390X
+	MQ_ARCHIVE_ARCH=SYSTEM_Z
+	MQ_DEV_ARCH=s390x
 endif
-
-# If this is a fake master build, push images to alternative location (pipeline wont consider these images GA candidates)
-ifeq ($(shell [ "$(TRAVIS)" = "true" ] && [ -n "$(MAIN_BRANCH)" ] && [ -n "$(SOURCE_BRANCH)" ] && [ "$(MAIN_BRANCH)" != "$(SOURCE_BRANCH)" ] && echo "true"), true)
-	MQ_DELIVERY_REGISTRY_NAMESPACE="master-fake"
-endif
-
-# LTS_TAG is the tag modifier for an LTS container build
-LTS_TAG=
-ifeq "$(LTS)" "true"
-ifneq "$(LTS_TAG_OVERRIDE)" "$(EMPTY)"
-	LTS_TAG=$(LTS_TAG_OVERRIDE)
-else
-	LTS_TAG=-lts
-endif
-	MQ_ARCHIVE:=$(MQ_VERSION)-IBM-MQ-Advanced-Non-Install-Linux$(MQ_ARCHIVE_ARCH).tar.gz
-	MQ_DELIVERY_REGISTRY_NAMESPACE:=$(MQ_DELIVERY_REGISTRY_NAMESPACE)$(LTS_TAG)
-endif
-
-ifneq (,$(findstring release-candidate,$(TRAVIS_TAG)))
-    MQ_DELIVERY_REGISTRY_NAMESPACE=release-candidates
-endif
-
-ifneq "$(MQ_DELIVERY_REGISTRY_NAMESPACE)" "$(EMPTY)"
-	MQ_DELIVERY_REGISTRY_FULL_PATH=$(MQ_DELIVERY_REGISTRY_HOSTNAME)/$(MQ_DELIVERY_REGISTRY_NAMESPACE)
-else
-	MQ_DELIVERY_REGISTRY_FULL_PATH=$(MQ_DELIVERY_REGISTRY_HOSTNAME)
-endif
-
-# image tagging
-
-ifneq "$(RELEASE)" "$(EMPTY)"
-	EXTRA_LABELS_RELEASE=--label "release=$(RELEASE)"
-	RELEASE_TAG="-$(RELEASE)"
-endif
-
-ifneq "$(MQ_ARCHIVE_LEVEL)" "$(EMPTY)"
-	EXTRA_LABELS_LEVEL=--label "mq-build=$(MQ_ARCHIVE_LEVEL)"
-endif
-
-EXTRA_LABELS=$(EXTRA_LABELS_RELEASE) $(EXTRA_LABELS_LEVEL)
-
-ifeq "$(TIMESTAMPFLAT)" "$(EMPTY)"
-	TIMESTAMPFLAT=$(shell date "+%Y%m%d%H%M%S")
-endif
-
-ifeq "$(GIT_COMMIT)" "$(EMPTY)"
-	GIT_COMMIT=$(shell git rev-parse --short HEAD)
-endif
-
-ifeq ($(shell [ ! -z $(TRAVIS) ] && [ "$(TRAVIS_PULL_REQUEST)" = "false" ] && [ "$(TRAVIS_BRANCH)" = "$(MAIN_BRANCH)" ] && echo true), true)
-	MQ_MANIFEST_TAG_SUFFIX=.$(TIMESTAMPFLAT).$(GIT_COMMIT)
-endif
-
-PATH_TO_MQ_TAG_CACHE=$(TRAVIS_BUILD_DIR)/.tagcache
-ifneq "$(TRAVIS)" "$(EMPTY)"
-ifneq ("$(wildcard $(PATH_TO_MQ_TAG_CACHE))","")
-include $(PATH_TO_MQ_TAG_CACHE)
-endif
-endif
-
-MQ_AMD64_TAG=$(MQ_MANIFEST_TAG)-amd64
-MQ_S390X_TAG?=$(MQ_MANIFEST_TAG)-s390x
-MQ_PPC64LE_TAG?=$(MQ_MANIFEST_TAG)-ppc64le
-
-# end image tagging
-
-MQ_IMAGE_FULL_RELEASE_NAME=$(MQ_IMAGE_ADVANCEDSERVER):$(MQ_TAG)
-MQ_IMAGE_DEV_FULL_RELEASE_NAME=$(MQ_IMAGE_DEVSERVER):$(MQ_TAG)
-
-#setup variables for fat-manifests
-MQ_IMAGE_DEVSERVER_MANIFEST=$(MQ_IMAGE_DEVSERVER):$(MQ_MANIFEST_TAG)
-MQ_IMAGE_ADVANCEDSERVER_MANIFEST=$(MQ_IMAGE_ADVANCEDSERVER):$(MQ_MANIFEST_TAG)
-MQ_IMAGE_DEVSERVER_AMD64=$(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_DEVSERVER):$(MQ_AMD64_TAG)
-MQ_IMAGE_DEVSERVER_S390X=$(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_DEVSERVER):$(MQ_S390X_TAG)
-MQ_IMAGE_DEVSERVER_PPC64LE=$(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_DEVSERVER):$(MQ_PPC64LE_TAG)
-MQ_IMAGE_ADVANCEDSERVER_AMD64=$(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_ADVANCEDSERVER):$(MQ_AMD64_TAG)
-MQ_IMAGE_ADVANCEDSERVER_S390X=$(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_ADVANCEDSERVER):$(MQ_S390X_TAG)
-MQ_IMAGE_ADVANCEDSERVER_PPC64LE=$(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_ADVANCEDSERVER):$(MQ_PPC64LE_TAG)
+# Archive names for IBM MQ Advanced for Developers
+MQ_ARCHIVE_DEV_9.1.0.0=mqadv_dev910_$(MQ_ARCHIVE_DEV_PLATFORM)_$(MQ_DEV_ARCH).tar.gz
+MQ_ARCHIVE_DEV_9.1.1.0=mqadv_dev911_$(MQ_ARCHIVE_DEV_PLATFORM)_$(MQ_DEV_ARCH).tar.gz
+MQ_ARCHIVE_DEV_9.1.2.0=mqadv_dev912_$(MQ_ARCHIVE_DEV_PLATFORM)_$(MQ_DEV_ARCH).tar.gz
+MQ_ARCHIVE_DEV_9.1.3.0=mqadv_dev913_$(MQ_ARCHIVE_DEV_PLATFORM)_$(MQ_DEV_ARCH).tar.gz
 
 ###############################################################################
 # Build targets
@@ -208,9 +112,6 @@ test-all: build-devjmstest test-devserver test-advancedserver
 .PHONY: devserver
 devserver: build-devserver build-devjmstest test-devserver
 
-.PHONY: advancedserver
-advancedserver: build-advancedserver test-advancedserver
-
 # Build incubating components
 .PHONY: incubating
 incubating: build-explorer
@@ -218,63 +119,30 @@ incubating: build-explorer
 downloads/$(MQ_ARCHIVE_DEV):
 	$(info $(SPACER)$(shell printf $(TITLE)"Downloading IBM MQ Advanced for Developers "$(MQ_VERSION)$(END)))
 	mkdir -p downloads
-ifneq "$(BUILD_RSYNC_SERVER)" "$(EMPTY)"
-# Use key which is not stored in the repository to fetch the files from the fileserver
-	curl --fail --location $(BUILD_RSYNC_ENCRYPTED_KEY_URL) --output ./host.key.gpg
-	@echo $(BUILD_RSYNC_ENCRYPTION_PASSWORD)|gpg --batch --passphrase-fd 0 ./host.key.gpg
-	chmod 600 ./host.key
-	rsync -rv -e "ssh -o BatchMode=yes -q -o StrictHostKeyChecking=no -i ./host.key" --include="*/" --include="*.tar.gz" --exclude="*" $(BUILD_RSYNC_USER)@$(BUILD_RSYNC_SERVER):"$(BUILD_RSYNC_PATH)" downloads/$(MQ_ARCHIVE_DEV)
-	-@rm host.key.gpg host.key
-else
-ifneq "$(MQ_ARCHIVE_REPOSITORY_DEV)" "$(EMPTY)"
-	curl --fail --user $(MQ_ARCHIVE_REPOSITORY_USER):$(MQ_ARCHIVE_REPOSITORY_CREDENTIAL) --request GET "$(MQ_ARCHIVE_REPOSITORY_DEV)" --output downloads/$(MQ_ARCHIVE_DEV)
-else
-	curl --fail --location https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqadv/$(MQ_ARCHIVE_DEV) --output downloads/$(MQ_ARCHIVE_DEV)
-endif
-endif
+	cd downloads; curl -LO https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqadv/$(MQ_ARCHIVE_DEV)
 
-downloads/$(MQ_ARCHIVE):
-	$(info $(SPACER)$(shell printf $(TITLE)"Downloading IBM MQ Advanced "$(MQ_VERSION)$(END)))
+downloads/$(MQ_SDK_ARCHIVE):
+	$(info $(SPACER)$(shell printf $(TITLE)"Downloading IBM MQ Advanced for Developers "$(MQ_VERSION)$(END)))
 	mkdir -p downloads
-ifneq "$(BUILD_RSYNC_SERVER)" "$(EMPTY)"
-# Use key which is not stored in the repository to fetch the files from the fileserver
-	-@rm host.key.gpg host.key
-	curl --fail --location $(BUILD_RSYNC_ENCRYPTED_KEY_URL) --output ./host.key.gpg
-	@echo $(BUILD_RSYNC_ENCRYPTION_PASSWORD)|gpg --batch --passphrase-fd 0 ./host.key.gpg
-	chmod 600 ./host.key
-	rsync -rv -e "ssh -o BatchMode=yes -q -o StrictHostKeyChecking=no -i ./host.key" --include="*/" --include="*.tar.gz" --exclude="*" $(BUILD_RSYNC_USER)@$(BUILD_RSYNC_SERVER):"$(BUILD_RSYNC_PATH)" downloads/$(MQ_ARCHIVE)
-	-@rm host.key.gpg host.key
-else
-ifneq "$(MQ_ARCHIVE_REPOSITORY)" "$(EMPTY)"
-	curl --fail --user $(MQ_ARCHIVE_REPOSITORY_USER):$(MQ_ARCHIVE_REPOSITORY_CREDENTIAL) --request GET "$(MQ_ARCHIVE_REPOSITORY)" --output downloads/$(MQ_ARCHIVE)
-endif
-endif
+	cd downloads; curl -LO https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqadv/$(MQ_SDK_ARCHIVE)
 
 .PHONY: downloads
 downloads: downloads/$(MQ_ARCHIVE_DEV) downloads/$(MQ_SDK_ARCHIVE)
 
-.PHONY: cache-mq-tag
-cache-mq-tag:
-	@printf "MQ_MANIFEST_TAG=$(MQ_MANIFEST_TAG)\n" | tee $(PATH_TO_MQ_TAG_CACHE)
-
-###############################################################################
-# Test targets
-###############################################################################
-
 # Vendor Go dependencies for the Docker tests
 test/docker/vendor:
-	cd test/docker && go mod vendor
+	cd test/docker && dep ensure -vendor-only
 
 # Shortcut to just run the unit tests
 .PHONY: test-unit
 test-unit:
-	$(COMMAND) build --target builder --file Dockerfile-server .
+	docker build --target builder --file Dockerfile-server .
 
 .PHONY: test-advancedserver
 test-advancedserver: test/docker/vendor
-	$(info $(SPACER)$(shell printf $(TITLE)"Test $(MQ_IMAGE_ADVANCEDSERVER):$(MQ_TAG) on $(shell $(COMMAND) --version)"$(END)))
-	$(COMMAND) inspect $(MQ_IMAGE_ADVANCEDSERVER):$(MQ_TAG)
-	cd test/docker && TEST_IMAGE=$(MQ_IMAGE_ADVANCEDSERVER):$(MQ_TAG) EXPECTED_LICENSE=Production DOCKER_API_VERSION=$(DOCKER_API_VERSION) go test -parallel $(NUM_CPU) -timeout $(TEST_TIMEOUT_DOCKER) $(TEST_OPTS_DOCKER)
+	$(info $(SPACER)$(shell printf $(TITLE)"Test $(MQ_IMAGE_ADVANCEDSERVER):$(MQ_TAG) on $(shell docker --version)"$(END)))
+	docker inspect $(MQ_IMAGE_ADVANCEDSERVER):$(MQ_TAG)
+	cd test/docker && TEST_IMAGE=$(MQ_IMAGE_ADVANCEDSERVER):$(MQ_TAG) EXPECTED_LICENSE=Production go test -parallel $(NUM_CPU) $(TEST_OPTS_DOCKER)
 
 .PHONY: build-devjmstest
 build-devjmstest:
@@ -283,9 +151,9 @@ build-devjmstest:
 
 .PHONY: test-devserver
 test-devserver: test/docker/vendor
-	$(info $(SPACER)$(shell printf $(TITLE)"Test $(MQ_IMAGE_DEVSERVER):$(MQ_TAG) on $(shell $(COMMAND) --version)"$(END)))
-	$(COMMAND) inspect $(MQ_IMAGE_DEVSERVER):$(MQ_TAG)
-	cd test/docker && TEST_IMAGE=$(MQ_IMAGE_DEVSERVER):$(MQ_TAG) EXPECTED_LICENSE=Developer DEV_JMS_IMAGE=$(DEV_JMS_IMAGE) IBMJRE=true DOCKER_API_VERSION=$(DOCKER_API_VERSION) go test -parallel $(NUM_CPU) -timeout $(TEST_TIMEOUT_DOCKER) -tags mqdev $(TEST_OPTS_DOCKER)
+	$(info $(SPACER)$(shell printf $(TITLE)"Test $(MQ_IMAGE_DEVSERVER):$(MQ_TAG) on $(shell docker --version)"$(END)))
+	docker inspect $(MQ_IMAGE_DEVSERVER):$(MQ_TAG)
+	cd test/docker && TEST_IMAGE=$(MQ_IMAGE_DEVSERVER):$(MQ_TAG) EXPECTED_LICENSE=Developer DEV_JMS_IMAGE=$(DEV_JMS_IMAGE) IBMJRE=true go test -parallel $(NUM_CPU) -tags mqdev $(TEST_OPTS_DOCKER) 
 
 .PHONY: coverage
 coverage:
@@ -293,7 +161,7 @@ coverage:
 
 .PHONY: test-advancedserver-cover
 test-advancedserver-cover: test/docker/vendor coverage
-	$(info $(SPACER)$(shell printf $(TITLE)"Test $(MQ_IMAGE_ADVANCEDSERVER):$(MQ_TAG) with code coverage on $(shell $(COMMAND) --version)"$(END)))
+	$(info $(SPACER)$(shell printf $(TITLE)"Test $(MQ_IMAGE_ADVANCEDSERVER):$(MQ_TAG) with code coverage on $(shell docker --version)"$(END)))
 	rm -f ./coverage/unit*.cov
 	# Run unit tests with coverage, for each package under 'internal'
 	go list -f '{{.Name}}' ./internal/... | xargs -I {} go test -cover -covermode count -coverprofile ./coverage/unit-{}.cov ./internal/{}
@@ -305,7 +173,7 @@ test-advancedserver-cover: test/docker/vendor coverage
 	rm -f ./test/docker/coverage/*.cov
 	rm -f ./coverage/docker.*
 	mkdir -p ./test/docker/coverage/
-	cd test/docker && TEST_IMAGE=$(MQ_IMAGE_ADVANCEDSERVER):$(MQ_TAG)-cover TEST_COVER=true DOCKER_API_VERSION=$(DOCKER_API_VERSION) go test $(TEST_OPTS_DOCKER)
+	cd test/docker && TEST_IMAGE=$(MQ_IMAGE_ADVANCEDSERVER):$(MQ_TAG)-cover TEST_COVER=true go test $(TEST_OPTS_DOCKER)
 	echo 'mode: count' > ./coverage/docker.cov
 	tail -q -n +2 ./test/docker/coverage/*.cov >> ./coverage/docker.cov
 	go tool cover -html=./coverage/docker.cov -o ./coverage/docker.html
@@ -314,94 +182,50 @@ test-advancedserver-cover: test/docker/vendor coverage
 	tail -q -n +2 ./coverage/unit.cov ./coverage/docker.cov  >> ./coverage/combined.cov
 	go tool cover -html=./coverage/combined.cov -o ./coverage/combined.html
 
-###############################################################################
-# Build functions
-###############################################################################
-
-# Command to build the image
-# Args: imageName, imageTag, dockerfile, extraArgs, dockerfileTarget
-define build-mq-command
+# Build an MQ image.  The commands used are slightly different between Docker and Podman
+define build-mq
+	$(if $(findstring docker,$(COMMAND)), @docker network create build,)
+	$(if $(findstring docker,$(COMMAND)), @docker run --rm --name $(BUILD_SERVER_CONTAINER) --network build --network-alias build --volume $(DOWNLOADS_DIR):/usr/share/nginx/html:ro --detach docker.io/nginx:alpine,)
+	$(eval EXTRA_ARGS=$(if $(findstring docker,$(COMMAND)), --network build --build-arg MQ_URL=http://build:80/$4, --volume $(DOWNLOADS_DIR):/var/downloads --build-arg MQ_URL=file:///var/downloads/$4))
+	# Build the new image
 	$(COMMAND) build \
 	  --tag $1:$2 \
 	  --file $3 \
-	  $4 \
+		$(EXTRA_ARGS) \
+	  --build-arg MQ_PACKAGES="$(MQ_PACKAGES)" \
 	  --build-arg IMAGE_REVISION="$(IMAGE_REVISION)" \
 	  --build-arg IMAGE_SOURCE="$(IMAGE_SOURCE)" \
 	  --build-arg IMAGE_TAG="$1:$2" \
+	  --build-arg MQM_UID=$(MQM_UID) \
 	  --label version=$(MQ_VERSION) \
 	  --label name=$1 \
 	  --label build-date=$(shell date +%Y-%m-%dT%H:%M:%S%z) \
+	  --label release="$(RELEASE)" \
 	  --label architecture="$(ARCH)" \
-	  --label run="podman run -d -e LICENSE=accept $1:$2" \
+	  --label run="docker run -d -e LICENSE=accept $1:$2" \
 	  --label vcs-ref=$(IMAGE_REVISION) \
 	  --label vcs-type=git \
 	  --label vcs-url=$(IMAGE_SOURCE) \
-	  $(EXTRA_LABELS) \
 	  --target $5 \
 	  .
+	$(if $(findstring docker,$(COMMAND)), @docker kill $(BUILD_SERVER_CONTAINER))
+	$(if $(findstring docker,$(COMMAND)), @docker network rm build)
 endef
 
-# Build using a separate container to host the MQ download files.
-# To minimize the layers in the resulting image, the download files can't be part of the build context.
-# The "docker build" command (and "podman build" on macOS) don't allow you to mount a directory into the build, so a
-# separate container is used to host a web server.
-# Note that for Podman, this means that you need to be using the "rootful" mode, because the rootless mode doesn't allow
-# much control of networking, so the containers can't talk to each other.
-define build-mq-using-web-server
-	$(COMMAND) network create $(BUILD_SERVER_NETWORK)
-	$(COMMAND) run \
-	  --rm \
-	  --name $(BUILD_SERVER_CONTAINER) \
-	  --network $(BUILD_SERVER_NETWORK) \
-	  --volume $(DOWNLOADS_DIR):/opt/app-root/src$(VOLUME_MOUNT_OPTIONS) \
-	  --detach \
-	  registry.access.redhat.com/ubi8/nginx-120 nginx -g "daemon off;" || ($(COMMAND) network rm $(BUILD_SERVER_NETWORK) && exit 1)
-	BUILD_SERVER_IP=$$($(COMMAND) inspect -f '{{ .NetworkSettings.Networks.$(BUILD_SERVER_NETWORK).IPAddress }}' $(BUILD_SERVER_CONTAINER)); \
-	DOCKER_BUILDKIT=0 $(call build-mq-command,$1,$2,$3,--network build --build-arg MQ_URL=http://$$BUILD_SERVER_IP:8080/$4,$5) || ($(COMMAND) rm -f $(BUILD_SERVER_CONTAINER) && $(COMMAND) network rm $(BUILD_SERVER_NETWORK) && exit 1)
-	$(COMMAND) rm -f $(BUILD_SERVER_CONTAINER)
-	$(COMMAND) network rm $(BUILD_SERVER_NETWORK)
-endef
-
-# When building with Docker, always use the web server build because you can't use bind-mounted volumes.
-# Args: imageName, imageTag, dockerfile, mqArchive, dockerfileTarget
-define build-mq-docker
-	$(call build-mq-using-web-server,$1,$2,$3,$4,$5)
-endef
-
-# Make sure we don't use VOLUME_MOUNT_OPTIONS for Podman on macOS
-ifeq "$(COMMAND)" "podman"
-	ifeq "$(shell uname -s)" "Darwin"
-		VOLUME_MOUNT_OPTIONS:=
-	endif
+DOCKER_SERVER_VERSION=$(shell docker version --format "{{ .Server.Version }}")
+DOCKER_CLIENT_VERSION=$(shell docker version --format "{{ .Client.Version }}")
+PODMAN_VERSION=$(shell podman version --format "{{ .Version }}")
+.PHONY: command-version
+command-version:
+# If we're using Docker, then check it's recent enough to support multi-stage builds
+ifneq (,$(findstring docker,$(COMMAND)))
+	@test "$(word 1,$(subst ., ,$(DOCKER_CLIENT_VERSION)))" -ge "17" || ("$(word 1,$(subst ., ,$(DOCKER_CLIENT_VERSION)))" -eq "17" && "$(word 2,$(subst ., ,$(DOCKER_CLIENT_VERSION)))" -ge "05") || (echo "Error: Docker client 17.05 or greater is required" && exit 1)
+	@test "$(word 1,$(subst ., ,$(DOCKER_SERVER_VERSION)))" -ge "17" || ("$(word 1,$(subst ., ,$(DOCKER_SERVER_VERSION)))" -eq "17" && "$(word 2,$(subst ., ,$(DOCKER_CLIENT_VERSION)))" -ge "05") || (echo "Error: Docker server 17.05 or greater is required" && exit 1)
+endif
+ifneq (,$(findstring podman,$(COMMAND)))
+	@test "$(word 1,$(subst ., ,$(PODMAN_VERSION)))" -ge "1" || (echo "Error: Podman version 1.0 or greater is required" && exit 1)
 endif
 
-# When building with Podman on macOS (Darwin), use the web server build because you can't use bind-mounted volumes with `podman build` on macOS
-# Args: imageName, imageTag, dockerfile, mqArchive, dockerfileTarget
-define build-mq-podman-Darwin
-	$(call build-mq-using-web-server,$1,$2,$3,$4,$5)
-endef
-
-# When building with Podman on Linux, just pass the downloads directory as a volume
-# Args: imageName, imageTag, dockerfile, mqArchive, dockerfileTarget
-define build-mq-podman-Linux
-	$(call build-mq-command,$1,$2,$3,--volume $(DOWNLOADS_DIR):/var/downloads$(VOLUME_MOUNT_OPTIONS) --build-arg MQ_URL=file:///var/downloads/$4,$5)
-endef
-
-# When building with Podman, just pass the downloads directory as a volume
-# Args: imageName, imageTag, dockerfile, mqArchive, dockerfileTarget
-define build-mq-podman
-	$(call build-mq-podman-$(shell uname -s),$1,$2,$3,$4,$5)
-endef
-
-# Build an MQ image.  The commands used are slightly different between Docker and Podman
-# Args: imageName, imageTag, dockerfile, mqArchive, dockerfileTarget
-define build-mq
-	$(call build-mq-$(COMMAND),$1,$2,$3,$4,$5)
-endef
-
-###############################################################################
-# Build targets
-###############################################################################
 .PHONY: build-advancedserver-host
 build-advancedserver-host: build-advancedserver
 
@@ -431,19 +255,16 @@ build-sdk: downloads/$(MQ_ARCHIVE_DEV)
 	$(info $(shell printf $(TITLE)"Build $(MQ_IMAGE_SDK)"$(END)))
 	$(call build-mq,mq-sdk,$(MQ_TAG),incubating/mq-sdk/Dockerfile,$(MQ_SDK_ARCHIVE),mq-sdk)
 
-###############################################################################
-# Logging targets
-###############################################################################
 .PHONY: log-build-env
 log-build-vars:
 	$(info $(SPACER)$(shell printf $(TITLE)"Build environment"$(END)))
 	@echo ARCH=$(ARCH)
 	@echo MQ_VERSION=$(MQ_VERSION)
 	@echo MQ_ARCHIVE=$(MQ_ARCHIVE)
-	@echo MQ_ARCHIVE_DEV=$(MQ_ARCHIVE_DEV)
 	@echo MQ_IMAGE_DEVSERVER=$(MQ_IMAGE_DEVSERVER)
 	@echo MQ_IMAGE_ADVANCEDSERVER=$(MQ_IMAGE_ADVANCEDSERVER)
 	@echo COMMAND=$(COMMAND)
+	@echo MQM_UID=$(MQM_UID)
 
 .PHONY: log-build-env
 log-build-env: log-build-vars
@@ -453,98 +274,15 @@ log-build-env: log-build-vars
 
 include formatting.mk
 
-###############################################################################
-# Push/pull targets
-###############################################################################
-.PHONY: pull-mq-archive
-pull-mq-archive:
-	curl --fail --user $(MQ_ARCHIVE_REPOSITORY_USER):$(MQ_ARCHIVE_REPOSITORY_CREDENTIAL) --request GET "$(MQ_ARCHIVE_REPOSITORY)" --output downloads/$(MQ_ARCHIVE)
-
-.PHONY: pull-mq-archive-dev
-pull-mq-archive-dev:
-	curl --fail --user $(MQ_ARCHIVE_REPOSITORY_USER):$(MQ_ARCHIVE_REPOSITORY_CREDENTIAL) --request GET "$(MQ_ARCHIVE_REPOSITORY_DEV)" --output downloads/$(MQ_ARCHIVE_DEV)
-
-.PHONY: push-advancedserver
-push-advancedserver:
-	@if [ $(MQ_DELIVERY_REGISTRY_NAMESPACE) = "master-fake" ]; then\
-		echo "Detected fake master build. Note that the push destination is set to the fake master namespace: $(MQ_DELIVERY_REGISTRY_FULL_PATH)";\
-	fi
-	$(info $(SPACER)$(shell printf $(TITLE)"Push production image to $(MQ_DELIVERY_REGISTRY_FULL_PATH)"$(END)))
-	$(COMMAND) login $(MQ_DELIVERY_REGISTRY_HOSTNAME) -u $(MQ_DELIVERY_REGISTRY_USER) -p $(MQ_DELIVERY_REGISTRY_CREDENTIAL)
-	$(COMMAND) tag $(MQ_IMAGE_ADVANCEDSERVER)\:$(MQ_TAG) $(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_FULL_RELEASE_NAME)
-	$(COMMAND) push $(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_FULL_RELEASE_NAME)
-
-.PHONY: push-devserver
-push-devserver:
-	@if [ $(MQ_DELIVERY_REGISTRY_NAMESPACE) = "master-fake" ]; then\
-		echo "Detected fake master build. Note that the push destination is set to the fake master namespace: $(MQ_DELIVERY_REGISTRY_FULL_PATH)";\
-	fi
-	$(info $(SPACER)$(shell printf $(TITLE)"Push developer image to $(MQ_DELIVERY_REGISTRY_FULL_PATH)"$(END)))
-	$(COMMAND) login $(MQ_DELIVERY_REGISTRY_HOSTNAME) -u $(MQ_DELIVERY_REGISTRY_USER) -p $(MQ_DELIVERY_REGISTRY_CREDENTIAL)
-	$(COMMAND) tag $(MQ_IMAGE_DEVSERVER)\:$(MQ_TAG) $(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_DEV_FULL_RELEASE_NAME)
-	$(COMMAND) push $(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_DEV_FULL_RELEASE_NAME)
-
-.PHONY: pull-advancedserver
-pull-advancedserver:
-	$(info $(SPACER)$(shell printf $(TITLE)"Pull production image from $(MQ_DELIVERY_REGISTRY_FULL_PATH)"$(END)))
-	$(COMMAND) login $(MQ_DELIVERY_REGISTRY_HOSTNAME) -u $(MQ_DELIVERY_REGISTRY_USER) -p $(MQ_DELIVERY_REGISTRY_CREDENTIAL)
-	$(COMMAND) pull $(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_FULL_RELEASE_NAME)
-	$(COMMAND) tag $(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_FULL_RELEASE_NAME) $(MQ_IMAGE_ADVANCEDSERVER)\:$(MQ_TAG)
-
-.PHONY: pull-devserver
-pull-devserver:
-	$(info $(SPACER)$(shell printf $(TITLE)"Pull developer image from $(MQ_DELIVERY_REGISTRY_FULL_PATH)"$(END)))
-	$(COMMAND) login $(MQ_DELIVERY_REGISTRY_HOSTNAME) -u $(MQ_DELIVERY_REGISTRY_USER) -p $(MQ_DELIVERY_REGISTRY_CREDENTIAL)
-	$(COMMAND) pull $(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_DEV_FULL_RELEASE_NAME)
-	$(COMMAND) tag $(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_DEV_FULL_RELEASE_NAME) $(MQ_IMAGE_DEVSERVER)\:$(MQ_TAG)
-
-.PHONY: push-manifest
-push-manifest: build-skopeo-container
-	$(info $(SPACER)$(shell printf $(TITLE)"** Determining the image digests **"$(END)))
-ifneq "$(LTS)" "true"
-	$(eval MQ_IMAGE_DEVSERVER_AMD64_DIGEST=$(shell $(COMMAND) run skopeo:latest --override-os linux inspect --creds $(MQ_ARCHIVE_REPOSITORY_USER):$(MQ_ARCHIVE_REPOSITORY_CREDENTIAL) docker://$(MQ_IMAGE_DEVSERVER_AMD64) | jq -r .Digest))
-	$(eval MQ_IMAGE_DEVSERVER_S390X_DIGEST=$(shell $(COMMAND) run skopeo:latest --override-os linux inspect --creds $(MQ_ARCHIVE_REPOSITORY_USER):$(MQ_ARCHIVE_REPOSITORY_CREDENTIAL) docker://$(MQ_IMAGE_DEVSERVER_S390X) | jq -r .Digest))
-	$(eval MQ_IMAGE_DEVSERVER_PPC64LE_DIGEST=$(shell $(COMMAND) run skopeo:latest --override-os linux inspect --creds $(MQ_ARCHIVE_REPOSITORY_USER):$(MQ_ARCHIVE_REPOSITORY_CREDENTIAL) docker://$(MQ_IMAGE_DEVSERVER_PPC64LE) | jq -r .Digest))
-	$(info $(shell printf "** Determined the built $(MQ_IMAGE_DEVSERVER_AMD64) has a digest of $(MQ_IMAGE_DEVSERVER_AMD64_DIGEST)**"$(END)))
-	$(info $(shell printf "** Determined the built $(MQ_IMAGE_DEVSERVER_S390X) has a digest of $(MQ_IMAGE_DEVSERVER_S390X_DIGEST)**"$(END)))
-	$(info $(shell printf "** Determined the built $(MQ_IMAGE_DEVSERVER_PPC64LE) has a digest of $(MQ_IMAGE_DEVSERVER_PPC64LE_DIGEST)**"$(END)))
-endif
-	$(eval MQ_IMAGE_ADVANCEDSERVER_AMD64_DIGEST=$(shell $(COMMAND) run skopeo:latest --override-os linux inspect --creds $(MQ_ARCHIVE_REPOSITORY_USER):$(MQ_ARCHIVE_REPOSITORY_CREDENTIAL) docker://$(MQ_IMAGE_ADVANCEDSERVER_AMD64) | jq -r .Digest))
-	$(eval MQ_IMAGE_ADVANCEDSERVER_S390X_DIGEST=$(shell $(COMMAND) run skopeo:latest --override-os linux inspect --creds $(MQ_ARCHIVE_REPOSITORY_USER):$(MQ_ARCHIVE_REPOSITORY_CREDENTIAL) docker://$(MQ_IMAGE_ADVANCEDSERVER_S390X) | jq -r .Digest))
-	$(eval MQ_IMAGE_ADVANCEDSERVER_PPC64LE_DIGEST=$(shell $(COMMAND) run skopeo:latest --override-os linux inspect --creds $(MQ_ARCHIVE_REPOSITORY_USER):$(MQ_ARCHIVE_REPOSITORY_CREDENTIAL) docker://$(MQ_IMAGE_ADVANCEDSERVER_PPC64LE) | jq -r .Digest))
-	$(info $(shell printf "** Determined the built $(MQ_IMAGE_ADVANCEDSERVER_AMD64) has a digest of $(MQ_IMAGE_ADVANCEDSERVER_AMD64_DIGEST)**"$(END)))
-	$(info $(shell printf "** Determined the built $(MQ_IMAGE_ADVANCEDSERVER_S390X) has a digest of $(MQ_IMAGE_ADVANCEDSERVER_S390X_DIGEST)**"$(END)))
-	$(info $(shell printf "** Determined the built $(MQ_IMAGE_ADVANCEDSERVER_PPC64LE) has a digest of $(MQ_IMAGE_ADVANCEDSERVER_PPC64LE_DIGEST)**"$(END)))
-ifneq "$(LTS)" "true"
-	$(info $(shell printf "** Calling script to create fat-manifest for $(MQ_IMAGE_DEVSERVER_MANIFEST)**"$(END)))
-	echo $(shell ./travis-build-scripts/create-manifest-list.sh -r $(MQ_DELIVERY_REGISTRY_HOSTNAME) -n $(MQ_DELIVERY_REGISTRY_NAMESPACE) -i $(MQ_IMAGE_DEVSERVER) -t $(MQ_MANIFEST_TAG) -u $(MQ_ARCHIVE_REPOSITORY_USER) -p $(MQ_ARCHIVE_REPOSITORY_CREDENTIAL)  -d "$(MQ_IMAGE_DEVSERVER_AMD64_DIGEST) $(MQ_IMAGE_DEVSERVER_S390X_DIGEST) $(MQ_IMAGE_DEVSERVER_PPC64LE_DIGEST)" $(END))
-endif
-	$(info $(shell printf "** Calling script to create fat-manifest for $(MQ_IMAGE_ADVANCEDSERVER_MANIFEST)**"$(END)))
-	echo $(shell ./travis-build-scripts/create-manifest-list.sh -r $(MQ_DELIVERY_REGISTRY_HOSTNAME) -n $(MQ_DELIVERY_REGISTRY_NAMESPACE) -i $(MQ_IMAGE_ADVANCEDSERVER) -t $(MQ_MANIFEST_TAG) -u $(MQ_ARCHIVE_REPOSITORY_USER) -p $(MQ_ARCHIVE_REPOSITORY_CREDENTIAL) -d "$(MQ_IMAGE_ADVANCEDSERVER_AMD64_DIGEST) $(MQ_IMAGE_ADVANCEDSERVER_S390X_DIGEST) $(MQ_IMAGE_ADVANCEDSERVER_PPC64LE_DIGEST)" $(END))
-
-.PHONY: build-skopeo-container
-build-skopeo-container:
-	$(COMMAND) images | grep -q "skopeo"; if [ $$? != 0 ]; then $(COMMAND) build -t skopeo:latest ./docker-builds/skopeo/; fi
-
-###############################################################################
-# Other targets
-###############################################################################
-
 .PHONY: clean
 clean:
 	rm -rf ./coverage
 	rm -rf ./build
 	rm -rf ./deps
 
-.PHONY: install-build-deps
-install-build-deps:
-	ARCH=$(ARCH) ./install-build-deps.sh
-
-.PHONY: install-credential-helper
-install-credential-helper:
-ifeq ($(ARCH),amd64)
-	ARCH=$(ARCH) ./travis-build-scripts/install-credential-helper.sh
-endif
+.PHONY: deps
+deps:
+	glide install --strip-vendor
 
 .PHONY: build-cov
 build-cov:
@@ -565,42 +303,29 @@ lint: $(addsuffix /$(wildcard *.go), $(GO_PKG_DIRS))
 	golint -set_exit_status $(sort $(dir $(wildcard $(addsuffix /*/*.go, $(GO_PKG_DIRS)))))
 
 .PHONY: gosec
-gosec:
-	$(info $(SPACER)$(shell printf "Running gosec test"$(END)))
-	@gosecrc=0; gosec -fmt=json -out=gosec_results.json cmd/... internal/... 2> /dev/null || gosecrc=$$?; \
-	cat gosec_results.json | jq '{"GolangErrors": (.["Golang errors"]|length>0),"Issues":(.Issues|length>0)}' | grep 'true' >/dev/null ;\
-	if [ $$? -eq 0 ] || [ $$gosecrc -ne 0 ]; then \
-		printf "FAILURE: Issues found running gosec - see gosec_results.json\n" ;\
-		cat "gosec_results.json" ;\
+gosec: $(info $(SPACER)$(shell printf "Running gosec test"$(END)))
+	@gosec -fmt=json -out=gosec_results.json cmd/... internal/... 2> /dev/null ;\
+	cat "gosec_results.json" ;\
+	cat gosec_results.json | grep HIGH | grep severity > /dev/null ;\
+	if [ $$? -eq 0 ]; then \
+		printf "\nFAILURE: gosec found files containing HIGH severity issues - see results.json\n" ;\
 		exit 1 ;\
 	else \
-		printf "gosec found no issues\n" ;\
-		cat "gosec_results.json" ;\
-	fi
+		printf "\ngosec found no HIGH severity issues\n" ;\
+	fi ;\
+	cat gosec_results.json | grep MEDIUM | grep severity > /dev/null ;\
+	if [ $$? -eq 0 ]; then \
+		printf "\nFAILURE: gosec found files containing MEDIUM severity issues - see results.json\n" ;\
+		exit 1 ;\
+	else \
+		printf "\ngosec found no MEDIUM severity issues\n" ;\
+	fi ;\
+	cat gosec_results.json | grep LOW | grep severity > /dev/null;\
+	if [ $$? -eq 0 ]; then \
+		printf "\nFAILURE: gosec found files containing LOW severity issues - see results.json\n" ;\
+		exit 1;\
+	else \
+		printf "\ngosec found no LOW severity issues\n" ;\
+fi ;\
 
-.PHONY: update-release-information
-update-release-information:
-	sed -i.bak 's/ARG MQ_URL=.*-LinuxX64.tar.gz"/ARG MQ_URL="https:\/\/public.dhe.ibm.com\/ibmdl\/export\/pub\/software\/websphere\/messaging\/mqadv\/$(MQ_VERSION)-IBM-MQ-Advanced-for-Developers-Non-Install-LinuxX64.tar.gz"/g' Dockerfile-server && rm Dockerfile-server.bak
-	$(eval MQ_VERSION_1=$(shell echo '${MQ_VERSION}' | rev | cut -c 3- | rev))
-	sed -i.bak 's/IBM_MQ_.*_LINUX_X86-64_NOINST.tar.gz/IBM_MQ_${MQ_VERSION_1}_LINUX_X86-64_NOINST.tar.gz/g' docs/building.md && rm docs/building.md.bak
-	sed -i.bak 's/ibm-mqadvanced-server:.*-amd64/ibm-mqadvanced-server:$(MQ_VERSION)-amd64/g' docs/security.md
-	sed -i.bak 's/ibm-mqadvanced-server-dev.*-amd64/ibm-mqadvanced-server-dev:$(MQ_VERSION)-amd64/g' docs/security.md && rm docs/security.md.bak
-	sed -i.bak 's/MQ_IMAGE_ADVANCEDSERVER=ibm-mqadvanced-server:.*-amd64/MQ_IMAGE_ADVANCEDSERVER=ibm-mqadvanced-server:$(MQ_VERSION)-amd64/g' docs/testing.md && rm docs/testing.md.bak
-	$(eval MQ_VERSION_2=$(shell echo '${MQ_VERSION_1}' | rev | cut -c 3- | rev))
-	sed -i.bak 's/knowledgecenter\/SSFKSJ_.*\/com/knowledgecenter\/SSFKSJ_${MQ_VERSION_2}.0\/com/g' docs/usage.md && rm docs/usage.md.bak
-	$(eval MQ_VERSION_3=$(shell echo '${MQ_VERSION_1}' | sed "s/\.//g"))
-	sed -i.bak 's/MQ_..._ARCHIVE_REPOSITORY/MQ_${MQ_VERSION_3}_ARCHIVE_REPOSITORY/g' .travis.yml && rm .travis.yml.bak
-
-COMMAND_SERVER_VERSION=$(shell $(COMMAND) version --format "{{ .Server.Version }}")
-COMMAND_CLIENT_VERSION=$(shell $(COMMAND) version --format "{{ .Client.Version }}")
-PODMAN_VERSION=$(shell podman version --format "{{ .Version }}")
-.PHONY: command-version
-command-version:
-# If we're using Docker, then check it's recent enough to support multi-stage builds
-ifneq (,$(findstring docker,$(COMMAND)))
-	@test "$(word 1,$(subst ., ,$(COMMAND_CLIENT_VERSION)))" -ge "17" || ("$(word 1,$(subst ., ,$(COMMAND_CLIENT_VERSION)))" -eq "17" && "$(word 2,$(subst ., ,$(COMMAND_CLIENT_VERSION)))" -ge "05") || (echo "Error: Docker client 17.05 or greater is required" && exit 1)
-	@test "$(word 1,$(subst ., ,$(COMMAND_SERVER_VERSION)))" -ge "17" || ("$(word 1,$(subst ., ,$(COMMAND_SERVER_VERSION)))" -eq "17" && "$(word 2,$(subst ., ,$(COMMAND_CLIENT_VERSION)))" -ge "05") || (echo "Error: Docker server 17.05 or greater is required" && exit 1)
-endif
-ifneq (,$(findstring podman,$(COMMAND)))
-	@test "$(word 1,$(subst ., ,$(PODMAN_VERSION)))" -ge "1" || (echo "Error: Podman version 1.0 or greater is required" && exit 1)
-endif
+include formatting.mk

README.md

@@ -1,6 +1,5 @@
 # IBM MQ container
 
-
 [![Build Status](https://travis-ci.org/ibm-messaging/mq-container.svg?branch=master)](https://travis-ci.org/ibm-messaging/mq-container)
 
 **Note**: The `master` branch may be in an *unstable or even broken state* during development.
@@ -34,7 +33,7 @@ See the [default developer configuration docs](docs/developer-config.md) for the
 
 ### Kubernetes
 
-If you want to use IBM MQ on [Kubernetes](https://kubernetes.io), you can find an example [Helm](https://helm.sh/) chart here: [IBM MQ Sample Helm Chart](https://github.com/ibm-messaging/mq-helm).  This can be used to run the container on a Kubernetes cluster, such as the [IBM Cloud Kubernetes Service](https://www.ibm.com/cloud/container-service).
+If you want to use IBM MQ in [Kubernetes](https://kubernetes.io), you can find an example [Helm](https://helm.sh/) chart here: [IBM charts](https://github.com/IBM/charts).  This can be used to run the container on a cluster, such as [IBM Cloud Private](https://www.ibm.com/cloud-computing/products/ibm-cloud-private/) or the [IBM Cloud Kubernetes Service](https://www.ibm.com/cloud/container-service).
 
 ## Issues and contributions
 
@@ -45,12 +44,12 @@ For issues relating specifically to the container image or Helm chart, please us
 The Dockerfiles and associated code and scripts are licensed under the [Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0.html).
 Licenses for the products installed within the images are as follows:
 
-- [IBM MQ Advanced for Developers](http://www14.software.ibm.com/cgi-bin/weblap/lap.pl?la_formnum=Z125-3301-14&li_formnum=L-APIG-CAUEQC) (International License Agreement for Non-Warranted Programs). This license may be viewed from an image using the `LICENSE=view` environment variable as described above or by following the link above.
-- [IBM MQ Advanced](http://www14.software.ibm.com/cgi-bin/weblap/lap.pl?la_formnum=Z125-3301-14&li_formnum=L-APIG-CAUEBE) (International Program License Agreement). This license may be viewed from an image using the `LICENSE=view` environment variable as described above or by following the link above.
+- [IBM MQ Advanced for Developers](http://www14.software.ibm.com/cgi-bin/weblap/lap.pl?la_formnum=Z125-3301-14&li_formnum=L-APIG-BBZHCQ) (International License Agreement for Non-Warranted Programs). This license may be viewed from an image using the `LICENSE=view` environment variable as described above or by following the link above.
+- [IBM MQ Advanced](http://www14.software.ibm.com/cgi-bin/weblap/lap.pl?la_formnum=Z125-3301-14&li_formnum=L-APIG-BBSHJL) (International Program License Agreement). This license may be viewed from an image using the `LICENSE=view` environment variable as described above or by following the link above.
+- License information for Ubuntu packages may be found in `/usr/share/doc/${package}/copyright`
 
 Note: The IBM MQ Advanced for Developers license does not permit further distribution and the terms restrict usage to a developer machine.
 
-
 ## Copyright
 
-© Copyright IBM Corporation 2015, 2022
+© Copyright IBM Corporation 2015, 2019

authservice/mqhtpass/Makefile

@@ -1,50 +0,0 @@
-# © Copyright IBM Corporation 2017, 2020
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# This Makefile expects the following to be installed:
-# - 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
-
-# Flags passed to the C compiler.  Need to use gnu11 to get POSIX functions needed for file locking.
-CFLAGS += -std=gnu11 -fPIC -Wall -m64
-
-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.o : $(SRC_DIR)/log.c $(SRC_DIR)/log.h
-	mkdir -p ${dir $@}
-	gcc $(CFLAGS) -c $(SRC_DIR)/log.c -o $@
-
-$(BUILD_DIR)/htpass.o : $(SRC_DIR)/htpass.c $(SRC_DIR)/htpass.h
-	mkdir -p ${dir $@}
-	gcc $(CFLAGS) -c $(SRC_DIR)/htpass.c -I /usr/include/apr-1 -o $@
-
-$(BUILD_DIR)/htpass_test : $(BUILD_DIR)/htpass.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)
-
-$(BUILD_DIR)/mqhtpass.so : $(BUILD_DIR)/log.o $(BUILD_DIR)/htpass.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 $@
-	ldd $@

authservice/mqhtpass/src/htpass.c

@@ -1,145 +0,0 @@
-/*
-© Copyright IBM Corporation 2021
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-#include <errno.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "log.h"
-#include "htpass.h"
-#include <linux/limits.h>
-#include <apr_general.h>
-#include <apr_errno.h>
-#include <apr_md5.h>
-
-bool htpass_valid_file(char *filename)
-{
-  bool valid = true;
-  FILE *fp;
-  char *huser;
-
-  fp = fopen(filename, "r");
-  if (fp == NULL)
-  {
-    log_errorf("Error %d opening htpasswd file '%s'", errno, filename);
-  }
-  if (fp)
-  {
-    const size_t line_size = 1024;
-    char *line = malloc(line_size);
-    while (fgets(line, line_size, fp) != NULL)
-    {
-      char *saveptr;
-      // Need to use strtok_r to be safe for multiple threads
-      huser = strtok_r(line, ":", &saveptr);
-      if (strlen(huser) >= 12)
-      {
-        log_errorf("Invalid htpasswd file for use with IBM MQ.  User '%s' is longer than twelve characters", huser);
-        valid = false;
-        break;
-      }
-    }
-    fclose(fp);
-    if (line)
-    {
-      free(line);
-    }
-  }
-  return valid;
-}
-
-char *find_hash(char *filename, char *user)
-{
-  bool found = false;
-  FILE *fp;
-  char *huser;
-  char *hash;
-
-  fp = fopen(filename, "r");
-  if (fp == NULL)
-  {
-    log_errorf("Error %d opening htpasswd file '%s'", errno, filename);
-  }
-  if (fp)
-  {
-    const size_t line_size = 1024;
-    char *line = malloc(line_size);
-    while (fgets(line, line_size, fp) != NULL)
-    {
-      char *saveptr;
-      // Need to use strtok_r to be safe for multiple threads
-      huser = strtok_r(line, ":", &saveptr);
-      if (huser && (strcmp(user, huser) == 0))
-      {
-        // Make a duplicate of the string, because we'll be keeping it
-        hash = strdup(strtok_r(NULL, " \r\n\t", &saveptr));
-        found = true;
-        break;
-      }
-    }
-    fclose(fp);
-    if (line)
-    {
-      free(line);
-    }
-  }
-  if (!found)
-  {
-    hash = NULL;
-  }
-  return hash;
-}
-
-int htpass_authenticate_user(char *filename, char *user, char *password)
-{
-  char *hash = find_hash(filename, user);
-  int result = -1;
-  if (hash == NULL)
-  {
-    result = HTPASS_INVALID_USER;
-    log_debugf("User does not exist. user=%s", user);
-  }
-  else
-  {
-    // Use the Apache Portable Runtime utilities to validate the password against the hash.
-    // Supports multiple hashing algorithms, but we should only be using bcrypt
-    apr_status_t status = apr_password_validate(password, hash);
-    // status is usually either APR_SUCCESS or APR_EMISMATCH
-    if (status == APR_SUCCESS)
-    {
-      result = HTPASS_VALID;
-      log_debugf("Correct password supplied. user=%s", user);
-    }
-    else
-    {
-      result = HTPASS_INVALID_PASSWORD;
-      log_debugf("Incorrect password supplied. user=%s", user);
-    }
-  }
-  return result;
-}
-
-bool htpass_valid_user(char *filename, char *user)
-{
-  char *hash = find_hash(filename, user);
-  bool valid = false;
-  if (hash != NULL)
-  {
-    valid = true;
-  }
-  return valid;
-}

authservice/mqhtpass/src/htpass.h

@@ -1,49 +0,0 @@
-/*
-© Copyright IBM Corporation 2021
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-#ifndef _HTPASS_H
-#define _HTPASS_H
-
-#define HTPASS_VALID 0
-#define HTPASS_INVALID_USER 1
-#define HTPASS_INVALID_PASSWORD 2
-
-/**
- * Validate an HTPasswd file for use with IBM MQ.
- * 
- * @param filename the HTPasswd file
- */
-_Bool htpass_valid_file(char *filename);
-
-/**
- * Authenticate a user, based on the supplied file name.
- * 
- * @param filename the HTPasswd file
- * @param user the user name to authenticate
- * @param password the password of the user
- * @return HTPASS_VALID, HTPASS_INVALID_USER or HTPASS_INVALID_PASSWORD
- */
-int htpass_authenticate_user(char *filename, char *user, char *password);
-
-/**
- * Validate that a user exists in the password file.
- * 
- * @param filename the HTPasswd file
- * @param user the user name to validate
- */
-_Bool htpass_valid_user(char *filename, char *user);
-
-#endif

authservice/mqhtpass/src/htpass_test.c

@@ -1,223 +0,0 @@
-/*
-© Copyright IBM Corporation 2021
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include "log.h"
-#include "htpass.h"
-
-// Headers for multi-threaded tests
-#include <pthread.h>
-
-// Start a test and log the function name
-#define test_start() printf("=== RUN: %s\n", __func__)
-
-// Indicate test has passed
-#define test_pass() printf("--- PASS: %s\n", __func__)
-
-// Indicate test has failed
-void test_fail(const char *test_name)
-{
-  printf("--- FAIL: %s\n", test_name);
-  exit(1);
-}
-
-// ----------------------------------------------------------------------------
-// Simple tests for file validation
-// ----------------------------------------------------------------------------
-
-void test_htpass_valid_file_ok()
-{
-  test_start();
-  int ok = htpass_valid_file("./src/htpass_test.htpasswd");
-  if (!ok)
-    test_fail(__func__);
-  test_pass();
-}
-
-void test_htpass_valid_file_too_long()
-{
-  test_start();
-  int ok = htpass_valid_file("./src/htpass_test_invalid.htpasswd");
-  if (ok)
-    test_fail(__func__);
-  test_pass();
-}
-
-// ----------------------------------------------------------------------------
-// Simple tests for authentication
-// ----------------------------------------------------------------------------
-
-void test_htpass_authenticate_user_fred_valid()
-{
-  test_start();
-  int rc = htpass_authenticate_user("./src/htpass_test.htpasswd", "fred", "passw0rd");
-  printf("%s: fred - %d\n", __func__, rc);
-  if (rc != HTPASS_VALID)
-    test_fail(__func__);
-  test_pass();
-}
-
-void test_htpass_authenticate_user_fred_invalid1()
-{
-  test_start();
-  int rc = htpass_authenticate_user("./src/htpass_test.htpasswd", "fred", "passw0rd ");
-  printf("%s: fred - %d\n", __func__, rc);
-  if (rc != HTPASS_INVALID_PASSWORD)
-    test_fail(__func__);
-  test_pass();
-}
-
-void test_htpass_authenticate_user_fred_invalid2()
-{
-  test_start();
-  int rc = htpass_authenticate_user("./src/htpass_test.htpasswd", "fred", "");
-  printf("%s: fred - %d\n", __func__, rc);
-  if (rc != HTPASS_INVALID_PASSWORD)
-    test_fail(__func__);
-  test_pass();
-}
-
-void test_htpass_authenticate_user_fred_invalid3()
-{
-  test_start();
-  int rc = htpass_authenticate_user("./src/htpass_test.htpasswd", "fred", "clearlywrong");
-  printf("%s: fred - %d\n", __func__, rc);
-  if (rc != HTPASS_INVALID_PASSWORD)
-    test_fail(__func__);
-  test_pass();
-}
-
-void test_htpass_authenticate_user_barney_valid()
-{
-  test_start();
-  int rc = htpass_authenticate_user("./src/htpass_test.htpasswd", "barney", "s3cret");
-  printf("%s: barney - %d\n", __func__, rc);
-  if (rc != HTPASS_VALID)
-    test_fail(__func__);
-  test_pass();
-}
-
-void test_htpass_authenticate_user_unknown()
-{
-  test_start();
-  int rc = htpass_authenticate_user("./src/htpass_test.htpasswd", "george", "s3cret");
-  printf("%s: barney - %d\n", __func__, rc);
-  if (rc != HTPASS_INVALID_USER)
-    test_fail(__func__);
-  test_pass();
-}
-
-// ----------------------------------------------------------------------------
-// Multi-threaded test
-// ----------------------------------------------------------------------------
-
-#define NUM_THREADS 5
-// Number of tests to perform per thread.  Higher numbers are more likely to trigger timing issue.
-#define NUM_TESTS_PER_THREAD 1000
-// Maximum number of JSON errors to report (log can get flooded)
-#define MAX_JSON_ERRORS 10
-
-// Authenticate multiple users, multiple times
-void *authenticate_many_times(void *p)
-{
-  for (int i = 0; i < NUM_TESTS_PER_THREAD; i++)
-  {
-    int rc = htpass_authenticate_user("./src/htpass_test.htpasswd", "barney", "s3cret");
-    if (rc != HTPASS_VALID)
-      test_fail(__func__);
-    rc = htpass_authenticate_user("./src/htpass_test.htpasswd", "fred", "passw0rd");
-    if (rc != HTPASS_VALID)
-      test_fail(__func__);
-  }
-  pthread_exit(NULL);
-}
-
-void check_log_file_valid(char *filename)
-{
-  int errors = 0;
-  printf("--- Checking log file is valid\n");
-  // Check that the JSON log file isn't corrupted
-  FILE *log = fopen(filename, "r");
-  if (log == NULL)
-  {
-    test_fail(__func__);
-  }
-  const size_t line_size = 1024;
-  char *line = malloc(line_size);
-  while (fgets(line, line_size, log) != NULL)
-  {
-    if ((line[0] != '{') && (errors < MAX_JSON_ERRORS))
-    {
-      printf("*** Invalid JSON detected: %s\n", line);
-      errors++;
-    }
-  }
-  if (line)
-  {
-    free(line);
-  }
-  fclose(log);
-}
-
-// Test authenticate_user with multiple threads, each doing many authentications
-void test_htpass_authenticate_user_multithreaded(char *logfile)
-{
-  pthread_t threads[NUM_THREADS];
-  int rc;
-  test_start();
-  // Re-initialize the log to use a file for the multi-threaded test
-  log_init(logfile);
-  for (int i = 0; i < NUM_THREADS; i++)
-  {
-    printf("Creating thread %d\n", i);
-    rc = pthread_create(&threads[i], NULL, authenticate_many_times, NULL);
-    if (rc)
-    {
-      printf("Error: Unable to create thread, %d\n", rc);
-      test_fail(__func__);
-    }
-  }
-  // Wait for all the threads to complete
-  for (int i = 0; i < NUM_THREADS; i++)
-  {
-    pthread_join(threads[i], NULL);
-  }
-  check_log_file_valid(logfile);
-  test_pass();
-}
-
-// ----------------------------------------------------------------------------
-
-int main()
-{
-  // Turn on debugging for the tests
-  setenv("DEBUG", "true", true);
-  log_init("htpass_test.log");
-  test_htpass_valid_file_ok();
-  test_htpass_valid_file_too_long();
-  test_htpass_authenticate_user_fred_valid();
-  test_htpass_authenticate_user_fred_invalid1();
-  test_htpass_authenticate_user_fred_invalid2();
-  test_htpass_authenticate_user_fred_invalid3();
-  test_htpass_authenticate_user_barney_valid();
-  test_htpass_authenticate_user_unknown();
-  log_close();
-
-  // Call multi-threaded test last, because it re-initializes the log to use a file
-  test_htpass_authenticate_user_multithreaded("htpass_test_multithreaded.log");
-}

authservice/mqhtpass/src/htpass_test.htpasswd

@@ -1,2 +0,0 @@
-fred:$2y$05$3Fp9epsqEwWOHdyj9Ngf9.qfX34kzc9zNrdQ7kac0GmcCvQjIkAwy
-barney:$2y$05$l8EoyCQ9y2PyfUzIDDfTyu7SSaJEYB1TuHy07xZvN7xt/pR3SIw0a

authservice/mqhtpass/src/htpass_test_invalid.htpasswd

@@ -1,3 +0,0 @@
-fred:$2y$05$3Fp9epsqEwWOHdyj9Ngf9.qfX34kzc9zNrdQ7kac0GmcCvQjIkAwy
-barney:$2y$05$l8EoyCQ9y2PyfUzIDDfTyu7SSaJEYB1TuHy07xZvN7xt/pR3SIw0a
-namewhichisfartoolongformq:$2y$05$l8EoyCQ9y2PyfUzIDDfTyu7SSaJEYB1TuHy07xZvN7xt/pR3SIw0a

authservice/mqhtpass/src/log.c

@@ -1,152 +0,0 @@
-/*
-© Copyright IBM Corporation 2021
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <time.h>
-#include <sys/time.h>
-#include <unistd.h>
-
-FILE *fp = NULL;
-int pid;
-char hostname[255];
-bool debug = false;
-
-/**
- * Determine whether debugging is enabled or not, using an environment variable.
- */
-void init_debug(){
-  char *debug_env = getenv("DEBUG");
-  if (debug_env != NULL)
-  {
-    // Enable debug logging if the DEBUG environment variable is set
-    if (strncmp(debug_env, "true", 4) || strncmp(debug_env, "1", 1))
-    {
-      debug = true;
-    }
-  }
-}
-
-/**
- * Internal function to initialize the log with the given file mode.
- */
-int log_init_internal(char *filename, const char *mode)
-{
-  int result = 0;
-  pid = getpid();
-  hostname[254] = '\0';
-  gethostname(hostname, 254);
-  if (!fp)
-  {
-    fp = fopen(filename, "a");
-    if (fp)
-    {
-      // Disable buffering for this file
-      setbuf(fp, NULL);
-    }
-    else
-    {
-      result = 1;
-    }
-  }
-  init_debug();
-  return result;
-}
-
-int log_init_reset(char *filename)
-{
-  // Open the log file for writing (overwrite if it already exists)
-  return log_init_internal(filename, "w");
-}
-
-int log_init(char *filename)
-{
-  // Open the log file file for appending
-  return log_init_internal(filename, "a");
-}
-
-void log_init_file(FILE *f)
-{
-  fp = f;
-  init_debug();
-}
-
-void log_close()
-{
-  if (fp)
-  {
-    fclose(fp);
-    fp = NULL;
-  }
-}
-
-void log_printf(const char *source_file, int source_line, const char *level, const char *format, ...)
-{
-  if (fp)
-  {
-    // If this is a DEBUG message, and debugging is off
-    if ((strncmp(level, "DEBUG", 5) == 0) && !debug)
-    {
-      return;
-    }
-    char buf[1024] = "";
-    char *cur = buf;
-    char* const end = buf + sizeof buf;
-    char date_buf[70];
-    struct tm *utc;
-    time_t t;
-    struct timeval now;
-
-    gettimeofday(&now, NULL);
-    t = now.tv_sec;
-    t = time(NULL);
-    utc = gmtime(&t);
-
-    cur += snprintf(cur, end-cur, "{");
-    cur += snprintf(cur, end-cur, "\"loglevel\":\"%s\"", level);
-    // Print ISO-8601 time and date
-    if (strftime(date_buf, sizeof date_buf, "%FT%T", utc))
-    {
-       // Round microseconds down to milliseconds, for consistency
-       cur += snprintf(cur, end-cur, ", \"ibm_datetime\":\"%s.%03ldZ\"", date_buf, now.tv_usec / 1000);
-    }
-    cur += snprintf(cur, end-cur, ", \"ibm_processId\":\"%d\"", pid);
-    cur += snprintf(cur, end-cur, ", \"host\":\"%s\"", hostname);
-    cur += snprintf(cur, end-cur, ", \"module\":\"%s:%d\"", source_file, source_line);
-    cur += snprintf(cur, end-cur, ", \"message\":\"");
-
-    if (strncmp(level, "DEBUG", 5) == 0)
-    {
-      // Add a prefix on any debug messages
-      cur += snprintf(cur, end-cur, "mqhtpass: ");
-    }
-
-    // Print log message, using varargs
-    va_list args;
-    va_start(args, format);
-    cur += vsnprintf(cur, end-cur, format, args);
-    va_end(args);
-    cur += snprintf(cur, end-cur, "\"}\n");
-
-    // Important: Just do one file write, to prevent problems with multi-threading.
-    // This only works if the log message is not too long for the buffer.
-    fprintf(fp, buf);
-  }
-}
-

authservice/mqhtpass/src/log.h

@@ -1,63 +0,0 @@
-/*
-© Copyright IBM Corporation 2021
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-#ifndef _LOG_H
-#define _LOG_H
-
-/**
- * Initialize the log to use the given file name, wiping any existing contents.
- */
-int log_init_reset(char *filename);
-
-/**
- * Initialize the log to use the given file name.
- */
-int log_init(char *filename);
-
-/**
- * Initialize the log with an existing file handle.
- */
-void log_init_file(FILE *f);
-
-/**
- * Write a message to the log file, based on a printf format string.
- * 
- * @param source_file the name of the source code file submitting this log message
- * @param source_line the line of code in the source file
- * @param level the log level, one of "DEBUG", "INFO" or "ERROR"
- * @param format the printf format string for the message
- */
-void log_printf(const char *source_file, int source_line, const char *level, const char *format, ...);
-
-void log_close();
-
-/**
- * Variadic macro to write an informational message to the log file, based on a printf format string.
- */
-#define log_infof(format,...) log_printf(__FILE__, __LINE__, "INFO", format, ##__VA_ARGS__)
-
-/**
- * Variadic macro to write an error message to the log file, based on a printf format string.
- */
-#define log_errorf(format,...) log_printf(__FILE__, __LINE__, "ERROR", format, ##__VA_ARGS__)
-
-/**
- * Variadic macro to write a debug message to the log file, based on a printf format string.
- */
-#define log_debugf(format,...) log_printf(__FILE__, __LINE__, "DEBUG", format, ##__VA_ARGS__)
-
-
-#endif

authservice/mqhtpass/src/mqhtpass.c

@@ -1,350 +0,0 @@
-/*
-© Copyright IBM Corporation 2021, 2022
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// This is a developer only configuration and not recommended for production usage.
-
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <cmqec.h>
-#include "log.h"
-#include "htpass.h"
-
-// Declare the internal functions that implement the interface
-MQZ_INIT_AUTHORITY MQStart;
-static MQZ_AUTHENTICATE_USER mqhtpass_authenticate_user;
-static MQZ_FREE_USER mqhtpass_free_user;
-static MQZ_TERM_AUTHORITY mqhtpass_terminate;
-
-#define LOG_FILE "/var/mqm/errors/mqhtpass.json"
-#define HTPASSWD_FILE "/etc/mqm/mq.htpasswd"
-#define NAME "MQ Advanced for Developers custom authentication service"
-
-static char *trim(char *s);
-
-/**
- * Initialization and entrypoint for the dynamically loaded
- * authorization installable service. It registers the addresses of the
- * other functions which are to be called by the queue manager.
- *
- * This function is called whenever the module is loaded.  The Options
- * field will show whether it's a PRIMARY (i.e. during qmgr startup) or
- * SECONDARY.
- */
-void MQENTRY MQStart(
-    MQHCONFIG hc,
-    MQLONG Options,
-    MQCHAR48 QMgrName,
-    MQLONG ComponentDataLength,
-    PMQBYTE ComponentData,
-    PMQLONG Version,
-    PMQLONG pCompCode,
-    PMQLONG pReason)
-{
-  MQLONG CC = MQCC_OK;
-  MQLONG Reason = MQRC_NONE;
-  int log_rc = 0;
-
-  if (Options == MQZIO_PRIMARY)
-  {
-    // Reset the log file.  The file could still get large if debug is turned on,
-    // but this is a simpler solution for now.
-    log_rc = log_init_reset(LOG_FILE);
-  }
-  else
-  {
-    log_rc = log_init(LOG_FILE);
-  }
-
-  if (log_rc != 0)
-  {
-    CC = MQCC_FAILED;
-    Reason = MQRC_INITIALIZATION_FAILED;
-  }
-
-  if (Options == MQZIO_PRIMARY)
-  {
-    log_infof("Initializing %s", NAME);
-  }
-  log_debugf("MQStart options=%s qmgr=%s", ((Options == MQZIO_SECONDARY) ? "Secondary" : "Primary"), trim(QMgrName));
-
-  if (!htpass_valid_file(HTPASSWD_FILE))
-  {
-    CC = MQCC_FAILED;
-    Reason = MQRC_INITIALIZATION_FAILED;
-  }
-
-  // Initialize the functions to use for each entry point
-  if (CC == MQCC_OK)
-  {
-    hc->MQZEP_Call(hc, MQZID_INIT_AUTHORITY, (PMQFUNC)MQStart, &CC, &Reason);
-  }
-  if (CC == MQCC_OK)
-  {
-    hc->MQZEP_Call(hc, MQZID_TERM_AUTHORITY, (PMQFUNC)mqhtpass_terminate, &CC, &Reason);
-  }
-  if (CC == MQCC_OK)
-  {
-    hc->MQZEP_Call(hc, MQZID_AUTHENTICATE_USER, (PMQFUNC)mqhtpass_authenticate_user, &CC, &Reason);
-  }
-  if (CC == MQCC_OK)
-  {
-    hc->MQZEP_Call(hc, MQZID_FREE_USER, (PMQFUNC)mqhtpass_free_user, &CC, &Reason);
-  }
-  *Version = MQZAS_VERSION_5;
-  *pCompCode = CC;
-  *pReason = Reason;
-  return;
-}
-
-/**
- * Called during the connection of any application which supplies an MQCSP (Connection Security Parameters).
- * This is the usual case.
- * See https://www.ibm.com/support/knowledgecenter/SSFKSJ_latest/com.ibm.mq.ref.dev.doc/q095610_.html
- */
-static void MQENTRY mqhtpass_authenticate_user_csp(
-    PMQCHAR pQMgrName,
-    PMQCSP pSecurityParms,
-    PMQZAC pApplicationContext,
-    PMQZIC pIdentityContext,
-    PMQPTR pCorrelationPtr,
-    PMQBYTE pComponentData,
-    PMQLONG pContinuation,
-    PMQLONG pCompCode,
-    PMQLONG pReason)
-{
-  char *csp_user = NULL;
-  char *csp_pass = NULL;
-
-  // Firstly, create null-terminated strings from the user credentials in the MQ CSP object
-  csp_user = malloc(pSecurityParms->CSPUserIdLength + 1);
-  if (!csp_user)
-  {
-    log_errorf("%s is unable to allocate memory for a user", NAME);
-    *pCompCode = MQCC_FAILED;
-    *pReason = MQRC_SERVICE_ERROR;
-    return;
-  }
-  strncpy(csp_user, pSecurityParms->CSPUserIdPtr, pSecurityParms->CSPUserIdLength);
-  csp_user[pSecurityParms->CSPUserIdLength] = 0;
-  csp_pass = malloc((pSecurityParms->CSPPasswordLength + 1));
-  if (!csp_pass)
-  {
-    log_errorf("%s is unable to allocate memory for a password", NAME);
-    *pCompCode = MQCC_FAILED;
-    *pReason = MQRC_SERVICE_ERROR;
-    if (csp_user)
-    {
-      free(csp_user);
-    }
-    return;
-  }
-  strncpy(csp_pass, pSecurityParms->CSPPasswordPtr, pSecurityParms->CSPPasswordLength);
-  csp_pass[pSecurityParms->CSPPasswordLength] = 0;
-  log_debugf("%s with CSP user set. user=%s", __func__, csp_user);
-  int auth_result = htpass_authenticate_user(HTPASSWD_FILE, csp_user, csp_pass);
-
-  if (auth_result == HTPASS_VALID)
-  {
-    // An OK completion code means MQ will accept this user is authenticated
-    *pCompCode = MQCC_OK;
-    *pReason = MQRC_NONE;
-    // Tell the queue manager to stop trying other authorization services.
-    *pContinuation = MQZCI_STOP;
-    memcpy(pIdentityContext->UserIdentifier, csp_user, sizeof(pIdentityContext->UserIdentifier));
-    log_debugf("Authenticated user=%s", pIdentityContext->UserIdentifier);
-  }
-  // If the htpasswd file does not have an entry for this user
-  else if (auth_result == HTPASS_INVALID_USER)
-  {
-    *pCompCode = MQCC_WARNING;
-    *pReason = MQRC_NONE;
-    // Tell the queue manager to continue trying other authorization services, as they might have the user.
-    *pContinuation = MQZCI_CONTINUE;
-    log_debugf(
-        "User authentication failed due to invalid user.  user=%s effuser=%s applname=%s csp_user=%s cc=%d reason=%d",
-        trim(pIdentityContext->UserIdentifier),
-        trim(pApplicationContext->EffectiveUserID),
-        trim(pApplicationContext->ApplName),
-        trim(csp_user),
-        *pCompCode,
-        *pReason);
-  }
-  // If the htpasswd file has an entry for this user, but the password supplied is incorrect
-  else if (auth_result == HTPASS_INVALID_PASSWORD)
-  {
-    *pCompCode = MQCC_WARNING;
-    *pReason = MQRC_NOT_AUTHORIZED;
-    // Tell the queue manager to stop trying other authorization services.
-    *pContinuation = MQZCI_STOP;
-    log_debugf(
-        "User authentication failed due to invalid password.  user=%s effuser=%s applname=%s csp_user=%s cc=%d reason=%d",
-        trim(pIdentityContext->UserIdentifier),
-        trim(pApplicationContext->EffectiveUserID),
-        trim(pApplicationContext->ApplName),
-        trim(csp_user),
-        *pCompCode,
-        *pReason);
-  }
-  if (csp_user)
-  {
-    free(csp_user);
-  }
-  if (csp_pass)
-  {
-    free(csp_pass);
-  }
-  return;
-}
-
-/**
- * Called during the connection of any application.
- * For more information on the parameters, see https://www.ibm.com/support/knowledgecenter/en/SSFKSJ_latest/com.ibm.mq.ref.dev.doc/q110090_.html
- */
-static void MQENTRY mqhtpass_authenticate_user(
-    PMQCHAR pQMgrName,
-    PMQCSP pSecurityParms,
-    PMQZAC pApplicationContext,
-    PMQZIC pIdentityContext,
-    PMQPTR pCorrelationPtr,
-    PMQBYTE pComponentData,
-    PMQLONG pContinuation,
-    PMQLONG pCompCode,
-    PMQLONG pReason)
-{
-  char *spuser = NULL;
-  // By default, return a warning, which indicates to MQ that this
-  // authorization service hasn't authenticated the user.
-  *pCompCode = MQCC_WARNING;
-  *pReason = MQRC_NONE;
-  // By default, tell the queue manager to continue trying other
-  // authorization services.
-  *pContinuation = MQZCI_CONTINUE;
-
-  if ((pSecurityParms->AuthenticationType) == MQCSP_AUTH_USER_ID_AND_PWD)
-  {
-    mqhtpass_authenticate_user_csp(pQMgrName, pSecurityParms, pApplicationContext, pIdentityContext, pCorrelationPtr, pComponentData, pContinuation, pCompCode, pReason);
-  }
-  else
-  {
-    // Password not supplied, so just check that the user ID is valid
-    spuser = malloc(sizeof(PMQCHAR12) + 1);
-    if (!spuser)
-    {
-      log_errorf("%s is unable to allocate memory to check a user", NAME);
-      *pCompCode = MQCC_FAILED;
-      *pReason = MQRC_SERVICE_ERROR;
-      return;
-    }
-    strncpy(spuser, pApplicationContext->EffectiveUserID, strlen(pApplicationContext->EffectiveUserID));
-    spuser[sizeof(PMQCHAR12)] = 0;
-    log_debugf("%s without CSP user set.  effectiveuid=%s env=%d, callertype=%d, type=%d, accttoken=%d applidentitydata=%d", __func__, spuser, pApplicationContext->Environment, pApplicationContext->CallerType, pApplicationContext->AuthenticationType, pIdentityContext->AccountingToken, pIdentityContext->ApplIdentityData);
-    if (strncmp(spuser, "mqm", 3) == 0)
-    {
-      // Special case: pass the "mqm" user on for validation up the chain
-      // A warning in the completion code means MQ will pass this to other authorization services
-      *pCompCode = MQCC_WARNING;
-      *pReason = MQRC_NONE;
-      *pContinuation = MQZCI_CONTINUE;
-    }
-    else
-    {
-      bool valid_user = htpass_valid_user(HTPASSWD_FILE, spuser);
-      if (valid_user)
-      {
-        // An OK completion code means MQ will accept this user is authenticated
-        *pCompCode = MQCC_OK;
-        *pReason = MQRC_NONE;
-        *pContinuation = MQZCI_STOP;
-        memcpy(pIdentityContext->UserIdentifier, spuser, sizeof(pIdentityContext->UserIdentifier));
-      }
-      else
-      {
-        log_debugf(
-            "User authentication failed user=%s effuser=%s applname=%s cspuser=%s cc=%d reason=%d",
-            trim(pIdentityContext->UserIdentifier),
-            trim(pApplicationContext->EffectiveUserID),
-            trim(pApplicationContext->ApplName),
-            trim(spuser),
-            *pCompCode,
-            *pReason);
-      }
-      if (spuser)
-      {
-        free(spuser);
-      }
-    }
-  }
-  return;
-}
-
-/**
- * Called during MQDISC, as the inverse of the call to authenticate.
- */
-static void MQENTRY mqhtpass_free_user(
-    PMQCHAR pQMgrName,
-    PMQZFP pFreeParms,
-    PMQBYTE pComponentData,
-    PMQLONG pContinuation,
-
-    PMQLONG pCompCode,
-    PMQLONG pReason)
-{
-  log_debugf("mqhtpass_freeuser()");
-  *pCompCode = MQCC_WARNING;
-  *pReason = MQRC_NONE;
-  *pContinuation = MQZCI_CONTINUE;
-}
-
-/**
- * Called when the authorization service is terminated.
- */
-static void MQENTRY mqhtpass_terminate(
-    MQHCONFIG hc,
-    MQLONG Options,
-    PMQCHAR pQMgrName,
-    PMQBYTE pComponentData,
-    PMQLONG pCompCode,
-    PMQLONG pReason)
-{
-  if (Options == MQZTO_PRIMARY)
-  {
-    log_infof("Terminating %s", NAME);
-    log_close();
-  }
-  else {
-    log_debugf("Terminating secondary");
-  }
-  *pCompCode = MQCC_OK;
-  *pReason = MQRC_NONE;
-}
-
-/**
- * Remove trailing spaces from a string.
- */
-static char *trim(char *s)
-{
-  int i;
-  for (i = strlen(s) - 1; i >= 0; i--)
-  {
-    if (s[i] == ' ')
-      s[i] = 0;
-    else
-      break;
-  }
-  return s;
-}

cmd/chkmqhealthy/main.go

@@ -1,5 +1,5 @@
 /*
-© Copyright IBM Corporation 2017, 2020
+© Copyright IBM Corporation 2017, 2019
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/ibm-messaging/mq-container/pkg/name"
+	"github.com/ibm-messaging/mq-container/internal/name"
 )
 
 func queueManagerHealthy() (bool, error) {
@@ -36,12 +36,12 @@ func queueManagerHealthy() (bool, error) {
 	cmd := exec.Command("dspmq", "-n", "-m", name)
 	// Run the command and wait for completion
 	out, err := cmd.CombinedOutput()
-	fmt.Printf("%s", out)
 	if err != nil {
 		fmt.Println(err)
 		return false, err
 	}
-	if !strings.Contains(string(out), "(RUNNING)") && !strings.Contains(string(out), "(RUNNING AS STANDBY)") && !strings.Contains(string(out), "(STARTING)") && !strings.Contains(string(out), "(REPLICA)") {
+	fmt.Printf("%s", out)
+	if !strings.Contains(string(out), "(RUNNING)") && !strings.Contains(string(out), "(RUNNING AS STANDBY)") && !strings.Contains(string(out), "(STARTING)") {
 		return false, nil
 	}
 	return true, nil

cmd/chkmqready/main.go

@@ -22,8 +22,8 @@ import (
 	"net"
 	"os"
 
+	"github.com/ibm-messaging/mq-container/internal/name"
 	"github.com/ibm-messaging/mq-container/internal/ready"
-	"github.com/ibm-messaging/mq-container/pkg/name"
 )
 
 func main() {
@@ -39,7 +39,7 @@ func main() {
 	}
 
 	// Check if the queue manager has a running listener
-	if active, _ := ready.IsRunningAsActiveQM(name); active {
+	if standby, _ := ready.IsRunningAsStandbyQM(name); !standby {
 		conn, err := net.Dial("tcp", "127.0.0.1:1414")
 		if err != nil {
 			fmt.Println(err)
@@ -49,13 +49,8 @@ func main() {
 		if err != nil {
 			fmt.Println(err)
 		}
-	} else if standby, _ := ready.IsRunningAsStandbyQM(name); standby {
+	} else {
 		fmt.Printf("Detected queue manager running in standby mode")
 		os.Exit(10)
-	} else if replica, _ := ready.IsRunningAsReplicaQM(name); replica {
-		fmt.Printf("Detected queue manager running in replica mode")
-		os.Exit(20)
-	} else {
-		os.Exit(1)
 	}
 }

cmd/chkmqstarted/main.go

@@ -1,58 +0,0 @@
-/*
-© Copyright IBM Corporation 2021
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// chkmqstarted checks that MQ has successfully started, by checking the output of the "dspmq" command
-package main
-
-import (
-	"fmt"
-	"os"
-	"os/exec"
-	"strings"
-
-	"github.com/ibm-messaging/mq-container/pkg/name"
-)
-
-func queueManagerStarted() (bool, error) {
-	name, err := name.GetQueueManagerName()
-	if err != nil {
-		return false, err
-	}
-	// Specify the queue manager name, just in case someone's created a second queue manager
-	// #nosec G204
-	cmd := exec.Command("dspmq", "-n", "-m", name)
-	// Run the command and wait for completion
-	out, err := cmd.CombinedOutput()
-	if err != nil {
-		fmt.Println(err)
-		return false, err
-	}
-	if !strings.Contains(string(out), "(RUNNING)") && !strings.Contains(string(out), "(RUNNING AS STANDBY)") && !strings.Contains(string(out), "(STARTING)") && !strings.Contains(string(out), "(REPLICA)") {
-		return false, nil
-	}
-	return true, nil
-}
-
-func main() {
-	started, err := queueManagerStarted()
-	if err != nil {
-		os.Exit(2)
-	}
-	if !started {
-		os.Exit(1)
-	}
-	os.Exit(0)
-}

cmd/runmqdevserver/main.go

@@ -1,5 +1,5 @@
 /*
-© Copyright IBM Corporation 2018, 2021
+© Copyright IBM Corporation 2018, 2019
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -19,16 +19,39 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
+	"os/exec"
 	"syscall"
 
-	"github.com/ibm-messaging/mq-container/internal/htpasswd"
-	"github.com/ibm-messaging/mq-container/pkg/containerruntimelogger"
-	"github.com/ibm-messaging/mq-container/pkg/logger"
-	"github.com/ibm-messaging/mq-container/pkg/name"
+	"github.com/ibm-messaging/mq-container/internal/command"
+	"github.com/ibm-messaging/mq-container/internal/containerruntimelogger"
+	"github.com/ibm-messaging/mq-container/internal/logger"
+	"github.com/ibm-messaging/mq-container/internal/mqtemplate"
+	"github.com/ibm-messaging/mq-container/internal/name"
 )
 
 var log *logger.Logger
 
+func setPassword(user string, password string) error {
+	// #nosec G204
+	cmd := exec.Command("sudo", "chpasswd")
+	stdin, err := cmd.StdinPipe()
+	if err != nil {
+		return err
+	}
+	fmt.Fprintf(stdin, "%s:%s", user, password)
+	err = stdin.Close()
+	if err != nil {
+		log.Errorf("Error closing password stdin: %v", err)
+	}
+	out, _, err := command.RunCmd(cmd)
+	if err != nil {
+		// Include the command output in the error
+		return fmt.Errorf("%v: %v", err.Error(), out)
+	}
+	log.Printf("Set password for \"%v\" user", user)
+	return nil
+}
+
 func getLogFormat() string {
 	return os.Getenv("LOG_FORMAT")
 }
@@ -67,6 +90,11 @@ func configureLogger() error {
 	return nil
 }
 
+func configureWeb(qmName string) error {
+	out := "/etc/mqm/web/installations/Installation1/angular.persistence/admin.json"
+	return mqtemplate.ProcessTemplateFile("/etc/mqm/admin.json.tpl", out, map[string]string{"QueueManagerName": qmName}, log)
+}
+
 func logTerminationf(format string, args ...interface{}) {
 	logTermination(fmt.Sprintf(format, args...))
 }
@@ -77,7 +105,6 @@ func logTermination(args ...interface{}) {
 	// Write the message to the termination log.  This is not the default place
 	// that Kubernetes will look for termination information.
 	log.Debugf("Writing termination message: %v", msg)
-	// #nosec G306 - its a read by owner/s group, and pose no harm.
 	err := ioutil.WriteFile("/run/termination-log", []byte(msg), 0660)
 	if err != nil {
 		log.Debug(err)
@@ -99,23 +126,16 @@ func doMain() error {
 	}
 
 	adminPassword, set := os.LookupEnv("MQ_ADMIN_PASSWORD")
-	if !set {
-		adminPassword = "passw0rd"
-		err = os.Setenv("MQ_ADMIN_PASSWORD", adminPassword)
+	if set {
+		err = setPassword("admin", adminPassword)
 		if err != nil {
-			logTerminationf("Error setting admin password variable: %v", err)
+			logTerminationf("Error setting admin password: %v", err)
 			return err
 		}
 	}
-	err = htpasswd.SetPassword("admin", adminPassword, false)
-	if err != nil {
-		logTerminationf("Error setting admin password: %v", err)
-		return err
-	}
-
 	appPassword, set := os.LookupEnv("MQ_APP_PASSWORD")
 	if set {
-		err = htpasswd.SetPassword("app", appPassword, false)
+		err = setPassword("app", appPassword)
 		if err != nil {
 			logTerminationf("Error setting app password: %v", err)
 			return err
@@ -128,6 +148,18 @@ func doMain() error {
 		return err
 	}
 
+	name, err := name.GetQueueManagerName()
+	if err != nil {
+		logTerminationf("Error getting queue manager name: %v", err)
+		return err
+	}
+
+	err = configureWeb(name)
+	if err != nil {
+		logTermination("Error configuring admin.json")
+		return err
+	}
+
 	return nil
 }
 
@@ -140,7 +172,7 @@ func main() {
 	} else {
 		// Replace this process with runmqserver
 		// #nosec G204
-		err = syscall.Exec("/usr/local/bin/runmqserver", []string{"runmqserver", "-nologruntime", "-dev"}, os.Environ())
+		err = syscall.Exec("/usr/local/bin/runmqserver", []string{"runmqserver", "-dev"}, os.Environ())
 		if err != nil {
 			log.Errorf("Error replacing this process with runmqserver: %v", err)
 		}

cmd/runmqserver/crtmqvol.go

@@ -1,5 +1,5 @@
 /*
-© Copyright IBM Corporation 2017, 2020
+© Copyright IBM Corporation 2017, 2019
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -17,10 +17,14 @@ package main
 
 import (
 	"os"
+	"runtime"
+	"syscall"
+
+	"github.com/ibm-messaging/mq-container/internal/command"
 )
 
 func createVolume(dataPath string) error {
-	_, err := os.Stat(dataPath)
+	fi, err := os.Stat(dataPath)
 	if err != nil {
 		if os.IsNotExist(err) {
 			// #nosec G301
@@ -32,5 +36,25 @@ func createVolume(dataPath string) error {
 			return err
 		}
 	}
+	fi, err = os.Stat(dataPath)
+	if err != nil {
+		return err
+	}
+	sys := fi.Sys()
+	if sys != nil && runtime.GOOS == "linux" {
+		stat := sys.(*syscall.Stat_t)
+		mqmUID, mqmGID, err := command.LookupMQM()
+		if err != nil {
+			return err
+		}
+		log.Debugf("mqm user is %v (%v)", mqmUID, mqmGID)
+		if int(stat.Uid) != mqmUID || int(stat.Gid) != mqmGID {
+			err = os.Chown(dataPath, mqmUID, mqmGID)
+			if err != nil {
+				log.Printf("Error: Unable to change ownership of %v", dataPath)
+				return err
+			}
+		}
+	}
 	return nil
 }

cmd/runmqserver/logging.go

@@ -1,5 +1,5 @@
 /*
-© Copyright IBM Corporation 2017, 2021
+© Copyright IBM Corporation 2017, 2019
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -23,13 +23,12 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
-	"sort"
 	"strings"
 	"sync"
 
 	"github.com/ibm-messaging/mq-container/internal/command"
-	"github.com/ibm-messaging/mq-container/pkg/logger"
-	"github.com/ibm-messaging/mq-container/pkg/mqini"
+	"github.com/ibm-messaging/mq-container/internal/logger"
+	"github.com/ibm-messaging/mq-container/internal/mqini"
 )
 
 // var debug = false
@@ -46,7 +45,6 @@ func logTermination(args ...interface{}) {
 	// Write the message to the termination log.  This is not the default place
 	// that Kubernetes will look for termination information.
 	log.Debugf("Writing termination message: %v", msg)
-	// #nosec G306 - its a read by owner/s group, and pose no harm.
 	err := ioutil.WriteFile("/run/termination-log", []byte(msg), 0660)
 	if err != nil {
 		log.Debug(err)
@@ -62,27 +60,8 @@ func getLogFormat() string {
 	return os.Getenv("LOG_FORMAT")
 }
 
-// formatBasic formats a log message parsed from JSON, as "basic" text
-func formatBasic(obj map[string]interface{}) string {
-	// Emulate the MQ "MessageDetail=Extended" option, by appending inserts to the message
-	// This is important for certain messages, where key details are only available in the extended message content
-	inserts := make([]string, 0)
-	for k, v := range obj {
-		if strings.HasPrefix(k, "ibm_commentInsert") {
-			inserts = append(inserts, fmt.Sprintf("%s(%v)", strings.Replace(k, "ibm_comment", "Comment", 1), obj[k]))
-		} else if strings.HasPrefix(k, "ibm_arithInsert") {
-			if v.(float64) != 0 {
-				inserts = append(inserts, fmt.Sprintf("%s(%v)", strings.Replace(k, "ibm_arith", "Arith", 1), obj[k]))
-			}
-		}
-	}
-	sort.Strings(inserts)
-	if len(inserts) > 0 {
-		return fmt.Sprintf("%s %s [%v]\n", obj["ibm_datetime"], obj["message"], strings.Join(inserts, ", "))
-	}
-	// Convert time zone information from some logs (e.g. Liberty) for consistency
-	obj["ibm_datetime"] = strings.Replace(obj["ibm_datetime"].(string), "+0000", "Z", 1)
-	return fmt.Sprintf("%s %s\n", obj["ibm_datetime"], obj["message"])
+func formatSimple(datetime string, message string) string {
+	return fmt.Sprintf("%v %v\n", datetime, message)
 }
 
 // mirrorSystemErrorLogs starts a goroutine to mirror the contents of the MQ system error logs
@@ -103,16 +82,6 @@ func mirrorQueueManagerErrorLogs(ctx context.Context, wg *sync.WaitGroup, name s
 	return mirrorLog(ctx, wg, f, fromStart, mf, true)
 }
 
-// mirrorHTPasswdLogs starts a goroutine to mirror the contents of the MQ HTPasswd authorization service's log
-func mirrorHTPasswdLogs(ctx context.Context, wg *sync.WaitGroup, name string, fromStart bool, mf mirrorFunc) (chan error, error) {
-	return mirrorLog(ctx, wg, "/var/mqm/errors/mqhtpass.json", false, mf, true)
-}
-
-// mirrorWebServerLogs starts a goroutine to mirror the contents of the Liberty web server messages.log
-func mirrorWebServerLogs(ctx context.Context, wg *sync.WaitGroup, name string, fromStart bool, mf mirrorFunc) (chan error, error) {
-	return mirrorLog(ctx, wg, "/var/mqm/web/installations/Installation1/servers/mqweb/logs/messages.log", false, mf, true)
-}
-
 func getDebug() bool {
 	debug := os.Getenv("DEBUG")
 	if debug == "true" || debug == "1" {
@@ -132,21 +101,14 @@ func configureLogger(name string) (mirrorFunc, error) {
 			return nil, err
 		}
 		return func(msg string, isQMLog bool) bool {
-			// Check if the message is JSON
-			if len(msg) > 0 && msg[0] == '{' {
-				obj, err := processLogMessage(msg)
-				if err == nil && isQMLog && filterQMLogMessage(obj) {
-					return false
-				}
-				if err != nil {
-					log.Printf("Failed to unmarshall JSON in log message - %v", msg)
-				} else {
-					fmt.Println(msg)
-				}
+			obj, err := processLogMessage(msg)
+			if err == nil && isQMLog && filterQMLogMessage(obj) {
+				return false
+			}
+			if err != nil {
+				log.Printf("Failed to unmarshall JSON - %v", msg)
 			} else {
-				// The log being mirrored isn't JSON, so wrap it in a simple JSON message
-				// MQ error logs are usually JSON, but this is useful for Liberty logs - usually expect WLP_LOGGING_MESSAGE_FORMAT=JSON to be set when mirroring Liberty logs.
-				fmt.Printf("{\"message\":\"%s\"}\n", msg)
+				fmt.Println(msg)
 			}
 			return true
 		}, nil
@@ -156,22 +118,15 @@ func configureLogger(name string) (mirrorFunc, error) {
 			return nil, err
 		}
 		return func(msg string, isQMLog bool) bool {
-			// Check if the message is JSON
-			if len(msg) > 0 && msg[0] == '{' {
-				// Parse the JSON message, and print a simplified version
-				obj, err := processLogMessage(msg)
-				if err == nil && isQMLog && filterQMLogMessage(obj) {
-					return false
-				}
-				if err != nil {
-					log.Printf("Failed to unmarshall JSON in log message - %v", err)
-				} else {
-					fmt.Printf(formatBasic(obj))
-				}
+			// Parse the JSON message, and print a simplified version
+			obj, err := processLogMessage(msg)
+			if err == nil && isQMLog && filterQMLogMessage(obj) {
+				return false
+			}
+			if err != nil {
+				log.Printf("Failed to unmarshall JSON - %v", err)
 			} else {
-				// The log being mirrored isn't JSON, so just print it.
-				// MQ error logs are usually JSON, but this is useful for Liberty logs - usually expect WLP_LOGGING_MESSAGE_FORMAT=JSON to be set when mirroring Liberty logs.
-				fmt.Println(msg)
+				fmt.Printf(formatSimple(obj["ibm_datetime"].(string), obj["message"].(string)))
 			}
 			return true
 		}, nil
@@ -199,43 +154,41 @@ func filterQMLogMessage(obj map[string]interface{}) bool {
 }
 
 func logDiagnostics() {
-	if getDebug() {
-		log.Debug("--- Start Diagnostics ---")
+	log.Debug("--- Start Diagnostics ---")
 
-		// show the directory ownership/permissions
-		// #nosec G104
-		out, _, _ := command.Run("ls", "-l", "/mnt/")
-		log.Debugf("/mnt/:\n%s", out)
-		// #nosec G104
-		out, _, _ = command.Run("ls", "-l", "/mnt/mqm")
-		log.Debugf("/mnt/mqm:\n%s", out)
-		// #nosec G104
-		out, _, _ = command.Run("ls", "-l", "/mnt/mqm/data")
-		log.Debugf("/mnt/mqm/data:\n%s", out)
-		// #nosec G104
-		out, _, _ = command.Run("ls", "-l", "/mnt/mqm-log/log")
-		log.Debugf("/mnt/mqm-log/log:\n%s", out)
-		// #nosec G104
-		out, _, _ = command.Run("ls", "-l", "/mnt/mqm-data/qmgrs")
-		log.Debugf("/mnt/mqm-data/qmgrs:\n%s", out)
-		// #nosec G104
-		out, _, _ = command.Run("ls", "-l", "/var/mqm")
-		log.Debugf("/var/mqm:\n%s", out)
-		// #nosec G104
-		out, _, _ = command.Run("ls", "-l", "/var/mqm/errors")
-		log.Debugf("/var/mqm/errors:\n%s", out)
-		// #nosec G104
-		out, _, _ = command.Run("ls", "-l", "/etc/mqm")
-		log.Debugf("/etc/mqm:\n%s", out)
+	// show the directory ownership/permissions
+	// #nosec G104
+	out, _, _ := command.Run("ls", "-l", "/mnt/")
+	log.Debugf("/mnt/:\n%s", out)
+	// #nosec G104
+	out, _, _ = command.Run("ls", "-l", "/mnt/mqm")
+	log.Debugf("/mnt/mqm:\n%s", out)
+	// #nosec G104
+	out, _, _ = command.Run("ls", "-l", "/mnt/mqm/data")
+	log.Debugf("/mnt/mqm/data:\n%s", out)
+	// #nosec G104
+	out, _, _ = command.Run("ls", "-l", "/mnt/mqm-log/log")
+	log.Debugf("/mnt/mqm-log/log:\n%s", out)
+	// #nosec G104
+	out, _, _ = command.Run("ls", "-l", "/mnt/mqm-data/qmgrs")
+	log.Debugf("/mnt/mqm-data/qmgrs:\n%s", out)
+	// #nosec G104
+	out, _, _ = command.Run("ls", "-l", "/var/mqm")
+	log.Debugf("/var/mqm:\n%s", out)
+	// #nosec G104
+	out, _, _ = command.Run("ls", "-l", "/var/mqm/errors")
+	log.Debugf("/var/mqm/errors:\n%s", out)
+	// #nosec G104
+	out, _, _ = command.Run("ls", "-l", "/etc/mqm")
+	log.Debugf("/etc/mqm:\n%s", out)
 
-		// Print out summary of any FDCs
-		// #nosec G204
-		cmd := exec.Command("/opt/mqm/bin/ffstsummary")
-		cmd.Dir = "/var/mqm/errors"
-		// #nosec G104
-		outB, _ := cmd.CombinedOutput()
-		log.Debugf("ffstsummary:\n%s", string(outB))
+	// Print out summary of any FDCs
+	// #nosec G204
+	cmd := exec.Command("/opt/mqm/bin/ffstsummary")
+	cmd.Dir = "/var/mqm/errors"
+	// #nosec G104
+	outB, _ := cmd.CombinedOutput()
+	log.Debugf("ffstsummary:\n%s", string(outB))
 
-		log.Debug("---  End Diagnostics  ---")
-	}
+	log.Debug("---  End Diagnostics  ---")
 }

cmd/runmqserver/logging_test.go

@@ -1,55 +0,0 @@
-/*
-© Copyright IBM Corporation 2020
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-	"strings"
-	"testing"
-)
-
-var formatBasicTests = []struct {
-	in          []byte
-	outContains string
-}{
-	{
-		[]byte("{\"ibm_datetime\":\"2020/06/24 00:00:00\",\"message\":\"Hello world\"}"),
-		"Hello",
-	},
-	{
-		[]byte("{\"ibm_datetime\":\"2020/06/24 00:00:00\",\"message\":\"Hello world\", \"ibm_commentInsert1\":\"foo\"}"),
-		"CommentInsert1(foo)",
-	},
-	{
-		[]byte("{\"ibm_datetime\":\"2020/06/24 00:00:00\",\"message\":\"Hello world\", \"ibm_arithInsert1\":1}"),
-		"ArithInsert1(1)",
-	},
-}
-
-func TestFormatBasic(t *testing.T) {
-	for i, table := range formatBasicTests {
-		t.Run(fmt.Sprintf("%v", i), func(t *testing.T) {
-			var inObj map[string]interface{}
-			json.Unmarshal(table.in, &inObj)
-			t.Logf("Unmarshalled: %+v", inObj)
-			out := formatBasic(inObj)
-			if !strings.Contains(out, table.outContains) {
-				t.Errorf("formatBasic() with input=%v - expected output to contain %v, got %v", string(table.in), table.outContains, out)
-			}
-		})
-	}
-}

cmd/runmqserver/main.go

@@ -1,5 +1,5 @@
 /*
-© Copyright IBM Corporation 2017, 2021
+© Copyright IBM Corporation 2017, 2019
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -24,19 +24,18 @@ import (
 	"os"
 	"sync"
 
-	"github.com/ibm-messaging/mq-container/internal/ha"
+	"github.com/ibm-messaging/mq-container/internal/containerruntimelogger"
 	"github.com/ibm-messaging/mq-container/internal/metrics"
+	"github.com/ibm-messaging/mq-container/internal/name"
 	"github.com/ibm-messaging/mq-container/internal/ready"
 	"github.com/ibm-messaging/mq-container/internal/tls"
-	"github.com/ibm-messaging/mq-container/pkg/containerruntimelogger"
-	"github.com/ibm-messaging/mq-container/pkg/name"
+	"github.com/ibm-messaging/mq-container/internal/mqini"
 )
 
 func doMain() error {
 	var initFlag = flag.Bool("i", false, "initialize volume only, then exit")
 	var infoFlag = flag.Bool("info", false, "Display debug info, then exit")
-	var noLogRuntimeFlag = flag.Bool("nologruntime", false, "used when running this program from another program, to control log output")
-	var devFlag = flag.Bool("dev", false, "used when running this program from runmqdevserver to control how TLS is configured")
+	var devFlag = flag.Bool("dev", false, "used when running this program from runmqdevserver to control log output")
 	flag.Parse()
 
 	name, nameErr := name.GetQueueManagerName()
@@ -89,7 +88,7 @@ func doMain() error {
 	// Enable diagnostic collecting on failure
 	collectDiagOnFail = true
 
-	if *noLogRuntimeFlag == false {
+	if *devFlag == false {
 		err = containerruntimelogger.LogContainerDetails(log)
 		if err != nil {
 			logTermination(err)
@@ -113,29 +112,12 @@ func doMain() error {
 		return err
 	}
 
-	enableTraceCrtmqdir := os.Getenv("MQ_ENABLE_TRACE_CRTMQDIR")
-	if enableTraceCrtmqdir == "true" || enableTraceCrtmqdir == "1" {
-		err = startMQTrace()
-		if err != nil {
-			logTermination(err)
-			return err
-		}
-	}
-
 	err = createDirStructure()
 	if err != nil {
 		logTermination(err)
 		return err
 	}
 
-	if enableTraceCrtmqdir == "true" || enableTraceCrtmqdir == "1" {
-		err = endMQTrace()
-		if err != nil {
-			logTermination(err)
-			return err
-		}
-	}
-
 	// If init flag is set, exit now
 	if *initFlag {
 		return nil
@@ -144,55 +126,29 @@ func doMain() error {
 	// Print out versioning information
 	logVersionInfo()
 
-	keyLabel, defaultCmsKeystore, defaultP12Truststore, err := tls.ConfigureDefaultTLSKeystores()
+	keylabel, cmsDB, p12Trust, _, err := tls.ConfigureTLSKeystores(keyDir, trustDir, keyStoreDir)
 	if err != nil {
 		logTermination(err)
 		return err
 	}
 
-	err = tls.ConfigureTLS(keyLabel, defaultCmsKeystore, *devFlag, log)
+	err = configureTLS(keylabel, cmsDB, *devFlag)
 	if err != nil {
 		logTermination(err)
 		return err
 	}
 
-	err = postInit(name, keyLabel, defaultP12Truststore)
+	err = postInit(name, keylabel, p12Trust)
 	if err != nil {
 		logTermination(err)
 		return err
 	}
 
-	if os.Getenv("MQ_NATIVE_HA") == "true" {
-		err = ha.ConfigureNativeHA(log)
-		if err != nil {
-			logTermination(err)
-			return err
-		}
-	}
-
-	enableTraceCrtmqm := os.Getenv("MQ_ENABLE_TRACE_CRTMQM")
-	if enableTraceCrtmqm == "true" || enableTraceCrtmqm == "1" {
-		err = startMQTrace()
-		if err != nil {
-			logTermination(err)
-			return err
-		}
-	}
-
-	newQM, err := createQueueManager(name, *devFlag)
+	newQM, err := createQueueManager(name)
 	if err != nil {
 		logTermination(err)
 		return err
 	}
-
-	if enableTraceCrtmqm == "true" || enableTraceCrtmqm == "1" {
-		err = endMQTrace()
-		if err != nil {
-			logTermination(err)
-			return err
-		}
-	}
-
 	var wg sync.WaitGroup
 	defer func() {
 		log.Debug("Waiting for log mirroring to complete")
@@ -214,46 +170,16 @@ func doMain() error {
 		logTermination(err)
 		return err
 	}
-	if *devFlag {
-		_, err = mirrorHTPasswdLogs(ctx, &wg, name, newQM, mf)
-		if err != nil {
-			logTermination(err)
-			return err
-		}
-	}
-	// Recommended to use this option in conjunction with setting WLP_LOGGING_MESSAGE_FORMAT=JSON
-	mirrorWebLog := os.Getenv("MQ_ENABLE_EMBEDDED_WEB_SERVER_LOG")
-	if mirrorWebLog == "true" || mirrorWebLog == "1" {
-		_, err = mirrorWebServerLogs(ctx, &wg, name, newQM, mf)
-		if err != nil {
-			logTermination(err)
-			return err
-		}
-	}
-
 	err = updateCommandLevel()
 	if err != nil {
 		logTermination(err)
 		return err
 	}
 
-	enableTraceStrmqm := os.Getenv("MQ_ENABLE_TRACE_STRMQM")
-	if enableTraceStrmqm == "true" || enableTraceStrmqm == "1" {
-		err = startMQTrace()
-		if err != nil {
-			logTermination(err)
-			return err
-		}
-	}
-
-	// This is a developer image only change
-	// This workaround should be removed and handled via <crtmqm -ii>, when inimerge is ready to handle stanza ordering
-	if *devFlag {
-		err = updateQMini(name)
-		if err != nil {
-			logTermination(err)
-			return err
-		}
+	err = mqini.AddStanzas(name)
+	if err != nil {
+		logTermination(err)
+		return err
 	}
 
 	err = startQueueManager(name)
@@ -261,9 +187,8 @@ func doMain() error {
 		logTermination(err)
 		return err
 	}
-
-	if enableTraceStrmqm == "true" || enableTraceStrmqm == "1" {
-		err = endMQTrace()
+	if standby, _ := ready.IsRunningAsStandbyQM(name); !standby {
+		err = configureQueueManager()
 		if err != nil {
 			logTermination(err)
 			return err

cmd/runmqserver/main_test.go

@@ -1,5 +1,5 @@
 /*
-© Copyright IBM Corporation 2017, 2019
+© Copyright IBM Corporation 2017, 2018
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/ibm-messaging/mq-container/pkg/logger"
+	"github.com/ibm-messaging/mq-container/internal/logger"
 )
 
 var test *bool

cmd/runmqserver/mirror.go

@@ -95,7 +95,6 @@ func mirrorLog(ctx context.Context, wg *sync.WaitGroup, path string, fromStart b
 		// the file is open before the queue manager is created or started.
 		// Otherwise, there would be the potential for a nearly-full file to
 		// rotate before the goroutine had a chance to open it.
-		// #nosec G304 - no harm, we open readonly and check error.
 		f, err = os.OpenFile(path, os.O_RDONLY, 0)
 		if err != nil {
 			return nil, err
@@ -123,7 +122,6 @@ func mirrorLog(ctx context.Context, wg *sync.WaitGroup, path string, fromStart b
 				return
 			}
 			log.Debugf("File exists: %v, %v", path, fi.Size())
-			// #nosec G304 - no harm, we open readonly and check error.
 			f, err = os.OpenFile(path, os.O_RDONLY, 0)
 			if err != nil {
 				log.Error(err)
@@ -171,7 +169,6 @@ func mirrorLog(ctx context.Context, wg *sync.WaitGroup, path string, fromStart b
 				}
 				// Re-open file
 				log.Debugf("Re-opening error log file %v", path)
-				// #nosec G304 - no harm, we open readonly and check error.
 				f, err = os.OpenFile(path, os.O_RDONLY, 0)
 				if err != nil {
 					log.Error(err)

cmd/runmqserver/post_init.go

@@ -22,23 +22,18 @@ import (
 )
 
 // postInit is run after /var/mqm is set up
-func postInit(name, keyLabel string, p12Truststore tls.KeyStoreData) error {
+func postInit(name, keylabel string, p12Trust tls.KeyStoreData) error {
 	enableWebServer := os.Getenv("MQ_ENABLE_EMBEDDED_WEB_SERVER")
 	if enableWebServer == "true" || enableWebServer == "1" {
 		// Configure the web server (if enabled)
-		webKeystore, err := configureWebServer(keyLabel, p12Truststore)
+		keystore, err := configureWebServer(keylabel, p12Trust)
 		if err != nil {
 			return err
 		}
-		// If trust-store is empty, set reference to point to the keystore
-		webTruststoreRef := "MQWebTrustStore"
-		if len(p12Truststore.TrustedCerts) == 0 {
-			webTruststoreRef = "MQWebKeyStore"
-		}
 		// Start the web server, in the background (if installed)
 		// WARNING: No error handling or health checking available for the web server
 		go func() {
-			err = startWebServer(webKeystore, p12Truststore.Password, webTruststoreRef)
+			err = startWebServer(keystore, p12Trust.Password)
 			if err != nil {
 				log.Printf("Error starting web server: %v", err)
 			}

cmd/runmqserver/qmgr.go

@@ -1,5 +1,5 @@
 /*
-© Copyright IBM Corporation 2017, 2020
+© Copyright IBM Corporation 2017, 2019
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,42 +16,34 @@ limitations under the License.
 package main
 
 import (
+	"bytes"
 	"fmt"
 	"io/ioutil"
 	"os"
+	"os/exec"
 	"path/filepath"
-	"regexp"
-	"strconv"
 	"strings"
 
 	"github.com/ibm-messaging/mq-container/internal/command"
 	containerruntime "github.com/ibm-messaging/mq-container/internal/containerruntime"
 	"github.com/ibm-messaging/mq-container/internal/mqscredact"
-	"github.com/ibm-messaging/mq-container/internal/mqversion"
 	"github.com/ibm-messaging/mq-container/internal/ready"
 )
 
 // createDirStructure creates the default MQ directory structure under /var/mqm
 func createDirStructure() error {
-	// log file diagnostics before and after crtmqdir if DEBUG=true
-	logDiagnostics()
-	out, rc, err := command.Run("/opt/mqm/bin/crtmqdir", "-f", "-a")
+	out, _, err := command.Run("/opt/mqm/bin/crtmqdir", "-f", "-a")
 	if err != nil {
-		if rc == 10 {
-			log.Printf("Warning creating directory structure: %v\n", string(out))
-		} else {
-			log.Printf("Error creating directory structure: %v\n", string(out))
-			return err
-		}
+		log.Printf("Error creating directory structure: %v\n", string(out))
+		return err
 	}
 	log.Println("Created directory structure under /var/mqm")
-	logDiagnostics()
 	return nil
 }
 
 // createQueueManager creates a queue manager, if it doesn't already exist.
 // It returns true if one was created (or a standby was created), or false if one already existed
-func createQueueManager(name string, devMode bool) (bool, error) {
+func createQueueManager(name string) (bool, error) {
 	log.Printf("Creating queue manager %v", name)
 
 	// Run 'dspmqinf' to check if 'mqs.ini' configuration file exists
@@ -74,7 +66,7 @@ func createQueueManager(name string, devMode bool) (bool, error) {
 	_, err = os.Stat(filepath.Join(dataDir, "qm.ini"))
 	if err != nil {
 		// If 'qm.ini' is not found - run 'crtmqm' to create a new queue manager
-		args := getCreateQueueManagerArgs(mounts, name, devMode)
+		args := getCreateQueueManagerArgs(mounts, name)
 		out, rc, err := command.Run("crtmqm", args...)
 		if err != nil {
 			log.Printf("Error %v creating queue manager: %v", rc, string(out))
@@ -113,13 +105,9 @@ func startQueueManager(name string) error {
 	out, rc, err := command.Run("strmqm", "-x", name)
 	if err != nil {
 		// 30=standby queue manager started, which is fine
-		// 94=native HA replica started, which is fine
 		if rc == 30 {
 			log.Printf("Started standby queue manager")
 			return nil
-		} else if rc == 94 {
-			log.Printf("Started replica queue manager")
-			return nil
 		}
 		log.Printf("Error %v starting queue manager: %v", rc, string(out))
 		return err
@@ -128,20 +116,74 @@ func startQueueManager(name string) error {
 	return nil
 }
 
-func stopQueueManager(name string) error {
-	log.Println("Stopping queue manager")
-	qmGracePeriod := os.Getenv("MQ_GRACE_PERIOD")
-	isStandby, err := ready.IsRunningAsStandbyQM(name)
+func configureQueueManager() error {
+	const configDir string = "/etc/mqm"
+	files, err := ioutil.ReadDir(configDir)
 	if err != nil {
-		log.Printf("Error getting status for queue manager %v: %v", name, err.Error())
+		log.Println(err)
 		return err
 	}
-	args := []string{"-w", "-r", "-tp", qmGracePeriod, name}
+	for _, file := range files {
+		if strings.HasSuffix(file.Name(), ".mqsc") {
+			abs := filepath.Join(configDir, file.Name())
+			// #nosec G204
+			verify := exec.Command("runmqsc", "-v", "-e")
+			// #nosec G204 - command is fixed, no injection vector
+			cmd := exec.Command("runmqsc")
+			// Read mqsc file into variable
+			// #nosec G304 - filename variable is derived from contents of 'configDir' which is a defined constant
+			mqsc, err := ioutil.ReadFile(abs)
+			if err != nil {
+				log.Printf("Error reading file %v: %v", abs, err)
+				continue
+			}
+			// Write mqsc to buffer
+			var buffer bytes.Buffer
+			_, err = buffer.Write(mqsc)
+			if err != nil {
+				log.Printf("Error writing MQSC file %v to buffer: %v", abs, err)
+				continue
+			}
+			verifyBuffer := buffer
+
+			// Buffer mqsc to stdin of runmqsc
+			cmd.Stdin = &buffer
+			verify.Stdin = &verifyBuffer
+
+			// Verify the MQSC commands
+			out, err := verify.CombinedOutput()
+			if err != nil {
+				log.Errorf("Error verifying MQSC file %v (%v):\n\t%v", file.Name(), err, formatMQSCOutput(string(out)))
+				return fmt.Errorf("Error verifying MQSC file %v (%v):\n\t%v", file.Name(), err, formatMQSCOutput(string(out)))
+			}
+
+			// Run runmqsc command
+			out, err = cmd.CombinedOutput()
+			if err != nil {
+				log.Errorf("Error running MQSC file %v (%v):\n\t%v", file.Name(), err, formatMQSCOutput(string(out)))
+				continue
+			} else {
+				// Print the runmqsc output, adding tab characters to make it more readable as part of the log
+				log.Printf("Output for \"runmqsc\" with %v:\n\t%v", abs, formatMQSCOutput(string(out)))
+			}
+		}
+	}
+	return nil
+}
+
+func stopQueueManager(name string) error {
+	log.Println("Stopping queue manager")
+	isStandby, err := ready.IsRunningAsStandbyQM(name)
+	if err != nil {
+		log.Printf("Error getting status for queue manager %v: ", name, err.Error())
+		return err
+	}
+	args := []string{"-w", "-r", name}
 	if os.Getenv("MQ_MULTI_INSTANCE") == "true" {
 		if isStandby {
 			args = []string{"-x", name}
 		} else {
-			args = []string{"-s", "-w", "-r", "-tp", qmGracePeriod, name}
+			args = []string{"-s", "-w", "-r", name}
 		}
 	}
 	out, rc, err := command.Run("endmqm", args...)
@@ -157,28 +199,6 @@ func stopQueueManager(name string) error {
 	return nil
 }
 
-func startMQTrace() error {
-	log.Println("Starting MQ trace")
-	out, rc, err := command.Run("strmqtrc")
-	if err != nil {
-		log.Printf("Error %v starting trace: %v", rc, string(out))
-		return err
-	}
-	log.Println("Started MQ trace")
-	return nil
-}
-
-func endMQTrace() error {
-	log.Println("Ending MQ Trace")
-	out, rc, err := command.Run("endmqtrc")
-	if err != nil {
-		log.Printf("Error %v ending trace: %v", rc, string(out))
-		return err
-	}
-	log.Println("Ended MQ trace")
-	return nil
-}
-
 func formatMQSCOutput(out string) string {
 	// redact sensitive information
 	out, _ = mqscredact.Redact(out)
@@ -207,30 +227,8 @@ func getQueueManagerDataDir(mounts map[string]string, name string) string {
 	return dataDir
 }
 
-func getCreateQueueManagerArgs(mounts map[string]string, name string, devMode bool) []string {
-
-	mqversionBase := "9.2.1.0"
-
-	// use "UserExternal" only if we are 9.2.1.0 or above.
-	oaVal := "user"
-	mqVersionCheck, err := mqversion.Compare(mqversionBase)
-
-	if err != nil {
-		log.Printf("Error comparing MQ versions for oa,rc: %v", mqVersionCheck)
-	}
-	if mqVersionCheck >= 0 {
-		oaVal = "UserExternal"
-	}
-
-	//build args
-	args := []string{"-ii", "/etc/mqm/", "-ic", "/etc/mqm/", "-q", "-p", "1414"}
-
-	if os.Getenv("MQ_NATIVE_HA") == "true" {
-		args = append(args, "-lr", os.Getenv("HOSTNAME"))
-	}
-	if devMode {
-		args = append(args, "-oa", oaVal)
-	}
+func getCreateQueueManagerArgs(mounts map[string]string, name string) []string {
+	args := []string{"-q", "-p", "1414"}
 	if _, ok := mounts["/mnt/mqm-log"]; ok {
 		args = append(args, "-ld", "/mnt/mqm-log/log")
 	}
@@ -249,49 +247,3 @@ func getCreateStandbyQueueManagerArgs(name string) []string {
 	args = append(args, "-v", fmt.Sprintf("DataPath=/mnt/mqm-data/qmgrs/%v", name))
 	return args
 }
-
-// updateQMini removes the original ServicecCmponent stanza so we can add a new one
-func updateQMini(qmname string) error {
-
-	val, set := os.LookupEnv("MQ_CONNAUTH_USE_HTP")
-	if !set {
-		//htpasswd mode not enabled.
-		return nil
-	}
-	bval, err := strconv.ParseBool(strings.ToLower(val))
-	if err != nil {
-		return err
-	}
-	if bval == false {
-		//htpasswd mode not enabled.
-		return nil
-	}
-
-	log.Printf("Removing existing ServiceComponent configuration")
-
-	mounts, err := containerruntime.GetMounts()
-	if err != nil {
-		log.Printf("Error getting mounts for queue manager")
-		return err
-	}
-	dataDir := getQueueManagerDataDir(mounts, qmname)
-	qmgrDir := filepath.Join(dataDir, "qm.ini")
-	//read the initial version.
-	// #nosec G304 - qmgrDir filepath is derived from dspmqinf
-	iniFileBytes, err := ioutil.ReadFile(qmgrDir)
-	if err != nil {
-		return err
-	}
-	qminiConfigStr := string(iniFileBytes)
-	if strings.Contains(qminiConfigStr, "ServiceComponent:") {
-		var re = regexp.MustCompile(`(?m)^.*ServiceComponent.*$\s^.*Service.*$\s^.*Name.*$\s^.*Module.*$\s^.*ComponentDataSize.*$`)
-		curFile := re.ReplaceAllString(qminiConfigStr, "")
-		// #nosec G304 G306 - qmgrDir filepath is derived from dspmqinf and
-		// its a read by owner/s group, and pose no harm.
-		err := ioutil.WriteFile(qmgrDir, []byte(curFile), 0660)
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}

cmd/runmqserver/signals.go

@@ -1,5 +1,5 @@
 /*
-© Copyright IBM Corporation 2017, 2022
+© Copyright IBM Corporation 2017, 2018
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -33,8 +33,8 @@ func signalHandler(qmgr string) chan int {
 	control := make(chan int)
 	// Use separate channels for the signals, to avoid SIGCHLD signals swamping
 	// the buffer, and preventing other signals.
-	stopSignals := make(chan os.Signal, 1)
-	reapSignals := make(chan os.Signal, 1)
+	stopSignals := make(chan os.Signal)
+	reapSignals := make(chan os.Signal)
 	signal.Notify(stopSignals, syscall.SIGTERM, syscall.SIGINT)
 	go func() {
 		for {

cmd/runmqserver/tls.go

@@ -0,0 +1,163 @@
+/*
+© Copyright IBM Corporation 2018, 2019
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+package main
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"github.com/ibm-messaging/mq-container/internal/command"
+	"github.com/ibm-messaging/mq-container/internal/keystore"
+	"github.com/ibm-messaging/mq-container/internal/mqtemplate"
+	"github.com/ibm-messaging/mq-container/internal/tls"
+)
+
+// Location to store the keystores
+const keyStoreDir = "/run/runmqserver/tls/"
+
+// KeyDir is the location of the certificate keys to import
+const keyDir = "/etc/mqm/pki/keys"
+
+// TrustDir is the location of the Certifates to add
+const trustDir = "/etc/mqm/pki/trust"
+
+// configureWebTLS configures TLS for Web Console
+func configureWebTLS(label string) error {
+	// Return immediately if we have no certificate to use as identity
+	if label == "" && os.Getenv("MQ_GENERATE_CERTIFICATE_HOSTNAME") == "" {
+		return nil
+	}
+
+	webConfigDir := "/etc/mqm/web/installations/Installation1/servers/mqweb"
+	tls := "tls.xml"
+
+	tlsConfig := filepath.Join(webConfigDir, tls)
+	newTLSConfig := filepath.Join(webConfigDir, tls+".tpl")
+	err := os.Remove(tlsConfig)
+	if err != nil {
+		return fmt.Errorf("Could not delete file %s: %v", tlsConfig, err)
+	}
+	// we symlink here to prevent issues on restart
+	err = os.Symlink(newTLSConfig, tlsConfig)
+	if err != nil {
+		return fmt.Errorf("Could not create symlink %s->%s: %v", newTLSConfig, tlsConfig, err)
+	}
+	mqmUID, mqmGID, err := command.LookupMQM()
+	if err != nil {
+		return fmt.Errorf("Could not find mqm user or group: %v", err)
+	}
+	err = os.Chown(tlsConfig, mqmUID, mqmGID)
+	if err != nil {
+		return fmt.Errorf("Could change ownership of %s to mqm: %v", tlsConfig, err)
+	}
+
+	return nil
+}
+
+// configureTLSDev configures TLS for developer defaults
+func configureTLSDev() error {
+	const mqsc string = "/etc/mqm/20-dev-tls.mqsc"
+	const mqscTemplate string = mqsc + ".tpl"
+
+	if os.Getenv("MQ_DEV") == "true" {
+		err := mqtemplate.ProcessTemplateFile(mqscTemplate, mqsc, map[string]string{}, log)
+		if err != nil {
+			return err
+		}
+	} else {
+		_, err := os.Stat(mqsc)
+		if !os.IsNotExist(err) {
+			err = os.Remove(mqsc)
+			if err != nil {
+				log.Errorf("Error removing file %s: %v", mqsc, err)
+				return err
+			}
+		}
+	}
+
+	return nil
+}
+
+// configureTLS configures TLS for queue manager
+func configureTLS(certLabel string, cmsKeystore tls.KeyStoreData, devmode bool) error {
+	log.Debug("Configuring TLS")
+
+	const mqsc string = "/etc/mqm/15-tls.mqsc"
+	const mqscTemplate string = mqsc + ".tpl"
+
+	err := mqtemplate.ProcessTemplateFile(mqscTemplate, mqsc, map[string]string{
+		"SSLKeyR":          strings.TrimSuffix(cmsKeystore.Keystore.Filename, ".kdb"),
+		"CertificateLabel": certLabel,
+	}, log)
+	if err != nil {
+		return err
+	}
+
+	if devmode && certLabel != "" {
+		err = configureTLSDev()
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+// configureSSOTLS configures MQ Console TLS for Single Sign-On
+func configureSSOTLS(p12TrustStore tls.KeyStoreData) (string, error) {
+	// TODO find way to supply this
+	// Override the webstore variables to hard coded defaults
+	webKeyStoreName := tls.IntegrationDefaultLabel + ".p12"
+
+	// Check keystore exists
+	ks := filepath.Join(keyStoreDir, webKeyStoreName)
+	_, err := os.Stat(ks)
+	// Now we know if the file exists let's check whether we should have it or not.
+	// Check if we're being told to generate the certificate
+	genHostName := os.Getenv("MQ_GENERATE_CERTIFICATE_HOSTNAME")
+	if genHostName != "" {
+		// We've got to generate the certificate with the hostname given
+		if err == nil {
+			log.Printf("Replacing existing keystore %s - generating new certificate", ks)
+		}
+		// Keystore doesn't exist so create it and populate a certificate
+		newKS := keystore.NewPKCS12KeyStore(ks, p12TrustStore.Password)
+		err = newKS.Create()
+		if err != nil {
+			return "", fmt.Errorf("Failed to create keystore %s: %v", ks, err)
+		}
+
+		err = newKS.CreateSelfSignedCertificate("default", fmt.Sprintf("CN=%s", genHostName), genHostName)
+		if err != nil {
+			return "", fmt.Errorf("Failed to generate certificate in keystore %s with DN of 'CN=%s': %v", ks, genHostName, err)
+		}
+	} else {
+		// Keystore should already exist
+		if err != nil {
+			return "", fmt.Errorf("Failed to find existing keystore %s: %v", ks, err)
+		}
+	}
+
+	// Check truststore exists
+	_, err = os.Stat(p12TrustStore.Keystore.Filename)
+	if err != nil {
+		return "", fmt.Errorf("Failed to find existing truststore %s: %v", p12TrustStore.Keystore.Filename, err)
+	}
+
+	return webKeyStoreName, nil
+}

cmd/runmqserver/version.go

@@ -20,7 +20,6 @@ import (
 	"strings"
 
 	"github.com/ibm-messaging/mq-container/internal/command"
-	"github.com/ibm-messaging/mq-container/internal/mqversion"
 )
 
 var (
@@ -51,7 +50,7 @@ func logImageTag() {
 }
 
 func logMQVersion() {
-	mqVersion, err := mqversion.Get()
+	mqVersion, _, err := command.Run("dspmqver", "-b", "-f", "2")
 	if err != nil {
 		log.Printf("Error Getting MQ version: %v", strings.TrimSuffix(string(mqVersion), "\n"))
 	}

cmd/runmqserver/webserver.go

@@ -1,5 +1,5 @@
 /*
-© Copyright IBM Corporation 2018, 2020
+© Copyright IBM Corporation 2018, 2019
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -19,15 +19,19 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
+	"os/user"
 	"path/filepath"
+	"strconv"
 	"strings"
+	"syscall"
 
+	"github.com/ibm-messaging/mq-container/internal/command"
 	"github.com/ibm-messaging/mq-container/internal/copy"
 	"github.com/ibm-messaging/mq-container/internal/mqtemplate"
 	"github.com/ibm-messaging/mq-container/internal/tls"
 )
 
-func startWebServer(webKeystore, webkeystorePW, webTruststoreRef string) error {
+func startWebServer(keystore, keystorepw string) error {
 	_, err := os.Stat("/opt/mqm/bin/strmqweb")
 	if err != nil && os.IsNotExist(err) {
 		log.Debug("Skipping web server, because it's not installed")
@@ -46,13 +50,29 @@ func startWebServer(webKeystore, webkeystorePW, webTruststoreRef string) error {
 	}
 
 	// TLS enabled
-	if webKeystore != "" {
-		cmd.Env = append(cmd.Env, "AMQ_WEBKEYSTORE="+webKeystore)
-		cmd.Env = append(cmd.Env, "AMQ_WEBKEYSTOREPW="+webkeystorePW)
-		cmd.Env = append(cmd.Env, "AMQ_WEBTRUSTSTOREREF="+webTruststoreRef)
+	if keystore != "" {
+		cmd.Env = append(cmd.Env, "AMQ_WEBKEYSTORE="+keystore)
+		cmd.Env = append(cmd.Env, "AMQ_WEBKEYSTOREPW="+keystorepw)
 	}
-	out, err := cmd.CombinedOutput()
-	rc := cmd.ProcessState.ExitCode()
+
+	uid, gid, err := command.LookupMQM()
+	if err != nil {
+		return err
+	}
+	u, err := user.Current()
+	if err != nil {
+		return err
+	}
+	currentUID, err := strconv.Atoi(u.Uid)
+	if err != nil {
+		return fmt.Errorf("Error converting UID to string: %v", err)
+	}
+	// Add credentials to run as 'mqm', only if we aren't already 'mqm'
+	if currentUID != uid {
+		cmd.SysProcAttr = &syscall.SysProcAttr{}
+		cmd.SysProcAttr.Credential = &syscall.Credential{Uid: uint32(uid), Gid: uint32(gid)}
+	}
+	out, rc, err := command.RunCmd(cmd)
 	if err != nil {
 		log.Printf("Error %v starting web server: %v", rc, string(out))
 		return err
@@ -61,32 +81,17 @@ func startWebServer(webKeystore, webkeystorePW, webTruststoreRef string) error {
 	return nil
 }
 
-func configureSSO(p12TrustStore tls.KeyStoreData, webKeystore string) (string, error) {
-	requiredEnvVars := []string{}
-	_, set := os.LookupEnv("MQ_ZEN_INTERNAL_ENDPOINT")
-	if !set {
-		// Ensure all required environment variables are set for SSO
-		requiredEnvVars = []string{
-			"MQ_OIDC_CLIENT_ID",
-			"MQ_OIDC_CLIENT_SECRET",
-			"MQ_OIDC_UNIQUE_USER_IDENTIFIER",
-			"MQ_OIDC_AUTHORIZATION_ENDPOINT",
-			"MQ_OIDC_TOKEN_ENDPOINT",
-			"MQ_OIDC_JWK_ENDPOINT",
-			"MQ_OIDC_ISSUER_IDENTIFIER",
-		}
-	} else {
-		// Ensure all required environment variables are set for Zen SSO
-		requiredEnvVars = []string{
-			"MQ_ZEN_UNIQUE_USER_IDENTIFIER",
-			"MQ_ZEN_INTERNAL_ENDPOINT",
-			"MQ_ZEN_ISSUER_IDENTIFIER",
-			"MQ_ZEN_AUDIENCES",
-			"MQ_ZEN_CONTEXT_NAME",
-			"MQ_ZEN_BASE_URI",
-			"MQ_ZEN_CONTEXT_NAMESPACE",
-			"IAM_URL",
-		}
+func configureSSO(p12TrustStore tls.KeyStoreData) (string, error) {
+	// Ensure all required environment variables are set for SSO
+	requiredEnvVars := []string{
+		"MQ_WEB_ADMIN_USERS",
+		"MQ_OIDC_CLIENT_ID",
+		"MQ_OIDC_CLIENT_SECRET",
+		"MQ_OIDC_UNIQUE_USER_IDENTIFIER",
+		"MQ_OIDC_AUTHORIZATION_ENDPOINT",
+		"MQ_OIDC_TOKEN_ENDPOINT",
+		"MQ_OIDC_JWK_ENDPOINT",
+		"MQ_OIDC_ISSUER_IDENTIFIER",
 	}
 	for _, envVar := range requiredEnvVars {
 		if len(os.Getenv(envVar)) == 0 {
@@ -112,49 +117,46 @@ func configureSSO(p12TrustStore tls.KeyStoreData, webKeystore string) (string, e
 	}
 
 	// Configure SSO TLS
-	return tls.ConfigureWebKeystore(p12TrustStore, webKeystore)
+	return configureSSOTLS(p12TrustStore)
 }
 
-func configureWebServer(keyLabel string, p12Truststore tls.KeyStoreData) (string, error) {
-	var webKeystore string
-
+func configureWebServer(keyLabel string, p12Trust tls.KeyStoreData) (string, error) {
+	var keystore string
 	// Configure TLS for Web Console first if we have a certificate to use
-	err := tls.ConfigureWebTLS(keyLabel)
+	err := configureWebTLS(keyLabel)
 	if err != nil {
-		return "", err
+		return keystore, err
 	}
 	if keyLabel != "" {
-		webKeystore = keyLabel + ".p12"
+		keystore = keyLabel + ".p12"
 	}
 
 	// Configure Single-Sign-On for the web server (if enabled)
 	enableSSO := os.Getenv("MQ_BETA_ENABLE_SSO")
 	if enableSSO == "true" || enableSSO == "1" {
-		webKeystore, err = configureSSO(p12Truststore, webKeystore)
+		keystore, err = configureSSO(p12Trust)
 		if err != nil {
-			return "", err
-		}
-	} else if keyLabel == "" && os.Getenv("MQ_GENERATE_CERTIFICATE_HOSTNAME") != "" {
-		webKeystore, err = tls.ConfigureWebKeystore(p12Truststore, webKeystore)
-		if err != nil {
-			return "", err
+			return keystore, err
 		}
 	}
-
 	_, err = os.Stat("/opt/mqm/bin/strmqweb")
 	if err != nil {
 		if os.IsNotExist(err) {
-			return "", nil
+			return keystore, nil
 		}
-		return "", err
+		return keystore, err
 	}
 	const webConfigDir string = "/etc/mqm/web"
 	_, err = os.Stat(webConfigDir)
 	if err != nil {
 		if os.IsNotExist(err) {
-			return "", nil
+			return keystore, nil
 		}
-		return "", err
+		return keystore, err
+	}
+	uid, gid, err := command.LookupMQM()
+	if err != nil {
+		return keystore, err
 	}
 	const prefix string = "/etc/mqm/web"
 	err = filepath.Walk(prefix, func(from string, info os.FileInfo, err error) error {
@@ -192,8 +194,11 @@ func configureWebServer(keyLabel string, p12Truststore tls.KeyStoreData) (string
 				return err
 			}
 		}
+		err = os.Chown(to, uid, gid)
+		if err != nil {
+			return err
+		}
 		return nil
 	})
-
-	return webKeystore, err
+	return keystore, err
 }

config.env

@@ -1,6 +0,0 @@
-###########################################################################################################################################################
-
-# MQ_VERSION is the fully qualified MQ version number to build
-MQ_VERSION ?= 9.3.0.5
-
-###########################################################################################################################################################

docs/building.md

@@ -4,25 +4,20 @@
 
 You need to have the following tools installed:
 
-* [Docker](https://www.docker.com/) 17.06.1 or later, or [Podman](https://podman.io) 1.0 or later (Podman 4.1 on macOS).  If using Podman on macOS, the you need to be in "rootful" mode to allow the use of a network during builds.  Run `podman machine init --rootful`.
+* [Docker](https://www.docker.com/) V17.06.1 or later, or [Podman](https://podman.io) V1.0 or later
 * [GNU make](https://www.gnu.org/software/make/)
 
 If you are working in the Windows Subsystem for Linux, follow [this guide by Microsoft to set up Docker](https://blogs.msdn.microsoft.com/commandline/2017/12/08/cross-post-wsl-interoperability-with-docker/) first.
 
 ## Building a production image
 
-From MQ 9.2.X, the MQ container adds support for MQ Long Term Support (LTS) **production licensed** releases.
-
-### Building MQ 9.3 Long Term Support (LTS) and Continuous Delivery (CD)
-
-**Note**: MQ 9.3 is the latest MQ version with MQ Long Term Support (LTS), as well as being the latest Continuous Delivery (CD) version.
-
-The procedure below is for building the 9.3 release, on `amd64`, `ppc64le` and `s390x` architectures.
+This procedure works for building the MQ Continuous Delivery release, on `amd64`, `ppc64le` and `s390x` architectures.
 
 1. Create a `downloads` directory in the root of this repository
-2. Download MQ from [IBM Passport Advantage](https://www.ibm.com/software/passportadvantage/). Identify the correct 'Long Term Support Release for Containers' eImage part number for your architecture from the 9.3.0 LTS tab at https://www.ibm.com/support/pages/downloading-ibm-mq-930
-3. Ensure the `tar.gz` file is in the `downloads` directory
-4. Run `make build-advancedserver`
+2. Download MQ from [IBM Passport Advantage](https://www.ibm.com/software/passportadvantage/) or [IBM Fix Central](https://www.ibm.com/support/fixcentral), and place the downloaded file (for example, `IBM_MQ_9.1.3_LINUX_X86-64.tar.gz`) in the `downloads` directory
+3. Run `make build-advancedserver`
+
+> **Warning**: Note that MQ offers two different sets of packaging on Linux: one is called "MQ for Linux" and contains RPM files for installing on Red Hat Enterprise Linux and SUSE Linux Enterprise Server; the other is for Ubuntu.  The MQ container build uses a Red Hat Universal Base Image, so you need the "MQ for Linux" RPM files.
 
 If you have an MQ archive file with a different file name, you can specify a particular file (which must be in the `downloads` directory).  You should also specify the MQ version, so that the resulting image is tagged correctly, for example:
 
@@ -30,19 +25,11 @@ If you have an MQ archive file with a different file name, you can specify a par
 MQ_ARCHIVE=mq-1.2.3.4.tar.gz MQ_VERSION=1.2.3.4 make build-advancedserver
 ```
 
-### Building previous MQ Long Term Support (LTS)
-
-**Note**: MQ 9.3 is the latest MQ version with MQ Long Term Support (LTS), as well as being the latest Continuous Delivery (CD) version. Therefore, to build build 9.3.0.X, follow the [instructions above for MQ 9.3](#building-mq-93-long-term-support-lts-and-continuous-delivery-cd).
-
-However, if you wish to build the previous MQ LTS, use the [instructions](/../9.2.0.x/docs/building.md#mq-long-term-support-lts) in the `v9.2.0.x-eus` branch.
-
-
 ## Building a developer image
-
 Run `make build-devserver`, which will download the latest version of MQ Advanced for Developers from IBM developerWorks.  This is currently only available on the `amd64` architecture.
 
 You can use the environment variable `MQ_ARCHIVE_DEV` to specify an alternative local file to install from (which must be in the `downloads` directory).
 
 ## Installed components
 
-This image includes the core MQ server, Java, language packs, GSKit, and web server.  This is configured in the `Generate MQ package in INSTALLATION_DIR` section [here](../install-mq.sh), with the configured options being picked up at build time.
+This image includes the core MQ server, Java, language packs, GSKit, and web server.  This can be configured by setting the `MQ_PACKAGES` argument to `make`.

docs/developer-config.md

@@ -9,12 +9,14 @@ The MQ Developer Defaults supports some customization options, these are all con
 * **MQ_DEV** - Set this to `false` to stop the default objects being created.
 * **MQ_ADMIN_PASSWORD** - Changes the password of the `admin` user. Must be at least 8 characters long.
 * **MQ_APP_PASSWORD** - Changes the password of the app user. If set, this will cause the `DEV.APP.SVRCONN` channel to become secured and only allow connections that supply a valid userid and password. Must be at least 8 characters long.
+* **MQ_TLS_KEYSTORE** - **DEPRECATED**. See section `Supplying TLS certificates` in [usage document](usage.md).  Allows you to supply the location of a PKCS#12 keystore containing a single certificate which you want to use in both the web console and the queue manager. Requires `MQ_TLS_PASSPHRASE`. When enabled the channels created will be secured using the `TLS_RSA_WITH_AES_128_CBC_SHA256` CipherSpec. *Note*: you will need to make the keystore available inside your container, this can be done by mounting a volume to your container.
+* **MQ_TLS_PASSPHRASE** - **DEPRECATED**. See section `Supplying TLS certificates` in [usage document](usage.md). Passphrase for the keystore referenced in `MQ_TLS_KEYSTORE`.
 
 ## Details of the default configuration
 
 The following users are created:
 
-* User **admin** for administration.  Default password is **passw0rd**.
+* User **admin** for administration (in the `mqm` group).  Default password is **passw0rd**.
 * User **app** for messaging (in a group called `mqclient`).  No password by default.
 
 Users in `mqclient` group have been given access connect to all queues and topics starting with `DEV.**` and have `put`, `get`, `pub`, `sub`, `browse` and `inq` permissions.
@@ -32,6 +34,11 @@ Two channels are created, one for administration, the other for normal messaging
 * DEV.ADMIN.SVRCONN - configured to only allow the `admin` user to connect into it.  A user and password must be supplied.
 * DEV.APP.SVRCONN - does not allow administrative users to connect.  Password is optional unless you choose a password for app users.
 
+A new listener is created (the SYSTEM listener is fine, but system objects are not shown by default in the web console):
+
+* DEV.LISTENER.TCP - listens on port 1414.
+
+
 ## Web Console
 
 By default the MQ Advanced for Developers image will start the IBM MQ Web Console that allows you to administer your Queue Manager running on your container. When the web console has been started, you can access it by opening a web browser and navigating to https://<Container IP>:9443/ibmmq/console. Where <Container IP> is replaced by the IP address of your running container.
@@ -43,6 +50,6 @@ If you choose to accept the security warning, you will be presented with the log
 * **User:** admin
 * **Password:** passw0rd
 
-If you wish to change the password for the admin user, this can be done using the `MQ_ADMIN_PASSWORD` environment variable.
+If you wish to change the password for the admin user, this can be done using the `MQ_ADMIN_PASSWORD` environment variable. If you supply a PKCS#12 keystore using the `MQ_TLS_KEYSTORE` environment variable, then the web console will be configured to use the certificate inside the keystore for HTTPS operations.
 
 If you do not wish the web console to run, you can disable it by setting the environment variable `MQ_ENABLE_EMBEDDED_WEB_SERVER` to `false`.

docs/internals.md

@@ -11,7 +11,6 @@ The resulting Docker image contains the following:
    - `runmqdevserver` - The main process for MQ Advanced for Developers
    - `chkmqhealthy` - Checks the health of the queue manager.  This can be used by (say) a Kubernetes liveness probe.
    - `chkmqready` - Checks if the queue manager is ready for work.  This can be used by (say) a Kubernetes readiness probe.
-   - `chkmqstarted` - Checks if the queue manager has successfully started.  This can be used by (say) a Kubernetes startup probe.
 
 ## runmqserver
 The `runmqserver` command has the following responsibilities:

docs/pluggable-connauth.md

@@ -1,29 +0,0 @@
-
-### Queue Manager Connection Authentication using a htpasswd file
-
-This pluggable authentication mode is to allow developers using the mq-container developer image to define users and their credentials into a .htpasswd file.  This is in addition to the existing methods of MQ Connection Authentication (`CONNAUTH`) using Operating System or LDAP users.
-
-**Please note:**
-1. This new feature is enabled only when environment variable `--env MQ_CONNAUTH_USE_HTP=true` is set while creating a container.
-2. When enabled, the `AuthType` value of the ConnectionAuthentication (`CONNAUTH`) is ignored and htpasswd mode is used. However, the MQ authority records created using (`SETMQAUT` or `AUTHREC`) will be in effect while using the htpasswd mode.
-3. Channel Authentication records (`CHLAUTH`) will be in effect while using the htpasswd mode.
-4. Passwords should be encrypted using bcrypt (golang.org/x/crypto/bcrypt).
-5. This is developer only feature and not recommended for use in Production.
-
-### Preparing htpasswd file
-
- 1. A default `mq.htpasswd` file is provided and placed under /etc/mqm/ directory inside the container.
- 2. You can set the password for user `admin` by setting the environment variable `MQ_ADMIN_PASSWORD`.
- 3. You can add user `app` into mq.htpasswd file by setting the environment variable `MQ_APP_PASSWORD`. This user `app` can be used to access `DEV.*` objects of the queue manager.
-
-#### Next Steps:
-
-Use an administrative tool or your application to connect to queue manager using the credentials defined in the mq.htpasswd file.  
-
-**Please note**: When an authentication request is made with a userid that is not defined in the `mq.htpasswd` file, then the authentication process is delegated to queue manager to handle. This will then use `IDPWOS` or `LDAP` modes for further processing.
-
-#### Troubleshooting
-
-A log file named `mqhtpass.log` is generated under `/var/mqm/errors` directory path of the container.  This file will contain all the failed connection authentication requests.  Additional information is logged to this file if the environment variable `DEBUG` is set to `true`.
-
-**Please note**: This log file will be wiped when the queue manager is next started.

docs/security.md

@@ -4,7 +4,7 @@
 
 ### User
 
-The MQ server image is run using with UID 1001, though this can be any UID, with a fixed GID of 0 (root).
+The MQ server image is run using the "mqm" user, with a fixed UID and GID of 888.
 
 ### Capabilities
 
@@ -16,5 +16,24 @@ docker run \
   --env LICENSE=accept \
   --env MQ_QMGR_NAME=QM1 \
   --detach \
-  ibm-mqadvanced-server:9.3.0.5-amd64
+  mqadvanced-server:9.1.3.0-amd64
 ```
+
+The MQ Advanced for Developers image does require the "chown", "setuid", "setgid" and "audit_write" capabilities (plus "dac_override" if you're using an image based on Red Hat Enterprise Linux).  This is because it uses the "sudo" command to change passwords inside the container.  For example, in Docker, you could do the following:
+
+```sh
+docker run \
+  --cap-drop=ALL \
+  --cap-add=CHOWN \
+  --cap-add=SETUID \
+  --cap-add=SETGID \
+  --cap-add=AUDIT_WRITE \
+  --env LICENSE=accept \
+  --env MQ_QMGR_NAME=QM1 \
+  --detach \
+  mqadvanced-server-dev:9.1.3.0-amd64
+```
+
+### SELinux
+
+The SELinux label "spc_t" (super-privileged container) is needed to run the MQ container on a host with SELinux enabled.  This is due to a current limitation in how MQ data is stored on volumes, which violates the usual policy applied when using the standard "container_t" label.

docs/testing.md

@@ -2,9 +2,10 @@
 
 ## Prerequisites
 You need to ensure you have the following tools installed:
-* [Docker](https://www.docker.com/) 19.03 or higher (API version 1.40)
+* [Docker](https://www.docker.com/)
 * [GNU make](https://www.gnu.org/software/make/)
 * [Go](https://golang.org/) - only needed for running the tests
+* [dep](https://github.com/golang/dep) (official Go dependency management tool) - needed to prepare for running the tests
 
 ## Running the tests
 There are two main sets of tests:
@@ -13,30 +14,29 @@ There are two main sets of tests:
 2. Docker tests, which test a complete Docker image, using the Docker API
 
 ### Running the Docker tests
-
-The Docker tests can be run locally on a machine with Docker. For example:
+The Docker tests can be run locally on a machine with Docker.  For example:
 
 ```
-make devserver
-make advancedserver
+make test-devserver
+make test-advancedserver
 ```
 
 You can specify the image to use directly by using the `MQ_IMAGE_ADVANCEDSERVER` or `MQ_IMAGE_DEVSERVER` variables, for example:
 
 ```
-MQ_IMAGE_ADVANCEDSERVER=ibm-mqadvanced-server:9.3.0.5-amd64 make test-advancedserver
+MQ_IMAGE_ADVANCEDSERVER=mqadvanced-server:9.1.3.0-amd64 make test-advancedserver
 ```
 
-You can pass parameters to `go test` with an environment variable.  For example, to run the "TestGoldenPath" test, run the following command:
+You can pass parameters to `go test` with an environment variable.  For example, to run the "TestGoldenPath" test, run the following command::
 
 ```
 TEST_OPTS_DOCKER="-run TestGoldenPath" make test-advancedserver
 ```
 
-You can also use the same environment variables you specified when [building](./building), for example, the following will try and test an image called `ibm-mqadvanced-server:9.2.0.0-amd64`:
+You can also use the same environment variables you specified when [building](./building), for example, the following will try and test an image called `mqadvanced-server:9.1.3.0-amd64`:
 
 ```
-MQ_VERSION=9.2.0.0 make test-advancedserver
+MQ_VERSION=9.1.3.0 make test-advancedserver
 ```
 
 ### Running the Docker tests with code coverage
@@ -48,3 +48,12 @@ make test-advancedserver-cover
 ```
 
 In order to generate code coverage metrics from the Docker tests, the build step creates a new Docker image with an instrumented version of the code.  Each test is then run individually, producing a coverage report each under `test/docker/coverage/`.  These individual reports are then combined.  The combined report is written to the `coverage` directory.
+
+
+### Running the Kubernetes tests
+
+For the Kubernetes tests, you need to have built the Docker image, and pushed it to the registry used by your Kubernetes cluster.  Most of the configuration used by the tests is picked up from your `kubectl` configuration, but you will typically need to specify the image details.  For example:
+
+```bash
+MQ_IMAGE=mycluster.icp:8500/default/mq-devserver make test-kubernetes-devserver
+```

docs/usage.md

@@ -14,7 +14,7 @@ docker run \
   --publish 1414:1414 \
   --publish 9443:9443 \
   --detach \
-  icr.io/ibm-messaging/mq
+  ibmcom/mq
 ```
 
 ## Running with the default configuration and a volume
@@ -34,7 +34,7 @@ docker run \
   --publish 9443:9443 \
   --detach \
   --volume qm1data:/mnt/mqm \
-  icr.io/ibm-messaging/mq
+  ibmcom/mq
 ```
 
 The Docker image always uses `/mnt/mqm` for MQ data, which is correctly linked for you under `/var/mqm` at runtime.  This is to handle problems with file permissions on some platforms.
@@ -51,7 +51,7 @@ docker run \
   --publish 9443:9443 \
   --publish 9157:9157 \
   --detach \
-  icr.io/ibm-messaging/mq
+  ibmcom/mq
 ```
 
 ## Customizing the queue manager configuration
@@ -60,18 +60,23 @@ You can customize the configuration in several ways:
 
 1. For getting started, you can use the [default developer configuration](developer-config.md), which is available out-of-the-box for the MQ Advanced for Developers image
 2. By creating your own image and adding your own MQSC file into the `/etc/mqm` directory on the image.  This file will be run when your queue manager is created.
-3. By using [remote MQ administration](https://www.ibm.com/support/knowledgecenter/SSFKSJ_9.3.0/com.ibm.mq.adm.doc/q021090_.htm), via an MQ command server, the MQ HTTP APIs, or using a tool such as the MQ web console or MQ Explorer.
+3. By using [remote MQ administration](https://www.ibm.com/support/knowledgecenter/SSFKSJ_9.1.0/com.ibm.mq.adm.doc/q021090_.htm), via an MQ command server, the MQ HTTP APIs, or using a tool such as the MQ web console or MQ Explorer.
 
 Note that a listener is always created on port 1414 inside the container.  This port can be mapped to any port on the Docker host.
 
-The following is an *example* `Dockerfile` for creating your own pre-configured image, which adds a custom MQ configuration file:
+The following is an *example* `Dockerfile` for creating your own pre-configured image, which adds a custom MQ configuration file, and an administrative user `alice`.  Note that it is not normally recommended to include passwords in this way:
 
 ```dockerfile
-FROM icr.io/ibm-messaging/mq
-USER 1001
+FROM ibmcom/mq
+USER root
+RUN useradd alice -G mqm && \
+    echo alice:passw0rd | chpasswd
+USER mqm
 COPY 20-config.mqsc /etc/mqm/
 ```
 
+The `USER` instructions are necessary to ensure that the `useradd` and `chpasswd` commands are run as the root user.
+
 Here is an example corresponding `20-config.mqsc` script, which creates two local queues:
 
 ```mqsc

etc/mqm/mq.htpasswd

@@ -1,2 +0,0 @@
-admin:$2y$05$M/C1U62RZ6q1kv4E7.S7ueNESJmFe85RsZcoMUReRXUDB8QcP3yqS
-app:$2y$05$BnbPtcjXTjk5JRJ8gzHqIuHgoQbLF3qtbPV3Q3tLyr0XJNg.7dkxW

etc/mqm/qm-service-component.ini

@@ -1,11 +0,0 @@
-ServiceComponent:
-    Service=AuthorizationService
-    Name=Dev.HtpAuth.Service
-    Module=/opt/mqm/lib64/mqhtpass.so
-    ComponentDataSize=0
-ServiceComponent:
-   Service=AuthorizationService
-   Name=MQSeries.UNIX.auth.service
-   Module=amqzfu
-   ComponentDataSize=0
-

glide.lock

@@ -0,0 +1,57 @@
+hash: 6ebd5fb1c39729378c7256da6f312e9699bff1ddff9941d3c8c1ba785e22acfd
+updated: 2019-05-21T10:38:01.227081+01:00
+imports:
+- name: github.com/beorn7/perks
+  version: 3a771d992973f24aa725d07868b467d1ddfceafb
+  subpackages:
+  - quantile
+- name: github.com/genuinetools/amicontained
+  version: fcae88544f0212fbb1e20699c41566655b68679b
+  subpackages:
+  - container
+- name: github.com/golang/protobuf
+  version: 70b3af33377e7aa25ae42977bed93cc6b90f0373
+  subpackages:
+  - proto
+- name: github.com/ibm-messaging/mq-golang
+  version: 1b2a2ad95ba3c555944be28097d392c27bda4071
+  subpackages:
+  - ibmmq
+  - mqmetric
+- name: github.com/matttproud/golang_protobuf_extensions
+  version: c12348ce28de40eed0136aa2b644d0ee0650e56c
+  subpackages:
+  - pbutil
+- name: github.com/prometheus/client_golang
+  version: c5b7fccd204277076155f10851dad72b76a49317
+  subpackages:
+  - prometheus
+- name: github.com/prometheus/client_model
+  version: 5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f
+  subpackages:
+  - go
+- name: github.com/prometheus/common
+  version: 7600349dcfe1abd18d72d3a1770870d9800a7801
+  subpackages:
+  - expfmt
+  - internal/bitbucket.org/ww/goautoneg
+  - model
+- name: github.com/prometheus/procfs
+  version: ae68e2d4c00fed4943b5f6698d504a5fe083da8a
+  subpackages:
+  - internal/util
+  - nfs
+  - xfs
+- name: github.com/syndtr/gocapability
+  version: 33e07d32887e1e06b7c025f27ce52f62c7990bc0
+  subpackages:
+  - capability
+- name: golang.org/x/sys
+  version: 1b2967e3c290b7c545b3db0deeda16e9be4f98a2
+  subpackages:
+  - unix
+- name: software.sslmate.com/src/go-pkcs12
+  version: 6e380ad96778cc63c6ea17649a9b74224bceafe9
+  subpackages:
+  - internal/rc2
+testImports: []

glide.yaml

@@ -0,0 +1,30 @@
+# © Copyright IBM Corporation 2017, 2019
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+package: github.com/ibm-messaging/mq-container
+license: Apache-2.0
+excludeDirs:
+- build
+- coverage
+- test
+import:
+- package: golang.org/x/sys/unix
+- package: github.com/prometheus/client_golang
+  version: 0.8.0
+- package: github.com/ibm-messaging/mq-golang
+  version: 2.0.0
+- package: github.com/genuinetools/amicontained
+  version: 0.4.0
+- package: software.sslmate.com/src/go-pkcs12
+  commit: 6e380ad96778cc63c6ea17649a9b74224bceafe9

go.mod

@@ -1,24 +0,0 @@
-module github.com/ibm-messaging/mq-container
-
-go 1.19
-
-require (
-	github.com/genuinetools/amicontained v0.4.3
-	github.com/ibm-messaging/mq-golang v2.0.0+incompatible
-	github.com/prometheus/client_golang v1.11.1
-	github.com/prometheus/client_model v0.2.0
-	golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d
-	golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1
-	software.sslmate.com/src/go-pkcs12 v0.0.0-20200830195227-52f69702a001
-)
-
-require (
-	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cespare/xxhash/v2 v2.1.1 // indirect
-	github.com/golang/protobuf v1.4.3 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
-	github.com/prometheus/common v0.26.0 // indirect
-	github.com/prometheus/procfs v0.6.0 // indirect
-	github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
-	google.golang.org/protobuf v1.26.0-rc.1 // indirect
-)

go.sum

@@ -1,149 +0,0 @@
-cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
-github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
-github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
-github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
-github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
-github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
-github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/genuinetools/amicontained v0.4.3 h1:cqq9XiAHfWWY3dk8VU8bSJFu9yh8Il5coEdeTAPq72o=
-github.com/genuinetools/amicontained v0.4.3/go.mod h1:PAMZkg9CcUTa6gNyULQ6tOMTMEb2HTKJufvKeFqDw+o=
-github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
-github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
-github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
-github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
-github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
-github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
-github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM=
-github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/ibm-messaging/mq-golang v2.0.0+incompatible h1:xAufRPYSzoRGaME2+x7LcW5+uvy/G3xL/3Sn3u+G/lY=
-github.com/ibm-messaging/mq-golang v2.0.0+incompatible/go.mod h1:qjsZDb7m1oKnbPeDma2JVJTKgyCA91I4bcJ1qHY+gcA=
-github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
-github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
-github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
-github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
-github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
-github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
-github.com/prometheus/client_golang v1.11.1 h1:+4eQaD7vAZ6DsfsxB15hbE0odUjGI5ARs9yskGu1v4s=
-github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
-github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M=
-github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
-github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
-github.com/prometheus/common v0.26.0 h1:iMAkS2TDoNWnKM+Kopnx/8tnEStIfpYA0ur0xQzzhMQ=
-github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
-github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
-github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
-github.com/prometheus/procfs v0.6.0 h1:mxy4L2jP6qMonqmq+aTtOx1ifVWUgG/TAmntgbh3xv4=
-github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
-github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
-github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 h1:kdXcSzyDtseVEc4yCz2qF8ZrQvIDBJLl4S1c3GCXmoI=
-github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
-golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d h1:sK3txAijHtOK88l68nt020reeT1ZdKLIYetKl95FzVY=
-golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
-google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
-google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
-google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
-google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.26.0-rc.1 h1:7QnIQpGRHE5RnLKnESfDoxm2dTapTZua5a0kS0A+VXQ=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-software.sslmate.com/src/go-pkcs12 v0.0.0-20200830195227-52f69702a001 h1:AVd6O+azYjVQYW1l55IqkbL8/JxjrLtO6q4FCmV8N5c=
-software.sslmate.com/src/go-pkcs12 v0.0.0-20200830195227-52f69702a001/go.mod h1:/xvNRWUqm0+/ZMiF4EX00vrSCMsE4/NHb+Pt3freEeQ=

ha/native-ha.ini.tpl

@@ -1,18 +0,0 @@
-NativeHALocalInstance:
-  Name={{ .Name }}
-  {{ if .CertificateLabel }}
-  CertificateLabel={{ .CertificateLabel }}
-  KeyRepository={{ .KeyRepository }}
-  {{ if .CipherSpec }}
-  CipherSpec={{ .CipherSpec }}
-  {{- end }}
-  {{- end }}
-NativeHAInstance:
-  Name={{ .NativeHAInstance0_Name }}
-  ReplicationAddress={{ .NativeHAInstance0_ReplicationAddress }}
-NativeHAInstance:
-  Name={{ .NativeHAInstance1_Name }}
-  ReplicationAddress={{ .NativeHAInstance1_ReplicationAddress }}
-NativeHAInstance:
-  Name={{ .NativeHAInstance2_Name }}
-  ReplicationAddress={{ .NativeHAInstance2_ReplicationAddress }}

incubating/mq-explorer/Dockerfile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM registry.redhat.io/ubi8/ubi-minimal AS mq-explorer
+FROM registry.access.redhat.com/ubi7/ubi-minimal AS mq-explorer
 
 # The URL to download the MQ installer from in tar.gz format
 ARG MQ_URL="https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqadv/mqadv_dev912_linux_x86-64.tar.gz"
@@ -22,7 +22,7 @@ ENV MQ_PACKAGES="MQSeriesRuntime*.rpm MQSeriesJRE*.rpm MQSeriesExplorer*.rpm"
 
 ARG MQM_UID=888
 
-RUN microdnf install -y gtk2 libXtst \
+RUN microdnf install -y --nodocs gtk2 libXtst \
   && microdnf clean all
 
 ADD install-mq.sh /usr/local/bin/

incubating/mq-sdk/Dockerfile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM registry.redhat.io/rhel8/llvm-toolset:8.0.1-10  AS mq-sdk
+FROM registry.access.redhat.com/rhscl/devtoolset-7-toolchain-rhel7 AS mq-sdk
 #FROM docker.io/centos/devtoolset-7-toolchain-centos7 AS mq-sdk
 
 # The URL to download the MQ installer from in tar.gz format

incubating/mqadvanced-server-dev/10-dev.mqsc.tpl

@@ -13,6 +13,9 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 
+STOP LISTENER('SYSTEM.LISTENER.TCP.1') IGNSTATE(YES)
+ALTER LISTENER('SYSTEM.LISTENER.TCP.1') TRPTYPE(TCP) CONTROL(MANUAL)
+
 * Developer queues
 DEFINE QLOCAL('DEV.QUEUE.1') REPLACE
 DEFINE QLOCAL('DEV.QUEUE.2') REPLACE
@@ -40,9 +43,12 @@ SET CHLAUTH('*') TYPE(ADDRESSMAP) ADDRESS('*') USERSRC(NOACCESS) DESCR('Back-sto
 SET CHLAUTH('DEV.APP.SVRCONN') TYPE(ADDRESSMAP) ADDRESS('*') USERSRC(CHANNEL) CHCKCLNT({{ .ChckClnt }}) DESCR('Allows connection via APP channel') ACTION(REPLACE)
 SET CHLAUTH('DEV.ADMIN.SVRCONN') TYPE(BLOCKUSER) USERLIST('nobody') DESCR('Allows admins on ADMIN channel') ACTION(REPLACE)
 SET CHLAUTH('DEV.ADMIN.SVRCONN') TYPE(USERMAP) CLNTUSER('admin') USERSRC(CHANNEL) DESCR('Allows admin user to connect via ADMIN channel') ACTION(REPLACE)
-SET CHLAUTH('DEV.ADMIN.SVRCONN') TYPE(USERMAP) CLNTUSER('admin') USERSRC(MAP) MCAUSER ('mqm') DESCR ('Allow admin as MQ-admin') ACTION(REPLACE)
 
 * Developer authority records
-SET AUTHREC PRINCIPAL('app') OBJTYPE(QMGR) AUTHADD(CONNECT,INQ)
-SET AUTHREC PROFILE('DEV.**') PRINCIPAL('app') OBJTYPE(QUEUE) AUTHADD(BROWSE,GET,INQ,PUT)
-SET AUTHREC PROFILE('DEV.**') PRINCIPAL('app') OBJTYPE(TOPIC) AUTHADD(PUB,SUB)
+SET AUTHREC GROUP('mqclient') OBJTYPE(QMGR) AUTHADD(CONNECT,INQ)
+SET AUTHREC PROFILE('DEV.**') GROUP('mqclient') OBJTYPE(QUEUE) AUTHADD(BROWSE,GET,INQ,PUT)
+SET AUTHREC PROFILE('DEV.**') GROUP('mqclient') OBJTYPE(TOPIC) AUTHADD(PUB,SUB)
+
+* Developer listener
+DEFINE LISTENER('DEV.LISTENER.TCP') TRPTYPE(TCP) PORT(1414) CONTROL(QMGR) REPLACE
+START LISTENER('DEV.LISTENER.TCP') IGNSTATE(YES)

incubating/mqadvanced-server-dev/20-dev-tls.mqsc.tpl

@@ -1,4 +1,4 @@
-* © Copyright IBM Corporation 2018, 2022
+* © Copyright IBM Corporation 2018, 2019
 *
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,5 +14,5 @@
 * limitations under the License.
 
 * Set the cipherspec for dev channels
-ALTER CHANNEL('DEV.APP.SVRCONN') CHLTYPE(SVRCONN) SSLCIPH(ANY_TLS12_OR_HIGHER) SSLCAUTH(OPTIONAL)
-ALTER CHANNEL('DEV.ADMIN.SVRCONN') CHLTYPE(SVRCONN) SSLCIPH(ANY_TLS12_OR_HIGHER) SSLCAUTH(OPTIONAL)
+ALTER CHANNEL('DEV.APP.SVRCONN') CHLTYPE(SVRCONN) SSLCIPH(ANY_TLS12) SSLCAUTH(OPTIONAL)
+ALTER CHANNEL('DEV.ADMIN.SVRCONN') CHLTYPE(SVRCONN) SSLCIPH(ANY_TLS12) SSLCAUTH(OPTIONAL)

incubating/mqadvanced-server-dev/install-extra-packages.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # -*- mode: sh -*-
-# © Copyright IBM Corporation 2019, 2021
+# © Copyright IBM Corporation 2019
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,9 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Fail on any non-zero return code
-set -ex
-
 test -f /usr/bin/yum && YUM=true || YUM=false
 test -f /usr/bin/microdnf && MICRODNF=true || MICRODNF=false
 test -f /usr/bin/apt-get && UBUNTU=true || UBUNTU=false
@@ -25,17 +22,17 @@ test -f /usr/bin/apt-get && UBUNTU=true || UBUNTU=false
 if ($UBUNTU); then
     export DEBIAN_FRONTEND=noninteractive
     apt-get update
-    apt-get install -y --no-install-recommends libaprutil1
+    apt-get install -y --no-install-recommends sudo
     rm -rf /var/lib/apt/lists/*
 fi
 
 if ($YUM); then
-    yum -y install apr-util-openssl
+    yum -y install sudo
     yum -y clean all
     rm -rf /var/cache/yum/*
 fi
 
 if ($MICRODNF); then
-    microdnf --disableplugin=subscription-manager install apr-util-openssl
-    microdnf --disableplugin=subscription-manager clean all
+    microdnf install --nodocs sudo
+    microdnf clean all
 fi

incubating/mqadvanced-server-dev/web/installations/Installation1/servers/mqweb/mqwebuser.xml

@@ -36,9 +36,5 @@
     </basicRegistry>
     <variable name="httpHost" value="*"/>
     <variable name="managementMode" value="externallyprovisioned"/>
-    <variable name="mqConsoleRemoteSupportEnabled" value="false"/>
-    <variable name="mqConsoleEnableUnsafeInline" value="true"/>
-    <jndiEntry jndiName="mqConsoleDefaultCCDTHostname" value="${env.MQ_CONSOLE_DEFAULT_CCDT_HOSTNAME}"/>
-    <jndiEntry jndiName="mqConsoleDefaultCCDTPort" value="${env.MQ_CONSOLE_DEFAULT_CCDT_PORT}"/>
     <include location="tls.xml"/>
 </server>

install-build-deps-ubuntu.sh

@@ -19,10 +19,8 @@
 
 set -ex
 
-sudo curl -Lo /usr/local/bin/dep https://github.com/golang/dep/releases/download/v0.5.1/dep-linux-$ARCH
+curl https://glide.sh/get | sh
+sudo curl -Lo /usr/local/bin/dep https://github.com/golang/dep/releases/download/v0.5.0/dep-linux-amd64
 sudo chmod +x /usr/local/bin/dep
-sudo apt-get update || :
-sudo apt-get install -y jq
 
-go install golang.org/x/lint/golint@latest
-curl -sfL https://raw.githubusercontent.com/securego/gosec/master/install.sh | sh -s -- -b $GOPATH/bin v2.14.0 || echo "Gosec not installed. Platform may not be supported."
+go get -u golang.org/x/lint/golint

install-mq-server-prereqs.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # -*- mode: sh -*-
-# © Copyright IBM Corporation 2015, 2021
+# © Copyright IBM Corporation 2015, 2019
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -63,10 +63,10 @@ if ($UBUNTU); then
 fi
 
 if ($RPM); then
-  EXTRA_RPMS="bash bc ca-certificates file findutils gawk glibc-common grep ncurses-compat-libs passwd procps-ng sed shadow-utils tar util-linux which"
+  EXTRA_RPMS="bash bc ca-certificates coreutils file findutils gawk glibc-common grep passwd procps-ng sed shadow-utils tar util-linux which"
   # Install additional packages required by MQ, this install process and the runtime scripts
   $YUM && yum -y install --setopt install_weak_deps=false ${EXTRA_RPMS}
-  $MICRODNF && microdnf --disableplugin=subscription-manager install ${EXTRA_RPMS}
+  $MICRODNF && microdnf install --nodocs ${EXTRA_RPMS}
 fi
 
 # Apply any bug fixes not included in base Ubuntu or MQ image.
@@ -78,4 +78,4 @@ $UBUNTU && apt-get install -y libapparmor1 libsystemd0 systemd systemd-sysv libu
 $UBUNTU && rm -rf /var/lib/apt/lists/*
 $YUM && yum -y clean all
 $YUM && rm -rf /var/cache/yum/*
-$MICRODNF && microdnf --disableplugin=subscription-manager clean all
+$MICRODNF && microdnf clean all

install-mq.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # -*- mode: sh -*-
-# © Copyright IBM Corporation 2015, 2022
+# © Copyright IBM Corporation 2015, 2019
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,64 +18,74 @@
 # Fail on any non-zero return code
 set -ex
 
+mqm_uid=${1:-888}
+
+test -f /usr/bin/yum && YUM=true || YUM=false
+test -f /usr/bin/microdnf && MICRODNF=true || MICRODNF=false
 test -f /usr/bin/rpm && RPM=true || RPM=false
 test -f /usr/bin/apt-get && UBUNTU=true || UBUNTU=false
 
-# Download and extract the MQ unzippable server
-DIR_TMP=/tmp/mq
-mkdir -p ${DIR_TMP}
-cd ${DIR_TMP}
-curl --fail --location $MQ_URL | tar --extract --gunzip
-ls -la ${DIR_TMP}
+# Download and extract the MQ installation files
+DIR_EXTRACT=/tmp/mq
+mkdir -p ${DIR_EXTRACT}
+cd ${DIR_EXTRACT}
+curl -LO $MQ_URL
+tar -zxf ./*.tar.gz
 
-# Generate MQ package in INSTALLATION_DIR
-export genmqpkg_inc32=0
-export genmqpkg_incadm=1
-export genmqpkg_incamqp=0
-export genmqpkg_incams=1
-export genmqpkg_inccbl=0
-export genmqpkg_inccics=0
-export genmqpkg_inccpp=0
-export genmqpkg_incdnet=0
-export genmqpkg_incjava=1
-export genmqpkg_incjre=1
-export genmqpkg_incman=0
-export genmqpkg_incmqbc=0
-export genmqpkg_incmqft=0
-export genmqpkg_incmqsf=0
-export genmqpkg_incmqxr=0
-export genmqpkg_incnls=1
-export genmqpkg_incras=1
-export genmqpkg_incsamp=1
-export genmqpkg_incsdk=0
-export genmqpkg_inctls=1
-export genmqpkg_incunthrd=0
-export genmqpkg_incweb=1
-export INSTALLATION_DIR=/opt/mqm
-${DIR_TMP}/bin/genmqpkg.sh -b ${INSTALLATION_DIR}
-ls -la ${INSTALLATION_DIR}
-rm -rf ${DIR_TMP}
+# Recommended: Create the mqm user ID with a fixed UID and group, so that the file permissions work between different images
+groupadd --system --gid ${mqm_uid} mqm
+useradd --system --uid ${mqm_uid} --gid mqm --groups 0 mqm
+
+# Find directory containing .deb files
+$UBUNTU && DIR_DEB=$(find ${DIR_EXTRACT} -name "*.deb" -printf "%h\n" | sort -u | head -1)
+$RPM && DIR_RPM=$(find ${DIR_EXTRACT} -name "*.rpm" -printf "%h\n" | sort -u | head -1)
+# Find location of mqlicense.sh
+MQLICENSE=$(find ${DIR_EXTRACT} -name "mqlicense.sh")
 
 # Accept the MQ license
-${INSTALLATION_DIR}/bin/mqlicense -accept
+${MQLICENSE} -text_only -accept
+$UBUNTU && echo "deb [trusted=yes] file:${DIR_DEB} ./" > /etc/apt/sources.list.d/IBM_MQ.list
+
+# Install MQ using the DEB packages
+$UBUNTU && apt-get update
+$UBUNTU && apt-get install -y $MQ_PACKAGES
+
+$RPM && cd $DIR_RPM && rpm -ivh $MQ_PACKAGES
+
+# Remove 32-bit libraries from 64-bit container
+# The "file" utility isn't installed by default in UBI, so only try this if it's installed
+which file && find /opt/mqm /var/mqm -type f -exec file {} \; | awk -F: '/ELF 32-bit/{print $1}' | xargs --no-run-if-empty rm -f
+
+# Remove tar.gz files unpacked by RPM postinst scripts
+find /opt/mqm -name '*.tar.gz' -delete
+
+# Recommended: Set the default MQ installation (makes the MQ commands available on the PATH)
+/opt/mqm/bin/setmqinst -p /opt/mqm -i
+
+# Clean up all the downloaded files
+$UBUNTU && rm -f /etc/apt/sources.list.d/IBM_MQ.list
+rm -rf ${DIR_EXTRACT}
 
 # Optional: Update the command prompt with the MQ version
 $UBUNTU && echo "mq:$(dspmqver -b -f 2)" > /etc/debian_chroot
 
+# Remove the directory structure under /var/mqm which was created by the installer
+rm -rf /var/mqm
+
 # Create the mount point for volumes, ensuring MQ has permissions to all directories
-install --directory --mode 2775 --owner 1001 --group root /mnt
-install --directory --mode 2775 --owner 1001 --group root /mnt/mqm
-install --directory --mode 2775 --owner 1001 --group root /mnt/mqm/data
-install --directory --mode 2775 --owner 1001 --group root /mnt/mqm-log
-install --directory --mode 2775 --owner 1001 --group root /mnt/mqm-log/log
-install --directory --mode 2775 --owner 1001 --group root /mnt/mqm-data
-install --directory --mode 2775 --owner 1001 --group root /mnt/mqm-data/qmgrs
+install --directory --mode 0775 --owner mqm --group root /mnt
+install --directory --mode 0775 --owner mqm --group root /mnt/mqm
+install --directory --mode 0775 --owner mqm --group root /mnt/mqm/data
+install --directory --mode 0775 --owner mqm --group root /mnt/mqm-log
+install --directory --mode 0775 --owner mqm --group root /mnt/mqm-log/log
+install --directory --mode 0775 --owner mqm --group root /mnt/mqm-data
+install --directory --mode 0775 --owner mqm --group root /mnt/mqm-data/qmgrs
 
 # Create the directory for MQ configuration files
-install --directory --mode 2775 --owner 1001 --group root /etc/mqm
+install --directory --mode 0775 --owner mqm --group root /etc/mqm
 
 # Create the directory for MQ runtime files
-install --directory --mode 2775 --owner 1001 --group root /run/mqm
+install --directory --mode 0775 --owner mqm --group root /run/mqm
 
 # Create a symlink for /var/mqm -> /mnt/mqm/data
 ln -s /mnt/mqm/data /var/mqm
@@ -84,18 +94,15 @@ ln -s /mnt/mqm/data /var/mqm
 sed -i 's/PASS_MAX_DAYS\t99999/PASS_MAX_DAYS\t90/' /etc/login.defs
 sed -i 's/PASS_MIN_DAYS\t0/PASS_MIN_DAYS\t1/' /etc/login.defs
 sed -i 's/PASS_MIN_LEN\t5/PASS_MIN_LEN\t8/' /etc/login.defs
-$RPM && sed -i 's/# minlen/minlen/' /etc/security/pwquality.conf
+sed -i 's/# minlen = 9/minlen = 8/' /etc/security/pwquality.conf
 
 $UBUNTU && PAM_FILE=/etc/pam.d/common-password
 $RPM && PAM_FILE=/etc/pam.d/password-auth
 sed -i 's/password\t\[success=1 default=ignore\]\tpam_unix\.so obscure sha512/password\t[success=1 default=ignore]\tpam_unix.so obscure sha512 minlen=8/' $PAM_FILE
 
 # List all the installed packages, for the build log
-$RPM && (rpm -q --all | sort) || true
-$UBUNTU && (dpkg --list | sort) || true
-
-#Update the license file to include UBI 8 instead of UBI 7
-sed -i 's/v7.0/v8.0/g' /opt/mqm/licenses/non_ibm_license.txt
+$RPM && rpm -q --all || true
+$UBUNTU && dpkg --list || true
 
 # Copy MQ Licenses into the correct location
 mkdir -p /licenses

internal/command/command.go

@@ -1,5 +1,5 @@
 /*
-© Copyright IBM Corporation 2017, 2020
+© Copyright IBM Corporation 2017, 2018
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -20,20 +20,69 @@ package command
 import (
 	"fmt"
 	"os/exec"
+	"os/user"
+	"runtime"
+	"strconv"
+	"syscall"
 )
 
+// RunCmd runs an OS command.  On Linux it waits for the command to
+// complete and returns the exit status (return code).
+// Do not use this function to run shell built-ins (like "cd"), because
+// the error handling works differently
+func RunCmd(cmd *exec.Cmd) (string, int, error) {
+	// Run the command and wait for completion
+	out, err := cmd.CombinedOutput()
+	if err != nil {
+		// Assert that this is an ExitError
+		exiterr, ok := err.(*exec.ExitError)
+		// If the type assertion was correct, and we're on Linux
+		if ok && runtime.GOOS == "linux" {
+			status, ok := exiterr.Sys().(syscall.WaitStatus)
+			if ok {
+				return string(out), status.ExitStatus(), fmt.Errorf("%v: %v", cmd.Path, err)
+			}
+		}
+		return string(out), -1, err
+	}
+	return string(out), 0, nil
+}
+
 // Run runs an OS command.  On Linux it waits for the command to
 // complete and returns the exit status (return code).
 // Do not use this function to run shell built-ins (like "cd"), because
 // the error handling works differently
 func Run(name string, arg ...string) (string, int, error) {
-	// Run the command and wait for completion
+	// #nosec G204
+	return RunCmd(exec.Command(name, arg...))
+}
+
+// RunAsMQM runs the specified command as the mqm user
+func RunAsMQM(name string, arg ...string) (string, int, error) {
 	// #nosec G204
 	cmd := exec.Command(name, arg...)
-	out, err := cmd.CombinedOutput()
-	rc := cmd.ProcessState.ExitCode()
+	cmd.SysProcAttr = &syscall.SysProcAttr{}
+	uid, gid, err := LookupMQM()
 	if err != nil {
-		return string(out), rc, fmt.Errorf("%v: %v", cmd.Path, err)
+		return "", 0, err
 	}
-	return string(out), rc, nil
+	cmd.SysProcAttr.Credential = &syscall.Credential{Uid: uint32(uid), Gid: uint32(gid)}
+	return RunCmd(cmd)
+}
+
+// LookupMQM looks up the UID & GID of the mqm user
+func LookupMQM() (int, int, error) {
+	mqm, err := user.Lookup("mqm")
+	if err != nil {
+		return -1, -1, err
+	}
+	mqmUID, err := strconv.Atoi(mqm.Uid)
+	if err != nil {
+		return -1, -1, err
+	}
+	mqmGID, err := strconv.Atoi(mqm.Gid)
+	if err != nil {
+		return -1, -1, err
+	}
+	return mqmUID, mqmGID, nil
 }

internal/containerruntimelogger/logruntime.go

@@ -1,5 +1,5 @@
 /*
-© Copyright IBM Corporation 2017, 2020
+© Copyright IBM Corporation 2017, 2019
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -22,8 +22,8 @@ import (
 	"strings"
 
 	"github.com/ibm-messaging/mq-container/internal/containerruntime"
+	"github.com/ibm-messaging/mq-container/internal/logger"
 	"github.com/ibm-messaging/mq-container/internal/user"
-	"github.com/ibm-messaging/mq-container/pkg/logger"
 )
 
 // LogContainerDetails logs details about the container runtime
@@ -45,14 +45,11 @@ func LogContainerDetails(log *logger.Logger) error {
 		log.Printf("Base image: %v", bi)
 	}
 	u, err := user.GetUser()
-	if err != nil {
-		log.Printf("Error: %v\nUser:\n  uid: %v\n  gid: %v\n  supGid: %v", err, u.UID, u.PrimaryGID, u.SupplementalGID)
-	}
 	if err == nil {
 		if len(u.SupplementalGID) == 0 {
-			log.Printf("Running as user ID %v with primary group %v", u.UID, u.PrimaryGID)
+			log.Printf("Running as user ID %v (%v) with primary group %v", u.UID, u.Name, u.PrimaryGID)
 		} else {
-			log.Printf("Running as user ID %v with primary group %v, and supplementary groups %v", u.UID, u.PrimaryGID, strings.Trim(strings.Join(strings.Fields(fmt.Sprint(u.SupplementalGID)), ","), "[]"))
+			log.Printf("Running as user ID %v (%v) with primary group %v, and supplementary groups %v", u.UID, u.Name, u.PrimaryGID, strings.Join(u.SupplementalGID, ","))
 		}
 	}
 	caps, err := containerruntime.GetCapabilities()

internal/copy/copy.go

@@ -36,15 +36,12 @@ func CopyFileMode(src, dest string, perm os.FileMode) error {
 	if err != nil {
 		return fmt.Errorf("failed to open %s for copy: %v", src, err)
 	}
-	// #nosec G307 - local to this function, pose no harm.
 	defer in.Close()
 
-	// #nosec G304 - this func creates based on the input filemode.
 	out, err := os.OpenFile(dest, os.O_CREATE|os.O_WRONLY, perm)
 	if err != nil {
 		return fmt.Errorf("failed to open %s for copy: %v", dest, err)
 	}
-	// #nosec G307 - local to this function, pose no harm.
 	defer out.Close()
 
 	_, err = io.Copy(out, in)

internal/ha/ha.go

@@ -1,68 +0,0 @@
-/*
-© Copyright IBM Corporation 2020, 2021
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Package ha contains code for high availability
-package ha
-
-import (
-	"os"
-
-	"github.com/ibm-messaging/mq-container/internal/mqtemplate"
-	"github.com/ibm-messaging/mq-container/internal/tls"
-	"github.com/ibm-messaging/mq-container/pkg/logger"
-)
-
-// ConfigureNativeHA configures native high availability
-func ConfigureNativeHA(log *logger.Logger) error {
-
-	file := "/etc/mqm/native-ha.ini"
-	templateFile := file + ".tpl"
-
-	templateMap := map[string]string{}
-	templateMap["Name"] = os.Getenv("HOSTNAME")
-	templateMap["NativeHAInstance0_Name"] = os.Getenv("MQ_NATIVE_HA_INSTANCE_0_NAME")
-	templateMap["NativeHAInstance1_Name"] = os.Getenv("MQ_NATIVE_HA_INSTANCE_1_NAME")
-	templateMap["NativeHAInstance2_Name"] = os.Getenv("MQ_NATIVE_HA_INSTANCE_2_NAME")
-	templateMap["NativeHAInstance0_ReplicationAddress"] = os.Getenv("MQ_NATIVE_HA_INSTANCE_0_REPLICATION_ADDRESS")
-	templateMap["NativeHAInstance1_ReplicationAddress"] = os.Getenv("MQ_NATIVE_HA_INSTANCE_1_REPLICATION_ADDRESS")
-	templateMap["NativeHAInstance2_ReplicationAddress"] = os.Getenv("MQ_NATIVE_HA_INSTANCE_2_REPLICATION_ADDRESS")
-
-	if os.Getenv("MQ_NATIVE_HA_TLS") == "true" {
-		keyLabel, _, _, err := tls.ConfigureHATLSKeystore()
-		if err != nil {
-			return err
-		}
-		templateMap["CertificateLabel"] = keyLabel
-
-		keyRepository, ok := os.LookupEnv("MQ_NATIVE_HA_KEY_REPOSITORY")
-		if !ok {
-			keyRepository = "/run/runmqserver/ha/tls/key"
-		}
-		templateMap["KeyRepository"] = keyRepository
-
-		cipherSpec, ok := os.LookupEnv("MQ_NATIVE_HA_CIPHERSPEC")
-		if ok {
-			templateMap["CipherSpec"] = cipherSpec
-		}
-	}
-
-	err := mqtemplate.ProcessTemplateFile(templateFile, file, templateMap, log)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}

internal/htpasswd/htpasswd.go

@@ -1,113 +0,0 @@
-/*
-© Copyright IBM Corporation 2020, 2021
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-//This is a developer only configuration and not recommended for production usage.
-
-package htpasswd
-
-import (
-	"fmt"
-	"io/ioutil"
-	"strings"
-
-	"golang.org/x/crypto/bcrypt"
-)
-
-type mapHtPasswd map[string]string
-
-func encryptPassword(password string) (string, error) {
-	passwordBytes, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
-	if err != nil {
-		return "", err
-	}
-	return string(passwordBytes), nil
-}
-
-// SetPassword sets encrypted password for the user into htpasswd file
-func SetPassword(user string, password string, isTest bool) error {
-
-	if len(strings.TrimSpace(user)) == 0 || len(strings.TrimSpace(password)) == 0 {
-		return fmt.Errorf("UserId or Password are empty")
-	}
-
-	passwords := mapHtPasswd(map[string]string{})
-
-	// Read the password file
-	err := passwords.ReadHtPasswordFile(isTest)
-	if err != nil {
-		return err
-	}
-
-	pwd, err := encryptPassword(password)
-	if err != nil {
-		return err
-	}
-	// Set the new password
-	passwords[user] = pwd
-
-	// Update the password file
-	return passwords.updateHtPasswordFile(isTest)
-}
-
-// GetBytes return the Bytes representation of the htpassword file
-func (htpfile mapHtPasswd) GetBytes() (passwordBytes []byte) {
-	passwordBytes = []byte{}
-	for name, hash := range htpfile {
-		passwordBytes = append(passwordBytes, []byte(name+":"+hash+"\n")...)
-	}
-	return passwordBytes
-}
-
-// ReadHtPasswordFile parses the htpasswd file
-func (htpfile mapHtPasswd) ReadHtPasswordFile(isTest bool) error {
-
-	file := "/etc/mqm/mq.htpasswd"
-	if isTest {
-		file = "my.htpasswd"
-	}
-
-	pwdsBytes, err := ioutil.ReadFile(file)
-	if err != nil {
-		return err
-	}
-
-	lines := strings.Split(string(pwdsBytes), "\n")
-	for _, line := range lines {
-		line = strings.TrimSpace(line)
-		if len(line) == 0 {
-			continue
-		}
-		parts := strings.Split(line, ":")
-		if len(parts) != 2 {
-			continue
-		}
-		for i, part := range parts {
-			parts[i] = strings.TrimSpace(part)
-		}
-		htpfile[parts[0]] = parts[1]
-	}
-	return nil
-}
-
-func (htpfile mapHtPasswd) updateHtPasswordFile(isTest bool) error {
-
-	file := "/etc/mqm/mq.htpasswd"
-	if isTest {
-		file = "my.htpasswd"
-	}
-	// #nosec G306 - its a read by owner/s group, and pose no harm.
-	return ioutil.WriteFile(file, htpfile.GetBytes(), 0660)
-}

internal/keystore/keystore.go

@@ -1,5 +1,5 @@
 /*
-© Copyright IBM Corporation 2018, 2020
+© Copyright IBM Corporation 2018, 2019
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -105,6 +105,14 @@ func (ks *KeyStore) Create() error {
 		return fmt.Errorf("error running \"%v -keydb -create\": %v %s", ks.command, err, out)
 	}
 
+	mqmUID, mqmGID, err := command.LookupMQM()
+	if err != nil {
+		return err
+	}
+	err = os.Chown(ks.Filename, mqmUID, mqmGID)
+	if err != nil {
+		return err
+	}
 	return nil
 }
 
@@ -122,6 +130,14 @@ func (ks *KeyStore) CreateStash() error {
 		}
 		return err
 	}
+	mqmUID, mqmGID, err := command.LookupMQM()
+	if err != nil {
+		return err
+	}
+	err = os.Chown(stashFile, mqmUID, mqmGID)
+	if err != nil {
+		return err
+	}
 	return nil
 }
 
@@ -136,7 +152,7 @@ func (ks *KeyStore) Import(inputFile, password string) error {
 
 // CreateSelfSignedCertificate creates a self-signed certificate in the keystore
 func (ks *KeyStore) CreateSelfSignedCertificate(label, dn, hostname string) error {
-	out, _, err := command.Run(ks.command, "-cert", "-create", "-db", ks.Filename, "-pw", ks.Password, "-label", label, "-dn", dn, "-san_dnsname", hostname, "-size 2048 -sig_alg sha256 -eku serverAuth")
+	out, _, err := command.Run(ks.command, "-cert", "-create", "-db", ks.Filename, "-pw", ks.Password, "-label", label, "-dn", dn, "-san_dnsname", hostname)
 	if err != nil {
 		return fmt.Errorf("error running \"%v -cert -create\": %v %s", ks.command, err, out)
 	}
@@ -191,7 +207,7 @@ func (ks *KeyStore) RenameCertificate(from, to string) error {
 		// #nosec G204
 		cmd := exec.Command("/opt/mqm/gskit8/bin/gsk8capicmd_64", "-cert", "-rename", "-db", ks.Filename, "-pw", ks.Password, "-label", from, "-new_label", to)
 		cmd.Env = append(os.Environ(), "LD_LIBRARY_PATH=/opt/mqm/gskit8/lib64/:/opt/mqm/gskit8/lib")
-		out, err := cmd.CombinedOutput()
+		out, _, err := command.RunCmd(cmd)
 		if err != nil {
 			return fmt.Errorf("error running \"%v -cert -rename\": %v %s", "/opt/mqm/gskit8/bin/gsk8capicmd_64", err, out)
 		}

internal/logger/logger.go

@@ -1,5 +1,5 @@
 /*
-© Copyright IBM Corporation 2018, 2021
+© Copyright IBM Corporation 2018, 2019
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -117,22 +117,14 @@ func (l *Logger) log(level string, msg string) {
 // Debug logs a line as debug
 func (l *Logger) Debug(args ...interface{}) {
 	if l.debug {
-		if l.json {
-			l.log(debugLevel, fmt.Sprint(args...))
-		} else {
-			l.log(debugLevel, "DEBUG: "+fmt.Sprint(args...))
-		}
+		l.log(debugLevel, fmt.Sprint(args...))
 	}
 }
 
 // Debugf logs a line as debug using format specifiers
 func (l *Logger) Debugf(format string, args ...interface{}) {
 	if l.debug {
-		if l.json {
-			l.log(debugLevel, fmt.Sprintf(format, args...))
-		} else {
-			l.log(debugLevel, fmt.Sprintf("DEBUG: "+format, args...))
-		}
+		l.log(debugLevel, fmt.Sprintf(format, args...))
 	}
 }
 

internal/logger/logger_test.go

@@ -1,5 +1,5 @@
 /*
-© Copyright IBM Corporation 2018, 2019
+© Copyright IBM Corporation 2018
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

internal/metrics/exporter.go

@@ -1,5 +1,5 @@
 /*
-© Copyright IBM Corporation 2018, 2019
+© Copyright IBM Corporation 2018
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ limitations under the License.
 package metrics
 
 import (
-	"github.com/ibm-messaging/mq-container/pkg/logger"
+	"github.com/ibm-messaging/mq-container/internal/logger"
 	"github.com/prometheus/client_golang/prometheus"
 )
 

internal/metrics/metrics.go

@@ -23,10 +23,9 @@ import (
 	"net/http"
 	"time"
 
+	"github.com/ibm-messaging/mq-container/internal/logger"
 	"github.com/ibm-messaging/mq-container/internal/ready"
-	"github.com/ibm-messaging/mq-container/pkg/logger"
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/client_golang/prometheus/promhttp"
 )
 
 const (
@@ -35,8 +34,6 @@ const (
 
 var (
 	metricsEnabled = false
-	// #nosec G112 - this needs investigation to find reasonable timeout.
-	// git-issue 233 to cover this..
 	metricsServer  = &http.Server{Addr: ":" + defaultPort}
 )
 
@@ -86,7 +83,7 @@ func startMetricsGathering(qmName string, log *logger.Logger) error {
 	}
 
 	// Setup HTTP server to handle requests from Prometheus
-	http.Handle("/metrics", promhttp.Handler())
+	http.Handle("/metrics", prometheus.Handler())
 	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(200)
 		// #nosec G104

internal/metrics/update.go

@@ -1,5 +1,5 @@
 /*
-© Copyright IBM Corporation 2018, 2019
+© Copyright IBM Corporation 2018
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ibm-messaging/mq-container/pkg/logger"
+	"github.com/ibm-messaging/mq-container/internal/logger"
 	"github.com/ibm-messaging/mq-golang/ibmmq"
 	"github.com/ibm-messaging/mq-golang/mqmetric"
 )

internal/metrics/update_test.go

@@ -1,5 +1,5 @@
 /*
-© Copyright IBM Corporation 2018, 2019
+© Copyright IBM Corporation 2018
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/ibm-messaging/mq-container/pkg/logger"
+	"github.com/ibm-messaging/mq-container/internal/logger"
 	"github.com/ibm-messaging/mq-golang/mqmetric"
 )
 

internal/mqini/mqat.ini

@@ -0,0 +1,20 @@
+#*******************************************************************#
+#* Module Name: mqat.ini                                           *#
+#* Type       : IBM MQ queue manager configuration file            *#
+#  Function   : Define the configuration of application activity   *#
+#*              trace for a single queue manager.                  *#
+#*******************************************************************#
+
+# Global settings stanza, default values
+AllActivityTrace:
+  ActivityInterval=1
+  ActivityCount=100
+  TraceLevel=MEDIUM
+  TraceMessageData=0
+  StopOnGetTraceMsg=ON
+  SubscriptionDelivery=BATCHED
+
+# Prevent the sample activity trace program from generating data
+ApplicationTrace:
+  ApplName=amqsact*
+  Trace=OFF

internal/mqini/mqini.go

@@ -0,0 +1,328 @@
+/*
+© Copyright IBM Corporation 2018, 2019
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Package mqini provides information about queue managers
+package mqini
+
+import (
+	"bufio"
+	"errors"
+	"fmt"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"regexp"
+	"strings"
+
+	"github.com/ibm-messaging/mq-container/internal/command"
+)
+
+// QueueManager describe high-level configuration information for a queue manager
+type QueueManager struct {
+	Name             string
+	Prefix           string
+	Directory        string
+	DataPath         string
+	InstallationName string
+}
+
+var qmgrDir string
+
+var stanzasQMINI []string
+
+var stanzasMQATINI []string
+
+// getQueueManagerFromStanza parses a queue manager stanza
+func getQueueManagerFromStanza(stanza string) (*QueueManager, error) {
+	scanner := bufio.NewScanner(strings.NewReader(stanza))
+	qm := QueueManager{}
+	for scanner.Scan() {
+		l := scanner.Text()
+		l = strings.TrimSpace(l)
+		t := strings.Split(l, "=")
+		switch t[0] {
+		case "Name":
+			qm.Name = t[1]
+		case "Prefix":
+			qm.Prefix = t[1]
+		case "Directory":
+			qm.Directory = t[1]
+		case "DataPath":
+			qm.DataPath = t[1]
+		case "InstallationName":
+			qm.InstallationName = t[1]
+		}
+	}
+	return &qm, scanner.Err()
+}
+
+// GetQueueManager returns queue manager configuration information
+func GetQueueManager(name string) (*QueueManager, error) {
+	// dspmqinf essentially returns a subset of mqs.ini, but it's simpler to parse
+	out, _, err := command.Run("dspmqinf", "-o", "stanza", name)
+	if err != nil {
+		return nil, err
+	}
+	return getQueueManagerFromStanza(out)
+}
+
+// GetErrorLogDirectory returns the directory holding the error logs for the
+// specified queue manager
+func GetErrorLogDirectory(qm *QueueManager) string {
+	if qm.DataPath != "" {
+		return filepath.Join(qm.DataPath, "errors")
+	}
+	return filepath.Join(qm.Prefix, "qmgrs", qm.Directory, "errors")
+}
+
+//AddStanzas Reads supplied mq ini configuration files and updates the stanzas
+//into queue manager's ini configuration files.
+func AddStanzas(qmname string) error {
+
+	//find the qmgr directory.
+	qm, err := GetQueueManager(qmname)
+	if err != nil {
+		return err
+	}
+	qmgrDir = filepath.Join(qm.Prefix, "qmgrs", qm.Directory)
+
+	//Find the users ini configuration file
+	files := getIniFileList()
+	if len(files) > 1 {
+		msg := fmt.Sprintf("[ %v ]", files)
+		return errors.New("Only a single ini file can be provided. Following ini files are found:" + msg)
+	}
+	if len(files) == 0 {
+		//no ini file update required.
+		return nil
+	}
+
+	iniFileBytes, err := ioutil.ReadFile(files[0])
+	if err != nil {
+		return err
+	}
+	userconfig := string(iniFileBytes)
+	if len(userconfig) == 0 {
+		return nil
+	}
+
+	//Prepare a list of all supported stanzas
+	PopulateAllAvailableStanzas()
+
+	//Update the qmgr ini file with user config.
+	qmConfig, atConfig, err := PrepareConfigStanzasToWrite(userconfig)
+	if err != nil {
+		return err
+	}
+	err = writeConfigStanzas(qmConfig, atConfig)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// PopulateAllAvailableStanzas initializes the ini stanzas prescribed by mq specification.
+func PopulateAllAvailableStanzas() {
+	stanzasQMINI = []string{"ExitPath",
+		"Log",
+		"Service",
+		"ServiceComponent",
+		"Channels",
+		"TCP",
+		"ApiExitLocal",
+		"AccessMode",
+		"RestrictedMode",
+		"XAResourceManager",
+		"DefaultBindType",
+		"SSL",
+		"DiagnosticMessages",
+		"Filesystem",
+		"Security",
+		"TuningParameters",
+		"ExitPropertiesLocal",
+		"LU62",
+		"NETBIOS"}
+
+	stanzasMQATINI = []string{"AllActivityTrace", "ApplicationTrace"}
+}
+
+// getIniFileList Checks for the user supplied ini file in /etc/mqm directory.
+func getIniFileList() []string {
+
+	fileList := []string{}
+	filepath.Walk("/etc/mqm", func(path string, f os.FileInfo, err error) error {
+		if strings.HasSuffix(path, ".ini") {
+			fileList = append(fileList, path)
+		}
+		return nil
+	})
+	return fileList
+}
+
+//PrepareConfigStanzasToWrite Reads through the user supplied ini config file and prepares list of
+//updates to be written into corresponding mq ini files (qm.ini and/or mqat.ini files.)
+func PrepareConfigStanzasToWrite(userconfig string) (string, string, error) {
+
+	var qminiConfigStr string
+	var mqatiniConfigStr string
+
+	//read the initial version.
+	iniFileBytes, err := ioutil.ReadFile(filepath.Join(qmgrDir, "qm.ini"))
+	if err != nil {
+		return "", "", err
+	}
+	qminiConfigStr = string(iniFileBytes)
+
+	iniFileBytes, err = ioutil.ReadFile(filepath.Join(qmgrDir, "mqat.ini"))
+	if err != nil {
+		return "", "", err
+	}
+	mqatiniConfigStr = string(iniFileBytes)
+
+	stanzaListMerge := make(map[string]strings.Builder)
+	stanzaListAppend := make(map[string]strings.Builder)
+	var sbAppend strings.Builder
+	var sbMerger strings.Builder
+
+	scanner := bufio.NewScanner(strings.NewReader(userconfig))
+	scanner.Split(bufio.ScanLines)
+	consumetoAppend := false
+	consumeToMerge := false
+	var stanza string
+
+	//read through the user file and prepare what we want.
+	for scanner.Scan() {
+		if strings.Contains(scanner.Text(), ":") {
+			consumetoAppend = false
+			consumeToMerge = false
+			stanza = scanner.Text()
+			//check if this stanza exists in the qm.ini/mqat.ini files
+			if strings.Contains(qminiConfigStr, stanza) ||
+				(strings.Contains(mqatiniConfigStr, stanza) && !(strings.Contains(stanza, "ApplicationTrace"))) {
+				consumeToMerge = true
+				sbMerger = strings.Builder{}
+
+				stanzaListMerge[stanza] = sbMerger
+			} else {
+				consumetoAppend = true
+				sbAppend = strings.Builder{}
+				stanzaListAppend[stanza] = sbAppend
+			}
+		} else {
+			if consumetoAppend {
+				sb := stanzaListAppend[stanza]
+				sb.WriteString(scanner.Text() + "\n")
+				stanzaListAppend[stanza] = sb
+			}
+			if consumeToMerge {
+				sb := stanzaListMerge[stanza]
+				sb.WriteString(scanner.Text() + "\n")
+				stanzaListMerge[stanza] = sb
+			}
+		}
+	}
+
+	//merge if stanza exits.
+	if len(stanzaListMerge) > 0 {
+		for key := range stanzaListMerge {
+			toWrite, filename := ValidateStanzaToWrite(key)
+			if toWrite {
+				attrList := stanzaListMerge[key]
+				switch filename {
+				case "qm.ini":
+					qminiConfigStr = prepareStanzasToMerge(key, attrList, qminiConfigStr)
+				case "mqat.ini":
+					mqatiniConfigStr = prepareStanzasToMerge(key, attrList, mqatiniConfigStr)
+				default:
+				}
+			}
+		}
+	}
+
+	//append new stanzas.
+	if len(stanzaListAppend) > 0 {
+		for key := range stanzaListAppend {
+			attrList := stanzaListAppend[key]
+			if strings.Contains(strings.Join(stanzasMQATINI, ", "), strings.TrimSuffix(strings.TrimSpace(key), ":")) {
+				mqatiniConfigStr = prepareStanzasToAppend(key, attrList, mqatiniConfigStr)
+			} else {
+				qminiConfigStr = prepareStanzasToAppend(key, attrList, qminiConfigStr)
+			}
+		}
+	}
+
+	return qminiConfigStr, mqatiniConfigStr, nil
+}
+
+//ValidateStanzaToWrite Validates stanza to be written and the file it belongs to.
+func ValidateStanzaToWrite(stanza string) (bool, string) {
+	stanza = strings.TrimSpace(stanza)
+	if strings.Contains(stanza, ":") {
+		stanza = stanza[:len(stanza)-1]
+	}
+
+	if strings.Contains(strings.Join(stanzasQMINI, ", "), stanza) {
+		return true, "qm.ini"
+	} else if strings.Contains(strings.Join(stanzasMQATINI, ", "), stanza) {
+		return true, "mqat.ini"
+	} else {
+		return false, ""
+	}
+}
+
+//prepareStanzasToAppend Prepares list of stanzas that are to be appended into qm ini files(qm.ini/mqat.ini)
+func prepareStanzasToAppend(key string, attrList strings.Builder, iniConfig string) string {
+	newVal := key + "\n" + attrList.String()
+	iniConfig = iniConfig + newVal
+	return iniConfig
+}
+
+//prepareStanzasToMerge Prepares list of stanzas that are to be updated into qm ini files(qm.ini/mqat.ini)
+//These stanzas are already present in mq ini files and their values have to be updated with user supplied ini.
+func prepareStanzasToMerge(key string, attrList strings.Builder, iniConfig string) string {
+	lineScanner := bufio.NewScanner(strings.NewReader(attrList.String()))
+	lineScanner.Split(bufio.ScanLines)
+	for lineScanner.Scan() {
+		attrLine := lineScanner.Text()
+		keyvalue := strings.Split(attrLine, "=")
+		//this line present in qm.ini, update value.
+		if strings.Contains(iniConfig, keyvalue[0]) {
+			re := regexp.MustCompile(keyvalue[0] + "=.*")
+			iniConfig = re.ReplaceAllString(iniConfig, attrLine)
+		} else { //this line not present in qm.ini file, add it.
+			re := regexp.MustCompile(key)
+			newVal := key + "\n" + attrLine
+			iniConfig = re.ReplaceAllString(iniConfig, newVal)
+		}
+	}
+	return iniConfig
+}
+
+//writeConfigStanzas Writes the ini file updates into corresponding mq ini files.
+func writeConfigStanzas(qmConfig string, atConfig string) error {
+
+	err := ioutil.WriteFile(filepath.Join(qmgrDir, "qm.ini"), []byte(qmConfig), 0644)
+	if err != nil {
+		return err
+	}
+
+	err = ioutil.WriteFile(filepath.Join(qmgrDir, "mqat.ini"), []byte(atConfig), 0644)
+	if err != nil {
+		return err
+	}
+	return nil
+}

internal/mqini/mqini_test.go

@@ -0,0 +1,202 @@
+/*
+© Copyright IBM Corporation 2018, 2019
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+package mqini
+
+import (
+	"bufio"
+	"io/ioutil"
+	"strings"
+	"testing"
+)
+
+var getQueueManagerTests = []struct {
+	file        string
+	name        string
+	prefix      string
+	directory   string
+	errorLogDir string
+}{
+	{"dspmqinf1.txt", "foo", "/var/mqm", "foo", "/var/mqm/qmgrs/foo/errors"},
+	{"dspmqinf2.txt", "a/b", "/var/mqm", "a&b", "/var/mqm/qmgrs/a&b/errors"},
+	{"dspmqinf3.txt", "..", "/var/mqm", "!!", "/var/mqm/qmgrs/!!/errors"},
+}
+
+func TestGetQueueManager(t *testing.T) {
+	for _, table := range getQueueManagerTests {
+		t.Run(table.file, func(t *testing.T) {
+			b, err := ioutil.ReadFile(table.file)
+			if err != nil {
+				t.Fatal(err)
+			}
+			qm, err := getQueueManagerFromStanza(string(b))
+			if err != nil {
+				t.Fatal(err)
+			}
+			t.Logf("%#v", qm)
+			if qm.Name != table.name {
+				t.Errorf("Expected name=%v; got %v", table.name, qm.Name)
+			}
+			if qm.Prefix != table.prefix {
+				t.Errorf("Expected prefix=%v; got %v", table.prefix, qm.Prefix)
+			}
+			if qm.Directory != table.directory {
+				t.Errorf("Expected directory=%v; got %v", table.directory, qm.Directory)
+			}
+
+			// Test
+			d := GetErrorLogDirectory(qm)
+			if d != table.errorLogDir {
+				t.Errorf("Expected error log directory=%v; got %v", table.errorLogDir, d)
+			}
+		})
+	}
+}
+
+func TestIniFileStanzas(t *testing.T) {
+	PopulateAllAvailableStanzas()
+
+	checkReturns("ApiExitLocal", true, true, t)
+	checkReturns("Channels", true, true, t)
+	checkReturns("TCP", true, true, t)
+	checkReturns("ServiceComponent", true, true, t)
+	checkReturns("Service", true, true, t)
+	checkReturns("AccessMode", true, true, t)
+	checkReturns("RestrictedMode", true, true, t)
+	checkReturns("XAResourceManager", true, true, t)
+	checkReturns("SSL", true, true, t)
+	checkReturns("Security", true, true, t)
+	checkReturns("TuningParameters", true, true, t)
+	checkReturns("ABC", false, false, t)
+	checkReturns("#1234ABD", true, false, t)
+	checkReturns("AllActivityTrace", false, true, t)
+	checkReturns("ApplicationTrace", false, true, t)
+	checkReturns("xyz123abvc", false, false, t)
+}
+
+func TestIniFile1Update(t *testing.T) {
+
+	iniFileBytes, err := ioutil.ReadFile("test1qm.ini")
+	if err != nil {
+		t.Errorf("Unexpected error: [%s]\n", err.Error())
+	}
+	userconfig := string(iniFileBytes)
+	qmConfig, atConfig, err := PrepareConfigStanzasToWrite(userconfig)
+	if err != nil {
+		t.Errorf("Unexpected error: [%s]\n", err.Error())
+	}
+	if len(atConfig) == 0 {
+		t.Errorf("Unexpected stanza file update: mqat.ini[%s]\n", atConfig)
+	}
+	if len(qmConfig) == 0 {
+		t.Errorf("Expected stanza file not found: qm.ini\n")
+	}
+
+	scanner := bufio.NewScanner(strings.NewReader(userconfig))
+	scanner.Split(bufio.ScanLines)
+	for scanner.Scan() {
+		line := scanner.Text()
+		if !strings.Contains(qmConfig, line) {
+			t.Errorf("Expected stanza line not found in updated string. line=%s\n, Stanza:%s\n", line, qmConfig)
+			break
+		}
+	}
+}
+
+func TestIniFile2Update(t *testing.T) {
+
+	iniFileBytes, err := ioutil.ReadFile("test2qm.ini")
+	if err != nil {
+		t.Errorf("Unexpected error: [%s]\n", err.Error())
+	}
+	userconfig := string(iniFileBytes)
+	qmConfig, atConfig, err := PrepareConfigStanzasToWrite(userconfig)
+	if err != nil {
+		t.Errorf("Unexpected error: [%s]\n", err.Error())
+	}
+	if len(atConfig) == 0 {
+		t.Errorf("Expected stanza file not found: mqat.ini\n")
+	}
+	if len(qmConfig) == 0 {
+		t.Errorf("Expected stanza file not found: qm.ini\n")
+	}
+
+	scanner := bufio.NewScanner(strings.NewReader(userconfig))
+	scanner.Split(bufio.ScanLines)
+	for scanner.Scan() {
+		line := scanner.Text()
+		if !strings.Contains(atConfig, line) {
+			t.Errorf("Expected stanza line not found in updated string. line=%s\n, Stanza:%s\n", line, qmConfig)
+			break
+		}
+	}
+}
+
+func TestIniFile3Update(t *testing.T) {
+
+	i := 0
+	iniFileBytes, err := ioutil.ReadFile("test3qm.ini")
+	if err != nil {
+		t.Errorf("Unexpected error: [%s]\n", err.Error())
+	}
+	userconfig := string(iniFileBytes)
+	qmConfig, atConfig, err := PrepareConfigStanzasToWrite(userconfig)
+	if err != nil {
+		t.Errorf("Unexpected error: [%s]\n", err.Error())
+	}
+	if len(qmConfig) == 0 {
+		t.Errorf("Unexpected stanza file update: qm.ini[%s]\n", atConfig)
+	}
+	if len(atConfig) == 0 {
+		t.Errorf("Expected stanza file not found: mqat.ini\n")
+	}
+
+	scanner := bufio.NewScanner(strings.NewReader(userconfig))
+	scanner.Split(bufio.ScanLines)
+	for scanner.Scan() {
+		line := scanner.Text()
+		i++
+		//first 20 lines of test3qm.ini shall go into qm.ini file and rest into mqat.ini file.
+		if i < 20 {
+			if !strings.Contains(qmConfig, line) {
+				t.Errorf("Expected stanza line not found in updated string. line=%s\n, Stanza:%s\n", line, qmConfig)
+			}
+		} else if i > 20 {
+			if !strings.Contains(atConfig, line) {
+				t.Errorf("Expected stanza line not found in updated string. line=%s\n, Stanza:%s\n", line, qmConfig)
+			}
+		}
+	}
+}
+
+func checkReturns(stanza string, isqmini bool, shouldexist bool, t *testing.T) {
+
+	exists, filename := ValidateStanzaToWrite(stanza)
+	if exists != shouldexist {
+		t.Errorf("Stanza should exist %t but found was %t", shouldexist, exists)
+	}
+
+	if shouldexist {
+		if isqmini {
+			if filename != "qm.ini" {
+				t.Errorf("Expected filename:qm.ini for stanza:%s. But got %s", stanza, filename)
+			}
+		} else {
+			if filename != "mqat.ini" {
+				t.Errorf("Expected filename:mqat.ini for stanza:%s. But got %s", stanza, filename)
+			}
+		}
+	}
+}

internal/mqini/qm.ini

@@ -0,0 +1,45 @@
+#*******************************************************************#
+#* Module Name: qm.ini                                             *#
+#* Type       : IBM MQ queue manager configuration file            *#
+#  Function   : Define the configuration of a single queue manager *#
+#*                                                                 *#
+#*******************************************************************#
+#* Notes      :                                                    *#
+#* 1) This file defines the configuration of the queue manager     *#
+#*                                                                 *#
+#*******************************************************************#
+ExitPath:
+   ExitsDefaultPath=C:\ProgramData\IBM\MQ\exits
+   ExitsDefaultPath64=C:\ProgramData\IBM\MQ\exits64
+InstanceData:
+   InstanceID=1562831591
+   Startup=ServiceManual
+#*                                                                 *#
+#*                                                                 *#
+Log:
+   LogPrimaryFiles=3
+   LogSecondaryFiles=2
+   LogFilePages=4096
+   LogType=CIRCULAR
+   LogBufferPages=0
+   LogPath=C:\ProgramData\IBM\MQ\log\INI1\
+   LogWriteIntegrity=TripleWrite
+Service:
+   Name=AuthorizationService
+   EntryPoints=14
+ServiceComponent:
+   Service=AuthorizationService
+   Name=MQSeries.WindowsNT.auth.service
+   Module=amqzfu.dll
+   ComponentDataSize=0
+Channels:
+   ChlauthEarlyAdopt=Y
+TCP:
+   SndBuffSize=0
+   RcvBuffSize=0
+   RcvSndBuffSize=0
+   RcvRcvBuffSize=0
+   ClntSndBuffSize=0
+   ClntRcvBuffSize=0
+   SvrSndBuffSize=0
+   SvrRcvBuffSize=0

internal/mqini/test1qm.ini

@@ -0,0 +1,5 @@
+ApiExitLocal:   
+  Sequence=1
+  Function=EntryPoint
+  Module=/opt/mylibs/mylib.so
+  Name=mylib

internal/mqini/test2qm.ini

@@ -0,0 +1,7 @@
+AllActivityTrace:
+  ActivityInterval=11
+  ActivityCount=1
+  TraceLevel=INFO
+ApplicationTrace:
+  ApplName=amqsget
+  Trace=ON

internal/mqini/test3qm.ini

@@ -0,0 +1,23 @@
+ApiExitLocal:   
+  Sequence=1
+  Function=EntryPoint
+  Module=/opt/MQOpenTracing/MQOpenTracingExit.so
+  Name=MQOpenTracingExit
+Channels:
+   MQIBindType=FASTPATH
+Log:
+   LogPrimaryFiles=30
+   LogType=CIRCULAR
+   LogPath=/ProgramfILES/IBM/MQ/log/INI1/
+TCP:
+   SndBuffSize=4095
+   RcvBuffSize=4095
+   RcvSndBuffSize=4095
+   RcvRcvBuffSize=4095
+   ClntSndBuffSize=2049
+   ClntRcvBuffSize=2049
+   SvrSndBuffSize=2049
+   SvrRcvBuffSize=2049 
+ApplicationTrace:
+  ApplName=amqsput
+  Trace=ON

internal/mqtemplate/mqtemplate.go

@@ -1,5 +1,5 @@
 /*
-© Copyright IBM Corporation 2018, 2020
+© Copyright IBM Corporation 2018, 2019
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -22,7 +22,8 @@ import (
 	"path"
 	"text/template"
 
-	"github.com/ibm-messaging/mq-container/pkg/logger"
+	"github.com/ibm-messaging/mq-container/internal/command"
+	"github.com/ibm-messaging/mq-container/internal/logger"
 )
 
 // ProcessTemplateFile takes a Go templateFile, and processes it with the
@@ -44,19 +45,37 @@ func ProcessTemplateFile(templateFile, destFile string, data interface{}, log *l
 				log.Error(err)
 				return err
 			}
+			mqmUID, mqmGID, err := command.LookupMQM()
+			if err != nil {
+				log.Error(err)
+				return err
+			}
+			err = os.Chown(dir, mqmUID, mqmGID)
+			if err != nil {
+				log.Error(err)
+				return err
+			}
 		} else {
 			return err
 		}
 	}
-
-	// #nosec G302 G304 G306 - its a read by owner/s group, and pose no harm.
+	// #nosec G302
 	f, err := os.OpenFile(destFile, os.O_CREATE|os.O_WRONLY, 0660)
-	// #nosec G307 - local to this function, pose no harm.
 	defer f.Close()
 	err = t.Execute(f, data)
 	if err != nil {
 		log.Error(err)
 		return err
 	}
+	mqmUID, mqmGID, err := command.LookupMQM()
+	if err != nil {
+		log.Error(err)
+		return err
+	}
+	err = os.Chown(destFile, mqmUID, mqmGID)
+	if err != nil {
+		log.Error(err)
+		return err
+	}
 	return nil
 }

internal/mqversion/mqversion.go

@@ -1,97 +0,0 @@
-/*
-© Copyright IBM Corporation 2020
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package mqversion
-
-import (
-	"fmt"
-	"strconv"
-	"strings"
-
-	"github.com/ibm-messaging/mq-container/internal/command"
-)
-
-// Get will return the current MQ version
-func Get() (string, error) {
-	mqVersion, _, err := command.Run("dspmqver", "-b", "-f", "2")
-	if err != nil {
-		return "", fmt.Errorf("Error Getting MQ version: %v", err)
-	}
-	return strings.TrimSpace(mqVersion), nil
-}
-
-// Compare returns an integer comparing two MQ version strings lexicographically. The result will be 0 if currentVersion==checkVersion, -1 if currentVersion < checkVersion, and +1 if currentVersion > checkVersion
-func Compare(checkVersion string) (int, error) {
-	currentVersion, err := Get()
-	if err != nil {
-		return 0, err
-	}
-
-	currentVRMF, err := parseVRMF(currentVersion)
-	if err != nil {
-		return 0, err
-	}
-	compareVRMF, err := parseVRMF(checkVersion)
-	if err != nil {
-		return 0, fmt.Errorf("failed to parse compare version: %w", err)
-	}
-	return currentVRMF.compare(*compareVRMF), nil
-}
-
-type vrmf [4]int
-
-func (v vrmf) String() string {
-	return fmt.Sprintf("%d.%d.%d.%d", v[0], v[1], v[2], v[3])
-}
-
-func (v vrmf) compare(to vrmf) int {
-	for idx := 0; idx < 4; idx++ {
-		if v[idx] < to[idx] {
-			return -1
-		}
-		if v[idx] > to[idx] {
-			return 1
-		}
-	}
-	return 0
-}
-
-func parseVRMF(vrmfString string) (*vrmf, error) {
-	versionParts := strings.Split(vrmfString, ".")
-	if len(versionParts) != 4 {
-		return nil, fmt.Errorf("incorrect number of parts to version string: expected 4, got %d", len(versionParts))
-	}
-	vmrfPartNames := []string{"version", "release", "minor", "fix"}
-	parsed := vrmf{}
-	for idx, value := range versionParts {
-		partName := vmrfPartNames[idx]
-		if value == "" {
-			return nil, fmt.Errorf("empty %s found in VRMF", partName)
-		}
-		val, err := strconv.Atoi(value)
-		if err != nil {
-			return nil, fmt.Errorf("non-numeric %s found in VRMF", partName)
-		}
-		if val < 0 {
-			return nil, fmt.Errorf("negative %s found in VRMF", partName)
-		}
-		if idx == 0 && val == 0 {
-			return nil, fmt.Errorf("zero value for version not allowed")
-		}
-		parsed[idx] = val
-	}
-	return &parsed, nil
-}

internal/mqversion/mqversion_test.go

@@ -1,147 +0,0 @@
-/*
-© Copyright IBM Corporation 2020
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package mqversion
-
-import (
-	"fmt"
-	"testing"
-)
-
-func TestCompareLower(t *testing.T) {
-	checkVersion := "99.99.99.99"
-	mqVersionCheck, err := Compare(checkVersion)
-	if err != nil {
-		t.Fatalf("Failed to compare MQ versions: %v", err)
-	}
-	if mqVersionCheck != -1 {
-		t.Errorf("MQ version compare result failed. Expected -1, Got %v", mqVersionCheck)
-	}
-}
-
-func TestCompareHigher(t *testing.T) {
-	checkVersion := "1.1.1.1"
-	mqVersionCheck, err := Compare(checkVersion)
-	if err != nil {
-		t.Fatalf("Failed to compare MQ versions: %v", err)
-	}
-	if mqVersionCheck != 1 {
-		t.Errorf("MQ version compare result failed. Expected 1, Got %v", mqVersionCheck)
-	}
-}
-
-func TestCompareEqual(t *testing.T) {
-	checkVersion, err := Get()
-	if err != nil {
-		t.Fatalf("Failed to get current MQ version: %v", err)
-	}
-	mqVersionCheck, err := Compare(checkVersion)
-	if err != nil {
-		t.Fatalf("Failed to compare MQ versions: %v", err)
-	}
-	if mqVersionCheck != 0 {
-		t.Errorf("MQ version compare result failed. Expected 0, Got %v", mqVersionCheck)
-	}
-}
-
-func TestVersionValid(t *testing.T) {
-	checkVersion, err := Get()
-	if err != nil {
-		t.Fatalf("Failed to get current MQ version: %v", err)
-	}
-	_, err = parseVRMF(checkVersion)
-	if err != nil {
-		t.Fatalf("Validation of MQ version failed: %v", err)
-	}
-}
-
-func TestValidVRMF(t *testing.T) {
-	validVRMFs := map[string]vrmf{
-		"1.0.0.0":         {1, 0, 0, 0},
-		"10.0.0.0":        {10, 0, 0, 0},
-		"1.10.0.0":        {1, 10, 0, 0},
-		"1.0.10.0":        {1, 0, 10, 0},
-		"1.0.0.10":        {1, 0, 0, 10},
-		"999.998.997.996": {999, 998, 997, 996},
-	}
-	for test, expect := range validVRMFs {
-		t.Run(test, func(t *testing.T) {
-			parsed, err := parseVRMF(test)
-			if err != nil {
-				t.Fatalf("Unexpectedly failed to parse VRMF '%s': %s", test, err.Error())
-			}
-			if *parsed != expect {
-				t.Fatalf("VRMF not parsed as expected. Expected '%v', got '%v'", parsed, expect)
-			}
-		})
-	}
-}
-
-func TestInvalidVRMF(t *testing.T) {
-	invalidVRMFs := []string{
-		"not-a-number",
-		"9.8.7.string",
-		"0.1.2.3",
-		"1.0.0.-10",
-	}
-	for _, test := range invalidVRMFs {
-		t.Run(test, func(t *testing.T) {
-			parsed, err := parseVRMF(test)
-			if err == nil {
-				t.Fatalf("Expected error when parsing VRMF '%s', but got none.  VRMF returned: %v", test, parsed)
-			}
-		})
-	}
-}
-
-func TestCompare(t *testing.T) {
-	tests := []struct {
-		current string
-		compare string
-		expect  int
-	}{
-		{"1.0.0.1", "1.0.0.1", 0},
-		{"1.0.0.1", "1.0.0.0", 1},
-		{"1.0.0.1", "1.0.0.2", -1},
-		{"9.9.9.9", "10.0.0.0", -1},
-		{"9.9.9.9", "9.10.0.0", -1},
-		{"9.9.9.9", "9.9.10.0", -1},
-		{"9.9.9.9", "9.9.9.10", -1},
-	}
-	for _, test := range tests {
-		t.Run(fmt.Sprintf("%s-%s", test.current, test.compare), func(t *testing.T) {
-			baseVRMF, err := parseVRMF(test.current)
-			if err != nil {
-				t.Fatalf("Could not parse base version '%s': %s", test.current, err.Error())
-			}
-			compareVRMF, err := parseVRMF(test.compare)
-			if err != nil {
-				t.Fatalf("Could not parse current version '%s': %s", test.current, err.Error())
-			}
-			result := baseVRMF.compare(*compareVRMF)
-			if result != test.expect {
-				t.Fatalf("Expected %d but got %d when comparing '%s' with '%s'", test.expect, result, test.current, test.compare)
-			}
-			if test.expect == 0 {
-				return
-			}
-			resultReversed := compareVRMF.compare(*baseVRMF)
-			if resultReversed != test.expect*-1 {
-				t.Fatalf("Expected %d but got %d when comparing '%s' with '%s'", test.expect*-1, resultReversed, test.compare, test.current)
-			}
-		})
-	}
-}

internal/name/name.go

@@ -1,5 +1,5 @@
 /*
-© Copyright IBM Corporation 2017, 2019
+© Copyright IBM Corporation 2017
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

internal/name/name_test.go

@@ -1,5 +1,5 @@
 /*
-© Copyright IBM Corporation 2017, 2019
+© Copyright IBM Corporation 2017
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

internal/ready/ready.go

@@ -53,7 +53,6 @@ func Clear() error {
 // Set lets any subsequent calls to `CheckReady` know that the queue
 // manager has finished its configuration step
 func Set() error {
-	// #nosec G306 - this gives permissions to owner/s group only.
 	return ioutil.WriteFile(fileName, []byte("1"), 0770)
 }
 
@@ -77,11 +76,6 @@ func IsRunningAsStandbyQM(name string) (bool, error) {
 	return isRunningQM(name, "(RUNNING AS STANDBY)")
 }
 
-// IsRunningAsReplicaQM returns true if the queue manager is running in replica mode
-func IsRunningAsReplicaQM(name string) (bool, error) {
-	return isRunningQM(name, "(REPLICA)")
-}
-
 func isRunningQM(name string, status string) (bool, error) {
 	out, _, err := command.Run("dspmq", "-n", "-m", name)
 	if err != nil {

internal/tls/tls_web.go

@@ -1,97 +0,0 @@
-/*
-© Copyright IBM Corporation 2019, 2021
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-package tls
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-
-	"github.com/ibm-messaging/mq-container/internal/keystore"
-)
-
-// webKeystoreDefault is the name of the default web server Keystore
-const webKeystoreDefault = "default.p12"
-
-// ConfigureWebTLS configures TLS for the web server
-func ConfigureWebTLS(keyLabel string) error {
-
-	// Return immediately if we have no certificate to use as identity
-	if keyLabel == "" && os.Getenv("MQ_GENERATE_CERTIFICATE_HOSTNAME") == "" {
-		return nil
-	}
-
-	webConfigDir := "/etc/mqm/web/installations/Installation1/servers/mqweb"
-	tls := "tls.xml"
-
-	tlsConfig := filepath.Join(webConfigDir, tls)
-	newTLSConfig := filepath.Join(webConfigDir, tls+".tpl")
-
-	err := os.Remove(tlsConfig)
-	if err != nil {
-		return fmt.Errorf("Failed to delete file %s: %v", tlsConfig, err)
-	}
-
-	// Symlink here to prevent issues on restart
-	err = os.Symlink(newTLSConfig, tlsConfig)
-	if err != nil {
-		return fmt.Errorf("Failed to create symlink %s->%s: %v", newTLSConfig, tlsConfig, err)
-	}
-
-	return nil
-}
-
-// ConfigureWebKeyStore configures the Web Keystore
-func ConfigureWebKeystore(p12Truststore KeyStoreData, webKeystore string) (string, error) {
-
-	if webKeystore == "" {
-		webKeystore = webKeystoreDefault
-	}
-	webKeystoreFile := filepath.Join(keystoreDirDefault, webKeystore)
-
-	// Check if a new self-signed certificate should be generated
-	genHostName := os.Getenv("MQ_GENERATE_CERTIFICATE_HOSTNAME")
-	if genHostName != "" {
-
-		// Create the Web Keystore
-		newWebKeystore := keystore.NewPKCS12KeyStore(webKeystoreFile, p12Truststore.Password)
-		err := newWebKeystore.Create()
-		if err != nil {
-			return "", fmt.Errorf("Failed to create Web Keystore %s: %v", webKeystoreFile, err)
-		}
-
-		// Generate a new self-signed certificate in the Web Keystore
-		err = newWebKeystore.CreateSelfSignedCertificate("default", fmt.Sprintf("CN=%s", genHostName), genHostName)
-		if err != nil {
-			return "", fmt.Errorf("Failed to generate certificate in Web Keystore %s with DN of 'CN=%s': %v", webKeystoreFile, genHostName, err)
-		}
-
-	} else {
-		// Check Web Keystore already exists
-		_, err := os.Stat(webKeystoreFile)
-		if err != nil {
-			return "", fmt.Errorf("Failed to find existing Web Keystore %s: %v", webKeystoreFile, err)
-		}
-	}
-
-	// Check Web Truststore already exists
-	_, err := os.Stat(p12Truststore.Keystore.Filename)
-	if err != nil {
-		return "", fmt.Errorf("Failed to find existing Web Truststore %s: %v", p12Truststore.Keystore.Filename, err)
-	}
-
-	return webKeystore, nil
-}

internal/user/user.go

@@ -1,5 +1,5 @@
 /*
-© Copyright IBM Corporation 2018, 2020
+© Copyright IBM Corporation 2018, 2019
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,26 +16,66 @@ limitations under the License.
 package user
 
 import (
-	"golang.org/x/sys/unix"
+	"fmt"
+	"os/user"
+	"strings"
+
+	"github.com/ibm-messaging/mq-container/internal/command"
 )
 
 // User holds information on primary and supplemental OS groups
 type User struct {
-	UID             int
-	PrimaryGID      int
-	SupplementalGID []int
+	UID             string
+	Name            string
+	PrimaryGID      string
+	SupplementalGID []string
 }
 
 // GetUser returns the current user and group information
 func GetUser() (User, error) {
-	u := User{
-		UID:        unix.Geteuid(),
-		PrimaryGID: unix.Getgid(),
-	}
-	groups, err := unix.Getgroups()
+	u, err := user.Current()
 	if err != nil {
-		return u, err
+		return User{}, err
 	}
-	u.SupplementalGID = groups
-	return u, nil
+	g, err := getCurrentUserGroups()
+	if err != nil {
+		return User{}, err
+	}
+	if err != nil && len(g) == 0 {
+		return User{
+			UID:             u.Uid,
+			Name:            u.Name,
+			PrimaryGID:      u.Gid,
+			SupplementalGID: []string{},
+		}, nil
+	}
+	// Look for the primary group in the list of group IDs
+	for i, v := range g {
+		if v == u.Gid {
+			// Remove the element from the slice
+			g = append(g[:i], g[i+1:]...)
+		}
+	}
+	return User{
+		UID:             u.Uid,
+		Name:            u.Name,
+		PrimaryGID:      u.Gid,
+		SupplementalGID: g,
+	}, nil
+}
+
+func getCurrentUserGroups() ([]string, error) {
+	var nilArray []string
+	out, _, err := command.Run("id", "--groups")
+	if err != nil {
+		return nilArray, err
+	}
+
+	out = strings.TrimSpace(out)
+	if out == "" {
+		return nilArray, fmt.Errorf("Unable to determine groups for current user")
+	}
+
+	groups := strings.Split(out, " ")
+	return groups, nil
 }

manifests/README.md

@@ -1,7 +1,7 @@
 Fat manifests
 =============
 
-These are the fat manifests used by Docker Hub to handle images with multiple CPU architectures.
+These are the fat manifests used by Docker Hub and Docker store to handle images with multiple CPU architectures.
 
 They are used in conjunction with [manifest-tool](https://github.com/estesp/manifest-tool), for example:
 

manifests/dockerhub/manifest-9.1.3.yaml

@@ -12,17 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-image: ibmcom/mq:9.1.3.0-r3
+image: ibmcom/mq:9.1.3.0-r2
 manifests:
-  - image: ibmcom/mq:9.1.3.0-r3-amd64
+  - image: ibmcom/mq:9.1.3.0-r2-amd64
     platform:
       architecture: amd64
       os: linux
-  - image: ibmcom/mq:9.1.3.0-r3-ppc64le
+  - image: ibmcom/mq:9.1.3.0-r2-ppc64le
     platform:
       architecture: ppc64le
       os: linux
-  - image: ibmcom/mq:9.1.3.0-r3-s390x
+  - image: ibmcom/mq:9.1.3.0-r2-s390x
     platform:
       architecture: s390x
       os: linux

manifests/dockerhub/manifest-latest.yaml

@@ -1,4 +1,4 @@
-# © Copyright IBM Corporation 2018, 2020
+# © Copyright IBM Corporation 2018, 2019
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,7 +14,15 @@
 
 image: ibmcom/mq:latest
 manifests:
-  - image: ibmcom/mq:9.2.0.0-r1-amd64
+  - image: ibmcom/mq:9.1.3.0-r2-amd64
     platform:
       architecture: amd64
       os: linux
+  - image: ibmcom/mq:9.1.3.0-r2-ppc64le
+    platform:
+      architecture: ppc64le
+      os: linux
+  - image: ibmcom/mq:9.1.3.0-r2-s390x
+    platform:
+      architecture: s390x
+      os: linux

manifests/dockerstore/manifest-9.1.1.yaml

@@ -1,4 +1,4 @@
-# © Copyright IBM Corporation 2020
+# © Copyright IBM Corporation 2018
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,17 +12,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-image: ibmcom/mq:9.1.5.0-r1
+image: ibmcorp/mqadvanced-server-dev:9.1.1.0
 manifests:
-  - image: ibmcom/mq:9.1.5.0-r1-amd64
+  - image: ibmcorp/mqadvanced-server-dev:9.1.1.0-x86_64
     platform:
       architecture: amd64
       os: linux
-  - image: ibmcom/mq:9.1.5.0-r1-ppc64le
+  - image: ibmcorp/mqadvanced-server-dev:9.1.1.0-ppc64le
     platform:
       architecture: ppc64le
       os: linux
-  - image: ibmcom/mq:9.1.5.0-r1-s390x
+  - image: ibmcorp/mqadvanced-server-dev:9.1.1.0-s390x
     platform:
       architecture: s390x
-      os: linux
+      os: linux
+

manifests/dockerstore/manifest-9.1.2-UBI.yaml

@@ -0,0 +1,28 @@
+# © Copyright IBM Corporation 2019
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+image: ibmcorp/mqadvanced-server-dev:9.1.2.0-UBI
+manifests:
+  - image: ibmcorp/mqadvanced-server-dev:9.1.2.0-UBI-amd64
+    platform:
+      architecture: amd64
+      os: linux
+  - image: ibmcorp/mqadvanced-server-dev:9.1.2.0-UBI-ppc64le
+    platform:
+      architecture: ppc64le
+      os: linux
+  - image: ibmcorp/mqadvanced-server-dev:9.1.2.0-UBI-s390x
+    platform:
+      architecture: s390x
+      os: linux

manifests/dockerstore/manifest-9.1.2.yaml

@@ -0,0 +1,29 @@
+# © Copyright IBM Corporation 2018, 2019
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+image: ibmcorp/mqadvanced-server-dev:9.1.2.0
+manifests:
+  - image: ibmcorp/mqadvanced-server-dev:9.1.2.0-x86_64
+    platform:
+      architecture: amd64
+      os: linux
+  - image: ibmcorp/mqadvanced-server-dev:9.1.2.0-ppc64le
+    platform:
+      architecture: ppc64le
+      os: linux
+  - image: ibmcorp/mqadvanced-server-dev:9.1.2.0-s390x
+    platform:
+      architecture: s390x
+      os: linux
+

manifests/dockerstore/manifest-9.1.3.yaml

@@ -12,17 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-image: ibmcom/mq:9.1.4.0-r1
+image: ibmcorp/mqadvanced-server-dev:9.1.3.0-r2
 manifests:
-  - image: ibmcom/mq:9.1.4.0-r1-amd64
+  - image: ibmcorp/mqadvanced-server-dev:9.1.3.0-r2-amd64
     platform:
       architecture: amd64
       os: linux
-  - image: ibmcom/mq:9.1.4.0-r1-ppc64le
+  - image: ibmcorp/mqadvanced-server-dev:9.1.3.0-r2-ppc64le
     platform:
       architecture: ppc64le
       os: linux
-  - image: ibmcom/mq:9.1.4.0-r1-s390x
+  - image: ibmcorp/mqadvanced-server-dev:9.1.3.0-r2-s390x
     platform:
       architecture: s390x
       os: linux

manifests/dockerstore/manifest-9.1.yaml

@@ -0,0 +1,29 @@
+# © Copyright IBM Corporation 2018
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+image: ibmcorp/mqadvanced-server-dev:9.1.0.0
+manifests:
+  - image: ibmcorp/mqadvanced-server-dev:9.1.0.0-x86_64
+    platform:
+      architecture: amd64
+      os: linux
+  - image: ibmcorp/mqadvanced-server-dev:9.1.0.0-ppc64le
+    platform:
+      architecture: ppc64le
+      os: linux
+  - image: ibmcorp/mqadvanced-server-dev:9.1.0.0-s390x
+    platform:
+      architecture: s390x
+      os: linux
+

pkg/mqini/mqini.go

@@ -1,92 +0,0 @@
-/*
-© Copyright IBM Corporation 2018, 2019
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Package mqini provides information about queue managers
-package mqini
-
-import (
-	"bufio"
-	"errors"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/ibm-messaging/mq-container/internal/command"
-)
-
-// QueueManager describe high-level configuration information for a queue manager
-type QueueManager struct {
-	Name             string
-	Prefix           string
-	Directory        string
-	DataPath         string
-	InstallationName string
-}
-
-// getQueueManagerFromStanza parses a queue manager stanza
-func getQueueManagerFromStanza(stanza string) (*QueueManager, error) {
-	scanner := bufio.NewScanner(strings.NewReader(stanza))
-	qm := QueueManager{}
-	for scanner.Scan() {
-		l := scanner.Text()
-		l = strings.TrimSpace(l)
-		t := strings.Split(l, "=")
-		switch t[0] {
-		case "Name":
-			qm.Name = t[1]
-		case "Prefix":
-			qm.Prefix = t[1]
-		case "Directory":
-			qm.Directory = t[1]
-		case "DataPath":
-			qm.DataPath = t[1]
-		case "InstallationName":
-			qm.InstallationName = t[1]
-		}
-	}
-	return &qm, scanner.Err()
-}
-
-// GetQueueManager returns queue manager configuration information
-func GetQueueManager(name string) (*QueueManager, error) {
-	_, err := os.Stat("/var/mqm/mqs.ini")
-	if err != nil {
-		// Don't run dspmqinf, which will generate an FDC if mqs.ini isn't there yet
-		return nil, errors.New("dspmqinf should not be run before crtmqdir")
-	}
-	// dspmqinf essentially returns a subset of mqs.ini, but it's simpler to parse
-	out, _, err := command.Run("dspmqinf", "-o", "stanza", name)
-	if err != nil {
-		return nil, err
-	}
-	return getQueueManagerFromStanza(out)
-}
-
-// GetErrorLogDirectory returns the directory holding the error logs for the
-// specified queue manager
-func GetErrorLogDirectory(qm *QueueManager) string {
-	return filepath.Join(GetDataDirectory(qm), "errors")
-}
-
-// GetDataDirectory returns the data directory for the specified queue manager
-func GetDataDirectory(qm *QueueManager) string {
-	if qm.DataPath != "" {
-		// Data path has been set explicitly (e.g. for multi-instance queue manager)
-		return qm.DataPath
-	} else {
-		return filepath.Join(qm.Prefix, "qmgrs", qm.Directory)
-	}
-}

pkg/mqini/mqini_test.go

@@ -1,64 +0,0 @@
-/*
-© Copyright IBM Corporation 2018, 2019
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-package mqini
-
-import (
-	"io/ioutil"
-	"testing"
-)
-
-var getQueueManagerTests = []struct {
-	file        string
-	name        string
-	prefix      string
-	directory   string
-	errorLogDir string
-}{
-	{"dspmqinf1.txt", "foo", "/var/mqm", "foo", "/var/mqm/qmgrs/foo/errors"},
-	{"dspmqinf2.txt", "a/b", "/var/mqm", "a&b", "/var/mqm/qmgrs/a&b/errors"},
-	{"dspmqinf3.txt", "..", "/var/mqm", "!!", "/var/mqm/qmgrs/!!/errors"},
-}
-
-func TestGetQueueManager(t *testing.T) {
-	for _, table := range getQueueManagerTests {
-		t.Run(table.file, func(t *testing.T) {
-			b, err := ioutil.ReadFile(table.file)
-			if err != nil {
-				t.Fatal(err)
-			}
-			qm, err := getQueueManagerFromStanza(string(b))
-			if err != nil {
-				t.Fatal(err)
-			}
-			t.Logf("%#v", qm)
-			if qm.Name != table.name {
-				t.Errorf("Expected name=%v; got %v", table.name, qm.Name)
-			}
-			if qm.Prefix != table.prefix {
-				t.Errorf("Expected prefix=%v; got %v", table.prefix, qm.Prefix)
-			}
-			if qm.Directory != table.directory {
-				t.Errorf("Expected directory=%v; got %v", table.directory, qm.Directory)
-			}
-
-			// Test
-			d := GetErrorLogDirectory(qm)
-			if d != table.errorLogDir {
-				t.Errorf("Expected error log directory=%v; got %v", table.errorLogDir, d)
-			}
-		})
-	}
-}

source-branch.env

@@ -1,7 +0,0 @@
-###########################################################################################################################################################
-
-# SOURCE_BRANCH is the repository branch name for this release stream. 
-# It should be updated when a new release fork is created but not for testing of personal builds or pre-fork updates.
-SOURCE_BRANCH ?= v9.3.0.x
-
-###########################################################################################################################################################

test/docker/Gopkg.lock

@@ -0,0 +1,114 @@
+# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
+
+
+[[projects]]
+  branch = "master"
+  name = "github.com/Azure/go-ansiterm"
+  packages = [
+    ".",
+    "winterm"
+  ]
+  revision = "d6e3b3328b783f23731bc4d058875b0371ff8109"
+
+[[projects]]
+  name = "github.com/Microsoft/go-winio"
+  packages = ["."]
+  revision = "7da180ee92d8bd8bb8c37fc560e673e6557c392f"
+  version = "v0.4.7"
+
+[[projects]]
+  name = "github.com/Sirupsen/logrus"
+  packages = ["."]
+  revision = "c155da19408a8799da419ed3eeb0cb5db0ad5dbc"
+  version = "v1.0.5"
+
+[[projects]]
+  name = "github.com/docker/distribution"
+  packages = [
+    "digest",
+    "reference"
+  ]
+  revision = "48294d928ced5dd9b378f7fd7c6f5da3ff3f2c89"
+  version = "v2.6.2"
+
+[[projects]]
+  name = "github.com/docker/docker"
+  packages = [
+    "api/types",
+    "api/types/blkiodev",
+    "api/types/container",
+    "api/types/events",
+    "api/types/filters",
+    "api/types/mount",
+    "api/types/network",
+    "api/types/reference",
+    "api/types/registry",
+    "api/types/strslice",
+    "api/types/swarm",
+    "api/types/time",
+    "api/types/versions",
+    "api/types/volume",
+    "client",
+    "pkg/jsonlog",
+    "pkg/jsonmessage",
+    "pkg/stdcopy",
+    "pkg/term",
+    "pkg/term/windows",
+    "pkg/tlsconfig"
+  ]
+  revision = "f5ec1e2936dcbe7b5001c2b817188b095c700c27"
+  version = "v17.03.2-ce"
+
+[[projects]]
+  name = "github.com/docker/go-connections"
+  packages = [
+    "nat",
+    "sockets",
+    "tlsconfig"
+  ]
+  revision = "3ede32e2033de7505e6500d6c868c2b9ed9f169d"
+  version = "v0.3.0"
+
+[[projects]]
+  name = "github.com/docker/go-units"
+  packages = ["."]
+  revision = "0dadbb0345b35ec7ef35e228dabb8de89a65bf52"
+  version = "v0.3.2"
+
+[[projects]]
+  name = "github.com/pkg/errors"
+  packages = ["."]
+  revision = "645ef00459ed84a119197bfb8d8205042c6df63d"
+  version = "v0.8.0"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/crypto"
+  packages = ["ssh/terminal"]
+  revision = "88942b9c40a4c9d203b82b3731787b672d6e809b"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/net"
+  packages = [
+    "context",
+    "context/ctxhttp",
+    "proxy"
+  ]
+  revision = "6078986fec03a1dcc236c34816c71b0e05018fda"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/sys"
+  packages = [
+    "unix",
+    "windows"
+  ]
+  revision = "13d03a9a82fba647c21a0ef8fba44a795d0f0835"
+
+[solve-meta]
+  analyzer-name = "dep"
+  analyzer-version = 1
+  inputs-digest = "c792836365447209421d5dc68a75fa77063408b8a6a2f9325b976581a0d60107"
+  solver-name = "gps-cdcl"
+  solver-version = 1