Added MQSCO structure for better TLS controls

Author: ibmmqmet

README.md

@@ -170,9 +170,9 @@ See the [README](cmd/mq_json/README.md) for more details.
 * Removed xxx_CURRENT_LENGTH definitions from cmqc
 
 10 Jan 2017
-* Added support for the MQCD structure to allow programmable client
-connectivity, without requiring a CCDT. See the clienttest program
-for an example of using it.
+* Added support for the MQCD and MQSCO structures to allow programmable client
+connectivity, without requiring a CCDT. See the clientconn sample program
+for an example of using the MQCD.
 * Moved sample programs into subdirectory
 
 ## Health Warning

cmd/samples/clientconn/clientconn.go

@@ -0,0 +1,114 @@
+/*
+This is a short sample to show how to connect to a remote
+queue manager in a Go program without requiring external
+client configuration such as a CCDT. Only the basic
+parameters are needed here - channel name and connection information -
+along with the queue manager name.
+
+For example, run as
+   clientconn QMGR1 "SYSTEM.DEF.SVRCONN" "myhost.example.com(1414)"
+
+If the MQSAMP_USER_ID environment variable is set, then a userid/password
+flow is also made to authenticate to the queue manager.
+
+There is no attempt in this sample to configure advanced security features
+such TLS.
+
+If an error occurs, the error is reported.
+*/
+package main
+
+/*
+  Copyright (c) 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.
+  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
+
+   Contributors:
+     Mark Taylor - Initial Contribution
+*/
+
+import (
+        "bufio"
+        "fmt"
+        "ibmmq"
+        "os"
+        "time"
+)
+
+func main() {
+        var qMgrName string
+        var err error
+        var qMgr ibmmq.MQQueueManager
+
+        if len(os.Args) != 4 {
+                fmt.Println("clientconn <qmgrname> <channelname> <conname>")
+                fmt.Println("")
+                fmt.Println("For example")
+                fmt.Println("  clientconn QMGR1 \"SYSTEM.DEF.SVRCONN\" \"myhost.example.com(1414)\"")
+                fmt.Println("All parameters are required.")
+                os.Exit(1)
+        }
+
+        // Which queue manager do we want to connect to
+        qMgrName = os.Args[1]
+
+        // Allocate the MQCNO and MQCD structures needed for the
+        // MQCONNX call.
+        cno := ibmmq.NewMQCNO()
+        cd := ibmmq.NewMQCD()
+
+        // Fill in the required fields in the
+        // MQCD channel definition structure
+        cd.ChannelName = os.Args[2]
+        cd.ConnectionName = os.Args[3]
+
+        // Reference the CD structure from the CNO
+        // and indicate that we want to use the client
+        // connection method.
+        cno.ClientConn = cd
+        cno.Options = ibmmq.MQCNO_CLIENT_BINDING
+
+        // Also fill in the userid and password if the MQSAMP_USER_ID
+        // environment variable is set. This is the same as the C
+        // sample programs such as amqsput.
+        userId := os.Getenv("MQSAMP_USER_ID")
+        if userId != "" {
+                scanner := bufio.NewScanner(os.Stdin)
+                csp := ibmmq.NewMQCSP()
+                csp.AuthenticationType = ibmmq.MQCSP_AUTH_USER_ID_AND_PWD
+                csp.UserId = userId
+
+                fmt.Println("Enter password : ")
+                scanner.Scan()
+                csp.Password = scanner.Text()
+
+                // And make the CNO refer to the CSP structure
+                cno.SecurityParms = csp
+        }
+
+        // And connect. Wait a short time before
+        // disconnecting.
+        qMgr, mqreturn, err := ibmmq.Connx(qMgrName, cno)
+        if err == nil {
+                fmt.Printf("Connection to %s succeeded.\n", qMgrName)
+                d, _ := time.ParseDuration("5s")
+                time.Sleep(d)
+                qMgr.Disc()
+        } else {
+                fmt.Printf("Connection to %s failed.\n", qMgrName)
+                fmt.Println(err)
+        }
+
+        fmt.Println("Done.")
+        os.Exit((int)(mqreturn.MQCC))
+
+}

cmd/samples/clienttest/clienttest.go

@@ -97,7 +97,7 @@ MQ_CLIENT_CONN_DEFAULT structure for consistency.
 func copyCDtoC(mqcd *C.MQCD, gocd *MQCD) {
 
 	setMQIString((*C.char)(&mqcd.ChannelName[0]), gocd.ChannelName, C.MQ_CHANNEL_NAME_LENGTH)
-	mqcd.Version = C.MQCD_VERSION_11
+	mqcd.Version = C.MQCD_VERSION_11 // The version this is written to match
 	mqcd.ChannelType = C.MQCHT_CLNTCONN
 	mqcd.TransportType = C.MQXPT_TCP
 	setMQIString((*C.char)(&mqcd.Desc[0]), "", C.MQ_CHANNEL_DESC_LENGTH)
@@ -139,7 +139,7 @@ func copyCDtoC(mqcd *C.MQCD, gocd *MQCD) {
 	mqcd.HeartbeatInterval = 1
 	mqcd.BatchInterval = 0
 	mqcd.NonPersistentMsgSpeed = C.MQNPMS_FAST
-	mqcd.StrucLength = C.MQCD_CURRENT_LENGTH
+	mqcd.StrucLength = C.MQCD_LENGTH_11
 	mqcd.ExitNameLength = C.MQ_EXIT_NAME_LENGTH
 	mqcd.ExitDataLength = C.MQ_EXIT_DATA_LENGTH
 	mqcd.MsgExitsDefined = 0

ibmmq/mqiMQCD.go

@@ -40,6 +40,7 @@ type MQCNO struct {
 	SecurityParms *MQCSP
 	CCDTUrl       string
 	ClientConn    *MQCD
+	SSLConfig     *MQSCO
 }
 
 /*
@@ -82,41 +83,52 @@ func copyCNOtoC(mqcno *C.MQCNO, gocno *MQCNO) {
 	var i int
 	var mqcsp C.PMQCSP
 	var mqcd C.PMQCD
+	var mqsco C.PMQSCO
 
 	setMQIString((*C.char)(&mqcno.StrucId[0]), "CNO ", 4)
 	mqcno.Version = C.MQLONG(gocno.Version)
 	mqcno.Options = C.MQLONG(gocno.Options)
 
-	mqcno.ClientConnOffset = 0
-	mqcno.ClientConnPtr = nil
-
 	for i = 0; i < C.MQ_CONN_TAG_LENGTH; i++ {
 		mqcno.ConnTag[i] = 0
 	}
 	for i = 0; i < C.MQ_CONNECTION_ID_LENGTH; i++ {
 		mqcno.ConnectionId[i] = 0
 	}
 
-	mqcno.SSLConfigOffset = 0
-	mqcno.SSLConfigPtr = nil
-
+	mqcno.ClientConnOffset = 0
 	if gocno.ClientConn != nil {
 		gocd := gocno.ClientConn
-		mqcd = C.PMQCD(C.malloc(C.MQCD_CURRENT_LENGTH))
+		mqcd = C.PMQCD(C.malloc(C.MQCD_LENGTH_11))
 		copyCDtoC(mqcd, gocd)
 		mqcno.ClientConnPtr = C.MQPTR(mqcd)
 		if gocno.Version < 2 {
 			mqcno.Version = C.MQCNO_VERSION_2
 		}
+	} else {
+		mqcno.ClientConnPtr = nil
+	}
+
+	mqcno.SSLConfigOffset = 0
+	if gocno.SSLConfig != nil {
+		gosco := gocno.SSLConfig
+		mqsco = C.PMQSCO(C.malloc(C.MQSCO_LENGTH_5))
+		copySCOtoC(mqsco, gosco)
+		mqcno.SSLConfigPtr = C.PMQSCO(mqsco)
+		if gocno.Version < 4 {
+			mqcno.Version = C.MQCNO_VERSION_4
+		}
+	} else {
+		mqcno.SSLConfigPtr = nil
 	}
 
 	mqcno.SecurityParmsOffset = 0
 	if gocno.SecurityParms != nil {
 		gocsp := gocno.SecurityParms
 
-		mqcsp = C.PMQCSP(C.malloc(C.MQCSP_CURRENT_LENGTH))
+		mqcsp = C.PMQCSP(C.malloc(C.MQCSP_LENGTH_1))
 		setMQIString((*C.char)(&mqcsp.StrucId[0]), "CSP ", 4)
-		mqcsp.Version = C.MQCSP_CURRENT_VERSION
+		mqcsp.Version = C.MQCSP_VERSION_1
 		mqcsp.AuthenticationType = C.MQLONG(gocsp.AuthenticationType)
 		mqcsp.CSPUserIdOffset = 0
 		mqcsp.CSPPasswordOffset = 0
@@ -166,6 +178,11 @@ func copyCNOfromC(mqcno *C.MQCNO, gocno *MQCNO) {
 		C.free(unsafe.Pointer(mqcno.ClientConnPtr))
 	}
 
+	if mqcno.SSLConfigPtr != nil {
+		copySCOfromC(C.PMQSCO(mqcno.SSLConfigPtr), gocno.SSLConfig)
+		C.free(unsafe.Pointer(mqcno.SSLConfigPtr))
+	}
+
 	if mqcno.CCDTUrlPtr != nil {
 		C.free(unsafe.Pointer(mqcno.CCDTUrlPtr))
 	}